Bump version to 4.0.8 for release

Fix AnyContainer breaking modified ender chest sizes
Drop support for 1.13, latest 2 versions only.
2019-12-12 14:36:38 -05:00 · 2019-12-12 14:33:42 -05:00 · 2019-12-12 14:21:33 -05:00 · 2019-12-12 13:59:38 -05:00 · 2019-12-12 13:59:12 -05:00 · 2019-12-12 12:49:21 -05:00
47 changed files with 932 additions and 710 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 **/.project
 **/.classpath
 **/.idea
-**/.iml
+**.iml
 **/target
 **/bin
 **/out
--- a/README.MD
+++ b/README.MD
@@ -132,15 +132,19 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) whi

 ## For Developers
 To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin.
-Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.11-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.11-R0.1-SNAPSHOT`
+Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.8-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.8-R0.1-SNAPSHOT`

-To compile for a specific version or set of versions, you'll need to use a profile. Provided profiles are `latest`, `recent` (last 2 major Minecraft versions), and `all`. Select an existing profile using the `-P` argument (ex: `mvn clean package -am -P all`) or make your own. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
+To compile for a single version, specify the NMS revision you are targeting: `mvn -pl <NMS module> -am clean install`

-The final file is target/OpenInv.jar
+To compile for a set of versions, you'll need to use a profile. The only provided profile is `all`. Select a profile using the `-P` argument: `mvn clean package -am -P all`
+
+For more information, check out the [official Maven guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
+
+The final file is `target/OpenInv.jar`

 ## License
 ```
-Copyright (C) 2011-2018 lishid. All rights reserved.
+Copyright (C) 2011-2019 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
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvapi</artifactId>
--- a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java
+++ b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java
+++ b/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java
+++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java
+++ b/api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/api/src/main/java/com/lishid/openinv/util/StringMetric.java
+++ b/api/src/main/java/com/lishid/openinv/util/StringMetric.java
@@ -12,21 +12,6 @@
 *
 * 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) 2014 - 2018 Simmetrics Authors
- * Copyright (C) 2010 The Guava Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 package com.lishid.openinv.util;
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvassembly</artifactId>
--- a/assembly/src/assembly/reactor-uberjar.xml
+++ b/assembly/src/assembly/reactor-uberjar.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvcommon</artifactId>
@@ -31,7 +31,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvapi</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.8</version>
    </dependency>
    <dependency>
      <groupId>org.spigotmc</groupId>
--- a/common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java
+++ b/common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/common/src/main/java/com/lishid/openinv/util/Cache.java
+++ b/common/src/main/java/com/lishid/openinv/util/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/common/src/main/java/com/lishid/openinv/util/Function.java
+++ b/common/src/main/java/com/lishid/openinv/util/Function.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java
+++ b/common/src/main/java/com/lishid/openinv/util/InternalAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/common/src/main/java/com/lishid/openinv/util/Permissions.java
+++ b/common/src/main/java/com/lishid/openinv/util/Permissions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/internal/pom.xml
+++ b/internal/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -20,7 +20,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvinternal</artifactId>
@@ -30,28 +30,12 @@

  <profiles>

-    <profile>
-      <id>latest</id>
-      <modules>
-        <module>v1_14_R1</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>recent</id>
-      <!-- The recent profile is for the most recent 2 versions. -->
-      <modules>
-        <module>v1_13_R2</module>
-        <module>v1_14_R1</module>
-      </modules>
-    </profile>
-
    <profile>
      <id>all</id>
      <modules>
        <module>v1_8_R3</module>
-        <module>v1_13_R2</module>
        <module>v1_14_R1</module>
+        <module>v1_15_R1</module>
      </modules>
    </profile>

--- a/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java
+++ b/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java
@@ -1,309 +0,0 @@
-/*
- * 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_R2;
-
-import com.lishid.openinv.internal.IAnySilentContainer;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.server.v1_13_R2.AxisAlignedBB;
-import net.minecraft.server.v1_13_R2.Block;
-import net.minecraft.server.v1_13_R2.BlockChest;
-import net.minecraft.server.v1_13_R2.BlockChestTrapped;
-import net.minecraft.server.v1_13_R2.BlockEnderChest;
-import net.minecraft.server.v1_13_R2.BlockPosition;
-import net.minecraft.server.v1_13_R2.BlockPropertyChestType;
-import net.minecraft.server.v1_13_R2.BlockShulkerBox;
-import net.minecraft.server.v1_13_R2.ChatMessage;
-import net.minecraft.server.v1_13_R2.Entity;
-import net.minecraft.server.v1_13_R2.EntityOcelot;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.EnumDirection;
-import net.minecraft.server.v1_13_R2.EnumGamemode;
-import net.minecraft.server.v1_13_R2.IBlockData;
-import net.minecraft.server.v1_13_R2.ITileInventory;
-import net.minecraft.server.v1_13_R2.InventoryEnderChest;
-import net.minecraft.server.v1_13_R2.InventoryLargeChest;
-import net.minecraft.server.v1_13_R2.PlayerInteractManager;
-import net.minecraft.server.v1_13_R2.TileEntity;
-import net.minecraft.server.v1_13_R2.TileEntityChest;
-import net.minecraft.server.v1_13_R2.TileEntityEnderChest;
-import net.minecraft.server.v1_13_R2.TileEntityShulkerBox;
-import net.minecraft.server.v1_13_R2.VoxelShape;
-import net.minecraft.server.v1_13_R2.VoxelShapes;
-import net.minecraft.server.v1_13_R2.World;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-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(@NotNull final org.bukkit.block.Block bukkitBlock) {
-        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
-            return true;
-        }
-        BlockState state = bukkitBlock.getState();
-        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox;
-    }
-
-    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player bukkitPlayer, @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        World world = PlayerDataManager.getHandle(bukkitPlayer).world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.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
-        BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-        if (chestType == BlockPropertyChestType.SINGLE) {
-            return false;
-        }
-
-        BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
-        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-        if (adjacentBlockData.getBlock() == block) {
-
-            BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-            if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                    && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                return this.isBlockedChest(world, adjacentBlockPosition);
-            }
-        }
-
-        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;
-            try {
-                Method method = VoxelShape.class.getMethod("a");
-                axisAlignedBB = (AxisAlignedBB) method.invoke(VoxelShapes.b());
-            } catch (NoSuchMethodException e) {
-                axisAlignedBB = VoxelShapes.b().getBoundingBox();
-            } catch (InvocationTargetException | IllegalAccessException e) {
-                return false;
-            }
-            axisAlignedBB = axisAlignedBB
-                    .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(@NotNull final Player bukkitPlayer, final boolean silent,
-                                     @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        EntityPlayer player = 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;
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
-
-        if (block instanceof BlockChest) {
-
-            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-            if (chestType != BlockPropertyChestType.SINGLE) {
-
-                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
-                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
-
-                if (adjacentBlockData.getBlock() == block) {
-
-                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
-
-                        if (adjacentTile instanceof TileEntityChest) {
-                            ITileInventory rightChest = chestType == BlockPropertyChestType.RIGHT ? tileInventory : (ITileInventory) adjacentTile;
-                            ITileInventory leftChest = chestType == BlockPropertyChestType.RIGHT ? (ITileInventory) adjacentTile : tileInventory;
-                            tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"), rightChest, leftChest);
-                        }
-                    }
-                }
-            }
-
-            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 (!silent || 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(@NotNull 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 = 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();
-        }
-    }
-
-}
--- a/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/PlayerDataManager.java
+++ b/internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/PlayerDataManager.java
@@ -1,85 +0,0 @@
-/*
- * 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_R2;
-
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.server.v1_13_R2.DimensionManager;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.MinecraftServer;
-import net.minecraft.server.v1_13_R2.PlayerInteractManager;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-
-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 Player loadPlayer(@NotNull final OfflinePlayer offline) {
-        // Ensure player has data
-        if (!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(DimensionManager.OVERWORLD), profile,
-                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
-
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
-        }
-        // Return the entity
-        return target;
-    }
-
-    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
-        return player.openInventory(inventory.getBukkitInventory());
-    }
-
-}
--- a/internal/v1_14_R1/pom.xml
+++ b/internal/v1_14_R1/pom.xml
@@ -22,7 +22,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvadapter1_14_R1</artifactId>
@@ -32,13 +32,13 @@
    <dependency>
      <groupId>org.spigotmc</groupId>
      <artifactId>spigot</artifactId>
-      <version>1.14.2-R0.1-SNAPSHOT</version>
+      <version>1.14.3-R0.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.8</version>
    </dependency>
  </dependencies>

--- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java
+++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java
@@ -18,9 +18,8 @@ package com.lishid.openinv.internal.v1_14_R1;

 import com.lishid.openinv.internal.IAnySilentContainer;
 import java.lang.reflect.Field;
-import javax.annotation.Nullable;
-import net.minecraft.server.v1_14_R1.AxisAlignedBB;
 import net.minecraft.server.v1_14_R1.Block;
+import net.minecraft.server.v1_14_R1.BlockBarrel;
 import net.minecraft.server.v1_14_R1.BlockChest;
 import net.minecraft.server.v1_14_R1.BlockChestTrapped;
 import net.minecraft.server.v1_14_R1.BlockEnderChest;
@@ -30,11 +29,10 @@ import net.minecraft.server.v1_14_R1.BlockShulkerBox;
 import net.minecraft.server.v1_14_R1.ChatMessage;
 import net.minecraft.server.v1_14_R1.Container;
 import net.minecraft.server.v1_14_R1.ContainerChest;
-import net.minecraft.server.v1_14_R1.Entity;
-import net.minecraft.server.v1_14_R1.EntityCat;
+import net.minecraft.server.v1_14_R1.Containers;
 import net.minecraft.server.v1_14_R1.EntityHuman;
 import net.minecraft.server.v1_14_R1.EntityPlayer;
-import net.minecraft.server.v1_14_R1.EnumDirection;
+import net.minecraft.server.v1_14_R1.EnumChatFormat;
 import net.minecraft.server.v1_14_R1.EnumGamemode;
 import net.minecraft.server.v1_14_R1.IBlockData;
 import net.minecraft.server.v1_14_R1.IChatBaseComponent;
@@ -46,15 +44,23 @@ import net.minecraft.server.v1_14_R1.PlayerInventory;
 import net.minecraft.server.v1_14_R1.TileEntity;
 import net.minecraft.server.v1_14_R1.TileEntityChest;
 import net.minecraft.server.v1_14_R1.TileEntityEnderChest;
-import net.minecraft.server.v1_14_R1.TileEntityShulkerBox;
+import net.minecraft.server.v1_14_R1.TileEntityLootable;
 import net.minecraft.server.v1_14_R1.TileInventory;
-import net.minecraft.server.v1_14_R1.VoxelShapes;
 import net.minecraft.server.v1_14_R1.World;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
+import org.bukkit.block.Barrel;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
+import org.bukkit.block.EnderChest;
+import org.bukkit.block.ShulkerBox;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.util.BoundingBox;
 import org.jetbrains.annotations.NotNull;

 public class AnySilentContainer implements IAnySilentContainer {
@@ -78,92 +84,85 @@ public class AnySilentContainer implements IAnySilentContainer {
        }
        BlockState state = bukkitBlock.getState();
        return state instanceof org.bukkit.block.Chest
-                || state instanceof org.bukkit.block.ShulkerBox;
+                || state instanceof org.bukkit.block.ShulkerBox
+                || state instanceof org.bukkit.block.Barrel;
    }

    @Override
-    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block bukkitBlock) {
-        EntityPlayer player = PlayerDataManager.getHandle(p);
-        World world = player.world;
-        BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        IBlockData blockData = world.getType(blockPosition);
-        Block block = blockData.getBlock();
+    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block block) {
+        BlockState blockState = block.getState();

-        if (block instanceof BlockShulkerBox) {
-            return this.isBlockedShulkerBox(world, blockPosition, blockData);
+        // Barrels do not require AnyContainer.
+        if (blockState instanceof Barrel) {
+            return false;
        }

-        if (block instanceof BlockEnderChest) {
-            // Ender chests are not blocked by ocelots.
-            return world.getType(blockPosition.up()).isOccluding(world, blockPosition);
+        // Enderchests require a non-occluding block on top to open.
+        if (blockState instanceof EnderChest) {
+            return block.getRelative(0, 1, 0).getType().isOccluding();
        }

-        // Check if chest is blocked or has an ocelot on top
-        if (this.isBlockedChest(world, blockPosition)) {
+        // Shulker boxes require 1/2 a block clear in the direction they open.
+        if (blockState instanceof ShulkerBox) {
+            BoundingBox boundingBox = block.getBoundingBox();
+            if (boundingBox.getVolume() > 1) {
+                // Shulker box is already open.
+                return false;
+            }
+
+            BlockData blockData = block.getBlockData();
+            if (!(blockData instanceof Directional)) {
+                // Shouldn't be possible. Just in case, demand AnyChest.
+                return true;
+            }
+
+            Directional directional = (Directional) blockData;
+            BlockFace face = directional.getFacing();
+            boundingBox.shift(face.getDirection());
+            // Return whether or not bounding boxes overlap.
+            return block.getRelative(face, 1).getBoundingBox().overlaps(boundingBox);
+        }
+
+        if (!(blockState instanceof org.bukkit.block.Chest)) {
+            return false;
+        }
+
+        if (isBlockedChest(block)) {
            return true;
        }

-        // Check for matching adjacent chests that are blocked or have an ocelot on top
-        BlockPropertyChestType chestType = blockData.get(BlockChest.b);
-
-        if (chestType == BlockPropertyChestType.SINGLE) {
+        BlockData blockData = block.getBlockData();
+        if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
            return false;
        }

-        BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.j(blockData));
-        IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
+        Chest chest = (Chest) blockData;
+        int ordinal = (chest.getFacing().ordinal() + 4 + (chest.getType() == Chest.Type.RIGHT ? -1 : 1)) % 4;
+        BlockFace relativeFace = BlockFace.values()[ordinal];
+        org.bukkit.block.Block relative = block.getRelative(relativeFace);

-        if (adjacentBlockData.getBlock() == block) {
-
-            BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
-
-            if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
-                    && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
-
-                return this.isBlockedChest(world, adjacentBlockPosition);
-            }
-        }
-
-        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)) {
+        if (relative.getType() != block.getType()) {
            return false;
        }

-        EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
-        if (((TileEntityShulkerBox) tile).s() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
-            AxisAlignedBB axisAlignedBB = VoxelShapes.b().getBoundingBox()
-                    .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)));
+        BlockData relativeData = relative.getBlockData();
+        if (!(relativeData instanceof Chest)) {
+            return false;
+        }
+        
+        Chest relativeChest = (Chest) relativeData;
+        if (relativeChest.getFacing() != chest.getFacing()
+                || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
+            return false;
        }

-        return false;
+        return isBlockedChest(relative);
    }

-    private boolean isBlockedChest(final World world, final BlockPosition blockPosition) {
-        // For reference, loot at net.minecraft.server.BlockChest
-        return world.getType(blockPosition.up()).isOccluding(world, blockPosition) || this.hasOcelotOnTop(world, blockPosition);
-    }
-
-    private boolean hasOcelotOnTop(final World world, final BlockPosition blockPosition) {
-        for (Entity entity : world.a(EntityCat.class,
-                new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
-                        blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
-                        blockPosition.getZ() + 1))) {
-            EntityCat entityCat = (EntityCat) entity;
-            if (entityCat.isSitting()) {
-                return true;
-            }
-        }
-
-        return false;
+    private boolean isBlockedChest(org.bukkit.block.Block block) {
+        org.bukkit.block.Block relative = block.getRelative(0, 1, 0);
+        return relative.getType().isOccluding()
+                || block.getWorld().getNearbyEntities(BoundingBox.of(relative), entity -> entity instanceof Cat).size() > 0;
    }

    @Override
@@ -181,7 +180,7 @@ public class AnySilentContainer implements IAnySilentContainer {

        final World world = player.world;
        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final Object tile = world.getTileEntity(blockPosition);
+        final TileEntity tile = world.getTileEntity(blockPosition);

        if (tile == null) {
            return false;
@@ -191,8 +190,32 @@ public class AnySilentContainer implements IAnySilentContainer {
            // Anychest ender chest. See net.minecraft.server.BlockEnderChest
            InventoryEnderChest enderChest = player.getEnderChest();
            enderChest.a((TileEntityEnderChest) tile);
-            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) ->
-                    ContainerChest.a(containerCounter, playerInventory, enderChest), BlockEnderChest.d));
+            player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
+                Containers containers;
+                int rows = enderChest.getSize() / 9;
+                switch (rows) {
+                    case 1:
+                        containers = Containers.GENERIC_9X1;
+                        break;
+                    case 2:
+                        containers = Containers.GENERIC_9X2;
+                        break;
+                    case 3:
+                    default:
+                        containers = Containers.GENERIC_9X3;
+                        break;
+                    case 4:
+                        containers = Containers.GENERIC_9X4;
+                        break;
+                    case 5:
+                        containers = Containers.GENERIC_9X5;
+                        break;
+                    case 6:
+                        containers = Containers.GENERIC_9X6;
+                        break;
+                }
+                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
+            }, BlockEnderChest.d));
            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
            return true;
        }
@@ -226,16 +249,17 @@ public class AnySilentContainer implements IAnySilentContainer {
                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
+
+                            if (rightChest.lootTable != null || leftChest.lootTable != null) {
+                                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
+                                return false;
+                            }
+
                            tileInventory = new ITileInventory() {
-                                @Nullable
                                public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) {
-                                    if (leftChest.e(entityHuman) && rightChest.e(entityHuman)) {
-                                        leftChest.d(playerInventory.player);
-                                        rightChest.d(playerInventory.player);
-                                        return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
-                                    } else {
-                                        return null;
-                                    }
+                                    leftChest.d(playerInventory.player);
+                                    rightChest.d(playerInventory.player);
+                                    return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
                                }

                                public IChatBaseComponent getScoreboardDisplayName() {
@@ -258,6 +282,10 @@ public class AnySilentContainer implements IAnySilentContainer {
            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
        }

+        if (block instanceof BlockBarrel) {
+            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+        }
+
        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
        if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
            player.openContainer(tileInventory);
@@ -269,6 +297,14 @@ public class AnySilentContainer implements IAnySilentContainer {
            return false;
        }

+        if (tile instanceof TileEntityLootable) {
+            TileEntityLootable lootable = (TileEntityLootable) tile;
+            if (lootable.lootTable != null) {
+                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
+                return false;
+            }
+        }
+
        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
        this.forceGameMode(player, EnumGamemode.SPECTATOR);
        player.openContainer(tileInventory);
@@ -284,9 +320,10 @@ public class AnySilentContainer implements IAnySilentContainer {

        InventoryView view = bukkitPlayer.getOpenInventory();
        switch (view.getType()) {
-        case CHEST:
-        case ENDER_CHEST:
-        case SHULKER_BOX:
+            case CHEST:
+            case ENDER_CHEST:
+            case SHULKER_BOX:
+            case BARREL:
            break;
        default:
            return;
@@ -297,6 +334,8 @@ public class AnySilentContainer implements IAnySilentContainer {
        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
        this.forceGameMode(player, EnumGamemode.SPECTATOR);
        player.activeContainer.b(player);
+        player.activeContainer.a(player, false);
+        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
        player.activeContainer = player.defaultContainer;
        this.forceGameMode(player, gamemode);
    }
--- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/PlayerDataManager.java
+++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/PlayerDataManager.java
@@ -132,7 +132,22 @@ public class PlayerDataManager implements IPlayerDataManager {
        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
            @Override
            public Containers<?> getType() {
-                return inventory instanceof SpecialEnderChest ? Containers.GENERIC_9X3 : Containers.GENERIC_9X5;
+                switch (inventory.getBukkitInventory().getSize()) {
+                    case 9:
+                        return Containers.GENERIC_9X1;
+                    case 18:
+                        return Containers.GENERIC_9X2;
+                    case 27:
+                    default:
+                        return Containers.GENERIC_9X3;
+                    case 36:
+                        return Containers.GENERIC_9X4;
+                    case 41: // PLAYER
+                    case 45:
+                        return Containers.GENERIC_9X5;
+                    case 54:
+                        return Containers.GENERIC_9X6;
+                }
            }
        };

--- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java
+++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java
@@ -57,7 +57,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
    private boolean playerOnline;
    private EntityHuman player;
    private NonNullList<ItemStack> items, armor, extraSlots;
-    private final List<NonNullList<ItemStack>> f;
+    private List<NonNullList<ItemStack>> f;

    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
        super(PlayerDataManager.getHandle(bukkitPlayer));
@@ -76,10 +76,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
            entityPlayer.inventory.transaction.addAll(this.transaction);
            this.player = entityPlayer;
-            this.player.inventory.a(this);
+            for (int i = 0; i < getSize(); ++i) {
+                this.player.inventory.setItem(i, getRawItem(i));
+            }
+            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
            this.items = this.player.inventory.items;
            this.armor = this.player.inventory.armor;
            this.extraSlots = this.player.inventory.extraSlots;
+            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
            this.playerOnline = true;
        }
    }
@@ -119,6 +123,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return list.get(i);
    }

+    private ItemStack getRawItem(int i) {
+        NonNullList<ItemStack> list = null;
+        for (NonNullList<ItemStack> next : this.f) {
+            if (i < next.size()) {
+                list = next;
+                break;
+            }
+            i -= next.size();
+        }
+
+        return list == null ? ItemStack.a : list.get(i);
+    }
+
    @Override
    public IChatBaseComponent getDisplayName() {
        return new ChatMessage(this.player.getName());
--- a/internal/v1_15_R1/pom.xml
+++ b/internal/v1_15_R1/pom.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,23 +22,23 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

-  <artifactId>openinvadapter1_13_R2</artifactId>
-  <name>OpenInvAdapter1_13_R2</name>
+  <artifactId>openinvadapter1_15_R1</artifactId>
+  <name>OpenInvAdapter1_15_R1</name>

  <dependencies>
    <dependency>
      <groupId>org.spigotmc</groupId>
      <artifactId>spigot</artifactId>
-      <version>1.13.2-R0.1-SNAPSHOT</version>
+      <version>1.15-R0.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.8</version>
    </dependency>
  </dependencies>

@@ -71,4 +72,4 @@
    </plugins>
  </build>

-</project>
+</project>
--- a/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/AnySilentContainer.java
+++ b/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/AnySilentContainer.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright (C) 2011-2019 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_15_R1;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+import java.lang.reflect.Field;
+import net.minecraft.server.v1_15_R1.Block;
+import net.minecraft.server.v1_15_R1.BlockBarrel;
+import net.minecraft.server.v1_15_R1.BlockChest;
+import net.minecraft.server.v1_15_R1.BlockChestTrapped;
+import net.minecraft.server.v1_15_R1.BlockEnderChest;
+import net.minecraft.server.v1_15_R1.BlockPosition;
+import net.minecraft.server.v1_15_R1.BlockPropertyChestType;
+import net.minecraft.server.v1_15_R1.BlockShulkerBox;
+import net.minecraft.server.v1_15_R1.ChatMessage;
+import net.minecraft.server.v1_15_R1.Container;
+import net.minecraft.server.v1_15_R1.ContainerChest;
+import net.minecraft.server.v1_15_R1.Containers;
+import net.minecraft.server.v1_15_R1.EntityHuman;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.EnumChatFormat;
+import net.minecraft.server.v1_15_R1.EnumGamemode;
+import net.minecraft.server.v1_15_R1.IBlockData;
+import net.minecraft.server.v1_15_R1.IChatBaseComponent;
+import net.minecraft.server.v1_15_R1.ITileInventory;
+import net.minecraft.server.v1_15_R1.InventoryEnderChest;
+import net.minecraft.server.v1_15_R1.InventoryLargeChest;
+import net.minecraft.server.v1_15_R1.PlayerInteractManager;
+import net.minecraft.server.v1_15_R1.PlayerInventory;
+import net.minecraft.server.v1_15_R1.TileEntity;
+import net.minecraft.server.v1_15_R1.TileEntityChest;
+import net.minecraft.server.v1_15_R1.TileEntityEnderChest;
+import net.minecraft.server.v1_15_R1.TileEntityLootable;
+import net.minecraft.server.v1_15_R1.TileInventory;
+import net.minecraft.server.v1_15_R1.World;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
+import org.bukkit.block.Barrel;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.EnderChest;
+import org.bukkit.block.ShulkerBox;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.util.BoundingBox;
+import org.jetbrains.annotations.NotNull;
+
+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(@NotNull final org.bukkit.block.Block bukkitBlock) {
+        if (bukkitBlock.getType() == Material.ENDER_CHEST) {
+            return true;
+        }
+        BlockState state = bukkitBlock.getState();
+        return state instanceof org.bukkit.block.Chest
+                || state instanceof org.bukkit.block.ShulkerBox
+                || state instanceof org.bukkit.block.Barrel;
+    }
+
+    @Override
+    public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block block) {
+        BlockState blockState = block.getState();
+
+        // Barrels do not require AnyContainer.
+        if (blockState instanceof Barrel) {
+            return false;
+        }
+
+        // Enderchests require a non-occluding block on top to open.
+        if (blockState instanceof EnderChest) {
+            return block.getRelative(0, 1, 0).getType().isOccluding();
+        }
+
+        // Shulker boxes require 1/2 a block clear in the direction they open.
+        if (blockState instanceof ShulkerBox) {
+            BoundingBox boundingBox = block.getBoundingBox();
+            if (boundingBox.getVolume() > 1) {
+                // Shulker box is already open.
+                return false;
+            }
+
+            BlockData blockData = block.getBlockData();
+            if (!(blockData instanceof Directional)) {
+                // Shouldn't be possible. Just in case, demand AnyChest.
+                return true;
+            }
+
+            Directional directional = (Directional) blockData;
+            BlockFace face = directional.getFacing();
+            boundingBox.shift(face.getDirection());
+            // Return whether or not bounding boxes overlap.
+            return block.getRelative(face, 1).getBoundingBox().overlaps(boundingBox);
+        }
+
+        if (!(blockState instanceof org.bukkit.block.Chest)) {
+            return false;
+        }
+
+        if (isBlockedChest(block)) {
+            return true;
+        }
+
+        BlockData blockData = block.getBlockData();
+        if (!(blockData instanceof Chest) || ((Chest) blockData).getType() == Chest.Type.SINGLE) {
+            return false;
+        }
+
+        Chest chest = (Chest) blockData;
+        int ordinal = (chest.getFacing().ordinal() + 4 + (chest.getType() == Chest.Type.RIGHT ? -1 : 1)) % 4;
+        BlockFace relativeFace = BlockFace.values()[ordinal];
+        org.bukkit.block.Block relative = block.getRelative(relativeFace);
+
+        if (relative.getType() != block.getType()) {
+            return false;
+        }
+
+        BlockData relativeData = relative.getBlockData();
+        if (!(relativeData instanceof Chest)) {
+            return false;
+        }
+        
+        Chest relativeChest = (Chest) relativeData;
+        if (relativeChest.getFacing() != chest.getFacing()
+                || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
+            return false;
+        }
+
+        return isBlockedChest(relative);
+    }
+
+    private boolean isBlockedChest(org.bukkit.block.Block block) {
+        org.bukkit.block.Block relative = block.getRelative(0, 1, 0);
+        return relative.getType().isOccluding()
+                || block.getWorld().getNearbyEntities(BoundingBox.of(relative), entity -> entity instanceof Cat).size() > 0;
+    }
+
+    @Override
+    public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
+                                     @NotNull 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 = PlayerDataManager.getHandle(bukkitPlayer);
+
+        final World world = player.world;
+        final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
+        final TileEntity 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(new TileInventory((containerCounter, playerInventory, ignored) -> {
+                Containers containers;
+                int rows = enderChest.getSize() / 9;
+                switch (rows) {
+                    case 1:
+                        containers = Containers.GENERIC_9X1;
+                        break;
+                    case 2:
+                        containers = Containers.GENERIC_9X2;
+                        break;
+                    case 3:
+                    default:
+                        containers = Containers.GENERIC_9X3;
+                        break;
+                    case 4:
+                        containers = Containers.GENERIC_9X4;
+                        break;
+                    case 5:
+                        containers = Containers.GENERIC_9X5;
+                        break;
+                    case 6:
+                        containers = Containers.GENERIC_9X6;
+                        break;
+                }
+                return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
+            }, BlockEnderChest.e));
+            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+            return true;
+        }
+
+        if (!(tile instanceof ITileInventory)) {
+            return false;
+        }
+
+        ITileInventory tileInventory = (ITileInventory) tile;
+        IBlockData blockData = world.getType(blockPosition);
+        Block block = blockData.getBlock();
+
+        if (block instanceof BlockChest) {
+
+            BlockPropertyChestType chestType = blockData.get(BlockChest.c);
+
+            if (chestType != BlockPropertyChestType.SINGLE) {
+
+                BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.i(blockData));
+                IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
+
+                if (adjacentBlockData.getBlock() == block) {
+
+                    BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c);
+
+                    if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
+                            && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
+
+                        TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
+
+                        if (adjacentTile instanceof TileEntityChest && tileInventory instanceof  TileEntityChest) {
+                            TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile;
+                            TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory);
+
+                            if (rightChest.lootTable != null || leftChest.lootTable != null) {
+                                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
+                                return false;
+                            }
+
+                            tileInventory = new ITileInventory() {
+                                public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) {
+                                    leftChest.d(playerInventory.player);
+                                    rightChest.d(playerInventory.player);
+                                    return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest));
+                                }
+
+                                public IChatBaseComponent getScoreboardDisplayName() {
+                                    return new ChatMessage("container.chestDouble");
+                                }
+                            };
+                        }
+                    }
+                }
+            }
+
+            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);
+        }
+
+        if (block instanceof BlockBarrel) {
+            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+        }
+
+        // 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;
+        }
+
+        if (tile instanceof TileEntityLootable) {
+            TileEntityLootable lootable = (TileEntityLootable) tile;
+            if (lootable.lootTable != null) {
+                player.a(new ChatMessage("Loot not generated! Please disable /silentcontainer.").a(EnumChatFormat.RED), true);
+                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(@NotNull final Player bukkitPlayer) {
+        if (this.playerInteractManagerGamemode == null) {
+            return;
+        }
+
+        InventoryView view = bukkitPlayer.getOpenInventory();
+        switch (view.getType()) {
+            case CHEST:
+            case ENDER_CHEST:
+            case SHULKER_BOX:
+            case BARREL:
+            break;
+        default:
+            return;
+        }
+
+        EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
+
+        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
+        this.forceGameMode(player, EnumGamemode.SPECTATOR);
+        player.activeContainer.b(player);
+        player.activeContainer.a(player, false);
+        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
+        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();
+        }
+    }
+
+}
--- a/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/PlayerDataManager.java
+++ b/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/PlayerDataManager.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2011-2019 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_15_R1;
+
+import com.lishid.openinv.internal.IPlayerDataManager;
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.mojang.authlib.GameProfile;
+import net.minecraft.server.v1_15_R1.ChatComponentText;
+import net.minecraft.server.v1_15_R1.Container;
+import net.minecraft.server.v1_15_R1.Containers;
+import net.minecraft.server.v1_15_R1.DimensionManager;
+import net.minecraft.server.v1_15_R1.EntityHuman;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.MinecraftServer;
+import net.minecraft.server.v1_15_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_15_R1.PlayerInteractManager;
+import net.minecraft.server.v1_15_R1.PlayerInventory;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftContainer;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+
+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 Player loadPlayer(@NotNull final OfflinePlayer offline) {
+        // Ensure player has data
+        if (!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(DimensionManager.OVERWORLD), profile,
+                new PlayerInteractManager(server.getWorldServer(DimensionManager.OVERWORLD)));
+
+        // Get the bukkit entity
+        Player target = entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+        }
+        // Return the entity
+        return target;
+    }
+
+    @Override
+    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+
+        EntityPlayer nmsPlayer = getHandle(player);
+
+        if (nmsPlayer == null || nmsPlayer.playerConnection == null) {
+            return null;
+        }
+
+        String title;
+        if (inventory instanceof SpecialEnderChest) {
+            HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
+            title = (owner.getName() != null ? owner.getName() : owner.getUniqueId().toString()) + "'s Ender Chest";
+        } else if (inventory instanceof SpecialPlayerInventory) {
+            EntityHuman owner = ((PlayerInventory) inventory).player;
+            title = (owner.getName() != null ? owner.getName() : owner.getUniqueID().toString()) + "'s Inventory";
+        } else {
+            return player.openInventory(inventory.getBukkitInventory());
+        }
+
+        Container container = new CraftContainer(new InventoryView() {
+            @Override
+            public @NotNull Inventory getTopInventory() {
+                return inventory.getBukkitInventory();
+            }
+            @Override
+            public @NotNull Inventory getBottomInventory() {
+                return player.getInventory();
+            }
+            @Override
+            public @NotNull HumanEntity getPlayer() {
+                return player;
+            }
+            @Override
+            public @NotNull InventoryType getType() {
+                return inventory.getBukkitInventory().getType();
+            }
+            @Override
+            public @NotNull String getTitle() {
+                return title;
+            }
+        }, nmsPlayer, nmsPlayer.nextContainerCounter()) {
+            @Override
+            public Containers<?> getType() {
+                switch (inventory.getBukkitInventory().getSize()) {
+                    case 9:
+                        return Containers.GENERIC_9X1;
+                    case 18:
+                        return Containers.GENERIC_9X2;
+                    case 27:
+                    default:
+                        return Containers.GENERIC_9X3;
+                    case 36:
+                        return Containers.GENERIC_9X4;
+                    case 41: // PLAYER
+                    case 45:
+                        return Containers.GENERIC_9X5;
+                    case 54:
+                        return Containers.GENERIC_9X6;
+                }
+            }
+        };
+
+        container.setTitle(new ChatComponentText(title));
+        container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container);
+
+        if (container == null) {
+            return null;
+        }
+
+        nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(),
+                new ChatComponentText(container.getBukkitView().getTitle())));
+        nmsPlayer.activeContainer = container;
+        container.addSlotListener(nmsPlayer);
+
+        return container.getBukkitView();
+
+    }
+
+}
--- a/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/SpecialEnderChest.java
+++ b/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/SpecialEnderChest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
@@ -14,50 +14,44 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package com.lishid.openinv.internal.v1_13_R2;
+package com.lishid.openinv.internal.v1_15_R1;

 import com.lishid.openinv.internal.ISpecialEnderChest;
 import java.util.List;
-import javax.annotation.Nullable;
-import net.minecraft.server.v1_13_R2.AutoRecipeOutput;
-import net.minecraft.server.v1_13_R2.AutoRecipeStackManager;
-import net.minecraft.server.v1_13_R2.ContainerUtil;
-import net.minecraft.server.v1_13_R2.EntityHuman;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.IChatBaseComponent;
-import net.minecraft.server.v1_13_R2.IInventory;
-import net.minecraft.server.v1_13_R2.IInventoryListener;
-import net.minecraft.server.v1_13_R2.InventoryEnderChest;
-import net.minecraft.server.v1_13_R2.ItemStack;
-import net.minecraft.server.v1_13_R2.NonNullList;
+import net.minecraft.server.v1_15_R1.AutoRecipeStackManager;
+import net.minecraft.server.v1_15_R1.ContainerUtil;
+import net.minecraft.server.v1_15_R1.EntityHuman;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.IInventoryListener;
+import net.minecraft.server.v1_15_R1.InventoryEnderChest;
+import net.minecraft.server.v1_15_R1.ItemStack;
+import net.minecraft.server.v1_15_R1.NonNullList;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;

-public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRecipeOutput {
+public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest {

-    private EntityPlayer owner;
-    private final IChatBaseComponent displayName;
    private final CraftInventory inventory;
+    private EntityPlayer owner;
    private NonNullList<ItemStack> items;
    private boolean playerOnline;

    public SpecialEnderChest(final Player player, final Boolean online) {
-        this.owner = PlayerDataManager.getHandle(player);
-        this.displayName = this.owner.getEnderChest().getDisplayName();
+        super(PlayerDataManager.getHandle(player));
        this.inventory = new CraftInventory(this);
-        this.items = this.owner.getEnderChest().items;
+        this.owner = PlayerDataManager.getHandle(player);
        this.playerOnline = online;
+        this.items = this.owner.getEnderChest().items;
    }

    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return this.inventory;
+    public @NotNull CraftInventory getBukkitInventory() {
+        return inventory;
    }

    @Override
@@ -90,46 +84,57 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
        this.owner.getEnderChest().update();
    }

+    @Override
    public List<ItemStack> getContents() {
        return this.items;
    }

+    @Override
    public void onOpen(CraftHumanEntity who) {
        this.owner.getEnderChest().onOpen(who);
    }

+    @Override
    public void onClose(CraftHumanEntity who) {
        this.owner.getEnderChest().onClose(who);
    }

+    @Override
    public List<HumanEntity> getViewers() {
        return this.owner.getEnderChest().getViewers();
    }

+    @Override
    public void setMaxStackSize(int i) {
        this.owner.getEnderChest().setMaxStackSize(i);
    }

+    @Override
    public InventoryHolder getOwner() {
        return this.owner.getEnderChest().getOwner();
    }

+    @Override
    public Location getLocation() {
        return null;
    }

+    @Override
    public void a(IInventoryListener iinventorylistener) {
        this.owner.getEnderChest().a(iinventorylistener);
    }

+    @Override
    public void b(IInventoryListener iinventorylistener) {
        this.owner.getEnderChest().b(iinventorylistener);
    }

+    @Override
    public ItemStack getItem(int i) {
        return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.a;
    }

+    @Override
    public ItemStack splitStack(int i, int j) {
        ItemStack itemstack = ContainerUtil.a(this.items, i, j);
        if (!itemstack.isEmpty()) {
@@ -139,6 +144,7 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
        return itemstack;
    }

+    @Override
    public ItemStack a(ItemStack itemstack) {
        ItemStack itemstack1 = itemstack.cloneItemStack();

@@ -171,6 +177,7 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
        return itemstack1;
    }

+    @Override
    public ItemStack splitWithoutUpdate(int i) {
        ItemStack itemstack = this.items.get(i);
        if (itemstack.isEmpty()) {
@@ -181,6 +188,7 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
        }
    }

+    @Override
    public void setItem(int i, ItemStack itemstack) {
        this.items.set(i, itemstack);
        if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) {
@@ -190,11 +198,13 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
        this.update();
    }

+    @Override
    public int getSize() {
        return this.owner.getEnderChest().getSize();
    }

-    public boolean P_() {
+    @Override
+    public boolean isNotEmpty() {

        for (ItemStack itemstack : this.items) {
            if (!itemstack.isEmpty()) {
@@ -205,56 +215,35 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
        return true;
    }

-    public IChatBaseComponent getDisplayName() {
-        return this.displayName;
-    }
-
-    @Nullable
-    public IChatBaseComponent getCustomName() {
-        return this.displayName;
-    }
-
-    public boolean hasCustomName() {
-        return false;
-    }
-
-    public void a(@Nullable IChatBaseComponent ichatbasecomponent) {
-        // Ignored - name is always player's name.
-    }
-
+    @Override
    public int getMaxStackSize() {
        return 64;
    }

+    @Override
    public boolean a(EntityHuman entityhuman) {
        return true;
    }

+    @Override
    public void startOpen(EntityHuman entityhuman) {
    }

+    @Override
    public void closeContainer(EntityHuman entityhuman) {
    }

+    @Override
    public boolean b(int i, ItemStack itemstack) {
        return true;
    }

-    public int getProperty(int i) {
-        return 0;
-    }
-
-    public void setProperty(int i, int j) {
-    }
-
-    public int h() {
-        return 0;
-    }
-
+    @Override
    public void clear() {
        this.items.clear();
    }

+    @Override
    public void a(AutoRecipeStackManager autorecipestackmanager) {

        for (ItemStack itemstack : this.items) {
--- a/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/SpecialPlayerInventory.java
+++ b/internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/SpecialPlayerInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
@@ -14,53 +14,56 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package com.lishid.openinv.internal.v1_13_R2;
+package com.lishid.openinv.internal.v1_15_R1;

 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
-import net.minecraft.server.v1_13_R2.AutoRecipeStackManager;
-import net.minecraft.server.v1_13_R2.ChatMessage;
-import net.minecraft.server.v1_13_R2.ContainerUtil;
-import net.minecraft.server.v1_13_R2.CrashReport;
-import net.minecraft.server.v1_13_R2.CrashReportSystemDetails;
-import net.minecraft.server.v1_13_R2.EntityHuman;
-import net.minecraft.server.v1_13_R2.EntityPlayer;
-import net.minecraft.server.v1_13_R2.IBlockData;
-import net.minecraft.server.v1_13_R2.IChatBaseComponent;
-import net.minecraft.server.v1_13_R2.Item;
-import net.minecraft.server.v1_13_R2.ItemArmor;
-import net.minecraft.server.v1_13_R2.ItemStack;
-import net.minecraft.server.v1_13_R2.NBTTagCompound;
-import net.minecraft.server.v1_13_R2.NBTTagList;
-import net.minecraft.server.v1_13_R2.NonNullList;
-import net.minecraft.server.v1_13_R2.PacketPlayOutSetSlot;
-import net.minecraft.server.v1_13_R2.PlayerInventory;
-import net.minecraft.server.v1_13_R2.ReportedException;
-import net.minecraft.server.v1_13_R2.World;
+import java.util.stream.Collectors;
+import net.minecraft.server.v1_15_R1.AutoRecipeStackManager;
+import net.minecraft.server.v1_15_R1.ChatMessage;
+import net.minecraft.server.v1_15_R1.ContainerUtil;
+import net.minecraft.server.v1_15_R1.CrashReport;
+import net.minecraft.server.v1_15_R1.CrashReportSystemDetails;
+import net.minecraft.server.v1_15_R1.EntityHuman;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.EnumItemSlot;
+import net.minecraft.server.v1_15_R1.IBlockData;
+import net.minecraft.server.v1_15_R1.IChatBaseComponent;
+import net.minecraft.server.v1_15_R1.Item;
+import net.minecraft.server.v1_15_R1.ItemArmor;
+import net.minecraft.server.v1_15_R1.ItemStack;
+import net.minecraft.server.v1_15_R1.NBTTagCompound;
+import net.minecraft.server.v1_15_R1.NBTTagList;
+import net.minecraft.server.v1_15_R1.NonNullList;
+import net.minecraft.server.v1_15_R1.PacketPlayOutSetSlot;
+import net.minecraft.server.v1_15_R1.PlayerInventory;
+import net.minecraft.server.v1_15_R1.ReportedException;
+import net.minecraft.server.v1_15_R1.World;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_15_R1.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {

-    private final CraftInventory inventory = new CraftInventory(this);
+    private final CraftInventory inventory;
    private boolean playerOnline;
+    private EntityHuman player;
    private NonNullList<ItemStack> items, armor, extraSlots;
-    private final List<NonNullList<ItemStack>> f;
+    private List<NonNullList<ItemStack>> f;

    public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
        super(PlayerDataManager.getHandle(bukkitPlayer));
+        this.inventory = new CraftInventory(this);
        this.playerOnline = online;
+        this.player = super.player;
        this.items = this.player.inventory.items;
        this.armor = this.player.inventory.armor;
        this.extraSlots = this.player.inventory.extraSlots;
@@ -73,10 +76,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
            EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
            entityPlayer.inventory.transaction.addAll(this.transaction);
            this.player = entityPlayer;
-            this.player.inventory.a(this);
+            for (int i = 0; i < getSize(); ++i) {
+                this.player.inventory.setItem(i, getRawItem(i));
+            }
+            this.player.inventory.itemInHandIndex = this.itemInHandIndex;
            this.items = this.player.inventory.items;
            this.armor = this.player.inventory.armor;
            this.extraSlots = this.player.inventory.extraSlots;
+            this.f = ImmutableList.of(this.items, this.armor, this.extraSlots);
            this.playerOnline = true;
        }
    }
@@ -87,8 +94,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
    }

    @Override
-    public @NotNull Inventory getBukkitInventory() {
-        return inventory;
+    public @NotNull CraftInventory getBukkitInventory() {
+        return this.inventory;
    }

    @Override
@@ -116,6 +123,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return list.get(i);
    }

+    private ItemStack getRawItem(int i) {
+        NonNullList<ItemStack> list = null;
+        for (NonNullList<ItemStack> next : this.f) {
+            if (i < next.size()) {
+                list = next;
+                break;
+            }
+            i -= next.size();
+        }
+
+        return list == null ? ItemStack.a : list.get(i);
+    }
+
    @Override
    public IChatBaseComponent getDisplayName() {
        return new ChatMessage(this.player.getName());
@@ -151,7 +171,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

    @Override
    public int getSize() {
-        return super.getSize() + 4;
+        return 45;
    }

    @Override
@@ -192,7 +212,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

    @Override
    public ItemStack splitStack(int i, final int j) {
-        NonNullList<ItemStack> list = this.items;
+        List<ItemStack> list = this.items;

        if (i >= list.size()) {
            i -= list.size();
@@ -217,7 +237,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

    @Override
    public ItemStack splitWithoutUpdate(int i) {
-        NonNullList<ItemStack> list = this.items;
+        List<ItemStack> list = this.items;

        if (i >= list.size()) {
            i -= list.size();
@@ -247,46 +267,44 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return ItemStack.a;
    }

+    @Override
    public List<ItemStack> getContents() {
-        List<ItemStack> combined = new ArrayList<>(this.items.size() + this.armor.size() + this.extraSlots.size());
-
-        for (List<ItemStack> sub : this.f) {
-            combined.addAll(sub);
-        }
-
-        return combined;
+        return this.f.stream().flatMap(List::stream).collect(Collectors.toList());
    }

+    @Override
    public List<ItemStack> getArmorContents() {
        return this.armor;
    }

+    @Override
    public void onOpen(CraftHumanEntity who) {
        this.transaction.add(who);
    }

+    @Override
    public void onClose(CraftHumanEntity who) {
        this.transaction.remove(who);
    }

+    @Override
    public List<HumanEntity> getViewers() {
        return this.transaction;
    }

+    @Override
    public InventoryHolder getOwner() {
        return this.player.getBukkitEntity();
    }

+    @Override
    public Location getLocation() {
        return this.player.getBukkitEntity().getLocation();
    }

+    @Override
    public ItemStack getItemInHand() {
-        return e(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
-    }
-
-    public static int getHotbarSize() {
-        return 9;
+        return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.a;
    }

    private boolean a(ItemStack itemstack, ItemStack itemstack1) {
@@ -297,10 +315,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
    }

+    @Override
    public int canHold(ItemStack itemstack) {
        int remains = itemstack.getCount();

-        for(int i = 0; i < this.items.size(); ++i) {
+        for (int i = 0; i < this.items.size(); ++i) {
            ItemStack itemstack1 = this.getItem(i);
            if (itemstack1.isEmpty()) {
                return itemstack.getCount();
@@ -318,8 +337,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return itemstack.getCount() - remains;
    }

+    @Override
    public int getFirstEmptySlotIndex() {
-        for(int i = 0; i < this.items.size(); ++i) {
+        for (int i = 0; i < this.items.size(); ++i) {
            if (this.items.get(i).isEmpty()) {
                return i;
            }
@@ -328,19 +348,17 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return -1;
    }

-    public void d(int i) {
-        this.itemInHandIndex = this.l();
+    @Override
+    public void c(int i) {
+        this.itemInHandIndex = this.i();
        ItemStack itemstack = this.items.get(this.itemInHandIndex);
        this.items.set(this.itemInHandIndex, this.items.get(i));
        this.items.set(i, itemstack);
    }

-    public static boolean e(int i) {
-        return i >= 0 && i < 9;
-    }
-
+    @Override
    public int c(ItemStack itemstack) {
-        for(int i = 0; i < this.items.size(); ++i) {
+        for (int i = 0; i < this.items.size(); ++i) {
            ItemStack itemstack1 = this.items.get(i);
            if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) {
                return i;
@@ -350,17 +368,18 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return -1;
    }

-    public int l() {
+    @Override
+    public int i() {
        int i;
        int j;
-        for(j = 0; j < 9; ++j) {
+        for (j = 0; j < 9; ++j) {
            i = (this.itemInHandIndex + j) % 9;
            if (this.items.get(i).isEmpty()) {
                return i;
            }
        }

-        for(j = 0; j < 9; ++j) {
+        for (j = 0; j < 9; ++j) {
            i = (this.itemInHandIndex + j) % 9;
            if (!this.items.get(i).hasEnchantments()) {
                return i;
@@ -370,11 +389,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return this.itemInHandIndex;
    }

+    @Override
    public int a(Predicate<ItemStack> predicate, int i) {
        int j = 0;

        int k;
-        for(k = 0; k < this.getSize(); ++k) {
+        for (k = 0; k < this.getSize(); ++k) {
            ItemStack itemstack = this.getItem(k);
            if (!itemstack.isEmpty() && predicate.test(itemstack)) {
                int l = i <= 0 ? itemstack.getCount() : Math.min(i - j, itemstack.getCount());
@@ -451,13 +471,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        }
    }

+    @Override
    public int firstPartial(ItemStack itemstack) {
        if (this.a(this.getItem(this.itemInHandIndex), itemstack)) {
            return this.itemInHandIndex;
        } else if (this.a(this.getItem(40), itemstack)) {
            return 40;
        } else {
-            for(int i = 0; i < this.items.size(); ++i) {
+            for (int i = 0; i < this.items.size(); ++i) {
                if (this.a(this.items.get(i), itemstack)) {
                    return i;
                }
@@ -467,9 +488,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        }
    }

-    public void p() {
+    @Override
+    public void j() {

-        for (NonNullList<ItemStack> itemStacks : this.f) {
+        for (List<ItemStack> itemStacks : this.f) {
            for (int i = 0; i < itemStacks.size(); ++i) {
                if (!itemStacks.get(i).isEmpty()) {
                    itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i);
@@ -479,10 +501,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

    }

+    @Override
    public boolean pickup(ItemStack itemstack) {
        return this.c(-1, itemstack);
    }

+    @Override
    public boolean c(int i, ItemStack itemstack) {
        if (itemstack.isEmpty()) {
            return false;
@@ -533,6 +557,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        }
    }

+    @Override
    public void a(World world, ItemStack itemstack) {
        if (!world.isClientSide) {
            while(!itemstack.isEmpty()) {
@@ -555,26 +580,29 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

    }

+    @Override
    public void f(ItemStack itemstack) {

-        for (NonNullList<ItemStack> nonnulllist : this.f) {
-            for (int i = 0; i < nonnulllist.size(); ++i) {
-                if (nonnulllist.get(i) == itemstack) {
-                    nonnulllist.set(i, ItemStack.a);
+        for (List<ItemStack> list : this.f) {
+            for (int i = 0; i < list.size(); ++i) {
+                if (list.get(i) == itemstack) {
+                    list.set(i, ItemStack.a);
                    break;
                }
            }
        }
    }

+    @Override
    public float a(IBlockData iblockdata) {
        return this.items.get(this.itemInHandIndex).a(iblockdata);
    }

+    @Override
    public NBTTagList a(NBTTagList nbttaglist) {
        NBTTagCompound nbttagcompound;
        int i;
-        for(i = 0; i < this.items.size(); ++i) {
+        for (i = 0; i < this.items.size(); ++i) {
            if (!this.items.get(i).isEmpty()) {
                nbttagcompound = new NBTTagCompound();
                nbttagcompound.setByte("Slot", (byte) i);
@@ -583,7 +611,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
            }
        }

-        for(i = 0; i < this.armor.size(); ++i) {
+        for (i = 0; i < this.armor.size(); ++i) {
            if (!this.armor.get(i).isEmpty()) {
                nbttagcompound = new NBTTagCompound();
                nbttagcompound.setByte("Slot", (byte) (i + 100));
@@ -592,7 +620,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
            }
        }

-        for(i = 0; i < this.extraSlots.size(); ++i) {
+        for (i = 0; i < this.extraSlots.size(); ++i) {
            if (!this.extraSlots.get(i).isEmpty()) {
                nbttagcompound = new NBTTagCompound();
                nbttagcompound.setByte("Slot", (byte) (i + 150));
@@ -604,6 +632,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        return nbttaglist;
    }

+    @Override
    public void b(NBTTagList nbttaglist) {
        this.items.clear();
        this.armor.clear();
@@ -626,11 +655,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

    }

-    public boolean P_() {
+    @Override
+    public boolean isNotEmpty() {
        Iterator iterator = this.items.iterator();

        ItemStack itemstack;
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
            itemstack = (ItemStack)iterator.next();
            if (!itemstack.isEmpty()) {
                return false;
@@ -639,7 +669,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

        iterator = this.armor.iterator();

-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
            itemstack = (ItemStack)iterator.next();
            if (!itemstack.isEmpty()) {
                return false;
@@ -648,7 +678,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP

        iterator = this.extraSlots.iterator();

-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
            itemstack = (ItemStack)iterator.next();
            if (!itemstack.isEmpty()) {
                return false;
@@ -659,14 +689,17 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
    }

    @Nullable
+    @Override
    public IChatBaseComponent getCustomName() {
        return null;
    }

+    @Override
    public boolean b(IBlockData iblockdata) {
-        return this.getItem(this.itemInHandIndex).b(iblockdata);
+        return this.getItem(this.itemInHandIndex).canDestroySpecialBlock(iblockdata);
    }

+    @Override
    public void a(float f) {
        if (f > 0.0F) {
            f /= 4.0F;
@@ -674,16 +707,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
                f = 1.0F;
            }

-            for (ItemStack itemstack : this.armor) {
+            for (int i = 0; i < this.armor.size(); ++i) {
+                ItemStack itemstack = this.armor.get(0);
+                int index = i;
                if (itemstack.getItem() instanceof ItemArmor) {
-                    itemstack.damage((int) f, this.player);
+                    itemstack.damage((int) f, this.player, (entityhuman) -> entityhuman.c(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index)));
                }
            }
        }
    }

+    @Override
    public void dropContents() {
-        for (NonNullList<ItemStack> itemStacks : this.f) {
+        for (List<ItemStack> itemStacks : this.f) {
            for (int i = 0; i < itemStacks.size(); ++i) {
                ItemStack itemstack = itemStacks.get(i);
                if (!itemstack.isEmpty()) {
@@ -694,10 +730,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        }
    }

+    @Override
    public boolean h(ItemStack itemstack) {
-        return this.f.stream().flatMap(NonNullList::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
+        return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack));
    }

+    @Override
    public void a(PlayerInventory playerinventory) {
        for (int i = 0; i < playerinventory.getSize(); ++i) {
            this.setItem(i, playerinventory.getItem(i));
@@ -706,10 +744,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
        this.itemInHandIndex = playerinventory.itemInHandIndex;
    }

+    @Override
    public void clear() {
-        this.f.forEach(NonNullList::clear);
+        this.f.forEach(List::clear);
    }

+    @Override
    public void a(AutoRecipeStackManager autorecipestackmanager) {
        for (ItemStack itemstack : this.items) {
            autorecipestackmanager.a(itemstack);
--- a/internal/v1_8_R3/pom.xml
+++ b/internal/v1_8_R3/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvinternal</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,7 +37,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.8</version>
    </dependency>
  </dependencies>

--- a/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java
+++ b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/AnySilentContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
@@ -225,6 +225,8 @@ public class AnySilentContainer implements IAnySilentContainer {
        EnumGamemode gamemode = player.playerInteractManager.getGameMode();
        this.forceGameMode(player, EnumGamemode.SPECTATOR);
        player.activeContainer.b(player);
+        player.activeContainer.a(player, false);
+        player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity());
        player.activeContainer = player.defaultContainer;
        this.forceGameMode(player, gamemode);
    }
--- a/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java
+++ b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java
+++ b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java
+++ b/internal/v1_8_R3/src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.8</version>
  </parent>

  <artifactId>openinvplugincore</artifactId>
@@ -31,7 +31,7 @@
    <dependency>
      <groupId>com.lishid</groupId>
      <artifactId>openinvcommon</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.8</version>
    </dependency>
    <dependency>
      <groupId>org.spigotmc</groupId>
--- a/plugin/src/main/java/com/lishid/openinv/OpenInv.java
+++ b/plugin/src/main/java/com/lishid/openinv/OpenInv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/AnyChestPluginCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/SearchEnchantPluginCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/SearchInvPluginCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java
+++ b/plugin/src/main/java/com/lishid/openinv/commands/SilentChestPluginCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/InventoryClickListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/listeners/InventoryCloseListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/InventoryCloseListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/listeners/PlayerListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/PlayerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/listeners/PluginListener.java
+++ b/plugin/src/main/java/com/lishid/openinv/listeners/PluginListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java
+++ b/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2018 lishid. All rights reserved.
+ * Copyright (C) 2011-2019 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
--- a/plugin/src/main/resources/plugin.yml
+++ b/plugin/src/main/resources/plugin.yml
@@ -5,6 +5,7 @@ author: lishid
 authors: [Jikoo, ShadowRanger]
 description: >
             This plugin allows you to open a player's inventory as a chest and interact with it in real time.
+api-version: "1.13"

 permissions:
  OpenInv.any.default:
@@ -13,47 +14,57 @@ permissions:
  OpenInv.silent.default:
    description: Permission for SilentContainer to default on prior to toggling.
    default: false
+  OpenInv.*:
+    description: Permission for all OpenInv features.
+    default: op
+    children:
+      OpenInv.openinv: true
+      OpenInv.openender: true
+      OpenInv.search: true
+      OpenInv.silent: true
+      OpenInv.anychest: true
+      OpenInv.searchenchant: true

 commands:
  openinv:
    aliases: [oi, inv, open]
    description: Open a player's inventory
-    permission: OpenInv.*;OpenInv.openinv
+    permission: OpenInv.openinv
    usage: |-
           /<command> [Player] - Open a player's inventory
  openender:
    aliases: [oe]
    description: Opens the enderchest of a player
-    permission: OpenInv.*;OpenInv.openender
+    permission: OpenInv.openender
    usage: |-
           /<command> [Player] - Open a player's enderchest
  searchinv:
    aliases: [si]
    description: Search and list players having a specific item
-    permission: OpenInv.*;OpenInv.search
+    permission: OpenInv.search
    usage: |-
           /<command> <Item> [MinAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
  searchender:
    aliases: [se]
-    permission: OpenInv.*;OpenInv.search
+    permission: OpenInv.search
    description: Searches and lists players having a specific item in their ender chest
    usage: |-
           /<command> <item> [MinAmount] - Item is the ID or the Bukkit Material, MinAmount is the minimum amount required
  silentcontainer:
    aliases: [sc, silent, silentchest]
    description: Toggle SilentContainer function, which stops sounds and animations when using containers.
-    permission: OpenInv.*;OpenInv.silent
+    permission: OpenInv.silent
    usage: |-
           /<command> [Check] - Check or toggle silent chest
  anycontainer:
    aliases: [ac, anychest]
    description: Toggle AnyContainer function, which allows opening of blocked containers.
-    permission: OpenInv.*;OpenInv.anychest
+    permission: OpenInv.anychest
    usage: |-
           /<command> [Check] - Checks or toggle anychest
  searchenchant:
    aliases: [searchenchants]
    description: Search and list players with a specific enchantment.
-    permission: OpenInv.*;OpenInv.searchenchant
+    permission: OpenInv.searchenchant
    usage: |-
           /<command> <[enchantment] [MinLevel]> - Enchantment is the enchantment type, MinLevel is the minimum level. One is optional
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2011-2018 lishid. All rights reserved.
+  ~ Copyright (C) 2011-2019 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
@@ -21,7 +21,7 @@
  <artifactId>openinvparent</artifactId>
  <name>OpenInvParent</name>
  <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.0.3</version>
+  <version>4.0.8</version>

  <packaging>pom</packaging>
Author	SHA1	Message	Date
Jikoo	65c6eb2693	Bump version to 4.0.8 for release	2019-12-12 14:36:38 -05:00
Jikoo	ab1f4ace8a	Fix AnyContainer breaking modified ender chest sizes	2019-12-12 14:33:42 -05:00
Jikoo	e7dc52bee4	Drop support for 1.13, latest 2 versions only.	2019-12-12 14:21:33 -05:00
Jikoo	a9c5799677	Merge branch 'master' of https://github.com/lishid/OpenInv	2019-12-12 13:59:38 -05:00
Andre LeBlanc	6d6257720a	add support for 1.15	2019-12-12 13:59:12 -05:00
Andre LeBlanc	3e235fa688	add support for 1.15	2019-12-12 12:49:21 -05:00
Jikoo	dd02355ac2	Properly remove SilentContainer viewers Closes #115	2019-12-03 13:50:27 -05:00
Jikoo	4d3f5d67a8	Update copyright Practically should make it 2020 at this rate, whoops (cherry picked from commit `ff76f2b95a`)	2019-12-03 13:32:41 -05:00
Jikoo	7ad5faa2ce	Clean up maven instructions (cherry picked from commit `b92543e078`)	2019-12-03 13:32:37 -05:00
Jikoo	c28383ef36	Work around 1.14 tab completion issues	2019-10-01 08:30:28 -04:00
Jikoo	5fbab1ab8f	Bump version to 4.0.8-SNAPSHOT for development	2019-09-29 19:43:14 -04:00
Jikoo	d97b092978	Bump version to 4.0.7 for release	2019-09-29 19:42:59 -04:00
Jikoo	154bf56c2a	Include api-version in plugin.yml Closes #111, #112	2019-09-29 19:40:06 -04:00
William Blake Galbreath	d65a9caeb2	Add support for varying sizes of inventories	2019-08-01 21:04:23 -04:00
Jikoo	b3c4253606	Bump version to 4.0.7-SNAPSHOT for development	2019-07-21 13:30:02 -04:00
Jikoo	b64000e89b	Bump version to 4.0.6 for release	2019-07-21 13:29:45 -04:00
Jikoo	3faf41ef18	More clear error when loot is not generated	2019-07-19 18:16:36 -04:00
Jikoo	db27d25a93	More Bukkit API, less breaking with new versions	2019-07-19 18:14:14 -04:00
Jikoo	0f02e6fe66	Right, 1.13 is a thing	2019-07-19 18:12:06 -04:00
Jikoo	ec07637e9f	Bump version to 4.0.6-SNAPSHOT for development	2019-07-19 16:26:24 -04:00
Jikoo	b269f3509c	Bump version to 4.0.5 for release	2019-07-19 16:26:03 -04:00
Jikoo	f2e4c8a3ad	Fix barrel triggering AnyContainer (#108 )	2019-07-19 16:24:58 -04:00
Jikoo	35839f1548	Bump version to 4.0.5-SNAPSHOT for development	2019-07-19 07:21:37 -04:00
Jikoo	a4a462a1fa	Bump version to 4.0.4 for release	2019-07-19 07:21:16 -04:00
Jikoo	b9f901af66	Add silent barrels - fixes #106	2019-07-19 07:18:23 -04:00
Jikoo	1333056613	Correct item order - fixes #107	2019-07-19 07:13:11 -04:00
Jikoo	fb23df313a	Bump version to 4.0.4-SNAPSHOT for development	2019-05-27 20:53:44 -04:00