From 85a03736757c9d4e39a9742b1d98a900dde53697 Mon Sep 17 00:00:00 2001 From: George Paton Date: Wed, 12 Nov 2025 10:03:34 +1100 Subject: [PATCH 1/2] fuck my chungus wife --- src/main/java/com/hbm/blocks/network/FluidDuctBox.java | 5 ++++- src/main/java/com/hbm/blocks/network/PowerCableBox.java | 2 +- src/main/java/com/hbm/inventory/material/Mats.java | 2 +- src/main/java/com/hbm/render/block/RenderBoxDuct.java | 4 +--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctBox.java b/src/main/java/com/hbm/blocks/network/FluidDuctBox.java index 3e291a8f3..48bbe091e 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctBox.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctBox.java @@ -8,6 +8,7 @@ import com.hbm.render.block.RenderBoxDuct; import com.hbm.tileentity.network.TileEntityPipeBaseNT; import com.hbm.util.i18n.I18nUtil; +import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; @@ -130,9 +131,11 @@ public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOve return meta % 15; } + public static int renderID = RenderingRegistry.getNextAvailableRenderId(); + @Override public int getRenderType() { - return RenderBoxDuct.renderID; + return renderID; } @Override diff --git a/src/main/java/com/hbm/blocks/network/PowerCableBox.java b/src/main/java/com/hbm/blocks/network/PowerCableBox.java index adb592805..2d664ec8c 100644 --- a/src/main/java/com/hbm/blocks/network/PowerCableBox.java +++ b/src/main/java/com/hbm/blocks/network/PowerCableBox.java @@ -125,7 +125,7 @@ public class PowerCableBox extends BlockContainer implements IBlockMulti { @Override public int getRenderType() { - return RenderBoxDuct.renderID; + return FluidDuctBox.renderID; } @Override diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 3d923dd47..7ee7b6990 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -151,7 +151,7 @@ public class Mats { public static final NTMMaterial MAT_CMB = makeSmeltable(_AS + 9, CMB, 0x6F6FB4, 0x000011, 0x6F6FB4).setAutogen(DUST, PLATE, CASTPLATE, WELDEDPLATE, BLOCK).m(); public static final NTMMaterial MAT_DNT = makeSmeltable(_AS + 15, DNT, 0x7582B9, 0x16000E, 0x455289).setAutogen(DUST, DENSEWIRE, BLOCK).m(); public static final NTMMaterial MAT_FLUX = makeAdditive(_AS + 10, df("Flux"), 0xF1E0BB, 0x6F6256, 0xDECCAD).setAutogen(DUST).n(); - public static final NTMMaterial MAT_SLAG = makeSmeltable(_AS + 11, SLAG, 0x554940, 0x34281F, 0x6C6562).setAutogen(BLOCK).n(); + public static final NTMMaterial MAT_SLAG = makeSmeltable(_AS + 11, SLAG, 0x554940, 0x34281F, 0x6C6562).setAutogen(INGOT, BLOCK).n(); public static final NTMMaterial MAT_MUD = makeSmeltable(_AS + 14, MUD, 0xBCB5A9, 0x481213, 0x96783B).n(); public static final NTMMaterial MAT_GUNMETAL = makeSmeltable(_AS + 19, GUNMETAL, 0xFFEF3F, 0xAD3600, 0xF9C62C).setAutogen(LIGHTBARREL, HEAVYBARREL, LIGHTRECEIVER, HEAVYRECEIVER, MECHANISM, STOCK, GRIP).n(); public static final NTMMaterial MAT_WEAPONSTEEL = makeSmeltable(_AS + 20, WEAPONSTEEL, 0xA0A0A0, 0x000000, 0x808080).setAutogen(CASTPLATE, SHELL, LIGHTBARREL, HEAVYBARREL, LIGHTRECEIVER, HEAVYRECEIVER, MECHANISM, STOCK, GRIP).n(); diff --git a/src/main/java/com/hbm/render/block/RenderBoxDuct.java b/src/main/java/com/hbm/render/block/RenderBoxDuct.java index 3db27024d..ad4da3cf3 100644 --- a/src/main/java/com/hbm/render/block/RenderBoxDuct.java +++ b/src/main/java/com/hbm/render/block/RenderBoxDuct.java @@ -285,11 +285,9 @@ public class RenderBoxDuct implements ISimpleBlockRenderingHandler { return true; } - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - @Override public int getRenderId() { - return renderID; + return FluidDuctBox.renderID; } } From 0a60e10827c5c8f2dae3f4865d33444332bafb6b Mon Sep 17 00:00:00 2001 From: George Paton Date: Wed, 12 Nov 2025 10:05:50 +1100 Subject: [PATCH 2/2] remove unused imports --- src/main/java/com/hbm/blocks/network/FluidDuctBox.java | 1 - src/main/java/com/hbm/blocks/network/PowerCableBox.java | 1 - src/main/java/com/hbm/render/block/RenderBoxDuct.java | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctBox.java b/src/main/java/com/hbm/blocks/network/FluidDuctBox.java index 48bbe091e..4823303a0 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctBox.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctBox.java @@ -4,7 +4,6 @@ import com.hbm.blocks.IBlockMulti; import com.hbm.blocks.ILookOverlay; import com.hbm.lib.Library; import com.hbm.lib.RefStrings; -import com.hbm.render.block.RenderBoxDuct; import com.hbm.tileentity.network.TileEntityPipeBaseNT; import com.hbm.util.i18n.I18nUtil; diff --git a/src/main/java/com/hbm/blocks/network/PowerCableBox.java b/src/main/java/com/hbm/blocks/network/PowerCableBox.java index 2d664ec8c..5c968bd2a 100644 --- a/src/main/java/com/hbm/blocks/network/PowerCableBox.java +++ b/src/main/java/com/hbm/blocks/network/PowerCableBox.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.blocks.IBlockMulti; import com.hbm.lib.Library; import com.hbm.lib.RefStrings; -import com.hbm.render.block.RenderBoxDuct; import com.hbm.tileentity.network.TileEntityCableBaseNT; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/render/block/RenderBoxDuct.java b/src/main/java/com/hbm/render/block/RenderBoxDuct.java index ad4da3cf3..05eecbb7e 100644 --- a/src/main/java/com/hbm/render/block/RenderBoxDuct.java +++ b/src/main/java/com/hbm/render/block/RenderBoxDuct.java @@ -12,7 +12,6 @@ import com.hbm.tileentity.network.TileEntityPipeBaseNT; import com.hbm.util.ColorUtil; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator;