Add weak signal forwarding + test

Author: shartte

src/main/java/dev/technici4n/moderndynamics/extender/MachineExtenderBlock.java

@@ -21,7 +21,9 @@
 import dev.technici4n.moderndynamics.MdBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.Containers;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
@@ -35,6 +37,8 @@
 import org.jetbrains.annotations.Nullable;
 
 public class MachineExtenderBlock extends MdBlock {
+    private static final ScopedValue<?> SIGNAL_FORWARDING = ScopedValue.newInstance();
+
     public static final BooleanProperty TOP = BooleanProperty.create("top");
 
     public MachineExtenderBlock(Properties props) {
@@ -90,10 +94,40 @@ protected void neighborChanged(BlockState state, Level level, BlockPos pos, Bloc
         super.neighborChanged(state, level, pos, block, orientation, movedByPiston);
     }
 
-    // TODO 26.1: This previously used the vanilla callback, but I have my doubt it was ever called
     @Override
     public void onNeighborChange(BlockState state, LevelReader level, BlockPos pos, BlockPos neighbor) {
+        if (pos.below().equals(neighbor) && level instanceof Level actualLevel) {
+            actualLevel.updateNeighborsAtExceptFromFacing(pos, this, Direction.DOWN, null);
+        }
+    }
+
+    @Override
+    protected boolean hasAnalogOutputSignal(BlockState state) {
+        return true;
+    }
+
+    @Override
+    protected int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos, Direction direction) {
+        if (direction == Direction.DOWN || SIGNAL_FORWARDING.isBound()) {
+            return 0;
+        }
+
+        // Seek to the first non-extender below
+        var below = pos.below();
+        while (below.getY() > 0 && level.getBlockState(below).is(this)) {
+            below = below.below();
+        }
 
-        super.onNeighborChange(state, level, pos, neighbor);
+        // Ensure we don't get recursively called
+        var source = below;
+        return ScopedValue.where(SIGNAL_FORWARDING, null).call(() -> {
+            return level.getBlockState(source).getAnalogOutputSignal(level, source, Direction.UP);
+        });
+    }
+
+    @Override
+    protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) {
+        // This mirrors what ChestBlock does
+        Containers.updateNeighboursAfterDestroy(state, level, pos);
     }
 }

src/main/java/dev/technici4n/moderndynamics/pipe/PipeItem.java

@@ -28,7 +28,7 @@
 
 public class PipeItem extends BlockItem {
     public PipeItem(PipeBlock block, Item.Properties props) {
-        super(block, props);
+        super(block, props.useBlockDescriptionPrefix());
         block.setItem(this);
     }
 

src/main/java/dev/technici4n/moderndynamics/test/MachineExtenderTest.java

@@ -0,0 +1,65 @@
+package dev.technici4n.moderndynamics.test;
+
+import dev.technici4n.moderndynamics.init.MdBlocks;
+import dev.technici4n.moderndynamics.test.framework.MdGameTestHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.RedstoneLampBlock;
+import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.transaction.Transaction;
+
+import java.util.List;
+
+public class MachineExtenderTest {
+    @MdGameTest
+    public void testForwardWeakSignal(MdGameTestHelper helper) {
+        var l0 = BlockPos.ZERO.above();
+        var l1 = l0.above();
+        var l2 = l1.above();
+
+        helper.setBlock(l0, Blocks.HOPPER);
+        helper.setBlock(l0.north().below(), Blocks.STONE, Direction.SOUTH);
+        helper.setBlock(l0.north(), Blocks.COMPARATOR, Direction.SOUTH);
+        helper.setBlock(l0.north().north(), Blocks.REDSTONE_LAMP);
+
+        helper.setBlock(l1, MdBlocks.MACHINE_EXTENDER.get());
+        helper.setBlock(l1.east().below(), Blocks.STONE);
+        helper.setBlock(l1.east(), Blocks.COMPARATOR, Direction.WEST);
+        helper.setBlock(l1.east().east(), Blocks.REDSTONE_LAMP);
+
+        helper.setBlock(l2, MdBlocks.MACHINE_EXTENDER.get());
+        helper.setBlock(l2.west().below(), Blocks.STONE);
+        helper.setBlock(l2.west(), Blocks.COMPARATOR, Direction.EAST);
+        helper.setBlock(l2.west().west(), Blocks.REDSTONE_LAMP);
+
+        var lamps = List.of(l0.north().north(), l1.east().east(), l2.west().west());
+        var lampOff = Blocks.REDSTONE_LAMP.defaultBlockState();
+        var lampOn = lampOff.setValue(RedstoneLampBlock.LIT, true);
+
+        helper.startSequence()
+                .thenExecute(() -> {
+                    for (var lamp : lamps) {
+                        helper.assertBlockState(lamp, lampOff);
+                    }
+                })
+                .thenExecuteAfter(1, () -> {
+                    // Fill the hopper
+                    try (var tx = Transaction.openRoot()) {
+                        var items = helper.getLevel().getCapability(Capabilities.Item.BLOCK, helper.absolutePos(l0), Direction.UP);
+                        for (int i = 0; i < items.size(); i++) {
+                            items.insert(ItemResource.of(Items.STICK), 64, tx);
+                        }
+                        tx.commit();
+                    }
+                })
+                .thenExecuteAfter(5, () -> {
+                    for (var lamp : lamps) {
+                        helper.assertBlockState(lamp, lampOn);
+                    }
+                })
+                .thenSucceed();
+    }
+}

src/main/java/dev/technici4n/moderndynamics/test/MdGameTests.java

@@ -46,7 +46,8 @@ public final class MdGameTests {
     private static final List<Class<?>> testClasses = List.of(
             FluidTransferTest.class,
             ItemDistributionTest.class,
-            ItemTransferTest.class);
+            ItemTransferTest.class,
+            MachineExtenderTest.class);
 
     private static final Map<Identifier, TestData<ResourceKey<TestEnvironmentDefinition<?>>>> tests = new HashMap<>();