From fae818db1c5996dd92b72b8357af28cc97af7113 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 29 Oct 2020 15:06:53 +0300 Subject: [PATCH] Charge-o-Mat back in business. Closes #2264 --- .../machine/misc/ChargeOMatBlockEntity.java | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java index f960a1d87..ed6363739 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java @@ -33,7 +33,6 @@ import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; -import team.reborn.energy.Energy; import team.reborn.energy.EnergySide; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; @@ -48,25 +47,16 @@ public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity super(TRBlockEntities.CHARGE_O_MAT); } - // TilePowerAcceptor + // PowerAcceptorBlockEntity @Override public void tick() { super.tick(); - if (world.isClient) { + if (world == null || world.isClient) { return; } for (int i = 0; i < 6; i++) { - ItemStack stack = inventory.getStack(i); - - if (Energy.valid(stack)) { - Energy.of(this) - .into( - Energy - .of(stack) - ) - .move(); - } + discharge(i); } } @@ -77,7 +67,8 @@ public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity @Override public boolean canProvideEnergy(EnergySide side) { - return false; + // This allows to move energy from BE to chargeable item. #2264 + return side == EnergySide.UNKNOWN; } @Override @@ -90,7 +81,7 @@ public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity return TechRebornConfig.chargeOMatBMaxInput; } - // TileMachineBase + // MachineBaseBlockEntity @Override public boolean canBeUpgraded() { return false; @@ -102,13 +93,13 @@ public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity return TRContent.Machine.CHARGE_O_MAT.getStack(); } - // ItemHandlerProvider + // InventoryProvider @Override public RebornInventory getInventory() { return inventory; } - // IContainerProvider + // BuiltScreenHandlerProvider @Override public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { return new ScreenHandlerBuilder("chargebench").player(player.inventory).inventory().hotbar().addInventory()