From 50c45b661632c396ea764ffe982c5715b3c196cb Mon Sep 17 00:00:00 2001 From: Jikoo Date: Sun, 4 Feb 2018 10:29:07 -0500 Subject: [PATCH] Cleaned up code, updated copyright at long last. --- README.MD | 6 +- api/pom.xml | 16 ++++++ .../java/com/lishid/openinv/IOpenInv.java | 56 ++++++++++++------- .../openinv/internal/IAnySilentContainer.java | 24 ++++++-- .../openinv/internal/IInventoryAccess.java | 14 ++--- .../openinv/internal/ISpecialEnderChest.java | 26 ++++----- .../internal/ISpecialPlayerInventory.java | 26 ++++----- assembly/pom.xml | 16 ++++++ assembly/src/assembly/reactor-uberjar.xml | 16 ++++++ common/pom.xml | 16 ++++++ .../openinv/internal/IPlayerDataManager.java | 36 ++++++------ .../java/com/lishid/openinv/util/Cache.java | 16 ++++++ .../com/lishid/openinv/util/Function.java | 18 +++++- .../lishid/openinv/util/InternalAccessor.java | 10 ++-- .../com/lishid/openinv/util/Permissions.java | 16 ++++++ internal/1_4_5/pom.xml | 16 ++++++ .../internal/v1_4_5/AnySilentContainer.java | 12 ++-- .../internal/v1_4_5/InventoryAccess.java | 12 ++-- .../internal/v1_4_5/PlayerDataManager.java | 16 +++--- .../internal/v1_4_5/SilentContainerChest.java | 14 ++--- .../internal/v1_4_5/SpecialEnderChest.java | 19 ++++--- .../v1_4_5/SpecialPlayerInventory.java | 14 ++--- internal/1_4_6/pom.xml | 16 ++++++ .../internal/v1_4_6/AnySilentContainer.java | 12 ++-- .../internal/v1_4_6/InventoryAccess.java | 12 ++-- .../internal/v1_4_6/PlayerDataManager.java | 16 +++--- .../internal/v1_4_6/SilentContainerChest.java | 14 ++--- .../internal/v1_4_6/SpecialEnderChest.java | 19 ++++--- .../v1_4_6/SpecialPlayerInventory.java | 14 ++--- internal/pom.xml | 20 ++++++- internal/v1_10_R1/pom.xml | 16 ++++++ .../internal/v1_10_R1/AnySilentContainer.java | 6 +- .../internal/v1_10_R1/InventoryAccess.java | 12 ++-- .../internal/v1_10_R1/PlayerDataManager.java | 16 +++--- .../internal/v1_10_R1/SpecialEnderChest.java | 15 ++--- .../v1_10_R1/SpecialPlayerInventory.java | 19 ++++--- internal/v1_11_R1/pom.xml | 16 ++++++ .../internal/v1_11_R1/AnySilentContainer.java | 12 ++-- .../internal/v1_11_R1/InventoryAccess.java | 12 ++-- .../internal/v1_11_R1/PlayerDataManager.java | 16 +++--- .../internal/v1_11_R1/SpecialEnderChest.java | 15 ++--- .../v1_11_R1/SpecialPlayerInventory.java | 31 +++++----- internal/v1_12_R1/pom.xml | 16 ++++++ .../internal/v1_12_R1/AnySilentContainer.java | 6 +- .../internal/v1_12_R1/InventoryAccess.java | 20 ++++--- .../internal/v1_12_R1/PlayerDataManager.java | 24 +++++--- .../internal/v1_12_R1/SpecialEnderChest.java | 32 ++++++----- .../v1_12_R1/SpecialPlayerInventory.java | 44 ++++++++------- internal/v1_4_R1/pom.xml | 16 ++++++ .../internal/v1_4_R1/AnySilentContainer.java | 12 ++-- .../internal/v1_4_R1/InventoryAccess.java | 12 ++-- .../internal/v1_4_R1/PlayerDataManager.java | 16 +++--- .../v1_4_R1/SilentContainerChest.java | 14 ++--- .../internal/v1_4_R1/SpecialEnderChest.java | 15 ++--- .../v1_4_R1/SpecialPlayerInventory.java | 14 ++--- internal/v1_5_R2/pom.xml | 16 ++++++ .../internal/v1_5_R2/AnySilentContainer.java | 12 ++-- .../internal/v1_5_R2/InventoryAccess.java | 12 ++-- .../internal/v1_5_R2/PlayerDataManager.java | 16 +++--- .../v1_5_R2/SilentContainerChest.java | 14 ++--- .../internal/v1_5_R2/SpecialEnderChest.java | 15 ++--- .../v1_5_R2/SpecialPlayerInventory.java | 14 ++--- internal/v1_5_R3/pom.xml | 16 ++++++ .../internal/v1_5_R3/AnySilentContainer.java | 12 ++-- .../internal/v1_5_R3/InventoryAccess.java | 12 ++-- .../internal/v1_5_R3/PlayerDataManager.java | 16 +++--- .../v1_5_R3/SilentContainerChest.java | 14 ++--- .../internal/v1_5_R3/SpecialEnderChest.java | 15 ++--- .../v1_5_R3/SpecialPlayerInventory.java | 14 ++--- internal/v1_6_R1/pom.xml | 16 ++++++ .../internal/v1_6_R1/AnySilentContainer.java | 12 ++-- .../internal/v1_6_R1/InventoryAccess.java | 12 ++-- .../internal/v1_6_R1/PlayerDataManager.java | 16 +++--- .../v1_6_R1/SilentContainerChest.java | 14 ++--- .../internal/v1_6_R1/SpecialEnderChest.java | 15 ++--- .../v1_6_R1/SpecialPlayerInventory.java | 14 ++--- internal/v1_6_R2/pom.xml | 16 ++++++ .../internal/v1_6_R2/AnySilentContainer.java | 12 ++-- .../internal/v1_6_R2/InventoryAccess.java | 12 ++-- .../internal/v1_6_R2/PlayerDataManager.java | 16 +++--- .../v1_6_R2/SilentContainerChest.java | 14 ++--- .../internal/v1_6_R2/SpecialEnderChest.java | 15 ++--- .../v1_6_R2/SpecialPlayerInventory.java | 14 ++--- internal/v1_6_R3/pom.xml | 16 ++++++ .../internal/v1_6_R3/AnySilentContainer.java | 12 ++-- .../internal/v1_6_R3/InventoryAccess.java | 12 ++-- .../internal/v1_6_R3/PlayerDataManager.java | 16 +++--- .../v1_6_R3/SilentContainerChest.java | 14 ++--- .../internal/v1_6_R3/SpecialEnderChest.java | 15 ++--- .../v1_6_R3/SpecialPlayerInventory.java | 14 ++--- internal/v1_7_R1/pom.xml | 16 ++++++ .../internal/v1_7_R1/AnySilentContainer.java | 12 ++-- .../internal/v1_7_R1/InventoryAccess.java | 12 ++-- .../internal/v1_7_R1/PlayerDataManager.java | 16 +++--- .../v1_7_R1/SilentContainerChest.java | 14 ++--- .../internal/v1_7_R1/SpecialEnderChest.java | 15 ++--- .../v1_7_R1/SpecialPlayerInventory.java | 14 ++--- internal/v1_7_R2/pom.xml | 16 ++++++ .../internal/v1_7_R2/AnySilentContainer.java | 12 ++-- .../internal/v1_7_R2/InventoryAccess.java | 12 ++-- .../internal/v1_7_R2/PlayerDataManager.java | 16 +++--- .../v1_7_R2/SilentContainerChest.java | 14 ++--- .../internal/v1_7_R2/SpecialEnderChest.java | 15 ++--- .../v1_7_R2/SpecialPlayerInventory.java | 14 ++--- internal/v1_7_R3/pom.xml | 16 ++++++ .../internal/v1_7_R3/AnySilentContainer.java | 12 ++-- .../internal/v1_7_R3/InventoryAccess.java | 12 ++-- .../internal/v1_7_R3/PlayerDataManager.java | 16 +++--- .../v1_7_R3/SilentContainerChest.java | 14 ++--- .../internal/v1_7_R3/SpecialEnderChest.java | 15 ++--- .../v1_7_R3/SpecialPlayerInventory.java | 14 ++--- internal/v1_7_R4/pom.xml | 16 ++++++ .../internal/v1_7_R4/AnySilentContainer.java | 12 ++-- .../internal/v1_7_R4/InventoryAccess.java | 12 ++-- .../internal/v1_7_R4/PlayerDataManager.java | 16 +++--- .../v1_7_R4/SilentContainerChest.java | 14 ++--- .../internal/v1_7_R4/SpecialEnderChest.java | 17 +++--- .../v1_7_R4/SpecialPlayerInventory.java | 14 ++--- internal/v1_8_R1/pom.xml | 16 ++++++ .../internal/v1_8_R1/AnySilentContainer.java | 6 +- .../internal/v1_8_R1/InventoryAccess.java | 12 ++-- .../internal/v1_8_R1/PlayerDataManager.java | 16 +++--- .../internal/v1_8_R1/SpecialEnderChest.java | 15 ++--- .../v1_8_R1/SpecialPlayerInventory.java | 19 ++++--- internal/v1_8_R2/pom.xml | 16 ++++++ .../internal/v1_8_R2/AnySilentContainer.java | 6 +- .../internal/v1_8_R2/InventoryAccess.java | 12 ++-- .../internal/v1_8_R2/PlayerDataManager.java | 16 +++--- .../internal/v1_8_R2/SpecialEnderChest.java | 15 ++--- .../v1_8_R2/SpecialPlayerInventory.java | 19 ++++--- internal/v1_8_R3/pom.xml | 16 ++++++ .../internal/v1_8_R3/AnySilentContainer.java | 6 +- .../internal/v1_8_R3/InventoryAccess.java | 12 ++-- .../internal/v1_8_R3/PlayerDataManager.java | 16 +++--- .../internal/v1_8_R3/SpecialEnderChest.java | 15 ++--- .../v1_8_R3/SpecialPlayerInventory.java | 19 ++++--- internal/v1_9_R1/pom.xml | 16 ++++++ .../internal/v1_9_R1/AnySilentContainer.java | 6 +- .../internal/v1_9_R1/InventoryAccess.java | 12 ++-- .../internal/v1_9_R1/PlayerDataManager.java | 16 +++--- .../internal/v1_9_R1/SpecialEnderChest.java | 15 ++--- .../v1_9_R1/SpecialPlayerInventory.java | 19 ++++--- internal/v1_9_R2/pom.xml | 16 ++++++ .../internal/v1_9_R2/AnySilentContainer.java | 6 +- .../internal/v1_9_R2/InventoryAccess.java | 12 ++-- .../internal/v1_9_R2/PlayerDataManager.java | 16 +++--- .../internal/v1_9_R2/SpecialEnderChest.java | 15 ++--- .../v1_9_R2/SpecialPlayerInventory.java | 25 ++++----- plugin/plugin-core/pom.xml | 18 +++++- .../main/java/com/lishid/openinv/OpenInv.java | 8 +-- .../commands/AnyChestPluginCommand.java | 6 +- .../commands/OpenEnderPluginCommand.java | 8 +-- .../commands/OpenInvPluginCommand.java | 8 +-- .../commands/SearchEnchantPluginCommand.java | 18 +++++- .../commands/SearchInvPluginCommand.java | 15 +++-- .../commands/SilentChestPluginCommand.java | 12 ++-- .../listeners/InventoryClickListener.java | 12 ++-- .../listeners/InventoryCloseListener.java | 16 ++++++ .../openinv/listeners/PlayerListener.java | 12 ++-- .../openinv/listeners/PluginListener.java | 18 +++++- .../lishid/openinv/util/ConfigUpdater.java | 16 ++++++ plugin/plugin-v1_10_R1/pom.xml | 16 ++++++ .../listeners/InventoryDragListener.java | 18 +++++- plugin/pom.xml | 18 +++++- pom.xml | 21 ++++++- 165 files changed, 1603 insertions(+), 921 deletions(-) diff --git a/README.MD b/README.MD index 0b62e35..f4a8358 100644 --- a/README.MD +++ b/README.MD @@ -140,15 +140,15 @@ The final file is target/OpenInv.jar ## License ``` -Copyright (C) 2011-2014 lishid. All rights reserved. +Copyright (C) 2011-2018 lishid. All rights reserved. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3. +the Free Software Foundation, version 3. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License diff --git a/api/pom.xml b/api/pom.xml index b9da1b7..1abe345 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/api/src/main/java/com/lishid/openinv/IOpenInv.java b/api/src/main/java/com/lishid/openinv/IOpenInv.java index 55a255b..58f3369 100644 --- a/api/src/main/java/com/lishid/openinv/IOpenInv.java +++ b/api/src/main/java/com/lishid/openinv/IOpenInv.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv; import javax.annotation.Nullable; @@ -26,7 +42,7 @@ public interface IOpenInv { * * @return false unless configured otherwise */ - public boolean disableSaving(); + boolean disableSaving(); /** * Gets the active ISilentContainer implementation. May return null if the server version is @@ -35,7 +51,7 @@ public interface IOpenInv { * @return the ISilentContainer * @throws IllegalStateException if the server version is unsupported */ - public IAnySilentContainer getAnySilentContainer(); + IAnySilentContainer getAnySilentContainer(); /** * Gets an ISpecialEnderChest for the given Player. Returns null if the ISpecialEnderChest could @@ -49,7 +65,7 @@ public interface IOpenInv { */ @Deprecated @Nullable - public ISpecialEnderChest getEnderChest(Player player, boolean online); + ISpecialEnderChest getEnderChest(Player player, boolean online); /** * Gets an ISpecialPlayerInventory for the given Player. Returns null if the @@ -63,7 +79,7 @@ public interface IOpenInv { */ @Deprecated @Nullable - public ISpecialPlayerInventory getInventory(Player player, boolean online); + ISpecialPlayerInventory getInventory(Player player, boolean online); /** * Gets the active IInventoryAccess implementation. May return null if the server version is @@ -72,7 +88,7 @@ public interface IOpenInv { * @return the IInventoryAccess * @throws IllegalStateException if the server version is unsupported */ - public IInventoryAccess getInventoryAccess(); + IInventoryAccess getInventoryAccess(); /** * Gets the provided player's AnyChest setting. @@ -81,7 +97,7 @@ public interface IOpenInv { * @return true if AnyChest is enabled * @throws IllegalStateException if the server version is unsupported */ - public boolean getPlayerAnyChestStatus(OfflinePlayer player); + boolean getPlayerAnyChestStatus(OfflinePlayer player); /** * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value @@ -91,7 +107,7 @@ public interface IOpenInv { * @return the identifier * @throws IllegalStateException if the server version is unsupported */ - public String getPlayerID(OfflinePlayer offline); + String getPlayerID(OfflinePlayer offline); /** * Gets a player's SilentChest setting. @@ -100,7 +116,7 @@ public interface IOpenInv { * @return true if SilentChest is enabled * @throws IllegalStateException if the server version is unsupported */ - public boolean getPlayerSilentChestStatus(OfflinePlayer player); + boolean getPlayerSilentChestStatus(OfflinePlayer player); /** * Gets an ISpecialEnderChest for the given Player. @@ -111,7 +127,7 @@ public interface IOpenInv { * @throws IllegalStateException if the server version is unsupported * @throws InstantiationException if the ISpecialEnderChest could not be instantiated */ - public ISpecialEnderChest getSpecialEnderChest(Player player, boolean online) throws InstantiationException; + ISpecialEnderChest getSpecialEnderChest(Player player, boolean online) throws InstantiationException; /** * Gets an ISpecialPlayerInventory for the given Player. @@ -122,14 +138,14 @@ public interface IOpenInv { * @throws IllegalStateException if the server version is unsupported * @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated */ - public ISpecialPlayerInventory getSpecialInventory(Player player, boolean online) throws InstantiationException; + ISpecialPlayerInventory getSpecialInventory(Player player, boolean online) throws InstantiationException; /** * Checks if the server version is supported by OpenInv. * * @return true if the server version is supported */ - public boolean isSupportedVersion(); + boolean isSupportedVersion(); /** * Load a Player from an OfflinePlayer. May return null under some circumstances. @@ -139,7 +155,7 @@ public interface IOpenInv { * @throws IllegalStateException if the server version is unsupported */ @Nullable - public Player loadPlayer(final OfflinePlayer offline); + Player loadPlayer(final OfflinePlayer offline); /** * Get an OfflinePlayer by name. @@ -152,7 +168,7 @@ public interface IOpenInv { * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in */ @Nullable - public OfflinePlayer matchPlayer(String name); + OfflinePlayer matchPlayer(String name); /** * Check the configuration value for whether or not OpenInv displays a notification to the user @@ -160,7 +176,7 @@ public interface IOpenInv { * * @return true unless configured otherwise */ - public boolean notifyAnyChest(); + boolean notifyAnyChest(); /** * Check the configuration value for whether or not OpenInv displays a notification to the user @@ -168,7 +184,7 @@ public interface IOpenInv { * * @return true unless configured otherwise */ - public boolean notifySilentChest(); + boolean notifySilentChest(); /** * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache @@ -178,7 +194,7 @@ public interface IOpenInv { * @param plugin the Plugin no longer holding a reference to the Player * @throws IllegalStateException if the server version is unsupported */ - public void releasePlayer(Player player, Plugin plugin); + void releasePlayer(Player player, Plugin plugin); /** * Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to @@ -203,7 +219,7 @@ public interface IOpenInv { * @param plugin the Plugin holding the reference to the Player * @throws IllegalStateException if the server version is unsupported */ - public void retainPlayer(Player player, Plugin plugin); + void retainPlayer(Player player, Plugin plugin); /** * Sets a player's AnyChest setting. @@ -212,7 +228,7 @@ public interface IOpenInv { * @param status the status * @throws IllegalStateException if the server version is unsupported */ - public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status); + void setPlayerAnyChestStatus(OfflinePlayer player, boolean status); /** * Sets a player's SilentChest setting. @@ -221,7 +237,7 @@ public interface IOpenInv { * @param status the status * @throws IllegalStateException if the server version is unsupported */ - public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status); + void setPlayerSilentChestStatus(OfflinePlayer player, boolean status); /** * Forcibly unload a cached Player's data. @@ -229,6 +245,6 @@ public interface IOpenInv { * @param player the OfflinePlayer to unload * @throws IllegalStateException if the server version is unsupported */ - public void unload(OfflinePlayer player); + void unload(OfflinePlayer player); } diff --git a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java index 7eac2bf..d5c0136 100644 --- a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java +++ b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.internal; import org.bukkit.block.Block; @@ -15,14 +31,14 @@ public interface IAnySilentContainer { * @param block the Block * @return true if the container can be opened */ - public boolean activateContainer(Player player, boolean silentchest, Block block); + boolean activateContainer(Player player, boolean silentchest, Block block); /** * Closes the Player's currently open container silently, if necessary. * * @param player the Player closing a container */ - public void deactivateContainer(Player player); + void deactivateContainer(Player player); /** * Checks if the container at the given coordinates is blocked. @@ -31,7 +47,7 @@ public interface IAnySilentContainer { * @param block the Block * @return true if the container is blocked */ - public boolean isAnyContainerNeeded(Player player, Block block); + boolean isAnyContainerNeeded(Player player, Block block); /** * Checks if the given block is a container which can be unblocked or silenced. @@ -39,6 +55,6 @@ public interface IAnySilentContainer { * @param block the BlockState * @return true if the Block is a supported container */ - public boolean isAnySilentContainer(Block block); + boolean isAnySilentContainer(Block block); } diff --git a/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java b/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java index 3ea8bc6..98844f5 100644 --- a/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java +++ b/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -30,7 +30,7 @@ public interface IInventoryAccess { * @return the ISpecialEnderChest or null */ @Nullable - public ISpecialEnderChest getSpecialEnderChest(Inventory inventory); + ISpecialEnderChest getSpecialEnderChest(Inventory inventory); /** * Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by @@ -40,7 +40,7 @@ public interface IInventoryAccess { * @return the ISpecialPlayerInventory or null */ @Nullable - public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory); + ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory); /** * Check if an Inventory is an ISpecialEnderChest implementation. @@ -48,7 +48,7 @@ public interface IInventoryAccess { * @param inventory the Inventory * @return true if the Inventory is backed by an ISpecialEnderChest */ - public boolean isSpecialEnderChest(Inventory inventory); + boolean isSpecialEnderChest(Inventory inventory); /** * Check if an Inventory is an ISpecialPlayerInventory implementation. @@ -56,6 +56,6 @@ public interface IInventoryAccess { * @param inventory the Inventory * @return true if the Inventory is backed by an ISpecialPlayerInventory */ - public boolean isSpecialPlayerInventory(Inventory inventory); + boolean isSpecialPlayerInventory(Inventory inventory); } diff --git a/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java b/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java index 29489e1..12caa86 100644 --- a/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java +++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -23,28 +23,28 @@ public interface ISpecialEnderChest { /** * Gets the Inventory associated with this ISpecialEnderChest. - * + * * @return the Inventory */ - public Inventory getBukkitInventory(); + Inventory getBukkitInventory(); /** * Sets the Player associated with this ISpecialEnderChest online. - * + * * @param player the Player coming online */ - public void setPlayerOnline(Player player); + void setPlayerOnline(Player player); /** * Sets the Player associated with this ISpecialEnderChest offline. */ - public void setPlayerOffline(); + void setPlayerOffline(); /** * Gets whether or not this ISpecialEnderChest is in use. - * + * * @return true if the ISpecialEnderChest is in use */ - public boolean isInUse(); + boolean isInUse(); } diff --git a/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java b/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java index 0ee9900..fbae50e 100644 --- a/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java +++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -23,28 +23,28 @@ public interface ISpecialPlayerInventory { /** * Gets the Inventory associated with this ISpecialPlayerInventory. - * + * * @return the Inventory */ - public Inventory getBukkitInventory(); + Inventory getBukkitInventory(); /** * Sets the Player associated with this ISpecialPlayerInventory online. - * + * * @param player the Player coming online */ - public void setPlayerOnline(Player player); + void setPlayerOnline(Player player); /** * Sets the Player associated with this ISpecialPlayerInventory offline. */ - public void setPlayerOffline(); + void setPlayerOffline(); /** * Gets whether or not this ISpecialPlayerInventory is in use. - * + * * @return true if the ISpecialPlayerInventory is in use */ - public boolean isInUse(); + boolean isInUse(); } diff --git a/assembly/pom.xml b/assembly/pom.xml index 1d0de45..7f8b81c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/assembly/src/assembly/reactor-uberjar.xml b/assembly/src/assembly/reactor-uberjar.xml index 200bc85..b3ce4f0 100644 --- a/assembly/src/assembly/reactor-uberjar.xml +++ b/assembly/src/assembly/reactor-uberjar.xml @@ -1,3 +1,19 @@ + + diff --git a/common/pom.xml b/common/pom.xml index e991823..912ac5a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java b/common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java index 4024564..12df4a3 100644 --- a/common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java +++ b/common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -27,33 +27,33 @@ public interface IPlayerDataManager { * Loads a Player for an OfflinePlayer. *

