From 2ff98d2ddbfca525397056c7f3a46099c1c650d5 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 17 Mar 2013 11:19:12 +0100 Subject: [PATCH] Initial update to 1.5 --- src/com/massivecraft/mcore/adapter/InventoryAdapter.java | 2 +- src/com/massivecraft/mcore/util/BiomeUtil.java | 8 ++++---- src/com/massivecraft/mcore/util/BukkitCommandUtil.java | 2 +- src/com/massivecraft/mcore/util/InventoryUtil.java | 2 +- src/com/massivecraft/mcore/util/LightUtil.java | 4 ++-- src/com/massivecraft/mcore/util/MUtil.java | 4 ++-- src/com/massivecraft/mcore/util/PlayerUtil.java | 6 +++--- src/com/massivecraft/mcore/util/SenderUtil.java | 4 ++-- src/com/massivecraft/mcore/util/TextWrapper.java | 2 +- src/com/massivecraft/mcore/util/ThrownPotionUtil.java | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java index af47e89e..a76a23ef 100644 --- a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java +++ b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore.adapter; import java.lang.reflect.Type; -import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_5_R1.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/src/com/massivecraft/mcore/util/BiomeUtil.java b/src/com/massivecraft/mcore/util/BiomeUtil.java index 850f7279..045260cb 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_4_R1.BiomeBase; -import net.minecraft.server.v1_4_R1.Chunk; -import net.minecraft.server.v1_4_R1.WorldServer; +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 org.bukkit.World; -import org.bukkit.craftbukkit.v1_4_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R1.CraftWorld; public class BiomeUtil { diff --git a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java index 03ff971b..5d11ab97 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_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_5_R1.CraftServer; public class BukkitCommandUtil { diff --git a/src/com/massivecraft/mcore/util/InventoryUtil.java b/src/com/massivecraft/mcore/util/InventoryUtil.java index 4956fdd7..48c418c3 100644 --- a/src/com/massivecraft/mcore/util/InventoryUtil.java +++ b/src/com/massivecraft/mcore/util/InventoryUtil.java @@ -3,7 +3,7 @@ package com.massivecraft.mcore.util; import java.util.HashMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom; +import org.bukkit.craftbukkit.v1_5_R1.inventory.CraftInventoryCustom; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; diff --git a/src/com/massivecraft/mcore/util/LightUtil.java b/src/com/massivecraft/mcore/util/LightUtil.java index abbffeca..a009a380 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_4_R1.WorldServer; +import net.minecraft.server.v1_5_R1.WorldServer; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_4_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_5_R1.CraftWorld; public class LightUtil { diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java index 3294099f..36b882be 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_4_R1.DedicatedServer; +import net.minecraft.server.v1_5_R1.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_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_5_R1.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 30f8a5b8..f4b74bf1 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_4_R1.EntityPlayer; -import net.minecraft.server.v1_4_R1.Packet8UpdateHealth; +import net.minecraft.server.v1_5_R1.EntityPlayer; +import net.minecraft.server.v1_5_R1.Packet8UpdateHealth; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_5_R1.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 ec7095c8..0d19bd5c 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_4_R1.MinecraftServer; +import net.minecraft.server.v1_5_R1.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_4_R1.CraftServer; +import org.bukkit.craftbukkit.v1_5_R1.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 e0ed7f92..6712a39d 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_4_R1.SharedConstants.allowedCharacters; + private static final String allowedChars = net.minecraft.server.v1_5_R1.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 index 6ef831c7..1b7031ff 100644 --- a/src/com/massivecraft/mcore/util/ThrownPotionUtil.java +++ b/src/com/massivecraft/mcore/util/ThrownPotionUtil.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.util; -import org.bukkit.craftbukkit.v1_4_R1.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_5_R1.entity.CraftThrownPotion; import org.bukkit.entity.ThrownPotion; // PR to add this feature to the API: