This is 6.5.0_dev

plugin.yml

@@ -1,6 +1,6 @@
 main: com.massivecraft.mcore.MCore
 name: mcore
-version: 6.4.1
+version: 6.5.0_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

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_5_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryPlayer;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;

src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java

@@ -1,10 +1,10 @@
 package com.massivecraft.mcore.inventory;
 
-import org.bukkit.inventory.InventoryHolder;
+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_5_R3.EntityHuman;
+import org.bukkit.inventory.InventoryHolder;
-import net.minecraft.server.v1_5_R3.ItemStack;
-import net.minecraft.server.v1_5_R3.PlayerInventory;
 
 /**
  * This is an extended version of the NMS.PlayerInventory.
@@ -27,6 +27,16 @@ import net.minecraft.server.v1_5_R3.PlayerInventory;
  * m() (2 matches)
  * pickup(ItemStack) (2 matches)
  * PlayerInventory(EntityHuman)
+ * 
+ * As of 1.6.1 these are the references:
+ * 
+ * a(EntityHuman) (2 matches)
+ * a(float)
+ * getOwner()
+ * k() (2 matches)
+ * m() (2 matches)
+ * pickup(ItemStack) (2 matches)
+ * PlayerInventory(EntityHuman)
  */
 public class MCorePlayerInventory extends PlayerInventory
 {
@@ -62,11 +72,11 @@ public class MCorePlayerInventory extends PlayerInventory
 	// This method handles damage dealt to the armor inside the inventory.
 	// We simply ignore damage if there is no player.
 	@Override
-	public void g(int arg0)
+	public void a(float arg0)
 	{
 		if (this.player == null) return;
 		
-		super.g(arg0);
+		super.a(arg0);
 	}
 	
 	// If the player is null there is no owner.

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_R3.BiomeBase;
+import net.minecraft.server.v1_6_R1.BiomeBase;
-import net.minecraft.server.v1_5_R3.Chunk;
+import net.minecraft.server.v1_6_R1.Chunk;
-import net.minecraft.server.v1_5_R3.WorldServer;
+import net.minecraft.server.v1_6_R1.WorldServer;
 
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
 
 public class BiomeUtil
 {

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_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
 
 public class BukkitCommandUtil
 {

src/com/massivecraft/mcore/util/InventoryUtil.java

@@ -3,8 +3,8 @@ package com.massivecraft.mcore.util;
 import java.util.HashMap;
 
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventoryPlayer;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.inventory.InventoryType.SlotType;

src/com/massivecraft/mcore/util/LightUtil.java

@@ -1,10 +1,10 @@
 package com.massivecraft.mcore.util;
 
-import net.minecraft.server.v1_5_R3.WorldServer;
+import net.minecraft.server.v1_6_R1.WorldServer;
 
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R1.CraftWorld;
 
 /**
  * Find the method by going through CraftBlock.setTypeId()

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_5_R3.DedicatedServer;
+import net.minecraft.server.v1_6_R1.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_5_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;

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_5_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R1.EntityPlayer;
-import net.minecraft.server.v1_5_R3.Packet8UpdateHealth;
+import net.minecraft.server.v1_6_R1.Packet8UpdateHealth;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

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_R3.MinecraftServer;
+import net.minecraft.server.v1_6_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_5_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
 import org.bukkit.entity.Player;
 
 import com.massivecraft.mcore.MCore;

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_R3.SharedConstants.allowedCharacters;
+	private static final String allowedChars = net.minecraft.server.v1_6_R1.SharedConstants.allowedCharacters;
 	
 	public static int getCharPixelWidth(char ch)
 	{

src/com/massivecraft/mcore/util/Txt.java

@@ -350,6 +350,21 @@ public class Txt
 		return isVowel(noun) ? "an" : "a";
 	}
 	
+	// -------------------------------------------- //
+	// START COLORS
+	// -------------------------------------------- //
+	// This method never returns null
+	
+	public static final String START_COLORS_REGEX = "^((?:§.)+).*$";
+	public static final Pattern START_COLORS_PATTERN = Pattern.compile(START_COLORS_REGEX);
+	
+	public static String getStartColors(String string)
+	{
+		Matcher matcher = START_COLORS_PATTERN.matcher(string);
+		if (!matcher.find()) return "";
+		return matcher.group(1);
+	}
+	
 	// -------------------------------------------- //
 	// Material name tools
 	// -------------------------------------------- //