From 4c70897d87668e875ca508d86d8d9fa50e5e76db Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 22 Mar 2013 17:31:16 +0100 Subject: [PATCH] Update for R2 --- .../massivecraft/mcore/util/BiomeUtil.java | 8 ++++---- .../mcore/util/BukkitCommandUtil.java | 2 +- .../mcore/util/InventoryUtil.java | 3 ++- .../massivecraft/mcore/util/LightUtil.java | 19 ++++++++++++++++--- src/com/massivecraft/mcore/util/MUtil.java | 4 ++-- .../massivecraft/mcore/util/PlayerUtil.java | 6 +++--- .../massivecraft/mcore/util/SenderUtil.java | 4 ++-- .../massivecraft/mcore/util/TextWrapper.java | 2 +- .../mcore/util/ThrownPotionUtil.java | 15 --------------- 9 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 src/com/massivecraft/mcore/util/ThrownPotionUtil.java diff --git a/src/com/massivecraft/mcore/util/BiomeUtil.java b/src/com/massivecraft/mcore/util/BiomeUtil.java index 045260cb..ef305620 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_5_R1.BiomeBase; -import net.minecraft.server.v1_5_R1.Chunk; -import net.minecraft.server.v1_5_R1.WorldServer; +import net.minecraft.server.v1_5_R2.BiomeBase; +import net.minecraft.server.v1_5_R2.Chunk; +import net.minecraft.server.v1_5_R2.WorldServer; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_5_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; public class BiomeUtil { diff --git a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java index 5d11ab97..6c26452c 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_5_R1.CraftServer; +import org.bukkit.craftbukkit.v1_5_R2.CraftServer; public class BukkitCommandUtil { diff --git a/src/com/massivecraft/mcore/util/InventoryUtil.java b/src/com/massivecraft/mcore/util/InventoryUtil.java index 368ffd5d..21dd1136 100644 --- a/src/com/massivecraft/mcore/util/InventoryUtil.java +++ b/src/com/massivecraft/mcore/util/InventoryUtil.java @@ -141,7 +141,8 @@ public class InventoryUtil return ret; } - // NOTE: This method may not be compatible with player inventories + // NOTE: This method does not handle the armor part of player inventories. + // That is expected behavior for now. public static Inventory cloneInventory(Inventory inventory) { if (inventory == null) return null; diff --git a/src/com/massivecraft/mcore/util/LightUtil.java b/src/com/massivecraft/mcore/util/LightUtil.java index a009a380..a34f0773 100644 --- a/src/com/massivecraft/mcore/util/LightUtil.java +++ b/src/com/massivecraft/mcore/util/LightUtil.java @@ -1,11 +1,24 @@ package com.massivecraft.mcore.util; -import net.minecraft.server.v1_5_R1.WorldServer; +import net.minecraft.server.v1_5_R2.WorldServer; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_5_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R2.CraftWorld; +/** + * Find the method by going through CraftBlock.setTypeId() + * The method should look something like this: + * + * public void A(int i, int j, int k) { + if (!this.worldProvider.f) { + this.c(EnumSkyBlock.SKY, i, j, k); + } + + this.c(EnumSkyBlock.BLOCK, i, j, k); + } + * + */ public class LightUtil { // -------------------------------------------- // @@ -23,6 +36,6 @@ public class LightUtil { CraftWorld cworld = (CraftWorld)world; WorldServer worldServer = cworld.getHandle(); - worldServer.z(x, y, z); + worldServer.A(x, y, z); } } diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java index 453ac652..3b786e2b 100644 --- a/src/com/massivecraft/mcore/util/MUtil.java +++ b/src/com/massivecraft/mcore/util/MUtil.java @@ -18,7 +18,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import net.minecraft.server.v1_5_R1.DedicatedServer; +import net.minecraft.server.v1_5_R2.DedicatedServer; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -26,7 +26,7 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.BlockFace; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_5_R1.CraftServer; +import org.bukkit.craftbukkit.v1_5_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 f4b74bf1..3e9bb42d 100644 --- a/src/com/massivecraft/mcore/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore/util/PlayerUtil.java @@ -7,11 +7,11 @@ import java.util.TreeSet; import java.util.Map.Entry; import java.util.concurrent.ConcurrentSkipListMap; -import net.minecraft.server.v1_5_R1.EntityPlayer; -import net.minecraft.server.v1_5_R1.Packet8UpdateHealth; +import net.minecraft.server.v1_5_R2.EntityPlayer; +import net.minecraft.server.v1_5_R2.Packet8UpdateHealth; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_5_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_5_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 0d19bd5c..6059f7a4 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_5_R1.MinecraftServer; +import net.minecraft.server.v1_5_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_5_R1.CraftServer; +import org.bukkit.craftbukkit.v1_5_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 6712a39d..73e1fda7 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_5_R1.SharedConstants.allowedCharacters; + private static final String allowedChars = net.minecraft.server.v1_5_R2.SharedConstants.allowedCharacters; public static int getCharPixelWidth(char ch) { diff --git a/src/com/massivecraft/mcore/util/ThrownPotionUtil.java b/src/com/massivecraft/mcore/util/ThrownPotionUtil.java deleted file mode 100644 index 1b7031ff..00000000 --- a/src/com/massivecraft/mcore/util/ThrownPotionUtil.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.massivecraft.mcore.util; - -import org.bukkit.craftbukkit.v1_5_R1.entity.CraftThrownPotion; -import org.bukkit.entity.ThrownPotion; - -// PR to add this feature to the API: -// https://github.com/Bukkit/Bukkit/pull/737 -public class ThrownPotionUtil -{ - public static int getPotionValue(ThrownPotion potion) - { - CraftThrownPotion cpotion = (CraftThrownPotion)potion; - return cpotion.getHandle().getPotionValue(); - } -}