Fork/herobrine-for-bukkit-or-spigot
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Updated plugin from Bukkit/Spigot 1.10 to 1.11

Browse Source
This commit is contained in:
David Berdik 2016-11-19 15:12:02 -05:00
parent 7dd20f599e
commit d72d24b67d
16 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -11,6 +11,6 @@
<classpathentry kind="lib" path="libs/worldedit-bukkit-6.1.jar"/>
<classpathentry kind="lib" path="libs/worldguard-6.1.jar"/>
<classpathentry kind="lib" path="libs/CustomItems-1.0.0.jar"/>
<classpathentry kind="lib" path="libs/craftbukkit-1.10.jar"/>
<classpathentry kind="lib" path="libs/craftbukkit-1.11.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/bin/
/libs/craftbukkit-1.10.jar
/libs/craftbukkit-1.11.jar

8
src/net/theprogrammersworld/herobrine/AI/AICore.java
View File

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Random;
import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.PacketPlayOutPlayerInfo;
import net.minecraft.server.v1_10_R1.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.PacketPlayOutPlayerInfo;
import net.minecraft.server.v1_11_R1.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
import net.theprogrammersworld.herobrine.Herobrine;
import net.theprogrammersworld.herobrine.Util;
import net.theprogrammersworld.herobrine.AI.cores.Attack;
@ -33,7 +33,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

2
src/net/theprogrammersworld/herobrine/commands/CmdExecutor.java
View File

