Bump version to 3.3.4 for release

This may break functionality on C(K)auldron and other server implementations with different remapping names.

README.MD

@@ -140,7 +140,7 @@ 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

api/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

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 <http://www.gnu.org/licenses/>.
+ */
+
 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,35 +51,35 @@ 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
      * not be instantiated.
      *
-     * @deprecated Use {@link IOpenInv#getSpecialEnderChest(Player, boolean)}
      * @param player the Player
      * @param online true if the Player is currently online
      * @return the ISpecialEnderChest
      * @throws IllegalStateException if the server version is unsupported
+     * @deprecated Use {@link IOpenInv#getSpecialEnderChest(Player, boolean)}
      */
     @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
      * ISpecialPlayerInventory could not be instantiated.
      *
-     * @deprecated Use {@link IOpenInv#getSpecialInventory(Player, boolean)}
      * @param player the Player
      * @param online true if the Player is currently online
      * @return the ISpecialPlayerInventory
      * @throws IllegalStateException if the server version is unsupported
+     * @deprecated Use {@link IOpenInv#getSpecialInventory(Player, boolean)}
      */
     @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);
 
 }

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 <http://www.gnu.org/licenses/>.
+ */
+
 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);
 
 }

api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);
 
 }

api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -26,25 +26,25 @@ public interface 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();
 
 }

api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -26,25 +26,25 @@ public interface 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();
 
 }

assembly/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

assembly/src/assembly/reactor-uberjar.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

