From 61acb3db45bae8f7755ecd33f95c05d49359b616 Mon Sep 17 00:00:00 2001 From: abel1502 Date: Tue, 3 Jun 2025 12:46:21 +0300 Subject: [PATCH 1/3] I turned myself into a bobblehead --- .../java/com/hbm/blocks/generic/BlockBobble.java | 7 ++++--- .../com/hbm/render/tileentity/RenderBobble.java | 6 ++++++ .../assets/hbm/textures/models/trinkets/abel.png | Bin 0 -> 2123 bytes 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/models/trinkets/abel.png diff --git a/src/main/java/com/hbm/blocks/generic/BlockBobble.java b/src/main/java/com/hbm/blocks/generic/BlockBobble.java index da175541c..067363c2d 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockBobble.java +++ b/src/main/java/com/hbm/blocks/generic/BlockBobble.java @@ -198,7 +198,7 @@ public class BlockBobble extends BlockContainer implements IGUIProvider, INBTTra INTELLIGENCE( "Intelligence", "Intelligence", null, "It takes the smartest individuals to realize$there's always more to learn.", false, ScrapType.BRIDGE_BUS), AGILITY( "Agility", "Agility", null, "Never be afraid to dodge the sensitive issues.", false, ScrapType.BRIDGE_CHIPSET), LUCK( "Luck", "Luck", null, "There's only one way to give 110%.", false, ScrapType.BRIDGE_CMOS), - BOB( "Robert \"The Bobcat\" Katzinsky", "HbMinecraft", "Hbm's Nuclear Tech Mod", "I know where you live, " + System.getProperty("user.name"), false, ScrapType.CPU_SOCKET), + BOB( "Robert \"The Bobcat\" Katzinsky", "HbMinecraft", "Hbm's Nuclear Tech Mod", "I know where you live, " + System.getProperty("user.name"), false, ScrapType.CPU_SOCKET), FRIZZLE( "Frooz", "Frooz", "Weapon models", "BLOOD IS FUEL", true, ScrapType.CPU_CLOCK), PU238( "Pu-238", "Pu-238", "Improved Tom impact mechanics", null, false, ScrapType.CPU_REGISTER), VT( "VT-6/24", "VT-6/24", "Balefire warhead model and general texturework", "You cannot unfuck a horse.", true, ScrapType.CPU_EXT), @@ -211,9 +211,10 @@ public class BlockBobble extends BlockContainer implements IGUIProvider, INBTTra NOS( "Dr Nostalgia", "Dr Nostalgia", "SSG and Vortex models", "Take a picture, I'ma pose, paparazzi$I've been drinking, moving like a zombie", true, ScrapType.BOARD_TRANSISTOR), DRILLGON( "Drillgon200", "Drillgon200", "1.12 Port", null, false, ScrapType.CPU_LOGIC), CIRNO( "Cirno", "Cirno", "the only multi layered skin i had", "No brain. Head empty.", true, ScrapType.BOARD_BLANK), - MICROWAVE( "Microwave", "Microwave", "OC Compatibility and massive RBMK/packet optimizations", "they call me the food heater$john optimization", true, ScrapType.BOARD_CONVERTER), + MICROWAVE( "Microwave", "Microwave", "OC Compatibility and massive RBMK/packet optimizations", "they call me the food heater$john optimization", true, ScrapType.BOARD_CONVERTER), PEEP( "Peep", "LePeeperSauvage", "Coilgun, Leadburster and Congo Lake models, BDCL QC", "Fluffy ears can't hide in ash, nor snow.", true, ScrapType.CARD_BOARD), - MELLOW( "MELLOWARPEGGIATION", "Mellow", "NBT Structures, industrial lighting, animation tools", "Make something cool now, ask for permission later.", true, ScrapType.CARD_PROCESSOR); + MELLOW( "MELLOWARPEGGIATION", "Mellow", "NBT Structures, industrial lighting, animation tools", "Make something cool now, ask for permission later.", true, ScrapType.CARD_PROCESSOR), + ABEL( "Abel1502", "Abel1502", "Abilities GUI, optimizations and many QoL improvements", "NANTO SUBARASHII!", true, ScrapType.CPU_REGISTER); public String name; //the title of the tooltip public String label; //the name engraved in the socket diff --git a/src/main/java/com/hbm/render/tileentity/RenderBobble.java b/src/main/java/com/hbm/render/tileentity/RenderBobble.java index 08dfa1283..979da575a 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBobble.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBobble.java @@ -50,6 +50,7 @@ public class RenderBobble extends TileEntitySpecialRenderer { public static final ResourceLocation bobble_peep = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/peep.png"); public static final ResourceLocation bobble_mellow = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/mellowrpg8.png"); public static final ResourceLocation bobble_mellow_glow = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/mellowrpg8_glow.png"); + public static final ResourceLocation bobble_abel = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/abel.png"); private long time; @@ -106,6 +107,7 @@ public class RenderBobble extends TileEntitySpecialRenderer { case MICROWAVE: bindTexture(bobble_microwave); break; case PEEP: bindTexture(bobble_peep); break; case MELLOW: bindTexture(bobble_mellow); break; + case ABEL: bindTexture(bobble_abel); break; default: bindTexture(ResourceManager.universal); } @@ -220,6 +222,10 @@ public class RenderBobble extends TileEntitySpecialRenderer { rotLeftLeg = new double[]{3, 5, 2}; rotRightLeg = new double[]{-3, -5, 0}; break; + case ABEL: + rotLeftArm = new double[]{0, 15, 80}; + rotRightArm = new double[]{0, 15, 80}; + break; } } diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/abel.png b/src/main/resources/assets/hbm/textures/models/trinkets/abel.png new file mode 100644 index 0000000000000000000000000000000000000000..3e436bd03ac465d7788d3bda9d961789cea9f526 GIT binary patch literal 2123 zcmV-R2(4lZU+Y3#ukeOiaAl8W0Qy`4S-ENm>FS7K?2FV1_`}+km%z39Kh0 zc=F^)z8tS!y=rN^?RpkVLaDgHr%#{q@9x;KL;ZfbmcWSpkBMviA5lygo8A!hdD^1p2V7y|1s&auP`B{QP`QZgzH-5g2I! zz|7Cv0l;j$2#)ARX&+$+0L(bNO(+!NVAa>xD_*ZREg-nejGV{gQ2~}|06L70j`Cfi z(LMp~Vw>nj0YYzYucZb+V2l$15TBiBfvc&hNde1jdUFGu&tkt1wya8L!) z@AtDickZz2>S|LP@ZiA%=~xT|QzE!{CjuOeMmhaWn>O*^qM{-;K0eOM%gcEk!ub7u z1??grb8~ax*9Fj?KYz}(u&k_%p^k!fDzaq;`^N#m!KR_1f%W(ItAi>lD_K`p7Yhc1 zrT~P)Vd+@d1}b!TqGxK0#bT-k(5@4LcXf4f;n2UkyPFS#!1x6q_^qp}Q)j%Pp@9Q| z5)Ow|n&iguUOdd<89cc>9uFsW^ypEpqF@XSn5EmdZ`%SuHddA1q+-WS!U#gsqR}W9 ztfHbqfo7(|6Q}^lc(kJdb_A96u>%0c!d68h5l$u$2xx4Flkcyvz+`cWXeboY(>Jx+ zjg5`Uix)3gVPPS|FACMgcQU5Q(#zWQ{5=^P)2R07*qEhP5ot>SAbUVU2!m_`Abv;> z%4z`sz~b1!fdLJv=tY5);2vJHA0 zg1!dJ(bE1|X_O0y$^;`7#aE!F=w~Lp-r%JIfRQAk5q<3d!0*y7km_~-C@s!o6O;4I zw`&*c>%Y(Cs;aDEBV%KX+C*V7)7W*=W{29a$-&N)Y=;p5M)dSRu1W(Su)Y8cBLE

