Fix scanning of inventories in the wrong neighbours of the Interface …

…and Browser blocks.
gigaherz · Apr 23, 2016 · 8d55898 · 8d55898
1 parent 9d27d23
commit 8d55898
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 22 deletions.
diff --git a/src/main/java/gigaherz/enderRift/blocks/BlockInterface.java b/src/main/java/gigaherz/enderRift/blocks/BlockInterface.java
@@ -44,22 +44,6 @@ public boolean isOpaqueCube()
         return false;
     }
 
-    @Override
-    public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
-    {
-        TileEntity te = worldIn.getTileEntity(pos);
-        if (te != null)
-            te.markDirty();
-    }
-
-    @Override
-    public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
-    {
-        IBlockState state = world.getBlockState(pos);
-        if (neighbor.equals(pos.offset(state.getValue(FACING))))
-            world.getTileEntity(pos).markDirty();
-    }
-
     @Override
     public boolean hasTileEntity(IBlockState state)
     {

diff --git a/src/main/java/gigaherz/enderRift/blocks/TileBrowser.java b/src/main/java/gigaherz/enderRift/blocks/TileBrowser.java
@@ -22,6 +22,20 @@ public class TileBrowser extends TileEntity implements IBrowserExtension
 {
     private int changeCount = 1;
 
+    EnumFacing facing = null;
+    public EnumFacing getFacing()
+    {
+        if(facing == null)
+        {
+            IBlockState state = worldObj.getBlockState(pos);
+            if(state.getBlock() == EnderRiftMod.browser)
+            {
+                facing = state.getValue(BlockInterface.FACING).getOpposite();
+            }
+        }
+        return facing;
+    }
+
     public IInventoryAutomation getAutomation()
     {
         AutomationAggregator aggregator = new AutomationAggregator();
@@ -82,6 +96,7 @@ public IInventoryAutomation getAutomation()
     public void markDirty()
     {
         changeCount++;
+        facing = null;
         super.markDirty();
     }
 
@@ -99,6 +114,10 @@ public void markDirty(Set<BlockPos> scanned, int distance, Queue<Pair<BlockPos,
     @Override
     public void gatherNeighbours(Queue<Triple<BlockPos, EnumFacing, Integer>> pending, EnumFacing faceFrom, int distance)
     {
-        pending.add(Triple.of(this.pos.offset(faceFrom.getOpposite()), faceFrom, distance));
+        EnumFacing f = getFacing();
+        if (f != null)
+        {
+            pending.add(Triple.of(this.pos.offset(f.getOpposite()), faceFrom, distance));
+        }
     }
 }
diff --git a/src/main/java/gigaherz/enderRift/blocks/TileInterface.java b/src/main/java/gigaherz/enderRift/blocks/TileInterface.java
@@ -45,6 +45,20 @@ protected void onContentsChanged(int slot)
         }
     };
 
+    EnumFacing facing = null;
+    public EnumFacing getFacing()
+    {
+        if(facing == null)
+        {
+            IBlockState state = worldObj.getBlockState(pos);
+            if(state.getBlock() == EnderRiftMod.riftInterface)
+            {
+                facing = state.getValue(BlockInterface.FACING).getOpposite();
+            }
+        }
+        return facing;
+    }
+
     public IItemHandler inventoryOutputs()
     {
         return outputs;
@@ -58,17 +72,23 @@ public IItemHandler inventoryFilter()
     @Override
     public boolean hasCapability(Capability<?> capability, EnumFacing facing)
     {
-        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
-            return true;
+        if (facing == getFacing())
+        {
+            if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
+                return true;
+        }
         return super.hasCapability(capability, facing);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public <T> T getCapability(Capability<T> capability, EnumFacing facing)
     {
-        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
-            return (T)outputs;
+        if (facing == getFacing())
+        {
+            if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
+                return (T) outputs;
+        }
         return super.getCapability(capability, facing);
     }
 
@@ -132,6 +152,7 @@ public IInventoryAutomation getAutomation()
     public void markDirty()
     {
         super.markDirty();
+        facing = null;
     }
 
     @Override
@@ -143,7 +164,11 @@ public void markDirty(Set<BlockPos> scanned, int distance, Queue<Pair<BlockPos,
     @Override
     public void gatherNeighbours(Queue<Triple<BlockPos, EnumFacing, Integer>> pending, EnumFacing faceFrom, int distance)
     {
-        pending.add(Triple.of(this.pos.offset(faceFrom.getOpposite()), faceFrom, distance));
+        EnumFacing f = getFacing();
+        if (f != null)
+        {
+            pending.add(Triple.of(this.pos.offset(f.getOpposite()), faceFrom, distance));
+        }
     }
 
     @Override