From 282228239f6a2b821b807c3b91feeaf01b7a935d Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 12 Sep 2023 22:04:26 +0200 Subject: [PATCH] fixes, armor sprites --- .../java/com/hbm/handler/HazmatRegistry.java | 6 ++++++ .../hbm/handler/nei/CustomMachineHandler.java | 2 -- src/main/java/com/hbm/items/ModItems.java | 4 +++- .../hbm/items/armor/ArmorTrenchmaster.java | 20 ++++++++++++++++++ src/main/java/com/hbm/main/MainRegistry.java | 6 +++--- .../hbm/textures/items/trenchmaster_boots.png | Bin 0 -> 164 bytes .../textures/items/trenchmaster_helmet.png | Bin 0 -> 347 bytes .../hbm/textures/items/trenchmaster_legs.png | Bin 0 -> 240 bytes .../hbm/textures/items/trenchmaster_plate.png | Bin 0 -> 392 bytes 9 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/trenchmaster_boots.png create mode 100644 src/main/resources/assets/hbm/textures/items/trenchmaster_helmet.png create mode 100644 src/main/resources/assets/hbm/textures/items/trenchmaster_legs.png create mode 100644 src/main/resources/assets/hbm/textures/items/trenchmaster_plate.png diff --git a/src/main/java/com/hbm/handler/HazmatRegistry.java b/src/main/java/com/hbm/handler/HazmatRegistry.java index 1d6b322b1..07e7df1b0 100644 --- a/src/main/java/com/hbm/handler/HazmatRegistry.java +++ b/src/main/java/com/hbm/handler/HazmatRegistry.java @@ -56,6 +56,7 @@ public class HazmatRegistry { double env = 2D; // 99% double hev = 2.3D; // 99.5% double rpa = 2D; // 99% + double trench = 1D; // 90% double fau = 4D; // 99.99% double dns = 5D; // 99.999% double security = 0.825D; // 85% @@ -124,6 +125,11 @@ public class HazmatRegistry { HazmatRegistry.registerHazmat(ModItems.rpa_legs, rpa * legs); HazmatRegistry.registerHazmat(ModItems.rpa_boots, rpa * boots); + HazmatRegistry.registerHazmat(ModItems.trenchmaster_helmet, trench * helmet); + HazmatRegistry.registerHazmat(ModItems.trenchmaster_plate, trench * chest); + HazmatRegistry.registerHazmat(ModItems.trenchmaster_legs, trench * legs); + HazmatRegistry.registerHazmat(ModItems.trenchmaster_boots, trench * boots); + HazmatRegistry.registerHazmat(ModItems.fau_helmet, fau * helmet); HazmatRegistry.registerHazmat(ModItems.fau_plate, fau * chest); HazmatRegistry.registerHazmat(ModItems.fau_legs, fau * legs); diff --git a/src/main/java/com/hbm/handler/nei/CustomMachineHandler.java b/src/main/java/com/hbm/handler/nei/CustomMachineHandler.java index cf3570f79..17acd394c 100644 --- a/src/main/java/com/hbm/handler/nei/CustomMachineHandler.java +++ b/src/main/java/com/hbm/handler/nei/CustomMachineHandler.java @@ -132,8 +132,6 @@ public class CustomMachineHandler extends TemplateRecipeHandler { List recipes = CustomMachineRecipes.recipes.get(conf.recipeKey); - System.out.println(conf.recipeKey); - if(recipes != null) outer:for(CustomMachineRecipe recipe : recipes) { for(Pair stack : recipe.outputItems) { diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 90b3279b0..2d0270f08 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -4956,12 +4956,14 @@ public class ModItems { ArmorMaterial aMatTrench = EnumHelper.addArmorMaterial("HBM_TRENCH", 150, new int[] { 3, 8, 6, 3 }, 100); aMatTrench.customCraftingMaterial = ModItems.plate_iron; - trenchmaster_helmet = new ArmorTrenchmaster(aMatTrench, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png") + trenchmaster_helmet = new ArmorTrenchmaster(aMatTrench, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.25F).setThreshold(5.0F) .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2)) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 1)) .addEffect(new PotionEffect(Potion.jump.id, 20, 1)) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 0)) .enableVATS(true) + .addResistance("fall", 0F) + .setFireproof(true) .setStepSize(1) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("trenchmaster_helmet").setTextureName(RefStrings.MODID + ":trenchmaster_helmet"); diff --git a/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java b/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java index e4c42037e..ec497410c 100644 --- a/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java +++ b/src/main/java/com/hbm/items/armor/ArmorTrenchmaster.java @@ -2,6 +2,7 @@ package com.hbm.items.armor; import java.util.List; +import com.hbm.extprop.HbmPlayerProps; import com.hbm.render.model.ModelArmorTrenchmaster; import com.hbm.util.I18nUtil; @@ -12,6 +13,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.event.entity.living.LivingAttackEvent; public class ArmorTrenchmaster extends ArmorFSB { @@ -43,4 +45,22 @@ public class ArmorTrenchmaster extends ArmorFSB { list.add(EnumChatFormatting.RED + " " + I18nUtil.resolveKey("armor.fasterReload")); list.add(EnumChatFormatting.RED + " " + I18nUtil.resolveKey("armor.moreAmmo")); } + + @Override + public void handleAttack(LivingAttackEvent event) { + + EntityLivingBase e = event.entityLiving; + + if(e instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) e; + + if(ArmorFSB.hasFSBArmor(player)) { + + if(e.getRNG().nextInt(3) == 0) { + HbmPlayerProps.plink(player, "random.break", 0.5F, 1.0F + e.getRNG().nextFloat() * 0.5F); + event.setCanceled(true); + } + } + } + } } diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 7c3542ec2..23e7a4a92 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -289,6 +289,9 @@ public class MainRegistry { SiegeTier.registerTiers(); HazardRegistry.registerItems(); HazardRegistry.registerTrafos(); + + OreDictManager oreMan = new OreDictManager(); + MinecraftForge.EVENT_BUS.register(oreMan); //OreRegisterEvent OreDictManager.registerGroups(); //important to run first OreDictManager.registerOres(); @@ -899,9 +902,6 @@ public class MainRegistry { MinecraftForge.EVENT_BUS.register(impactHandler); MinecraftForge.TERRAIN_GEN_BUS.register(impactHandler); - OreDictManager oreMan = new OreDictManager(); - MinecraftForge.EVENT_BUS.register(oreMan); //OreRegisterEvent - PacketDispatcher.registerPackets(); ChunkRadiationManager radiationSystem = new ChunkRadiationManager(); diff --git a/src/main/resources/assets/hbm/textures/items/trenchmaster_boots.png b/src/main/resources/assets/hbm/textures/items/trenchmaster_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..509f7cae63cdddc78aa22a7d84ee1d5da77750c2 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf z{)#QRVdmG84vtHL4lZo**^K9S-uXuUS>~%A^09l{pJv_yM!RgibtQ>=K<;7iboFyt I=akR{0G@9(n*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/trenchmaster_helmet.png b/src/main/resources/assets/hbm/textures/items/trenchmaster_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..b12e0e69f292402234ccf6956dc2223c9ee74daa GIT binary patch literal 347 zcmV-h0i^zkP)08mO9t+lW}9&WBo5NrV0@4t9_ zeisvZR&&lluwnP~!tVZ-!Dz8Tk|YLzpAV2*H+O1;IF1d#_2mWj2ydU?0F-4ZW(@}M zDQpt~5Jk}<;a{q%5^I32>(E+@G);}?dH;&~zNaXPV+Sh$t+h}}82~9I`Rg5do+G6k z#c&weF&H7YhYifd7VD{GmSq66ZR^BC2R6qJ>`RnV(zdPhY_VNCdx=XK-FKR%2B2vg tC-3_{fU|)~gMly%o!hAEdbai~egT>IY}~g=gL?n~002ovPDHLkV1g7Xk6r)( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/trenchmaster_legs.png b/src/main/resources/assets/hbm/textures/items/trenchmaster_legs.png new file mode 100644 index 0000000000000000000000000000000000000000..48e7b3e7cc0b10eec7ca82ed944ffe688890ae95 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfCs&GFz2nV5|B2Law2XX|d~khQz($#(9TtMK8s z|1vp`JzspGBiBvnRuNCm%3A zSjeAX8)0`#|GvzG$8t}*MKkyg$ZTLZy3MrCys^W8M|%)NZ4fq4*&hbo$#yd_n80i>G4uwWz*Be! zZ{Z0{RWumgV0Q-AU{KgZSi1#j1Lu?i`%;qLbzzHiZ{rkTwKT1Huw!3fUV69q?F8Nv&?QC^4iJx z3kPwM5+^B#1D7~Sc^D;G94Bd|VFRGs^Nl@>5N<(G=ImQ*#bg{c9DtLf{Y)@@eM6}^ zgVsAY=>o31j8gL~@2#(8@#$Igd4uiMrHnkkxB}p^#=*hyUUh{$>}RnS^D6?}N7sd# m$`Q3zg<^ooIBHn_&+!3*xQFmFi(-iY0000