diff --git a/plugin.yml b/plugin.yml index 9919c56b..7881a561 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: mcore5 -version: 1.0.0 +version: 1.1.0 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 dc5700e1..463e78fd 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.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java b/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java index fd806b59..8f4839a8 100644 --- a/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java +++ b/src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java @@ -3,10 +3,10 @@ package com.massivecraft.mcore5.adapter; import java.lang.reflect.Type; import java.util.Map.Entry; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagCompound; +import net.minecraft.server.v1_4_5.NBTBase; +import net.minecraft.server.v1_4_5.NBTTagCompound; -import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_4_5.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/src/com/massivecraft/mcore5/adapter/NBType.java b/src/com/massivecraft/mcore5/adapter/NBType.java index 29a06736..f5400abe 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.NBTBase; +import net.minecraft.server.v1_4_5.NBTBase; import lombok.Getter; diff --git a/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java b/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java index 306545cf..fbd44850 100644 --- a/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java +++ b/src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java @@ -1,23 +1,23 @@ package com.massivecraft.mcore5.adapter; -import net.minecraft.server.NBTBase; -import net.minecraft.server.NBTTagByte; -import net.minecraft.server.NBTTagByteArray; -import net.minecraft.server.NBTTagCompound; -import net.minecraft.server.NBTTagDouble; -import net.minecraft.server.NBTTagEnd; -import net.minecraft.server.NBTTagFloat; -import net.minecraft.server.NBTTagInt; -import net.minecraft.server.NBTTagIntArray; -import net.minecraft.server.NBTTagList; -import net.minecraft.server.NBTTagLong; -import net.minecraft.server.NBTTagShort; -import net.minecraft.server.NBTTagString; - 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 com.massivecraft.mcore5.xlib.gson.JsonArray; import com.massivecraft.mcore5.xlib.gson.JsonElement; import com.massivecraft.mcore5.xlib.gson.JsonObject; diff --git a/src/com/massivecraft/mcore5/util/BiomeUtil.java b/src/com/massivecraft/mcore5/util/BiomeUtil.java index 0272c4ba..dcf19a39 100644 --- a/src/com/massivecraft/mcore5/util/BiomeUtil.java +++ b/src/com/massivecraft/mcore5/util/BiomeUtil.java @@ -5,11 +5,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.AbstractMap.SimpleEntry; -import org.bukkit.World; -import org.bukkit.craftbukkit.CraftWorld; +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.BiomeBase; -import net.minecraft.server.WorldServer; +import org.bukkit.World; +import org.bukkit.craftbukkit.v1_4_5.CraftWorld; public class BiomeUtil { @@ -44,7 +45,7 @@ public class BiomeUtil BiomeBase bb = BiomeBase.biomes[id]; if (craftWorld.loadChunk(x >> 4, z >> 4, false)) { - net.minecraft.server.Chunk chunk = worldServer.getChunkAtWorldCoords(x, z); + Chunk chunk = worldServer.getChunkAtWorldCoords(x, z); if (chunk != null) { byte[] biomevals = chunk.m(); diff --git a/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore5/util/BukkitCommandUtil.java index 05efa1b4..fce7b2e7 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.CraftServer; +import org.bukkit.craftbukkit.v1_4_5.CraftServer; public class BukkitCommandUtil { diff --git a/src/com/massivecraft/mcore5/util/InventoryUtil.java b/src/com/massivecraft/mcore5/util/InventoryUtil.java index 099dd8d1..1a58dbcb 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.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_4_5.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 a167372b..cfd9b6a0 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.WorldServer; +import net.minecraft.server.v1_4_5.WorldServer; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_4_5.CraftWorld; public class LightUtil { diff --git a/src/com/massivecraft/mcore5/util/PlayerUtil.java b/src/com/massivecraft/mcore5/util/PlayerUtil.java index e0152285..55475caf 100644 --- a/src/com/massivecraft/mcore5/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore5/util/PlayerUtil.java @@ -9,13 +9,13 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; import java.util.regex.Pattern; -import net.minecraft.server.DedicatedServer; -import net.minecraft.server.EntityPlayer; -import net.minecraft.server.Packet8UpdateHealth; +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 org.bukkit.Bukkit; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_5.CraftServer; +import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/com/massivecraft/mcore5/util/PotionPaketUtil.java b/src/com/massivecraft/mcore5/util/PotionPaketUtil.java index c4ee96d6..21bdd886 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.Packet41MobEffect; -import net.minecraft.server.Packet42RemoveMobEffect; +import net.minecraft.server.v1_4_5.Packet41MobEffect; +import net.minecraft.server.v1_4_5.Packet42RemoveMobEffect; -import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; diff --git a/src/com/massivecraft/mcore5/util/SmokeUtil.java b/src/com/massivecraft/mcore5/util/SmokeUtil.java index 893c74a7..a59f9f92 100644 --- a/src/com/massivecraft/mcore5/util/SmokeUtil.java +++ b/src/com/massivecraft/mcore5/util/SmokeUtil.java @@ -5,15 +5,15 @@ import java.util.Collection; import java.util.List; import java.util.Random; -import net.minecraft.server.ChunkPosition; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.Packet60Explosion; +import net.minecraft.server.v1_4_5.ChunkPosition; +import net.minecraft.server.v1_4_5.MinecraftServer; +import net.minecraft.server.v1_4_5.Packet60Explosion; import org.bukkit.Bukkit; import org.bukkit.Effect; import org.bukkit.Location; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.v1_4_5.CraftServer; +import org.bukkit.craftbukkit.v1_4_5.CraftWorld; // http://mc.kev009.com/Protocol // ----------------------------- diff --git a/src/com/massivecraft/mcore5/util/TextWrapper.java b/src/com/massivecraft/mcore5/util/TextWrapper.java index 5e85d264..9851c9ff 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.SharedConstants.allowedCharacters; + private static final String allowedChars = net.minecraft.server.v1_4_5.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 a8bc3a5b..facfa160 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.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_4_5.entity.CraftThrownPotion; import org.bukkit.entity.ThrownPotion; // PR to add this feature to the API: