Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use one mcore only

Browse Source
This commit is contained in:
Olof Larsson 2013-02-22 08:27:28 +01:00
parent 022e05ceaa
commit 06bf6f2946
422 changed files with 1476 additions and 1476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin.yml
View File

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

8
src/com/massivecraft/mcore5/Conf.java → src/com/massivecraft/mcore/Conf.java
View File

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

22
src/com/massivecraft/mcore5/InternalListener.java → src/com/massivecraft/mcore/InternalListener.java
View File

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

2
src/com/massivecraft/mcore5/Lang.java → src/com/massivecraft/mcore/Lang.java
View File

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

40
src/com/massivecraft/mcore5/MCore.java → src/com/massivecraft/mcore/MCore.java
View File

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

14
src/com/massivecraft/mcore5/MPlugin.java → src/com/massivecraft/mcore/MPlugin.java
View File

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

18
src/com/massivecraft/mcore5/PS.java → src/com/massivecraft/mcore/PS.java
View File

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

4
src/com/massivecraft/mcore5/Permission.java → src/com/massivecraft/mcore/Permission.java
View File

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

2
src/com/massivecraft/mcore5/Predictate.java → src/com/massivecraft/mcore/Predictate.java
View File

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

2
src/com/massivecraft/mcore5/Prioritized.java → src/com/massivecraft/mcore/Prioritized.java
View File

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

2
src/com/massivecraft/mcore5/PriorityComparator.java → src/com/massivecraft/mcore/PriorityComparator.java
View File

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

2
src/com/massivecraft/mcore5/ReversePriorityComparator.java → src/com/massivecraft/mcore/ReversePriorityComparator.java
View File

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

6
src/com/massivecraft/mcore5/SimpleConfig.java → src/com/massivecraft/mcore/SimpleConfig.java
View File

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

12
src/com/massivecraft/mcore5/adapter/FireworkEffectAdapter.java → src/com/massivecraft/mcore/adapter/FireworkEffectAdapter.java
View File

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

20
src/com/massivecraft/mcore5/adapter/InventoryAdapter.java → src/com/massivecraft/mcore/adapter/InventoryAdapter.java
View File

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

16
src/com/massivecraft/mcore5/adapter/ItemStackAdapter.java → src/com/massivecraft/mcore/adapter/ItemStackAdapter.java
View File

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

16
src/com/massivecraft/mcore5/adapter/ItemStackAdapterV1.java → src/com/massivecraft/mcore/adapter/ItemStackAdapterV1.java
View File

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

20
src/com/massivecraft/mcore5/adapter/ItemStackAdapterV2.java → src/com/massivecraft/mcore/adapter/ItemStackAdapterV2.java
View File

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

18
src/com/massivecraft/mcore5/adapter/MongoURIAdapter.java → src/com/massivecraft/mcore/adapter/MongoURIAdapter.java
View File

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

2
src/com/massivecraft/mcore5/adapter/NBType.java → src/com/massivecraft/mcore/adapter/NBType.java
View File

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

10
src/com/massivecraft/mcore5/adapter/NbtGsonConverter.java → src/com/massivecraft/mcore/adapter/NbtGsonConverter.java
View File

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

18
src/com/massivecraft/mcore5/adapter/PSAdapter.java → src/com/massivecraft/mcore/adapter/PSAdapter.java
View File

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

20
src/com/massivecraft/mcore5/adapter/PolymorphicAdapter.java → src/com/massivecraft/mcore/adapter/PolymorphicAdapter.java
View File

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

6
src/com/massivecraft/mcore5/adapter/PotionEffectAdapter.java → src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java
View File

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

8
src/com/massivecraft/mcore5/cmd/BukkitGlueCommand.java → src/com/massivecraft/mcore/cmd/BukkitGlueCommand.java
View File

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

10
src/com/massivecraft/mcore5/cmd/CmdMcore.java → src/com/massivecraft/mcore/cmd/CmdMcore.java
View File

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