7mot>s$ zfiHnijvZsa-MFEuw+sNw1-I<;(GQ!Jtp!U_WE22kXCGknjo*L0$zOl^`EffeX!_XF z06kSY6wS=cs7;)GcOPyUa}*rEsvkgnJ)o70Qe9DM-eqZ#(+#S znvNf5KVH1ZhkbSSEbF+rq{gyhv~|{NO-9_H5df*6EdxN@N8orX?)J<;&@YKK(SURS z02)SH-Bf6&qpzhAT#W`GDvN?BtxN+_u>qjvDJx?K4;RAMsseV8GA@D2j59xm*m58Y2iI6+4%Lq0uKxu{^WV+R|d!9IUO?*nn_Pj}<8m z0Mz+mZ|{m&q8MAGC=c~VY*1{MoemYo&O!K;j*gZRWMPL50J3n>(#rCN2Ba0vEF`v} z0hyXKMNyQ;kqFxp2r&G{007|5Bob^qk$C$6fbhfp{YqI$2`eZq%^1*5 zH8`V;O;1d4EpP%rYip}={rYvzC+gnq+u3L=#&>)4UJnBL;T`(^eEG8Zao8z>nI3=o z^l7EIxR`$iNtuW-^+h5qIX}<-ynEMBxQ`DXR*FkXSh?5xW&nUg7h)6u0GT2BP zY}>}F0)gz;fcExwh2ne^5&GrI6^^Y8fJ>JyaT|dCZEbDYZ3EJwMP@YC{SwGJ0G#F* zr2GEg3c$2$Kw)7aUw;%5UrmCA$h6b@{|x{v5LlNQAjbclrod!e1F8=mRB&Z3rr3%1 z0EqS)20Y>cv1iZJxB1jlYr4}dJcK;&AyPt3&a zFX932ygYsy#D6&M-Mg1(yiq&>0Tmpn5l?UoK&J8wM8Hz@0*D9X Date: Tue, 3 Jun 2025 12:52:07 +0300 Subject: [PATCH 2/3] Fix posture and inscription --- src/main/java/com/hbm/blocks/generic/BlockBobble.java | 2 +- src/main/java/com/hbm/render/tileentity/RenderBobble.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/blocks/generic/BlockBobble.java b/src/main/java/com/hbm/blocks/generic/BlockBobble.java index 067363c2d..ea53feb69 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockBobble.java +++ b/src/main/java/com/hbm/blocks/generic/BlockBobble.java @@ -214,7 +214,7 @@ public class BlockBobble extends BlockContainer implements IGUIProvider, INBTTra MICROWAVE( "Microwave", "Microwave", "OC Compatibility and massive RBMK/packet optimizations", "they call me the food heater$john optimization", true, ScrapType.BOARD_CONVERTER), PEEP( "Peep", "LePeeperSauvage", "Coilgun, Leadburster and Congo Lake models, BDCL QC", "Fluffy ears can't hide in ash, nor snow.", true, ScrapType.CARD_BOARD), MELLOW( "MELLOWARPEGGIATION", "Mellow", "NBT Structures, industrial lighting, animation tools", "Make something cool now, ask for permission later.", true, ScrapType.CARD_PROCESSOR), - ABEL( "Abel1502", "Abel1502", "Abilities GUI, optimizations and many QoL improvements", "NANTO SUBARASHII!", true, ScrapType.CPU_REGISTER); + ABEL( "Abel1502", "Abel1502", "Abilities GUI, optimizations and many QoL improvements", "NANTO SUBARASHII", true, ScrapType.CPU_REGISTER); public String name; //the title of the tooltip public String label; //the name engraved in the socket diff --git a/src/main/java/com/hbm/render/tileentity/RenderBobble.java b/src/main/java/com/hbm/render/tileentity/RenderBobble.java index 979da575a..4bb36748e 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBobble.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBobble.java @@ -223,8 +223,8 @@ public class RenderBobble extends TileEntitySpecialRenderer { rotRightLeg = new double[]{-3, -5, 0}; break; case ABEL: - rotLeftArm = new double[]{0, 15, 80}; - rotRightArm = new double[]{0, 15, 80}; + rotLeftArm = new double[]{0, 80, 90}; + rotRightArm = new double[]{0, -80, 90}; break; } } From d9ef97f34596ab9ee7ce0440f0f750e48bcdd0bc Mon Sep 17 00:00:00 2001 From: abel1502 Date: Tue, 3 Jun 2025 14:08:02 +0300 Subject: [PATCH 3/3] Add glow --- .../com/hbm/render/tileentity/RenderBobble.java | 8 ++++++++ .../hbm/textures/models/trinkets/abel_glow.png | Bin 0 -> 553 bytes 2 files changed, 8 insertions(+) create mode 100644 src/main/resources/assets/hbm/textures/models/trinkets/abel_glow.png diff --git a/src/main/java/com/hbm/render/tileentity/RenderBobble.java b/src/main/java/com/hbm/render/tileentity/RenderBobble.java index 4bb36748e..58e8ee850 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBobble.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBobble.java @@ -51,6 +51,7 @@ public class RenderBobble extends TileEntitySpecialRenderer { public static final ResourceLocation bobble_mellow = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/mellowrpg8.png"); public static final ResourceLocation bobble_mellow_glow = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/mellowrpg8_glow.png"); public static final ResourceLocation bobble_abel = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/abel.png"); + public static final ResourceLocation bobble_abel_glow = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/abel_glow.png"); private long time; @@ -478,6 +479,13 @@ public class RenderBobble extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_BLEND); GL11.glPopAttrib(); break; + case ABEL: + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240F, 240F); + bindTexture(bobble_abel_glow); + renderGuy(type); + GL11.glPopAttrib(); + break; } } diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/abel_glow.png b/src/main/resources/assets/hbm/textures/models/trinkets/abel_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..6886dad7cb547cd559e3723fb8fa375cd9604be9 GIT binary patch literal 553 zcmV+^0@nSBP)*ks^wPf+&ckL@-UXNFo@uNybegByrhI5U~|(ECdVD z##iA#&{nWj5ClaKv9c@Koy&UYgpQvv|!*w%a<`&rI2&$8DN{bB_m009U<0000C>g^#yz69&? rWu_tq000000000Q{s(-_0Px=pjPobc#{x8F00000NkvXXu0mjf_~PT9 literal 0 HcmV?d00001