use one mcore only

plugin.yml

@@ -1,6 +1,6 @@
-name: mcore5
-version: 1.1.4
-main: com.massivecraft.mcore5.MCore
+name: mcore
+version: 6.0.0
+main: com.massivecraft.mcore.MCore
 load: startup
 permissions:
 # -------------------------------------------- #

src/com/massivecraft/mcore/Conf.java

@@ -1,13 +1,13 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import com.massivecraft.mcore5.cmd.CmdMcore;
-import com.massivecraft.mcore5.usys.cmd.CmdUsys;
-import com.massivecraft.mcore5.util.MUtil;
+import com.massivecraft.mcore.cmd.CmdMcore;
+import com.massivecraft.mcore.usys.cmd.CmdUsys;
+import com.massivecraft.mcore.util.MUtil;
 
 public class Conf extends SimpleConfig
 {

src/com/massivecraft/mcore/InternalListener.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,16 +21,16 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-import com.massivecraft.mcore5.event.MCoreAfterPlayerRespawnEvent;
-import com.massivecraft.mcore5.event.MCoreAfterPlayerTeleportEvent;
-import com.massivecraft.mcore5.event.MCorePlayerLeaveEvent;
-import com.massivecraft.mcore5.event.MCoreSenderRegisterEvent;
-import com.massivecraft.mcore5.event.MCoreSenderUnregisterEvent;
-import com.massivecraft.mcore5.mixin.Mixin;
-import com.massivecraft.mcore5.store.Coll;
-import com.massivecraft.mcore5.store.SenderColl;
-import com.massivecraft.mcore5.util.SenderUtil;
-import com.massivecraft.mcore5.util.SmokeUtil;
+import com.massivecraft.mcore.event.MCoreAfterPlayerRespawnEvent;
+import com.massivecraft.mcore.event.MCoreAfterPlayerTeleportEvent;
+import com.massivecraft.mcore.event.MCorePlayerLeaveEvent;
+import com.massivecraft.mcore.event.MCoreSenderRegisterEvent;
+import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent;
+import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.mcore.store.Coll;
+import com.massivecraft.mcore.store.SenderColl;
+import com.massivecraft.mcore.util.SenderUtil;
+import com.massivecraft.mcore.util.SmokeUtil;
 
 public class InternalListener implements Listener
 {

src/com/massivecraft/mcore/Lang.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 public class Lang
 {

src/com/massivecraft/mcore/MCore.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.lang.reflect.Modifier;
 import java.util.Map;
@@ -10,25 +10,25 @@ import org.bukkit.ChatColor;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore5.adapter.InventoryAdapter;
-import com.massivecraft.mcore5.adapter.ItemStackAdapter;
-import com.massivecraft.mcore5.adapter.MongoURIAdapter;
-import com.massivecraft.mcore5.adapter.PSAdapter;
-import com.massivecraft.mcore5.cmd.CmdMcore;
-import com.massivecraft.mcore5.mixin.SenderIdMixinDefault;
-import com.massivecraft.mcore5.mixin.ScheduledTeleportListener;
-import com.massivecraft.mcore5.store.Coll;
-import com.massivecraft.mcore5.store.Db;
-import com.massivecraft.mcore5.store.MStore;
-import com.massivecraft.mcore5.usys.AspectColl;
-import com.massivecraft.mcore5.usys.MultiverseColl;
-import com.massivecraft.mcore5.usys.cmd.CmdUsys;
-import com.massivecraft.mcore5.util.PlayerUtil;
-import com.massivecraft.mcore5.util.TimeDiffUtil;
-import com.massivecraft.mcore5.util.TimeUnit;
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
-import com.massivecraft.mcore5.xlib.mongodb.MongoURI;
+import com.massivecraft.mcore.adapter.InventoryAdapter;
+import com.massivecraft.mcore.adapter.ItemStackAdapter;
+import com.massivecraft.mcore.adapter.MongoURIAdapter;
+import com.massivecraft.mcore.adapter.PSAdapter;
+import com.massivecraft.mcore.cmd.CmdMcore;
+import com.massivecraft.mcore.mixin.ScheduledTeleportListener;
+import com.massivecraft.mcore.mixin.SenderIdMixinDefault;
+import com.massivecraft.mcore.store.Coll;
+import com.massivecraft.mcore.store.Db;
+import com.massivecraft.mcore.store.MStore;
+import com.massivecraft.mcore.usys.AspectColl;
+import com.massivecraft.mcore.usys.MultiverseColl;
+import com.massivecraft.mcore.usys.cmd.CmdUsys;
+import com.massivecraft.mcore.util.PlayerUtil;
+import com.massivecraft.mcore.util.TimeDiffUtil;
+import com.massivecraft.mcore.util.TimeUnit;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore.xlib.mongodb.MongoURI;
 
 public class MCore extends MPlugin
 {

src/com/massivecraft/mcore/MPlugin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -9,12 +9,12 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.massivecraft.mcore5.integration.Integration;
-import com.massivecraft.mcore5.integration.IntegrationFeatures;
-import com.massivecraft.mcore5.store.Coll;
-import com.massivecraft.mcore5.util.Txt;
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.GsonBuilder;
+import com.massivecraft.mcore.integration.Integration;
+import com.massivecraft.mcore.integration.IntegrationFeatures;
+import com.massivecraft.mcore.store.Coll;
+import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.GsonBuilder;
 
 public abstract class MPlugin extends JavaPlugin implements Listener
 {

src/com/massivecraft/mcore/PS.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.io.Serializable;
 import java.text.DecimalFormat;
@@ -18,14 +18,14 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import com.massivecraft.mcore5.mixin.TeleportMixinDefault;
-import com.massivecraft.mcore5.mixin.Mixin;
-import com.massivecraft.mcore5.mixin.TeleporterException;
-import com.massivecraft.mcore5.usys.Aspect;
-import com.massivecraft.mcore5.usys.Multiverse;
-import com.massivecraft.mcore5.util.MUtil;
-import com.massivecraft.mcore5.util.Txt;
-import com.massivecraft.mcore5.xlib.gson.annotations.SerializedName;
+import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.mcore.mixin.TeleportMixinDefault;
+import com.massivecraft.mcore.mixin.TeleporterException;
+import com.massivecraft.mcore.usys.Aspect;
+import com.massivecraft.mcore.usys.Multiverse;
+import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.mcore.util.Txt;
+import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
 
 /**
  * PS stands for PhysicalState.

src/com/massivecraft/mcore/Permission.java

@@ -1,8 +1,8 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import org.bukkit.permissions.Permissible;
 
-import com.massivecraft.mcore5.util.PermUtil;
+import com.massivecraft.mcore.util.PermUtil;
 
 public enum Permission
 {

src/com/massivecraft/mcore/Predictate.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 public interface Predictate<T>
 {

src/com/massivecraft/mcore/Prioritized.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 public interface Prioritized
 {

src/com/massivecraft/mcore/PriorityComparator.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.util.Comparator;
 

src/com/massivecraft/mcore/ReversePriorityComparator.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.util.Comparator;
 

src/com/massivecraft/mcore/SimpleConfig.java

@@ -1,9 +1,9 @@
-package com.massivecraft.mcore5;
+package com.massivecraft.mcore;
 
 import java.io.File;
 
-import com.massivecraft.mcore5.store.accessor.Accessor;
-import com.massivecraft.mcore5.util.DiscUtil;
+import com.massivecraft.mcore.store.accessor.Accessor;
+import com.massivecraft.mcore.util.DiscUtil;
 
 public class SimpleConfig
 {

src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,11 +10,11 @@ import org.bukkit.Color;
 import org.bukkit.FireworkEffect;
 import org.bukkit.FireworkEffect.Type;
 
-import com.massivecraft.mcore5.util.MUtil;
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
 
 public class FireworkEffectAdapter
 {

src/com/massivecraft/mcore/adapter/InventoryAdapter.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 
@@ -6,15 +6,15 @@ import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventoryCustom;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore5.MCore;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
 
 public class InventoryAdapter implements JsonDeserializer<Inventory>, JsonSerializer<Inventory>
 {

src/com/massivecraft/mcore/adapter/ItemStackAdapter.java

@@ -1,15 +1,15 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
 
 public class ItemStackAdapter implements JsonDeserializer<ItemStack>, JsonSerializer<ItemStack>
 {	

src/com/massivecraft/mcore/adapter/ItemStackAdapterV1.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
@@ -11,13 +11,13 @@ import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftItemStack;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
 
 // TODO: This adapter is deprecated as of 2012-12-20. It should be removed in some time.
 public class ItemStackAdapterV1 implements JsonDeserializer<ItemStack>, JsonSerializer<ItemStack>

src/com/massivecraft/mcore/adapter/ItemStackAdapterV2.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -26,15 +26,15 @@ import org.bukkit.inventory.meta.Repairable;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.bukkit.potion.PotionEffect;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
 
 /**
  * This is a GSON serializer/deserializer for the Bukkit ItemStack. Why not use

src/com/massivecraft/mcore/adapter/MongoURIAdapter.java

@@ -1,15 +1,15 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
-import com.massivecraft.mcore5.xlib.mongodb.MongoURI;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.mongodb.MongoURI;
 
 public class MongoURIAdapter implements JsonDeserializer<MongoURI>, JsonSerializer<MongoURI>
 {

src/com/massivecraft/mcore/adapter/NBType.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/massivecraft/mcore/adapter/NbtGsonConverter.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -18,10 +18,10 @@ import net.minecraft.server.v1_4_R1.NBTTagLong;
 import net.minecraft.server.v1_4_R1.NBTTagShort;
 import net.minecraft.server.v1_4_R1.NBTTagString;
 
-import com.massivecraft.mcore5.xlib.gson.JsonArray;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonArray;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
 
 //TODO: This converter is deprecated as of 2012-12-20. It should be removed in some time.
 public class NbtGsonConverter

src/com/massivecraft/mcore/adapter/PSAdapter.java

@@ -1,15 +1,15 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.PS;
-import com.massivecraft.mcore5.xlib.gson.Gson;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.mongodb.MongoURI;
+import com.massivecraft.mcore.PS;
+import com.massivecraft.mcore.xlib.gson.Gson;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.mongodb.MongoURI;
 
 public class PSAdapter implements JsonDeserializer<PS>
 {

src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java

@@ -1,16 +1,16 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonDeserializer;
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonNull;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
-import com.massivecraft.mcore5.xlib.gson.JsonParseException;
-import com.massivecraft.mcore5.xlib.gson.JsonPrimitive;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializationContext;
-import com.massivecraft.mcore5.xlib.gson.JsonSerializer;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonDeserializer;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonNull;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonParseException;
+import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.JsonSerializationContext;
+import com.massivecraft.mcore.xlib.gson.JsonSerializer;
 
 public class PolymorphicAdapter<T> implements JsonDeserializer<T>, JsonSerializer<T>
 {

src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.adapter;
+package com.massivecraft.mcore.adapter;
 
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import com.massivecraft.mcore5.xlib.gson.JsonElement;
-import com.massivecraft.mcore5.xlib.gson.JsonObject;
+import com.massivecraft.mcore.xlib.gson.JsonElement;
+import com.massivecraft.mcore.xlib.gson.JsonObject;
 
 public class PotionEffectAdapter
 {

src/com/massivecraft/mcore/cmd/BukkitGlueCommand.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd;
+package com.massivecraft.mcore.cmd;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,9 +8,9 @@ import java.util.TreeSet;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.MPlugin;
-import com.massivecraft.mcore5.mixin.Mixin;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.MPlugin;
+import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.mcore.util.Txt;
 
 public class BukkitGlueCommand extends Command
 {

src/com/massivecraft/mcore/cmd/CmdMcore.java

@@ -1,9 +1,9 @@
-package com.massivecraft.mcore5.cmd;
+package com.massivecraft.mcore.cmd;
 
-import com.massivecraft.mcore5.Conf;
-import com.massivecraft.mcore5.MCore;
-import com.massivecraft.mcore5.Permission;
-import com.massivecraft.mcore5.cmd.req.ReqHasPerm;
+import com.massivecraft.mcore.Conf;
+import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.Permission;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdMcore extends MCommand
 {

src/com/massivecraft/mcore/cmd/HelpCommand.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.cmd;
+package com.massivecraft.mcore.cmd;
 
 import java.util.ArrayList;
 
-import com.massivecraft.mcore5.cmd.MCommand;
-import com.massivecraft.mcore5.cmd.arg.ARInteger;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.cmd.MCommand;
+import com.massivecraft.mcore.cmd.arg.ARInteger;
+import com.massivecraft.mcore.util.Txt;
 
 public class HelpCommand extends MCommand
 {

src/com/massivecraft/mcore/cmd/MCommand.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd;
+package com.massivecraft.mcore.cmd;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -11,17 +11,17 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.SimpleCommandMap;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore5.Lang;
-import com.massivecraft.mcore5.MCore;
-import com.massivecraft.mcore5.MPlugin;
-import com.massivecraft.mcore5.cmd.arg.ArgReader;
-import com.massivecraft.mcore5.cmd.arg.ArgResult;
-import com.massivecraft.mcore5.cmd.req.IReq;
-import com.massivecraft.mcore5.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore5.mixin.Mixin;
-import com.massivecraft.mcore5.util.BukkitCommandUtil;
-import com.massivecraft.mcore5.util.PermUtil;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.Lang;
+import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.MPlugin;
+import com.massivecraft.mcore.cmd.arg.ArgReader;
+import com.massivecraft.mcore.cmd.arg.ArgResult;
+import com.massivecraft.mcore.cmd.req.IReq;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
+import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.mcore.util.BukkitCommandUtil;
+import com.massivecraft.mcore.util.PermUtil;
+import com.massivecraft.mcore.util.Txt;
 
 public abstract class MCommand
 {	

src/com/massivecraft/mcore/cmd/VisibilityMode.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd;
+package com.massivecraft.mcore.cmd;
 
 public enum VisibilityMode
 {

src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.util.Txt;
 
 public abstract class ARAbstractSelect<T> implements ArgReader<T>
 {

src/com/massivecraft/mcore/cmd/arg/ARAspect.java

@@ -1,12 +1,12 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.Permission;
-import com.massivecraft.mcore5.usys.Aspect;
-import com.massivecraft.mcore5.usys.AspectColl;
+import com.massivecraft.mcore.Permission;
+import com.massivecraft.mcore.usys.Aspect;
+import com.massivecraft.mcore.usys.AspectColl;
 
 public class ARAspect extends ARAbstractSelect<Aspect>
 {

src/com/massivecraft/mcore/cmd/arg/ARBoolean.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARBoolean extends ARAbstractPrimitive<Boolean>
 {

src/com/massivecraft/mcore/cmd/arg/ARByte.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARByte extends ARAbstractPrimitive<Byte>
 {	

src/com/massivecraft/mcore/cmd/arg/ARChatColor.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/com/massivecraft/mcore/cmd/arg/ARDate.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.Difficulty;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.MUtil;
+import com.massivecraft.mcore.util.MUtil;
 
 public class ARDifficulty extends ARAbstractSelect<Difficulty>
 {

src/com/massivecraft/mcore/cmd/arg/ARDouble.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARDouble extends ARAbstractPrimitive<Double>
 {	

src/com/massivecraft/mcore/cmd/arg/AREnvironment.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.World.Environment;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.MUtil;
+import com.massivecraft.mcore.util.MUtil;
 
 public class AREnvironment extends ARAbstractSelect<Environment>
 {

src/com/massivecraft/mcore/cmd/arg/ARFloat.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARFloat extends ARAbstractPrimitive<Float>
 {	

src/com/massivecraft/mcore/cmd/arg/ARGameMode.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.MUtil;
+import com.massivecraft.mcore.util.MUtil;
 
 public class ARGameMode extends ARAbstractSelect<GameMode>
 {

src/com/massivecraft/mcore/cmd/arg/ARInteger.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARInteger extends ARAbstractPrimitive<Integer>
 {

src/com/massivecraft/mcore/cmd/arg/ARLong.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARLong extends ARAbstractPrimitive<Long>
 {	

src/com/massivecraft/mcore/cmd/arg/ARMaterial.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;

src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java

@@ -1,9 +1,9 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.TimeDiffUtil;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.util.TimeDiffUtil;
+import com.massivecraft.mcore.util.Txt;
 
 public class ARMillisDiff implements ArgReader<Long>
 {

src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java

@@ -1,12 +1,12 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.Permission;
-import com.massivecraft.mcore5.usys.Multiverse;
-import com.massivecraft.mcore5.usys.MultiverseColl;
+import com.massivecraft.mcore.Permission;
+import com.massivecraft.mcore.usys.Multiverse;
+import com.massivecraft.mcore.usys.MultiverseColl;
 
 public class ARMultiverse extends ARAbstractSelect<Multiverse>
 {

src/com/massivecraft/mcore/cmd/arg/ARPlayer.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore5.store.SenderIdSourceMixinAllSenderIds;
-import com.massivecraft.mcore5.store.SenderIdSource;
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.store.SenderIdSource;
+import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public class ARPlayer extends ARSenderIdAbstractPredsource<Player>
 {

src/com/massivecraft/mcore/cmd/arg/ARSender.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.store.SenderIdSourceMixinAllSenderIds;
-import com.massivecraft.mcore5.store.SenderIdSource;
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.store.SenderIdSource;
+import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public class ARSender extends ARSenderIdAbstractPredsource<CommandSender>
 {

src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java

@@ -1,8 +1,8 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
-import com.massivecraft.mcore5.store.SenderIdSource;
-import com.massivecraft.mcore5.store.SenderColl;
-import com.massivecraft.mcore5.store.SenderEntity;
+import com.massivecraft.mcore.store.SenderColl;
+import com.massivecraft.mcore.store.SenderEntity;
+import com.massivecraft.mcore.store.SenderIdSource;
 
 public class ARSenderEntity<T extends SenderEntity<T>> extends ARSenderIdAbstractPredsource<T>
 {

src/com/massivecraft/mcore/cmd/arg/ARSenderId.java

@@ -1,7 +1,7 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
-import com.massivecraft.mcore5.store.SenderIdSourceMixinAllSenderIds;
-import com.massivecraft.mcore5.store.SenderIdSource;
+import com.massivecraft.mcore.store.SenderIdSource;
+import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds;
 
 public class ARSenderId extends ARSenderIdAbstractPredsource<String>
 {

src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.mixin.Mixin;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.mixin.Mixin;
+import com.massivecraft.mcore.util.Txt;
 
 public abstract class ARSenderIdAbstract<T> implements ArgReader<T>
 {

src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 import java.util.TreeSet;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.store.SenderIdSource;
+import com.massivecraft.mcore.store.SenderIdSource;
 
 public abstract class ARSenderIdAbstractPredsource<T> extends ARSenderIdAbstract<T>
 {

src/com/massivecraft/mcore/cmd/arg/ARString.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 public class ARString extends ARAbstractPrimitive<String>
 {

src/com/massivecraft/mcore/cmd/arg/ARUniverse.java

@@ -1,12 +1,12 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.usys.Multiverse;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.usys.Multiverse;
+import com.massivecraft.mcore.util.Txt;
 
 public class ARUniverse implements ArgReader<String>
 {

src/com/massivecraft/mcore/cmd/arg/ARWorld.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;

src/com/massivecraft/mcore/cmd/arg/ARWorldId.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.mixin.Mixin;
+import com.massivecraft.mcore.mixin.Mixin;
 
 public class ARWorldId extends ARAbstractSelect<String>
 {

src/com/massivecraft/mcore/cmd/arg/ARWorldType.java

@@ -1,11 +1,11 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.Collection;
 
 import org.bukkit.WorldType;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.MUtil;
+import com.massivecraft.mcore.util.MUtil;
 
 public class ARWorldType extends ARAbstractSelect<WorldType>
 {

src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java

@@ -1,8 +1,8 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.mixin.Mixin;
+import com.massivecraft.mcore.mixin.Mixin;
 
 public class ArgPredictateStringIsOnlineSenderId implements ArgPredictate<String>
 {

src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/cmd/arg/ArgReader.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/cmd/arg/ArgResult.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.cmd.arg;
+package com.massivecraft.mcore.cmd.arg;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/com/massivecraft/mcore/cmd/req/IReq.java

@@ -1,8 +1,8 @@
-package com.massivecraft.mcore5.cmd.req;
+package com.massivecraft.mcore.cmd.req;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.cmd.MCommand;
+import com.massivecraft.mcore.cmd.MCommand;
 
 public interface IReq
 {

src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java

@@ -1,12 +1,12 @@
-package com.massivecraft.mcore5.cmd.req;
+package com.massivecraft.mcore.cmd.req;
 
 import lombok.Getter;
 import lombok.Setter;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.cmd.MCommand;
-import com.massivecraft.mcore5.util.PermUtil;
+import com.massivecraft.mcore.cmd.MCommand;
+import com.massivecraft.mcore.util.PermUtil;
 
 public class ReqHasPerm implements IReq
 {

src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.cmd.req;
+package com.massivecraft.mcore.cmd.req;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore5.Lang;
-import com.massivecraft.mcore5.cmd.MCommand;
+import com.massivecraft.mcore.Lang;
+import com.massivecraft.mcore.cmd.MCommand;
 
 public class ReqIsPlayer implements IReq
 {

src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import lombok.Getter;
 

src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import lombok.Getter;
 

src/com/massivecraft/mcore/event/MCoreEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;

src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/massivecraft/mcore/event/MCoreSenderEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.HandlerList;

src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.event;
+package com.massivecraft.mcore.event;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.HandlerList;

src/com/massivecraft/mcore/integration/Integration.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.integration;
+package com.massivecraft.mcore.integration;
 
 import java.util.Collection;
 
@@ -12,8 +12,8 @@ import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.plugin.Plugin;
 
-import com.massivecraft.mcore5.MPlugin;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.MPlugin;
+import com.massivecraft.mcore.util.Txt;
 
 public class Integration implements Listener
 {

src/com/massivecraft/mcore/integration/IntegrationFeatures.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.integration;
+package com.massivecraft.mcore.integration;
 
 import java.util.List;
 

src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.integration;
+package com.massivecraft.mcore.integration;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/com/massivecraft/mcore/mixin/DisplayNameMixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java

@@ -1,8 +1,8 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public abstract class DisplayNameMixinAbstract implements DisplayNameMixin
 {

src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Map;
 import java.util.TreeMap;

src/com/massivecraft/mcore/mixin/KickMixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/mixin/KickMixinAbstract.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/mixin/KickMixinDefault.java

@@ -1,9 +1,9 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public class KickMixinDefault extends KickMixinAbstract
 {	

src/com/massivecraft/mcore/mixin/ListNameMixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 

src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java

@@ -1,8 +1,8 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public abstract class ListNameMixinAbstract implements ListNameMixin
 {

src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Map;
 import java.util.TreeMap;

src/com/massivecraft/mcore/mixin/MessageMixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Collection;
 

src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,7 +7,7 @@ import java.util.List;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.util.Txt;
 
 public abstract class MessageMixinAbstract implements MessageMixin
 {

src/com/massivecraft/mcore/mixin/MessageMixinDefault.java

@@ -1,10 +1,10 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public class MessageMixinDefault extends MessageMixinAbstract
 {

src/com/massivecraft/mcore/mixin/Mixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Collection;
 import java.util.List;
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permissible;
 
-import com.massivecraft.mcore5.PS;
+import com.massivecraft.mcore.PS;
 
 public class Mixin
 {

src/com/massivecraft/mcore/mixin/PlayedMixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 public interface PlayedMixin
 {

src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 public abstract class PlayedMixinAbstract implements PlayedMixin
 {

src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.io.File;
 
@@ -6,8 +6,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore5.util.MUtil;
-import com.massivecraft.mcore5.util.SenderUtil;
+import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.mcore.util.SenderUtil;
 
 public class PlayedMixinDefault extends PlayedMixinAbstract
 {

src/com/massivecraft/mcore/mixin/ScheduledTeleport.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -6,8 +6,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.massivecraft.mcore5.MCore;
-import com.massivecraft.mcore5.PS;
+import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.PS;
 
 public class ScheduledTeleport implements Runnable
 {

src/com/massivecraft/mcore/mixin/ScheduledTeleportListener.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -6,8 +6,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-import com.massivecraft.mcore5.MCore;
-import com.massivecraft.mcore5.util.MUtil;
+import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.util.MUtil;
 
 public class ScheduledTeleportListener implements Listener
 {

src/com/massivecraft/mcore/mixin/SenderIdMixin.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Set;
 

src/com/massivecraft/mcore/mixin/SenderIdMixinAbstract.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 public abstract class SenderIdMixinAbstract implements SenderIdMixin
 {

src/com/massivecraft/mcore/mixin/SenderIdMixinDefault.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 import java.util.Collections;
 import java.util.Map;
@@ -15,13 +15,13 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 
-import com.massivecraft.mcore5.MCore;
-import com.massivecraft.mcore5.event.MCorePlayerLeaveEvent;
-import com.massivecraft.mcore5.event.MCoreSenderRegisterEvent;
-import com.massivecraft.mcore5.event.MCoreSenderUnregisterEvent;
-import com.massivecraft.mcore5.util.MUtil;
-import com.massivecraft.mcore5.util.SenderUtil;
-import com.massivecraft.mcore5.util.Txt;
+import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.event.MCorePlayerLeaveEvent;
+import com.massivecraft.mcore.event.MCoreSenderRegisterEvent;
+import com.massivecraft.mcore.event.MCoreSenderUnregisterEvent;
+import com.massivecraft.mcore.util.MUtil;
+import com.massivecraft.mcore.util.SenderUtil;
+import com.massivecraft.mcore.util.Txt;
 
 public class SenderIdMixinDefault extends SenderIdMixinAbstract implements Listener
 {

src/com/massivecraft/mcore/mixin/SenderPsMixin.java

@@ -1,6 +1,6 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
-import com.massivecraft.mcore5.PS;
+import com.massivecraft.mcore.PS;
 
 public interface SenderPsMixin
 {

src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java

@@ -1,4 +1,4 @@
-package com.massivecraft.mcore5.mixin;
+package com.massivecraft.mcore.mixin;
 
 public abstract class SenderPsMixinAbstract implements SenderPsMixin
 {