From 6ceb5e1210afcc1262b46bbc0be2243fca24761e Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 5 Nov 2016 15:00:29 -0400 Subject: [PATCH 1/4] next have to do playerdata serializing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit not sure if there’s stuff i was in the middle of changing, there might be weird shit anomalies or there --- .DS_Store | Bin 6148 -> 6148 bytes plugin.yml | 4 +- src/.DS_Store | Bin 6148 -> 6148 bytes src/cache/CacheInterface.java | 16 +++ src/cache/CacheRequestHandler.java | 7 ++ src/cache/player/GameMode.java | 10 ++ src/cache/player/Name.java | 6 ++ src/cache/world/ShareSettings.java | 100 ++++++++++++++++++ src/main/ListenerPlayerJoin.java | 21 ++++ src/main/ListenerPlayerWorldChange.java | 32 ++++++ src/main/MainPlugin.java | 74 +++++-------- ...dChangeManager.java => PlayerUpdater.java} | 77 ++++---------- src/main/WorldChangeListener.java | 39 ------- src/serializers/location.java | 6 +- 14 files changed, 242 insertions(+), 150 deletions(-) create mode 100644 src/cache/CacheInterface.java create mode 100644 src/cache/CacheRequestHandler.java create mode 100644 src/cache/player/GameMode.java create mode 100644 src/cache/player/Name.java create mode 100644 src/cache/world/ShareSettings.java create mode 100644 src/main/ListenerPlayerJoin.java create mode 100644 src/main/ListenerPlayerWorldChange.java rename src/main/{WorldChangeManager.java => PlayerUpdater.java} (54%) delete mode 100644 src/main/WorldChangeListener.java diff --git a/.DS_Store b/.DS_Store index 97754fd81ef6b21bb96b88ae44f73a9ce65327fb..5b749f68749e8da6b6d80ac8bc6e022e1a430fc6 100644 GIT binary patch delta 331 zcmZoMXfc=|#>B!kF;Q%yo+2af#(>?7ixZfc7bIDlaZb%E?b+U|{%}RFIQd zTw-8wlaYy;g_Vt+gOiIJ1O)`SVuLgC%Y#c2OG=BK5{sh2yv&r;Bq%!|u_Ob=4$05Y zfwL2n!ZK6K;{`;V^Ycm)GxJi5khI2xXV&MXAvkp;C~ixw|gx@`H1!$*O>0|G`y2+bf2r5PC5A*^GYpD>9qZD!}-=Ku!P=0N7} V%#-;=965j*m_RBvM~JLp1^^DVUta(K delta 67 zcmZoMXfc=|#>B)qF;Q%yo+2a9#(>?7j69QhSRQTu%gV*Hv4Ed>Gdl-A2T;joL5}at Vlles)IT(O|k%56_bA-qmW&l)E57Gbt diff --git a/plugin.yml b/plugin.yml index 25e5172..f4a3f8a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,3 +1,5 @@ main: main.MainPlugin version: 1.0.0 - name: PerWorldInventories \ No newline at end of file + name: PerWorldInventories + softdepend: + [Multiverse-Core] \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store index 4e5679eae8c9aef33e490e016ef93edb83223ffa..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 100644 GIT binary patch delta 71 zcmZoMXfc=|&Zs&uQEZ}~A_oHyFfuR*Y-VI+W1lR*xN0*yhX4noDvEWCEI|0K^GE3 cache; +} diff --git a/src/cache/player/Name.java b/src/cache/player/Name.java new file mode 100644 index 0000000..66a9b7b --- /dev/null +++ b/src/cache/player/Name.java @@ -0,0 +1,6 @@ +package cache.player; + +public class Name { + + +} diff --git a/src/cache/world/ShareSettings.java b/src/cache/world/ShareSettings.java new file mode 100644 index 0000000..bd2e2ab --- /dev/null +++ b/src/cache/world/ShareSettings.java @@ -0,0 +1,100 @@ +package cache.world; + +import java.util.HashMap; + +import cache.CacheInterface; + +public class ShareSettings implements CacheInterface { + + + /* ConfigurationSection "worlds" is a static import from main.MainPlugin.java, + * inherited from CacheInterface. + * + * It points to the section found at config.getConfigurationSection("worlds") + * and contains all world keys, child keys, and their values + * + * this is a static field backed by the actual contents of config.yml + */ + + + + + + //CACHE ELEMENT + public class E { + /* the optional share type (in or out) specifies that the world + * shares with its group in only one traffic direction. + */ + String group; + int t; + public E(String group, int type){ + this.group = group; + this.t = type;//0-default, 1-in, 2-out + } + } + + + //CACHE + public static volatile HashMap cache = new HashMap(); + /* this stores the share settings for each world + * in an easily-parsed format, mapping each world to + * an array e[] of two cache elements (inv and data) + */ + + + + + + //GENERATE ELEMENT (FROM CONFIG) + public E[] generateElement(String world){ + return new E[] + { + new E( + worlds.getString(world + ".share.inventory.group"), + worlds.getInt(world + ".share.inventory.type", 0) + ), + new E( + worlds.getString(world + ".share.playerdata.group"), + worlds.getInt(world + ".share.playerdata.type", 0) + ) + }; + } + + + //PUT CACHE + public void putCache(String world){ + E[] element = generateElement(world); + if ((element[0].group != null || element[1].group != null)) cache.put(world, element); + } + + + //INIT CACHE ( forEach -> putCache() ) + public void initCache(){ + worlds.getKeys(false).forEach(s -> { putCache(s); }); + } + + + + + + //COMPARE SETTINGS + public static boolean[] compare (String worldTo, String worldFrom) { + E[][] params = new E[][] { cache.get(worldTo), cache.get(worldFrom) }; + return params[0] == null || params [1] == null ? + new boolean[] {false, false} : + new boolean[] + { + params[0][0] == null || params[1][0] == null ? false : + + params[0][0].group == params[1][0].group //inv + && params[0][0].t == 0 ? true : params[0][0].t == 1 + && params[1][0].t == 0 ? true : params[1][0].t == 2 + , + params[0][1] == null || params[1][1] == null ? false : + + params[0][1].group == params[1][1].group //data + && params[0][1].t == 0 ? true : params[0][1].t == 1 + && params[1][1].t == 0 ? true : params[1][1].t == 2 + }; + } +} diff --git a/src/main/ListenerPlayerJoin.java b/src/main/ListenerPlayerJoin.java new file mode 100644 index 0000000..34703c1 --- /dev/null +++ b/src/main/ListenerPlayerJoin.java @@ -0,0 +1,21 @@ +package main; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +public class ListenerPlayerJoin implements Listener { + + MainPlugin plugin; + public ListenerPlayerJoin(MainPlugin plugin){ + this.plugin = plugin; + } + + + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerJoin(PlayerJoinEvent event){ + + } + +} diff --git a/src/main/ListenerPlayerWorldChange.java b/src/main/ListenerPlayerWorldChange.java new file mode 100644 index 0000000..25c027d --- /dev/null +++ b/src/main/ListenerPlayerWorldChange.java @@ -0,0 +1,32 @@ +package main; + +import static main.MainPlugin.debugClock; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerChangedWorldEvent; + +public class ListenerPlayerWorldChange implements Listener { + + MainPlugin plugin; + public ListenerPlayerWorldChange(MainPlugin plugin){ + this.plugin = plugin; + + } + + + @EventHandler(priority = EventPriority.MONITOR) + public void onWorldChange(PlayerChangedWorldEvent event){ + + debugClock = System.currentTimeMillis(); + + Player player = event.getPlayer(); player.sendMessage("updating... "); + String gamemode; + String worldTo = player.getWorld().getName(); + String worldFrom = event.getFrom().getName(); + + PlayerUpdater.update(player, worldTo, worldFrom); + } +} diff --git a/src/main/MainPlugin.java b/src/main/MainPlugin.java index 3c83ac0..06c3486 100644 --- a/src/main/MainPlugin.java +++ b/src/main/MainPlugin.java @@ -1,59 +1,35 @@ package main; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.plugin.java.JavaPlugin; public class MainPlugin extends JavaPlugin { - + + + public static MainPlugin plugin; + public static volatile FileConfiguration config; + + public static volatile ConfigurationSection worlds; + public static volatile ConfigurationSection players; + public static long debugClock; + + public void onEnable(){ - //getServer().getPluginManager().registerEvents(new WorldLoadListener(this), this); - getServer().getPluginManager().registerEvents(new WorldChangeListener(this), this); - MainPlugin.getPlugin(this.getClass()).getServer().getListeningPluginChannels(); - + getServer().getPluginManager().registerEvents(new ListenerPlayerJoin(this), this); + getServer().getPluginManager().registerEvents(new ListenerPlayerWorldChange(this), this); saveDefaultConfig(); - WorldChangeManager.init(this); - //BukkitTask task = new initWorldSettings().runTaskLater(this, 20); - } -} -/* - public void initWorldSettings(){ - Bukkit.getServer().getWorlds() - .stream() - .forEach(s -> { - FileConfiguration config = getConfig(); - String name = s.getName(); - - if (config.get(name + ".settings.shareinvgroup") == null) - config.set(name + ".settings.shareinvgroup", name); - - if (config.get(name + ".settings.sharedatagroup") == null) - config.set(name + ".settings.sharedatagroup", name); - - }); + + plugin = this; + config = getConfig(); + worlds = config.getConfigurationSection("worlds"); + players = config.getConfigurationSection("players"); + + if (!config.contains("worlds")) config.createSection("worlds"); + if (!config.contains("players")) config.createSection("players"); saveConfig(); + + new cache.world.ShareSettings().initCache(); } -} - - private void createConfig(){ - try { - - - if (!getDataFolder().exists()) - getDataFolder().mkdirs(); - - - File file = new File(getDataFolder(), "config.yml"); - - if (!file.exists()){ - getLogger().info("Config.yml not found, creating!"); - saveDefaultConfig(); - }else - getLogger().info("Config.yml found, loading!"); - - - }catch (Exception e) { - e.printStackTrace(); - } - } - -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/WorldChangeManager.java b/src/main/PlayerUpdater.java similarity index 54% rename from src/main/WorldChangeManager.java rename to src/main/PlayerUpdater.java index d531d7f..2e46790 100644 --- a/src/main/WorldChangeManager.java +++ b/src/main/PlayerUpdater.java @@ -1,65 +1,19 @@ package main; -import java.util.Arrays; - -import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; import org.bukkit.entity.Player; import net.minecraft.server.v1_10_R1.IInventory; -public class WorldChangeManager { - - private static MainPlugin plugin; - private static FileConfiguration config; - public static void init(MainPlugin plugin){ //onEnable() - WorldChangeManager.plugin = plugin; - WorldChangeManager.config = plugin.getConfig(); - } - - - //EVALUATE SHARE SETTINGS - public static boolean[] compare (String worldTo, String worldFrom) { - boolean[] result = new boolean[] {false,false}; - String[][] params = - (String[][]) Arrays.asList - (new String[] { - (String) config.get(worldTo + ".settings.shareinvgroup"), - (String) config.get(worldFrom + ".settings.shareinvgroup"), - (String) config.get(worldTo + ".settings.sharedatagroup"), - (String) config.get(worldFrom + ".settings.sharedatagroup") - }) - .stream() - .map(s -> (String[]) s - .trim() - .replaceAll("( )", "") - .toLowerCase() - .split("\\*")) - .toArray(String[][]::new); - - /* Each world has two sharing settings: for inventory sharing, - * and for playerdata sharing. Each setting has two parameters: - * the sharegroup flag, which labels a group of sharing worlds, - * and an optional suffix, *in or *out, specifying that the world - * shares with its group in only one traffic direction - */ - - if ( - params[0][0].equals(params[1][0])//inv - && params[0].length > 1 ? params[0][1].equals("in") : true - && params[1].length > 1 ? params[1][1].equals("out") : true - ) - result[0] = true; - - if ( - params[2][0].equals(params[3][0])//data - && params[2].length > 1 ? params[2][1].equals("in") : true - && params[3].length > 1 ? params[3][1].equals("out") : true - ) - result[1] = true; - - return result; - } +import static cache.world.ShareSettings.compare; +import static main.MainPlugin.plugin; + +import java.util.stream.Collectors; + +import static main.MainPlugin.config; +import static main.MainPlugin.debugClock; + +public class PlayerUpdater { //VALUES USED BY THE UPDATE METHODS @@ -77,15 +31,18 @@ public class WorldChangeManager { this.uuid = player.getUniqueId().toString(); this.worldTo = worldTo; this.worldFrom = worldFrom; - this.pTo = worldTo + ".players." + uuid; - this.pFrom = worldFrom + ".players." + uuid; + this.pTo = "worlds." + worldTo + ".players." + uuid; + this.pFrom = "worlds." + worldFrom + ".players." + uuid; - boolean[] compare = compare(worldTo,worldFrom); + boolean[] compare = compare(worldTo, worldFrom); + //compare() is a static import from world.ShareSettings.java this.shareinv = compare[0]; this.sharedata = compare[1]; } } + + //MAIN UPDATE METHOD @@ -96,6 +53,10 @@ public class WorldChangeManager { updateLocation(values, player); updateInventories(values, player); //updatePlayerData(values, player); + + player.sendMessage("...done, " + (System.currentTimeMillis() - debugClock) + " ms"); + new cache.world.ShareSettings().initCache(); + player.sendMessage(cache.world.ShareSettings.cache.keySet().stream().collect(Collectors.joining(","))); } diff --git a/src/main/WorldChangeListener.java b/src/main/WorldChangeListener.java deleted file mode 100644 index 7763228..0000000 --- a/src/main/WorldChangeListener.java +++ /dev/null @@ -1,39 +0,0 @@ -package main; - -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerChangedWorldEvent; - -public class WorldChangeListener implements Listener { - - private static MainPlugin plugin; - private static FileConfiguration config; - public WorldChangeListener(MainPlugin plugin){ - WorldChangeListener.plugin = plugin; - WorldChangeListener.config = plugin.getConfig(); - } - - - @EventHandler(priority = EventPriority.MONITOR) - public void onWorldChangeListener(PlayerChangedWorldEvent event){ - Player player = event.getPlayer(); - String worldTo = player.getWorld().getName(); - String worldFrom = event.getFrom().getName(); - - initWorldSettings(worldTo); - initWorldSettings(worldFrom); - WorldChangeManager.update(player,worldTo, worldFrom); - } - - - public static void initWorldSettings(String world){ - if (config.get(world + ".settings.shareinvgroup") == null) - config.set(world + ".settings.shareinvgroup", world); - if (config.get(world + ".settings.sharedatagroup") == null) - config.set(world + ".settings.sharedatagroup", world); - plugin.saveConfig(); - } -} diff --git a/src/serializers/location.java b/src/serializers/location.java index 7248f84..234d5f9 100644 --- a/src/serializers/location.java +++ b/src/serializers/location.java @@ -10,10 +10,10 @@ public class location { public static String serialize(Location location){ return location.getBlockX() + "," - + location.getBlockZ() + "," + location.getBlockY() + "," - + location.getPitch() + "," - + location.getYaw(); + + location.getBlockZ() + "," + + location.getYaw() + "," + + location.getPitch(); } From ef7d2bf12f8b515f351c19a9ffe6f828d6e91a0d Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 5 Nov 2016 20:51:02 +0100 Subject: [PATCH 2/4] Renamed things here as well to fix conflicts --- src/{ => buttondevteam/perworld}/cache/CacheInterface.java | 0 src/{ => buttondevteam/perworld}/cache/CacheRequestHandler.java | 0 src/{ => buttondevteam/perworld}/cache/player/GameMode.java | 0 src/{ => buttondevteam/perworld}/cache/player/Name.java | 0 src/{ => buttondevteam/perworld}/cache/world/ShareSettings.java | 0 src/{ => buttondevteam/perworld}/main/ListenerPlayerJoin.java | 0 .../perworld}/main/ListenerPlayerWorldChange.java | 0 src/{ => buttondevteam/perworld}/main/MainPlugin.java | 0 src/{ => buttondevteam/perworld}/main/PlayerUpdater.java | 0 src/{ => buttondevteam/perworld}/main/SerializerOld.java | 0 src/{ => buttondevteam/perworld}/serializers/inventory.java | 0 src/{ => buttondevteam/perworld}/serializers/location.java | 0 src/{ => buttondevteam/perworld}/serializers/playerdata.java | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => buttondevteam/perworld}/cache/CacheInterface.java (100%) rename src/{ => buttondevteam/perworld}/cache/CacheRequestHandler.java (100%) rename src/{ => buttondevteam/perworld}/cache/player/GameMode.java (100%) rename src/{ => buttondevteam/perworld}/cache/player/Name.java (100%) rename src/{ => buttondevteam/perworld}/cache/world/ShareSettings.java (100%) rename src/{ => buttondevteam/perworld}/main/ListenerPlayerJoin.java (100%) rename src/{ => buttondevteam/perworld}/main/ListenerPlayerWorldChange.java (100%) rename src/{ => buttondevteam/perworld}/main/MainPlugin.java (100%) rename src/{ => buttondevteam/perworld}/main/PlayerUpdater.java (100%) rename src/{ => buttondevteam/perworld}/main/SerializerOld.java (100%) rename src/{ => buttondevteam/perworld}/serializers/inventory.java (100%) rename src/{ => buttondevteam/perworld}/serializers/location.java (100%) rename src/{ => buttondevteam/perworld}/serializers/playerdata.java (100%) diff --git a/src/cache/CacheInterface.java b/src/buttondevteam/perworld/cache/CacheInterface.java similarity index 100% rename from src/cache/CacheInterface.java rename to src/buttondevteam/perworld/cache/CacheInterface.java diff --git a/src/cache/CacheRequestHandler.java b/src/buttondevteam/perworld/cache/CacheRequestHandler.java similarity index 100% rename from src/cache/CacheRequestHandler.java rename to src/buttondevteam/perworld/cache/CacheRequestHandler.java diff --git a/src/cache/player/GameMode.java b/src/buttondevteam/perworld/cache/player/GameMode.java similarity index 100% rename from src/cache/player/GameMode.java rename to src/buttondevteam/perworld/cache/player/GameMode.java diff --git a/src/cache/player/Name.java b/src/buttondevteam/perworld/cache/player/Name.java similarity index 100% rename from src/cache/player/Name.java rename to src/buttondevteam/perworld/cache/player/Name.java diff --git a/src/cache/world/ShareSettings.java b/src/buttondevteam/perworld/cache/world/ShareSettings.java similarity index 100% rename from src/cache/world/ShareSettings.java rename to src/buttondevteam/perworld/cache/world/ShareSettings.java diff --git a/src/main/ListenerPlayerJoin.java b/src/buttondevteam/perworld/main/ListenerPlayerJoin.java similarity index 100% rename from src/main/ListenerPlayerJoin.java rename to src/buttondevteam/perworld/main/ListenerPlayerJoin.java diff --git a/src/main/ListenerPlayerWorldChange.java b/src/buttondevteam/perworld/main/ListenerPlayerWorldChange.java similarity index 100% rename from src/main/ListenerPlayerWorldChange.java rename to src/buttondevteam/perworld/main/ListenerPlayerWorldChange.java diff --git a/src/main/MainPlugin.java b/src/buttondevteam/perworld/main/MainPlugin.java similarity index 100% rename from src/main/MainPlugin.java rename to src/buttondevteam/perworld/main/MainPlugin.java diff --git a/src/main/PlayerUpdater.java b/src/buttondevteam/perworld/main/PlayerUpdater.java similarity index 100% rename from src/main/PlayerUpdater.java rename to src/buttondevteam/perworld/main/PlayerUpdater.java diff --git a/src/main/SerializerOld.java b/src/buttondevteam/perworld/main/SerializerOld.java similarity index 100% rename from src/main/SerializerOld.java rename to src/buttondevteam/perworld/main/SerializerOld.java diff --git a/src/serializers/inventory.java b/src/buttondevteam/perworld/serializers/inventory.java similarity index 100% rename from src/serializers/inventory.java rename to src/buttondevteam/perworld/serializers/inventory.java diff --git a/src/serializers/location.java b/src/buttondevteam/perworld/serializers/location.java similarity index 100% rename from src/serializers/location.java rename to src/buttondevteam/perworld/serializers/location.java diff --git a/src/serializers/playerdata.java b/src/buttondevteam/perworld/serializers/playerdata.java similarity index 100% rename from src/serializers/playerdata.java rename to src/buttondevteam/perworld/serializers/playerdata.java From ae11acc4bf1a2f50b65cfb47bbaca7c46b09c109 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 5 Nov 2016 20:51:18 +0100 Subject: [PATCH 3/4] Renamed things here as well to fix conflicts --- .gitignore | 1 + .../perworld/cache/CacheInterface.java | 6 ++--- .../perworld/cache/CacheRequestHandler.java | 2 +- .../perworld/cache/player/GameMode.java | 2 +- .../perworld/cache/player/Name.java | 2 +- .../perworld/cache/world/ShareSettings.java | 4 +-- .../perworld/main/ListenerPlayerJoin.java | 2 +- .../main/ListenerPlayerWorldChange.java | 4 +-- .../perworld/main/MainPlugin.java | 4 +-- .../perworld/main/PlayerUpdater.java | 27 +++++++++---------- .../perworld/main/SerializerOld.java | 2 +- .../perworld/serializers/inventory.java | 2 +- .../perworld/serializers/location.java | 2 +- .../perworld/serializers/playerdata.java | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 7d05c00..afd0d7f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* /bin/ +/target/ diff --git a/src/buttondevteam/perworld/cache/CacheInterface.java b/src/buttondevteam/perworld/cache/CacheInterface.java index 10146c4..d7a390b 100644 --- a/src/buttondevteam/perworld/cache/CacheInterface.java +++ b/src/buttondevteam/perworld/cache/CacheInterface.java @@ -1,11 +1,11 @@ -package cache; +package buttondevteam.perworld.cache; import org.bukkit.configuration.ConfigurationSection; public interface CacheInterface { - public static ConfigurationSection worlds = main.MainPlugin.worlds; - public static ConfigurationSection players = main.MainPlugin.players; + public static ConfigurationSection worlds = buttondevteam.perworld.main.MainPlugin.worlds; + public static ConfigurationSection players = buttondevteam.perworld.main.MainPlugin.players; Object generateElement(String string); diff --git a/src/buttondevteam/perworld/cache/CacheRequestHandler.java b/src/buttondevteam/perworld/cache/CacheRequestHandler.java index 4b5c9a7..0983930 100644 --- a/src/buttondevteam/perworld/cache/CacheRequestHandler.java +++ b/src/buttondevteam/perworld/cache/CacheRequestHandler.java @@ -1,4 +1,4 @@ -package cache; +package buttondevteam.perworld.cache; public class CacheRequestHandler { diff --git a/src/buttondevteam/perworld/cache/player/GameMode.java b/src/buttondevteam/perworld/cache/player/GameMode.java index a19536f..7f3f86c 100644 --- a/src/buttondevteam/perworld/cache/player/GameMode.java +++ b/src/buttondevteam/perworld/cache/player/GameMode.java @@ -1,4 +1,4 @@ -package cache.player; +package buttondevteam.perworld.cache.player; import java.util.HashMap; diff --git a/src/buttondevteam/perworld/cache/player/Name.java b/src/buttondevteam/perworld/cache/player/Name.java index 66a9b7b..7400736 100644 --- a/src/buttondevteam/perworld/cache/player/Name.java +++ b/src/buttondevteam/perworld/cache/player/Name.java @@ -1,4 +1,4 @@ -package cache.player; +package buttondevteam.perworld.cache.player; public class Name { diff --git a/src/buttondevteam/perworld/cache/world/ShareSettings.java b/src/buttondevteam/perworld/cache/world/ShareSettings.java index bd2e2ab..8b7b8d8 100644 --- a/src/buttondevteam/perworld/cache/world/ShareSettings.java +++ b/src/buttondevteam/perworld/cache/world/ShareSettings.java @@ -1,8 +1,8 @@ -package cache.world; +package buttondevteam.perworld.cache.world; import java.util.HashMap; -import cache.CacheInterface; +import buttondevteam.perworld.cache.CacheInterface; public class ShareSettings implements CacheInterface { diff --git a/src/buttondevteam/perworld/main/ListenerPlayerJoin.java b/src/buttondevteam/perworld/main/ListenerPlayerJoin.java index 34703c1..d0b81d2 100644 --- a/src/buttondevteam/perworld/main/ListenerPlayerJoin.java +++ b/src/buttondevteam/perworld/main/ListenerPlayerJoin.java @@ -1,4 +1,4 @@ -package main; +package buttondevteam.perworld.main; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/buttondevteam/perworld/main/ListenerPlayerWorldChange.java b/src/buttondevteam/perworld/main/ListenerPlayerWorldChange.java index 25c027d..d3c6aa5 100644 --- a/src/buttondevteam/perworld/main/ListenerPlayerWorldChange.java +++ b/src/buttondevteam/perworld/main/ListenerPlayerWorldChange.java @@ -1,6 +1,6 @@ -package main; +package buttondevteam.perworld.main; -import static main.MainPlugin.debugClock; +import static buttondevteam.perworld.main.MainPlugin.debugClock; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/buttondevteam/perworld/main/MainPlugin.java b/src/buttondevteam/perworld/main/MainPlugin.java index 06c3486..ed1de28 100644 --- a/src/buttondevteam/perworld/main/MainPlugin.java +++ b/src/buttondevteam/perworld/main/MainPlugin.java @@ -1,4 +1,4 @@ -package main; +package buttondevteam.perworld.main; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -30,6 +30,6 @@ public class MainPlugin extends JavaPlugin { if (!config.contains("players")) config.createSection("players"); saveConfig(); - new cache.world.ShareSettings().initCache(); + new buttondevteam.perworld.cache.world.ShareSettings().initCache(); } } \ No newline at end of file diff --git a/src/buttondevteam/perworld/main/PlayerUpdater.java b/src/buttondevteam/perworld/main/PlayerUpdater.java index 2e46790..ea13d83 100644 --- a/src/buttondevteam/perworld/main/PlayerUpdater.java +++ b/src/buttondevteam/perworld/main/PlayerUpdater.java @@ -1,17 +1,16 @@ -package main; +package buttondevteam.perworld.main; import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; import org.bukkit.entity.Player; import net.minecraft.server.v1_10_R1.IInventory; -import static cache.world.ShareSettings.compare; -import static main.MainPlugin.plugin; - import java.util.stream.Collectors; -import static main.MainPlugin.config; -import static main.MainPlugin.debugClock; +import static buttondevteam.perworld.cache.world.ShareSettings.compare; +import static buttondevteam.perworld.main.MainPlugin.config; +import static buttondevteam.perworld.main.MainPlugin.debugClock; +import static buttondevteam.perworld.main.MainPlugin.plugin; public class PlayerUpdater { @@ -55,8 +54,8 @@ public class PlayerUpdater { //updatePlayerData(values, player); player.sendMessage("...done, " + (System.currentTimeMillis() - debugClock) + " ms"); - new cache.world.ShareSettings().initCache(); - player.sendMessage(cache.world.ShareSettings.cache.keySet().stream().collect(Collectors.joining(","))); + new buttondevteam.perworld.cache.world.ShareSettings().initCache(); + player.sendMessage(buttondevteam.perworld.cache.world.ShareSettings.cache.keySet().stream().collect(Collectors.joining(","))); } @@ -64,7 +63,7 @@ public class PlayerUpdater { public static void updateLocation(Values values, Player player){ config.set( values.pFrom + ".location", - serializers.location.serialize(player.getLocation()) + buttondevteam.perworld.serializers.location.serialize(player.getLocation()) ); plugin.saveConfig(); /* players are not automatically moved to their stored location, @@ -76,18 +75,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", serializers.inventory.serialize(inventory)); + config.set(values.pFrom + ".inventory", buttondevteam.perworld.serializers.inventory.serialize(inventory)); plugin.saveConfig(); if (!values.shareinv) - serializers.inventory.setFromSerialized( + buttondevteam.perworld.serializers.inventory.setFromSerialized( inventory, (String) config.get(values.pTo + ".inventory") ); IInventory enderchest = ((CraftInventory) player.getEnderChest()).getInventory(); - config.set(values.pFrom + ".enderchest", serializers.inventory.serialize(enderchest)); + config.set(values.pFrom + ".enderchest", buttondevteam.perworld.serializers.inventory.serialize(enderchest)); plugin.saveConfig(); if (!values.sharedata) - serializers.inventory.setFromSerialized( + buttondevteam.perworld.serializers.inventory.setFromSerialized( enderchest, (String) config.get(values.pTo + ".enderchest") ); } @@ -95,7 +94,7 @@ public class PlayerUpdater { //UPDATE PLAYERDATA public static void updatePlayerData(Values values, Player player){ - config.set(values.pFrom + ".playerdata", serializers.playerdata.serialize(player)); + config.set(values.pFrom + ".playerdata", buttondevteam.perworld.serializers.playerdata.serialize(player)); plugin.saveConfig(); if (!values.sharedata) ; diff --git a/src/buttondevteam/perworld/main/SerializerOld.java b/src/buttondevteam/perworld/main/SerializerOld.java index 77a1022..d31336a 100644 --- a/src/buttondevteam/perworld/main/SerializerOld.java +++ b/src/buttondevteam/perworld/main/SerializerOld.java @@ -1,4 +1,4 @@ -package main; +package buttondevteam.perworld.main; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/buttondevteam/perworld/serializers/inventory.java b/src/buttondevteam/perworld/serializers/inventory.java index 9610e51..d83a07e 100644 --- a/src/buttondevteam/perworld/serializers/inventory.java +++ b/src/buttondevteam/perworld/serializers/inventory.java @@ -1,4 +1,4 @@ -package serializers; +package buttondevteam.perworld.serializers; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/buttondevteam/perworld/serializers/location.java b/src/buttondevteam/perworld/serializers/location.java index 234d5f9..4b7788d 100644 --- a/src/buttondevteam/perworld/serializers/location.java +++ b/src/buttondevteam/perworld/serializers/location.java @@ -1,4 +1,4 @@ -package serializers; +package buttondevteam.perworld.serializers; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/buttondevteam/perworld/serializers/playerdata.java b/src/buttondevteam/perworld/serializers/playerdata.java index 73405ab..5056a25 100644 --- a/src/buttondevteam/perworld/serializers/playerdata.java +++ b/src/buttondevteam/perworld/serializers/playerdata.java @@ -1,4 +1,4 @@ -package serializers; +package buttondevteam.perworld.serializers; import java.util.Arrays; From c1a7aa87328f86fd184cac202176d70a19abe012 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 5 Nov 2016 21:47:21 +0100 Subject: [PATCH 4/4] Made progress on merge conflict --- .project | 8 +- LICENSE | 1348 ++++++++--------- plugin.yml | 2 +- pom.xml | 65 + .../perworld/main/MainPlugin.java | 8 +- .../perworld/main/WorldChangeListener.java | 39 + .../perworld/main/WorldChangeManager.java | 142 ++ 7 files changed, 934 insertions(+), 678 deletions(-) create mode 100644 pom.xml create mode 100644 src/buttondevteam/perworld/main/WorldChangeListener.java create mode 100644 src/buttondevteam/perworld/main/WorldChangeManager.java diff --git a/.project b/.project index 775687b..2607fa2 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - iieHardcoreWorld + PerWorldInventory @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/LICENSE b/LICENSE index 9cecc1d..c65825e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,674 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/plugin.yml b/plugin.yml index f4a3f8a..2ed8063 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,4 +1,4 @@ - main: main.MainPlugin + main: buttondevteam.perworld.main.MainPlugin version: 1.0.0 name: PerWorldInventories softdepend: diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..563b493 --- /dev/null +++ b/pom.xml @@ -0,0 +1,65 @@ + + 4.0.0 + com.github.TBMCPlugins + PerWorldInventory + master-SNAPSHOT + + src + + + src + + **/*.java + + + + . + + *.properties + *.yml + *.csv + *.txt + + true + + + + + maven-compiler-plugin + 3.5.1 + + + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io/ + + + + + org.spigotmc + spigot-api + 1.10-R0.1-SNAPSHOT + + + com.github.TBMCPlugins.ButtonCore + ButtonCore + master-SNAPSHOT + + + org.bukkit + craftbukkit + 1.10-R0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/src/buttondevteam/perworld/main/MainPlugin.java b/src/buttondevteam/perworld/main/MainPlugin.java index ed1de28..1afeb26 100644 --- a/src/buttondevteam/perworld/main/MainPlugin.java +++ b/src/buttondevteam/perworld/main/MainPlugin.java @@ -4,6 +4,8 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.plugin.java.JavaPlugin; +import buttondevteam.lib.TBMCCoreAPI; + public class MainPlugin extends JavaPlugin { @@ -17,8 +19,10 @@ public class MainPlugin extends JavaPlugin { public void onEnable(){ - getServer().getPluginManager().registerEvents(new ListenerPlayerJoin(this), this); - getServer().getPluginManager().registerEvents(new ListenerPlayerWorldChange(this), this); + //getServer().getPluginManager().registerEvents(new WorldLoadListener(this), this); + TBMCCoreAPI.RegisterEventsForExceptions(new WorldChangeListener(this), this); + TBMCCoreAPI.RegisterEventsForExceptions(new ListenerPlayerWorldChange(this), this); + saveDefaultConfig(); plugin = this; diff --git a/src/buttondevteam/perworld/main/WorldChangeListener.java b/src/buttondevteam/perworld/main/WorldChangeListener.java new file mode 100644 index 0000000..dfcc062 --- /dev/null +++ b/src/buttondevteam/perworld/main/WorldChangeListener.java @@ -0,0 +1,39 @@ +package buttondevteam.perworld.main; + +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerChangedWorldEvent; + +public class WorldChangeListener implements Listener { + + private static MainPlugin plugin; + private static FileConfiguration config; + public WorldChangeListener(MainPlugin plugin){ + WorldChangeListener.plugin = plugin; + WorldChangeListener.config = plugin.getConfig(); + } + + + @EventHandler(priority = EventPriority.MONITOR) + public void onWorldChangeListener(PlayerChangedWorldEvent event){ + Player player = event.getPlayer(); + String worldTo = player.getWorld().getName(); + String worldFrom = event.getFrom().getName(); + + initWorldSettings(worldTo); + initWorldSettings(worldFrom); + WorldChangeManager.update(player,worldTo, worldFrom); + } + + + public static void initWorldSettings(String world){ + if (config.get(world + ".settings.shareinvgroup") == null) + config.set(world + ".settings.shareinvgroup", world); + if (config.get(world + ".settings.sharedatagroup") == null) + config.set(world + ".settings.sharedatagroup", world); + plugin.saveConfig(); + } +} diff --git a/src/buttondevteam/perworld/main/WorldChangeManager.java b/src/buttondevteam/perworld/main/WorldChangeManager.java new file mode 100644 index 0000000..75ea4c4 --- /dev/null +++ b/src/buttondevteam/perworld/main/WorldChangeManager.java @@ -0,0 +1,142 @@ +package buttondevteam.perworld.main; + +import java.util.Arrays; + +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; +import org.bukkit.entity.Player; + +import net.minecraft.server.v1_10_R1.IInventory; + +public class WorldChangeManager { + + private static MainPlugin plugin; + private static FileConfiguration config; + public static void init(MainPlugin plugin){ //onEnable() + WorldChangeManager.plugin = plugin; + WorldChangeManager.config = plugin.getConfig(); + } + + + //EVALUATE SHARE SETTINGS + public static boolean[] compare (String worldTo, String worldFrom) { + boolean[] result = new boolean[] {false,false}; + String[][] params = + (String[][]) Arrays.asList + (new String[] { + (String) config.get(worldTo + ".settings.shareinvgroup"), + (String) config.get(worldFrom + ".settings.shareinvgroup"), + (String) config.get(worldTo + ".settings.sharedatagroup"), + (String) config.get(worldFrom + ".settings.sharedatagroup") + }) + .stream() + .map(s -> (String[]) s + .trim() + .replaceAll("( )", "") + .toLowerCase() + .split("\\*")) + .toArray(String[][]::new); + + /* Each world has two sharing settings: for inventory sharing, + * and for playerdata sharing. Each setting has two parameters: + * the sharegroup flag, which labels a group of sharing worlds, + * and an optional suffix, *in or *out, specifying that the world + * shares with its group in only one traffic direction + */ + + if ( + params[0][0].equals(params[1][0])//inv + && params[0].length > 1 ? params[0][1].equals("in") : true + && params[1].length > 1 ? params[1][1].equals("out") : true + ) + result[0] = true; + + if ( + params[2][0].equals(params[3][0])//data + && params[2].length > 1 ? params[2][1].equals("in") : true + && params[3].length > 1 ? params[3][1].equals("out") : true + ) + result[1] = true; + + return result; + } + + + //VALUES USED BY THE UPDATE METHODS + public static class Values { + public String uuid; + public String worldTo; + public String worldFrom; + public String pTo; + public String pFrom; + public boolean shareinv; + public boolean sharedata; + + public Values (Player player, String worldTo, String worldFrom){ + + this.uuid = player.getUniqueId().toString(); + this.worldTo = worldTo; + this.worldFrom = worldFrom; + this.pTo = worldTo + ".players." + uuid; + this.pFrom = worldFrom + ".players." + uuid; + + boolean[] compare = compare(worldTo,worldFrom); + + this.shareinv = compare[0]; + this.sharedata = compare[1]; + } + } + + + //MAIN UPDATE METHOD + public static void update(Player player, String worldTo, String worldFrom){ + + final Values values = new Values(player, worldTo, worldFrom); + + updateLocation(values, player); + updateInventories(values, player); + //updatePlayerData(values, player); + } + + + //UPDATE LOCATION + public static void updateLocation(Values values, Player player){ + config.set( + values.pFrom + ".location", + buttondevteam.perworld.serializers.location.serialize(player.getLocation()) + ); + plugin.saveConfig(); + /* players are not automatically moved to their stored location, + * this is done only on request, in a dedicated teleport method + */ + } + + + //UPDATE INVENTORIES + public static void updateInventories(Values values, Player player){ + IInventory inventory = ((CraftInventory) player.getInventory()).getInventory(); + config.set(values.pFrom + ".inventory", buttondevteam.perworld.serializers.inventory.serialize(inventory)); + plugin.saveConfig(); + if (!values.shareinv) + buttondevteam.perworld.serializers.inventory.setFromSerialized( + inventory, (String) config.get(values.pTo + ".inventory") + ); + + IInventory enderchest = ((CraftInventory) player.getEnderChest()).getInventory(); + config.set(values.pFrom + ".enderchest", buttondevteam.perworld.serializers.inventory.serialize(enderchest)); + plugin.saveConfig(); + if (!values.sharedata) + buttondevteam.perworld.serializers.inventory.setFromSerialized( + enderchest, (String) config.get(values.pTo + ".enderchest") + ); + } + + + //UPDATE PLAYERDATA + public static void updatePlayerData(Values values, Player player){ + config.set(values.pFrom + ".playerdata", buttondevteam.perworld.serializers.playerdata.serialize(player)); + plugin.saveConfig(); + if (!values.sharedata) + ; + } +}