From 7d50f934eb94a1b43694ac031fa77d68a3f0f69e Mon Sep 17 00:00:00 2001 From: burningwater202 Date: Thu, 14 Mar 2024 16:59:44 -0400 Subject: [PATCH 1/2] Lemme axe you somethin sorry for being a pain in the axe Adds Super Axes (Bismuth, Molten, Chlorophyte, Mese) Basically the same as the pickaxes but they also double as a weapon, with each having damage relatively respective to the progression level equivalent meteorite sword. --- .../java/com/hbm/crafting/ToolRecipes.java | 7 +++ src/main/java/com/hbm/items/ModItems.java | 51 ++++++++++++++++-- src/main/resources/assets/hbm/lang/en_US.lang | 4 ++ .../assets/hbm/textures/items/bismuth_axe.png | Bin 0 -> 621 bytes .../hbm/textures/items/chlorophyte_axe.png | Bin 0 -> 620 bytes .../assets/hbm/textures/items/mese_axe.png | Bin 0 -> 592 bytes .../hbm/textures/items/volcanic_axe.png | Bin 0 -> 700 bytes 7 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/bismuth_axe.png create mode 100644 src/main/resources/assets/hbm/textures/items/chlorophyte_axe.png create mode 100644 src/main/resources/assets/hbm/textures/items/mese_axe.png create mode 100644 src/main/resources/assets/hbm/textures/items/volcanic_axe.png diff --git a/src/main/java/com/hbm/crafting/ToolRecipes.java b/src/main/java/com/hbm/crafting/ToolRecipes.java index 27c513745..b0fac7d30 100644 --- a/src/main/java/com/hbm/crafting/ToolRecipes.java +++ b/src/main/java/com/hbm/crafting/ToolRecipes.java @@ -83,6 +83,13 @@ public class ToolRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.chlorophyte_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_steel, 'D', ModItems.powder_chlorophyte, 'A', FIBER.ingot(), 'P', ModItems.volcanic_pickaxe, 'F', DURA.bolt() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.mese_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_desh, 'D', ModItems.powder_dineutronium, 'A', ModItems.plate_paa, 'P', ModItems.chlorophyte_pickaxe, 'F', ModItems.shimmer_handle }); + //Super Axes + CraftingManager.addRecipeAuto(new ItemStack(ModItems.bismuth_axe, 1), new Object[] { " BM", "BPB", "TB ", 'B', ModItems.ingot_bismuth, 'M', ModItems.ingot_meteorite, 'P', ModItems.starmetal_axe, 'T', W.bolt() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.volcanic_axe, 1), new Object[] { " BM", "BPB", "TB ", 'B', ModItems.gem_volcanic, 'M', ModItems.ingot_meteorite, 'P', ModItems.starmetal_axe, 'T', W.bolt() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.chlorophyte_axe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_steel, 'D', ModItems.powder_chlorophyte, 'A', FIBER.ingot(), 'P', ModItems.bismuth_axe, 'F', DURA.bolt() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.chlorophyte_axe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_steel, 'D', ModItems.powder_chlorophyte, 'A', FIBER.ingot(), 'P', ModItems.volcanic_axe, 'F', DURA.bolt() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.mese_axe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_desh, 'D', ModItems.powder_dineutronium, 'A', ModItems.plate_paa, 'P', ModItems.chlorophyte_axe, 'F', ModItems.shimmer_handle }); + //Chainsaws CraftingManager.addRecipeAuto(ItemToolAbilityFueled.getEmptyTool(ModItems.chainsaw), new Object[] { "CCH", "BBP", "CCE", 'H', ModItems.hull_small_steel, 'B', ModItems.blades_steel, 'P', ModItems.piston_selenium, 'C', ModBlocks.chain, 'E', ModItems.canister_empty }); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index cf9ee4f9b..adcecafc1 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2081,9 +2081,13 @@ public class ModItems { public static Item drax_mk2; public static Item drax_mk3; public static Item bismuth_pickaxe; + public static Item bismuth_axe; public static Item volcanic_pickaxe; + public static Item volcanic_axe; public static Item chlorophyte_pickaxe; + public static Item chlorophyte_axe; public static Item mese_pickaxe; + public static Item mese_axe; public static Item dnt_sword; public static Item dwarven_pickaxe; @@ -5271,6 +5275,16 @@ public class ModItems { .addHitAbility(new WeaponAbility.VampireAbility(2F)) .addHitAbility(new WeaponAbility.BeheaderAbility()) .setDepthRockBreaker().setUnlocalizedName("bismuth_pickaxe").setTextureName(RefStrings.MODID + ":bismuth_pickaxe"); + bismuth_axe = new ItemToolAbility(125F, 0, matBismuth, EnumToolType.AXE) + .addBreakAbility(new ToolAbility.HammerAbility(2)) + .addBreakAbility(new ToolAbility.RecursionAbility(4)) + .addBreakAbility(new ToolAbility.ShredderAbility()) + .addBreakAbility(new ToolAbility.LuckAbility(2)) + .addBreakAbility(new ToolAbility.SilkAbility()) + .addHitAbility(new WeaponAbility.StunAbility(5)) + .addHitAbility(new WeaponAbility.VampireAbility(2F)) + .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("bismuth_axe").setTextureName(RefStrings.MODID + ":bismuth_axe"); + ToolMaterial matVolcano = EnumHelper.addToolMaterial("HBM_VOLCANIC", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.ingot_bismuth)); volcanic_pickaxe = new ItemToolAbility(15F, 0, matVolcano, EnumToolType.MINER) @@ -5283,6 +5297,15 @@ public class ModItems { .addHitAbility(new WeaponAbility.VampireAbility(2F)) .addHitAbility(new WeaponAbility.BeheaderAbility()) .setDepthRockBreaker().setUnlocalizedName("volcanic_pickaxe").setTextureName(RefStrings.MODID + ":volcanic_pickaxe"); + volcanic_axe = new ItemToolAbility(125F, 0, matVolcano, EnumToolType.AXE) + .addBreakAbility(new ToolAbility.HammerAbility(2)) + .addBreakAbility(new ToolAbility.RecursionAbility(4)) + .addBreakAbility(new ToolAbility.SmelterAbility()) + .addBreakAbility(new ToolAbility.LuckAbility(3)) + .addBreakAbility(new ToolAbility.SilkAbility()) + .addHitAbility(new WeaponAbility.FireAbility(5)) + .addHitAbility(new WeaponAbility.VampireAbility(2F)) + .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("volcanic_axe").setTextureName(RefStrings.MODID + ":volcanic_axe"); ToolMaterial matChlorophyte = EnumHelper.addToolMaterial("HBM_CHLOROPHYTE", 4, 0, 75F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.powder_chlorophyte)); chlorophyte_pickaxe = new ItemToolAbility(20F, 0, matChlorophyte, EnumToolType.MINER) @@ -5295,9 +5318,16 @@ public class ModItems { .addHitAbility(new WeaponAbility.VampireAbility(5F)) .addHitAbility(new WeaponAbility.BeheaderAbility()) .setDepthRockBreaker().setUnlocalizedName("chlorophyte_pickaxe").setTextureName(RefStrings.MODID + ":chlorophyte_pickaxe"); - + chlorophyte_axe = new ItemToolAbility(175F, 0, matChlorophyte, EnumToolType.AXE) + .addBreakAbility(new ToolAbility.HammerAbility(2)) + .addBreakAbility(new ToolAbility.RecursionAbility(4)) + .addBreakAbility(new ToolAbility.LuckAbility(4)) + .addHitAbility(new WeaponAbility.StunAbility(10)) + .addHitAbility(new WeaponAbility.VampireAbility(5F)) + .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("chlorophyte_axe").setTextureName(RefStrings.MODID + ":chlorophyte_axe"); + ToolMaterial matMese = EnumHelper.addToolMaterial("HBM_MESE", 4, 0, 100F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa)); - mese_pickaxe = new ItemToolAbility(35F, 0, matMese, EnumToolType.MINER) + mese_pickaxe = new ItemToolAbility(15F, 0, matMese, EnumToolType.MINER) .addBreakAbility(new ToolAbility.HammerAbility(3)) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.CrystallizerAbility()) @@ -5311,6 +5341,18 @@ public class ModItems { .addHitAbility(new WeaponAbility.PhosphorusAbility(60)) .addHitAbility(new WeaponAbility.BeheaderAbility()) .setDepthRockBreaker().setUnlocalizedName("mese_pickaxe").setTextureName(RefStrings.MODID + ":mese_pickaxe"); + mese_axe = new ItemToolAbility(250F, 0, matMese, EnumToolType.AXE) + .addBreakAbility(new ToolAbility.HammerAbility(3)) + .addBreakAbility(new ToolAbility.RecursionAbility(5)) + .addBreakAbility(new ToolAbility.SilkAbility()) + .addBreakAbility(new ToolAbility.LuckAbility(9)) + .addBreakAbility(new ToolAbility.ExplosionAbility(2.5F)) + .addBreakAbility(new ToolAbility.ExplosionAbility(5F)) + .addBreakAbility(new ToolAbility.ExplosionAbility(10F)) + .addBreakAbility(new ToolAbility.ExplosionAbility(15F)) + .addHitAbility(new WeaponAbility.StunAbility(10)) + .addHitAbility(new WeaponAbility.PhosphorusAbility(60)) + .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("mese_axe").setTextureName(RefStrings.MODID + ":mese_axe"); dnt_sword = new ItemSwordAbility(12F, 0, matMese).setUnlocalizedName("dnt_sword").setTextureName(RefStrings.MODID + ":dnt_sword"); @@ -7361,10 +7403,13 @@ public class ModItems { GameRegistry.registerItem(drax_mk2, drax_mk2.getUnlocalizedName()); GameRegistry.registerItem(drax_mk3, drax_mk3.getUnlocalizedName()); GameRegistry.registerItem(bismuth_pickaxe, bismuth_pickaxe.getUnlocalizedName()); + GameRegistry.registerItem(bismuth_axe, bismuth_axe.getUnlocalizedName()); GameRegistry.registerItem(volcanic_pickaxe, volcanic_pickaxe.getUnlocalizedName()); + GameRegistry.registerItem(volcanic_axe, volcanic_axe.getUnlocalizedName()); GameRegistry.registerItem(chlorophyte_pickaxe, chlorophyte_pickaxe.getUnlocalizedName()); + GameRegistry.registerItem(chlorophyte_axe, chlorophyte_axe.getUnlocalizedName()); GameRegistry.registerItem(mese_pickaxe, mese_pickaxe.getUnlocalizedName()); - GameRegistry.registerItem(matchstick, matchstick.getUnlocalizedName()); + GameRegistry.registerItem(mese_axe, mese_axe.getUnlocalizedName()); GameRegistry.registerItem(matchstick, matchstick.getUnlocalizedName()); GameRegistry.registerItem(balefire_and_steel, balefire_and_steel.getUnlocalizedName()); GameRegistry.registerItem(crowbar, crowbar.getUnlocalizedName()); GameRegistry.registerItem(wrench, wrench.getUnlocalizedName()); diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 4abb224b1..0d62d5ffa 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1949,6 +1949,7 @@ item.biomass_compressed.name=Compressed Biomass item.bismuth_boots.name=Bismuth Sandals item.bismuth_helmet.name=Bismuth Headdress item.bismuth_legs.name=Bismuth Kneeguards +item.bismuth_axe.name=Bismuth Axe item.bismuth_pickaxe.name=Bismuth Pickaxe item.bismuth_plate.name=Bismuth Shoulderpads, Necklace & Loincloth item.bismuth_tool.name=Magnetic Extractor @@ -2173,6 +2174,7 @@ item.chemistry_set_boron.name=Laboratory Glassware (Boron Glass) item.chemistry_template.name=Chemistry Template: item.chernobylsign.name=Chernobyl Warning Sign Battle Axe item.chlorine_pinwheel.name=Chlorine Pinwheel +item.chlorophyte_axe.name=Chlorophyte Axe item.chlorophyte_pickaxe.name=Chlorophyte Pickaxe item.chocolate.name=Ithis-Brand Radium Chocolate item.chocolate.desc=Radium Chocolate? Pretty sure this is just meth. @@ -3053,6 +3055,7 @@ item.meltdown_tool.name=Dyatlov Instant Meltdown Applicator item.memespoon.name=§eMarket Gardener item.memory.name=item.null.name item.mese_gavel.name=Mese Gavel +item.mese_axe.name=Mese Axe item.mese_pickaxe.name=Mese Pickaxe item.meteor_charm.name=Meteor Charm item.meteor_remote.name=Meteorite Remote @@ -4318,6 +4321,7 @@ item.upgrade_stack_2.name=Stack Ejection Upgrade Mk.II item.upgrade_stack_3.name=Stack Ejection Upgrade Mk.III item.upgrade_template.name=Machine Upgrade Template item.v1.name=V1 +item.volcanic_axe.name=Molten Axe item.volcanic_pickaxe.name=Molten Pickaxe item.wand_d.name=Debug Wand item.wand_k.name=Construction Wand diff --git a/src/main/resources/assets/hbm/textures/items/bismuth_axe.png b/src/main/resources/assets/hbm/textures/items/bismuth_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..f4009dde19f07321b95ed4c9f5bb5c850786f68d GIT binary patch literal 621 zcmV-z0+RiSP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0s=`yK~y+TosvIq z(?A%;pR=9f`e;#6NN5@)BorxP=+4F$=mAJckl0gUcdJe{6&v9HhH#`dcON`X6zrE z0#v6ern(Ack%CQPsG5q<_prJBK*qP*ZB8jguh%1rq%sMZFa?pO!GVIW!!bOXz*`w1 zym%~Q1l(%1(C_!VtG{sQvx(;0~hE#qR_&bc^&K5uH>*#se*tpd_NvxO2!zP-@uL{ zETrzy)J1)vhS+t$!US9QJN(t%j%;$CNmNj4UV_CuyxxA4@9*qA<14i#jDHM}_zeEQ zMdT!?U=D|eX1M~_aZ0dg*ryMl;o2i0R6t^a$o4Uf7~(jQF{K2)V`i)0SM~ngN8DI{ zLMCp2@fRySsiaVP#TlBr6?Jk|#cpriyU95xP?!dt8ZZYV_(4#vKTgp;E(ya}n;Wt?_1~fpgU=g48ka zJXp3ZPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T---S`9Y4}x1kaO1{}2!5c( zMiEIAtdta?xXZ#-RGj9c%}kOpopJ8T+%co=LLZoL&%Nh;&&j!0z#)vyBy4v{TtBmP zK9k9ObVHB740?rE=OzH#LMWgh`|vfkpMRnJR4Qews)}NgXP#uwg|2D9sTl2e9C`D@N0y`^?IGO zUI$FPu(${%a2!=#b54%nn4+Qu1AY5ZG%F@X$3|cd?jW5`54p169WaCWh9=yM}Ih7rDwoHM4FP^-_u2qH55pguAqS7iO zaqbi@&tAa&cXu?O!Gn8`NbH6*u<_wZyv@ExNLHL15fM^k#7+#uFm%fC49exQyXwNP zDxWWqY4+(lEV+%a8bPDoK(v2=@;n3HGF$gv6`wXk5+&4rY8VQ~k$wD%_I!VV!7CRE z1)rEY|DGr^usIv*)}tX#bR#Mg$p^tL6!dnn!*2y0pJ(gm*iw$a;GW)0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T-I3kdVt}2Xe|marGb`_9kKwe}Vr(@aRFvzwqwKdqjwOFc1|)A|&Dm znpHGnbiyQRj8&cPFhksfKIrML?tZUoUbTk*U~LU8xfCcAmL}8b^qvem=n`-fQ>iK3 z-2B7qYZC_t=U7~9-%lhGEz>lS&*!xsaZ^H(XJ-ClY-|dp(iv(shekl0Gni~y7M+zu z>=9rrEKK0;?vzM}czJn)<5XbV$B0ICk$^L2vsqNDRZ)#DSOh*yrT*aZ@(K?RHX02b z0|U<_;zzw6fUf(|+dGV8vVhUim1riDd1hY60~Qz`|A~!_N4e96WyRt5H^_%RXj+|i z%BWP@XScWM5zjB!wj<`{WoT*?i>E~7Lf>fA;Pd^UDuS4siz5_Ty7vfdZZ-s2hQhF1 zZWjCd7bMaL({x}M2F+BuHYo0N1j=Q(kWj7K+S9M5c%Rmvl$~lNQKb# z4j8IcZnsxg(Ml#QL?RjjfiSkWv*K=78&zgESs@m?rnVXgho3~u56dIqek5)(XXiN> z{Ec|r!20^3*k^bQ~@m ec<@~^0DJ(Ir_L*UCGwvD0000#m~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/volcanic_axe.png b/src/main/resources/assets/hbm/textures/items/volcanic_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..9a870d13143e3409b4ef0ba6725ef19b3990621f GIT binary patch literal 700 zcmV;t0z>_YP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TPFzUjnTUSLB zLqtMUG+KitX=>$RXQnTvojKmQeG)Y>ewobNIrn_$J1>U6fG)=f;+FWsj}P;I^!?39 z^KpV%6K8X77XF@X*kK#W&rPr!8R5UYq|uRn72~&7nMZgwL1#w^dL71e64t^rlwkuj zav1e+m`gRZT(TSg&4;x3KM(+pgZx&Q}Au9 z12Q-BYB1W5+F}w_ZwcPOF6v$%Bx3-jq=bOvdhInEdz! zERO}p=Y?v9A?r1m$4^05kAbcXQ740FkWk^{GAeCbt6}HV9L%dp_`j>LEeoEC3S@Hd zzx&eFM7#NI;=y8LR3VwCdRJ$mo3BtPad*!lNO}ph7X*5xP5`!3W-ayG=QVPCDzbYe z%-sLf$jBo@kpiG>9w-n3D{H`4o{hNd!u2_ghDH-u-AH%HE^;Rgq4o i50L*AqJ;k?1Hdm}PV_-B>~C`b0000! literal 0 HcmV?d00001 From 7ce891689a8c313d5a94745c8478642fcfb7f5ed Mon Sep 17 00:00:00 2001 From: burningwater202 Date: Thu, 14 Mar 2024 17:05:23 -0400 Subject: [PATCH 2/2] Axe yourself this fixes Mese pickaxe damage that I for some reason modified --- src/main/java/com/hbm/items/ModItems.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index adcecafc1..9c3d71bc2 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -5327,7 +5327,7 @@ public class ModItems { .addHitAbility(new WeaponAbility.BeheaderAbility()).setUnlocalizedName("chlorophyte_axe").setTextureName(RefStrings.MODID + ":chlorophyte_axe"); ToolMaterial matMese = EnumHelper.addToolMaterial("HBM_MESE", 4, 0, 100F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa)); - mese_pickaxe = new ItemToolAbility(15F, 0, matMese, EnumToolType.MINER) + mese_pickaxe = new ItemToolAbility(35F, 0, matMese, EnumToolType.MINER) .addBreakAbility(new ToolAbility.HammerAbility(3)) .addBreakAbility(new ToolAbility.RecursionAbility(5)) .addBreakAbility(new ToolAbility.CrystallizerAbility())