From abe6efc52e5fc8a5391eb95fd143e65e4e18969a Mon Sep 17 00:00:00 2001 From: sten104 Date: Sun, 15 Mar 2026 17:42:09 +0100 Subject: [PATCH 1/3] consistency? in this economy??? the steel sword is now consistent with every single other ntm sword, and now looks like a medieval longsword --- .../resources/assets/hbm/textures/steel_sword.png | Bin 0 -> 861 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/steel_sword.png diff --git a/src/main/resources/assets/hbm/textures/steel_sword.png b/src/main/resources/assets/hbm/textures/steel_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..f68b72f8aa8240fe0d6f883badd357b4fabd3d47 GIT binary patch literal 861 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V64n^b`J1#c2)=|%1_J8No8Qr zI6rmbUhl&JB1iqBy_be{y-;{GVPPGQt_W-46t1$Be7UTv^-gAA;_{S=3tF;+OOKD0 z{o>K}2md>S9}IOA5OF+mwEn<)SFb(mHMex|-TP2fKW9&I<$IP7=_P45Vm%KS$j!n{UDypzB4@f<#n8r71ckJAsT_TOjyTvImfom!gLQob;&8B=#U+W5&Bf6>aG z>wZUN(X4LESI%475|z76f+j3j&}I6fV8VjDptSwJC;8rI(t48kWm^EVx;tm;r(>RL zFNI9q<+jVKzi-xwzv=U~nOQ#c?O)RHVDjsIy$lOw7X+5yU9WsSSBAOK{lTG}-`Z0y ze_?<5b(@$q!=l*-Zl*>DmoP;L6VqGd06fN>!g;1lAip`mf|hT| z5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNYXe7+&UIJ9qmm1-j=IN=$zyaj2GDtD9GB5&J zUO+4jWrLE91|u_AoC(M_WMpCx1kzDJoY~F-7S92)LE!#m7KRtV)CHr_ZDn8pnlOQ# zfd#16z{uEuaRJ2K|Np_-8Q!FZq;T3D0{N-i)5S5w!vE++YoP`O9@mQ>Lci@#6z0+T zz_e8Jz|86e4qCH+iV9p!V=BtyJn?e_lfU_a+lD_%IQGdlu4BINUDBifm#%Ts#{Ps? z%rmO_9l{rAzbL;X-@S|Jy!5-bMgDH#2b3P%Yv8yc?P2*#)Z=(0PoU!|_4PUoi4I4e orv|Kdh&wo^>M+}ybY`!e43F&<+$S4^%7Pr}>FVdQ&MBb@0EX#7)&Kwi literal 0 HcmV?d00001 From 274aaede2b9669a5e08df044fa099cdc450317ec Mon Sep 17 00:00:00 2001 From: sten104 Date: Sun, 15 Mar 2026 17:51:21 +0100 Subject: [PATCH 2/3] oops --- .../assets/hbm/textures/items/steel_sword.png | Bin 514 -> 861 bytes .../assets/hbm/textures/steel_sword.png | Bin 861 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/steel_sword.png diff --git a/src/main/resources/assets/hbm/textures/items/steel_sword.png b/src/main/resources/assets/hbm/textures/items/steel_sword.png index b0852ff1b4c37ec74ca591f52051a5c22b27492e..f68b72f8aa8240fe0d6f883badd357b4fabd3d47 100644 GIT binary patch literal 861 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V64n^b`J1#c2)=|%1_J8No8Qr zI6rmbUhl&JB1iqBy_be{y-;{GVPPGQt_W-46t1$Be7UTv^-gAA;_{S=3tF;+OOKD0 z{o>K}2md>S9}IOA5OF+mwEn<)SFb(mHMex|-TP2fKW9&I<$IP7=_P45Vm%KS$j!n{UDypzB4@f<#n8r71ckJAsT_TOjyTvImfom!gLQob;&8B=#U+W5&Bf6>aG z>wZUN(X4LESI%475|z76f+j3j&}I6fV8VjDptSwJC;8rI(t48kWm^EVx;tm;r(>RL zFNI9q<+jVKzi-xwzv=U~nOQ#c?O)RHVDjsIy$lOw7X+5yU9WsSSBAOK{lTG}-`Z0y ze_?<5b(@$q!=l*-Zl*>DmoP;L6VqGd06fN>!g;1lAip`mf|hT| z5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNYXe7+&UIJ9qmm1-j=IN=$zyaj2GDtD9GB5&J zUO+4jWrLE91|u_AoC(M_WMpCx1kzDJoY~F-7S92)LE!#m7KRtV)CHr_ZDn8pnlOQ# zfd#16z{uEuaRJ2K|Np_-8Q!FZq;T3D0{N-i)5S5w!vE++YoP`O9@mQ>Lci@#6z0+T zz_e8Jz|86e4qCH+iV9p!V=BtyJn?e_lfU_a+lD_%IQGdlu4BINUDBifm#%Ts#{Ps? z%rmO_9l{rAzbL;X-@S|Jy!5-bMgDH#2b3P%Yv8yc?P2*#)Z=(0PoU!|_4PUoi4I4e orv|Kdh&wo^>M+}ybY`!e43F&<+$S4^%7Pr}>FVdQ&MBb@0EX#7)&Kwi literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}50G|+74GoQj3m5kH_e)7hm6n#~=jZ$S`nI*T1qTOvnu%uk$#tfyYshf} zl}p|`v>Hh9l?3?(|3?N4t_SX%0LpL{ctjQh73>FLMhn(p6`-I*iEBhjaDG}zd16s2 zLqK9?UWuNcYlwoWo}r%EpNq%W1J!IxjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7*q zWCn{f0ojI(Okm$e0oj@DEMW00AR7dhl`%5B00sh#MzfRwC^dndfd#12z{uEuaRJ0s zkd3ShASO)#vO$0eXf6|2Wss!>kOkFcXkY-6?LMd-;`#e~8<3gk>Ealo5$xOJD0D!9 zgL&h{sI`Co@8(@_H7224VNrU^%+>CfT7xHi)>N6wbGNCcIeC#+soBH)?pTqVZ}d&< z+gAk5I~nNp_;Ql>>lJT03$~SOtg&Rd(5@S?bj51DL*2nE>MT?^e|}hL@gHQdr>mdK II;Vst07JBkMgRZ+ diff --git a/src/main/resources/assets/hbm/textures/steel_sword.png b/src/main/resources/assets/hbm/textures/steel_sword.png deleted file mode 100644 index f68b72f8aa8240fe0d6f883badd357b4fabd3d47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 861 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0V64n^b`J1#c2)=|%1_J8No8Qr zI6rmbUhl&JB1iqBy_be{y-;{GVPPGQt_W-46t1$Be7UTv^-gAA;_{S=3tF;+OOKD0 z{o>K}2md>S9}IOA5OF+mwEn<)SFb(mHMex|-TP2fKW9&I<$IP7=_P45Vm%KS$j!n{UDypzB4@f<#n8r71ckJAsT_TOjyTvImfom!gLQob;&8B=#U+W5&Bf6>aG z>wZUN(X4LESI%475|z76f+j3j&}I6fV8VjDptSwJC;8rI(t48kWm^EVx;tm;r(>RL zFNI9q<+jVKzi-xwzv=U~nOQ#c?O)RHVDjsIy$lOw7X+5yU9WsSSBAOK{lTG}-`Z0y ze_?<5b(@$q!=l*-Zl*>DmoP;L6VqGd06fN>!g;1lAip`mf|hT| z5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNYXe7+&UIJ9qmm1-j=IN=$zyaj2GDtD9GB5&J zUO+4jWrLE91|u_AoC(M_WMpCx1kzDJoY~F-7S92)LE!#m7KRtV)CHr_ZDn8pnlOQ# zfd#16z{uEuaRJ2K|Np_-8Q!FZq;T3D0{N-i)5S5w!vE++YoP`O9@mQ>Lci@#6z0+T zz_e8Jz|86e4qCH+iV9p!V=BtyJn?e_lfU_a+lD_%IQGdlu4BINUDBifm#%Ts#{Ps? z%rmO_9l{rAzbL;X-@S|Jy!5-bMgDH#2b3P%Yv8yc?P2*#)Z=(0PoU!|_4PUoi4I4e orv|Kdh&wo^>M+}ybY`!e43F&<+$S4^%7Pr}>FVdQ&MBb@0EX#7)&Kwi From 24f53f4997e60002cf7e82d32ef13dda328fb19b Mon Sep 17 00:00:00 2001 From: Stefano Date: Sun, 15 Mar 2026 23:09:16 +0100 Subject: [PATCH 3/3] plate stamps and siren tracks moved to the anvil --- .../gui/GUIScreenTemplateFolder.java | 12 +----- .../inventory/recipes/anvil/AnvilRecipes.java | 38 +++++++++++++++++++ .../com/hbm/items/machine/ItemCassette.java | 2 - .../java/com/hbm/items/machine/ItemStamp.java | 6 +-- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index 135250162..bd0ff47be 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -56,17 +56,7 @@ public class GUIScreenTemplateFolder extends GuiScreen { this.isJournal = item != ModItems.template_folder; - if(!this.isJournal) { - // Stamps - for(ItemStack i : ItemStamp.stamps.get(StampType.PLATE)) allStacks.add(i.copy()); - for(ItemStack i : ItemStamp.stamps.get(StampType.WIRE)) allStacks.add(i.copy()); - for(ItemStack i : ItemStamp.stamps.get(StampType.CIRCUIT)) allStacks.add(i.copy()); - - // Tracks - for(int i = 1; i < ItemCassette.TrackType.values().length; i++) { - allStacks.add(new ItemStack(ModItems.siren_track, 1, i)); - } - } + if(!this.isJournal) { diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 8a68e0ccf..67587ad44 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -166,7 +166,9 @@ public class AnvilRecipes extends SerializableRecipe { constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(EMERALD.dust()), new AnvilOutput(new ItemStack(Items.emerald))).setTier(3)); registerConstructionRecipes(); + registerConstructionStamps(); registerConstructionAmmo(); + registerConstructionSirens(); registerConstructionUpgrades(); registerConstructionRecycling(); } @@ -578,6 +580,34 @@ public class AnvilRecipes extends SerializableRecipe { } } + public static void registerConstructionStamps() { + + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_stone_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_stone_plate))).setTier(1)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_stone_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_stone_wire))).setTier(1)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_stone_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_stone_circuit))).setTier(1)); + + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_iron_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_iron_plate))).setTier(1)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_iron_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_iron_wire))).setTier(1)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_iron_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_iron_circuit))).setTier(1)); + + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_steel_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_steel_plate))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_steel_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_steel_wire))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_steel_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_steel_circuit))).setTier(2)); + + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_titanium_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_titanium_plate))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_titanium_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_titanium_wire))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_titanium_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_titanium_circuit))).setTier(2)); + + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_obsidian_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_obsidian_plate))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_obsidian_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_obsidian_wire))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_obsidian_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_obsidian_circuit))).setTier(2)); + + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_desh_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_desh_plate))).setTier(3)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_desh_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_desh_wire))).setTier(3)); + constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.stamp_desh_flat, 1),new AnvilOutput(new ItemStack(ModItems.stamp_desh_circuit))).setTier(3)); + + } + public static void registerConstructionAmmo() { constructionRecipes.add(new AnvilConstructionRecipe(new AStack[]{new ComparableStack(ModItems.stamp_iron_flat), new OreDictStack(GUNMETAL.ingot(), 2)}, new AnvilOutput(new ItemStack(ModItems.stamp_9))).setTier(2)); @@ -597,6 +627,14 @@ public class AnvilRecipes extends SerializableRecipe { constructionRecipes.add(new AnvilConstructionRecipe(new AStack[]{new ComparableStack(ModItems.mold_base), new OreDictStack(STEEL.ingot(), 4)}, new AnvilOutput(new ItemStack(ModItems.mold, 1, 28))).setTier(2)); } + public static void registerConstructionSirens() { + for(int i = 1; i < 21; i++) { + constructionRecipes.add(new AnvilConstructionRecipe(new AStack[] {new OreDictStack(STEEL.plate()), new ComparableStack(ModItems.plate_polymer)}, new AnvilOutput(new ItemStack(ModItems.siren_track, 1, i))).setTier(2).setOverlay(OverlayType.CONSTRUCTION)); + } + + + } + public static void registerConstructionUpgrades() { } public static void registerConstructionRecycling() { diff --git a/src/main/java/com/hbm/items/machine/ItemCassette.java b/src/main/java/com/hbm/items/machine/ItemCassette.java index 9a0dc6a55..12667e1cb 100644 --- a/src/main/java/com/hbm/items/machine/ItemCassette.java +++ b/src/main/java/com/hbm/items/machine/ItemCassette.java @@ -120,8 +120,6 @@ public class ItemCassette extends Item { if(!(stack.getItem() instanceof ItemCassette)) return; - list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("info.templatefolder", I18nUtil.resolveKey(ModItems.template_folder.getUnlocalizedName() + ".name"))); - list.add(""); list.add("Siren sound cassette:"); list.add(" Name: " + TrackType.getEnum(stack.getItemDamage()).getTrackTitle()); diff --git a/src/main/java/com/hbm/items/machine/ItemStamp.java b/src/main/java/com/hbm/items/machine/ItemStamp.java index 629f634e0..ee6372fc2 100644 --- a/src/main/java/com/hbm/items/machine/ItemStamp.java +++ b/src/main/java/com/hbm/items/machine/ItemStamp.java @@ -34,11 +34,7 @@ public class ItemStamp extends Item { stamps.put(type, list); } - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - if(this.type == StampType.PLATE || this.type == StampType.WIRE || this.type == StampType.CIRCUIT) - list.add("[CREATED USING TEMPLATE FOLDER]"); - } + /** Params can't take an ItemStack, for some reason it crashes during init */ public StampType getStampType(Item item, int meta) {