From 1bd15dfa78706bb1b387d75ed674cbe25b847efb Mon Sep 17 00:00:00 2001
From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com>
Date: Fri, 6 Sep 2024 22:28:00 -0500
Subject: [PATCH] fixes after the merge conflicts (death)

---
 src/main/java/com/hbm/blocks/network/BlockCableGauge.java     | 4 ----
 src/main/java/com/hbm/blocks/network/FluidDuctGauge.java      | 3 ---
 src/main/java/com/hbm/main/ModEventHandlerRenderer.java       | 2 +-
 src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java    | 2 +-
 .../com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java    | 4 ++--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/hbm/blocks/network/BlockCableGauge.java b/src/main/java/com/hbm/blocks/network/BlockCableGauge.java
index 3c6cc0425..292686f37 100644
--- a/src/main/java/com/hbm/blocks/network/BlockCableGauge.java
+++ b/src/main/java/com/hbm/blocks/network/BlockCableGauge.java
@@ -8,8 +8,6 @@ import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.handler.CompatHandler;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.BufPacket;
-import com.hbm.packet.PacketDispatcher;
 import com.hbm.render.block.RenderBlockMultipass;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.network.TileEntityCableBaseNT;
@@ -18,7 +16,6 @@ import com.hbm.util.I18nUtil;
 
 import api.hbm.energymk2.PowerNetMK2;
 import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
@@ -33,7 +30,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java b/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java
index 153268f9f..77a347b17 100644
--- a/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java
+++ b/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java
@@ -11,8 +11,6 @@ import com.hbm.blocks.ITooltipProvider;
 import com.hbm.handler.CompatHandler;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.BufPacket;
-import com.hbm.packet.PacketDispatcher;
 import com.hbm.render.block.RenderBlockMultipass;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
@@ -20,7 +18,6 @@ import com.hbm.util.I18nUtil;
 
 import api.hbm.fluid.IPipeNet;
 import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java
index 693c8e20c..03e7834bd 100644
--- a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java
+++ b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java
@@ -418,7 +418,7 @@ public class ModEventHandlerRenderer {
 	public void onRenderHand(RenderHandEvent event) {
 		
 		//can't use plaxer.getHeldItem() here because the item rendering persists for a few frames after hitting the switch key
-		ItemStack toRender = Minecraft.getMinecraft().entityRenderer.itemRenderer.itemToRender;
+		ItemStack toRender = null; //Minecraft.getMinecraft().entityRenderer.itemRenderer.itemToRender;
 		
 		if(toRender != null) {
 			IItemRenderer renderer = MinecraftForgeClient.getItemRenderer(toRender, ItemRenderType.EQUIPPED_FIRST_PERSON);
diff --git a/src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java b/src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java
index 47fd69ef9..a72e81da4 100644
--- a/src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java
+++ b/src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java
@@ -35,7 +35,7 @@ public class RenderRBMKLid extends TileEntitySpecialRenderer {
 			if(rod.hasRod)
 				hasRod = true;
 			
-			if(rod.fluxQuantity > 5)
+			if(rod.lastFluxQuantity > 5)
 				cherenkov = true;
 		}
 
diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
index e4b7e4f64..1b9a7a422 100644
--- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
+++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
@@ -234,8 +234,8 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
 	public void writeToNBTDiag(NBTTagCompound nbt) {
 		super.writeToNBT(nbt);
 
-		nbt.setDouble("fluxSlow", this.fluxQuantity * (1 - fluxRatio));
-		nbt.setDouble("fluxFast", this.fluxQuantity * fluxRatio);
+		nbt.setDouble("fluxSlow", this.lastFluxQuantity * (1 - fluxRatio));
+		nbt.setDouble("fluxFast", this.lastFluxQuantity * fluxRatio);
 		nbt.setBoolean("hasRod", this.hasRod);
 	}