diff --git a/plugin.yml b/plugin.yml index 550f4f93..1e952e7e 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ main: com.massivecraft.mcore.MCore name: mcore -version: 6.4.3 +version: 6.4.4_dev website: http://massivecraft.com/mcore authors: [Cayorion] description: §eMCore stands for MassiveCraft Core and is a plugin that contains libraries and features that other plugins make use of. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead programmer. Feel free to visit us at §bhttp://massivecraft.com diff --git a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java index d64d81f1..d30a2e10 100644 --- a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java @@ -2,8 +2,8 @@ package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; -import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryCustom; -import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryPlayer; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java b/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java index a81ee7a4..4cf352b0 100644 --- a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java +++ b/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java @@ -1,8 +1,8 @@ package com.massivecraft.mcore.inventory; -import net.minecraft.server.v1_6_R1.EntityHuman; -import net.minecraft.server.v1_6_R1.ItemStack; -import net.minecraft.server.v1_6_R1.PlayerInventory; +import net.minecraft.server.v1_6_R2.EntityHuman; +import net.minecraft.server.v1_6_R2.ItemStack; +import net.minecraft.server.v1_6_R2.PlayerInventory; import org.bukkit.inventory.InventoryHolder; @@ -28,7 +28,7 @@ import org.bukkit.inventory.InventoryHolder; * pickup(ItemStack) (2 matches) * PlayerInventory(EntityHuman) * - * As of 1.6.1 these are the references: + * As of 1.6.1 and 1.6.2 these are the references: * * a(EntityHuman) (2 matches) * a(float) diff --git a/src/com/massivecraft/mcore/util/BiomeUtil.java b/src/com/massivecraft/mcore/util/BiomeUtil.java index 0b7c9421..58b94e37 100644 --- a/src/com/massivecraft/mcore/util/BiomeUtil.java +++ b/src/com/massivecraft/mcore/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_6_R1.BiomeBase; -import net.minecraft.server.v1_6_R1.Chunk; -import net.minecraft.server.v1_6_R1.WorldServer; +import net.minecraft.server.v1_6_R2.BiomeBase; +import net.minecraft.server.v1_6_R2.Chunk; +import net.minecraft.server.v1_6_R2.WorldServer; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_6_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; public class BiomeUtil { diff --git a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java index e05721a9..8ed9a3af 100644 --- a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java +++ b/src/com/massivecraft/mcore/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_6_R1.CraftServer; +import org.bukkit.craftbukkit.v1_6_R2.CraftServer; public class BukkitCommandUtil { diff --git a/src/com/massivecraft/mcore/util/InventoryUtil.java b/src/com/massivecraft/mcore/util/InventoryUtil.java index 8e60c171..bc19a44f 100644 --- a/src/com/massivecraft/mcore/util/InventoryUtil.java +++ b/src/com/massivecraft/mcore/util/InventoryUtil.java @@ -2,9 +2,11 @@ package com.massivecraft.mcore.util; import java.util.HashMap; +import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryCustom; -import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryPlayer; +import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType.SlotType; @@ -13,10 +15,33 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; +import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.inventory.MCorePlayerInventory; public class InventoryUtil { + // -------------------------------------------- // + // UPDATES + // -------------------------------------------- // + + @SuppressWarnings("deprecation") + public static void update(Player player) + { + player.updateInventory(); + } + + public static void updateSoon(final Player player) + { + Bukkit.getScheduler().scheduleSyncDelayedTask(MCore.get(), new Runnable() + { + @Override + public void run() + { + update(player); + } + }); + } + // -------------------------------------------- // // EVENT INTERPRETATION // -------------------------------------------- // diff --git a/src/com/massivecraft/mcore/util/LightUtil.java b/src/com/massivecraft/mcore/util/LightUtil.java index 8a713707..c98a4950 100644 --- a/src/com/massivecraft/mcore/util/LightUtil.java +++ b/src/com/massivecraft/mcore/util/LightUtil.java @@ -1,10 +1,10 @@ package com.massivecraft.mcore.util; -import net.minecraft.server.v1_6_R1.WorldServer; +import net.minecraft.server.v1_6_R2.WorldServer; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_6_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_6_R2.CraftWorld; /** * Find the method by going through CraftBlock.setTypeId() diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java index 735011d8..443ab60a 100644 --- a/src/com/massivecraft/mcore/util/MUtil.java +++ b/src/com/massivecraft/mcore/util/MUtil.java @@ -19,7 +19,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import net.minecraft.server.v1_6_R1.DedicatedServer; +import net.minecraft.server.v1_6_R2.DedicatedServer; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -27,7 +27,7 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.BlockFace; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_6_R1.CraftServer; +import org.bukkit.craftbukkit.v1_6_R2.CraftServer; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; diff --git a/src/com/massivecraft/mcore/util/PlayerUtil.java b/src/com/massivecraft/mcore/util/PlayerUtil.java index 1a4221f1..4d63d890 100644 --- a/src/com/massivecraft/mcore/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore/util/PlayerUtil.java @@ -8,11 +8,11 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; -import net.minecraft.server.v1_6_R1.EntityPlayer; -import net.minecraft.server.v1_6_R1.Packet8UpdateHealth; +import net.minecraft.server.v1_6_R2.EntityPlayer; +import net.minecraft.server.v1_6_R2.Packet8UpdateHealth; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/com/massivecraft/mcore/util/SenderUtil.java b/src/com/massivecraft/mcore/util/SenderUtil.java index f6c7006e..3359e2b8 100644 --- a/src/com/massivecraft/mcore/util/SenderUtil.java +++ b/src/com/massivecraft/mcore/util/SenderUtil.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; -import net.minecraft.server.v1_6_R1.MinecraftServer; +import net.minecraft.server.v1_6_R2.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -17,7 +17,7 @@ import org.bukkit.command.BlockCommandSender; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.RemoteConsoleCommandSender; -import org.bukkit.craftbukkit.v1_6_R1.CraftServer; +import org.bukkit.craftbukkit.v1_6_R2.CraftServer; import org.bukkit.entity.Player; import com.massivecraft.mcore.MCore; diff --git a/src/com/massivecraft/mcore/util/TextWrapper.java b/src/com/massivecraft/mcore/util/TextWrapper.java index b1ba2f8f..aa4b16e7 100644 --- a/src/com/massivecraft/mcore/util/TextWrapper.java +++ b/src/com/massivecraft/mcore/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_6_R1.SharedConstants.allowedCharacters; + private static final String allowedChars = net.minecraft.server.v1_6_R2.SharedConstants.allowedCharacters; public static int getCharPixelWidth(char ch) {