diff --git a/changelog b/changelog index e2cab390e..7accd4a68 100644 --- a/changelog +++ b/changelog @@ -11,10 +11,13 @@ * Solar boilers will now show a tooltip when they are too cold * Updated the satellite dish structure, due to the new spawn rules it's also no longer obscenely rare * The rare small lab structures have been removed and replaced with a new lighthouse +* ReaSim connectors will no longer function if ReaSim boilers are disabled +* Updated the placed geiger counter model ## Fixed * Fixed fatal gamebreaking hard drive corrupting issue where taurun leggings were misspelled * Fixed minor display issue where compressed air ducts would visually connect to non-ejector pneumatic tubes * Fixed special creeper types being able to spawn in other dimensions * Fixed modeled armor using weird rotation rules, causing issues with Customizable Player Models -* Fixed rotation issues for certain blocks using the new structure system \ No newline at end of file +* Fixed rotation issues for certain blocks using the new structure system +* Fixed ReaSim water never moving if the reactor is at 20° \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java index 99ca91110..4be8b8847 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java @@ -155,9 +155,8 @@ public abstract class TileEntityRBMKBase extends TileEntityLoadedBase { * Moves heat to neighboring parts, if possible, in a relatively fair manner */ private void moveHeat() { - - if(heat == 20 && RBMKDials.getReasimBoilers(worldObj)) - return; + + boolean reasim = RBMKDials.getReasimBoilers(worldObj); List rec = new ArrayList<>(); rec.add(this); @@ -188,8 +187,10 @@ public abstract class TileEntityRBMKBase extends TileEntityLoadedBase { if(base != null) { rec.add(base); heatTot += base.heat; - waterTot += base.reasimWater; - steamTot += base.reasimSteam; + if(reasim) { + waterTot += base.reasimWater; + steamTot += base.reasimSteam; + } } } @@ -210,13 +211,17 @@ public abstract class TileEntityRBMKBase extends TileEntityLoadedBase { rbmk.heat += delta * stepSize; //set to the averages, rounded down - rbmk.reasimWater = tWater; - rbmk.reasimSteam = tSteam; + if(reasim) { + rbmk.reasimWater = tWater; + rbmk.reasimSteam = tSteam; + } } //add the modulo to make up for the losses coming from rounding - this.reasimWater += rWater; - this.reasimSteam += rSteam; + if(reasim) { + this.reasimWater += rWater; + this.reasimSteam += rSteam; + } this.markDirty(); } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java index 2008e6f1d..56520da08 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKInlet.java @@ -28,7 +28,7 @@ public class TileEntityRBMKInlet extends TileEntityLoadedBase implements IFluidS this.subscribeToAllAround(water.getTankType(), this); - for(int i = 2; i < 6; i++) { + if(RBMKDials.getReasimBoilers(worldObj)) for(int i = 2; i < 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); Block b = worldObj.getBlock(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java index f6f05198e..8cac0f029 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutlet.java @@ -26,7 +26,7 @@ public class TileEntityRBMKOutlet extends TileEntityLoadedBase implements IFluid if(!worldObj.isRemote) { - for(int i = 2; i < 6; i++) { + if(RBMKDials.getReasimBoilers(worldObj)) for(int i = 2; i < 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); Block b = worldObj.getBlock(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); diff --git a/src/main/resources/assets/hbm/structures/spire-air.nbt b/src/main/resources/assets/hbm/structures/spire-air.nbt new file mode 100644 index 000000000..0e6994429 Binary files /dev/null and b/src/main/resources/assets/hbm/structures/spire-air.nbt differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png b/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png new file mode 100644 index 000000000..544a44f77 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png differ