From 2aaa426feb0263b7b73f49845965666fdb19811f Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 26 Dec 2021 22:05:44 +0100 Subject: [PATCH] fixed batteries not disconnecting, acidizer output stacks --- src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../machine/TileEntityMachineBattery.java | 11 +++++++++-- .../machine/TileEntityMachineCrystallizer.java | 2 +- .../tileentity/machine/TileEntityMachineFENSU.java | 13 ++++++++++--- src/main/resources/mcmod.info | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 9d70d2aef..9149cf183 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4088)"; + public static final String VERSION = "1.0.27 BETA (4095)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java index ab0e2e4dc..0d2340897 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java @@ -217,8 +217,15 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I if(te instanceof IEnergyConductor) { IEnergyConductor con = (IEnergyConductor) te; - if(con.getPowerNet() != null && !con.getPowerNet().isSubscribed(this)) - con.getPowerNet().subscribe(this); + if(con.getPowerNet() != null) { + if(mode == 1 || mode == 2) { + if(con.getPowerNet().isSubscribed(this)) { + con.getPowerNet().unsubscribe(this); + } + } else if(!con.getPowerNet().isSubscribed(this)) { + con.getPowerNet().subscribe(this); + } + } } } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java index f2d2d61b0..3248d4d92 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java @@ -160,7 +160,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme return false; //Or is the output slot already full? - if(slots[2] != null && slots[2].stackSize >= slots[2].getMaxStackSize()) + if(slots[2] != null && slots[2].stackSize + result.stackSize > slots[2].getMaxStackSize()) return false; return true; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java index 3c35edc82..c62c4bd95 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java @@ -77,9 +77,16 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery { if(te instanceof IEnergyConductor) { IEnergyConductor con = (IEnergyConductor) te; - - if(con.getPowerNet() != null && !con.getPowerNet().isSubscribed(this)) - con.getPowerNet().subscribe(this); + + if(con.getPowerNet() != null) { + if(mode == 1 || mode == 2) { + if(con.getPowerNet().isSubscribed(this)) { + con.getPowerNet().unsubscribe(this); + } + } else if(!con.getPowerNet().isSubscribed(this)) { + con.getPowerNet().subscribe(this); + } + } } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5e5ade27e..0c3c83c32 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4088", + "version":"1.0.27_X4095", "mcversion": "1.7.10", "url": "", "updateUrl": "",