From c40156d5f692e6571e66cf8911bb4f25025a5a4b Mon Sep 17 00:00:00 2001
From: sten104 <stefanocaravano06@gmail.com>
Date: Fri, 20 Mar 2026 22:36:49 +0100
Subject: [PATCH 1/2] how do you get a cylinder unstuck from a barrel connector

- barrel connectors
  small visual part that pops up when you connect it to a fluid duct
  slightly downscaled the hazard diamond to make space for it
---
 .../java/com/hbm/main/ResourceManager.java    |   6 +
 .../com/hbm/render/block/RenderBarrel.java    |   4 +-
 .../render/tileentity/RenderFluidBarrel.java  |  56 +++++++++-
 .../assets/hbm/models/blocks/barrel.obj       | 105 +++++++++++++-----
 .../hbm/textures/blocks/barrel_antimatter.png | Bin 966 -> 1205 bytes
 .../hbm/textures/blocks/barrel_plastic.png    | Bin 1114 -> 1425 bytes
 .../hbm/textures/blocks/barrel_steel.png      | Bin 926 -> 1082 bytes
 .../hbm/textures/blocks/barrel_tcalloy.png    | Bin 877 -> 1076 bytes
 8 files changed, 139 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java
index 2391413a4..53e973e9c 100644
--- a/src/main/java/com/hbm/main/ResourceManager.java
+++ b/src/main/java/com/hbm/main/ResourceManager.java
@@ -863,6 +863,12 @@ public class ResourceManager {
 	//Pipes
 	public static final ResourceLocation pipe_anchor_tex = new ResourceLocation(RefStrings.MODID, "textures/models/network/pipe_anchor.png");
 	public static final ResourceLocation fluid_pump_tex = new ResourceLocation(RefStrings.MODID, "textures/models/network/fluid_diode.png");
+	
+	//Barrels
+	public static ResourceLocation barrel_plastic_tex  = new ResourceLocation("hbm:textures/blocks/barrel_plastic.png");
+	public static ResourceLocation barrel_steel_tex    = new ResourceLocation("hbm:textures/blocks/barrel_steel.png");
+	public static ResourceLocation barrel_tcalloy_tex  = new ResourceLocation("hbm:textures/blocks/barrel_tcalloy.png");
+	public static ResourceLocation barrel_antimatter_tex = new ResourceLocation("hbm:textures/blocks/barrel_antimatter.png");
 
 	//Radiolysis
 	public static final ResourceLocation radiolysis_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radiolysis.png");
diff --git a/src/main/java/com/hbm/render/block/RenderBarrel.java b/src/main/java/com/hbm/render/block/RenderBarrel.java
index 06d0b7b70..48662f477 100644
--- a/src/main/java/com/hbm/render/block/RenderBarrel.java
+++ b/src/main/java/com/hbm/render/block/RenderBarrel.java
@@ -30,7 +30,7 @@ public class RenderBarrel implements ISimpleBlockRenderingHandler {
 
 		GL11.glTranslated(0, -0.5, 0);
 		tessellator.startDrawingQuads();
-		ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, false);
+		ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.barrel, "Barrel", iicon, tessellator, 0, false);
 		tessellator.draw();
 
 		GL11.glPopMatrix();
@@ -50,7 +50,7 @@ public class RenderBarrel implements ISimpleBlockRenderingHandler {
 		}
 
 		tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
-		ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, true);
+		ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.barrel, "Barrel", iicon, tessellator, 0, true);
 		tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
 
 		return true;
diff --git a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java
index 4eb711e4f..242672c6d 100644
--- a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java
+++ b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java
@@ -2,10 +2,13 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
+import com.hbm.blocks.ModBlocks;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.render.util.DiamondPronter;
 import com.hbm.render.util.EnumSymbol;
+import com.hbm.lib.Library;
+import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.machine.storage.TileEntityBarrel;
 
 import net.minecraft.client.renderer.RenderHelper;