8
src/com/massivecraft/mcore5/cmd/HelpCommand.java → src/com/massivecraft/mcore/cmd/HelpCommand.java
View File

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

24
src/com/massivecraft/mcore5/cmd/MCommand.java → src/com/massivecraft/mcore/cmd/MCommand.java
View File

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

2
src/com/massivecraft/mcore5/cmd/VisibilityMode.java → src/com/massivecraft/mcore/cmd/VisibilityMode.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARAbstractPrimitive.java → src/com/massivecraft/mcore/cmd/arg/ARAbstractPrimitive.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ARAbstractSelect.java → src/com/massivecraft/mcore/cmd/arg/ARAbstractSelect.java
View File

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

8
src/com/massivecraft/mcore5/cmd/arg/ARAspect.java → src/com/massivecraft/mcore/cmd/arg/ARAspect.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARBoolean.java → src/com/massivecraft/mcore/cmd/arg/ARBoolean.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARByte.java → src/com/massivecraft/mcore/cmd/arg/ARByte.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARChatColor.java → src/com/massivecraft/mcore/cmd/arg/ARChatColor.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARDate.java → src/com/massivecraft/mcore/cmd/arg/ARDate.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ARDifficulty.java → src/com/massivecraft/mcore/cmd/arg/ARDifficulty.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARDouble.java → src/com/massivecraft/mcore/cmd/arg/ARDouble.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/AREnvironment.java → src/com/massivecraft/mcore/cmd/arg/AREnvironment.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARFloat.java → src/com/massivecraft/mcore/cmd/arg/ARFloat.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ARGameMode.java → src/com/massivecraft/mcore/cmd/arg/ARGameMode.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARInteger.java → src/com/massivecraft/mcore/cmd/arg/ARInteger.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARLong.java → src/com/massivecraft/mcore/cmd/arg/ARLong.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARMaterial.java → src/com/massivecraft/mcore/cmd/arg/ARMaterial.java
View File

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

6
src/com/massivecraft/mcore5/cmd/arg/ARMillisDiff.java → src/com/massivecraft/mcore/cmd/arg/ARMillisDiff.java
View File

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

8
src/com/massivecraft/mcore5/cmd/arg/ARMultiverse.java → src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java
View File

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

8
src/com/massivecraft/mcore5/cmd/arg/ARPlayer.java → src/com/massivecraft/mcore/cmd/arg/ARPlayer.java
View File

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

8
src/com/massivecraft/mcore5/cmd/arg/ARSender.java → src/com/massivecraft/mcore/cmd/arg/ARSender.java
View File

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

8
src/com/massivecraft/mcore5/cmd/arg/ARSenderEntity.java → src/com/massivecraft/mcore/cmd/arg/ARSenderEntity.java
View File

