From b90741f6403e18c5861e709c2940a0fbc903ad6d Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 25 Mar 2025 15:48:29 +0100 Subject: [PATCH] you've creeked your last flow, pardner --- README.md | 2 +- changelog | 15 +++-------- .../java/com/hbm/crafting/ToolRecipes.java | 13 ---------- .../inventory/recipes/AssemblerRecipes.java | 1 - src/main/java/com/hbm/items/ModItems.java | 13 ++++------ .../weapon/sedna/factory/XFactory75Bolt.java | 24 +++++++++++++++--- .../java/com/hbm/main/CraftingManager.java | 2 +- src/main/java/com/hbm/main/MainRegistry.java | 3 ++- .../java/com/hbm/main/ModEventHandler.java | 4 +-- .../textures/items/assembly_template_alt.png | Bin 242 -> 0 bytes .../assets/hbm/textures/items/ln2_1.png | Bin 142 -> 0 bytes .../assets/hbm/textures/items/ln2_10.png | Bin 334 -> 0 bytes .../assets/hbm/textures/items/ln2_2.png | Bin 152 -> 0 bytes .../assets/hbm/textures/items/ln2_3.png | Bin 239 -> 0 bytes .../assets/hbm/textures/items/ln2_4.png | Bin 237 -> 0 bytes .../assets/hbm/textures/items/ln2_5.png | Bin 259 -> 0 bytes .../assets/hbm/textures/items/ln2_6.png | Bin 356 -> 0 bytes .../assets/hbm/textures/items/ln2_7.png | Bin 404 -> 0 bytes .../assets/hbm/textures/items/ln2_8.png | Bin 409 -> 0 bytes .../assets/hbm/textures/items/ln2_9.png | Bin 399 -> 0 bytes .../hbm/textures/items/magnet_circular.png | Bin 240 -> 0 bytes .../assets/hbm/textures/items/magnet_dee.png | Bin 297 -> 0 bytes .../assets/hbm/textures/items/magnetron.png | Bin 285 -> 0 bytes .../hbm/textures/items/nugget_daffergon.png | Bin 194 -> 0 bytes .../hbm/textures/items/nugget_reiium.png | Bin 180 -> 0 bytes .../hbm/textures/items/nugget_u238m2.png | Bin 206 -> 0 bytes .../hbm/textures/items/nugget_unobtainium.png | Bin 178 -> 0 bytes .../hbm/textures/items/nugget_verticium.png | Bin 176 -> 0 bytes .../hbm/textures/items/nugget_weidanium.png | Bin 189 -> 0 bytes .../hbm/textures/items/pellets_canister.png | Bin 355 -> 0 bytes .../textures/items/pellets_chlorophyte.png | Bin 205 -> 0 bytes .../hbm/textures/items/pellets_claws.png | Bin 216 -> 0 bytes .../hbm/textures/items/pellets_flechette.png | Bin 257 -> 0 bytes .../assets/hbm/textures/items/pill_salt.png | Bin 318 -> 0 bytes .../assets/hbm/textures/items/pill_zinc.png | Bin 317 -> 0 bytes .../assets/hbm/textures/items/pipe_lead.png | Bin 493 -> 253 bytes .../assets/hbm/textures/items/pirfenidone.png | Bin 370 -> 0 bytes .../hbm/textures/items/powder_daffergon.png | Bin 307 -> 0 bytes .../hbm/textures/items/powder_reiium.png | Bin 334 -> 0 bytes .../hbm/textures/items/powder_unobtainium.png | Bin 357 -> 0 bytes .../hbm/textures/items/powder_verticium.png | Bin 340 -> 0 bytes .../hbm/textures/items/powder_weidanium.png | Bin 370 -> 0 bytes .../hbm/textures/items/ring_starmetal_alt.png | Bin 385 -> 0 bytes .../hbm/textures/items/singularity_2.png | Bin 753 -> 0 bytes .../hbm/textures/items/singularity_3.png | Bin 710 -> 0 bytes .../hbm/textures/items/singularity_micro.png | Bin 251 -> 0 bytes .../hbm/textures/items/singularity_spark.png | Bin 808 -> 0 bytes .../textures/items/singularity_special.png | Bin 812 -> 0 bytes 48 files changed, 35 insertions(+), 42 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/assembly_template_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_1.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_10.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_3.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_4.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_5.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_7.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_8.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ln2_9.png delete mode 100644 src/main/resources/assets/hbm/textures/items/magnet_circular.png delete mode 100644 src/main/resources/assets/hbm/textures/items/magnet_dee.png delete mode 100644 src/main/resources/assets/hbm/textures/items/magnetron.png delete mode 100644 src/main/resources/assets/hbm/textures/items/nugget_daffergon.png delete mode 100644 src/main/resources/assets/hbm/textures/items/nugget_reiium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/nugget_u238m2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/nugget_unobtainium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/nugget_verticium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/nugget_weidanium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pellets_canister.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pellets_chlorophyte.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pellets_claws.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pellets_flechette.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pill_salt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pill_zinc.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pirfenidone.png delete mode 100644 src/main/resources/assets/hbm/textures/items/powder_daffergon.png delete mode 100644 src/main/resources/assets/hbm/textures/items/powder_reiium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/powder_unobtainium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/powder_verticium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/powder_weidanium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/ring_starmetal_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/singularity_2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/singularity_3.png delete mode 100644 src/main/resources/assets/hbm/textures/items/singularity_micro.png delete mode 100644 src/main/resources/assets/hbm/textures/items/singularity_spark.png delete mode 100644 src/main/resources/assets/hbm/textures/items/singularity_special.png diff --git a/README.md b/README.md index f86803200..db2e42f5b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ * NTM Reloaded: https://github.com/TheOriginalGolem/Hbm-s-Nuclear-Tech-GIT/releases * NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases -* NTM WarFactory: https://github.com/MisterNorwood/Hbm-s-Nuclear-Tech-GIT/releases +* NTM Community Edition (WarFactory): https://codeberg.org/MrNorwood/Hbm-s-Nuclear-Tech-CE For 1.18, try Martin's remake: https://codeberg.org/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases diff --git a/changelog b/changelog index a9ca40d00..299a12998 100644 --- a/changelog +++ b/changelog @@ -1,12 +1,5 @@ ## Changed -* The toolbox' functionality has been completely changed (thanks gamma) - * Instead of a crappy backpack substitute that doesn't work half the time, the toolbox can quickly swap out the hotbar when used -* Updated StG 77 recipe to use two grips and a proper scope -* Buffed the RPA set -* Tiered damage and durability weapon mods are now craftable -* Duct tape is now cheaper and less ugly - -## Fixed -* Fixed a bunch of singleblocks not accepting fluids (thanks mellow) -* Fixed fluid valves not properly disconnecting -* Fixed a dupe regarding the weapon mod table +* .75 bolts now work as advertised +* Updated lead pipe texture +* Removed recipes from a few ancient melee weapons, as well as the creative tab listing +* Removed flat magnets \ No newline at end of file diff --git a/src/main/java/com/hbm/crafting/ToolRecipes.java b/src/main/java/com/hbm/crafting/ToolRecipes.java index 84c9df2a6..4399f08c3 100644 --- a/src/main/java/com/hbm/crafting/ToolRecipes.java +++ b/src/main/java/com/hbm/crafting/ToolRecipes.java @@ -108,11 +108,6 @@ public class ToolRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.lead_gavel, 1), new Object[] { "PIP", "IGI", "PIP", 'P', ModItems.pellet_buckshot, 'I', PB.ingot(), 'G', ModItems.wood_gavel }); //Misc weapons - CraftingManager.addRecipeAuto(new ItemStack(ModItems.saw, 1), new Object[] { "IIL", "PP ", 'P', STEEL.plate(), 'I', STEEL.ingot(), 'L', Items.leather }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.bat, 1), new Object[] { "P", "P", "S", 'S', STEEL.plate(), 'P', KEY_PLANKS }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.bat_nail, 1), new Object[] { ModItems.bat, STEEL.plate() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.golf_club, 1), new Object[] { "IP", " P", " P", 'P', STEEL.plate(), 'I', STEEL.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.pipe_rusty, 1), new Object[] { "II", " I", " I", 'I', IRON.pipe() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.pipe_lead, 1), new Object[] { "II", " I", " I", 'I', PB.pipe() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ullapool_caber, 1), new Object[] { "ITI", " S ", " S ", 'I', IRON.plate(), 'T', Blocks.tnt, 'S', KEY_STICK }); @@ -197,14 +192,6 @@ public class ToolRecipes { addShovel( SA326.ingot(), ModItems.schrabidium_shovel); addHoe( SA326.ingot(), ModItems.schrabidium_hoe); } else { - /* - CraftingManager.addRecipeAuto(new ItemStack(ModItems.cobalt_decorated_sword, 1), new Object[] { " I ", " I ", "SBS", 'I', CO.ingot(), 'S', ModItems.ingot_meteorite_forged, 'B', ModItems.cobalt_sword }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.cobalt_decorated_pickaxe, 1), new Object[] { "III", " B ", " S ", 'I', CO.ingot(), 'S', ModItems.ingot_meteorite_forged, 'B', ModItems.cobalt_pickaxe }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.cobalt_decorated_axe, 1), new Object[] { "II", "IB", " S", 'I', CO.ingot(), 'S', ModItems.ingot_meteorite_forged, 'B', ModItems.cobalt_axe }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.cobalt_decorated_shovel, 1), new Object[] { "I", "B", "S", 'I', CO.ingot(), 'S', ModItems.ingot_meteorite_forged, 'B', ModItems.cobalt_shovel }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.cobalt_decorated_hoe, 1), new Object[] { "II", " B", " S", 'I', CO.ingot(), 'S', ModItems.ingot_meteorite_forged, 'B', ModItems.cobalt_hoe }); - - */ CraftingManager.addRecipeAuto(new ItemStack(ModItems.starmetal_sword, 1), new Object[] { " I ", " B ", "ISI", 'I', STAR.ingot(), 'S', ModItems.ring_starmetal, 'B', ModItems.cobalt_decorated_sword }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.starmetal_pickaxe, 1), new Object[] { "ISI", " B ", " I ", 'I', STAR.ingot(), 'S', ModItems.ring_starmetal, 'B', ModItems.cobalt_decorated_pickaxe }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.starmetal_axe, 1), new Object[] { "IS", "IB", " I", 'I', STAR.ingot(), 'S', ModItems.ring_starmetal, 'B', ModItems.cobalt_decorated_axe }); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index c1949152a..e4e576ef2 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -74,7 +74,6 @@ public class AssemblerRecipes extends SerializableRecipe { makeRecipe(new ComparableStack(ModItems.asbestos_cloth, 4), new AStack[] {new OreDictStack(ASBESTOS.ingot(), 2), new ComparableStack(Items.string, 6), new ComparableStack(Blocks.wool, 1), },50); makeRecipe(new ComparableStack(ModItems.filter_coal, 1), new AStack[] {new OreDictStack(COAL.dust(), 4), new ComparableStack(Items.string, 2), new ComparableStack(Items.paper, 1), },50); makeRecipe(new ComparableStack(ModItems.centrifuge_element, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 4), new OreDictStack(TI.plate528(), 4), new ComparableStack(ModItems.motor, 1), }, 100); - makeRecipe(new ComparableStack(ModItems.magnet_circular, 1), new AStack[] {new ComparableStack(ModBlocks.fusion_conductor, 5), new OreDictStack(STEEL.ingot(), 4), new OreDictStack(ALLOY.plate(), 6), },150); makeRecipe(new ComparableStack(ModItems.reactor_core, 1), new AStack[] {new OreDictStack(PB.ingot(), 8), new OreDictStack(BE.ingot(), 6), new OreDictStack(STEEL.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(FIBER.ingot(), 2) },100); makeRecipe(new ComparableStack(ModItems.rtg_unit, 1), new AStack[] {new ComparableStack(ModItems.thermo_element, 2), new OreDictStack(CU.plateCast(), 1), new OreDictStack(PB.ingot(), 2), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.CAPACITOR.ordinal()), },100); makeRecipe(new ComparableStack(ModItems.levitation_unit, 1), new AStack[] {new ComparableStack(ModItems.coil_copper, 4), new ComparableStack(ModItems.coil_tungsten, 2), new OreDictStack(TI.plate(), 6), new ComparableStack(ModItems.nugget_schrabidium, 2), },100); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 694b18910..b712e47a4 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -570,7 +570,6 @@ public class ModItems { public static Item coil_magnetized_tungsten; public static Item coil_gold; public static Item coil_gold_torus; - public static Item magnet_circular; public static Item component_limiter; public static Item component_emitter; public static Item chlorine_pinwheel; @@ -2747,7 +2746,6 @@ public class ModItems { coil_magnetized_tungsten = new Item().setUnlocalizedName("coil_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_magnetized_tungsten"); coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold"); coil_gold_torus = new Item().setUnlocalizedName("coil_gold_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold_torus"); - magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_circular"); component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_limiter"); component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_emitter"); chlorine_pinwheel = new ItemInfiniteFluid(Fluids.CHLORINE, 1, 2).setUnlocalizedName("chlorine_pinwheel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":chlorine_pinwheel"); @@ -4940,11 +4938,11 @@ public class ModItems { multitool_joule = new ItemMultitoolPassive().setUnlocalizedName("multitool_joule").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); multitool_decon = new ItemMultitoolPassive().setUnlocalizedName("multitool_decon").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); - saw = new ModSword(MainRegistry.enumToolMaterialSaw).setUnlocalizedName("weapon_saw").setFull3D().setTextureName(RefStrings.MODID + ":saw"); - bat = new ModSword(MainRegistry.enumToolMaterialBat).setUnlocalizedName("weapon_bat").setFull3D().setTextureName(RefStrings.MODID + ":bat"); - bat_nail = new ModSword(MainRegistry.enumToolMaterialBatNail).setUnlocalizedName("weapon_bat_nail").setFull3D().setTextureName(RefStrings.MODID + ":bat_nail"); - golf_club = new ModSword(MainRegistry.enumToolMaterialGolfClub).setUnlocalizedName("weapon_golf_club").setFull3D().setTextureName(RefStrings.MODID + ":golf_club"); - pipe_rusty = new ModSword(MainRegistry.enumToolMaterialPipeRusty).setUnlocalizedName("weapon_pipe_rusty").setFull3D().setTextureName(RefStrings.MODID + ":pipe_rusty"); + saw = new ModSword(MainRegistry.enumToolMaterialSaw).setUnlocalizedName("weapon_saw").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":saw"); + bat = new ModSword(MainRegistry.enumToolMaterialBat).setUnlocalizedName("weapon_bat").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":bat"); + bat_nail = new ModSword(MainRegistry.enumToolMaterialBatNail).setUnlocalizedName("weapon_bat_nail").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":bat_nail"); + golf_club = new ModSword(MainRegistry.enumToolMaterialGolfClub).setUnlocalizedName("weapon_golf_club").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":golf_club"); + pipe_rusty = new ModSword(MainRegistry.enumToolMaterialPipeRusty).setUnlocalizedName("weapon_pipe_rusty").setCreativeTab(null).setFull3D().setTextureName(RefStrings.MODID + ":pipe_rusty"); pipe_lead = new ModSword(MainRegistry.enumToolMaterialPipeLead).setUnlocalizedName("weapon_pipe_lead").setFull3D().setTextureName(RefStrings.MODID + ":pipe_lead"); reer_graar = new ModSword(MainRegistry.tMatTitan).setUnlocalizedName("reer_graar").setFull3D().setTextureName(RefStrings.MODID + ":reer_graar_hd"); stopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("stopsign").setTextureName(RefStrings.MODID + ":stopsign"); @@ -5562,7 +5560,6 @@ public class ModItems { GameRegistry.registerItem(motor_desh, motor_desh.getUnlocalizedName()); GameRegistry.registerItem(motor_bismuth, motor_bismuth.getUnlocalizedName()); GameRegistry.registerItem(centrifuge_element, centrifuge_element.getUnlocalizedName()); - GameRegistry.registerItem(magnet_circular, magnet_circular.getUnlocalizedName()); GameRegistry.registerItem(reactor_core, reactor_core.getUnlocalizedName()); GameRegistry.registerItem(rtg_unit, rtg_unit.getUnlocalizedName()); GameRegistry.registerItem(levitation_unit, levitation_unit.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java index 92d47c361..1638a2794 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java @@ -3,6 +3,8 @@ package com.hbm.items.weapon.sedna.factory; import java.util.function.BiConsumer; import java.util.function.BiFunction; +import com.hbm.entity.projectile.EntityBulletBaseMK4; +import com.hbm.extprop.HbmLivingProps; import com.hbm.items.ModItems; import com.hbm.items.weapon.sedna.BulletConfig; import com.hbm.items.weapon.sedna.Crosshair; @@ -19,7 +21,9 @@ import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; import com.hbm.render.anim.HbmAnimations.AnimType; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; public class XFactory75Bolt { @@ -27,15 +31,29 @@ public class XFactory75Bolt { public static BulletConfig b75_inc; public static BulletConfig b75_exp; + public static BiConsumer LAMBDA_TINY_EXPLODE = (bullet, mop) -> { + if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; + Lego.tinyExplode(bullet, mop, 2F); bullet.setDead(); + }; + public static BiConsumer LAMBDA_INC = (bullet, mop) -> { + if(mop.entityHit != null && mop.entityHit instanceof EntityLivingBase) { + HbmLivingProps data = HbmLivingProps.getData((EntityLivingBase) mop.entityHit); + if(data.phosphorus < 300) data.phosphorus = 300; + } + }; + public static BiConsumer LAMBDA_STANDARD_EXPLODE = (bullet, mop) -> { + Lego.standardExplode(bullet, mop, 5F); bullet.setDead(); + }; + public static void init() { SpentCasing casing75 = new SpentCasing(CasingType.STRAIGHT).setColor(SpentCasing.COLOR_CASE_BRASS).setScale(2F, 2F, 1.5F); b75 = new BulletConfig().setItem(EnumAmmo.B75) - .setCasing(casing75.clone().register("b75")); + .setCasing(casing75.clone().register("b75")).setOnImpact(LAMBDA_TINY_EXPLODE); b75_inc = new BulletConfig().setItem(EnumAmmo.B75_INC).setDamage(0.8F).setArmorPiercing(0.1F) - .setCasing(casing75.clone().register("b75inc")); + .setCasing(casing75.clone().register("b75inc")).setOnImpact(LAMBDA_INC); b75_exp = new BulletConfig().setItem(EnumAmmo.B75_EXP).setDamage(1.5F).setArmorPiercing(-0.25F) - .setCasing(casing75.clone().register("b75exp")); + .setCasing(casing75.clone().register("b75exp")).setOnImpact(LAMBDA_STANDARD_EXPLODE); ModItems.gun_bolter = new ItemGunBaseNT(WeaponQuality.SPECIAL, new GunConfig() .dura(3_000).draw(20).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index ff321331f..452d1cbe7 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -740,7 +740,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.dfc_emitter, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModBlocks.machine_transformer_dnt, 'X', ModItems.crystal_xen, 'L', ModItems.sat_head_laser }); addRecipeAuto(new ItemStack(ModBlocks.dfc_receiver, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModBlocks.machine_transformer_dnt, 'X', ModBlocks.block_dineutronium, 'L', STEEL.shell() }); addRecipeAuto(new ItemStack(ModBlocks.dfc_injector, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', CMB.plate(), 'T', ModBlocks.machine_fluidtank, 'X', ModItems.motor, 'L', ModItems.pipes_steel }); - addRecipeAuto(new ItemStack(ModBlocks.dfc_stabilizer, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModItems.singularity_spark, 'X', ModItems.magnet_circular, 'L', ModItems.crystal_xen }); + addRecipeAuto(new ItemStack(ModBlocks.dfc_stabilizer, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModItems.singularity_spark, 'X', ModBlocks.fusion_conductor, 'L', ModItems.crystal_xen }); addRecipeAuto(new ItemStack(ModBlocks.barrel_plastic, 1), new Object[] { "IPI", "I I", "IPI", 'I', ModItems.plate_polymer, 'P', AL.plate() }); addRecipeAuto(new ItemStack(ModBlocks.barrel_iron, 1), new Object[] { "IPI", "I I", "IPI", 'I', IRON.plate(), 'P', IRON.ingot() }); addShapelessAuto(new ItemStack(ModBlocks.barrel_iron, 1), new Object[] { ModBlocks.barrel_corroded, ANY_TAR.any() }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index dd4323118..8f7f53640 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -131,7 +131,7 @@ public class MainRegistry { public static ToolMaterial enumToolMaterialBatNail = EnumHelper.addToolMaterial("BATNAIL", 0, 450, 1.0F, 4F, 25); public static ToolMaterial enumToolMaterialGolfClub = EnumHelper.addToolMaterial("GOLFCLUB", 1, 1000, 2.0F, 5F, 25); public static ToolMaterial enumToolMaterialPipeRusty = EnumHelper.addToolMaterial("PIPERUSTY", 1, 350, 1.5F, 4.5F, 25); - public static ToolMaterial enumToolMaterialPipeLead = EnumHelper.addToolMaterial("PIPELEAD", 1, 250, 1.5F, 5.5F, 25); + public static ToolMaterial enumToolMaterialPipeLead = EnumHelper.addToolMaterial("PIPELEAD", 1, 250, 1.5F, 3F, 25); public static ToolMaterial enumToolMaterialBottleOpener = EnumHelper.addToolMaterial("OPENER", 1, 250, 1.5F, 0.5F, 200); public static ToolMaterial enumToolMaterialSledge = EnumHelper.addToolMaterial("SHIMMERSLEDGE", 1, 0, 25.0F, 26F, 200); @@ -1665,6 +1665,7 @@ public class MainRegistry { ignoreMappings.add("hbm:item.bobmazon_weapons"); ignoreMappings.add("hbm:item.bobmazon_tools"); ignoreMappings.add("hbm:item.missile_carrier"); + ignoreMappings.add("hbm:item.magnet_circular"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index bdba621ca..7415566d7 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -370,12 +370,10 @@ public class ModEventHandler { if(rand.nextInt(1024) == 0) entity.setCurrentItemOrArmor(3, new ItemStack(ModItems.starmetal_plate, 1, world.rand.nextInt(ModItems.starmetal_plate.getMaxDamage()))); - if(rand.nextInt(128) == 0) + if(rand.nextInt(64) == 0) entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.pipe_lead, 1, world.rand.nextInt(100))); if(rand.nextInt(128) == 0) entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.reer_graar, 1, world.rand.nextInt(100))); - if(rand.nextInt(128) == 0) - entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.pipe_rusty, 1, world.rand.nextInt(100))); if(rand.nextInt(128) == 0) entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.crowbar, 1, world.rand.nextInt(100))); if(rand.nextInt(128) == 0) diff --git a/src/main/resources/assets/hbm/textures/items/assembly_template_alt.png b/src/main/resources/assets/hbm/textures/items/assembly_template_alt.png deleted file mode 100644 index 2537c2fc2885f9092bd2e8d68a5f0d66fa893c8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfGj!TGg@ZmyD<~zM5D=bx^uRg210Oy=XW!9go`25RXT}7tIovmHvPxK4J3nMo zQx88F+n~eF++)C2C6REMq1dr%m+IkPUj_DRuXy}HQDFfwHe?nP=04c3&e>1qC&JB%rpoV@EN} z%zX6um3XX@=)HGF>L&zdYMsp8&U^r{xgu9}4b38ken zoHY{Kj%!0Sqv{uW6S{@bQXkRwI6uhs?4^iTcgg|98g0k9axUEutO;2k;E2{UF)0Ew zB5_|SSM^^4SBYlL#lXr05KJXvWy+FTCc=^{t24k$e?)jZ%SWvms5*jY_GeLMjH+?& g@726JcKmO=0DGgwlsH_e_W%F@07*qoM6N<$g4FMgeE7con`1dntil;tu9}{fgZ(szo%8q x+iX0~IfP~PXU-z#`?*_AKDanv!Sh!u`#Y`JnYIN6vw%i3c)I$ztaD0e0svLKGBW@G diff --git a/src/main/resources/assets/hbm/textures/items/ln2_3.png b/src/main/resources/assets/hbm/textures/items/ln2_3.png deleted file mode 100644 index 55b04d07a2aa3835dfc30baba775a76f0814b7da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@|StKIEF;D zzMXQH^RNL=%X_cmncH64E&QD#&AY_rh}NMUs$HGTYxk+&PPqH>INKx@&wsMtV!}de z*_C!DwYKj45s+0FEpJ-d-xa-bX~)DRJ3eb{SDwz0ptQ5bK(cf5?X9W#GxZtbRGx3D zXR1h8-BA|uWObv}?wfCqo^?`r_fBj>0#i_@f1a3MwPM|)rHLsoE`L$0scxH*@t67V kk!Ux)-=dRMJnNc74;)!MIftn(0_b7}Pgg&ebxsLQ01xnAw*UYD diff --git a/src/main/resources/assets/hbm/textures/items/ln2_4.png b/src/main/resources/assets/hbm/textures/items/ln2_4.png deleted file mode 100644 index f33742080de98f3b085e168ce3fe70dcaee78e99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@|SqJIEF;D zzMT@u#casq?4J7WE%#S5%L%`pDm6LVc5^e=*_VmwsPf(1wk&g&y3-^%Q~O}<^rMUk z^L~p>-5UQU{78F`=cUEZ-LsY-we54&abAD(Xinmz6V(-|M;RUbGbim&eLo>A#ditM ziiUNO3MH#6LarSzQ|_H9P&8HX*@9DU`?8F`;6(?;LCNQ%dTeG2FcG?o%n21WBN6qFBm*s{an^L HB{Ts5$@p(b diff --git a/src/main/resources/assets/hbm/textures/items/ln2_6.png b/src/main/resources/assets/hbm/textures/items/ln2_6.png deleted file mode 100644 index 41256391aa8737005a5b0422e8c5e1b904fa5706..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 356 zcmV-q0h|7bP)Au?`$7b zWMN@p0A^-U9KmgbnAcQQM@4iAh=^ab=D1XVC-q95xB$^hL{wF!#+k7k$UQnCM@O-K zZ|E;_ud0|?QdJ~<*7&FqpKnM~b95t`DGJDR%^mR^EslGOT;!v^K=P!jPQ25#kcdqt zsz>0=bNz`NI}jDoyDJU}*lLP?@$3}LbkE;T0~48jyE{6PFKd5GOhkyr zyPO!wqp`rq=Uv|`f}izb=zwrC{@=gk++SGuJG=q&4+|0jA_&6(0000aPa$F$$d70KjwD7=d?z>puTHdy{TU7c@ZO^UTJUT%GrPO{ zU2GnmME6bwpbi-LNIwnEdUayfvo$Ywhi+8IVXs2H&W`{;wIPE8z-DF(00vnAtYm*t zFbfslW*St$5_=(m4dbixoD!jZhH%Au469r?Bv651LsUx zs9Lh4eVYDkbNBdESG9{w2cf}aK;1Pw;`{J_;9>Ee!vI+dn`_AZdwx&T yuHfvn0?Fnt2|&TF1fI@~=2!KwXZ^nA|H?OYWK-e&$75>%0000L|u+%e;k}(dRH+ahOD8JV`cVg*uCgL5sYs@;A^b}F%V039M?&n9I1}JV z1H+0r5b#HAHZHYafwdDV#1S}GUk1-MsxY&Ef!ljoe2%pyViGRa&TMeu8_zQyY5s8)NUyRqBosW!s^Xu)n+H;Z$D=*d%2LQmBExG00000NkvXXu0mjf Dh5@c( diff --git a/src/main/resources/assets/hbm/textures/items/ln2_9.png b/src/main/resources/assets/hbm/textures/items/ln2_9.png deleted file mode 100644 index 8cc282346a66fd756aea1635e1686bced0f8861f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmV;A0dW3_P)Qz56-qrur^s_& z>O$>X4aek2hI1Cq0rB49J)rKey5EUyU)x}>K-!s1`FQXG8e#oPtrdx0`}o}Vx4kbm zI^PST3620$j^w$<`>vc_Qq_c9XBOee+22PZScr?58<8{6C1&MnWFj?Z@eJgXUqf`j zjgyV$MDQ7GL>z}Rp(1j`E(o=sI9)@G!bOwL_;(EFLs7P%>d2AI&X+{sntN{TEs1bh tP|jVp9Hwf;4wpW;pF*X3In5XT8gFx!OKPCk<@Nvo002ovPDHLkV1oXuwHE*Y diff --git a/src/main/resources/assets/hbm/textures/items/magnet_circular.png b/src/main/resources/assets/hbm/textures/items/magnet_circular.png deleted file mode 100644 index 4d8f16620943fd79007d7beed92102b5068f5171..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf%V`&(a`VP&)O*}{Uyw^gTA8!NEzUs|)&>P&;g-5*yNYx|h~yf&XU lA&mWO`x1w(SAy@w`&XW`ZalffaTU>WdCX-I&L!%B?78Ce3`^*I!8~%w>^Eqe>y~zODtVxojt-pGUs+iDC%2`F-x} zN#^Iy={R28;q7GkDXlH*8lq`E)sja{nWMg)|s|D-nMQl^$s@q sr1V)`TddAW{YuUDQ~4~#y!OY1FDNJK7&Bjb2lOk0r>mdKI;Vst095I6@c;k- diff --git a/src/main/resources/assets/hbm/textures/items/magnetron.png b/src/main/resources/assets/hbm/textures/items/magnetron.png deleted file mode 100644 index 5f160f01faca065e5344ed7936ab98c56af10da0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmV+&0pk9NP)%025b$YuYdnZLD8e;&cstSOd(g2 zqYePnK~cI$HV4}Qr)*5rldl11@f%f05fT>#{3QB8`a6lg jq;S?j=tQxU#MSr!YOziF3AE0q00000NkvXXu0mjf$-Zx2G+gFpZ3kp92^>i_@qwawnz^Ebb&kI9-@;JIS;YU4Y5 zDknDr!NF+r8eJmqnB6D`gZ%y`IsICD+b$6XK3t+uYn oRnK5J>M-jdYd%j869)r>#t-EqJ39Z00Ug2M>FVdQ&MBb@0H-NQ1poj5 diff --git a/src/main/resources/assets/hbm/textures/items/nugget_reiium.png b/src/main/resources/assets/hbm/textures/items/nugget_reiium.png deleted file mode 100644 index b6b8a5d3f6e93fd75867adebbaedbc3b5bd6c538..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfZoDj$~z zYqCB|F7`OLsmaIp#`Hj8CypsW3^N#YU3fEg@|@jskSQdAo$qLNUclU!c?a?*eQrE= anDMjGVW$<+Mb6Mw<&;$VRi#>+` diff --git a/src/main/resources/assets/hbm/textures/items/nugget_u238m2.png b/src/main/resources/assets/hbm/textures/items/nugget_u238m2.png deleted file mode 100644 index 95a04822b70e8c3ba0912c5b521897fc7f9ae5f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfPpz diff --git a/src/main/resources/assets/hbm/textures/items/nugget_verticium.png b/src/main/resources/assets/hbm/textures/items/nugget_verticium.png deleted file mode 100644 index c8f9333ecf122b81b6cb8cf7589c3bc3e5a66691..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VffA9KI~^E*L54l8stHa_HIWRkbziSPG&y!TAggtb-yR8=KqSpqOk6XQ6l)e2f` zX_|)P@fdf0wK|TY+U<5^Sr&&Qz!)QK+s4$(vSe8n9*+kpf!A-14pONLJu9FBz zrGC5JR#sC2->U06d6H9a&N&%|VYBDQdMEII^##Lqw1P2Kr2PN@002ovPDHLkV1g|a BkPH9- diff --git a/src/main/resources/assets/hbm/textures/items/pellets_chlorophyte.png b/src/main/resources/assets/hbm/textures/items/pellets_chlorophyte.png deleted file mode 100644 index 6a5489d550e3d40259eafa8e0c9b9641f2febcce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfo9{|a$yJqf`MSe^C($Xq=j<}?>3W89ZdJ5y@SWU$ z?XUk_xexMp)dFqxcnl>H6pt;tK7F6zqwVuJW^1tRIMkk?bHL|L zr6L`M_a5z?V{5Rv>qJ|}gT3r&*HoLsQhcZJ=*;Y35WLQ#W4V+i*2kISSK6A{Q5R1v zd7t1h^X)T}8G8@pn7`vq-8TDfP?Wk0i{*3gMIAi$Q#W(^PnrLkLH2yG*{MmtUjm)R N;OXk;vd$@?2>>YQQV;+D diff --git a/src/main/resources/assets/hbm/textures/items/pellets_flechette.png b/src/main/resources/assets/hbm/textures/items/pellets_flechette.png deleted file mode 100644 index b0711e2acdc103bd7203ab69ac5eadf063c8777f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf%@;Yz4eLTHR z+MJKbW-K_@wSv90*7w$jfZN*?mwk0^k*nD7zIsZ~a+>8l`IoHhlk-p5?Q@+2^aF#ZtDnm{r-UW| DXToJ~ diff --git a/src/main/resources/assets/hbm/textures/items/pill_salt.png b/src/main/resources/assets/hbm/textures/items/pill_salt.png deleted file mode 100644 index decab9dbabcbd05bd6caa31ff1f7d6baf33a9982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfQna3Xpsxs8o_$e^#7lq(;I=nG3=gzv#qch^S%Amtk*d%|M~Pa zevRJIm#xO>=l(o@`s=`lpR*a5^{=zDmFkMG$%-tHoKXMY;IO}<92=V=A6wgV`vT3w z?^s`7{rkV3>!Sioi-m;Gw{!pceRac_Js2Z+XDnaat+*{DNN_b{#Nh{@%^BxNbugu$ zoAY!1k|kf_Jw0FkKbu|sPg_&-uYK_|o@)jNq)e}^{{7!SWJ~Mk%AIxwF82G+7aX$` zb+$d1app&b+#!KS2?;+sZ*LVj&U9`HM}Ilc5kSyp+_ur;Y7h%U(k>sZRN=QQzyM(I MboFyt=akR{0Qc*Id;kCd diff --git a/src/main/resources/assets/hbm/textures/items/pill_zinc.png b/src/main/resources/assets/hbm/textures/items/pill_zinc.png deleted file mode 100644 index d93286d7369107218e4737d7e5388319bdca0aee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmV-D0mA-?P)sDuKY2E+z=UU15kIkRp&$MSk@D!-YQJs(=js z0woG00v!TF%%!pj@gCS{yV;u=W^Wf3)=li8e}4;qaentGa>eF<@!@a;peUct__vb5 z_g6m)PvVcyqnI>0f^#lp>A*Ox$kKt$!>h;@69BYrOV=kTrRe%3Mw1P!wV^D_85?70 znkGoxXo5>iGRT6Js9aH&1 z?$>cfUe_l-x0g>obdEP?t?kr~1f}y)(tU;NSiH0@-YU3W`r@~oWxCF3XGUJZZ+}+? zMP1#NtFct3b|V9W(~KX|c|u1lK0p6DC9LoZv)plOYx6Dt5Bxv8{4hu2qdA*160Ryv zOwZO`QV{Ag&v`~fcCoH;!23U{j34g(oc3G4SS3A}vIur=0!p5nL&SIF1nnTdN4C z0yy}7zXt#$Nn#c8=~4gylx5lezTIxt^G+SO-+xwBRUyxF000qLU0Askz;FRdDN)xo zhzRHN8IOnR#PcG+6jBrghzL#7;Cj7wL^$sP6TXt&Zimfg(|g9N0F$O^-Y-CiNJ}Y4 z&v-4uq9_3TwPWA?1D+W0Y|VOsZBNr&XW3!4?Ix3z`^tRM1D3Yh7}g@>g5wuV*R3}CAk+4- zmAZsp2l&f|*Q#x$I)y7;h)5rgUyFv!6rM7gv(K0EbOlPOcCHf<;yCsdx22O=5Nvgl jBmmyLT>gvjdG98_^4%dg9A>>700000NkvXXu0mjfad^*1 diff --git a/src/main/resources/assets/hbm/textures/items/pirfenidone.png b/src/main/resources/assets/hbm/textures/items/pirfenidone.png deleted file mode 100644 index 9ab831d0fa157620e453dae0fdf33b446617c26d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmV-&0ge8NP)y3>J$b zHZ2NbQPUNX!(`E*VvvJHVP%GGw;L>;$#c8=jveSrf8O`rk diff --git a/src/main/resources/assets/hbm/textures/items/powder_daffergon.png b/src/main/resources/assets/hbm/textures/items/powder_daffergon.png deleted file mode 100644 index f9afea21267cede7f7bf8f774884ee4c79ee2bc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmV-30nGl1P)`{<0mbvvRC6oK&-e4L;s2wc@&%RuHTl+ff2s$cQ_hNr&&cQI%s7tpeg8Ap zoH9B$t2duh`mH$3rdXt0*ZVb><^q6r8Yv|V-&kQ9xoumNQb;Lr&aq@kstXFLSk|c? zo>th3gHIK@2;|*rN7r>6>my33n8Z1UF$Owj3(dkIsA{1x#zb<64{(3KW3g=5V6i;7 zW*IM-#?wMaB7nulcMq;vOpsIhaFG(5lKuqA-}rL)f)BOvjp*HFB2@qY002ovPDHLk FV1io;f(rlu diff --git a/src/main/resources/assets/hbm/textures/items/powder_reiium.png b/src/main/resources/assets/hbm/textures/items/powder_reiium.png deleted file mode 100644 index 52bd800c86f3dc9be333bb584ad5ab0132828e22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@Uf?hV~BRKj6_QU96e`q z&R}s{=os1D*Y(>Xr$E1Npzg-kR>iruU&uQd z_+Fkd^H=%PkewRhr@UUAJGbGdsKLP-PLEkCmd(AjU~d1pqwD6d%-wq|EbH^jj(_3L zGNM&kM2c%3EVR*{elpG_WGa`yPuW1827!i-1_?823POz_<6i c!BHE=?wtwWmoqwC1A3Ri)78&qol`;+0E?l7XaE2J diff --git a/src/main/resources/assets/hbm/textures/items/powder_unobtainium.png b/src/main/resources/assets/hbm/textures/items/powder_unobtainium.png deleted file mode 100644 index 2f26e8148d0adcae710df6090f7e109f8c2690b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@Rz5HV~BK54l7Lj({M}bRTop| zQ&x{(oELWdV>tYQRfVs0Nv*4{mdeZ6_Qz2(G!LIkx#XQc`K(`d2gm+|gyQ@^`x_0p zCv7+`@W?Toq1fph|INAl!FsLbR-!Mi{NWK{E!cfCt7CzquI0y*(`^mnK3T8Ze=z%k z&sn|$YK)6GI+9hBjW%wtY0=)}b?@yfH77l9y&fmgb3CSJW-YxrbGjVoW8Lewc|%#X zY-5?12kXW!vr;vx-1^8gZEc&`{32!FZ=y}g=AR@(S#9(V7+m!!F+I5d!CQ^9EKVXE zH=RyQ+S)iF=Ar2Owyk#qm4CGue|miSy<-Ivt2*<8uHt1Cz))cDboFyt=akR{0L)m5 Ai~s-t diff --git a/src/main/resources/assets/hbm/textures/items/powder_verticium.png b/src/main/resources/assets/hbm/textures/items/powder_verticium.png deleted file mode 100644 index 5346e7b44cf51411d81056fe683d58b6af388e48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@TI4VV~BJ%js2HjH>~<9nIZL{@^icD648}jTUXQ+ROg)5+co=0QH=3T@vQsm zo5gNT^S4g0xpvg!X8_;Ut(is_0yI;{ttG6Dj ztX%LhxbIq+o}!BT?<3xof#+hTte){E{>7ISM|Ea+7~E_=*|Uvd@*zj*mj}Gc9|_o} kN~C-{ASZUOd}fn5-xPx#a(aFNKu$~Gyg!zvzM29Bq|wi_A4BA zU|1r^;xH?LVTq(mGcQAC6Q=_67ly;j*yK8vBtmdKI;Vst0GKa~WdHyG diff --git a/src/main/resources/assets/hbm/textures/items/ring_starmetal_alt.png b/src/main/resources/assets/hbm/textures/items/ring_starmetal_alt.png deleted file mode 100644 index ebdca2cc5a4b17b7fd2de5b55acedb35875b5303..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmV-{0e=38P)PJG2rKJRXNYqMKCi!(baMPqEjaXZxx!2N-4`Y z91dTCtTCSFp_D>vO;HqRtpRXd7p*n-`<=~ZV}WZxo*xas`Fv)zT9KxyWo)%t1VO;{ zdL@qMrb$je_14_aqw1JpI5va901+Vw0!E{eWmHPBUay(W zW{3!vOJOfD%cf4h|6z8!9k<&J5y5p`fTy!o%@zP)yWO%_Eb6AFs#TOrCyyV|SagFvd~l!MzSU3rdwb}WwpM!H>7H6AoJHo@U=z~`%j$Kye{JyM`D_kGEQ-|r zK9>%;Tn>rdT^Ml#idhl&zjt;;4R31V-I+aSWIppT+4vhMOT~=d|zj@11k%Jl6dAAV4m(QP=_A;ziD{l7oL1$#Heq9xl zxs8sFf-EjBVq|0lhGDP(pUh;eFKO|g8QNyfA;n;J|4t!ILzS_x7!V_ zAQFj$m{1~%zeXk}ZS(8&Mc^r&nw+G=L-)iT7qXNW2m}NV;3WDPG(iYszQj0h#9!Pg jFAu4xs1R$424}VZp3@^l2(pY@00000NkvXXu0mjfwPR1= diff --git a/src/main/resources/assets/hbm/textures/items/singularity_3.png b/src/main/resources/assets/hbm/textures/items/singularity_3.png deleted file mode 100644 index a171074f161d5b16318997a435ff341d0a15d120..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmV;%0y+JOP)~s;4TDe?CBocu!27bR^UE9rZ99Wj6{_*kgtvJsnP%f9l($W$P-`cA+ zq~Jr1W0z4!mCbcsk^ryQYX$}ewg_1AQ>)dG&1PXU=qWVe8TR8W!stT)A%5b45nwpH z^IIwu3aC^n|4W#jo@N&)2_JpJVWPz%y+)GGpoxO8h_jHFA>!~-3#Z{yD3M5@SS$kd zdL8L>nh6`~#V*RAjsCQrpzCO*4i4a~3Lv@m@p;IE`Q9fW$mjFG{QSHUiNPVJOhX9M zY0lgQKLt3u+1AJlT|M;u_8q#9IC+dk-QC@=CMPF_K3DD2dcR=}@3Df7WEZN(crkuBrP|i~O2%6~$5_Ao_m6?Egs?{pL zBK+W?9fBVRnaMhzSJ~E>K{IS5`ToJ+MbzDOJbgEdkNB&|w&+5dA(Ln!n?|umX_w*Z zzRWuh5EJQRIR5IPmh$ub4aC2^)S5&Oo=_;HGhJb^yg>yMh+&E$`VmAYXFd?yi}rd1WBUClPwwm-Ek2*3bNz#= z0eKsZMpgbOl}ZQ(g9@P55Y1I?)LhR9eYkX!?soK%!+~ftPArqjXz7q9>O7gAZQJUU s|5l^>Vzx1~`5}n~0s&Q_0_=4C1Ji&Sa=E*xqW}N^07*qoM6N<$f}tNw*8l(j diff --git a/src/main/resources/assets/hbm/textures/items/singularity_micro.png b/src/main/resources/assets/hbm/textures/items/singularity_micro.png deleted file mode 100644 index b1c9e4765801d45113ac3da6b82715a6e78229be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf88|oII#-=Ir4OIX8{gWX;^b>E`PCcYo<$v%_n-w@aLp zu{`zR$NBoUDP6Dr-?*|VLAd7kSMI|*tDj5U+gE$~01y;Bf0M~}jz53nE|JyT|LXrA zJfNn)@%;a<5Azx)PG(-s7!j+Go^t9#tiz0l*W17I>^ZZCXVs@wJcsVsMDQMv>fAh12a*DRC>|XXT#F|Tkg+Wx++%Mk0Vgu0i44$rjF6*2UngE2OY`_2j diff --git a/src/main/resources/assets/hbm/textures/items/singularity_spark.png b/src/main/resources/assets/hbm/textures/items/singularity_spark.png deleted file mode 100644 index c2e97f9a6b41311d4b3165fa79abee2aee87f329..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmV+@1K0eCP)gnKHAro(hq0>MJWOXp;Zb&u(&WL>W&3& zj2joaAz{aw1QzW03r1HY>VoJBS>Vd3QKF==0g4o~7KM_&7U{=(?YquhRI;6Q9-WaNZ^U=Et5VQy}YF9f>ky^h;~QFufjewTN# zUPz!`@*v`kqFFfuUDIiKc^QR5;lG5%#YH#-CtY?7(jD&@-Krm@Ryjn+G6WL2jI+*j z)ZZ{fUYn1&6bgkxNTpI>wOS25Jw2#w8#LB=4~}{#s2JrCaIAS-hS@d!R6>9bXpW~}oOuoccY2#Qk6Cg1e zI%(+b?Pa227+6_ZndUUn73@YslONIkeguO-T%F0H@2zB`IiY4WZ4`0WGIvUHxjwF@rzpjHv6n zS;%R|sTGYQq&G7d>KjI#%LSWkZiXjN_){$yy8&m(oT zf$_%=Ffe`zPoF)(x3v^zzr-LYpTHft;ulKD7 z&CShPQY|joU&^t-0z*GmI5+u|y-)qjNV97~dc7WfeSQB6#9}cxolZ!CnTLz-FgPpo z$;V}ucSKm%9pu#46^{8L%*{NfbO@}kuSYl>{wLt|dKGbz4(mNWdl};Nbd;N~e`Z?C z6wMtI%&2PS&|rv@fnT&+PEZ+z4u=EddjDm6cHE+LaPuMt&P@1;zCFhABtloSzD^ zslm;YXU_7Ge}o46PC6~EbR~Nl79^Z?LIro}Td~dM0A*8j(3Oo8b3}RXS4Zl(*