From 45fe9a81b2af77ba9c531719180b1def83206033 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 15 Nov 2023 16:09:18 +0100 Subject: [PATCH] MINE THE NITRA FOR AMMO --- changelog | 10 +++++++- .../com/hbm/crafting/ConsumableRecipes.java | 1 + .../java/com/hbm/crafting/MineralRecipes.java | 2 ++ .../java/com/hbm/crafting/WeaponRecipes.java | 14 +++++++++++ .../java/com/hbm/handler/WeaponAbility.java | 23 +----------------- .../com/hbm/inventory/OreDictManager.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 6 +++++ src/main/resources/assets/hbm/lang/de_DE.lang | 2 ++ src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ .../assets/hbm/textures/gui/gui_inserter.png | Bin 2245 -> 0 bytes .../assets/hbm/textures/gui/gui_turbofan.png | Bin 2642 -> 0 bytes .../hbm/textures/gui/machine/gui_pattern.png | Bin 3347 -> 0 bytes .../assets/hbm/textures/items/nitra.png | Bin 0 -> 206 bytes .../assets/hbm/textures/items/nitra_small.png | Bin 0 -> 155 bytes .../assets/hbm/textures/items/pattern.png | Bin 179 -> 0 bytes .../hbm/textures/items/pattern_drawn.png | Bin 208 -> 0 bytes 16 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/gui/gui_inserter.png delete mode 100644 src/main/resources/assets/hbm/textures/gui/gui_turbofan.png delete mode 100644 src/main/resources/assets/hbm/textures/gui/machine/gui_pattern.png create mode 100644 src/main/resources/assets/hbm/textures/items/nitra.png create mode 100644 src/main/resources/assets/hbm/textures/items/nitra_small.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pattern.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pattern_drawn.png diff --git a/changelog b/changelog index e03539fb7..ec78b2193 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,14 @@ +## Added +* Nitra + * Dropped by the painsaw ability when killing a mob + * Can be used to quickly craft standard ammo types in the 2x2 crafting grid + * Can also refill empty syringes, making stimpaks + ## Changed * Light oil and cracked light oil can now be refomred into large quantities of aromatic hydrocarbons a well as some reformate gas +* The painsaw ability no longer drops ammo and syringes, instead it drops nitra ## Fixed * Fixed thorium bedrock ore using the wrong ore dict key, making it unable to be processed via centrifuge or acidizer -* Fixed custom machine NEI slots going out of bounds after the third slot \ No newline at end of file +* Fixed custom machine NEI slots going out of bounds after the third slot +* Fixed bismuth billets not being oredicted, making BFB PWR rods uncraftable \ No newline at end of file diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index 971b29fa1..57c95d9b7 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -105,6 +105,7 @@ public class ConsumableRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SNS", "PCP", "SNS", 'C', ModItems.syringe_empty, 'S', S.dust(), 'P', PU239.nugget(), 'N', PU238.nugget() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.syringe_metal_empty, 6), new Object[] { "P", "C", "B", 'B', Blocks.iron_bars, 'C', ModItems.rod_empty, 'P', IRON.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_metal_empty }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { ModItems.nitra_small, ModItems.nitra_small, ModItems.nitra_small, ModItems.syringe_metal_empty }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.syringe_metal_medx, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.quartz, 'S', ModItems.syringe_metal_empty }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.syringe_metal_psycho, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.glowstone_dust, 'S', ModItems.syringe_metal_empty }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.syringe_metal_super, 1), new Object[] { " N ", "PSP", "L L", 'N', ModItems.bottle_nuka, 'P', STEEL.plate(), 'S', ModItems.syringe_metal_stimpak, 'L', Items.leather }); diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 45e58b454..49b00e0d4 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -418,6 +418,8 @@ public class MineralRecipes { GameRegistry.addRecipe(new ItemStack(ModItems.ingot_mercury, 8), new Object[] { "#", '#', ModItems.bottle_mercury }); GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire, 1), new Object[] { "###", "###", "###", '#', ModItems.egg_balefire_shard }); GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire_shard, 9), new Object[] { "#", '#', ModItems.egg_balefire }); + GameRegistry.addRecipe(new ItemStack(ModItems.nitra, 1), new Object[] { "##", "##", '#', ModItems.nitra_small }); + GameRegistry.addRecipe(new ItemStack(ModItems.nitra_small, 9), new Object[] { "#", '#', ModItems.nitra }); add1To9Pair(ModItems.powder_paleogenite, ModItems.powder_paleogenite_tiny); add1To9Pair(ModItems.ingot_osmiridium, ModItems.nugget_osmiridium); diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index 003f4c7e3..60c6823c0 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -166,6 +166,20 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_coilgun, 16, 0), new Object[] { " T ", "TST", " T ", 'T', W.ingot(), 'S', BIGMT.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_coilgun, 16, 1), new Object[] { " T ", "TST", " T ", 'T', FERRO.ingot(), 'S', BIGMT.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_coilgun, 16, 2), new Object[] { " T ", "TST", " T ", 'T', RUBBER.ingot(), 'S', ANY_PLASTIC.ingot() }); + + //TODO: somehow add more variance, 4 gauge is still missing + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_22lr, 16), new Object[] { ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_9mm, 16), new Object[] { ModItems.nitra_small, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_5mm, 16), new Object[] { ModItems.nitra_small, ModItems.nitra_small, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_357, 16, Ammo357Magnum.LEAD.ordinal()), new Object[] { ModItems.nitra, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_44, 16), new Object[] { ModItems.nitra, ModItems.nitra_small, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_45, 16), new Object[] { ModItems.nitra, ModItems.nitra_small, ModItems.nitra_small, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_50ae, 16), new Object[] { ModItems.nitra, ModItems.nitra }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_556, 16), new Object[] { ModItems.nitra, ModItems.nitra, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_20gauge, 16), new Object[] { ModItems.nitra, ModItems.nitra, ModItems.nitra_small, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_12gauge, 16), new Object[] { ModItems.nitra, ModItems.nitra, ModItems.nitra }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_762, 16), new Object[] { ModItems.nitra, ModItems.nitra, ModItems.nitra, ModItems.nitra_small }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_50bmg, 16), new Object[] { ModItems.nitra, ModItems.nitra, ModItems.nitra, ModItems.nitra }); //Ammo assemblies CraftingManager.addRecipeAuto(new ItemStack(ModItems.pellet_flechette, 1), new Object[] { " L ", " L ", "LLL", 'L', PB.nugget() }); diff --git a/src/main/java/com/hbm/handler/WeaponAbility.java b/src/main/java/com/hbm/handler/WeaponAbility.java index 919b149a2..11e2621b3 100644 --- a/src/main/java/com/hbm/handler/WeaponAbility.java +++ b/src/main/java/com/hbm/handler/WeaponAbility.java @@ -2,14 +2,12 @@ package com.hbm.handler; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.BlockBobble.BobbleType; -import com.hbm.items.ItemAmmoEnums.*; import com.hbm.items.ModItems; import com.hbm.items.tool.IItemAbility; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import com.hbm.potion.HbmPotion; import com.hbm.util.ContaminationUtil; -import com.hbm.util.WeightedRandomObject; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; @@ -36,7 +34,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; -import net.minecraft.util.WeightedRandom; import net.minecraft.world.World; public abstract class WeaponAbility { @@ -208,28 +205,10 @@ public abstract class WeaponAbility { if(living.getHealth() <= 0.0F) { - WeightedRandomObject[] ammo = new WeightedRandomObject[] { - new WeightedRandomObject(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_12gauge.stackFromEnum(Ammo12Gauge.SHRAPNEL), 5), - new WeightedRandomObject(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.FLECHETTE), 5), - new WeightedRandomObject(ModItems.ammo_20gauge.stackFromEnum(Ammo20Gauge.SLUG), 5), - new WeightedRandomObject(ModItems.ammo_9mm.stackFromEnum(Ammo9mm.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_5mm.stackFromEnum(Ammo5mm.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_556.stackFromEnum(Ammo556mm.STOCK), 10), - new WeightedRandomObject(ModItems.ammo_556.stackFromEnum(Ammo556mm.FLECHETTE), 10), - new WeightedRandomObject(ModItems.ammo_50bmg.stackFromEnum(Ammo50BMG.STOCK), 3), - new WeightedRandomObject(ModItems.ammo_grenade.stackFromEnum(AmmoGrenade.STOCK), 3), - new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.STOCK), 1), - new WeightedRandomObject(ModItems.ammo_rocket.stackFromEnum(AmmoRocket.GLARE), 1), - new WeightedRandomObject(new ItemStack(ModItems.syringe_metal_stimpak), 20), - }; - int count = Math.min((int)Math.ceil(living.getMaxHealth() / divider), 250); //safeguard to prevent funnies from bosses with obscene health for(int i = 0; i < count; i++) { - - living.entityDropItem(((WeightedRandomObject)WeightedRandom.getRandomItem(living.getRNG(), ammo)).asStack(), 1); + living.entityDropItem(new ItemStack(ModItems.nitra_small), 1); world.spawnEntityInWorld(new EntityXPOrb(world, living.posX, living.posY, living.posZ, 1)); } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 4ac445aa0..f195610ed 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -356,7 +356,7 @@ public class OreDictManager { TCALLOY .ingot(ingot_tcalloy) .dust(powder_tcalloy) .block(block_tcalloy); CDALLOY .ingot(ingot_cdalloy) .block(block_cdalloy); PB .nugget(nugget_lead) .ingot(ingot_lead) .dust(powder_lead) .plate(plate_lead) .block(block_lead) .ore(ore_lead, ore_meteor_lead); - BI .nugget(nugget_bismuth) .ingot(ingot_bismuth) .dust(powder_bismuth); + BI .nugget(nugget_bismuth) .billet(billet_bismuth) .ingot(ingot_bismuth) .dust(powder_bismuth); AS .nugget(nugget_arsenic) .ingot(ingot_arsenic); CA .ingot(ingot_calcium) .dust(powder_calcium); CD .ingot(ingot_cadmium) .dust(powder_cadmium) .block(block_cadmium); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 4609fed6d..21b01c816 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -103,6 +103,8 @@ public class ModItems { public static Item ingot_titanium; public static Item ingot_cobalt; public static Item sulfur; + public static Item nitra; + public static Item nitra_small; public static Item coke; public static Item lignite; @@ -2524,6 +2526,8 @@ public class ModItems { ingot_firebrick = new Item().setUnlocalizedName("ingot_firebrick").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_firebrick"); ingot_smore = new ItemFood(10, 20F, false).setUnlocalizedName("ingot_smore").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_smore"); sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sulfur"); + nitra = new Item().setUnlocalizedName("nitra").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nitra"); + nitra_small = new Item().setUnlocalizedName("nitra_small").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nitra_small"); ingot_uranium_fuel = new Item().setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel"); ingot_plutonium_fuel = new Item().setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel"); @@ -5721,6 +5725,8 @@ public class ModItems { GameRegistry.registerItem(briquette, briquette.getUnlocalizedName()); GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName()); GameRegistry.registerItem(niter, niter.getUnlocalizedName()); + GameRegistry.registerItem(nitra, nitra.getUnlocalizedName()); + GameRegistry.registerItem(nitra_small, nitra_small.getUnlocalizedName()); GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName()); GameRegistry.registerItem(powder_coal, powder_coal.getUnlocalizedName()); GameRegistry.registerItem(powder_coal_tiny, powder_coal_tiny.getUnlocalizedName()); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 770d3d540..56baffc69 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2464,6 +2464,8 @@ item.n2_charge.name=Große Sprengladung item.neutrino_lens.name=Neutrinolinse item.neutron_reflector.name=Neutronenreflektor item.niter.name=Salpeter +item.nitra.name=Nitra +item.nitra_small.name=Kleines Stück Nitra item.no9.name=Bergbauhelm item.nossy_hat.name=Fabulöser Hut item.nothing.name=Leer diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 19cb1bd86..deb978aef 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -3214,6 +3214,8 @@ item.night_vision.name=Night Vision Goggles item.night_vision.description.item=Grants you night vision (requires full electric set) item.night_vision.description.in_armor=%s (grants night vision) item.niter.name=Niter +item.nitra.name=Nitra +item.nitra_small.name=Small Pile of Nitra item.no9.name=Mining Helmet item.nossy_hat.name=Fabulous Hat item.nothing.name=Nothing diff --git a/src/main/resources/assets/hbm/textures/gui/gui_inserter.png b/src/main/resources/assets/hbm/textures/gui/gui_inserter.png deleted file mode 100644 index a38ebf127ee093cd1741e9d8a9b936eae297ec68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2245 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 A&;S4c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/pattern.png b/src/main/resources/assets/hbm/textures/items/pattern.png deleted file mode 100644 index 9a263db7ba70834dcabdf1aad2651493a0f05b1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfYT%Pc~mg^g@2i=Vf0#T@;iU z86MSWEZuS5r6ub1jmH-ktXj^H7T08Ee(56r52l2djDn3b^BLWy27Be^%}_Vy-uIgG Z?W7o~2i;bC{s3)d@O1TaS?83{1OVR+Jb(ZI diff --git a/src/main/resources/assets/hbm/textures/items/pattern_drawn.png b/src/main/resources/assets/hbm/textures/items/pattern_drawn.png deleted file mode 100644 index ca8a8505a5f013dd950fa67eb5daf7ddb0bc11e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4cQK=PU2A8&2gae?JbpTDECxlqH*SEiy0Yxx=1x`;lQ_2U)St>8O# z4>gx?W!T1uI=IY`eLZLQCynUrV9P|?Rso;=ueoz`gB4>=1$Q3@I*Gy4)z4*}Q$iB} D=F3T3