@ -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.mcore.store.SenderColl;
import com.massivecraft.mcore5.store.SenderColl; import com.massivecraft.mcore.store.SenderEntity;
import com.massivecraft.mcore5.store.SenderEntity; import com.massivecraft.mcore.store.SenderIdSource;
public class ARSenderEntity<T extends SenderEntity<T>> extends ARSenderIdAbstractPredsource<T> public class ARSenderEntity<T extends SenderEntity<T>> extends ARSenderIdAbstractPredsource<T>
{ {

6
src/com/massivecraft/mcore5/cmd/arg/ARSenderId.java → src/com/massivecraft/mcore/cmd/arg/ARSenderId.java
View File

@ -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.mcore.store.SenderIdSource;
import com.massivecraft.mcore5.store.SenderIdSource; import com.massivecraft.mcore.store.SenderIdSourceMixinAllSenderIds;
public class ARSenderId extends ARSenderIdAbstractPredsource<String> public class ARSenderId extends ARSenderIdAbstractPredsource<String>
{ {

6
src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstract.java → src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstract.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ARSenderIdAbstractPredsource.java → src/com/massivecraft/mcore/cmd/arg/ARSenderIdAbstractPredsource.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARString.java → src/com/massivecraft/mcore/cmd/arg/ARString.java
View File

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

6
src/com/massivecraft/mcore5/cmd/arg/ARUniverse.java → src/com/massivecraft/mcore/cmd/arg/ARUniverse.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ARWorld.java → src/com/massivecraft/mcore/cmd/arg/ARWorld.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ARWorldId.java → src/com/massivecraft/mcore/cmd/arg/ARWorldId.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ARWorldType.java → src/com/massivecraft/mcore/cmd/arg/ARWorldType.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ArgPredictate.java → src/com/massivecraft/mcore/cmd/arg/ArgPredictate.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ArgPredictateAnd.java → src/com/massivecraft/mcore/cmd/arg/ArgPredictateAnd.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringEqualsLC.java → src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringEqualsLC.java
View File

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

4
src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringIsOnlineSenderId.java → src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringIsOnlineSenderId.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ArgPredictateStringStartsLC.java → src/com/massivecraft/mcore/cmd/arg/ArgPredictateStringStartsLC.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ArgReader.java → src/com/massivecraft/mcore/cmd/arg/ArgReader.java
View File

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

2
src/com/massivecraft/mcore5/cmd/arg/ArgResult.java → src/com/massivecraft/mcore/cmd/arg/ArgResult.java
View File

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

4
src/com/massivecraft/mcore5/cmd/req/IReq.java → src/com/massivecraft/mcore/cmd/req/IReq.java
View File

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

6
src/com/massivecraft/mcore5/cmd/req/ReqHasPerm.java → src/com/massivecraft/mcore/cmd/req/ReqHasPerm.java
View File

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

6
src/com/massivecraft/mcore5/cmd/req/ReqIsPlayer.java → src/com/massivecraft/mcore/cmd/req/ReqIsPlayer.java
View File

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

2
src/com/massivecraft/mcore5/event/MCoreAfterPlayerRespawnEvent.java → src/com/massivecraft/mcore/event/MCoreAfterPlayerRespawnEvent.java
View File

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

2
src/com/massivecraft/mcore5/event/MCoreAfterPlayerTeleportEvent.java → src/com/massivecraft/mcore/event/MCoreAfterPlayerTeleportEvent.java
View File

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

2
src/com/massivecraft/mcore5/event/MCoreEvent.java → src/com/massivecraft/mcore/event/MCoreEvent.java
View File

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

2
src/com/massivecraft/mcore5/event/MCorePlayerLeaveEvent.java → src/com/massivecraft/mcore/event/MCorePlayerLeaveEvent.java
View File

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

2
src/com/massivecraft/mcore5/event/MCoreSenderEvent.java → src/com/massivecraft/mcore/event/MCoreSenderEvent.java
View File

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

2
src/com/massivecraft/mcore5/event/MCoreSenderRegisterEvent.java → src/com/massivecraft/mcore/event/MCoreSenderRegisterEvent.java
View File

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

2
src/com/massivecraft/mcore5/event/MCoreSenderUnregisterEvent.java → src/com/massivecraft/mcore/event/MCoreSenderUnregisterEvent.java
View File

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

6
src/com/massivecraft/mcore5/integration/Integration.java → src/com/massivecraft/mcore/integration/Integration.java
View File

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

2
src/com/massivecraft/mcore5/integration/IntegrationFeatures.java → src/com/massivecraft/mcore/integration/IntegrationFeatures.java
View File

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

2
src/com/massivecraft/mcore5/integration/IntegrationFeaturesAbstract.java → src/com/massivecraft/mcore/integration/IntegrationFeaturesAbstract.java
View File

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

2
src/com/massivecraft/mcore5/mixin/DisplayNameMixin.java → src/com/massivecraft/mcore/mixin/DisplayNameMixin.java
View File

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

4
src/com/massivecraft/mcore5/mixin/DisplayNameMixinAbstract.java → src/com/massivecraft/mcore/mixin/DisplayNameMixinAbstract.java
View File

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

2
src/com/massivecraft/mcore5/mixin/DisplayNameMixinDefault.java → src/com/massivecraft/mcore/mixin/DisplayNameMixinDefault.java
View File

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

2
src/com/massivecraft/mcore5/mixin/KickMixin.java → src/com/massivecraft/mcore/mixin/KickMixin.java
View File

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

2
src/com/massivecraft/mcore5/mixin/KickMixinAbstract.java → src/com/massivecraft/mcore/mixin/KickMixinAbstract.java
View File

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

4
src/com/massivecraft/mcore5/mixin/KickMixinDefault.java → src/com/massivecraft/mcore/mixin/KickMixinDefault.java
View File

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

2
src/com/massivecraft/mcore5/mixin/ListNameMixin.java → src/com/massivecraft/mcore/mixin/ListNameMixin.java
View File

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

4
src/com/massivecraft/mcore5/mixin/ListNameMixinAbstract.java → src/com/massivecraft/mcore/mixin/ListNameMixinAbstract.java
View File

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

2
src/com/massivecraft/mcore5/mixin/ListNameMixinDefault.java → src/com/massivecraft/mcore/mixin/ListNameMixinDefault.java
View File

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

2
src/com/massivecraft/mcore5/mixin/MessageMixin.java → src/com/massivecraft/mcore/mixin/MessageMixin.java
View File

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

4
src/com/massivecraft/mcore5/mixin/MessageMixinAbstract.java → src/com/massivecraft/mcore/mixin/MessageMixinAbstract.java
View File

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

4
src/com/massivecraft/mcore5/mixin/MessageMixinDefault.java → src/com/massivecraft/mcore/mixin/MessageMixinDefault.java
View File

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

4
src/com/massivecraft/mcore5/mixin/Mixin.java → src/com/massivecraft/mcore/mixin/Mixin.java
View File

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

2
src/com/massivecraft/mcore5/mixin/PlayedMixin.java → src/com/massivecraft/mcore/mixin/PlayedMixin.java
View File

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

2
src/com/massivecraft/mcore5/mixin/PlayedMixinAbstract.java → src/com/massivecraft/mcore/mixin/PlayedMixinAbstract.java
View File

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

6
src/com/massivecraft/mcore5/mixin/PlayedMixinDefault.java → src/com/massivecraft/mcore/mixin/PlayedMixinDefault.java
View File

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

6
src/com/massivecraft/mcore5/mixin/ScheduledTeleport.java → src/com/massivecraft/mcore/mixin/ScheduledTeleport.java
View File

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

6
src/com/massivecraft/mcore5/mixin/ScheduledTeleportListener.java → src/com/massivecraft/mcore/mixin/ScheduledTeleportListener.java
View File

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

2
src/com/massivecraft/mcore5/mixin/SenderIdMixin.java → src/com/massivecraft/mcore/mixin/SenderIdMixin.java
View File

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

2
src/com/massivecraft/mcore5/mixin/SenderIdMixinAbstract.java → src/com/massivecraft/mcore/mixin/SenderIdMixinAbstract.java
View File

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

16
src/com/massivecraft/mcore5/mixin/SenderIdMixinDefault.java → src/com/massivecraft/mcore/mixin/SenderIdMixinDefault.java
View File

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

4
src/com/massivecraft/mcore5/mixin/SenderPsMixin.java → src/com/massivecraft/mcore/mixin/SenderPsMixin.java
View File

@ -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 public interface SenderPsMixin
{ {

2
src/com/massivecraft/mcore5/mixin/SenderPsMixinAbstract.java → src/com/massivecraft/mcore/mixin/SenderPsMixinAbstract.java
View File

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

Some files were not shown because too many files have changed in this diff Show More