Bump version to 3.3.5 for release

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

assembly/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

common/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/1_4_5/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/1_4_6/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>

internal/v1_10_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_11_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_12_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_12_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_13_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_13_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

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

@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
 import com.lishid.openinv.internal.IAnySilentContainer;
 
 import net.minecraft.server.v1_13_R1.BlockChestTrapped;
+import net.minecraft.server.v1_13_R1.BlockPropertyChestType;
 import net.minecraft.server.v1_13_R1.ChatMessage;
 import net.minecraft.server.v1_13_R1.VoxelShapes;
 import org.bukkit.Material;
@@ -193,31 +194,34 @@ public class AnySilentContainer implements IAnySilentContainer {
         }
 
         ITileInventory tileInventory = (ITileInventory) tile;
-        Block block = world.getType(blockPosition).getBlock();
+        IBlockData blockData = world.getType(blockPosition);
+        Block block = blockData.getBlock();
 
         if (block instanceof BlockChest) {
-            for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
-                BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
-                Block localBlock = world.getType(localBlockPosition).getBlock();
 
-                if (localBlock != block) {
-                    continue;
-                }
+            BlockPropertyChestType chestType = blockData.get(BlockChest.b);
 
-                TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
-                if (!(localTileEntity instanceof TileEntityChest)) {
-                    continue;
-                }
+            if (chestType != BlockPropertyChestType.SINGLE) {
 
-                if (localEnumDirection == EnumDirection.WEST
-                        || localEnumDirection == EnumDirection.NORTH) {
-                    tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"),
-                            (TileEntityChest) localTileEntity, tileInventory);
-                } else {
-                    tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"),
-                            tileInventory, (TileEntityChest) localTileEntity);
+                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);
+                        }
+                    }
                 }
-                break;
             }
 
             if (block instanceof BlockChestTrapped) {

internal/v1_4_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_5_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_5_R3/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_6_R3/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R3/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_7_R4/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R4</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_8_R3/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

internal/v1_9_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_9_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 </project>

internal/v1_9_R2/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvadapter1_9_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

plugin/plugin-core/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvplugin</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvpluginv1_10_r1</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

plugin/plugin-v1_10_R1/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvplugin</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvpluginv1_10_r1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
     </dependency>
   </dependencies>
 

plugin/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4</version>
+    <version>3.3.5</version>
   </parent>
 
   <artifactId>openinvplugin</artifactId>

pom.xml

@@ -21,7 +21,7 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInvParent</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>3.3.4</version>
+  <version>3.3.5</version>
 
   <packaging>pom</packaging>