@ -966,7 +966,7 @@ public class CmdExecutor implements CommandExecutor {
double x = Herobrine.herobrineNPC.getNMSEntity().locX;
double y = Herobrine.herobrineNPC.getNMSEntity().locY;
double z = Herobrine.herobrineNPC.getNMSEntity().locZ;
net.minecraft.server.v1_10_R1.World world = Herobrine.herobrineNPC.getNMSEntity().getWorld();
net.minecraft.server.v1_11_R1.World world = Herobrine.herobrineNPC.getNMSEntity().getWorld();
sender.sendMessage(red + "Herobrine's location world: " + world + " x: " + x + " y: " + y +
" z: " + z);

4
src/net/theprogrammersworld/herobrine/nms/NPC/NPCCore.java
View File

@ -5,8 +5,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import net.minecraft.server.v1_10_R1.Entity;
import net.minecraft.server.v1_10_R1.PlayerInteractManager;
import net.minecraft.server.v1_11_R1.Entity;
import net.minecraft.server.v1_11_R1.PlayerInteractManager;
import net.theprogrammersworld.herobrine.Herobrine;
import net.theprogrammersworld.herobrine.nms.NPC.entity.HumanEntity;
import net.theprogrammersworld.herobrine.nms.NPC.entity.HumanNPC;

19
src/net/theprogrammersworld/herobrine/nms/NPC/entity/HumanEntity.java
View File

@ -1,10 +1,11 @@
package net.theprogrammersworld.herobrine.nms.NPC.entity;
import net.minecraft.server.v1_10_R1.Entity;
import net.minecraft.server.v1_10_R1.EntityHuman;
import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.EnumGamemode;
import net.minecraft.server.v1_10_R1.PlayerInteractManager;
import net.minecraft.server.v1_11_R1.Entity;
import net.minecraft.server.v1_11_R1.EntityHuman;
import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.EnumGamemode;
import net.minecraft.server.v1_11_R1.EnumMoveType;
import net.minecraft.server.v1_11_R1.PlayerInteractManager;
import net.theprogrammersworld.herobrine.nms.NPC.NPCCore;
import net.theprogrammersworld.herobrine.nms.NPC.network.NetworkHandler;
import net.theprogrammersworld.herobrine.nms.NPC.utils.NMSWorldAccess;
@ -12,8 +13,8 @@ import net.theprogrammersworld.herobrine.nms.NPC.utils.NMSWorldAccess;
import com.mojang.authlib.GameProfile;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
public class HumanEntity extends EntityPlayer {
@ -23,9 +24,9 @@ public class HumanEntity extends EntityPlayer {
playerConnection = new NetworkHandler(npcCore, this);
fauxSleeping = true;
}
@Override
public void move(final double arg0, final double arg1, final double arg2) {
public void move(EnumMoveType x, final double arg0, final double arg1, final double arg2) {
setPosition(arg0, arg1, arg2);
}

6
src/net/theprogrammersworld/herobrine/nms/NPC/entity/HumanNPC.java
View File

@ -1,8 +1,8 @@
package net.theprogrammersworld.herobrine.nms.NPC.entity;
import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.PacketPlayInArmAnimation;
import net.minecraft.server.v1_10_R1.WorldServer;
import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.PacketPlayInArmAnimation;
import net.minecraft.server.v1_11_R1.WorldServer;
import net.theprogrammersworld.herobrine.Herobrine;
import org.bukkit.Location;

4
src/net/theprogrammersworld/herobrine/nms/NPC/network/NetworkCore.java
View File

@ -1,7 +1,7 @@
package net.theprogrammersworld.herobrine.nms.NPC.network;
import net.minecraft.server.v1_10_R1.EnumProtocolDirection;
import net.minecraft.server.v1_10_R1.NetworkManager;
import net.minecraft.server.v1_11_R1.EnumProtocolDirection;
import net.minecraft.server.v1_11_R1.NetworkManager;
public class NetworkCore extends NetworkManager {

6
src/net/theprogrammersworld/herobrine/nms/NPC/network/NetworkHandler.java
View File

@ -1,8 +1,8 @@
package net.theprogrammersworld.herobrine.nms.NPC.network;
import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.Packet;
import net.minecraft.server.v1_10_R1.PlayerConnection;
import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.Packet;
import net.minecraft.server.v1_11_R1.PlayerConnection;
import net.theprogrammersworld.herobrine.nms.NPC.NPCCore;
public class NetworkHandler extends PlayerConnection {

4
src/net/theprogrammersworld/herobrine/nms/NPC/network/NetworkUtils.java
View File

@ -1,11 +1,11 @@
package net.theprogrammersworld.herobrine.nms.NPC.network;
import net.minecraft.server.v1_10_R1.Packet;
import net.minecraft.server.v1_11_R1.Packet;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

6
src/net/theprogrammersworld/herobrine/nms/NPC/utils/NMSServerAccess.java
View File

@ -3,12 +3,12 @@ package net.theprogrammersworld.herobrine.nms.NPC.utils;
import java.util.List;
import java.util.logging.Logger;
import net.minecraft.server.v1_10_R1.MinecraftServer;
import net.minecraft.server.v1_10_R1.WorldServer;
import net.minecraft.server.v1_11_R1.MinecraftServer;
import net.minecraft.server.v1_11_R1.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
public class NMSServerAccess {

6
src/net/theprogrammersworld/herobrine/nms/NPC/utils/NMSWorldAccess.java
View File

@ -3,11 +3,11 @@ package net.theprogrammersworld.herobrine.nms.NPC.utils;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.v1_10_R1.PlayerChunkMap;
import net.minecraft.server.v1_10_R1.WorldServer;
import net.minecraft.server.v1_11_R1.PlayerChunkMap;
import net.minecraft.server.v1_11_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
public class NMSWorldAccess {

6
src/net/theprogrammersworld/herobrine/nms/entity/CustomSkeleton.java
View File

@ -2,9 +2,9 @@ package net.theprogrammersworld.herobrine.nms.entity;
import java.util.Random;
import net.minecraft.server.v1_10_R1.EntitySkeleton;
import net.minecraft.server.v1_10_R1.GenericAttributes;
import net.minecraft.server.v1_10_R1.World;
import net.minecraft.server.v1_11_R1.EntitySkeleton;
import net.minecraft.server.v1_11_R1.GenericAttributes;
import net.minecraft.server.v1_11_R1.World;
import net.theprogrammersworld.herobrine.Herobrine;
import net.theprogrammersworld.herobrine.misc.ItemName;

6
src/net/theprogrammersworld/herobrine/nms/entity/CustomZombie.java
View File

@ -2,9 +2,9 @@ package net.theprogrammersworld.herobrine.nms.entity;
import java.util.Random;
import net.minecraft.server.v1_10_R1.EntityZombie;
import net.minecraft.server.v1_10_R1.GenericAttributes;
import net.minecraft.server.v1_10_R1.World;
import net.minecraft.server.v1_11_R1.EntityZombie;
import net.minecraft.server.v1_11_R1.GenericAttributes;
import net.minecraft.server.v1_11_R1.World;
import net.theprogrammersworld.herobrine.Herobrine;
import org.bukkit.Location;

2
src/net/theprogrammersworld/herobrine/nms/entity/EntityInjector.java
View File

@ -4,7 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Map;
import net.minecraft.server.v1_10_R1.EntityTypes;
import net.minecraft.server.v1_11_R1.EntityTypes;
import net.theprogrammersworld.herobrine.Herobrine;
public class EntityInjector {

4
src/net/theprogrammersworld/herobrine/nms/entity/EntityManager.java
View File

@ -3,10 +3,10 @@ package net.theprogrammersworld.herobrine.nms.entity;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.server.v1_10_R1.World;
import net.minecraft.server.v1_11_R1.World;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
public class EntityManager {