From 39c8a6711b451669792e5043f1b9bcfb88106da7 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 21 Apr 2025 17:34:18 +0200 Subject: [PATCH] 3 BIG SHOTS FROM [KITCHEN GUN] --- changelog | 5 +++- .../machine/rbmk/TileEntityRBMKBase.java | 23 +++++++++++------- .../machine/rbmk/TileEntityRBMKInlet.java | 2 +- .../machine/rbmk/TileEntityRBMKOutlet.java | 2 +- .../assets/hbm/structures/spire-air.nbt | Bin 0 -> 16529 bytes .../hbm/textures/items/coil_copper_alt.png | Bin 0 -> 375 bytes 6 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/hbm/structures/spire-air.nbt create mode 100644 src/main/resources/assets/hbm/textures/items/coil_copper_alt.png 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 0000000000000000000000000000000000000000..0e6994429abd992edc63a8521ae1b1a7be521b63 GIT binary patch literal 16529 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..544a44f775789dcf648550998109e536b8018749 GIT binary patch literal 375 zcmV--0f_#IP)BA)Rp$>#9U7U^m9M`WNqeFaJLS|Dj&5m!z}E1KeDkC6n<8*L9fG z8w5cBfbaWaD-XO=E^>H$fGjvfoh#l>PVs$T02J~xf4n<9DNAK{k4m*lsoh$5)&``_ z`$rz})DYd>GYS=@av7uT=74q0qv#QV!F7rYZ{`L+cYYZ}gwJCHk|=zIIh=Q{#ma!R z`EzC&4nm~dM#=)=a14paz)Jxs?A5$n&6yjd?;P9)=-6g