common/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -22,7 +38,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -28,18 +28,18 @@ public interface IPlayerDataManager {
      * </p>
      * 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.
@@ -47,13 +47,13 @@ public interface IPlayerDataManager {
      * @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<? extends Player> getOnlinePlayers();
+	Collection<? extends Player> getOnlinePlayers();
 
 }

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 <http://www.gnu.org/licenses/>.
+ */
+
 package com.lishid.openinv.util;
 
 import java.util.ArrayList;
@@ -41,7 +57,7 @@ public class Cache<K, V> {
                 new Comparator<K>() {
                     @Override
                     public int compare(final K k1, final K k2) {
-                        return 0;
+                        return k1 == k2 || k1 != null && k1.equals(k2) ? 0 : 1;
                     }
                 });
 

common/src/main/java/com/lishid/openinv/util/Function.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 <http://www.gnu.org/licenses/>.
+ */
+
 package com.lishid.openinv.util;
 
 /**

common/src/main/java/com/lishid/openinv/util/InternalAccessor.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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());
-        }
 
         String message = builder.append(']').toString();
         this.plugin.getLogger().warning(message);

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 <http://www.gnu.org/licenses/>.
+ */
+
 package com.lishid.openinv.util;
 
 import org.bukkit.permissions.Permissible;
@@ -9,9 +25,9 @@ public enum Permissions {
     EXEMPT("exempt"),
     CROSSWORLD("crossworld"),
     SILENT("silent"),
-    SILENT_DEFAULT("silent", "default"),
+    SILENT_DEFAULT("silent.default"),
     ANYCHEST("anychest"),
-    ANY_DEFAULT("any", "default"),
+    ANY_DEFAULT("any.default"),
     ENDERCHEST("openender"),
     ENDERCHEST_ALL("openenderall"),
     SEARCH("search"),
@@ -19,31 +35,35 @@ public enum Permissions {
     EDITENDER("editender"),
     OPENSELF("openself");
 
-    private final String[] permission;
+    private final String permission;
 
-    Permissions(String... permissions) {
-        this.permission = new String[permissions.length + 1];
-        this.permission[0] = "OpenInv";
-        System.arraycopy(permissions, 0, this.permission, 1, permissions.length);
+    Permissions(String permission) {
+        this.permission = "OpenInv." + permission;
     }
 
     public boolean hasPermission(Permissible permissible) {
-        StringBuilder permissionBuilder = new StringBuilder();
 
-        // Support wildcard nodes.
-        for (int i = 0; i < permission.length; i++) {
-            if (permissible.hasPermission(permissionBuilder.toString() + "*")) {
-                return true;
-            }
-            permissionBuilder.append(permission[i]).append('.');
+        boolean hasPermission = permissible.hasPermission(permission);
+        if (hasPermission || permissible.isPermissionSet(permission)) {
+            return hasPermission;
         }
 
-        // Delete trailing period.
-        if (permissionBuilder.length() > 0) {
-            permissionBuilder.deleteCharAt(permissionBuilder.length() - 1);
+        StringBuilder permissionDestroyer = new StringBuilder(permission);
+        for (int lastPeriod = permissionDestroyer.lastIndexOf("."); lastPeriod > 0;
+                lastPeriod = permissionDestroyer.lastIndexOf(".")) {
+            permissionDestroyer.delete(lastPeriod + 1, permissionDestroyer.length()).append('*');
+
+            hasPermission = permissible.hasPermission(permissionDestroyer.toString());
+            if (hasPermission || permissible.isPermissionSet(permissionDestroyer.toString())) {
+                return hasPermission;
             }
 
-        return permissible.hasPermission(permissionBuilder.toString());
+            permissionDestroyer.delete(lastPeriod, permissionDestroyer.length());
+
+        }
+
+        return permissible.hasPermission("*");
+
     }
 
 }

internal/1_4_5/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/1_4_6/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/pom.xml

@@ -1,11 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>
@@ -26,8 +41,8 @@
       <id>recent</id>
       <!-- The recent profile is for the most recent 2 versions. -->
       <modules>
-        <module>v1_11_R1</module>
         <module>v1_12_R1</module>
+        <module>v1_13_R1</module>
       </modules>
     </profile>
 
@@ -44,7 +59,6 @@
         <module>v1_6_R1</module>
         <module>v1_6_R2</module>
         <module>v1_6_R3</module>
-        <!-- TODO: Recompile CB for 1_7_R1 through 1_7_R4, currently using whatever jars worked -->
         <module>v1_7_R1</module>
         <module>v1_7_R2</module>
         <module>v1_7_R3</module>
@@ -57,6 +71,7 @@
         <module>v1_10_R1</module>
         <module>v1_11_R1</module>
         <module>v1_12_R1</module>
+        <module>v1_13_R1</module>
       </modules>
     </profile>
 

internal/v1_10_R1/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -16,36 +16,48 @@
 
 package com.lishid.openinv.internal.v1_10_R1;
 
+import java.lang.reflect.Field;
+
 import com.lishid.openinv.internal.IAnySilentContainer;
 
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
 
 import net.minecraft.server.v1_10_R1.AxisAlignedBB;
 import net.minecraft.server.v1_10_R1.Block;
 import net.minecraft.server.v1_10_R1.BlockChest;
 import net.minecraft.server.v1_10_R1.BlockEnderChest;
 import net.minecraft.server.v1_10_R1.BlockPosition;
-import net.minecraft.server.v1_10_R1.Container;
 import net.minecraft.server.v1_10_R1.Entity;
 import net.minecraft.server.v1_10_R1.EntityOcelot;
 import net.minecraft.server.v1_10_R1.EntityPlayer;
 import net.minecraft.server.v1_10_R1.EnumDirection;
+import net.minecraft.server.v1_10_R1.EnumGamemode;
 import net.minecraft.server.v1_10_R1.ITileInventory;
 import net.minecraft.server.v1_10_R1.InventoryEnderChest;
 import net.minecraft.server.v1_10_R1.InventoryLargeChest;
-import net.minecraft.server.v1_10_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_10_R1.PlayerInteractManager;
 import net.minecraft.server.v1_10_R1.StatisticList;
 import net.minecraft.server.v1_10_R1.TileEntity;
 import net.minecraft.server.v1_10_R1.TileEntityChest;
 import net.minecraft.server.v1_10_R1.TileEntityEnderChest;
 import net.minecraft.server.v1_10_R1.World;
 
-import org.bukkit.craftbukkit.v1_10_R1.event.CraftEventFactory;
-
 public class AnySilentContainer implements IAnySilentContainer {
 
+    private Field playerInteractManagerGamemode;
+
+    public AnySilentContainer() {
+        try {
+            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
+            this.playerInteractManagerGamemode.setAccessible(true);
+        } catch (Exception e) {
+            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public boolean isAnySilentContainer(org.bukkit.block.Block block) {
         return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
@@ -144,7 +156,6 @@ public class AnySilentContainer implements IAnySilentContainer {
 
         ITileInventory tileInventory = (ITileInventory) tile;
         Block block = world.getType(blockPosition).getBlock();
-        Container container = null;
 
         if (block instanceof BlockChest) {
             for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
@@ -176,42 +187,64 @@ public class AnySilentContainer implements IAnySilentContainer {
             } else if (blockChest.g == BlockChest.Type.TRAP) {
                 player.b(StatisticList.W);
             }
-
-            if (silentchest) {
-                container = new SilentContainerChest(player.inventory, tileInventory, player);
-            }
         }
 
-        // AnyChest only - SilentChest not active or container unsupported
-        if (!silentchest || container == null) {
+        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
+        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
             player.openContainer(tileInventory);
             return true;
         }
 
-        // SilentChest
-        try {
-            // Call InventoryOpenEvent
-            container = CraftEventFactory.callInventoryOpenEvent(player, container, false);
-            if (container == null) {
+        // SilentChest requires access to setting players' gamemode directly.
+        if (this.playerInteractManagerGamemode == null) {
             return false;
         }
 
-            // Open window
-            int windowId = player.nextContainerCounter();
-            player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, tileInventory.getContainerName(), tileInventory.getScoreboardDisplayName(), tileInventory.getSize()));
-            player.activeContainer = container;
-            player.activeContainer.windowId = windowId;
-            player.activeContainer.addSlotListener(player);
-
+        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
+        this.forceGameMode(player, EnumGamemode.SPECTATOR);
+        player.openContainer(tileInventory);
+        this.forceGameMode(player, gamemode);
         return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            p.sendMessage(ChatColor.RED + "Error while sending silent container.");
-            return false;
-        }
     }
 
     @Override
-    public void deactivateContainer(final Player bukkitPlayer) {}
+    public void deactivateContainer(final Player bukkitPlayer) {
+        if (this.playerInteractManagerGamemode == null) {
+            return;
+        }
+
+        InventoryView view = bukkitPlayer.getOpenInventory();
+        switch (view.getType()) {
+            case CHEST:
+            case ENDER_CHEST:
+                break;
+            default:
+                return;
+        }
+
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
+
+        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
+        this.forceGameMode(player, EnumGamemode.SPECTATOR);
+        player.activeContainer.b(player);
+        player.activeContainer = player.defaultContainer;
+        this.forceGameMode(player, gamemode);
+    }
+
+    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
+        if (this.playerInteractManagerGamemode == null) {
+            // No need to warn repeatedly, error on startup and lack of function should be enough.
+            return;
+        }
+        try {
+            if (!this.playerInteractManagerGamemode.isAccessible()) {
+                // Just in case, ensure accessible.
+                this.playerInteractManagerGamemode.setAccessible(true);
+            }
+            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 }

internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SilentContainerChest.java

@@ -1,45 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_10_R1;
-
-import net.minecraft.server.v1_10_R1.ContainerChest;
-import net.minecraft.server.v1_10_R1.EntityHuman;
-import net.minecraft.server.v1_10_R1.IInventory;
-import net.minecraft.server.v1_10_R1.ItemStack;
-import net.minecraft.server.v1_10_R1.PlayerInventory;
-
-public class SilentContainerChest extends ContainerChest {
-
-    public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
-        super(i1, i2, e1);
-        // Send close signal
-        i2.closeContainer(e1);
-    }
-
-    @Override
-    public void b(EntityHuman entityHuman) {
-        // Don't send close signal twice, might screw up
-        PlayerInventory playerinventory = entityHuman.inventory;
-
-        if (playerinventory.getCarried() != null) {
-            ItemStack carried = playerinventory.getCarried();
-            playerinventory.setCarried(null);
-            entityHuman.drop(carried, false);
-        }
-    }
-
-}

internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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();

internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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;

internal/v1_11_R1/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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();

internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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,10 +215,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             return;
         }
 
-        if (list != null) {
         list.set(i, itemstack);
     }
-    }
 
     private int getReversedItemSlotNum(int i) {
         if (i >= 27) {
@@ -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;

internal/v1_12_R1/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_12_R1</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/AnySilentContainer.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
- * <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
 package com.lishid.openinv.internal.v1_12_R1;
@@ -56,6 +62,101 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
     }
 
+    @Override
+    public boolean isAnySilentContainer(final org.bukkit.block.Block block) {
+        if (block.getType() == Material.ENDER_CHEST) {
+            return true;
+        }
+        BlockState state = block.getState();
+        return state instanceof org.bukkit.block.Chest
+                || state instanceof org.bukkit.block.ShulkerBox;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) {
+        EntityPlayer player = PlayerDataManager.getHandle(p);
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        IBlockData blockData = world.getType(blockPosition);
+        Block block = blockData.getBlock();
+
+        if (block instanceof BlockShulkerBox) {
+            return this.isBlockedShulkerBox(world, blockPosition, blockData);
+        }
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.getType(blockPosition.up()).m();
+        }
+
+        // Check if chest is blocked or has an ocelot on top
+        if (this.isBlockedChest(world, blockPosition)) {
+            return true;
+        }
+
+        // Check for matching adjacent chests that are blocked or have an ocelot on top
+        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+            Block localBlock = world.getType(localBlockPosition).getBlock();
+
+            if (localBlock != block) {
+                continue;
+            }
+
+            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+            if (!(localTileEntity instanceof TileEntityChest)) {
+                continue;
+            }
+
+            if (this.isBlockedChest(world, localBlockPosition)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
+                                        final IBlockData blockData) {
+        // For reference, look at net.minecraft.server.BlockShulkerBox
+        TileEntity tile = world.getTileEntity(blockPosition);
+
+        if (!(tile instanceof TileEntityShulkerBox)) {
+            return false;
+        }
+
+        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
+        if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
+            AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
+                    0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
+                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
+                            enumDirection.getAdjacentZ());
+
+            return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
+        // For reference, loot at net.minecraft.server.BlockChest
+        return world.getType(blockPosition.up()).l() || this.hasOcelotOnTop(world, blockPosition);
+    }
+
+    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
+                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
+                        blockPosition.getZ() + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     @Override
     public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest,
             final org.bukkit.block.Block bukkitBlock) {
@@ -189,99 +290,4 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
     }
 
-    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
-        for (Entity localEntity : world.a(EntityOcelot.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
-            if (localEntityOcelot.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockShulkerBox) {
-            return this.isBlockedShulkerBox(world, blockPosition, blockData);
-        }
-
-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).m();
-        }
-
-        // Check if chest is blocked or has an ocelot on top
-        if (this.isBlockedChest(world, blockPosition)) {
-            return true;
-        }
-
-        // Check for matching adjacent chests that are blocked or have an ocelot on top
-        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-            Block localBlock = world.getType(localBlockPosition).getBlock();
-
-            if (localBlock != block) {
-                continue;
-            }
-
-            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-            if (!(localTileEntity instanceof TileEntityChest)) {
-                continue;
-            }
-
-            if (this.isBlockedChest(world, localBlockPosition)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isAnySilentContainer(final org.bukkit.block.Block block) {
-        if (block.getType() == Material.ENDER_CHEST) {
-            return true;
-        }
-        BlockState state = block.getState();
-        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox;
-    }
-
-    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).l() || this.hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
-            final IBlockData blockData) {
-        // For reference, look at net.minecraft.server.BlockShulkerBox
-        TileEntity tile = world.getTileEntity(blockPosition);
-
-        if (!(tile instanceof TileEntityShulkerBox)) {
-            return false;
-        }
-
-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
-                    0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
-                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
-                            enumDirection.getAdjacentZ());
-
-            return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
-        }
-
-        return false;
-    }
-
 }

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
- * <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
 package com.lishid.openinv.internal.v1_12_R1;

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
- * <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
 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

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
- * <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
 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();
         }
     }

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
- * <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
  */
 
 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,10 +149,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             return;
         }
 
