diff --git a/plugin.yml b/plugin.yml index 0e3d8497..7238c906 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: mcore5 -version: 1.1.2 +version: 1.1.3 main: com.massivecraft.mcore5.MCore load: startup permissions: diff --git a/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java index cf336f6e..45826908 100644 --- a/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/mcore5/adapter/InventoryAdapter.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore5.adapter; import java.lang.reflect.Type; -import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java b/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java index 045d8ec9..4753eb9b 100644 --- a/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java +++ b/src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java @@ -4,10 +4,10 @@ import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.Map.Entry; -import net.minecraft.server.v1_4_5.NBTBase; -import net.minecraft.server.v1_4_5.NBTTagCompound; +import net.minecraft.server.v1_4_6.NBTBase; +import net.minecraft.server.v1_4_6.NBTTagCompound; -import org.bukkit.craftbukkit.v1_4_5.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_4_6.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; @@ -191,11 +191,11 @@ public class ItemStackAdapterV1 implements JsonDeserializer, JsonSeri } } - public static net.minecraft.server.v1_4_5.ItemStack getHandle(CraftItemStack craftItemStack) + public static net.minecraft.server.v1_4_6.ItemStack getHandle(CraftItemStack craftItemStack) { try { - return (net.minecraft.server.v1_4_5.ItemStack) fieldCraftItemStackDotHandle.get(craftItemStack); + return (net.minecraft.server.v1_4_6.ItemStack) fieldCraftItemStackDotHandle.get(craftItemStack); } catch (Exception e) { diff --git a/src/com/massivecraft/mcore5/adapter/NBType.java b/src/com/massivecraft/mcore5/adapter/NBType.java index f5400abe..f2b11376 100644 --- a/src/com/massivecraft/mcore5/adapter/NBType.java +++ b/src/com/massivecraft/mcore5/adapter/NBType.java @@ -3,7 +3,7 @@ package com.massivecraft.mcore5.adapter; import java.util.HashMap; import java.util.Map; -import net.minecraft.server.v1_4_5.NBTBase; +import net.minecraft.server.v1_4_6.NBTBase; import lombok.Getter; diff --git a/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java b/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java index 23c02bf8..5fb22d1e 100644 --- a/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java +++ b/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java @@ -4,19 +4,19 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map.Entry; -import net.minecraft.server.v1_4_5.NBTBase; -import net.minecraft.server.v1_4_5.NBTTagByte; -import net.minecraft.server.v1_4_5.NBTTagByteArray; -import net.minecraft.server.v1_4_5.NBTTagCompound; -import net.minecraft.server.v1_4_5.NBTTagDouble; -import net.minecraft.server.v1_4_5.NBTTagEnd; -import net.minecraft.server.v1_4_5.NBTTagFloat; -import net.minecraft.server.v1_4_5.NBTTagInt; -import net.minecraft.server.v1_4_5.NBTTagIntArray; -import net.minecraft.server.v1_4_5.NBTTagList; -import net.minecraft.server.v1_4_5.NBTTagLong; -import net.minecraft.server.v1_4_5.NBTTagShort; -import net.minecraft.server.v1_4_5.NBTTagString; +import net.minecraft.server.v1_4_6.NBTBase; +import net.minecraft.server.v1_4_6.NBTTagByte; +import net.minecraft.server.v1_4_6.NBTTagByteArray; +import net.minecraft.server.v1_4_6.NBTTagCompound; +import net.minecraft.server.v1_4_6.NBTTagDouble; +import net.minecraft.server.v1_4_6.NBTTagEnd; +import net.minecraft.server.v1_4_6.NBTTagFloat; +import net.minecraft.server.v1_4_6.NBTTagInt; +import net.minecraft.server.v1_4_6.NBTTagIntArray; +import net.minecraft.server.v1_4_6.NBTTagList; +import net.minecraft.server.v1_4_6.NBTTagLong; +import net.minecraft.server.v1_4_6.NBTTagShort; +import net.minecraft.server.v1_4_6.NBTTagString; import com.massivecraft.mcore5.xlib.gson.JsonArray; import com.massivecraft.mcore5.xlib.gson.JsonElement; diff --git a/src/com/massivecraft/mcore5/util/BiomeUtil.java b/src/com/massivecraft/mcore5/util/BiomeUtil.java index 39ca447f..b1a777c7 100644 --- a/src/com/massivecraft/mcore5/util/BiomeUtil.java +++ b/src/com/massivecraft/mcore5/util/BiomeUtil.java @@ -5,12 +5,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.AbstractMap.SimpleEntry; -import net.minecraft.server.v1_4_5.BiomeBase; -import net.minecraft.server.v1_4_5.Chunk; -import net.minecraft.server.v1_4_5.WorldServer; +import net.minecraft.server.v1_4_6.BiomeBase; +import net.minecraft.server.v1_4_6.Chunk; +import net.minecraft.server.v1_4_6.WorldServer; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_4_5.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; public class BiomeUtil { diff --git a/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java index fce7b2e7..a97d8749 100644 --- a/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java +++ b/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java @@ -6,7 +6,7 @@ import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.SimpleCommandMap; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; public class BukkitCommandUtil { diff --git a/src/com/massivecraft/mcore5/util/InventoryUtil.java b/src/com/massivecraft/mcore5/util/InventoryUtil.java index 1a58dbcb..eb6f346a 100644 --- a/src/com/massivecraft/mcore5/util/InventoryUtil.java +++ b/src/com/massivecraft/mcore5/util/InventoryUtil.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore5.util; -import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; diff --git a/src/com/massivecraft/mcore5/util/LightUtil.java b/src/com/massivecraft/mcore5/util/LightUtil.java index 5ad29326..96e826c9 100644 --- a/src/com/massivecraft/mcore5/util/LightUtil.java +++ b/src/com/massivecraft/mcore5/util/LightUtil.java @@ -1,10 +1,10 @@ package com.massivecraft.mcore5.util; -import net.minecraft.server.v1_4_5.WorldServer; +import net.minecraft.server.v1_4_6.WorldServer; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_4_5.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; public class LightUtil { diff --git a/src/com/massivecraft/mcore5/util/PlayerUtil.java b/src/com/massivecraft/mcore5/util/PlayerUtil.java index ea11e4a6..b04f26b0 100644 --- a/src/com/massivecraft/mcore5/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore5/util/PlayerUtil.java @@ -1,7 +1,6 @@ package com.massivecraft.mcore5.util; import java.io.File; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -9,13 +8,13 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; import java.util.regex.Pattern; -import net.minecraft.server.v1_4_5.DedicatedServer; -import net.minecraft.server.v1_4_5.EntityPlayer; -import net.minecraft.server.v1_4_5.Packet8UpdateHealth; +import net.minecraft.server.v1_4_6.DedicatedServer; +import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_6.Packet8UpdateHealth; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_5.CraftServer; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -82,15 +81,12 @@ public class PlayerUtil implements Listener /** * This is a faster version of the getPlayerExact method since this one is exact for real (no to lower case stuff). */ - @SuppressWarnings("unchecked") + public static Player getPlayerExact(String exactPlayerName) { - if (exactPlayerName == null) return null; - CraftServer craftServer = (CraftServer) Bukkit.getServer(); - List entityPlayers = craftServer.getHandle().players; - for (EntityPlayer entityPlayer : entityPlayers) + if (exactPlayerName == null) return null; + for (Player player : Bukkit.getOnlinePlayers()) { - Player player = entityPlayer.netServerHandler.getPlayer(); if (player.getName().equals(exactPlayerName)) { return player; @@ -215,7 +211,7 @@ public class PlayerUtil implements Listener { CraftPlayer cplayer = (CraftPlayer)player; EntityPlayer eplayer = cplayer.getHandle(); - eplayer.netServerHandler.sendPacket(new Packet8UpdateHealth(eplayer.getHealth(), eplayer.getFoodData().a(), eplayer.getFoodData().e())); + eplayer.playerConnection.sendPacket(new Packet8UpdateHealth(eplayer.getHealth(), eplayer.getFoodData().a(), eplayer.getFoodData().e())); } // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore5/util/PotionPaketUtil.java b/src/com/massivecraft/mcore5/util/PotionPaketUtil.java index 21bdd886..81daf2b0 100644 --- a/src/com/massivecraft/mcore5/util/PotionPaketUtil.java +++ b/src/com/massivecraft/mcore5/util/PotionPaketUtil.java @@ -1,9 +1,9 @@ package com.massivecraft.mcore5.util; -import net.minecraft.server.v1_4_5.Packet41MobEffect; -import net.minecraft.server.v1_4_5.Packet42RemoveMobEffect; +import net.minecraft.server.v1_4_6.Packet41MobEffect; +import net.minecraft.server.v1_4_6.Packet42RemoveMobEffect; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; @@ -60,7 +60,7 @@ public class PotionPaketUtil pm.b = effectId; pm.c = amplifier; pm.d = duration; - ((CraftPlayer)player).getHandle().netServerHandler.sendPacket(pm); + ((CraftPlayer)player).getHandle().playerConnection.sendPacket(pm); } public static void remove(Player player, int entityId, byte effectId) @@ -68,7 +68,7 @@ public class PotionPaketUtil Packet42RemoveMobEffect pr = new Packet42RemoveMobEffect(); pr.a = entityId; pr.b = effectId; - ((CraftPlayer)player).getHandle().netServerHandler.sendPacket(pr); + ((CraftPlayer)player).getHandle().playerConnection.sendPacket(pr); } } diff --git a/src/com/massivecraft/mcore5/util/TextWrapper.java b/src/com/massivecraft/mcore5/util/TextWrapper.java index 9851c9ff..bf2db965 100644 --- a/src/com/massivecraft/mcore5/util/TextWrapper.java +++ b/src/com/massivecraft/mcore5/util/TextWrapper.java @@ -25,7 +25,7 @@ public class TextWrapper private static final char COLOR_CHAR = '\u00A7'; private static final int CHAT_WINDOW_WIDTH = 320; private static final int CHAT_STRING_LENGTH = 119; - private static final String allowedChars = net.minecraft.server.v1_4_5.SharedConstants.allowedCharacters; + private static final String allowedChars = net.minecraft.server.v1_4_6.SharedConstants.allowedCharacters; public static int getCharPixelWidth(char ch) { diff --git a/src/com/massivecraft/mcore5/util/ThrownPotionUtil.java b/src/com/massivecraft/mcore5/util/ThrownPotionUtil.java index facfa160..07c3c47c 100644 --- a/src/com/massivecraft/mcore5/util/ThrownPotionUtil.java +++ b/src/com/massivecraft/mcore5/util/ThrownPotionUtil.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore5.util; -import org.bukkit.craftbukkit.v1_4_5.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftThrownPotion; import org.bukkit.entity.ThrownPotion; // PR to add this feature to the API: