Machine Chainers to respect voltage (#173)

Author: Swedz

src/generated/resources/data/modern_industrialization/recipe/machines/machine_chainer/assembler.json

@@ -7,10 +7,6 @@
       "amount": 1,
       "item": "modern_industrialization:advanced_machine_hull"
     },
-    {
-      "amount": 2,
-      "item": "extended_industrialization:universal_transformer"
-    },
     {
       "amount": 2,
       "item": "modern_industrialization:large_motor"

src/main/java/net/swedz/extended_industrialization/datagen/server/provider/recipes/MachineItemRecipesServerDatagenProvider.java

@@ -484,7 +484,6 @@ private static void machineChainer(RecipeOutput output)
 	{
 		new MachineRecipeBuilder(MIMachineRecipeTypes.ASSEMBLER, 8, 10 * 20)
 				.addItemInput(MIBlock.ADVANCED_MACHINE_HULL, 1)
-				.addItemInput("extended_industrialization:universal_transformer", 2)
 				.addItemInput(MIItem.LARGE_MOTOR, 2)
 				.addItemInput(MIItem.LARGE_PUMP, 2)
 				.addItemInput(MITags.ITEM_PIPES, 64)

src/main/java/net/swedz/extended_industrialization/machines/blockentity/MachineChainerMachineBlockEntity.java

@@ -1,17 +1,24 @@
 package net.swedz.extended_industrialization.machines.blockentity;
 
 import aztech.modern_industrialization.MICapabilities;
+import aztech.modern_industrialization.api.energy.CableTier;
+import aztech.modern_industrialization.api.energy.CableTierHolder;
 import aztech.modern_industrialization.api.energy.EnergyApi;
 import aztech.modern_industrialization.inventory.MIInventory;
 import aztech.modern_industrialization.machines.BEP;
 import aztech.modern_industrialization.machines.MachineBlockEntity;
+import aztech.modern_industrialization.machines.components.CasingComponent;
 import aztech.modern_industrialization.machines.components.OrientationComponent;
 import aztech.modern_industrialization.machines.components.RedstoneControlComponent;
 import aztech.modern_industrialization.machines.gui.MachineGuiParameters;
 import aztech.modern_industrialization.machines.guicomponents.AutoExtract;
 import aztech.modern_industrialization.machines.guicomponents.SlotPanel;
 import aztech.modern_industrialization.machines.models.MachineModelClientData;
 import aztech.modern_industrialization.util.Tickable;
+import net.minecraft.core.Direction;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.ItemInteractionResult;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.neoforged.neoforge.capabilities.Capabilities;
@@ -27,9 +34,10 @@
 import static net.swedz.tesseract.neoforge.compat.mi.guicomponent.modularmultiblock.ModularMultiblockGuiLine.*;
 import static net.swedz.tesseract.neoforge.tooltip.Parser.*;
 
-public final class MachineChainerMachineBlockEntity extends MachineBlockEntity implements Tickable
+public final class MachineChainerMachineBlockEntity extends MachineBlockEntity implements Tickable, CableTierHolder
 {
 	private final RedstoneControlComponent redstoneControl;
+	private final CasingComponent          casing;
 
 	private final ChainerComponent chainer;
 
@@ -59,12 +67,15 @@ public MachineChainerMachineBlockEntity(BEP bep)
 				() -> redstoneControl.doAllowNormalOperation(this)
 		);
 
+		casing = new CasingComponent((from, to) -> chainer.invalidate());
+		
 		transferItem = new ItemTransferCache(chainer::itemHandler);
 		transferFluid = new FluidTransferCache(chainer::fluidHandler);
 		transferEnergy = new MIEnergyTransferCache(chainer::extractableEnergyHandler);
 
 		this.registerGuiComponent(new SlotPanel.Server(this)
-				.withRedstoneControl(redstoneControl));
+				.withRedstoneControl(redstoneControl)
+				.withCasing(casing));
 
 		this.registerGuiComponent(new AutoExtract.Server(orientation));
 
@@ -82,7 +93,7 @@ public MachineChainerMachineBlockEntity(BEP bep)
 			}
 		}));
 
-		this.registerComponents(chainer, redstoneControl);
+		this.registerComponents(chainer, redstoneControl, casing);
 	}
 
 	public ChainerComponent getChainerComponent()
@@ -120,6 +131,12 @@ public void buildLinks()
 		lastRebuildTick = tick;
 	}
 
+	@Override
+	public CableTier getCableTier()
+	{
+		return casing.getCableTier();
+	}
+	
 	@Override
 	public MIInventory getInventory()
 	{
@@ -129,7 +146,7 @@ public MIInventory getInventory()
 	@Override
 	protected MachineModelClientData getMachineModelData()
 	{
-		MachineModelClientData data = new MachineModelClientData();
+		MachineModelClientData data = new MachineModelClientData(casing.getCasing());
 		orientation.writeModelData(data);
 		return data;
 	}
@@ -185,7 +202,7 @@ public void tick()
 			{
 				transferFluid.autoExtract(level, worldPosition, orientation.outputDirection);
 			}
-			if(transferEnergy.autoExtract(level, worldPosition, orientation.outputDirection))
+			if(transferEnergy.autoExtract(level, worldPosition, orientation.outputDirection, this.getCableTier()))
 			{
 				this.setChanged();
 			}
@@ -198,6 +215,21 @@ public void tick()
 		rebuildsThisTick = 0;
 	}
 
+	@Override
+	protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face)
+	{
+		ItemInteractionResult result = super.useItemOn(player, hand, face);
+		if(!result.consumesAction())
+		{
+			result = redstoneControl.onUse(this, player, hand);
+		}
+		if(!result.consumesAction())
+		{
+			result = casing.onUse(this, player, hand);
+		}
+		return result;
+	}
+	
 	public static void registerCapabilities(BlockEntityType<?> bet)
 	{
 		MICapabilities.onEvent((event) ->

src/main/java/net/swedz/extended_industrialization/machines/component/chainer/ChainerComponent.java

@@ -40,8 +40,8 @@ public ChainerComponent(MachineChainerMachineBlockEntity machine, int maxConnect
 
 		this.itemHandler = new ChainerItemHandler(links);
 		this.fluidHandler = new ChainerFluidHandler(links);
-		this.insertableEnergyHandler = new ChainerEnergyHandler(links, true);
-		this.extractableEnergyHandler = new ChainerEnergyHandler(links, false);
+		this.insertableEnergyHandler = new ChainerEnergyHandler(links, machine::getCableTier, true);
+		this.extractableEnergyHandler = new ChainerEnergyHandler(links, machine::getCableTier, false);
 
 		this.listenerNeighborNotify = (event) ->
 		{

src/main/java/net/swedz/extended_industrialization/machines/component/chainer/handler/ChainerEnergyHandler.java

@@ -9,14 +9,17 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Supplier;
 
 public final class ChainerEnergyHandler extends ChainerHandler<MIEnergyStorage, InventoryWrapper<MIEnergyStorage>> implements MIEnergyStorage
 {
-	private final boolean insertable;
+	private final Supplier<CableTier> cableTier;
+	private final boolean             insertable;
 
-	public ChainerEnergyHandler(ChainerLinks chainerLinks, boolean insertable)
+	public ChainerEnergyHandler(ChainerLinks chainerLinks, Supplier<CableTier> cableTier, boolean insertable)
 	{
 		super(chainerLinks);
+		this.cableTier = cableTier;
 		this.insertable = insertable;
 	}
 
@@ -27,7 +30,10 @@ public void invalidate()
 
 		for(MIEnergyStorage handler : this.getMachineLinks().energyHandlers())
 		{
-			wrappers.add(new InventoryWrapper<>(handler));
+			if(handler.canConnect(cableTier.get()))
+			{
+				wrappers.add(new InventoryWrapper<>(handler));
+			}
 		}
 
 		this.wrappers = Collections.unmodifiableList(wrappers);
@@ -97,8 +103,8 @@ public boolean canReceive()
 	}
 
 	@Override
-	public boolean canConnect(CableTier cableTier)
+	public boolean canConnect(CableTier other)
 	{
-		return true;
+		return cableTier.get() == other;
 	}
 }

src/main/java/net/swedz/extended_industrialization/machines/component/chainer/link/linkable/MachineBlockLinkable.java

@@ -45,7 +45,7 @@ private MIEnergyStorage combine(MIEnergyStorage input, MIEnergyStorage output)
 			@Override
 			public boolean canConnect(CableTier cableTier)
 			{
-				return true;
+				return input != null ? input.canConnect(cableTier) : output.canConnect(cableTier);
 			}
 
 			@Override

src/main/resources/assets/extended_industrialization/models/block/machine_chainer.json

@@ -1,5 +1,5 @@
 {
-    "casing": "modern_industrialization:mv",
+    "casing": "modern_industrialization:lv",
     "overlays": {
         "front": "extended_industrialization:block/machines/machine_chainer/overlay_front",
         "up": "extended_industrialization:block/machines/machine_chainer/overlay_arrow_up",