diff --git a/src/perworld/cache/CacheInterface.java b/src/perworld/cache/CacheInterface.java new file mode 100644 index 0000000..ab81db9 --- /dev/null +++ b/src/perworld/cache/CacheInterface.java @@ -0,0 +1,16 @@ +package perworld.cache; + +import org.bukkit.configuration.ConfigurationSection; + +public interface CacheInterface { + + public static ConfigurationSection worlds = perworld.main.MainPlugin.worlds; + public static ConfigurationSection players = perworld.main.MainPlugin.players; + + Object generateElement(String string); + + void putCache(String string); + + void initCache(); + +} diff --git a/src/tbmc/perworld/cache/CacheRequestHandler.java b/src/perworld/cache/CacheRequestHandler.java similarity index 60% rename from src/tbmc/perworld/cache/CacheRequestHandler.java rename to src/perworld/cache/CacheRequestHandler.java index 42d11d9..a391089 100644 --- a/src/tbmc/perworld/cache/CacheRequestHandler.java +++ b/src/perworld/cache/CacheRequestHandler.java @@ -1,4 +1,4 @@ -package tbmc.perworld.cache; +package perworld.cache; public class CacheRequestHandler { diff --git a/src/tbmc/perworld/cache/player/GameMode.java b/src/perworld/cache/player/GameMode.java similarity index 75% rename from src/tbmc/perworld/cache/player/GameMode.java rename to src/perworld/cache/player/GameMode.java index 7f322e4..1103509 100644 --- a/src/tbmc/perworld/cache/player/GameMode.java +++ b/src/perworld/cache/player/GameMode.java @@ -1,4 +1,4 @@ -package tbmc.perworld.cache.player; +package perworld.cache.player; import java.util.HashMap; diff --git a/src/perworld/cache/player/Name.java b/src/perworld/cache/player/Name.java new file mode 100644 index 0000000..7276dbc --- /dev/null +++ b/src/perworld/cache/player/Name.java @@ -0,0 +1,6 @@ +package perworld.cache.player; + +public class Name { + + +} diff --git a/src/tbmc/perworld/cache/world/ShareSettings.java b/src/perworld/cache/world/ShareSettings.java similarity index 97% rename from src/tbmc/perworld/cache/world/ShareSettings.java rename to src/perworld/cache/world/ShareSettings.java index 9d0768e..2b93df5 100644 --- a/src/tbmc/perworld/cache/world/ShareSettings.java +++ b/src/perworld/cache/world/ShareSettings.java @@ -1,8 +1,8 @@ -package tbmc.perworld.cache.world; +package perworld.cache.world; import java.util.HashMap; -import tbmc.perworld.cache.CacheInterface; +import perworld.cache.CacheInterface; public class ShareSettings implements CacheInterface { diff --git a/src/tbmc/perworld/main/CustomConfigClass.java b/src/perworld/main/CustomConfigClass.java similarity index 96% rename from src/tbmc/perworld/main/CustomConfigClass.java rename to src/perworld/main/CustomConfigClass.java index 5888201..b3a072e 100644 --- a/src/tbmc/perworld/main/CustomConfigClass.java +++ b/src/perworld/main/CustomConfigClass.java @@ -1,4 +1,4 @@ -package tbmc.perworld.main; +package perworld.main; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/tbmc/perworld/main/ListenerPlayerJoin.java b/src/perworld/main/ListenerPlayerJoin.java similarity index 93% rename from src/tbmc/perworld/main/ListenerPlayerJoin.java rename to src/perworld/main/ListenerPlayerJoin.java index 964c424..ba1c7cd 100644 --- a/src/tbmc/perworld/main/ListenerPlayerJoin.java +++ b/src/perworld/main/ListenerPlayerJoin.java @@ -1,4 +1,4 @@ -package tbmc.perworld.main; +package perworld.main; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/tbmc/perworld/main/ListenerPlayerWorldChange.java b/src/perworld/main/ListenerPlayerWorldChange.java similarity index 90% rename from src/tbmc/perworld/main/ListenerPlayerWorldChange.java rename to src/perworld/main/ListenerPlayerWorldChange.java index f523be8..ffb690c 100644 --- a/src/tbmc/perworld/main/ListenerPlayerWorldChange.java +++ b/src/perworld/main/ListenerPlayerWorldChange.java @@ -1,6 +1,6 @@ -package tbmc.perworld.main; +package perworld.main; -import static tbmc.perworld.main.MainPlugin.debugClock; +import static perworld.main.MainPlugin.debugClock; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/tbmc/perworld/main/MainPlugin.java b/src/perworld/main/MainPlugin.java similarity index 91% rename from src/tbmc/perworld/main/MainPlugin.java rename to src/perworld/main/MainPlugin.java index 7a6272b..7c60125 100644 --- a/src/tbmc/perworld/main/MainPlugin.java +++ b/src/perworld/main/MainPlugin.java @@ -1,4 +1,4 @@ -package tbmc.perworld.main; +package perworld.main; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -31,6 +31,6 @@ public class MainPlugin extends JavaPlugin { worlds = config.getConfigurationSection("worlds"); players = config.getConfigurationSection("players"); - new tbmc.perworld.cache.world.ShareSettings().initCache(); + new perworld.cache.world.ShareSettings().initCache(); } } \ No newline at end of file diff --git a/src/tbmc/perworld/main/PlayerUpdater.java b/src/perworld/main/PlayerUpdater.java similarity index 70% rename from src/tbmc/perworld/main/PlayerUpdater.java rename to src/perworld/main/PlayerUpdater.java index 875f344..c65e61d 100644 --- a/src/tbmc/perworld/main/PlayerUpdater.java +++ b/src/perworld/main/PlayerUpdater.java @@ -1,4 +1,4 @@ -package tbmc.perworld.main; +package perworld.main; import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; import org.bukkit.entity.Player; @@ -7,10 +7,10 @@ import net.minecraft.server.v1_10_R1.IInventory; import java.util.stream.Collectors; -import static tbmc.perworld.cache.world.ShareSettings.compare; -import static tbmc.perworld.main.MainPlugin.debugClock; -import static tbmc.perworld.main.MainPlugin.plugin; -import static tbmc.perworld.main.MainPlugin.config; +import static perworld.cache.world.ShareSettings.compare; +import static perworld.main.MainPlugin.config; +import static perworld.main.MainPlugin.debugClock; +import static perworld.main.MainPlugin.plugin; public class PlayerUpdater { @@ -57,8 +57,8 @@ public class PlayerUpdater { updatePlayerData(values, player); player.sendMessage("...done, " + (System.currentTimeMillis() - debugClock) + " ms"); - new tbmc.perworld.cache.world.ShareSettings().initCache(); - player.sendMessage(tbmc.perworld.cache.world.ShareSettings.cache.keySet().stream().collect(Collectors.joining(","))); + new perworld.cache.world.ShareSettings().initCache(); + player.sendMessage(perworld.cache.world.ShareSettings.cache.keySet().stream().collect(Collectors.joining(","))); } @@ -66,7 +66,7 @@ public class PlayerUpdater { public static void updateLocation(Values values, Player player){ config.set( values.pFrom + ".location", - tbmc.perworld.serializers.location.serialize(player.getLocation()) + perworld.serializers.location.serialize(player.getLocation()) ); plugin.saveConfig(); /* players are not automatically moved to their stored location, @@ -78,18 +78,18 @@ public class PlayerUpdater { //UPDATE INVENTORIES public static void updateInventories(Values values, Player player){ IInventory inventory = ((CraftInventory) player.getInventory()).getInventory(); - config.set(values.pFrom + ".inventory", tbmc.perworld.serializers.inventory.serialize(inventory)); + config.set(values.pFrom + ".inventory", perworld.serializers.inventory.serialize(inventory)); plugin.saveConfig(); if (!values.shareinv) - tbmc.perworld.serializers.inventory.setFromSerialized( + perworld.serializers.inventory.setFromSerialized( inventory, config.getString(values.pTo + ".inventory") ); IInventory enderchest = ((CraftInventory) player.getEnderChest()).getInventory(); - config.set(values.pFrom + ".enderchest", tbmc.perworld.serializers.inventory.serialize(enderchest)); + config.set(values.pFrom + ".enderchest", perworld.serializers.inventory.serialize(enderchest)); plugin.saveConfig(); if (!values.shareinv) - tbmc.perworld.serializers.inventory.setFromSerialized( + perworld.serializers.inventory.setFromSerialized( enderchest, config.getString(values.pTo + ".enderchest") ); } @@ -97,10 +97,10 @@ public class PlayerUpdater { //UPDATE PLAYERDATA public static void updatePlayerData(Values values, Player player){ - config.set(values.pFrom + ".playerdata", tbmc.perworld.serializers.playerdata.serialize(player)); + config.set(values.pFrom + ".playerdata", perworld.serializers.playerdata.serialize(player)); plugin.saveConfig(); if (!values.sharedata) - tbmc.perworld.serializers.playerdata.setFromSerialized( + perworld.serializers.playerdata.setFromSerialized( player, config.getString(values.pTo + ".playerdata") ); } diff --git a/src/tbmc/perworld/main/SerializerOld.java b/src/perworld/main/SerializerOld.java similarity index 99% rename from src/tbmc/perworld/main/SerializerOld.java rename to src/perworld/main/SerializerOld.java index 9909823..a0a1a96 100644 --- a/src/tbmc/perworld/main/SerializerOld.java +++ b/src/perworld/main/SerializerOld.java @@ -1,4 +1,4 @@ -package tbmc.perworld.main; +package perworld.main; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/tbmc/perworld/serializers/inventory.java b/src/perworld/serializers/inventory.java similarity index 98% rename from src/tbmc/perworld/serializers/inventory.java rename to src/perworld/serializers/inventory.java index 63ff553..88dc290 100644 --- a/src/tbmc/perworld/serializers/inventory.java +++ b/src/perworld/serializers/inventory.java @@ -1,4 +1,4 @@ -package tbmc.perworld.serializers; +package perworld.serializers; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/tbmc/perworld/serializers/location.java b/src/perworld/serializers/location.java similarity index 94% rename from src/tbmc/perworld/serializers/location.java rename to src/perworld/serializers/location.java index 499e738..8dac0e9 100644 --- a/src/tbmc/perworld/serializers/location.java +++ b/src/perworld/serializers/location.java @@ -1,4 +1,4 @@ -package tbmc.perworld.serializers; +package perworld.serializers; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/tbmc/perworld/serializers/playerdata.java b/src/perworld/serializers/playerdata.java similarity index 98% rename from src/tbmc/perworld/serializers/playerdata.java rename to src/perworld/serializers/playerdata.java index 57343c0..c3943ca 100644 --- a/src/tbmc/perworld/serializers/playerdata.java +++ b/src/perworld/serializers/playerdata.java @@ -1,4 +1,4 @@ -package tbmc.perworld.serializers; +package perworld.serializers; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/src/tbmc/perworld/cache/CacheInterface.java b/src/tbmc/perworld/cache/CacheInterface.java deleted file mode 100644 index a94b808..0000000 --- a/src/tbmc/perworld/cache/CacheInterface.java +++ /dev/null @@ -1,16 +0,0 @@ -package tbmc.perworld.cache; - -import org.bukkit.configuration.ConfigurationSection; - -public interface CacheInterface { - - public static ConfigurationSection worlds = tbmc.perworld.main.MainPlugin.worlds; - public static ConfigurationSection players = tbmc.perworld.main.MainPlugin.players; - - Object generateElement(String string); - - void putCache(String string); - - void initCache(); - -} diff --git a/src/tbmc/perworld/cache/player/Name.java b/src/tbmc/perworld/cache/player/Name.java deleted file mode 100644 index 8528014..0000000 --- a/src/tbmc/perworld/cache/player/Name.java +++ /dev/null @@ -1,6 +0,0 @@ -package tbmc.perworld.cache.player; - -public class Name { - - -}