Fix more comparator/tile entity jank

Author: zero318

_VERSION.txt

@@ -1 +1 @@
-0.2.0
+0.2.1

build_stats.txt

@@ -1,8 +1,8 @@
 ; Stats tracked as of version 0.0.9
-TotalBuilds=1007
-TotalRuns=933
-SuccessRuns=670
-FailedRuns=263
+TotalBuilds=1037
+TotalRuns=963
+SuccessRuns=681
+FailedRuns=282
 TotalReleases=74
 SuccessReleases=67
 FailedReleases=7

feature_list.txt

@@ -144,6 +144,7 @@ Comparators:
 - Enabled rotation on turntables
 - Fixed placement from block dispensers
 - Fixed MC-8911, MC-10653, MC-12211, MC-63669, and MC-195351
+- Properly detect breaking/moving of blocks
 
 Repeaters:
 - Renders properly on top of transparent blocks

gradle.properties

@@ -10,4 +10,4 @@ archives_base_name = zero_btw_addon_test
 
 org.gradle.jvmargs=-Xmx4g
 org.gradle.daemon=false
-mod_version = 0.2.0
+mod_version = 0.2.1

src/main/java/zero/test/IBlockEntityPistonMixins.java

@@ -8,6 +8,7 @@ public interface IBlockEntityPistonMixins {
     public void setLastTicked(long time);
     public boolean hasSmallCenterHardPointToFacing(int x, int y, int z, int direction, boolean ignoreTransparency);
     public boolean hasCenterHardPointToFacing(int x, int y, int z, int direction, boolean ignoreTransparency);
+    public TileEntity getStoredTileEntity();
     public boolean isRetractingBase();
     public boolean hasLargeCenterHardPointToFacing(int x, int y, int z, int direction, boolean ignoreTransparency);
     public void getCollisionList(AxisAlignedBB maskBox, List list, Entity entity);

src/main/java/zero/test/PistonResolver.java

@@ -490,7 +490,6 @@ public boolean moveBlocks(World world, int x, int y, int z, int direction, boole
             blockMeta = block.adjustMetadataForPistonMove(blockMeta);
                                                                              ;
             NBTTagCompound tileEntityData = BlockPistonBase.getBlockTileEntityData(world, x, y, z);
-            // Removing this seems to be safe...
             world.removeBlockTileEntity(x, y, z);
             packedPos = ((long)(z + Facing.offsetsZForSide[direction])<<12 +26|(long)((x + Facing.offsetsXForSide[direction])&0x3FFFFFF)<<12|((y + Facing.offsetsYForSide[direction])&0xFFF));
             int j = i;
@@ -578,12 +577,16 @@ else if (
         for (int i = destroy_index_global; --i >= DESTROY_LIST_START_INDEX;) {
             // Set x,y,z to position of block in destroy list
             packedPos = pushed_blocks[i];
-            world.notifyBlocksOfNeighborChange(((int)((packedPos)<<26>>(64)-26)),((int)(packedPos)<<(32)-12>>(32)-12),((int)((packedPos)>>(64)-26)), ((data_list[i])&0xFFFF));
+            //world.notifyBlocksOfNeighborChange(BLOCK_POS_UNPACK_ARGS(packedPos), BLOCK_STATE_EXTRACT_ID(data_list[i]));
+            blockId = ((data_list[i])&0xFFFF);
+            ((IWorldMixins)world).notifyBlockChangeAndComparators(((int)((packedPos)<<26>>(64)-26)),((int)(packedPos)<<(32)-12>>(32)-12),((int)((packedPos)>>(64)-26)), blockId, blockId);
         }
         for (int i = push_index_global; --i >= PUSH_LIST_START_INDEX;) {
             // Set x,y,z to position of block in push list
             packedPos = pushed_blocks[i];
-            world.notifyBlocksOfNeighborChange(((int)((packedPos)<<26>>(64)-26)),((int)(packedPos)<<(32)-12>>(32)-12),((int)((packedPos)>>(64)-26)), ((data_list[i])&0xFFFF));
+            //world.notifyBlocksOfNeighborChange(BLOCK_POS_UNPACK_ARGS(packedPos), BLOCK_STATE_EXTRACT_ID(data_list[i]));
+            blockId = ((data_list[i])&0xFFFF);
+            ((IWorldMixins)world).notifyBlockChangeAndComparators(((int)((packedPos)<<26>>(64)-26)),((int)(packedPos)<<(32)-12>>(32)-12),((int)((packedPos)>>(64)-26)), blockId, blockId);
         }
         // START SHOVEL CODE
         for (int i = shovel_index_global; --i >= SHOVEL_EJECT_LIST_START_INDEX;) {

src/main/java/zero/test/TurntableResolver.java

@@ -11,6 +11,7 @@
 import zero.test.mixin.IPistonBaseAccessMixins;
 import zero.test.IWorldMixins;
 import zero.test.IBlockEntityPistonMixins;
+import zero.test.ZeroUtil;
 // Block piston reactions
 public class TurntableResolver {
     private static final int TURNTABLE_HEIGHT_LIMIT =
@@ -158,11 +159,16 @@ public int turnBlocks(World world, int x, int y, int z, boolean reverse, int cra
             for (int i = attachment_index_global; --i >= ATTACHMENT_LIST_START_INDEX;) {
                 packedPos = pillar_blocks[i];
                 {(x)=((int)((packedPos)<<26>>(64)-26));(z)=((int)((packedPos)>>(64)-26));(y)=((int)(packedPos)<<(32)-12>>(32)-12);};
-                if (Block.blocksList[((data_list[i])&0xFFF)].hasTileEntity()) {
+                blockId = ((data_list[i])&0xFFF);
+                Block block = Block.blocksList[blockId];
+                if (block.hasTileEntity()) {
                     tile_entity_list[tile_entity_index++] = world.getBlockTileEntity(x, y, z);
                     world.removeBlockTileEntity(x, y, z);
                 }
                 world.setBlock(x, y, z, 0, 0, 0x01 | 0x02);
+                if (block.hasComparatorInputOverride()) {
+                    world.func_96440_m(x, y, z, blockId);
+                }
             }
             for (int i = pillar_index_global; --i >= PILLAR_LIST_START_INDEX;) {
                 packedPos = pillar_blocks[i];
@@ -217,6 +223,9 @@ public int turnBlocks(World world, int x, int y, int z, boolean reverse, int cra
                     }
                 }
                 else {
+                    if (tile_entity != null) {
+                        ZeroUtil.break_tile_entity(world, x, y, z, tile_entity);
+                    }
                     // This seems like it could be an issue.
                     // Maybe destroy the block instead?
                     block.dropBlockAsItem(world, x, y, z, blockId, blockMeta);

src/main/java/zero/test/ZeroTestAddon.java

@@ -17,7 +17,7 @@
 public class ZeroTestAddon extends BTWAddon {
     private static ZeroTestAddon instance;
     private ZeroTestAddon() {
-        super("Zero Test Addon", "0.2.0", "ZeroTest");
+        super("Zero Test Addon", "0.2.1", "ZeroTest");
     }
     @Override
     public void initialize() {
@@ -270,6 +270,16 @@ public void postInitialize() {
                 'B', new ItemStack(BTWItems.stoneBrick, 1, InventoryUtils.IGNORE_METADATA)
             }
         );
+        RecipeManager.addRecipe(
+            new ItemStack(Block.dropper, 1),
+            new Object[] {
+                "###",
+                "# #",
+                "#R#",
+                '#', new ItemStack(BTWItems.stoneBrick, 1, InventoryUtils.IGNORE_METADATA),
+                'R', BTWItems.redstoneLatch
+            }
+        );
     }
     // Is this important?
     // Also looks kinda backwards tbh (I tried fixing it)

src/main/java/zero/test/ZeroUtil.java

@@ -1,6 +1,10 @@
 package zero.test;
 import net.minecraft.src.*;
+import btw.block.tileentity.*;
+import btw.item.util.ItemUtils;
+import btw.inventory.util.InventoryUtils;
 import btw.AddonHandler;
+import java.util.Random;
 // Block piston reactions
 public class ZeroUtil {
     public static final int[] rail_exit_directions = new int[] {
@@ -78,4 +82,30 @@ public static float angle_rotate_180(float angle) {
         }
         return angle;
     }
+    public static double triangle_random(Random random, double offset, double range) {
+        return offset + range * (random.nextDouble() - random.nextDouble());
+    }
+    public static void break_tile_entity(World world, int x, int y, int z, TileEntity tileEntity) {
+        if (tileEntity instanceof IInventory) {
+            InventoryUtils.ejectInventoryContents(world, x, y, z, (IInventory)tileEntity);
+        }
+        else if (tileEntity instanceof TileEntityRecordPlayer) {
+            ItemStack record;
+            if ((record = ((TileEntityRecordPlayer)tileEntity).func_96097_a()) != null) {
+                ItemUtils.ejectStackWithRandomOffset(world, x, y, z, record);
+            }
+        }
+        else if (tileEntity instanceof ArcaneVesselTileEntity) {
+            ((ArcaneVesselTileEntity)tileEntity).ejectContentsOnBlockBreak();
+        }
+        else if (tileEntity instanceof BasketTileEntity) {
+            ((BasketTileEntity)tileEntity).ejectContents();
+        }
+        else if (tileEntity instanceof PlacedToolTileEntity) {
+            ((PlacedToolTileEntity)tileEntity).ejectContents();
+        }
+        else if (tileEntity instanceof CampfireTileEntity) {
+            ((CampfireTileEntity)tileEntity).ejectContents();
+        }
+    }
 }

src/main/java/zero/test/block/DropperShim.java

@@ -0,0 +1,10 @@
+package zero.test.block;
+import net.minecraft.src.*;
+// Block piston reactions
+public class DropperShim
+extends BlockDropper
+{
+    public DropperShim(int blockId) {
+        super(blockId);
+    }
+}