diff --git a/README.MD b/README.MD index dcd7296..2014cf4 100644 --- a/README.MD +++ b/README.MD @@ -117,9 +117,9 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin. Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.11-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.11-R0.1-SNAPSHOT` -Compiling OpenInv for a specific version is very easy - just compile the correct module. +To compile for a specific version or set of versions, you'll need to use a profile. Provided profiles are `latest`, `modern` (versions 1.8+), and `all`. Select an existing profile using the `-P` argument (ex: `mvn clean package -am -P all`) or make your own. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html). -Compiling for a set of versions is slightly more complex. You'll need to use a profile for the versions you want to compile. Provided profiles are latest, modern (versions 1.8+), and all. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html). +The final file is target/OpenInv.jar ## License ``` diff --git a/api/pom.xml b/api/pom.xml new file mode 100644 index 0000000..1e84cc6 --- /dev/null +++ b/api/pom.xml @@ -0,0 +1,23 @@ + + 4.0.0 + + + com.lishid + openinvparent + 1.0-SNAPSHOT + + + openinvapi + OpenInvAPI + + + + org.bukkit + bukkit + 1.4.5-R1.0 + provided + + + + diff --git a/api/src/main/java/com/lishid/openinv/IOpenInv.java b/api/src/main/java/com/lishid/openinv/IOpenInv.java new file mode 100644 index 0000000..8eee839 --- /dev/null +++ b/api/src/main/java/com/lishid/openinv/IOpenInv.java @@ -0,0 +1,155 @@ +package com.lishid.openinv; + +import com.lishid.openinv.internal.IAnySilentContainer; +import com.lishid.openinv.internal.IInventoryAccess; +import com.lishid.openinv.internal.ISpecialEnderChest; +import com.lishid.openinv.internal.ISpecialPlayerInventory; + +import org.bukkit.OfflinePlayer; +import org.bukkit.entity.Player; + +/** + * Interface defining behavior for the OpenInv plugin. + * + * @author Jikoo + */ +public interface IOpenInv { + + + + /** + * Checks if the server version is supported by OpenInv. + * + * @return true if the server version is supported + */ + public boolean isSupportedVersion(); + + /** + * Gets the active IInventoryAccess implementation. May return null if the server version is + * unsupported. + * + * @return the IInventoryAccess + */ + public IInventoryAccess getInventoryAccess(); + + /** + * Gets the active ISilentContainer implementation. May return null if the server version is + * unsupported. + * + * @return the ISilentContainer + */ + public IAnySilentContainer getAnySilentContainer(); + + /** + * Gets an ISpecialPlayerInventory for the given Player. + * + * @param player the Player + * @param online true if the Player is currently online + * @return the ISpecialPlayerInventory + */ + public ISpecialPlayerInventory getInventory(Player player, boolean online); + + /** + * Gets an ISpecialEnderChest for the given Player. + * + * @param player the Player + * @param online true if the Player is currently online + * @return the ISpecialEnderChest + */ + public ISpecialEnderChest getEnderChest(Player player, boolean online); + + /** + * Forcibly unload a cached Player's data. + * + * @param player the OfflinePlayer to unload + */ + public void unload(OfflinePlayer player); + + /** + * Check the configuration value for whether or not OpenInv saves player data when unloading + * players. This is exclusively for users who do not allow editing of inventories, only viewing, + * and wish to prevent any possibility of bugs such as lishid#40. If true, OpenInv will not ever + * save any edits made to players. + * + * @return false unless configured otherwise + */ + public boolean disableSaving(); + + /** + * Check the configuration value for whether or not OpenInv displays a notification to the user + * when a container is activated with SilentChest. + * + * @return true unless configured otherwise + */ + public boolean notifySilentChest(); + + /** + * Check the configuration value for whether or not OpenInv displays a notification to the user + * when a container is activated with AnyChest. + * + * @return true unless configured otherwise + */ + public boolean notifyAnyChest(); + + /** + * Gets a player's SilentChest setting. + * + * @param player the OfflinePlayer + * @return true if SilentChest is enabled + */ + public boolean getPlayerSilentChestStatus(OfflinePlayer player); + + /** + * Sets a player's SilentChest setting. + * + * @param player the OfflinePlayer + * @param status the status + */ + public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status); + + /** + * Gets the provided player's AnyChest setting. + * + * @param player the OfflinePlayer + * @return true if AnyChest is enabled + */ + public boolean getPlayerAnyChestStatus(OfflinePlayer player); + + /** + * Sets a player's AnyChest setting. + * + * @param player the OfflinePlayer + * @param status the status + */ + public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status); + + /** + * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value + * returned to look up a Player will generally be much faster for later implementations. + * + * @param offline the OfflinePlayer + * @return the identifier + */ + public String getPlayerID(OfflinePlayer offline); + + /** + * Get an OfflinePlayer by name. + *

+ * Note: This method is potentially very heavily blocking. It should not ever be called on the + * main thread, and if it is, a stack trace will be displayed alerting server owners to the + * call. + * + * @param name the name of the Player + * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in + */ + public OfflinePlayer matchPlayer(String name); + + /** + * Load a Player from an OfflinePlayer. May return null under some circumstances. + * + * @param offline the OfflinePlayer to load a Player for + * @return the Player + */ + public Player loadPlayer(final OfflinePlayer offline); + +} diff --git a/internal/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java similarity index 100% rename from internal/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java rename to api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java diff --git a/internal/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java b/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java similarity index 100% rename from internal/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java rename to api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java diff --git a/internal/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java b/api/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java similarity index 100% rename from internal/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java rename to api/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java diff --git a/internal/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java b/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java similarity index 100% rename from internal/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java rename to api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java diff --git a/internal/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java b/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java similarity index 100% rename from internal/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java rename to api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java diff --git a/assembly/pom.xml b/assembly/pom.xml index 17e12af..1247798 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -4,205 +4,39 @@ com.lishid - openinv + openinvparent 1.0-SNAPSHOT openinvassembly OpenInvAssembly - - - - latest - - - com.lishid - openinvadapter1_11_R1 - 1.0-SNAPSHOT - - - - - - modern - - - com.lishid - openinvadapter1_8_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_8_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_8_R3 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_9_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_9_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_10_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_11_R1 - 1.0-SNAPSHOT - - - - - - all - - - com.lishid - openinvadapter1_4_5 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_4_6 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_4_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_5_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_5_R3 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_6_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_6_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_6_R3 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_7_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_7_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_7_R3 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_7_R4 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_8_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_8_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_8_R3 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_9_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_9_R2 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_10_R1 - 1.0-SNAPSHOT - - - com.lishid - openinvadapter1_11_R1 - 1.0-SNAPSHOT - - - - - - ../target OpenInv - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - true - - - com.lishid:* - - com/lishid/openinv/**/* - plugin.yml - - - - + maven-assembly-plugin + 3.0.0 + reactor-uberjar package - shade + single + + false + + src/assembly/reactor-uberjar.xml + + + - \ No newline at end of file + diff --git a/assembly/src/assembly/reactor-uberjar.xml b/assembly/src/assembly/reactor-uberjar.xml new file mode 100644 index 0000000..200bc85 --- /dev/null +++ b/assembly/src/assembly/reactor-uberjar.xml @@ -0,0 +1,28 @@ + + + reactor-uberjar + + + jar + + + false + + + + + true + + + / + true + + + + + + + + diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..bf47814 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + + com.lishid + openinvparent + 1.0-SNAPSHOT + + + openinvcommon + OpenInvCommon + + + + org.bukkit + bukkit + 1.4.5-R1.0 + provided + + + + com.lishid + openinvapi + 1.0-SNAPSHOT + + + + diff --git a/plugin/src/main/java/com/lishid/openinv/util/Cache.java b/common/src/main/java/com/lishid/openinv/util/Cache.java similarity index 100% rename from plugin/src/main/java/com/lishid/openinv/util/Cache.java rename to common/src/main/java/com/lishid/openinv/util/Cache.java diff --git a/plugin/src/main/java/com/lishid/openinv/util/Function.java b/common/src/main/java/com/lishid/openinv/util/Function.java similarity index 100% rename from plugin/src/main/java/com/lishid/openinv/util/Function.java rename to common/src/main/java/com/lishid/openinv/util/Function.java diff --git a/internal/src/main/java/com/lishid/openinv/internal/InternalAccessor.java b/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java similarity index 95% rename from internal/src/main/java/com/lishid/openinv/internal/InternalAccessor.java rename to common/src/main/java/com/lishid/openinv/util/InternalAccessor.java index 5b4cbe5..cc8a8b4 100644 --- a/internal/src/main/java/com/lishid/openinv/internal/InternalAccessor.java +++ b/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java @@ -14,11 +14,17 @@ * along with this program. If not, see . */ -package com.lishid.openinv.internal; +package com.lishid.openinv.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import com.lishid.openinv.internal.IAnySilentContainer; +import com.lishid.openinv.internal.IInventoryAccess; +import com.lishid.openinv.internal.IPlayerDataManager; +import com.lishid.openinv.internal.ISpecialEnderChest; +import com.lishid.openinv.internal.ISpecialPlayerInventory; + import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/com/lishid/openinv/Permissions.java b/common/src/main/java/com/lishid/openinv/util/Permissions.java similarity index 96% rename from plugin/src/main/java/com/lishid/openinv/Permissions.java rename to common/src/main/java/com/lishid/openinv/util/Permissions.java index b08fc6a..8fdf8a6 100644 --- a/plugin/src/main/java/com/lishid/openinv/Permissions.java +++ b/common/src/main/java/com/lishid/openinv/util/Permissions.java @@ -1,4 +1,4 @@ -package com.lishid.openinv; +package com.lishid.openinv.util; import org.bukkit.permissions.Permissible; diff --git a/1_4_5/pom.xml b/internal/1_4_5/pom.xml similarity index 89% rename from 1_4_5/pom.xml rename to internal/1_4_5/pom.xml index 0abd40e..2655295 100644 --- a/1_4_5/pom.xml +++ b/internal/1_4_5/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java similarity index 100% rename from 1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java rename to internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java diff --git a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java similarity index 98% rename from 1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java rename to internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java index 4b61708..802b914 100644 --- a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java +++ b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_4_5; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java similarity index 100% rename from 1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java rename to internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java diff --git a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java similarity index 100% rename from 1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java rename to internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java diff --git a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java similarity index 100% rename from 1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java rename to internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java diff --git a/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java b/internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java similarity index 100% rename from 1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java rename to internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java diff --git a/1_4_6/pom.xml b/internal/1_4_6/pom.xml similarity index 89% rename from 1_4_6/pom.xml rename to internal/1_4_6/pom.xml index fb3c735..b330a80 100644 --- a/1_4_6/pom.xml +++ b/internal/1_4_6/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java similarity index 100% rename from 1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java rename to internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java diff --git a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java similarity index 98% rename from 1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java rename to internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java index 69a3374..5d0e844 100644 --- a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java +++ b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_4_6; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java similarity index 100% rename from 1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java rename to internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java diff --git a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java similarity index 100% rename from 1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java rename to internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java diff --git a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java similarity index 100% rename from 1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java rename to internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java diff --git a/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java b/internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java similarity index 100% rename from 1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java rename to internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java diff --git a/internal/pom.xml b/internal/pom.xml index ce65e5c..07aa5f7 100644 --- a/internal/pom.xml +++ b/internal/pom.xml @@ -4,20 +4,65 @@ com.lishid - openinv + openinvparent 1.0-SNAPSHOT openinvinternal OpenInvInternal - - - org.bukkit - bukkit - 1.4.5-R1.0 - provided - - + pom + + + + + latest + + v1_11_R1 + + + + + modern + + v1_8_R1 + v1_8_R2 + v1_8_R3 + v1_9_R1 + v1_9_R2 + v1_10_R1 + v1_11_R1 + + + + + all + + 1_4_5 + 1_4_6 + v1_4_R1 + + v1_5_R2 + v1_5_R3 + + v1_6_R1 + v1_6_R2 + v1_6_R3 + + v1_7_R1 + v1_7_R2 + v1_7_R3 + v1_7_R4 + v1_8_R1 + v1_8_R2 + v1_8_R3 + v1_9_R1 + v1_9_R2 + v1_10_R1 + v1_11_R1 + + + + diff --git a/v1_10_R1/pom.xml b/internal/v1_10_R1/pom.xml similarity index 89% rename from v1_10_R1/pom.xml rename to internal/v1_10_R1/pom.xml index bf3d81b..265446e 100644 --- a/v1_10_R1/pom.xml +++ b/internal/v1_10_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentContainer.java b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentContainer.java similarity index 100% rename from v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentContainer.java rename to internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentContainer.java diff --git a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java similarity index 98% rename from v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java rename to internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java index a827864..8e7e028 100644 --- a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java +++ b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_10_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java similarity index 100% rename from v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java rename to internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java diff --git a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SilentContainerChest.java b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SilentContainerChest.java similarity index 100% rename from v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SilentContainerChest.java rename to internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SilentContainerChest.java diff --git a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java similarity index 100% rename from v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java rename to internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java diff --git a/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java b/internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java rename to internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java diff --git a/v1_11_R1/pom.xml b/internal/v1_11_R1/pom.xml similarity index 89% rename from v1_11_R1/pom.xml rename to internal/v1_11_R1/pom.xml index bfbba58..208245c 100644 --- a/v1_11_R1/pom.xml +++ b/internal/v1_11_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java similarity index 100% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java similarity index 98% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java index 3de2a2b..346d82b 100644 --- a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java +++ b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_11_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/PlayerDataManager.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/PlayerDataManager.java similarity index 100% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/PlayerDataManager.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/PlayerDataManager.java diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java similarity index 100% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerChest.java diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerShulkerBox.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerShulkerBox.java similarity index 100% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerShulkerBox.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SilentContainerShulkerBox.java diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialEnderChest.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialEnderChest.java similarity index 100% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialEnderChest.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialEnderChest.java diff --git a/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java b/internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java rename to internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java diff --git a/v1_4_R1/pom.xml b/internal/v1_4_R1/pom.xml similarity index 89% rename from v1_4_R1/pom.xml rename to internal/v1_4_R1/pom.xml index 0976b7e..006ec96 100644 --- a/v1_4_R1/pom.xml +++ b/internal/v1_4_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/AnySilentContainer.java b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/AnySilentContainer.java similarity index 100% rename from v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/AnySilentContainer.java rename to internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/AnySilentContainer.java diff --git a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java similarity index 98% rename from v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java rename to internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java index 0fd5d00..78b42b5 100644 --- a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java +++ b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_4_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java similarity index 100% rename from v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java rename to internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java diff --git a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java similarity index 100% rename from v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java rename to internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java diff --git a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java similarity index 100% rename from v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java rename to internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java diff --git a/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java b/internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java rename to internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java diff --git a/v1_5_R2/pom.xml b/internal/v1_5_R2/pom.xml similarity index 89% rename from v1_5_R2/pom.xml rename to internal/v1_5_R2/pom.xml index e596180..8b255b9 100644 --- a/v1_5_R2/pom.xml +++ b/internal/v1_5_R2/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/AnySilentContainer.java b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/AnySilentContainer.java similarity index 100% rename from v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/AnySilentContainer.java rename to internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/AnySilentContainer.java diff --git a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java similarity index 98% rename from v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java rename to internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java index b61d7ee..932bf21 100644 --- a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java +++ b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_5_R2; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java similarity index 100% rename from v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java rename to internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java diff --git a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java similarity index 100% rename from v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java rename to internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java diff --git a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java similarity index 100% rename from v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java rename to internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java diff --git a/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java b/internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java similarity index 100% rename from v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java rename to internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java diff --git a/v1_5_R3/pom.xml b/internal/v1_5_R3/pom.xml similarity index 89% rename from v1_5_R3/pom.xml rename to internal/v1_5_R3/pom.xml index 4b2e345..7a5148a 100644 --- a/v1_5_R3/pom.xml +++ b/internal/v1_5_R3/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/AnySilentContainer.java b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/AnySilentContainer.java similarity index 100% rename from v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/AnySilentContainer.java rename to internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/AnySilentContainer.java diff --git a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java similarity index 98% rename from v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java rename to internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java index 1a0df32..aa09220 100644 --- a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java +++ b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_5_R3; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java similarity index 100% rename from v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java rename to internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java diff --git a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java similarity index 100% rename from v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java rename to internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java diff --git a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java similarity index 100% rename from v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java rename to internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java diff --git a/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java b/internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java similarity index 100% rename from v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java rename to internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java diff --git a/v1_6_R1/pom.xml b/internal/v1_6_R1/pom.xml similarity index 89% rename from v1_6_R1/pom.xml rename to internal/v1_6_R1/pom.xml index fa9b987..652702e 100644 --- a/v1_6_R1/pom.xml +++ b/internal/v1_6_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/AnySilentContainer.java b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/AnySilentContainer.java similarity index 100% rename from v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/AnySilentContainer.java rename to internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/AnySilentContainer.java diff --git a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java similarity index 98% rename from v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java rename to internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java index 8d6dc65..aa3b591 100644 --- a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java +++ b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_6_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java similarity index 100% rename from v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java rename to internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java diff --git a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java similarity index 100% rename from v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java rename to internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java diff --git a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java similarity index 100% rename from v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java rename to internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java diff --git a/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java b/internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java rename to internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java diff --git a/v1_6_R2/pom.xml b/internal/v1_6_R2/pom.xml similarity index 89% rename from v1_6_R2/pom.xml rename to internal/v1_6_R2/pom.xml index 3f4670e..708b4ad 100644 --- a/v1_6_R2/pom.xml +++ b/internal/v1_6_R2/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/AnySilentContainer.java b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/AnySilentContainer.java similarity index 100% rename from v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/AnySilentContainer.java rename to internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/AnySilentContainer.java diff --git a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java similarity index 98% rename from v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java rename to internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java index 265202b..25f85bc 100644 --- a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java +++ b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_6_R2; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java similarity index 100% rename from v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java rename to internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java diff --git a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java similarity index 100% rename from v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java rename to internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java diff --git a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java similarity index 100% rename from v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java rename to internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java diff --git a/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java b/internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java similarity index 100% rename from v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java rename to internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java diff --git a/v1_6_R3/pom.xml b/internal/v1_6_R3/pom.xml similarity index 89% rename from v1_6_R3/pom.xml rename to internal/v1_6_R3/pom.xml index 53b3b79..9f66d53 100644 --- a/v1_6_R3/pom.xml +++ b/internal/v1_6_R3/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/AnySilentContainer.java b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/AnySilentContainer.java similarity index 100% rename from v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/AnySilentContainer.java rename to internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/AnySilentContainer.java diff --git a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java similarity index 98% rename from v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java rename to internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java index 536887a..9bb400f 100644 --- a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java +++ b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_6_R3; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java similarity index 100% rename from v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java rename to internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java diff --git a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java similarity index 100% rename from v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java rename to internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java diff --git a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java similarity index 100% rename from v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java rename to internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java diff --git a/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java b/internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java similarity index 100% rename from v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java rename to internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java diff --git a/v1_7_R1/pom.xml b/internal/v1_7_R1/pom.xml similarity index 89% rename from v1_7_R1/pom.xml rename to internal/v1_7_R1/pom.xml index 21f2942..a8ed017 100644 --- a/v1_7_R1/pom.xml +++ b/internal/v1_7_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/AnySilentContainer.java b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/AnySilentContainer.java similarity index 100% rename from v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/AnySilentContainer.java rename to internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/AnySilentContainer.java diff --git a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java similarity index 98% rename from v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java rename to internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java index c0f8de9..372a2b9 100644 --- a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java +++ b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_7_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/PlayerDataManager.java b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/PlayerDataManager.java similarity index 100% rename from v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/PlayerDataManager.java rename to internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/PlayerDataManager.java diff --git a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java similarity index 100% rename from v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java rename to internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java diff --git a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialEnderChest.java b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialEnderChest.java similarity index 100% rename from v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialEnderChest.java rename to internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialEnderChest.java diff --git a/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java b/internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java rename to internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java diff --git a/v1_7_R2/pom.xml b/internal/v1_7_R2/pom.xml similarity index 89% rename from v1_7_R2/pom.xml rename to internal/v1_7_R2/pom.xml index a100986..31a98d2 100644 --- a/v1_7_R2/pom.xml +++ b/internal/v1_7_R2/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/AnySilentContainer.java b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/AnySilentContainer.java similarity index 100% rename from v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/AnySilentContainer.java rename to internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/AnySilentContainer.java diff --git a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/InventoryAccess.java b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/InventoryAccess.java similarity index 98% rename from v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/InventoryAccess.java rename to internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/InventoryAccess.java index c982a30..1012348 100644 --- a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/InventoryAccess.java +++ b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_7_R2; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/PlayerDataManager.java b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/PlayerDataManager.java similarity index 100% rename from v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/PlayerDataManager.java rename to internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/PlayerDataManager.java diff --git a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java similarity index 100% rename from v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java rename to internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java diff --git a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialEnderChest.java b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialEnderChest.java similarity index 100% rename from v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialEnderChest.java rename to internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialEnderChest.java diff --git a/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java b/internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java similarity index 100% rename from v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java rename to internal/v1_7_R2/src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java diff --git a/v1_7_R3/pom.xml b/internal/v1_7_R3/pom.xml similarity index 89% rename from v1_7_R3/pom.xml rename to internal/v1_7_R3/pom.xml index af3d2df..09e82e4 100644 --- a/v1_7_R3/pom.xml +++ b/internal/v1_7_R3/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/AnySilentContainer.java b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/AnySilentContainer.java similarity index 100% rename from v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/AnySilentContainer.java rename to internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/AnySilentContainer.java diff --git a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java similarity index 98% rename from v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java rename to internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java index f8b23a8..41ff36f 100644 --- a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java +++ b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_7_R3; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java similarity index 100% rename from v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java rename to internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java diff --git a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java similarity index 100% rename from v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java rename to internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java diff --git a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialEnderChest.java b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialEnderChest.java similarity index 100% rename from v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialEnderChest.java rename to internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialEnderChest.java diff --git a/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java b/internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java similarity index 100% rename from v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java rename to internal/v1_7_R3/src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java diff --git a/v1_7_R4/pom.xml b/internal/v1_7_R4/pom.xml similarity index 89% rename from v1_7_R4/pom.xml rename to internal/v1_7_R4/pom.xml index ae32c7e..50ec61f 100644 --- a/v1_7_R4/pom.xml +++ b/internal/v1_7_R4/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/AnySilentContainer.java b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/AnySilentContainer.java similarity index 100% rename from v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/AnySilentContainer.java rename to internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/AnySilentContainer.java diff --git a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/InventoryAccess.java b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/InventoryAccess.java similarity index 98% rename from v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/InventoryAccess.java rename to internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/InventoryAccess.java index b41fd40..dc7b7c1 100644 --- a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/InventoryAccess.java +++ b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_7_R4; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java similarity index 100% rename from v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java rename to internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java diff --git a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java similarity index 100% rename from v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java rename to internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java diff --git a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialEnderChest.java b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialEnderChest.java similarity index 100% rename from v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialEnderChest.java rename to internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialEnderChest.java diff --git a/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java b/internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java similarity index 100% rename from v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java rename to internal/v1_7_R4/src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java diff --git a/v1_8_R1/pom.xml b/internal/v1_8_R1/pom.xml similarity index 89% rename from v1_8_R1/pom.xml rename to internal/v1_8_R1/pom.xml index 8864486..dcbf5c4 100644 --- a/v1_8_R1/pom.xml +++ b/internal/v1_8_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/AnySilentContainer.java b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/AnySilentContainer.java similarity index 100% rename from v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/AnySilentContainer.java rename to internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/AnySilentContainer.java diff --git a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/InventoryAccess.java b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/InventoryAccess.java similarity index 98% rename from v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/InventoryAccess.java rename to internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/InventoryAccess.java index 20e6d09..d348ca5 100644 --- a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/InventoryAccess.java +++ b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_8_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java similarity index 100% rename from v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java rename to internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java diff --git a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java similarity index 100% rename from v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java rename to internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java diff --git a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialEnderChest.java b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialEnderChest.java similarity index 100% rename from v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialEnderChest.java rename to internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialEnderChest.java diff --git a/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialPlayerInventory.java b/internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialPlayerInventory.java rename to internal/v1_8_R1/src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialPlayerInventory.java diff --git a/v1_8_R2/pom.xml b/internal/v1_8_R2/pom.xml similarity index 89% rename from v1_8_R2/pom.xml rename to internal/v1_8_R2/pom.xml index a002526..80fafd5 100644 --- a/v1_8_R2/pom.xml +++ b/internal/v1_8_R2/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/AnySilentContainer.java b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/AnySilentContainer.java similarity index 100% rename from v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/AnySilentContainer.java rename to internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/AnySilentContainer.java diff --git a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/InventoryAccess.java b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/InventoryAccess.java similarity index 98% rename from v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/InventoryAccess.java rename to internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/InventoryAccess.java index 6d3e6ff..fdeb50a 100644 --- a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/InventoryAccess.java +++ b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_8_R2; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java similarity index 100% rename from v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java rename to internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java diff --git a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java similarity index 100% rename from v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java rename to internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java diff --git a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialEnderChest.java b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialEnderChest.java similarity index 100% rename from v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialEnderChest.java rename to internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialEnderChest.java diff --git a/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialPlayerInventory.java b/internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialPlayerInventory.java similarity index 100% rename from v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialPlayerInventory.java rename to internal/v1_8_R2/src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialPlayerInventory.java diff --git a/v1_8_R3/pom.xml b/internal/v1_8_R3/pom.xml similarity index 89% rename from v1_8_R3/pom.xml rename to internal/v1_8_R3/pom.xml index 972b9ae..7d78fdf 100644 --- a/v1_8_R3/pom.xml +++ b/internal/v1_8_R3/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java similarity index 100% rename from v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java rename to internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java diff --git a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/InventoryAccess.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/InventoryAccess.java similarity index 98% rename from v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/InventoryAccess.java rename to internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/InventoryAccess.java index 82d9d3e..5b18964 100644 --- a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/InventoryAccess.java +++ b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_8_R3; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java similarity index 100% rename from v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java rename to internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java diff --git a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java similarity index 100% rename from v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java rename to internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java diff --git a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java similarity index 100% rename from v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java rename to internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java diff --git a/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java similarity index 100% rename from v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java rename to internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java diff --git a/v1_9_R1/pom.xml b/internal/v1_9_R1/pom.xml similarity index 89% rename from v1_9_R1/pom.xml rename to internal/v1_9_R1/pom.xml index 07e89da..13d1c3a 100644 --- a/v1_9_R1/pom.xml +++ b/internal/v1_9_R1/pom.xml @@ -4,7 +4,7 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT @@ -14,7 +14,7 @@ com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/AnySilentContainer.java b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/AnySilentContainer.java similarity index 100% rename from v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/AnySilentContainer.java rename to internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/AnySilentContainer.java diff --git a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/InventoryAccess.java b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/InventoryAccess.java similarity index 98% rename from v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/InventoryAccess.java rename to internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/InventoryAccess.java index c9d48f8..8b2c196 100644 --- a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/InventoryAccess.java +++ b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_9_R1; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/PlayerDataManager.java b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/PlayerDataManager.java similarity index 100% rename from v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/PlayerDataManager.java rename to internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/PlayerDataManager.java diff --git a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java similarity index 100% rename from v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java rename to internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java diff --git a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialEnderChest.java b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialEnderChest.java similarity index 100% rename from v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialEnderChest.java rename to internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialEnderChest.java diff --git a/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java b/internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java similarity index 100% rename from v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java rename to internal/v1_9_R1/src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java diff --git a/v1_9_R2/pom.xml b/internal/v1_9_R2/pom.xml similarity index 85% rename from v1_9_R2/pom.xml rename to internal/v1_9_R2/pom.xml index d4693b7..b04cc62 100644 --- a/v1_9_R2/pom.xml +++ b/internal/v1_9_R2/pom.xml @@ -4,17 +4,17 @@ com.lishid - openinv + openinvinternal 1.0-SNAPSHOT openinvadapter1_9_R2 - OpenInvaAdapter1_9_R2 + OpenInvAdapter1_9_R2 com.lishid - openinvplugin + openinvcommon 1.0-SNAPSHOT diff --git a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/AnySilentContainer.java b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/AnySilentContainer.java similarity index 100% rename from v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/AnySilentContainer.java rename to internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/AnySilentContainer.java diff --git a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java similarity index 98% rename from v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java rename to internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java index 0f09b1c..0f00bc8 100644 --- a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java +++ b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java @@ -19,7 +19,7 @@ package com.lishid.openinv.internal.v1_9_R2; import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.util.InternalAccessor; import org.bukkit.inventory.Inventory; diff --git a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/PlayerDataManager.java b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/PlayerDataManager.java similarity index 100% rename from v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/PlayerDataManager.java rename to internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/PlayerDataManager.java diff --git a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java similarity index 100% rename from v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java rename to internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java diff --git a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialEnderChest.java b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialEnderChest.java similarity index 100% rename from v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialEnderChest.java rename to internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialEnderChest.java diff --git a/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialPlayerInventory.java b/internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialPlayerInventory.java similarity index 100% rename from v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialPlayerInventory.java rename to internal/v1_9_R2/src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialPlayerInventory.java diff --git a/plugin/plugin-core/pom.xml b/plugin/plugin-core/pom.xml new file mode 100644 index 0000000..dce3c3e --- /dev/null +++ b/plugin/plugin-core/pom.xml @@ -0,0 +1,42 @@ + + 4.0.0 + + + com.lishid + openinvplugin + 1.0-SNAPSHOT + + + openinvplugincore + OpenInvPluginCore + + + + org.bukkit + bukkit + 1.4.5-R1.0 + provided + + + com.lishid + openinvcommon + 1.0-SNAPSHOT + + + com.lishid + openinvpluginv1_10_r1 + 1.0-SNAPSHOT + + + + + + + src/main/resources + true + + + + + \ No newline at end of file diff --git a/plugin/src/main/java/com/lishid/openinv/OpenInv.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java similarity index 94% rename from plugin/src/main/java/com/lishid/openinv/OpenInv.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java index 57b034c..60f4733 100644 --- a/plugin/src/main/java/com/lishid/openinv/OpenInv.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java @@ -35,9 +35,14 @@ import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.IPlayerDataManager; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import com.lishid.openinv.internal.InternalAccessor; +import com.lishid.openinv.listeners.InventoryClickListener; +import com.lishid.openinv.listeners.InventoryDragListener; +import com.lishid.openinv.listeners.PlayerListener; import com.lishid.openinv.util.Cache; +import com.lishid.openinv.util.ConfigUpdater; import com.lishid.openinv.util.Function; +import com.lishid.openinv.util.InternalAccessor; +import com.lishid.openinv.util.Permissions; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; @@ -54,7 +59,7 @@ import org.bukkit.scheduler.BukkitRunnable; * * @author lishid */ -public class OpenInv extends JavaPlugin { +public class OpenInv extends JavaPlugin implements IOpenInv { private final Map inventories = new HashMap(); private final Map enderChests = new HashMap(); @@ -120,9 +125,13 @@ public class OpenInv extends JavaPlugin { new ConfigUpdater(this).checkForUpdates(); - pm.registerEvents(new OpenInvPlayerListener(this), this); - pm.registerEvents(new OpenInvInventoryListener(this), this); + // Register listeners + pm.registerEvents(new PlayerListener(this), this); + pm.registerEvents(new InventoryClickListener(this), this); + // Bukkit will handle missing events for us, attempt to register InventoryDragEvent without a version check + pm.registerEvents(new InventoryDragListener(this), this); + // Register commands to their executors getCommand("openinv").setExecutor(new OpenInvPluginCommand(this)); getCommand("openender").setExecutor(new OpenEnderPluginCommand(this)); SearchInvPluginCommand searchInv = new SearchInvPluginCommand(); @@ -149,8 +158,9 @@ public class OpenInv extends JavaPlugin { * * @return true if the server version is supported */ + @Override public boolean isSupportedVersion() { - return this.accessor.isSupported(); + return this.accessor != null && this.accessor.isSupported(); } /** @@ -159,6 +169,7 @@ public class OpenInv extends JavaPlugin { * * @return the IInventoryAccess */ + @Override public IInventoryAccess getInventoryAccess() { return this.inventoryAccess; } @@ -169,6 +180,7 @@ public class OpenInv extends JavaPlugin { * * @return the ISilentContainer */ + @Override public IAnySilentContainer getAnySilentContainer() { return this.anySilentContainer; } @@ -180,6 +192,7 @@ public class OpenInv extends JavaPlugin { * @param online true if the Player is currently online * @return the ISpecialPlayerInventory */ + @Override public ISpecialPlayerInventory getInventory(Player player, boolean online) { String id = playerLoader.getPlayerDataID(player); if (inventories.containsKey(id)) { @@ -198,6 +211,7 @@ public class OpenInv extends JavaPlugin { * @param online true if the Player is currently online * @return the ISpecialEnderChest */ + @Override public ISpecialEnderChest getEnderChest(Player player, boolean online) { String id = playerLoader.getPlayerDataID(player); if (enderChests.containsKey(id)) { @@ -214,6 +228,7 @@ public class OpenInv extends JavaPlugin { * * @param player the OfflinePlayer to unload */ + @Override public void unload(OfflinePlayer player) { this.playerCache.invalidate(this.playerLoader.getPlayerDataID(player)); } @@ -226,6 +241,7 @@ public class OpenInv extends JavaPlugin { * * @return false unless configured otherwise */ + @Override public boolean disableSaving() { return getConfig().getBoolean("settings.disable-saving", false); } @@ -236,6 +252,7 @@ public class OpenInv extends JavaPlugin { * * @return true unless configured otherwise */ + @Override public boolean notifySilentChest() { return getConfig().getBoolean("notify.silent-chest", true); } @@ -246,6 +263,7 @@ public class OpenInv extends JavaPlugin { * * @return true unless configured otherwise */ + @Override public boolean notifyAnyChest() { return getConfig().getBoolean("notify.any-chest", true); } @@ -256,6 +274,7 @@ public class OpenInv extends JavaPlugin { * @param player the OfflinePlayer * @return true if SilentChest is enabled */ + @Override public boolean getPlayerSilentChestStatus(OfflinePlayer player) { return getConfig().getBoolean("toggles.silent-chest." + playerLoader.getPlayerDataID(player), false); } @@ -266,6 +285,7 @@ public class OpenInv extends JavaPlugin { * @param player the OfflinePlayer * @param status the status */ + @Override public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status) { getConfig().set("toggles.silent-chest." + playerLoader.getPlayerDataID(player), status); saveConfig(); @@ -277,6 +297,7 @@ public class OpenInv extends JavaPlugin { * @param player the OfflinePlayer * @return true if AnyChest is enabled */ + @Override public boolean getPlayerAnyChestStatus(OfflinePlayer player) { return getConfig().getBoolean("toggles.any-chest." + playerLoader.getPlayerDataID(player), false); } @@ -287,6 +308,7 @@ public class OpenInv extends JavaPlugin { * @param player the OfflinePlayer * @param status the status */ + @Override public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status) { getConfig().set("toggles.any-chest." + playerLoader.getPlayerDataID(player), status); saveConfig(); @@ -299,6 +321,7 @@ public class OpenInv extends JavaPlugin { * @param offline the OfflinePlayer * @return the identifier */ + @Override public String getPlayerID(OfflinePlayer offline) { return this.playerLoader.getPlayerDataID(offline); } @@ -313,6 +336,7 @@ public class OpenInv extends JavaPlugin { * @param name the name of the Player * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in */ + @Override public OfflinePlayer matchPlayer(String name) { // Warn if called on the main thread - if we resort to searching offline players, this may take several seconds. @@ -391,6 +415,7 @@ public class OpenInv extends JavaPlugin { * @param offline the OfflinePlayer to load a Player for * @return the Player */ + @Override public Player loadPlayer(final OfflinePlayer offline) { if (offline == null) { @@ -473,6 +498,7 @@ public class OpenInv extends JavaPlugin { if (this.inventories.containsKey(key)) { this.inventories.get(key).setPlayerOnline(player); new BukkitRunnable() { + @SuppressWarnings("deprecation") // Unlikely to ever be a viable alternative, Spigot un-deprecated. @Override public void run() { if (player.isOnline()) { diff --git a/plugin/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java similarity index 100% rename from plugin/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java diff --git a/plugin/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java similarity index 99% rename from plugin/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java index 7e8df21..2c1ae54 100644 --- a/plugin/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java @@ -19,8 +19,8 @@ package com.lishid.openinv.commands; import java.util.HashMap; import com.lishid.openinv.OpenInv; -import com.lishid.openinv.Permissions; import com.lishid.openinv.internal.ISpecialEnderChest; +import com.lishid.openinv.util.Permissions; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; diff --git a/plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java similarity index 99% rename from plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java index 9b4d351..8f91596 100644 --- a/plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java @@ -19,8 +19,8 @@ package com.lishid.openinv.commands; import java.util.HashMap; import com.lishid.openinv.OpenInv; -import com.lishid.openinv.Permissions; import com.lishid.openinv.internal.ISpecialPlayerInventory; +import com.lishid.openinv.util.Permissions; import org.bukkit.ChatColor; import org.bukkit.OfflinePlayer; diff --git a/plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java similarity index 100% rename from plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java diff --git a/plugin/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java similarity index 100% rename from plugin/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java diff --git a/plugin/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java similarity index 100% rename from plugin/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java diff --git a/plugin/src/main/java/com/lishid/openinv/OpenInvInventoryListener.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java similarity index 58% rename from plugin/src/main/java/com/lishid/openinv/OpenInvInventoryListener.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java index f9eba2c..f9b4fe7 100644 --- a/plugin/src/main/java/com/lishid/openinv/OpenInvInventoryListener.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java @@ -14,49 +14,36 @@ * along with this program. If not, see . */ -package com.lishid.openinv; +package com.lishid.openinv.listeners; + +import com.lishid.openinv.IOpenInv; +import com.lishid.openinv.util.Permissions; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.inventory.InventoryDragEvent; -import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.inventory.Inventory; -public class OpenInvInventoryListener implements Listener { +public class InventoryClickListener implements Listener { - private final OpenInv plugin; + private final IOpenInv plugin; - public OpenInvInventoryListener(OpenInv plugin) { + public InventoryClickListener(IOpenInv plugin) { this.plugin = plugin; } @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onInventoryClick(InventoryClickEvent event) { - if (cancelInteract(event.getWhoClicked(), event.getInventory())) { - event.setCancelled(true); - } - } - - @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) - public void onInventoryDrag(InventoryDragEvent event) { - if (cancelInteract(event.getWhoClicked(), event.getInventory())) { - event.setCancelled(true); - } - } - - private boolean cancelInteract(HumanEntity entity, Inventory inventory) { - return plugin.getInventoryAccess().isSpecialPlayerInventory(inventory) + HumanEntity entity = event.getWhoClicked(); + Inventory inventory = event.getInventory(); + if (plugin.getInventoryAccess().isSpecialPlayerInventory(inventory) && !Permissions.EDITINV.hasPermission(entity) || plugin.getInventoryAccess().isSpecialEnderChest(inventory) - && !Permissions.EDITENDER.hasPermission(entity); - } - - @EventHandler - public void onWorldChange(PlayerChangedWorldEvent event) { - plugin.changeWorld(event.getPlayer()); + && !Permissions.EDITENDER.hasPermission(entity)) { + event.setCancelled(true); + } } } diff --git a/plugin/src/main/java/com/lishid/openinv/OpenInvPlayerListener.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java similarity index 88% rename from plugin/src/main/java/com/lishid/openinv/OpenInvPlayerListener.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java index d0c65ff..984bbdc 100644 --- a/plugin/src/main/java/com/lishid/openinv/OpenInvPlayerListener.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java @@ -14,7 +14,10 @@ * along with this program. If not, see . */ -package com.lishid.openinv; +package com.lishid.openinv.listeners; + +import com.lishid.openinv.OpenInv; +import com.lishid.openinv.util.Permissions; import org.bukkit.entity.Player; import org.bukkit.event.Event.Result; @@ -22,15 +25,16 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerChangedWorldEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -public class OpenInvPlayerListener implements Listener { +public class PlayerListener implements Listener { private final OpenInv plugin; - public OpenInvPlayerListener(OpenInv plugin) { + public PlayerListener(OpenInv plugin) { this.plugin = plugin; } @@ -44,6 +48,11 @@ public class OpenInvPlayerListener implements Listener { plugin.setPlayerOffline(event.getPlayer()); } + @EventHandler + public void onWorldChange(PlayerChangedWorldEvent event) { + plugin.changeWorld(event.getPlayer()); + } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerInteract(PlayerInteractEvent event) { if (event.getAction() != Action.RIGHT_CLICK_BLOCK || event.getPlayer().isSneaking() diff --git a/plugin/src/main/java/com/lishid/openinv/ConfigUpdater.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java similarity index 98% rename from plugin/src/main/java/com/lishid/openinv/ConfigUpdater.java rename to plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java index ee0a826..81d33cb 100644 --- a/plugin/src/main/java/com/lishid/openinv/ConfigUpdater.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java @@ -1,4 +1,4 @@ -package com.lishid.openinv; +package com.lishid.openinv.util; import java.io.File; import java.io.IOException; @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import com.lishid.openinv.OpenInv; + import org.bukkit.Material; import org.bukkit.OfflinePlayer; import org.bukkit.configuration.ConfigurationSection; @@ -140,7 +142,6 @@ public class ConfigUpdater { }.runTask(plugin); } - @SuppressWarnings("deprecation") private Material getMaterialById(int id) { Material material = Material.getMaterial(id); diff --git a/plugin/src/main/resources/plugin.yml b/plugin/plugin-core/src/main/resources/plugin.yml similarity index 100% rename from plugin/src/main/resources/plugin.yml rename to plugin/plugin-core/src/main/resources/plugin.yml diff --git a/plugin/plugin-v1_10_R1/pom.xml b/plugin/plugin-v1_10_R1/pom.xml new file mode 100644 index 0000000..4b0cd48 --- /dev/null +++ b/plugin/plugin-v1_10_R1/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + + + com.lishid + openinvplugin + 1.0-SNAPSHOT + + + openinvpluginv1_10_r1 + OpenInvPluginv1_10_R1 + + + + org.bukkit + bukkit + 1.10-R0.1-SNAPSHOT + provided + + + com.lishid + openinvcommon + 1.0-SNAPSHOT + + + + diff --git a/plugin/plugin-v1_10_R1/src/main/java/com/lishid/openinv/listeners/InventoryDragListener.java b/plugin/plugin-v1_10_R1/src/main/java/com/lishid/openinv/listeners/InventoryDragListener.java new file mode 100644 index 0000000..1b2f18a --- /dev/null +++ b/plugin/plugin-v1_10_R1/src/main/java/com/lishid/openinv/listeners/InventoryDragListener.java @@ -0,0 +1,38 @@ +package com.lishid.openinv.listeners; + +import com.lishid.openinv.IOpenInv; +import com.lishid.openinv.util.Permissions; + +import org.bukkit.entity.HumanEntity; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.InventoryDragEvent; +import org.bukkit.inventory.Inventory; + +/** + * Listener for InventoryDragEvents to prevent unpermitted modification of special inventories. + * + * @author Jikoo + */ +public class InventoryDragListener implements Listener { + + private final IOpenInv plugin; + + public InventoryDragListener(IOpenInv plugin) { + this.plugin = plugin; + } + + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) + public void onInventoryDrag(InventoryDragEvent event) { + HumanEntity entity = event.getWhoClicked(); + Inventory inventory = event.getInventory(); + if (plugin.getInventoryAccess().isSpecialPlayerInventory(inventory) + && !Permissions.EDITINV.hasPermission(entity) + || plugin.getInventoryAccess().isSpecialEnderChest(inventory) + && !Permissions.EDITENDER.hasPermission(entity)) { + event.setCancelled(true); + } + } + +} diff --git a/plugin/pom.xml b/plugin/pom.xml index 64c32d7..a386781 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,35 +4,18 @@ com.lishid - openinv + openinvparent 1.0-SNAPSHOT openinvplugin OpenInvPlugin - - - org.bukkit - bukkit - - 1.11-R0.1-SNAPSHOT - provided - - - com.lishid - openinvinternal - 1.0-SNAPSHOT - - + pom - - - - src/main/resources - true - - - + + plugin-v1_10_R1 + plugin-core + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9214a37..cc71f52 100644 --- a/pom.xml +++ b/pom.xml @@ -1,44 +1,41 @@ 4.0.0 + com.lishid - openinv - pom - 1.0-SNAPSHOT - OpenInv + openinvparent + OpenInvParent http://dev.bukkit.org/bukkit-plugins/openinv/ + 1.0-SNAPSHOT + + pom UTF-8 3.0.3-SNAPSHOT + + api + common + plugin + internal + assembly + + - - reactorbuildfirst + all - - !breakBuildProcess - + true - - internal - plugin - @@ -49,9 +46,6 @@ true - - v1_11_R1 - @@ -62,62 +56,6 @@ true - - v1_8_R1 - v1_8_R2 - v1_8_R3 - v1_9_R1 - v1_9_R2 - v1_10_R1 - v1_11_R1 - - - - - all - - true - - - 1_4_5 - 1_4_6 - v1_4_R1 - - v1_5_R2 - v1_5_R3 - - v1_6_R1 - v1_6_R2 - v1_6_R3 - - v1_7_R1 - v1_7_R2 - v1_7_R3 - v1_7_R4 - v1_8_R1 - v1_8_R2 - v1_8_R3 - v1_9_R1 - v1_9_R2 - v1_10_R1 - v1_11_R1 - - - - - - reactorbuildlast - - - !breakBuildProcess - - - - assembly -