* This method is potentially blocking, and should not be called on the main thread. - * - * @param offline - * @return + * + * @param offline the OfflinePlayer + * @return the Player loaded */ - public Player loadPlayer(OfflinePlayer offline); + Player loadPlayer(OfflinePlayer offline); /** * Gets a unique identifying string for an OfflinePlayer. - * - * @param player - * @return + * + * @param offline the OfflinePlayer + * @return the unique identifier */ - public String getPlayerDataID(OfflinePlayer player); + String getPlayerDataID(OfflinePlayer offline); /** * Gets an OfflinePlayer by the given unique identifier. - * + * * @param identifier the unique identifier * @return the OfflinePlayer, or null if no exact match was found */ - public OfflinePlayer getPlayerByID(String identifier); + OfflinePlayer getPlayerByID(String identifier); /** * Gets a Collection of all Players currently online. - * + * * @return the Collection of Players */ - public Collection getOnlinePlayers(); + Collection getOnlinePlayers(); } diff --git a/common/src/main/java/com/lishid/openinv/util/Cache.java b/common/src/main/java/com/lishid/openinv/util/Cache.java index d0f40df..dd6d0da 100644 --- a/common/src/main/java/com/lishid/openinv/util/Cache.java +++ b/common/src/main/java/com/lishid/openinv/util/Cache.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.util; import java.util.ArrayList; diff --git a/common/src/main/java/com/lishid/openinv/util/Function.java b/common/src/main/java/com/lishid/openinv/util/Function.java index 37894c1..05813b0 100644 --- a/common/src/main/java/com/lishid/openinv/util/Function.java +++ b/common/src/main/java/com/lishid/openinv/util/Function.java @@ -1,8 +1,24 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.util; /** * Abstraction for some simple cache calls. - * + * * @author Jikoo */ public abstract class Function { diff --git a/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java b/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java index 18a5f6a..652198a 100644 --- a/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java +++ b/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -108,9 +108,7 @@ public class InternalAccessor { for (Object object : params) { builder.append(object.getClass().getName()).append(", "); } - if (params.length > 0) { - builder.delete(builder.length() - 2, builder.length()); - } + builder.delete(builder.length() - 2, builder.length()); String message = builder.append(']').toString(); this.plugin.getLogger().warning(message); diff --git a/common/src/main/java/com/lishid/openinv/util/Permissions.java b/common/src/main/java/com/lishid/openinv/util/Permissions.java index 3d8e4ec..56a3038 100644 --- a/common/src/main/java/com/lishid/openinv/util/Permissions.java +++ b/common/src/main/java/com/lishid/openinv/util/Permissions.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.util; import org.bukkit.permissions.Permissible; diff --git a/internal/1_4_5/pom.xml b/internal/1_4_5/pom.xml index 4680288..c00c0d1 100644 --- a/internal/1_4_5/pom.xml +++ b/internal/1_4_5/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 4bff7b8..494e124 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 471fc75..5b7a11c 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index c9a126a..4661453 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index fd3e707..a192485 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_4_5.IInventory; import net.minecraft.server.v1_4_5.ItemStack; import net.minecraft.server.v1_4_5.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index ab2cb5c..83cf09a 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,13 +42,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; public SpecialEnderChest(Player player, Boolean online) { - super(((CraftPlayer) player).getHandle().getEnderChest().getName(), - ((CraftPlayer) player).getHandle().getEnderChest().getSize()); + super(PlayerDataManager.getHandle(player).getEnderChest().getName(), + PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index fcf3231..fb70752 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/1_4_6/pom.xml b/internal/1_4_6/pom.xml index 35228c2..666da4e 100644 --- a/internal/1_4_6/pom.xml +++ b/internal/1_4_6/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index f420591..024d64e 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 2fc37fc..72a209d 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index e708908..9b56c4b 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index 93e1589..bc9d1d3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_4_6.IInventory; import net.minecraft.server.v1_4_6.ItemStack; import net.minecraft.server.v1_4_6.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index e019d03..f6eebc1 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,13 +42,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; public SpecialEnderChest(Player player, Boolean online) { - super(((CraftPlayer) player).getHandle().getEnderChest().getName(), - ((CraftPlayer) player).getHandle().getEnderChest().getSize()); + super(PlayerDataManager.getHandle(player).getEnderChest().getName(), + PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 722ec74..0976e2b 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/pom.xml b/internal/pom.xml index ee29de8..1540b78 100644 --- a/internal/pom.xml +++ b/internal/pom.xml @@ -1,4 +1,19 @@ - + + 4.0.0 @@ -44,7 +59,6 @@ v1_6_R1 v1_6_R2 v1_6_R3 - v1_7_R1 v1_7_R2 v1_7_R3 @@ -62,4 +76,4 @@ - \ No newline at end of file + diff --git a/internal/v1_10_R1/pom.xml b/internal/v1_10_R1/pom.xml index d1199e7..63fcf89 100644 --- a/internal/v1_10_R1/pom.xml +++ b/internal/v1_10_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 8f6d86c..e571d4f 100644 --- a/internal/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 @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/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 index ae1e7b3..6d13fdf 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index ca18f6f..dc11335 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index 66adece..95c7482 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -36,12 +36,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index de99b24..36072a8 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,7 +34,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[4]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -286,6 +286,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + @Override public boolean a(EntityHuman entityhuman) { return true; diff --git a/internal/v1_11_R1/pom.xml b/internal/v1_11_R1/pom.xml index 57f53a2..4b29bf5 100644 --- a/internal/v1_11_R1/pom.xml +++ b/internal/v1_11_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index cb0a110..42a42f2 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 730e83a..741536c 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index af39f4b..8d1566c 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index 9c235a9..a4115f0 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -37,12 +37,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 3731b70..b403d29 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -36,7 +36,7 @@ import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory; public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -70,7 +70,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP field = PlayerInventory.class.getDeclaredField("g"); field.setAccessible(true); modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL); - field.set(inventory, Arrays.asList(new NonNullList[] { items, armor, extraSlots })); + field.set(inventory, Arrays.asList(items, armor, extraSlots)); } catch (NoSuchFieldException e) { // Unable to set final fields to item arrays, we're screwed. Noisily fail. e.printStackTrace(); @@ -89,7 +89,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP @Override public void setPlayerOnline(Player player) { if (!playerOnline) { - this.player = PlayerDataManager.getHandle(player);; + this.player = PlayerDataManager.getHandle(player); setItemArrays(this.player.inventory, items, armor, extraSlots); playerOnline = true; } @@ -157,7 +157,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return ItemStack.a; } - return list == null || list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j); + return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j); } @Override @@ -182,7 +182,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return ItemStack.a; } - if (list != null && !list.get(i).isEmpty()) { + if (!list.get(i).isEmpty()) { ItemStack itemstack = list.get(i); list.set(i, ItemStack.a); @@ -215,9 +215,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return; } - if (list != null) { - list.set(i, itemstack); - } + list.set(i, itemstack); } private int getReversedItemSlotNum(int i) { @@ -251,6 +249,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + @Override public boolean a(EntityHuman entityhuman) { return true; diff --git a/internal/v1_12_R1/pom.xml b/internal/v1_12_R1/pom.xml index 8016e64..ee4be3c 100644 --- a/internal/v1_12_R1/pom.xml +++ b/internal/v1_12_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/AnySilentContainer.java b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/AnySilentContainer.java index 6502758..493eb5d 100644 --- a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/AnySilentContainer.java +++ b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/AnySilentContainer.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/InventoryAccess.java b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/InventoryAccess.java index 0da8f58..06c597a 100644 --- a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/InventoryAccess.java +++ b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/InventoryAccess.java @@ -1,11 +1,17 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. This program is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public License as published - * by the Free Software Foundation, version 3. This program is distributed in the hope that it will - * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should - * have received a copy of the GNU General Public License along with this program. If not, see - * . + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.lishid.openinv.internal.v1_12_R1; diff --git a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/PlayerDataManager.java b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/PlayerDataManager.java index 6c83edd..885cde8 100644 --- a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/PlayerDataManager.java +++ b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/PlayerDataManager.java @@ -1,11 +1,17 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. This program is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public License as published - * by the Free Software Foundation, version 3. This program is distributed in the hope that it will - * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should - * have received a copy of the GNU General Public License along with this program. If not, see - * . + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.lishid.openinv.internal.v1_12_R1; @@ -74,8 +80,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(final OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(final OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialEnderChest.java b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialEnderChest.java index e052616..d86c01f 100644 --- a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialEnderChest.java +++ b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialEnderChest.java @@ -1,11 +1,17 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. This program is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public License as published - * by the Free Software Foundation, version 3. This program is distributed in the hope that it will - * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should - * have received a copy of the GNU General Public License along with this program. If not, see - * . + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.lishid.openinv.internal.v1_12_R1; @@ -32,12 +38,13 @@ public class SpecialEnderChest extends InventorySubcontainer private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(final Player player, final Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); @@ -64,13 +71,8 @@ public class SpecialEnderChest extends InventorySubcontainer Field field = InventorySubcontainer.class.getField("items"); modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL); field.set(subcontainer, list); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } catch (SecurityException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (NoSuchFieldException | SecurityException | IllegalArgumentException + | IllegalAccessException e) { e.printStackTrace(); } } diff --git a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialPlayerInventory.java b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialPlayerInventory.java index 1687b98..5bbf01e 100644 --- a/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialPlayerInventory.java +++ b/internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialPlayerInventory.java @@ -1,11 +1,17 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. This program is free software: you can - * redistribute it and/or modify it under the terms of the GNU General Public License as published - * by the Free Software Foundation, version 3. This program is distributed in the hope that it will - * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should - * have received a copy of the GNU General Public License along with this program. If not, see - * . + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.lishid.openinv.internal.v1_12_R1; @@ -30,7 +36,7 @@ import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -82,6 +88,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return this.player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + private int getReversedArmorSlotNum(final int i) { if (i == 0) { return 3; @@ -138,9 +149,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return; } - if (list != null) { - list.set(i, itemstack); - } + list.set(i, itemstack); } private void setItemArrays(final PlayerInventory inventory, final NonNullList items, @@ -169,14 +178,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP field = PlayerInventory.class.getDeclaredField("f"); field.setAccessible(true); modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL); - field.set(inventory, Arrays.asList(new NonNullList[] { items, armor, extraSlots })); - } catch (NoSuchFieldException e) { + field.set(inventory, Arrays.asList(items, armor, extraSlots)); + } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { // Unable to set final fields to item lists, we're screwed. Noisily fail. e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); } } @@ -189,7 +194,6 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP public void setPlayerOnline(final Player player) { if (!this.playerOnline) { this.player = PlayerDataManager.getHandle(player); - ; this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots); this.playerOnline = true; } @@ -217,7 +221,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return ItemStack.a; } - return list == null || list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j); + return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j); } @Override @@ -242,7 +246,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return ItemStack.a; } - if (list != null && !list.get(i).isEmpty()) { + if (!list.get(i).isEmpty()) { ItemStack itemstack = list.get(i); list.set(i, ItemStack.a); diff --git a/internal/v1_4_R1/pom.xml b/internal/v1_4_R1/pom.xml index eb6489c..9524856 100644 --- a/internal/v1_4_R1/pom.xml +++ b/internal/v1_4_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 8bdcbd3..8308155 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index eddf654..e452647 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index e89517e..071c429 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -60,8 +60,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index 9554dad..04be0cb 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_4_R1.IInventory; import net.minecraft.server.v1_4_R1.ItemStack; import net.minecraft.server.v1_4_R1.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 7108e07..5deeee7 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,13 +42,14 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 4306769..ca45c7a 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_5_R2/pom.xml b/internal/v1_5_R2/pom.xml index 0be62b3..a6f2d41 100644 --- a/internal/v1_5_R2/pom.xml +++ b/internal/v1_5_R2/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index b2f3c43..57162f5 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index bf22dc9..487e8c7 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 38bf6b9..58862d3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index e7317cd..f5832ee 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_5_R2.IInventory; import net.minecraft.server.v1_5_R2.ItemStack; import net.minecraft.server.v1_5_R2.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 26c0285..375e0c4 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().c(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index b47eaf1..f599172 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_5_R3/pom.xml b/internal/v1_5_R3/pom.xml index 2e2ebeb..9f87949 100644 --- a/internal/v1_5_R3/pom.xml +++ b/internal/v1_5_R3/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 02dc321..6a68365 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index a58d68b..3177516 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 18b6be1..455cfb1 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index e0b217c..b80ed18 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_5_R3.IInventory; import net.minecraft.server.v1_5_R3.ItemStack; import net.minecraft.server.v1_5_R3.PlayerInventory; -public class SilentContainerChest extends ContainerChest { public IInventory inv; +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 47ef32e..816e5b7 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().c(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index f212392..a0b44d0 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_6_R1/pom.xml b/internal/v1_6_R1/pom.xml index aed0023..c933914 100644 --- a/internal/v1_6_R1/pom.xml +++ b/internal/v1_6_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 660fefd..81ab633 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 24c7ccd..11859fd 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index b186ba3..fb7b230 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index e1ea429..56630e2 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_6_R1.IInventory; import net.minecraft.server.v1_6_R1.ItemStack; import net.minecraft.server.v1_6_R1.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index a1051c8..10534d4 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().c(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index ef3cb03..7791a58 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_6_R2/pom.xml b/internal/v1_6_R2/pom.xml index 35af0a2..9015af3 100644 --- a/internal/v1_6_R2/pom.xml +++ b/internal/v1_6_R2/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index bd40860..fd40053 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 6dbaf56..24ea8a3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index f0f7b69..100f447 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index d86ca95..f128e6b 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_6_R2.IInventory; import net.minecraft.server.v1_6_R2.ItemStack; import net.minecraft.server.v1_6_R2.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 86ae0c0..d0810d0 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().c(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index f25c8cc..48a6909 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_6_R3/pom.xml b/internal/v1_6_R3/pom.xml index b5ca6c5..481bf38 100644 --- a/internal/v1_6_R3/pom.xml +++ b/internal/v1_6_R3/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index d61e09c..580de75 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 1a41928..b11c4a0 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index f930485..4843ab3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -59,8 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index 19b20d6..9d6c56e 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_6_R3.IInventory; import net.minecraft.server.v1_6_R3.ItemStack; import net.minecraft.server.v1_6_R3.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 810fd72..a5dfeab 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().c(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index c6d4aac..a1d0702 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_7_R1/pom.xml b/internal/v1_7_R1/pom.xml index df2b77b..2108d04 100644 --- a/internal/v1_7_R1/pom.xml +++ b/internal/v1_7_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index f400239..3b31a04 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 056d132..8490c0c 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index e063345..ca746d8 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -60,8 +60,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index ea7861c..90bb62d 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_7_R1.IInventory; import net.minecraft.server.v1_7_R1.ItemStack; import net.minecraft.server.v1_7_R1.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 9ca3a5a..bfbb711 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(), PlayerDataManager.getHandle(player).getEnderChest().k_(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 911d2fb..b16870f 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_7_R2/pom.xml b/internal/v1_7_R2/pom.xml index 9b9c3e9..a28d2bb 100644 --- a/internal/v1_7_R2/pom.xml +++ b/internal/v1_7_R2/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index d2f541c..622f2a2 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index bb8464f..022379a 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index d079981..cfe40d5 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getName(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getName(); } @Override diff --git a/internal/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 index d6c943a..f04e1e3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_7_R2.IInventory; import net.minecraft.server.v1_7_R2.ItemStack; import net.minecraft.server.v1_7_R2.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 1b12b80..4ee26f6 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(((CraftPlayer) player).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) player).getHandle().getEnderChest().k_(), ((CraftPlayer) player).getHandle().getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index f259f31..6302cb6 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_7_R3/pom.xml b/internal/v1_7_R3/pom.xml index 0548a7e..59a47c2 100644 --- a/internal/v1_7_R3/pom.xml +++ b/internal/v1_7_R3/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 1675080..8d13937 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index f62dbc4..bdce49a 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index d8a7070..3fa9363 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index 3e89651..7397564 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_7_R3.IInventory; import net.minecraft.server.v1_7_R3.ItemStack; import net.minecraft.server.v1_7_R3.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 349fccb..0110821 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -42,7 +42,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); private final List transaction = new ArrayList(); - private boolean playerOnline = false; + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(), PlayerDataManager.getHandle(player).getEnderChest().k_(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 5126447..18c1797 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_7_R4/pom.xml b/internal/v1_7_R4/pom.xml index 54d53aa..1f218d1 100644 --- a/internal/v1_7_R4/pom.xml +++ b/internal/v1_7_R4/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 6323e5d..4a967c5 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 4f5e0c3..fd7c8e1 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 0b765ae..acddbdf 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -60,8 +60,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index 1243cdd..0126208 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,7 +22,7 @@ import net.minecraft.server.v1_7_R4.IInventory; import net.minecraft.server.v1_7_R4.ItemStack; import net.minecraft.server.v1_7_R4.PlayerInventory; -public class SilentContainerChest extends ContainerChest { +class SilentContainerChest extends ContainerChest { public SilentContainerChest(IInventory i1, IInventory i2) { super(i1, i2); diff --git a/internal/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 index 7716d6a..78010da 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -41,8 +41,8 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - public List transaction = new ArrayList(); - private boolean playerOnline = false; + private final List transaction = new ArrayList(); + private boolean playerOnline; private CraftPlayer owner; private int maxStack = MAX_STACK; @@ -50,6 +50,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(), PlayerDataManager.getHandle(player).getEnderChest().k_(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.owner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index c4cadc8..b8925a3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); diff --git a/internal/v1_8_R1/pom.xml b/internal/v1_8_R1/pom.xml index 19f8bd7..cc70d2f 100644 --- a/internal/v1_8_R1/pom.xml +++ b/internal/v1_8_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index c579867..12009d1 100644 --- a/internal/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 @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/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 index 6f39a6d..7597149 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 14b9fd4..a9ee9f8 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index b404385..9e28b7a 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,12 +34,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index ad1911a..ce38472 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -224,4 +224,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + } diff --git a/internal/v1_8_R2/pom.xml b/internal/v1_8_R2/pom.xml index 8c46da0..385d775 100644 --- a/internal/v1_8_R2/pom.xml +++ b/internal/v1_8_R2/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index f6dae14..3e08935 100644 --- a/internal/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 @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/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 index 7a11e0b..0c02956 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index febbc68..a81b0cf 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index 278aa18..4c9f3b8 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,12 +34,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 0f4e596..cb12205 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -224,4 +224,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + } diff --git a/internal/v1_8_R3/pom.xml b/internal/v1_8_R3/pom.xml index d2ed8bb..3be2f70 100644 --- a/internal/v1_8_R3/pom.xml +++ b/internal/v1_8_R3/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 7310cf0..d252d7e 100644 --- a/internal/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 @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/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 index 98c3357..5fe208d 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index 76bcaf2..ee1b091 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index 1b4b8f4..3cabcd2 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,12 +34,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index 8483a4c..c38d875 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,7 +30,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[5]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -224,4 +224,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + } diff --git a/internal/v1_9_R1/pom.xml b/internal/v1_9_R1/pom.xml index 69c3974..a7b7521 100644 --- a/internal/v1_9_R1/pom.xml +++ b/internal/v1_9_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 0c27d4c..6ac66fb 100644 --- a/internal/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 @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/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 index 4cc1f93..991df8a 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index b2e3988..43db944 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index ef2b09f..ee7d2dc 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,12 +34,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index f86e4b2..1e3f8de 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -33,7 +33,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private final ItemStack[] extra = new ItemStack[4]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -285,4 +285,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + } diff --git a/internal/v1_9_R2/pom.xml b/internal/v1_9_R2/pom.xml index abc8f08..95a4671 100644 --- a/internal/v1_9_R2/pom.xml +++ b/internal/v1_9_R2/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 diff --git a/internal/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 index 42f6647..45f63c4 100644 --- a/internal/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 @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/internal/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 index fb2d2cc..14d0a01 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/internal/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 index ff004f4..74199f3 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -61,8 +61,8 @@ public class PlayerDataManager implements IPlayerDataManager { } @Override - public String getPlayerDataID(OfflinePlayer player) { - return player.getUniqueId().toString(); + public String getPlayerDataID(OfflinePlayer offline) { + return offline.getUniqueId().toString(); } @Override diff --git a/internal/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 index d95ea82..83bcec6 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -34,12 +34,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento private final InventoryEnderChest enderChest; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialEnderChest(Player player, Boolean online) { super(PlayerDataManager.getHandle(player).getEnderChest().getName(), PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(), PlayerDataManager.getHandle(player).getEnderChest().getSize()); + this.playerOnline = online; EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); this.enderChest = nmsPlayer.getEnderChest(); this.bukkitOwner = nmsPlayer.getBukkitEntity(); diff --git a/internal/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 index b4e23de..ad146d4 100644 --- a/internal/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 @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -27,14 +27,13 @@ import org.bukkit.inventory.Inventory; import net.minecraft.server.v1_9_R2.ItemStack; import net.minecraft.server.v1_9_R2.PlayerInventory; -import org.bukkit.craftbukkit.v1_9_R2.entity.CraftHumanEntity; import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory; public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { private final ItemStack[] extra = new ItemStack[4]; private final CraftInventory inventory = new CraftInventory(this); - private boolean playerOnline = false; + private boolean playerOnline; public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -103,11 +102,6 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return !this.getViewers().isEmpty(); } - @Override - public void onClose(CraftHumanEntity who) { - super.onClose(who); - } - @Override public ItemStack[] getContents() { ItemStack[] contents = new ItemStack[getSize()]; @@ -291,4 +285,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return player.getName(); } + @Override + public boolean hasCustomName() { + return true; + } + } diff --git a/plugin/plugin-core/pom.xml b/plugin/plugin-core/pom.xml index d142fc7..ed7c357 100644 --- a/plugin/plugin-core/pom.xml +++ b/plugin/plugin-core/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 @@ -40,4 +56,4 @@ - \ No newline at end of file + diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java index 02e05b1..c3ee807 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/OpenInv.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -366,7 +366,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv { Future future = Bukkit.getScheduler().callSyncMethod(this, new Callable() { @Override - public Player call() throws Exception { + public Player call() { return OpenInv.this.accessor.getPlayerDataManager().loadPlayer(offline); } }); diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java index d917e2d..ae132e8 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java index ec2e907..4239555 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -56,7 +56,7 @@ public class OpenEnderPluginCommand implements CommandExecutor { // History management String history = this.openEnderHistory.get(player); - if (history == null || history == "") { + if (history == null || history.isEmpty()) { history = player.getName(); this.openEnderHistory.put(player, history); } diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java index 9aac909..ab62861 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java @@ -1,13 +1,13 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. + * Copyright (C) 2011-2018 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. + * the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -56,7 +56,7 @@ public class OpenInvPluginCommand implements CommandExecutor { // History management String history = this.openInvHistory.get(player); - if (history == null || history == "") { + if (history == null || history.isEmpty()) { history = player.getName(); this.openInvHistory.put(player, history); } diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java index ec50990..522107b 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.commands; import com.lishid.openinv.OpenInv; @@ -15,7 +31,7 @@ import org.bukkit.inventory.meta.ItemMeta; /** * Command adding the ability to search online players' inventories for enchantments of a specific * type at or above the level specified. - * + * * @author Jikoo */ public class SearchEnchantPluginCommand implements CommandExecutor { diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java index 2979593..267d1ad 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -41,8 +41,7 @@ public class SearchInvPluginCommand implements CommandExecutor { int count = 1; if (args.length >= 1) { - String[] gData = null; - gData = args[0].split(":"); + String[] gData = args[0].split(":"); material = Material.matchMaterial(gData[0]); } diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java index 3710f6e..1019234 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java index f9b4fe7..63a4718 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryCloseListener.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryCloseListener.java index 73fe3eb..988a3d8 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryCloseListener.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/InventoryCloseListener.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.listeners; import com.lishid.openinv.IOpenInv; diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java index 984bbdc..b34914f 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PlayerListener.java @@ -1,15 +1,15 @@ /* - * Copyright (C) 2011-2014 lishid. All rights reserved. - * + * Copyright (C) 2011-2018 lishid. All rights reserved. + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * + * the Free Software Foundation, version 3. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PluginListener.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PluginListener.java index ea7dea8..158a434 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PluginListener.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/listeners/PluginListener.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.listeners; import com.lishid.openinv.OpenInv; @@ -8,7 +24,7 @@ import org.bukkit.event.server.PluginDisableEvent; /** * Listener for plugin-related events. - * + * * @author Jikoo */ public class PluginListener implements Listener { diff --git a/plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java b/plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java index 81d33cb..45aff2b 100644 --- a/plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java +++ b/plugin/plugin-core/src/main/java/com/lishid/openinv/util/ConfigUpdater.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.util; import java.io.File; diff --git a/plugin/plugin-v1_10_R1/pom.xml b/plugin/plugin-v1_10_R1/pom.xml index 2f257bc..41e2f2b 100644 --- a/plugin/plugin-v1_10_R1/pom.xml +++ b/plugin/plugin-v1_10_R1/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 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 index 1b2f18a..520b762 100644 --- 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 @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2011-2018 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.lishid.openinv.listeners; import com.lishid.openinv.IOpenInv; @@ -12,7 +28,7 @@ import org.bukkit.inventory.Inventory; /** * Listener for InventoryDragEvents to prevent unpermitted modification of special inventories. - * + * * @author Jikoo */ public class InventoryDragListener implements Listener { diff --git a/plugin/pom.xml b/plugin/pom.xml index 10dd706..6344252 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 @@ -18,4 +34,4 @@ plugin-core - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index f0639a5..fad1666 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,19 @@ - + + 4.0.0 @@ -26,7 +41,7 @@ @@ -107,4 +122,4 @@ - \ No newline at end of file +