From d079cdc0f750e459c95e63903e14e901215a2e0e Mon Sep 17 00:00:00 2001 From: David Berdik Date: Sun, 22 Mar 2015 21:36:38 -0400 Subject: [PATCH] Fixed CraftBukkit imports to match 1.8.3. All but two imports have been fixed. The two remaining imports don't seem to follow the same naming conventions as the other imports for this update of CraftBukkit, so I have left them untouched for now. --- .classpath | 8 ++++---- .settings/org.eclipse.core.resources.prefs | 2 -- .../herobrineai/listeners/PlayerListener.java | 8 ++++---- src/org/jakub1221/herobrineai/nms/NPC/NPCCore.java | 4 ++-- .../herobrineai/nms/NPC/entity/HumanEntity.java | 14 +++++++------- .../herobrineai/nms/NPC/entity/HumanNPC.java | 6 +++--- .../herobrineai/nms/NPC/network/NetworkCore.java | 4 ++-- .../nms/NPC/network/NetworkHandler.java | 6 +++--- .../herobrineai/nms/NPC/network/NetworkUtils.java | 4 ++-- .../herobrineai/nms/NPC/utils/NMSServerAccess.java | 6 +++--- .../herobrineai/nms/NPC/utils/NMSWorldAccess.java | 6 +++--- .../herobrineai/nms/entity/CustomSkeleton.java | 6 +++--- .../herobrineai/nms/entity/CustomZombie.java | 6 +++--- .../herobrineai/nms/entity/EntityInjector.java | 2 +- .../herobrineai/nms/entity/EntityManager.java | 4 ++-- 15 files changed, 42 insertions(+), 44 deletions(-) delete mode 100644 .settings/org.eclipse.core.resources.prefs diff --git a/.classpath b/.classpath index e978682..99fd5b4 100644 --- a/.classpath +++ b/.classpath @@ -3,17 +3,17 @@ - + - + - - + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/src/org/jakub1221/herobrineai/listeners/PlayerListener.java b/src/org/jakub1221/herobrineai/listeners/PlayerListener.java index ff9883d..b643b3e 100644 --- a/src/org/jakub1221/herobrineai/listeners/PlayerListener.java +++ b/src/org/jakub1221/herobrineai/listeners/PlayerListener.java @@ -3,16 +3,16 @@ package org.jakub1221.herobrineai.listeners; import java.util.ArrayList; import java.util.Random; -import net.minecraft.server.v1_8_R1.EntityPlayer; -import net.minecraft.server.v1_8_R1.EnumPlayerInfoAction; -import net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo; +import net.minecraft.server.v1_8_R2.EntityPlayer; +import net.minecraft.server.v1_8_R2.EnumPlayerInfoAction; +import net.minecraft.server.v1_8_R2.PacketPlayOutPlayerInfo; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Jukebox; -import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/org/jakub1221/herobrineai/nms/NPC/NPCCore.java b/src/org/jakub1221/herobrineai/nms/NPC/NPCCore.java index f94ed1b..3e73796 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/NPCCore.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/NPCCore.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import net.minecraft.server.v1_8_R1.Entity; -import net.minecraft.server.v1_8_R1.PlayerInteractManager; +import net.minecraft.server.v1_8_R2.Entity; +import net.minecraft.server.v1_8_R2.PlayerInteractManager; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanEntity.java b/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanEntity.java index da0ca26..cf46d52 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanEntity.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanEntity.java @@ -1,15 +1,15 @@ package org.jakub1221.herobrineai.nms.NPC.entity; -import net.minecraft.server.v1_8_R1.Entity; -import net.minecraft.server.v1_8_R1.EntityHuman; -import net.minecraft.server.v1_8_R1.EntityPlayer; -import net.minecraft.server.v1_8_R1.EnumGamemode; -import net.minecraft.server.v1_8_R1.PlayerInteractManager; +import net.minecraft.server.v1_8_R2.Entity; +import net.minecraft.server.v1_8_R2.EntityHuman; +import net.minecraft.server.v1_8_R2.EntityPlayer; +import net.minecraft.server.v1_8_R2.EnumGamemode; +import net.minecraft.server.v1_8_R2.PlayerInteractManager; import com.mojang.authlib.GameProfile; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_8_R1.CraftServer; -import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_8_R2.CraftServer; +import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; import org.jakub1221.herobrineai.nms.NPC.NPCCore; import org.jakub1221.herobrineai.nms.NPC.network.NetworkHandler; import org.jakub1221.herobrineai.nms.NPC.utils.NMSWorldAccess; diff --git a/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanNPC.java b/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanNPC.java index 9d51a36..9057e93 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanNPC.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/entity/HumanNPC.java @@ -1,8 +1,8 @@ package org.jakub1221.herobrineai.nms.NPC.entity; -import net.minecraft.server.v1_8_R1.EntityPlayer; -import net.minecraft.server.v1_8_R1.PacketPlayInArmAnimation; -import net.minecraft.server.v1_8_R1.WorldServer; +import net.minecraft.server.v1_8_R2.EntityPlayer; +import net.minecraft.server.v1_8_R2.PacketPlayInArmAnimation; +import net.minecraft.server.v1_8_R2.WorldServer; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; diff --git a/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkCore.java b/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkCore.java index caa356d..7bf34cd 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkCore.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkCore.java @@ -1,7 +1,7 @@ package org.jakub1221.herobrineai.nms.NPC.network; -import net.minecraft.server.v1_8_R1.EnumProtocolDirection; -import net.minecraft.server.v1_8_R1.NetworkManager; +import net.minecraft.server.v1_8_R2.EnumProtocolDirection; +import net.minecraft.server.v1_8_R2.NetworkManager; public class NetworkCore extends NetworkManager { diff --git a/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkHandler.java b/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkHandler.java index 511db78..0c02efc 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkHandler.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkHandler.java @@ -1,8 +1,8 @@ package org.jakub1221.herobrineai.nms.NPC.network; -import net.minecraft.server.v1_8_R1.EntityPlayer; -import net.minecraft.server.v1_8_R1.Packet; -import net.minecraft.server.v1_8_R1.PlayerConnection; +import net.minecraft.server.v1_8_R2.EntityPlayer; +import net.minecraft.server.v1_8_R2.Packet; +import net.minecraft.server.v1_8_R2.PlayerConnection; import org.jakub1221.herobrineai.nms.NPC.NPCCore; diff --git a/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkUtils.java b/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkUtils.java index 4865e3c..5cda134 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkUtils.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/network/NetworkUtils.java @@ -1,11 +1,11 @@ package org.jakub1221.herobrineai.nms.NPC.network; -import net.minecraft.server.v1_8_R1.Packet; +import net.minecraft.server.v1_8_R2.Packet; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSServerAccess.java b/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSServerAccess.java index 9d23256..95cce0f 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSServerAccess.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSServerAccess.java @@ -3,12 +3,12 @@ package org.jakub1221.herobrineai.nms.NPC.utils; import java.util.List; import java.util.logging.Logger; -import net.minecraft.server.v1_8_R1.MinecraftServer; -import net.minecraft.server.v1_8_R1.WorldServer; +import net.minecraft.server.v1_8_R2.MinecraftServer; +import net.minecraft.server.v1_8_R2.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Server; -import org.bukkit.craftbukkit.v1_8_R1.CraftServer; +import org.bukkit.craftbukkit.v1_8_R2.CraftServer; public class NMSServerAccess { diff --git a/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSWorldAccess.java b/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSWorldAccess.java index 0d5aae8..d33efb5 100644 --- a/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSWorldAccess.java +++ b/src/org/jakub1221/herobrineai/nms/NPC/utils/NMSWorldAccess.java @@ -3,11 +3,11 @@ package org.jakub1221.herobrineai.nms.NPC.utils; import java.util.logging.Level; import java.util.logging.Logger; -import net.minecraft.server.v1_8_R1.PlayerChunkMap; -import net.minecraft.server.v1_8_R1.WorldServer; +import net.minecraft.server.v1_8_R2.PlayerChunkMap; +import net.minecraft.server.v1_8_R2.WorldServer; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_8_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_8_R2.CraftWorld; public class NMSWorldAccess { diff --git a/src/org/jakub1221/herobrineai/nms/entity/CustomSkeleton.java b/src/org/jakub1221/herobrineai/nms/entity/CustomSkeleton.java index 5531488..ad0bee7 100644 --- a/src/org/jakub1221/herobrineai/nms/entity/CustomSkeleton.java +++ b/src/org/jakub1221/herobrineai/nms/entity/CustomSkeleton.java @@ -2,9 +2,9 @@ package org.jakub1221.herobrineai.nms.entity; import java.util.Random; -import net.minecraft.server.v1_8_R1.EntitySkeleton; -import net.minecraft.server.v1_8_R1.GenericAttributes; -import net.minecraft.server.v1_8_R1.World; +import net.minecraft.server.v1_8_R2.EntitySkeleton; +import net.minecraft.server.v1_8_R2.GenericAttributes; +import net.minecraft.server.v1_8_R2.World; import org.bukkit.Color; import org.bukkit.Location; diff --git a/src/org/jakub1221/herobrineai/nms/entity/CustomZombie.java b/src/org/jakub1221/herobrineai/nms/entity/CustomZombie.java index a6226b7..682244a 100644 --- a/src/org/jakub1221/herobrineai/nms/entity/CustomZombie.java +++ b/src/org/jakub1221/herobrineai/nms/entity/CustomZombie.java @@ -2,9 +2,9 @@ package org.jakub1221.herobrineai.nms.entity; import java.util.Random; -import net.minecraft.server.v1_8_R1.EntityZombie; -import net.minecraft.server.v1_8_R1.GenericAttributes; -import net.minecraft.server.v1_8_R1.World; +import net.minecraft.server.v1_8_R2.EntityZombie; +import net.minecraft.server.v1_8_R2.GenericAttributes; +import net.minecraft.server.v1_8_R2.World; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/org/jakub1221/herobrineai/nms/entity/EntityInjector.java b/src/org/jakub1221/herobrineai/nms/entity/EntityInjector.java index 02d4542..02306e8 100644 --- a/src/org/jakub1221/herobrineai/nms/entity/EntityInjector.java +++ b/src/org/jakub1221/herobrineai/nms/entity/EntityInjector.java @@ -4,7 +4,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Map; -import net.minecraft.server.v1_8_R1.EntityTypes; +import net.minecraft.server.v1_8_R2.EntityTypes; import org.jakub1221.herobrineai.HerobrineAI; diff --git a/src/org/jakub1221/herobrineai/nms/entity/EntityManager.java b/src/org/jakub1221/herobrineai/nms/entity/EntityManager.java index d57979d..c131b2b 100644 --- a/src/org/jakub1221/herobrineai/nms/entity/EntityManager.java +++ b/src/org/jakub1221/herobrineai/nms/entity/EntityManager.java @@ -3,10 +3,10 @@ package org.jakub1221.herobrineai.nms.entity; import java.util.HashMap; import java.util.Map; -import net.minecraft.server.v1_8_R1.World; +import net.minecraft.server.v1_8_R2.World; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_8_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_8_R2.CraftWorld; public class EntityManager {