-        if (list != null) {
         list.set(i, itemstack);
     }
-    }
 
     private void setItemArrays(final PlayerInventory inventory, final NonNullList<ItemStack> items,
             final NonNullList<ItemStack> armor, final NonNullList<ItemStack> extraSlots) {
@@ -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);

internal/v1_13_R1/pom.xml

@@ -0,0 +1,57 @@
+<!--
+  ~ 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 <http://www.gnu.org/licenses/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.lishid</groupId>
+    <artifactId>openinvinternal</artifactId>
+    <version>3.3.4</version>
+  </parent>
+
+  <artifactId>openinvadapter1_13_R1</artifactId>
+  <name>OpenInvAdapter1_13_R1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.13-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lishid</groupId>
+      <artifactId>openinvcommon</artifactId>
+      <version>3.3.4</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/AnySilentContainer.java

@@ -0,0 +1,293 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_13_R1;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+
+import net.minecraft.server.v1_13_R1.BlockChestTrapped;
+import net.minecraft.server.v1_13_R1.ChatMessage;
+import net.minecraft.server.v1_13_R1.VoxelShapes;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+
+import net.minecraft.server.v1_13_R1.AxisAlignedBB;
+import net.minecraft.server.v1_13_R1.Block;
+import net.minecraft.server.v1_13_R1.BlockChest;
+import net.minecraft.server.v1_13_R1.BlockEnderChest;
+import net.minecraft.server.v1_13_R1.BlockPosition;
+import net.minecraft.server.v1_13_R1.BlockShulkerBox;
+import net.minecraft.server.v1_13_R1.Entity;
+import net.minecraft.server.v1_13_R1.EntityOcelot;
+import net.minecraft.server.v1_13_R1.EntityPlayer;
+import net.minecraft.server.v1_13_R1.EnumDirection;
+import net.minecraft.server.v1_13_R1.EnumGamemode;
+import net.minecraft.server.v1_13_R1.IBlockData;
+import net.minecraft.server.v1_13_R1.ITileInventory;
+import net.minecraft.server.v1_13_R1.InventoryEnderChest;
+import net.minecraft.server.v1_13_R1.InventoryLargeChest;
+import net.minecraft.server.v1_13_R1.PlayerInteractManager;
+import net.minecraft.server.v1_13_R1.TileEntity;
+import net.minecraft.server.v1_13_R1.TileEntityChest;
+import net.minecraft.server.v1_13_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_13_R1.TileEntityShulkerBox;
+import net.minecraft.server.v1_13_R1.World;
+
+public class AnySilentContainer implements IAnySilentContainer {
+
+    private Field playerInteractManagerGamemode;
+
+    public AnySilentContainer() {
+        try {
+            this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode");
+            this.playerInteractManagerGamemode.setAccessible(true);
+        } catch (NoSuchFieldException | SecurityException e) {
+            System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail.");
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean isAnySilentContainer(final org.bukkit.block.Block block) {
+        if (block.getType() == Material.ENDER_CHEST) {
+            return true;
+        }
+        BlockState state = block.getState();
+        return state instanceof org.bukkit.block.Chest
+                || state instanceof org.bukkit.block.ShulkerBox;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) {
+        EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(p);
+        World world = player.world;
+        BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
+        IBlockData blockData = world.getType(blockPosition);
+        Block block = blockData.getBlock();
+
+        if (block instanceof BlockShulkerBox) {
+            return this.isBlockedShulkerBox(world, blockPosition, blockData);
+        }
+
+        if (block instanceof BlockEnderChest) {
+            // Ender chests are not blocked by ocelots.
+            return world.getType(blockPosition.up()).isOccluding();
+        }
+
+        // Check if chest is blocked or has an ocelot on top
+        if (this.isBlockedChest(world, blockPosition)) {
+            return true;
+        }
+
+        // Check for matching adjacent chests that are blocked or have an ocelot on top
+        for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+            BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+            Block localBlock = world.getType(localBlockPosition).getBlock();
+
+            if (localBlock != block) {
+                continue;
+            }
+
+            TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+            if (!(localTileEntity instanceof TileEntityChest)) {
+                continue;
+            }
+
+            if (this.isBlockedChest(world, localBlockPosition)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedShulkerBox(final World world, final BlockPosition blockPosition,
+                                        final IBlockData blockData) {
+        // For reference, look at net.minecraft.server.BlockShulkerBox
+        TileEntity tile = world.getTileEntity(blockPosition);
+
+        if (!(tile instanceof TileEntityShulkerBox)) {
+            return false;
+        }
+
+        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
+        if (((TileEntityShulkerBox) tile).r() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
+            AxisAlignedBB axisAlignedBB = VoxelShapes.b().a()
+                    .b(0.5F * enumDirection.getAdjacentX(), 0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
+                    .a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(), enumDirection.getAdjacentZ());
+            return !world.getCubes(null, axisAlignedBB.a(blockPosition.shift(enumDirection)));
+        }
+
+        return false;
+    }
+
+    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
+        // For reference, loot at net.minecraft.server.BlockChest
+        return world.getType(blockPosition.up()).isOccluding() || this.hasOcelotOnTop(world, blockPosition);
+    }
+
+    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
+        for (Entity entity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
+                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
+                        blockPosition.getZ() + 1))) {
+            EntityOcelot entityOcelot = (EntityOcelot) entity;
+            if (entityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest,
+            final org.bukkit.block.Block bukkitBlock) {
+
+        // Silent ender chest is API-only
+        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
+            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(bukkitPlayer);
+
+        final World world = player.world;
+        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
+        final Object tile = world.getTileEntity(blockPosition);
+
+        if (tile == null) {
+            return false;
+        }
+
+        if (tile instanceof TileEntityEnderChest) {
+            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
+            InventoryEnderChest enderChest = player.getEnderChest();
+            enderChest.a((TileEntityEnderChest) tile);
+            player.openContainer(enderChest);
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        if (!(tile instanceof ITileInventory)) {
+            return false;
+        }
+
+        ITileInventory tileInventory = (ITileInventory) tile;
+        Block block = world.getType(blockPosition).getBlock();
+
+        if (block instanceof BlockChest) {
+            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
+                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
+                Block localBlock = world.getType(localBlockPosition).getBlock();
+
+                if (localBlock != block) {
+                    continue;
+                }
+
+                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
+                if (!(localTileEntity instanceof TileEntityChest)) {
+                    continue;
+                }
+
+                if (localEnumDirection == EnumDirection.WEST
+                        || localEnumDirection == EnumDirection.NORTH) {
+                    tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"),
+                            (TileEntityChest) localTileEntity, tileInventory);
+                } else {
+                    tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"),
+                            tileInventory, (TileEntityChest) localTileEntity);
+                }
+                break;
+            }
+
+            if (block instanceof BlockChestTrapped) {
+                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
+            } else {
+                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
+            }
+        }
+
+        if (block instanceof BlockShulkerBox) {
+            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
+        }
+
+        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
+        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
+            player.openContainer(tileInventory);
+            return true;
+        }
+
+        // SilentChest requires access to setting players' gamemode directly.
+        if (this.playerInteractManagerGamemode == null) {
+            return false;
+        }
+
+        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
+        this.forceGameMode(player, EnumGamemode.SPECTATOR);
+        player.openContainer(tileInventory);
+        this.forceGameMode(player, gamemode);
+        return true;
+    }
+
+    @Override
+    public void deactivateContainer(final Player bukkitPlayer) {
+        if (this.playerInteractManagerGamemode == null) {
+            return;
+        }
+
+        InventoryView view = bukkitPlayer.getOpenInventory();
+        switch (view.getType()) {
+        case CHEST:
+        case ENDER_CHEST:
+        case SHULKER_BOX:
+            break;
+        default:
+            return;
+        }
+
+        EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(bukkitPlayer);
+
+        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
+        this.forceGameMode(player, EnumGamemode.SPECTATOR);
+        player.activeContainer.b(player);
+        player.activeContainer = player.defaultContainer;
+        this.forceGameMode(player, gamemode);
+    }
+
+    private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) {
+        if (this.playerInteractManagerGamemode == null) {
+            // No need to warn repeatedly, error on startup and lack of function should be enough.
+            return;
+        }
+        try {
+            if (!this.playerInteractManagerGamemode.isAccessible()) {
+                // Just in case, ensure accessible.
+                this.playerInteractManagerGamemode.setAccessible(true);
+            }
+            this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode);
+        } catch (IllegalArgumentException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/InventoryAccess.java

@@ -0,0 +1,80 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_13_R1;
+
+import com.lishid.openinv.internal.IInventoryAccess;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.util.InternalAccessor;
+
+import org.bukkit.inventory.Inventory;
+
+import net.minecraft.server.v1_13_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+
+    @Override
+    public ISpecialEnderChest getSpecialEnderChest(final Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof com.lishid.openinv.internal.v1_13_R1.SpecialEnderChest) {
+            return (com.lishid.openinv.internal.v1_13_R1.SpecialEnderChest) inv;
+        }
+        return null;
+    }
+
+    @Override
+    public ISpecialPlayerInventory getSpecialPlayerInventory(final Inventory inventory) {
+        IInventory inv;
+        if (inventory instanceof CraftInventory) {
+            inv = ((CraftInventory) inventory).getInventory();
+        } else {
+            inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
+        }
+
+        if (inv instanceof com.lishid.openinv.internal.v1_13_R1.SpecialPlayerInventory) {
+            return (com.lishid.openinv.internal.v1_13_R1.SpecialPlayerInventory) inv;
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isSpecialEnderChest(final Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
+                inventory) instanceof ISpecialEnderChest;
+    }
+
+    @Override
+    public boolean isSpecialPlayerInventory(final Inventory inventory) {
+        if (inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
+        }
+        return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class,
+                inventory) instanceof ISpecialPlayerInventory;
+    }
+
+}

internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/PlayerDataManager.java

@@ -0,0 +1,109 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_13_R1;
+
+import java.util.Collection;
+import java.util.UUID;
+
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+
+import net.minecraft.server.v1_13_R1.EntityPlayer;
+import net.minecraft.server.v1_13_R1.MinecraftServer;
+import net.minecraft.server.v1_13_R1.PlayerInteractManager;
+
+import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
+
+public class PlayerDataManager implements IPlayerDataManager {
+
+    public static EntityPlayer getHandle(final Player player) {
+        if (player instanceof CraftPlayer) {
+            return ((CraftPlayer) player).getHandle();
+        }
+
+        Server server = player.getServer();
+        EntityPlayer nmsPlayer = null;
+
+        if (server instanceof CraftServer) {
+            nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
+        }
+
+        if (nmsPlayer == null) {
+            // Could use reflection to examine fields, but it's honestly not worth the bother.
+            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+        }
+
+        return nmsPlayer;
+    }
+
+    @Override
+    public Collection<? extends Player> getOnlinePlayers() {
+        return Bukkit.getOnlinePlayers();
+    }
+
+    @Override
+    public OfflinePlayer getPlayerByID(final String identifier) {
+        try {
+            UUID uuid = UUID.fromString(identifier);
+            OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
+            // Ensure player is a real player, otherwise return null
+            if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
+                return null;
+            }
+            return player;
+        } catch (IllegalArgumentException e) {
+            // Not a UUID
+            return null;
+        }
+    }
+
+    @Override
+    public String getPlayerDataID(final OfflinePlayer offline) {
+        return offline.getUniqueId().toString();
+    }
+
+    @Override
+    public Player loadPlayer(final OfflinePlayer offline) {
+        // Ensure player has data
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+
+        // Create a profile and entity to load the player data
+        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
+                new PlayerInteractManager(server.getWorldServer(0)));
+
+        // Get the bukkit entity
+        Player target = entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+        }
+        // Return the entity
+        return target;
+    }
+
+}

internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/SpecialEnderChest.java

@@ -0,0 +1,99 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_13_R1;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+import net.minecraft.server.v1_13_R1.EntityPlayer;
+import net.minecraft.server.v1_13_R1.IInventory;
+import net.minecraft.server.v1_13_R1.InventoryEnderChest;
+import net.minecraft.server.v1_13_R1.InventorySubcontainer;
+import net.minecraft.server.v1_13_R1.ItemStack;
+
+import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
+
+public class SpecialEnderChest extends InventorySubcontainer
+        implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline;
+
+    public SpecialEnderChest(final Player player, final Boolean online) {
+        super(PlayerDataManager.getHandle(player).getEnderChest().getDisplayName(),
+                PlayerDataManager.getHandle(player).getEnderChest().getSize(), player);
+        this.playerOnline = online;
+        this.enderChest = PlayerDataManager.getHandle(player).getEnderChest();
+        this.setItemLists(this, this.enderChest.getContents());
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return this.inventory;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    private void setItemLists(final InventorySubcontainer subcontainer, final List<ItemStack> list) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+            // Access and replace main inventory array
+            Field field = InventorySubcontainer.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(subcontainer, list);
+        } catch (NoSuchFieldException | SecurityException | IllegalArgumentException
+                | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @Override
+    public void setPlayerOnline(final Player player) {
+        if (!this.playerOnline) {
+            try {
+                EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
+                this.bukkitOwner = nmsPlayer.getBukkitEntity();
+                this.setItemLists(nmsPlayer.getEnderChest(), this.items);
+            } catch (Exception e) {}
+            this.playerOnline = true;
+        }
+    }
+
+    @Override
+    public void update() {
+        super.update();
+        this.enderChest.update();
+    }
+
+}

internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/SpecialPlayerInventory.java

@@ -0,0 +1,258 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_13_R1;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import net.minecraft.server.v1_13_R1.ChatMessage;
+import net.minecraft.server.v1_13_R1.IChatBaseComponent;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+import net.minecraft.server.v1_13_R1.ContainerUtil;
+import net.minecraft.server.v1_13_R1.EntityHuman;
+import net.minecraft.server.v1_13_R1.ItemStack;
+import net.minecraft.server.v1_13_R1.NonNullList;
+import net.minecraft.server.v1_13_R1.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline;
+
+    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
+        super(PlayerDataManager.getHandle(bukkitPlayer));
+        this.playerOnline = online;
+        this.setItemArrays(this, this.player.inventory.items, this.player.inventory.armor,
+                this.player.inventory.extraSlots);
+    }
+
+    @Override
+    public boolean a(final EntityHuman entityhuman) {
+        return true;
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return this.inventory;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        return list.get(i);
+    }
+
+    @Override
+    public IChatBaseComponent getDisplayName() {
+        return new ChatMessage(this.player.getName());
+    }
+
+    @Override
+    public boolean hasCustomName() {
+        return true;
+    }
+
+    private int getReversedArmorSlotNum(final int i) {
+        if (i == 0) {
+            return 3;
+        }
+        if (i == 1) {
+            return 2;
+        }
+        if (i == 2) {
+            return 1;
+        }
+        if (i == 3) {
+            return 0;
+        }
+        return i;
+    }
+
+    private int getReversedItemSlotNum(final int i) {
+        if (i >= 27) {
+            return i - 27;
+        }
+        return i + 9;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 4;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void setItem(int i, final ItemStack itemstack) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            this.player.drop(itemstack, true);
+            return;
+        }
+
+        list.set(i, itemstack);
+    }
+
+    private void setItemArrays(final PlayerInventory inventory, final NonNullList<ItemStack> items,
+            final NonNullList<ItemStack> armor, final NonNullList<ItemStack> extraSlots) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+
+            // Access and replace main inventory list
+            Field field = PlayerInventory.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, items);
+
+            // Access and replace armor inventory list
+            field = PlayerInventory.class.getField("armor");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, armor);
+
+            // Access and replace offhand inventory list
+            field = PlayerInventory.class.getField("extraSlots");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, extraSlots);
+
+            // Access and replace list containing all inventory lists
+            field = PlayerInventory.class.getDeclaredField("f");
+            field.setAccessible(true);
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            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();
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        this.playerOnline = false;
+    }
+
+    @Override
+    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;
+        }
+    }
+
+    @Override
+    public ItemStack splitStack(int i, final int j) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        return list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        NonNullList<ItemStack> list = this.items;
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.armor;
+        } else {
+            i = this.getReversedItemSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            i -= list.size();
+            list = this.extraSlots;
+        } else if (list == this.armor) {
+            i = this.getReversedArmorSlotNum(i);
+        }
+
+        if (i >= list.size()) {
+            return ItemStack.a;
+        }
+
+        if (!list.get(i).isEmpty()) {
+            ItemStack itemstack = list.get(i);
+
+            list.set(i, ItemStack.a);
+            return itemstack;
+        }
+
+        return ItemStack.a;
+    }
+
+}

internal/v1_4_R1/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/v1_5_R2/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/v1_5_R3/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/v1_6_R1/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/v1_6_R2/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/v1_6_R3/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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

internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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);

internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    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();

internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -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));

internal/v1_7_R1/pom.xml

@@ -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 <http://www.gnu.org/licenses/>.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -5,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R1</artifactId>
@@ -21,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/AnySilentContainer.java

@@ -1,5 +1,5 @@
 /*
- * 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

internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java

@@ -1,5 +1,5 @@
 /*
- * 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