@@ -21,6 +24,7 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer {
 		GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
 		GL11.glEnable(GL11.GL_LIGHTING);
 		
+		
 		if(te instanceof TileEntityBarrel) {
 			
 			TileEntityBarrel barrel = (TileEntityBarrel)te;
@@ -28,7 +32,6 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer {
 			
 			if(type != Fluids.NONE) {
 				
-				RenderHelper.disableStandardItemLighting();
 				GL11.glPushMatrix();
 				
 				int poison = type.poison;
@@ -36,16 +39,63 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer {
 				int reactivity = type.reactivity;
 				EnumSymbol symbol = type.symbol;
 				
+		        int cx = te.xCoord;
+		        int cy = te.yCoord;
+		        int cz = te.zCoord;
+		        
+		        if(te.getBlockType() == ModBlocks.barrel_plastic)
+		            bindTexture(ResourceManager.barrel_plastic_tex);
+		        else if(te.getBlockType() == ModBlocks.barrel_steel)
+		            bindTexture(ResourceManager.barrel_steel_tex);
+		        else if(te.getBlockType() == ModBlocks.barrel_tcalloy)
+		            bindTexture(ResourceManager.barrel_tcalloy_tex);
+		        else if(te.getBlockType() == ModBlocks.barrel_antimatter)
+		            bindTexture(ResourceManager.barrel_antimatter_tex);
+
+                if(Library.canConnectFluid(te.getWorldObj(), cx + 1, cy, cz, Library.POS_X, type)) {
+                    GL11.glTranslatef(0.0F, -0.5F, 0.0F);
+                    GL11.glRotatef(0F, 0F, 0F, 0F);
+                    ResourceManager.barrel.renderPart("Connector");
+                    GL11.glTranslatef(0.0F, 0.5F, 0.0F);
+                }
+		        
+                if(Library.canConnectFluid(te.getWorldObj(), cx - 1, cy, cz, Library.NEG_X, type)) {
+                    GL11.glRotatef(180, 0F, 1F, 0F);
+                    GL11.glTranslatef(0.0F, -0.5F, 0.0F);
+                    ResourceManager.barrel.renderPart("Connector");
+                    GL11.glTranslatef(0.0F, 0.5F, 0.0F);
+                    GL11.glRotatef(-180, 0F, 1F, 0F);
+                }
+
+                if(Library.canConnectFluid(te.getWorldObj(), cx, cy, cz - 1, Library.NEG_Z, type)) {
+                    GL11.glRotatef(90, 0F, 1F, 0F);
+                    GL11.glTranslatef(0.0F, -0.5F, 0.0F);
+                    ResourceManager.barrel.renderPart("Connector");
+                    GL11.glTranslatef(0.0F, 0.5F, 0.0F);
+                    GL11.glRotatef(-90, 0F, 1F, 0F);
+                }
+
+                if(Library.canConnectFluid(te.getWorldObj(), cx, cy, cz + 1, Library.POS_Z, type)) {
+                    GL11.glRotatef(-90, 0F, 1F, 0F);
+                    GL11.glTranslatef(0.0F, -0.5F, 0.0F);
+                    ResourceManager.barrel.renderPart("Connector");
+                    GL11.glTranslatef(0.0F, 0.5F, 0.0F);
+                    GL11.glRotatef(90, 0F, 1F, 0F);
+                }
+				
+				RenderHelper.disableStandardItemLighting();
+				
 				for(int j = 0; j < 4; j++) {
 					
 					GL11.glPushMatrix();
-					GL11.glTranslated(0.4, 0.25, -0.15);
-					GL11.glScalef(1.0F, 0.35F, 0.35F);
+					GL11.glTranslated(0.4, 0.30, -0.24);
+					GL11.glScalef(1.0F, 0.25F, 0.25F);
 					DiamondPronter.pront(poison, flammability, reactivity, symbol);
 					GL11.glPopMatrix();
 					GL11.glRotatef(90, 0, 1, 0);
 				}
 				
+				
 				GL11.glPopMatrix();
 				RenderHelper.enableStandardItemLighting();
 			}
diff --git a/src/main/resources/assets/hbm/models/blocks/barrel.obj b/src/main/resources/assets/hbm/models/blocks/barrel.obj
index 3a2fb7ec7..a9f9119f4 100644
--- a/src/main/resources/assets/hbm/models/blocks/barrel.obj
+++ b/src/main/resources/assets/hbm/models/blocks/barrel.obj
@@ -1,13 +1,58 @@
-# Blender v2.76 (sub 0) OBJ File: 'barrel.blend'
+# Blender v2.82 (sub 7) OBJ File: 'barrel.blend'
 # www.blender.org
-o Cube_Cube.001
-v -0.375000 0.000000 0.375000
-v -0.375000 1.000000 0.375000
-v -0.375000 0.000000 -0.375000
-v -0.375000 1.000000 -0.375000
-v 0.375000 0.000000 0.375000
+mtllib barrel.mtl
+o Connector
+v 0.500000 0.687500 0.187500
+v 0.500000 0.312500 -0.187500
+v 0.500000 0.687500 -0.187500
+v 0.375000 0.312500 -0.187500
+v 0.375000 0.687500 0.187500
+v 0.375000 0.687500 -0.187500
+v 0.375000 0.312500 0.187500
+v 0.500000 0.312500 0.187500
+vt 0.145833 0.270833
+vt 0.020833 0.395833
+vt 0.020833 0.270833
+vt 0.020833 0.375000
+vt 0.000000 0.250000
+vt 0.020833 0.250000
+vt 0.166667 0.395833
+vt 0.041667 0.416667
+vt 0.041667 0.395833
+vt 0.145833 0.291667
+vt 0.166667 0.416667
+vt 0.145833 0.416667
+vt 0.000000 0.270833
+vt 0.125000 0.250000
+vt 0.125000 0.270833
+vt 0.145833 0.395833
+vt -0.000000 0.375000
+vt 0.166667 0.291667
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.0000 -0.0000 -1.0000
+vn 0.0000 -1.0000 0.0000
+usemtl Default_OBJ
+s 1
+f 1/1/1 2/2/1 3/3/1
+f 1/4/2 7/5/2 8/6/2
+f 3/7/3 5/8/3 1/9/3
+f 2/10/4 6/11/4 3/12/4
+f 8/13/5 4/14/5 2/15/5
+f 1/1/1 8/16/1 2/2/1
+f 1/4/2 5/17/2 7/5/2
+f 3/7/3 6/11/3 5/8/3
+f 2/10/4 4/18/4 6/11/4
+f 8/13/5 7/5/5 4/14/5
+o Barrel
 v 0.375000 1.000000 0.375000
-v 0.375000 0.000000 -0.375000
+v 0.375000 0.000000 0.375000
+v 0.375000 -0.000000 -0.375000
+v -0.375000 1.000000 0.375000
+v -0.375000 0.000000 0.375000
+v -0.375000 1.000000 -0.375000
+v -0.375000 -0.000000 -0.375000
 v 0.375000 1.000000 -0.375000
 vt 0.000000 0.750000
 vt 0.000000 0.416667
@@ -18,26 +63,32 @@ vt 1.000000 0.416667
 vt 0.500000 0.750000
 vt 0.500000 0.416667
 vt 0.250000 0.750000
+vt 0.750000 0.750000
 vt 0.750000 1.000000
 vt 0.500000 1.000000
+vt 0.500000 0.750000
+vt 0.500000 1.000000
 vt 0.250000 1.000000
 vt 1.000000 0.750000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 0.000000 1.000000
-vn 0.000000 -1.000000 0.000000
-vn 0.000000 1.000000 0.000000
-s off
-f 4/1/1 3/2/1 1/3/1
-f 8/4/2 7/5/2 3/6/2
-f 6/7/3 5/8/3 7/5/3
-f 2/9/4 1/3/4 5/8/4
-f 3/4/5 7/10/5 5/11/5
-f 8/7/6 4/11/6 2/12/6
-f 2/9/1 4/1/1 1/3/1
-f 4/13/2 8/4/2 3/6/2
-f 8/4/3 6/7/3 7/5/3
-f 6/7/4 2/9/4 5/8/4
-f 1/7/5 3/4/5 5/11/5
-f 6/9/6 8/7/6 2/12/6
+vt 0.500000 0.750000
+vt 0.250000 0.750000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 -0.0000 -1.0000
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 -0.0000
+usemtl Default_OBJ
+s 1
+f 9/19/6 10/20/6 11/21/6
+f 12/22/7 13/23/7 10/24/7
+f 14/25/8 15/26/8 13/23/8
+f 16/27/9 11/21/9 15/26/9
+f 10/28/10 13/29/10 15/30/10
+f 12/31/11 9/32/11 16/33/11
+f 16/27/6 9/19/6 11/21/6
+f 9/34/7 12/22/7 10/24/7
+f 12/22/8 14/25/8 13/23/8
+f 14/25/9 16/27/9 15/26/9
+f 11/35/10 10/28/10 15/30/10
+f 14/36/11 12/31/11 16/33/11
diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_antimatter.png b/src/main/resources/assets/hbm/textures/blocks/barrel_antimatter.png
index 0af2f9c6077b26ac2a23607ff550fcef59ae116b..ed6b74202b6f9cc20ddef6257f08dd2102261140 100644
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WChB(1o(uw*45S3)YKFd6l7;-$Hm2^rKN?1h1uHL9xry>5TkW4*ZOe2?YSzC
zV?_=pOPx2z>zbIDY)>})zbx<n>f*0+Qa;U0{5~)3N`v43jg?0W?e}Du9muiTmt}FS
zDPUKc$-kw!#>U1cN}RH?vQkr1BO)UHuP8W_XY+q~zM-LEQ&ZFKbko?_*u=!d+}zys
z^z{E*YyYn;{j)gR+uJ)QCnqyAGb$?TMoZAo1sSKyT|+}d&CSi@<KzFYFaNtF=hwo_
zcT;1(%ue2sVsxay?%Ukd|Er2V&Pa%ijP&*O_4oJB$jAr^3Q9;w(9_e?*Vq5QyztMG
z-2W>J-%U&SIyde8^u%xT(tj_?+Ma5*H_Pf&naj2m(><A%do#`VWLfXdu-Kn%X<=bu
zZEfw~;1CiL;_B*ZX=$09oE#k;9UdMY7#L_^019s)m^Xcg4Uozy3Gxg6Pd~sgEjTg+
zXfJ1hM`SSr1K&XqX529``z=sVvcxr_Bsf2<q&%@Gl_4N8Gp|I?&oxBBRL@Y)&`6lk
zy#%OeM{0y;ny0500|$`9${@wa%D@O@c>%FBlnqK&8jQ?faV8+!kdcW&5J*P>ab`OU
zSUd;F27#Mpj0`V;sSie@+seQIl$^lMzyefjU}S8-xBy}<$WGP;5VNKM*&x6KG?@vk
zGRV>b$b#xJgoJt9ZiBEbR~R<{Q}Iks7sn6}@3&JtgAW-<v@xd!Z(HzyNlRDb8mp-J
z9WIVpNvwtJ*OQL&{`-GdsK~>Qmt8Xb%g!e!_k8x-m!`%l%aySCCc_49zU8NVtvd~U
z4nC8V`c_p_=dZw#sczV2t7u{*CD+^2)9deW%d;oZe@2f>dvfq)<BK~yfXd%+2B}Q*
zuu6X(^x5dG$}xl1)}uQQTq>$cHQl0i*)NGF`a{~1uf1p2{(QRzq&(-K@IB9W@7|_6
zvnv6WZ@51pXvrNHoB7-#3LxFAyG5q(1-s6_AK$QLvczE#naQe4r-b(%IxY#)>~oNJ
zp+@(HZXY0<VdYa{l_ji8=2}(AglJvO+M3iPp3R=V_0G?usoP3QYZrg8*s<0;sr>uF
z_T$T+EA=zS=I>iED{+rm^n~N=29vl~<~u!#{h_hC<9Pk!t%t%sU%kNdb?M62Hg*jY
zdA_{#;>avXvakahz3N%&LvCYnKK8A0yr1lJ7)}4I2$=gu*N{8@?YHUI{1@ha+T2>_
w?i3~d&uQ_!<~O>DbtyJ~#4CO@xB5Mojw}7YzI$1-1t>Z_UHx3vIVCg!08}jh00000

delta 928
zcmV;R17G~L3C0JI83+ad00374`G=7qAAbM|a7bBm000ic000ic0Tn1pfB*mkTS-Jg
zRA@u(S4(RXQ5ZdwOdd^>zAS}wBZaEaYSa=+gc7JI6fFo+3I(AnaVPi#LeW1UF8m4N
z;|J(MDzrgsi3GaPZiK2JeOUX-yLpWFTpJMS!Y?jn7IPrndnacm_k7=X&zCVQ%YT9d
zb8~Z6qtQ580UnP>j|T?_s8*}U<#GrHgV@{K!}|I<#>dAY;V&*O8k+Er5DQ49Qr7j-
zTWoG_qPx3WZ^$%F1Ofq+%Vijbp|5RiZQ=gM0463TAmL{+8IgeB;Shj7#%SHRb_K~~
z0wd?nAdwis;K?X1#bdZId<yOD?SGiOIoT3l3b6o|Lq|u4PW}9R8Xs0xv9PeD$JNi@
zkba-V#>NJ$d>+iMlrKd~8Sr|&dd^aKUO$f~m0>)q#qi)$5LYjc!SDCOP&{s4%9lbc
zfSX`6Bb}XSYirZ<TCJvQx>H?4B!WVr0JW=@_)>@k5Oj^YauB9`XJ<#(Fn>42%_)1q
zz`y_w)tu39g)c!%0vOdwrJ_rtzrSBQOg5W^&*#ITy1ury20x>F1Swwvu>eMn{;i{0
zujBEUi5Is9v2=G74@Vo?7JGVnP}ttqb17d6u>dw89=eyW7xel~dKqcuF7Glc`11XS
zb{B562`OI+aU+|Zowe?q_<xFvXHV;c$kJd#;(_$2jTY608Fkiq;?XjOhK3;FOB<P3
zKr)%MN~MyX^WLUa9+!SbHXIH^!dGWQCSYb}M)i=qerPlr#s2=ju1T)>V{{Ehjm?N_
z*0YoNMl2T7DflxYe`n>m@0`Lntf%*^dcB5*`uLPn?Ec(Uwd#lI^?&G;Ru0*8{P3Ax
z9R-iqr>;APZ@juaYWaO8BH<8<#UhI3D!48c^9Y4PunZGcqplucXy48i%KCe!@Qp+w
zq4UEg!wV7B+Bs4k!5ZX)n)S)1L^y@-mXPfwG(A0SF<rE-zP>))@_Fi+s;;gsY^xT}
z#>14+(-{RP@m(8r&ws%Go`HBgZgE02B=Aob>x*l)Y`%2RuBe{iA1^2I-4e3Bgr=sZ
zbP3U#IQI7T>Qhd2v@E8OBX4F383iZtwT+TMtKvu;XJt(^c~0SrUuc{L@jJ28;0mxC
zt^m8?3a}fl0K4G|up6!byWtA38?FGm;R>)9z%SkgKV@x|iVa@?0000<MNUMnLSTZN
Cxwl&Y

diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_plastic.png b/src/main/resources/assets/hbm/textures/blocks/barrel_plastic.png
index 0d3dd9543bce38daf11de01a1df7a369cc908e2a..675349a397071707608c337269bdadeba157d80b 100644
GIT binary patch
literal 1425
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCh9<2Ka=y>g(&Psj2Dd=@}RpsH>|7WG#-X*qBncJ+paFTEotqwgZ{XdsFIn
zWVP&#E#DB7vs6-2Qc6lnLP8>;YIAzyuHxR~rTr(%CY-F8bUL^FU}5)>)cPHX)msXC
zj^=e7tekwdeB!CH38!+~52QEkmXni9uH9DLd#rB8rIvZuYo}jmnsc>g+WGv>Lq$DD
zTj$^CUUt8G>HYSFx2vX{&FeT+KJj$-(t8tDJ?U9?ziH03;=bdms;Wgj$LeQZ>RNJl
z^4e!T%N{h$x>7pfWI@-F+UXbD7vAbzd?%@9YeCoHhS^u@W?Yn&mCb0{UC@1`dg{5V
zspm@jPZV|^&F?&{p`qcMz96S<e|+Vpwgoq%O4d3?b~{FPxy4WQ&s-FoyUa6bmR)E|
z$D-Rw)mvlA)|d1h?_CbG>vD9-y1o?;lWVtEO+Gte)#I9}=bPtVi!5FfUbreCb8%7k
zQJdgK&!pL&iL)FdI;{e08fRY#D_H5DvB<*00vH8A;28O>0!USt1o;L3A27f$`S6NY
zKxc3kctjR6Fz_7$VMb96uLhu?WQl7;NpOBzNqJ&XDnmeGW?qS&pKFMMsh**pp^-47
zdkIj{j?@UxG*3@01`Z&Hl|hP;m4Ok+@&aOMC>xX{H5i$};!HrcAtMumAdrp%;>>my
zuy_uT4FaFa7#UswQ!b1~x0QhbC^><hfd#16z{uEuaRJ0!ke#dxAZASivO$0eXfhL6
zWss!>kOkFcXaLF|49)fWGDR0I-v_F*^mK6y@$h~-<#zEU2a#jv)h3#(y`aL&mdqo-
z%Cs;eT5##tFhSQN+yVhz8XciIALB&-RZTCIKVu;~jeY(X^O<M2e|~HJe2$OMjDKtj
zM-=;>vm80x*|0-Jcl{iZ=7phI!haYer-?=$U9Gbw^WX<f+eP!u&b6%Y{lI$R%?hp6
za}=5@uU%5Un4yz5fAb38AI1w-7+L8rb}?GEd``(RUTLANockEoYb{~%Tll6*W$NyN
z!oxT3+*)LIQ2fCOj;^NggZo50pX-Zrg`2HsTM0C@Yja(JU<~t`x3cQxZ-4d9o)~@n
z`~l4_uiZ|&H{PDT)VeiBZI;bGRmX=P?=0yE*f)DmxaZQcM}^)?fF?R@Dv<X#s17>1
zYMK3tt8%;gC%H|%#S+i(;lPhSZ?xK01(kjOSazvuQp94A^{+Wt<QPOP*Cl36+PdkE
zi0fL%T&6NX1qE}nUh6mx16$AXXi4|!Hj`bQqc`iS#}?>DXK&7^__b#9b5HNyyyunu
zKnbr~TMu>5y3MmE<>Cc#_FbQ|Uc6xbXxiP@U?LIrjr-@8x2+K-6}JwY*#0g0*MdK7
zuFW&I-n06>IPg{;8&E>=aqQECCp)&4omiCkhPUUT<H?Pt=Tk0zxVObV=Ze?5b+ToV
zCSUC8e%*QB9%j8)KR(jrP3I&zyDk~Yr}?pBy!Ve^UG?_bHQ~;}X4l8!a~fWJHxzG>
zH+ES1d*=fN`<WlUx-to$xzDR}OXy1a2KEWRxOdI(e(!$l(0>N*{|O0Je>q!UaOk_<
RzHAOkP@b-SF6*2UngDEHkVyal

delta 1077
zcmV-51j_r73)%>f83+ad00374`G=7qAAbM|a7bBm000id000id0mpBsWB>pI?@2^K
zRA@u(n7MM)KoEvo+FR>A3_i+aJb@p8Dynz_A_5>HBzHziM#>YAL&PIFuyNV!C9Sk8
zt>~|{v$YUe4k%IRubP^pd!)Xmdn8Xv;{5zPUoMw6?smHp$FcRk@5^Shkt9hZ&wq0X
zg24Kx&n{#*97?<0mR74JS(fRzWBoc^i!vE)KA%e%hVt$6+fp+5+rAWd8SUogMiz^O
z^;cI{*3V`$qg`KLn{wmvSbDvl2^j=^8I8u;_p~3%qr*d`1=8ts%n1E{fBS~}qqG9f
z`VLr`=6Rm=$H&KJaez>)2P#;z*?*Kq!{4^1uKPwqxin41Z#3jk6)KAddEieFK28a&
z?v$j5=5GZBgipU8s6q|1c)Q)QwLt0YEsN3$xY$Nm2j&ih&w9Py(GLy|cKqFLPs61x
z9res`IMOrGHZQT3WgDZHMQH^%s0g#K1Y<1i=KFN`5ftS4#?C^k*;1P5dVf>th4L-+
zM9QHqi3gtnCme7gwBLX`19*gkN?WZ~+7cV<Q|uWup20aOi_!`Z%g)lk3G3jj4~jF;
z*jYM?qMfp&+a!r~?&%&)!J1Z4s4Pk=z>C4j$%$nfC$JNmxl@pSHk;a>C<>*mR!6BY
zjC6f&-dHTcq9&-9;3<pJ3V%3Z5rpOhc0xmAOiySK^YAq^O-?2g6E@3INwqQNTrh|J
z*Fp&4$TkQ7n1g*K2o*qeWgX#jRS4@x(Nf}Nk#6x$nr2o2|4JG~7^*Ajk)kyi4CM6m
z)I!S5p&cC^nX(9uknBU?%_cKJ37;agB2{W(*1x^I-M;1i@b>REynm3fD>`7G=1?Vm
z@9gaC_cZd4!F%`NyN2e*@-m@OT)Kkdexh+qY`QRTaa|>TpFvU1I~JRaaTA-E)1a{q
zZ`Js{7q35Q2<2MJ`_c;rrZo(twad#(v%q}zQ|B!S=Rc&;q=Ht5-+OcMH79G3J;)3c
zC$6=)j8y4TAg*ibHGeqP>RBaz4Wr^q3IZpa#u!&I<{`KX&2d=;`Sl=Z1H>5&Y`_Y*
zjs_#8-q(+j%JD;_f$4N=u0vZM0u#(^A_n>Js2abn`{oif?db;v49r=_0#0Mb>-Eak
zE5%Q|-QC@pMli9F`wQTM-Q9E0o>nz}-?@hkp<ZVh16Q(fBYzKp4@*>y-%sM=<l`2N
zK6O#?5J1n#2W%pBRgK?!{_3M%B{CU|o^TJA$9kg#93)(~m`@~*io%g3bG<co)y>u6
z_g=pLl5-74YpNc92ZqCexeRS78n})4<Ni-UsS>|_pccPE*nms;;O1};gD{$#RC^k3
vs~mrg8Z~Ovs3K9LMvWRZYSgIlUqa*;&VL}FtGyj=00000NkvXXu0mjf<oF1{

diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_steel.png b/src/main/resources/assets/hbm/textures/blocks/barrel_steel.png
index db69798a5ecdc10a0978674020e52c7e26aebdfd..590b2e695be91629ce28912b3476077fa41138cc 100644
GIT binary patch
literal 1082
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCili2l#}z*45S3)YKFd6l7;-$Hm2^rKN?1h1uHLW+f*CdwYcW`6NX}L<I%J
zgaoF?$C#LytY5!=?b@~L)~(yHVZ)j=YYrSZuw%!LZQHhO-@bjylqtr>#=Cay+Oua*
zLqkJGMuwrGVN+An&Ye5=@87?7@7}|Q4{zSQIWjWR*VotI-#<4uHz+75At6CePfuT8
z-@?Me%*@Q%+S<v<$<@`>$H&Lr-QC&Q*}=gfBqYSr($dSz%frJXIXO8iD=RuWIy^i)
zFfeezf(5CmsRjlhuLD6{eB>)2<ysQt7yO?JfML_SjTS%yISV`@iy0XB4uUY_j)~cC
zfr64Ht`Q}{`DrEPiAAXl0g0J;C3=3YAqu8?hI)oZ!i?@EKt(%JBRtbQJ+&A(fE-o^
zDMnTXMj*=zh^3)yP}FHKGK0mLfNVoXCI&$u9R<Xh?JQvN93UG6Zk91Jya2{9j7GPW
zfdMEvft`T`sMf&9*nn{X#9WY_tP3D!O#`w)fC*?a6If-Cr3H`$)ny0?%(mSIVOy>+
zZUCmDU7jwEAs*guC&v~qGLUGE?_Mo>L?a+0aLe7dOq-;b7rprAy!PM!`&WLL8T+p5
zu)e(dUGe00%VM<xnTINjy>848PG$Vd*qSPCxJX3my6ojwv$oyc-0?=q?TU2O-^Rz^
zV$Z)6xar!n!u-a$UU`=7<?AF*=_R@BJt%jF$KBE7U9>PzQlqu{^2fgkA~rkjc7k*|
zU6=j)=c@(JuQZL_9fDgEDz}&Kv#%<78&D>w{K|YroJpMo+u{3W6Jw8b1nqdWqwhJ7
z&H1;2V1t%j-JH8Qd*<A1C7{lw7t~bdv^+WE0@Np<{?fv1ncJMdnXfF)q<#KbbL`;a
zdx}fAr-`4Qqnokfv4GIAPfN~(_w3)&#=JCVZc1qA2HuN>3Of3mb9bGUTx`WBy({jY
z@8vBCB?}*4=$fql_~+3I-^mfj{}*0M{b(8AJ3l@4Y3iZ<?9W%1DoBTgL{42Jxzvhp
z%73+*jcd+GUM!5*P&V^j+3l30W>$Qmd$Mh%FIU8v#+S;Z72ApN9pmS1|I0q{NBtG1
z--l<uP?(qfuyy<6kGb`p4^RBOb!h2&k%wNtS~<e4UWgxAdG>!3-~9~*R(qLcyY3!Q
Tn!f)CD84;i{an^LB{Ts5NV2}3

delta 886
zcmV-+1Bv{)2%ZO!83+ad00374`G=7qAb$yPNLh0L01m<c01m<d6(~x80009sNkl<Z
zXhZFn&q^Cn6vod?5)J;x1gje#z=a#Zr69Nnt||?Itnwt1K1ZR;zDRaf5L)7<l!8!*
zLI}}l)ckRp-_cvr;=&V<xh?a-c<!D1-I?>9bM6@vL{TIbRIAnK;o;$FCK86B+JCF7
zE9v+9(&=<0o6SnQ-Ihk9A-lV~V&T_nwLl3kgjvAh;bGKj{FICHb4jJrGB-CTcXxL(
z7z|`;Dx;j)+1ZhE1Nr*xyA%oqvG9+Nk6%{+8Mrw6A%(Z^G_pYuXjFL)V;p1t>Ej1E
zyJ*V({=QiFRsoOsGyo@VZf?|pTz@VnGcz-zNKVQ0^t4{*qe$Zr(S~E?TVWQ!%Yb_s
za~uLkM@Lex*L96j!Fem+3bTN8IxW3kU(-)5^U_|gr%r8eZ_B~K!SA(6_*R$&0GuL{
zSXT;M%!k9FM%2~zBzy}d5<uJIg|xxb(^Iw7IS$Ov&uc_ohXGc;1!e&_a({h&tz%ci
zIDj*h#_jFx=s>1)o%>e46=nf^fQG|?rhjvDQ}*`uG@5*ny4~*6`cQlOBz!B(-+@Y{
z5~T+{$z;;%2;h+7Af-aIarn*Zs(k)ZmyL}LvG8C0L$<TC6OnenUe_w0OFxmNJzDrD
zCnq)m<#IV93OsaeZA~sOFMnlud0FSYtkr7C{r$ZxEG+1p1LzY!7}cewU_2s!XXUvy
zU--e+)>f3sWK<27{!CZEa>!6iREPi;_{7&PM5}}Bz~OQaW6T;Hr`#ug$b^mn7}L(M
zd|+Jdxix2f;)f`4DdJ**|4UFz%IFMA9Bt&mzVS5!+;lYu2@9}141bJseBuYCQYqpl
zt!rgvMQe;xPy1S0T9Rh7sS$uoPiLb~{Qt9!@~eq<MKoU0=Hlf4(MCxZV8M+6YjB)$
zpZFnvxB*Z_tD<$G+_f;kiRbc-pITpEfA3B<8>lxPLaNwADw$)6gl_VPA2M)c)NwI}
z%xUMhD;of7zVU-%v16!*m_=+ppH~8#XjzMki)zOYl23eXqYzxG0At|h<8VA*_~sup
zzTxpdqkkBQfVhzeh#QH3xRD5m8;O9pkqC$ziGa9~2#6brfOsMD3wG6ct5ge@@Bjb+
M07*qoM6N<$f(xLn761SM

diff --git a/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png b/src/main/resources/assets/hbm/textures/blocks/barrel_tcalloy.png
index c7ae3629026c616b1be532cad0de579769de0417..3a74dfde77b53cb3bb27beb49c487c372b7295dd 100644
GIT binary patch
literal 1076
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCili1o(uwuHU(H?e^^pSFfJ4Y+3)znbQ|8Y@awWucBi1yxA>n&F!7-lc!GZ
z?(OdF@0l@cdTM_D`t|GAu3fus-MS4MHmq5*=D>jiJ9g~Ywr$(??c1kJnUa#1w`<p~
zJ$v>vG&E#nWF+O}Y~H(f=gyt`_wV1kckkiDhc|ED+%;uNT}MYlSJ%wNi|4Ia(cIfR
zarW%^%*=$Wtjyx#^uofNva;gZ+Omd*+V=K}rlyj*y29$}*8cvil9KAy*2?DQDf8yd
zUb?hr+O&>IlbU*Z3=Ba227<_dx?CXTQWE4B{GW2bP<W|d2xuN>fk$L90|Vb-5N14{
zzaj-FC|TkfQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=RXJ{nM=w1R;v?DdbGtJXei-7~k
zVP%kFWMyCkvb=y;8p;Mmn+78@SeyySHe_UC5CqauK%Cjm0v68!vOypLh(Y>cG`g(}
z48W+Lz|Oz|RAXRdY{0kxVlGGz>jH>b(|~LcU;>)N1XdYjX#r$Gbs0j!^5*hcQ%`Q^
zjtAPe!_&nv#KZgT<k;dx1`@6D-CvoHXar<joK|+-DJm@4LF8rG)?fes2S2u+nOPKk
z`P`eU?}{g<KRYw?Kw`sUrY%vr4cx11Z@yfmm+YdwrK<L}<c)RKB^|Gf+`dS+E#CON
z|IdNf!dFv!UYPH=7b@X;-F%<yYM|2n2W8`ZmtA~&_k?H2bi+lW?{f8d7H58Wz%K++
z+uCUV_hYeHr(4;YT|I((AFy0EPqdi(GY`c3EBofbw|9v`zH+gPfZVkO7r*a4AkE%r
zud?d2#6_;$^cTCn9oYEW7A$!|RmCr<NGUM(7{?OHTCcU~+Gp#x`pP`}d^E{W{6XP8
z#We4@DXW|GBXb@J2%qa-qjfFDW=kV;a?RwYrLmuM4GR_atoYPs#`^rsk;KzxtHr%C
zPu{$AWZ~qr{cEq=U+YU-*;!wFE%c}1eM$SXyYyE1?BPFGeyuU5GV*!pwue14Eet;T
z9!aVUEl7H_;mO^uci(-tJ&P7@x4K&%xAys$m3i-dWS(&wit(xOF|%_{{eL`?VUlp~
zxA59FjXkn_`5&epa{N%v9bc=`r9D$zDn`>#|HS1P|5=6q9X#~$2cJ*b<(3Uo=Bt8Y
N+tbz0Wt~$(69AdV)6f6_

delta 865
zcmV-n1D^b}2<--t8Gi-<00374`G)`i00eVFNmK|32nc)#WQYI&10+dAK~!jg?U=D{
zBR3F+KhBc73rV&N+i=c>-3KvTy1ys6+HZ158QgoMzDICx2kDFe0jvuI!ID?fO5~C$
zoMldli_n0PMY4Y*3H+Agh%^6?QY7lf&!2<$K7JMv02Ye{)_+=_o}MVnlE=qK9v&We
z|NcEG{0|>Ls+9HU)BwEq%pQK_%Va{9X-1<FbzS3}BhL*0N_j?FSg+T~e5#TI5D^;Z
z`0m>ay!R-j5D`KMD5Y@DAtL<r^WCfX<n^RJ;Js(LToOXy=;(;SU_hSd6h%Q%6ig-)
zM1(BUgb<SXH-8VH&EfXTM1(xg0l2xj;r8~H5CWso2=9F|pQ_{((pt0KT9i`Mbq(-G
zKIdFrU6ExO>-9R0rSfkcK)WarL2FHxWq9w&^BnIz&N)H|F}GjCrzrgipe#$Ab69J+
zySu|$%W}CyMA+NgLn##<<~97A2H>2dsw&{m9B!RuyMNuXUa!fr3?RBp3ZJUv6k046
zG>t=R&E@4K7Z(@NW!gg3S~DCDU&X(90JGVQ@%VtrZx1Y&O8~Z8i`JU5EUBuBrg41p
z?%k{SHxJ<c{yuih*5^g!Z`=RNmnlutB=f0K-+%fPs;WXnI6XaOKA&@Vc!-ER9|LAH
zHk%Fm`+xg*@3Gd>C0>2Fz7DWkK!5FsFO7AD*Txu(F?jDW#!wUmS(Z^01*_GH&1QqO
z77@W(3(zTE;Mp3D+4b#qva&2O#^9Wbk#~vLUxUUNhQncu9AG}5$1!UyUE{TLE}jhA
zbgJt*0<AN&M}e;KVvM0_nwWE|)hhl9#+cY8zkg=B#Ot%OGqNnBswz%SPAJQg5CZf0
zoP&b{rqd~d!2s_)qtS?_X*$LKH*It<7_ixFXqx69+1$U$@7QQrmH=35<NJ2Pmu#*J
zyjDuZA`ubB<MGZ_ux;;J>z&EF!b^Kwg6GO!tyb~1-NLpTI_KybFYQHIM56DC2t`p)
z*IG4sp2w|ibF)jlK0iO-X%@%F$MMEAolY5#$I-glLh2H)K3rc1rBwW*30}6cRxQ^R
rzE`hay?XWP)vH&pUcGwt`oHRT4C8^L0xBvD00000NkvXXu0mjfN$RU~


From fa883b2fd44dca7235ea9873d17cf0fed9ca7f80 Mon Sep 17 00:00:00 2001
From: sten104 <stefanocaravano06@gmail.com>
Date: Mon, 23 Mar 2026 19:30:26 +0100
Subject: [PATCH 2/2] the effects of drugs on your brain

---
 src/main/java/com/hbm/main/ResourceManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java
index 53e973e9c..c8b8c7898 100644
--- a/src/main/java/com/hbm/main/ResourceManager.java
+++ b/src/main/java/com/hbm/main/ResourceManager.java
@@ -865,10 +865,10 @@ public class ResourceManager {
 	public static final ResourceLocation fluid_pump_tex = new ResourceLocation(RefStrings.MODID, "textures/models/network/fluid_diode.png");
 	
 	//Barrels
-	public static ResourceLocation barrel_plastic_tex  = new ResourceLocation("hbm:textures/blocks/barrel_plastic.png");
-	public static ResourceLocation barrel_steel_tex    = new ResourceLocation("hbm:textures/blocks/barrel_steel.png");
-	public static ResourceLocation barrel_tcalloy_tex  = new ResourceLocation("hbm:textures/blocks/barrel_tcalloy.png");
-	public static ResourceLocation barrel_antimatter_tex = new ResourceLocation("hbm:textures/blocks/barrel_antimatter.png");
+	public static ResourceLocation barrel_plastic_tex  = new ResourceLocation(RefStrings.MODID, "textures/blocks/barrel_plastic.png");
+	public static ResourceLocation barrel_steel_tex    = new ResourceLocation(RefStrings.MODID, "textures/blocks/barrel_steel.png");
+	public static ResourceLocation barrel_tcalloy_tex  = new ResourceLocation(RefStrings.MODID, "textures/blocks/barrel_tcalloy.png");
+	public static ResourceLocation barrel_antimatter_tex = new ResourceLocation(RefStrings.MODID, "textures/blocks/barrel_antimatter.png");
 
 	//Radiolysis
 	public static final ResourceLocation radiolysis_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radiolysis.png");