From 57db8cc9ab5552a7a0d398802edd15f2d6bfe68a Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 18 Feb 2026 15:30:55 +0100 Subject: [PATCH] unused asset extermination --- changelog | 5 ++- src/main/java/com/hbm/blocks/ModBlocks.java | 10 ++--- .../com/hbm/blocks/bomb/BlockCrashedBomb.java | 23 ++++++---- .../blocks/generic/BlockForgottenLock.java | 42 ++++++++++++++++++ .../blocks/machine/MachineTransformer.java | 6 +-- src/main/java/com/hbm/config/MobConfig.java | 2 +- .../com/hbm/itempool/ItemPoolsComponent.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 21 +-------- .../java/com/hbm/main/CraftingManager.java | 6 +-- src/main/java/com/hbm/main/MainRegistry.java | 6 +++ .../com/hbm/main/ModEventHandlerRenderer.java | 2 +- .../blocks/battery_lithium_top_alt.png | Bin 458 -> 0 bytes .../blocks/brick_forgotten_hole_empty.png | Bin 0 -> 423 bytes .../textures/blocks/brick_forgotten_sign.png | Bin 0 -> 425 bytes .../textures/blocks/machine_transformer.png | Bin 498 -> 0 bytes .../blocks/machine_transformer_top.png | Bin 591 -> 0 bytes .../hbm/textures/blocks/mine_ap_alt.png | Bin 276 -> 0 bytes .../assets/hbm/textures/blocks/toaster.png | Bin 201 -> 0 bytes .../assets/hbm/textures/items/UCChip.png | Bin 280 -> 0 bytes .../hbm/textures/items/armor_battery_base.png | Bin 367 -> 0 bytes .../assets/hbm/textures/items/clip_bf.png | Bin 212 -> 0 bytes .../hbm/textures/items/clip_bolt_action.png | Bin 360 -> 0 bytes .../hbm/textures/items/clip_cryolator.png | Bin 268 -> 0 bytes .../hbm/textures/items/clip_defabricator.png | Bin 255 -> 0 bytes .../assets/hbm/textures/items/clip_emp.png | Bin 175 -> 0 bytes .../hbm/textures/items/clip_euthanasia.png | Bin 257 -> 0 bytes .../assets/hbm/textures/items/clip_fatman.png | Bin 278 -> 0 bytes .../assets/hbm/textures/items/clip_hp.png | Bin 216 -> 0 bytes .../hbm/textures/items/clip_immolator.png | Bin 281 -> 0 bytes .../assets/hbm/textures/items/clip_jack.png | Bin 372 -> 0 bytes .../hbm/textures/items/clip_lever_action.png | Bin 340 -> 0 bytes .../assets/hbm/textures/items/clip_mirv.png | Bin 259 -> 0 bytes .../assets/hbm/textures/items/clip_mp.png | Bin 278 -> 0 bytes .../assets/hbm/textures/items/clip_mp40.png | Bin 164 -> 0 bytes .../assets/hbm/textures/items/clip_osipr.png | Bin 308 -> 0 bytes .../hbm/textures/items/clip_revolver.png | Bin 314 -> 0 bytes .../textures/items/clip_revolver_cursed.png | Bin 272 -> 0 bytes .../hbm/textures/items/clip_revolver_gold.png | Bin 258 -> 0 bytes .../hbm/textures/items/clip_revolver_iron.png | Bin 306 -> 0 bytes .../hbm/textures/items/clip_revolver_lead.png | Bin 334 -> 0 bytes .../items/clip_revolver_nightmare.png | Bin 263 -> 0 bytes .../items/clip_revolver_nightmare2.png | Bin 246 -> 0 bytes .../textures/items/clip_revolver_nopip.png | Bin 267 -> 0 bytes .../hbm/textures/items/clip_revolver_pip.png | Bin 348 -> 0 bytes .../items/clip_revolver_schrabidium.png | Bin 306 -> 0 bytes .../assets/hbm/textures/items/clip_rpg.png | Bin 312 -> 0 bytes .../hbm/textures/items/clip_rpg_alt.png | Bin 308 -> 0 bytes .../assets/hbm/textures/items/clip_spark.png | Bin 321 -> 0 bytes .../hbm/textures/items/clip_stinger.png | Bin 196 -> 0 bytes .../hbm/textures/items/clip_uboinik.png | Bin 388 -> 0 bytes .../assets/hbm/textures/items/clip_uzi.png | Bin 153 -> 0 bytes .../hbm/textures/items/clip_xvl1456.png | Bin 327 -> 0 bytes .../hbm/textures/items/coil_copper_alt.png | Bin 375 -> 373 bytes .../assets/hbm/textures/items/letter.png | Bin 274 -> 0 bytes .../hbm/textures/items/levitation_unit.png | Bin 345 -> 0 bytes .../assets/hbm/textures/items/limiter.png | Bin 300 -> 0 bytes .../assets/hbm/textures/items/mechanism_1.png | Bin 281 -> 0 bytes .../assets/hbm/textures/items/mechanism_2.png | Bin 296 -> 0 bytes .../assets/hbm/textures/items/mechanism_3.png | Bin 316 -> 0 bytes .../assets/hbm/textures/items/mechanism_4.png | Bin 296 -> 0 bytes .../assets/hbm/textures/items/mechanism_5.png | Bin 261 -> 0 bytes .../assets/hbm/textures/items/mechanism_6.png | Bin 290 -> 0 bytes .../assets/hbm/textures/items/mechanism_7.png | Bin 401 -> 0 bytes .../assets/hbm/textures/items/spill1.png | Bin 133 -> 0 bytes .../assets/hbm/textures/items/spill2.png | Bin 129 -> 0 bytes .../assets/hbm/textures/items/spill3.png | Bin 113 -> 0 bytes .../assets/hbm/textures/items/spill4.png | Bin 117 -> 0 bytes .../assets/hbm/textures/items/spill5.png | Bin 114 -> 0 bytes .../assets/hbm/textures/items/spill6.png | Bin 98 -> 0 bytes .../assets/hbm/textures/items/spill7.png | Bin 93 -> 0 bytes .../assets/hbm/textures/items/spill8.png | Bin 93 -> 0 bytes .../hbm/textures/items/test_wireing.png | Bin 277 -> 0 bytes .../hbm/textures/items/thermo_unit_empty.png | Bin 332 -> 0 bytes .../hbm/textures/items/thermo_unit_endo.png | Bin 360 -> 0 bytes .../hbm/textures/items/thermo_unit_exo.png | Bin 365 -> 0 bytes .../assets/hbm/textures/items/toothpicks.png | Bin 224 -> 0 bytes .../assets/hbm/textures/items/trinitite.png | Bin 356 -> 354 bytes .../hbm/textures/items/trinitite_new.png | Bin 354 -> 0 bytes .../textures/items/{xanax_2.png => xanax.png} | Bin 79 files changed, 80 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java delete mode 100644 src/main/resources/assets/hbm/textures/blocks/battery_lithium_top_alt.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/brick_forgotten_hole_empty.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/brick_forgotten_sign.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_transformer.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_transformer_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/mine_ap_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/toaster.png delete mode 100644 src/main/resources/assets/hbm/textures/items/UCChip.png delete mode 100644 src/main/resources/assets/hbm/textures/items/armor_battery_base.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_bf.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_bolt_action.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_cryolator.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_defabricator.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_emp.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_euthanasia.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_fatman.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_hp.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_immolator.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_jack.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_lever_action.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_mirv.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_mp.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_mp40.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_osipr.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_cursed.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_gold.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_iron.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_lead.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_nopip.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_pip.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_revolver_schrabidium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_rpg.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_rpg_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_spark.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_stinger.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_uboinik.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_uzi.png delete mode 100644 src/main/resources/assets/hbm/textures/items/clip_xvl1456.png delete mode 100644 src/main/resources/assets/hbm/textures/items/letter.png delete mode 100644 src/main/resources/assets/hbm/textures/items/levitation_unit.png delete mode 100644 src/main/resources/assets/hbm/textures/items/limiter.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_1.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_3.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_4.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_5.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/mechanism_7.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill1.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill3.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill4.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill5.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill7.png delete mode 100644 src/main/resources/assets/hbm/textures/items/spill8.png delete mode 100644 src/main/resources/assets/hbm/textures/items/test_wireing.png delete mode 100644 src/main/resources/assets/hbm/textures/items/thermo_unit_empty.png delete mode 100644 src/main/resources/assets/hbm/textures/items/thermo_unit_endo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/thermo_unit_exo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/toothpicks.png delete mode 100644 src/main/resources/assets/hbm/textures/items/trinitite_new.png rename src/main/resources/assets/hbm/textures/items/{xanax_2.png => xanax.png} (100%) diff --git a/changelog b/changelog index e4c661a8c..8c0770c38 100644 --- a/changelog +++ b/changelog @@ -19,8 +19,11 @@ * Badges can be disabled with the `BADGES_HUD` value of `/ntmclient` * The badge only shows up if the "true" configuration is used, 528 requires default settings, expensive requires the precision assembler config to not be modified and rampant needs most of the default settings enabled * If all three modes are enabled, the "328 mode" badge also appears +* Removed toothpicks, as they haven't been used in recipes for well over a year +* Cleaned up a ton of unused assets # Fixed * Fixed proxy tiles that do not use electricity at all visually connecting to cables * Fixed missing texture for canned horse slime -* Fixed incorrect ore dictionary key used by enriched naquadah watz pellet recipe \ No newline at end of file +* Fixed incorrect ore dictionary key used by enriched naquadah watz pellet recipe +* Fixed out of bounds light level for the RTG blast furnace \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index cf0f5c50f..251a1dfec 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -345,6 +345,7 @@ public class ModBlocks { public static Block lightstone; public static Block brick_forgotten; + public static Block brick_forgotten_lock; public static Block concrete_slab; public static Block concrete_double_slab; @@ -846,7 +847,6 @@ public class ModBlocks { public static Block barrel_antimatter; public static Block machine_transformer; - public static Block machine_transformer_dnt; public static Block machine_solar_boiler; public static Block solar_mirror; @@ -1533,6 +1533,7 @@ public class ModBlocks { lightstone = new BlockLightstone(Material.rock, LightstoneType.class, true, true).setBlockName("lightstone").setCreativeTab(MainRegistry.blockTab).setHardness(2F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":lightstone"); brick_forgotten = new BlockPillar(Material.rock, RefStrings.MODID + ":brick_forgotten_top").setBlockName("brick_forgotten").setBlockUnbreakable().setResistance(666_666F).setBlockTextureName(RefStrings.MODID + ":brick_forgotten"); + brick_forgotten_lock = new BlockForgottenLock(Material.rock, RefStrings.MODID + ":brick_forgotten_top").setBlockName("brick_forgotten_lock").setBlockUnbreakable().setResistance(666_666F).setBlockTextureName(RefStrings.MODID + ":brick_forgotten_lock"); concrete_slab = new BlockMultiSlab(null, Material.rock, concrete_smooth, concrete, concrete_asbestos, ducrete_smooth, ducrete, asphalt).setBlockName("concrete_slab").setCreativeTab(MainRegistry.blockTab); concrete_double_slab = new BlockMultiSlab(concrete_slab, Material.rock, concrete_smooth, concrete, concrete_asbestos, ducrete_smooth, ducrete, asphalt).setBlockName("concrete_double_slab").setCreativeTab(MainRegistry.blockTab); @@ -1790,7 +1791,7 @@ public class ModBlocks { machine_difurnace_on = new MachineDiFurnace(true).setBlockName("machine_difurnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); machine_difurnace_extension = new MachineDiFurnaceExtension().setBlockName("machine_difurnace_extension").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_difurnace_rtg_off = new MachineDiFurnaceRTG(false).setBlockName("machine_difurnace_rtg_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); - machine_difurnace_rtg_on = new MachineDiFurnaceRTG(true).setBlockName("machine_difurnace_rtg_on").setHardness(5.0F).setResistance(10.0F).setLightLevel(2.0F).setCreativeTab(null); + machine_difurnace_rtg_on = new MachineDiFurnaceRTG(true).setBlockName("machine_difurnace_rtg_on").setHardness(5.0F).setResistance(10.0F).setLightLevel(1.0F).setCreativeTab(null); machine_centrifuge = new MachineCentrifuge(Material.iron).setBlockName("machine_centrifuge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); machine_gascent = new MachineGasCent(Material.iron).setBlockName("machine_gascent").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); @@ -1969,8 +1970,7 @@ public class ModBlocks { barrel_tcalloy = new BlockFluidBarrel(Material.iron, 24000).setBlockName("barrel_tcalloy").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_tcalloy"); barrel_antimatter = new BlockFluidBarrel(Material.iron, 16000).setBlockName("barrel_antimatter").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_antimatter"); - machine_transformer = new MachineTransformer(Material.iron, 10000L, 1).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); - machine_transformer_dnt = new MachineTransformer(Material.iron, 1000000000000000L, 1).setBlockName("machine_transformer_dnt").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); + machine_transformer = new MachineTransformer(Material.iron).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); machine_satlinker = new MachineSatLinker(Material.iron).setBlockName("machine_satlinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_satlinker_side"); machine_keyforge = new MachineKeyForge(Material.iron).setBlockName("machine_keyforge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":machine_keyforge_side"); @@ -2704,6 +2704,7 @@ public class ModBlocks { register(stones_double_slab, ItemModSlab.class); register(brick_forgotten); + register(brick_forgotten_lock); GameRegistry.registerBlock(concrete_slab, ItemModSlab.class, concrete_slab.getUnlocalizedName()); GameRegistry.registerBlock(concrete_double_slab, ItemModSlab.class, concrete_double_slab.getUnlocalizedName()); @@ -3257,7 +3258,6 @@ public class ModBlocks { register(capacitor_tantalium); register(capacitor_schrabidate); GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName()); - GameRegistry.registerBlock(machine_transformer_dnt, machine_transformer_dnt.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_he_rf, machine_converter_he_rf.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_rf_he, machine_converter_rf_he.getUnlocalizedName()); GameRegistry.registerBlock(machine_electric_furnace_off, machine_electric_furnace_off.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java b/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java index 5a2e037b4..0a3ffebe2 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java @@ -54,21 +54,24 @@ public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvi EnumDudType type = EnumUtil.grabEnumSafely(EnumDudType.class, world.getBlockMetadata(x, y, z)); - //TODO: make this less scummy if(type == type.BALEFIRE) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.egg_balefire_shard))); + dropItems(world, x, y, z, + new ItemStack(ModItems.egg_balefire_shard)); } if(type == type.CONVENTIONAL) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 16))); + dropItems(world, x, y, z, + new ItemStack(ModItems.ball_tnt, 16)); } if(type == type.NUKE) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 8))); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.billet_plutonium, 4))); + dropItems(world, x, y, z, + new ItemStack(ModItems.ball_tnt, 8), + new ItemStack(ModItems.billet_plutonium, 4)); } if(type == type.SALTED) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 8))); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.billet_plutonium, 2))); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ingot_cobalt, 12))); + dropItems(world, x, y, z, + new ItemStack(ModItems.ball_tnt, 8), + new ItemStack(ModItems.billet_plutonium, 2), + new ItemStack(ModItems.ingot_cobalt, 12)); } world.func_147480_a(x, y, z, false); @@ -77,6 +80,10 @@ public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvi return false; } + + public static void dropItems(World world, int x, int y, int z, ItemStack... drops) { + for(ItemStack drop : drops) world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, drop)); + } @Override public BombReturnCode explode(World world, int x, int y, int z) { diff --git a/src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java b/src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java new file mode 100644 index 000000000..23051777a --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java @@ -0,0 +1,42 @@ +package com.hbm.blocks.generic; + +import com.hbm.blocks.machine.BlockPillar; +import com.hbm.items.ModItems; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public class BlockForgottenLock extends BlockPillar { + + public BlockForgottenLock(Material mat, String top) { + super(mat, top); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + + // placeholder + if(player.getHeldItem() != null) { + boolean cracked = player.getHeldItem().getItem() == ModItems.key_red_cracked; + if((player.getHeldItem().getItem() == ModItems.key_red || cracked) && side != 0 && side != 1) { + if(cracked) player.getHeldItem().stackSize--; + if(world.isRemote) return true; + int meta = world.getBlockMetadata(x, y, z); + ForgeDirection dir = ForgeDirection.getOrientation(side); + + generate(world, x, y, z, meta, dir); + + world.playSoundAtEntity(player, "hbm:block.lockOpen", 1.0F, 1.0F); + return true; + } + } + + return false; + } + + public static void generate(World world, int x, int y, int z, int meta, ForgeDirection dir) { + + } +} diff --git a/src/main/java/com/hbm/blocks/machine/MachineTransformer.java b/src/main/java/com/hbm/blocks/machine/MachineTransformer.java index 60751e333..fe9cb6261 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTransformer.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTransformer.java @@ -14,7 +14,7 @@ public class MachineTransformer extends Block { @SideOnly(Side.CLIENT) private IIcon iconTop; - public MachineTransformer(Material p_i45394_1_, long b, int d) { + public MachineTransformer(Material p_i45394_1_) { super(p_i45394_1_); } @@ -26,10 +26,6 @@ public class MachineTransformer extends Block { this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top_iron"); this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_iron"); } - if(this == ModBlocks.machine_transformer_dnt) { - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer"); - } } @Override diff --git a/src/main/java/com/hbm/config/MobConfig.java b/src/main/java/com/hbm/config/MobConfig.java index 6b6ac3294..43c2d5526 100644 --- a/src/main/java/com/hbm/config/MobConfig.java +++ b/src/main/java/com/hbm/config/MobConfig.java @@ -69,7 +69,7 @@ public class MobConfig { public static double pollutionMult = 3; public static boolean trueRam() { - return rampantMode && rampantNaturalScoutSpawn && rampantScoutSpawnThresh <= 0.1 && rampantExtendedTargetting && rampantDig && rampantGlyphidGuidance; + return rampantMode && rampantNaturalScoutSpawn && scoutThreshold <= 0.1 && rampantExtendedTargetting && rampantDig && rampantGlyphidGuidance; } public static void loadFromConfig(Configuration config) { diff --git a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java index 7ba5e59fc..dd501fee8 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java @@ -122,10 +122,10 @@ public class ItemPoolsComponent { weighted(Items.map, 0, 1, 1, 50), weighted(Items.writable_book, 0, 1, 1, 30), weighted(ModItems.cigarette, 0, 1, 16, 20), - weighted(ModItems.toothpicks, 0, 1, 16, 10), weighted(ModItems.dust, 0, 1, 1, 40), weighted(ModItems.dust_tiny, 0, 1, 3, 75), weighted(ModItems.ink, 0, 1, 1, 1), + weighted(ModItems.screwdriver, 0, 1, 1, 10), weighted(ModItems.blueprint_folder, 0, 1, 1, 5) }; }}; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index dd23f2930..5a808cc5e 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -610,7 +610,6 @@ public class ModItems { public static Item gear_large; public static Item sawblade; - public static Item toothpicks; public static Item ducttape; public static Item catalyst_clay; @@ -774,12 +773,6 @@ public class ModItems { public static Item ams_catalyst_thorium; public static Item ams_catalyst_tungsten; - public static Item ams_focus_blank; - public static Item ams_focus_limiter; - public static Item ams_focus_booster; - - public static Item ams_muzzle; - public static Item ams_lens; public static Item ams_core_sing; @@ -2697,7 +2690,6 @@ public class ModItems { blade_tungsten = new Item().setUnlocalizedName("blade_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":blade_tungsten"); turbine_tungsten = new Item().setUnlocalizedName("turbine_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":turbine_tungsten"); - toothpicks = new Item().setUnlocalizedName("toothpicks").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":toothpicks"); ducttape = new Item().setUnlocalizedName("ducttape").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ducttape"); catalyst_clay = new Item().setUnlocalizedName("catalyst_clay").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":catalyst_clay"); @@ -2938,7 +2930,7 @@ public class ModItems { radx = new ItemPill(0).setUnlocalizedName("radx").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radx"); siox = new ItemPill(0).setUnlocalizedName("siox").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":siox"); pill_herbal = new ItemPill(0).setUnlocalizedName("pill_herbal").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_herbal"); - xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax_2"); + xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax"); fmn = new ItemPill(0).setUnlocalizedName("fmn").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tablet"); five_htp = new ItemPill(0).setUnlocalizedName("five_htp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":5htp"); pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine"); @@ -3430,7 +3422,7 @@ public class ModItems { icf_pellet = new ItemICFPellet().setUnlocalizedName("icf_pellet").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":icf_pellet"); icf_pellet_depleted = new Item().setUnlocalizedName("icf_pellet_depleted").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":icf_pellet_depleted"); - trinitite = new ItemNuclearWaste().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); + trinitite = new ItemNuclearWaste().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite"); nuclear_waste_long = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long"); nuclear_waste_long_tiny = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_tiny"); nuclear_waste_short = new ItemWasteShort().setUnlocalizedName("nuclear_waste_short").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short"); @@ -3885,10 +3877,6 @@ public class ModItems { arc_electrode = new ItemArcElectrode().setUnlocalizedName("arc_electrode").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":arc_electrode"); arc_electrode_burnt = new ItemArcElectrodeBurnt().setUnlocalizedName("arc_electrode_burnt").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":arc_electrode_burnt"); - ams_focus_blank = new Item().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_blank"); - ams_focus_limiter = new ItemCustomLore().setUnlocalizedName("ams_focus_limiter").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_limiter"); - ams_focus_booster = new ItemCustomLore().setUnlocalizedName("ams_focus_booster").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_booster"); - ams_muzzle = new ItemCustomLore().setUnlocalizedName("ams_muzzle").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_muzzle"); ams_lens = new ItemLens(60 * 60 * 60 * 20 * 100).setUnlocalizedName("ams_lens").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_lens"); ams_core_sing = new ItemAMSCore(1000000000L, 200, 10).setUnlocalizedName("ams_core_sing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_core_sing"); ams_core_wormhole = new ItemAMSCore(1500000000L, 200, 15).setUnlocalizedName("ams_core_wormhole").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_core_wormhole"); @@ -5460,7 +5448,6 @@ public class ModItems { GameRegistry.registerItem(turbine_titanium, turbine_titanium.getUnlocalizedName()); GameRegistry.registerItem(turbine_tungsten, turbine_tungsten.getUnlocalizedName()); GameRegistry.registerItem(flywheel_beryllium, flywheel_beryllium.getUnlocalizedName()); - GameRegistry.registerItem(toothpicks, toothpicks.getUnlocalizedName()); GameRegistry.registerItem(ducttape, ducttape.getUnlocalizedName()); GameRegistry.registerItem(catalyst_clay, catalyst_clay.getUnlocalizedName()); GameRegistry.registerItem(missile_assembly, missile_assembly.getUnlocalizedName()); @@ -5835,10 +5822,6 @@ public class ModItems { GameRegistry.registerItem(catalytic_converter, catalytic_converter.getUnlocalizedName()); //AMS Components - GameRegistry.registerItem(ams_focus_blank, ams_focus_blank.getUnlocalizedName()); - GameRegistry.registerItem(ams_focus_limiter, ams_focus_limiter.getUnlocalizedName()); - GameRegistry.registerItem(ams_focus_booster, ams_focus_booster.getUnlocalizedName()); - GameRegistry.registerItem(ams_muzzle, ams_muzzle.getUnlocalizedName()); GameRegistry.registerItem(ams_lens, ams_lens.getUnlocalizedName()); GameRegistry.registerItem(ams_core_sing, ams_core_sing.getUnlocalizedName()); GameRegistry.registerItem(ams_core_wormhole, ams_core_wormhole.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 48f25d845..d0b012e15 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -220,7 +220,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_yellowcake, 'G', TH232.block(), 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" }); addShapelessAuto(new ItemStack(ModItems.cbt_device, 1), new Object[] { STEEL.bolt(), ModItems.wrench }); - addShapelessAuto(new ItemStack(ModItems.toothpicks, 3), new Object[] { KEY_STICK, KEY_STICK, KEY_STICK }); addRecipeAuto(new ItemStack(ModItems.ducttape, 4), new Object[] { "F", "P", "S", 'F', Items.string, 'S', KEY_SLIME, 'P', Items.paper }); addRecipeAuto(new ItemStack(ModBlocks.radio_torch_sender, 4), new Object[] { "G", "R", "I", 'G', "dustGlowstone", 'R', Blocks.redstone_torch, 'I', NETHERQUARTZ.gem() }); @@ -619,7 +618,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.sat_interface), new Object[] { "ISI", "PCP", "PAP", 'I', STEEL.ingot(), 'S', STAR.ingot(), 'P', ModItems.plate_polymer, 'C', ModItems.sat_chip, 'A', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) }); addRecipeAuto(new ItemStack(ModItems.sat_coord), new Object[] { "SII", "SCA", "SPP", 'I', STEEL.ingot(), 'S', STAR.ingot(), 'P', ModItems.plate_polymer, 'C', ModItems.sat_chip, 'A', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) }); addRecipeAuto(new ItemStack(ModBlocks.machine_transformer), new Object[] { "SCS", "MDM", "SCS", 'S', IRON.ingot(), 'D', MINGRADE.ingot(), 'M',ModItems.coil_advanced_alloy, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR) }); - addRecipeAuto(new ItemStack(ModBlocks.machine_transformer_dnt), new Object[] { "SDS", "MCM", "MCM", 'S', STAR.ingot(), 'D', DESH.ingot(), 'M', MAGTUNG.wireDense(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID) }); addRecipeAuto(new ItemStack(ModBlocks.radiobox), new Object[] { "PLP", "PSP", "PLP", 'P', STEEL.plate(), 'S', ModItems.ring_starmetal, 'C', ModItems.fusion_core, 'L', getReflector() }); addRecipeAuto(new ItemStack(ModBlocks.radiorec), new Object[] { " W", "PCP", "PIP", 'W', CU.wireFine(), 'P', STEEL.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'I', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModItems.jackt), new Object[] { "S S", "LIL", "LIL", 'S', STEEL.plate(), 'L', Items.leather, 'I', ANY_RUBBER.ingot() }); @@ -729,8 +727,8 @@ public class CraftingManager { addShapelessAuto(new ItemStack(ModItems.ams_catalyst_schrabidium, 1), new Object[] { ModItems.ams_catalyst_blank, ModItems.rune_dagaz, ModItems.rune_hagalaz, ModItems.rune_thurisaz, ModItems.rune_thurisaz, SA326.dust(), SA326.dust(), SA326.dust(), SA326.dust() }); addShapelessAuto(new ItemStack(ModItems.ams_catalyst_dineutronium, 1), new Object[] { ModItems.ams_catalyst_blank, ModItems.rune_hagalaz, ModItems.rune_hagalaz, ModItems.rune_thurisaz, ModItems.rune_thurisaz, DNT.dust(), DNT.dust(), DNT.dust(), DNT.dust() }); addRecipeAuto(new ItemStack(ModBlocks.dfc_core, 1), new Object[] { "DLD", "LML", "DLD", 'D', ModItems.ingot_bismuth, 'L', DNT.block(), 'M', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID) }); - 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_emitter, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', new ItemStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_QUANTUM.ordinal()), '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', new ItemStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_QUANTUM.ordinal()), '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', STEEL.pipe() }); 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.hadron_coil_alloy, 'L', ModItems.crystal_xen }); addRecipeAuto(new ItemStack(ModBlocks.barrel_plastic, 1), new Object[] { "IPI", "I I", "IPI", 'I', ModItems.plate_polymer, 'P', AL.plate() }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index a8b602748..845044aeb 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1479,6 +1479,12 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.sat_resonator"); ignoreMappings.add("hbm:item.sliding_blast_door_skin"); ignoreMappings.add("hbm:tile.dummy_block_vault"); + ignoreMappings.add("hbm:item.toothpicks"); + ignoreMappings.add("hbm:item.ams_focus_blank"); + ignoreMappings.add("hbm:item.ams_focus_limiter"); + ignoreMappings.add("hbm:item.ams_focus_booster"); + ignoreMappings.add("hbm:item.ams_muzzle"); + ignoreMappings.add("hbm:tile.machine_transformer_dnt"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java index 2ae70f6c5..9d3401fd3 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java +++ b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java @@ -587,7 +587,7 @@ public class ModEventHandlerRenderer { @SubscribeEvent public void onRenderHand(RenderHandEvent event) { - //can't use plaxer.getHeldItem() here because the item rendering persists for a few frames after hitting the switch key + //can't use player.getHeldItem() here because the item rendering persists for a few frames after hitting the switch key ItemStack toRender = Minecraft.getMinecraft().entityRenderer.itemRenderer.itemToRender; if(toRender != null) { diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_top_alt.png b/src/main/resources/assets/hbm/textures/blocks/battery_lithium_top_alt.png deleted file mode 100644 index 12d7b89d1849c45c483c2a21f7cd5e8d527fe889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=KP)N2bZe?^J zG%hhNHDpIvQUCw}NJ&INR5(vvk}+zAKoEs<2t|`Z#V*BvmJ~^oA~~BU5JZI7Xrq-N z7!(B?8}E@%-)4W4L57)m^XAR&`tbSjZojwJ7ruY#wRpQdAA~&5zkV%E(=5x1qM(Q` z%d)QPrfI6G8iv6TNcMei+jgGkX_~sO`#xiZ2Rstgt4LFLTFbsnr@O>X0wSsaaLtqks zJOJHKr-^Vy4+1NpKq3!-0^N_Nabs81oPmq)`<}fyE`Z}WuIqZ9hXQxNF`%i(5Y!4F zm`NCWa|Z-eghDeb*;ZZB-1)4DS5&9Osg^%E9 z;^?Yz)y1eIxRA67BO?yB1uR7{dU&_y;Ej+ zFY=}~ASsfRh3AjR4x<=X#-VGC)>fuOd4fDsQQ-L;x)$e`!iOKY*GWp?`A}y0Bz9r6 z?J~=aU+-s|)%t4b&3SJ=fnjx<)fxc#bxeZ0xH#wj^_itNA0UKLOv!LOHYZw_Id#Uz z6h<*KyTA@;@4#q+kRiX!@-c}TU+l^^^`B@Pf#>5+-M50We>SzXb7J}5@&$DV402L2 R5*z>k002ovPDHLkV1hI>y)ys+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_sign.png b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_sign.png new file mode 100644 index 0000000000000000000000000000000000000000..f7bd436f63831eac20175b9bbc095f79084aceeb GIT binary patch literal 425 zcmV;a0apHrP)At55XXNB8Jcbmf|L@6pfQ`HNS)mTM?Zpd=kEOmegwyY zTj!Qi5K6ZyY9SAiPy^YTF&)x-K7$nLE${B${qOGm`9Ets80C}M6o6s7OUuv%MV>|$12hV0+vew$12i!3+M%*uD7MLc_vw^H;}1-KE+}c;Rs;Z z?vnf#JQ*t{SxVKdkQl4q7#mo|K}e*%T9t8NARl)mNCoObF@?6dTs#Q)k4B{bx~ TDLBt100000NkvXXu0mjf!#cP- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_transformer.png b/src/main/resources/assets/hbm/textures/blocks/machine_transformer.png deleted file mode 100644 index dea44f1329c0b73b9648eb24c2c53d6c47ce0d45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmVN2bZe?^J zG%hhNHvLWs=l}o#a7jc#R5(v{lD|sCKoG|B9Cm{Cl1RkEKu92`OM-!TgbOYP&eq=M z3afO!hGh`+5qtz+z(xyeYkxbFi@{SEX8+85-#4>6UfW(;+o-X}nx?Mni?S@Lsw@gq z6lZA~s}F($kG$C|48s7gn=te-Jx)VW#KCt8T=jk5bzPRF#?0{;l*VKz;5CYZ1E9dd z*;+f{JHn#qIF3)q(rM8tULc~;vdl^FR;w#0Hvs>| z9zNxJkEgr%hj`~X-=}-6v#QR?bO3N!mWW~iCB)Dpf)s+hn6zZ30ACyB3?;;)2!a5} zCd$T@)V5Xt3D5Fp52}E^0DMmuQAqylK^}KL0H|yOa3yW`K!SeAP*Po20&q?9@Y_8w zAkbq-IRH=q`j>K>>lDF0yOb)3AdR5R~VHKT0 o$^m2shj|>08)SdoyUWo32Ji0qSWZ0JPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;jv63FrU-0l-N_K~y+TU6RdC>R=Ftxfpkfpv|dqv$!wWHR5(yzl&drB3Ie zC~^^OB+s)fyNTm4P2({1!?04-*?dnl)mp!0Zp{m>s?&b6o3lwk)7vx5O_i0dY zSD-(Hj9s>6Sy$v?BN!5GGz?wWN>5LZwEG26+!$!jvmB=(fPJ5}nyvs;Ahz9ZH=E6R zy`IfxU~Kyz53PO!n1Kg@_t)QlU+yQ92>>X5dH~R{YN^vHc7VoewfggHzO@bpgMn>d z(b96c+h)JwFG}+#FO`cZS&7Wn7jr#** zuj`%DTskQxCi>^$ZMl&i=W^ECK4QMGP4}eZx!{W8%O)y}Q;taN-lJaVr1?}LS>m|h zl%RrhhQ7iU&pURDt6R)oyEWpvXzl%Ubq|Kqn;L?+7&z=!uQK3qW~zwYn?Eo8&F{KU zAwPwsCHsEgd{NAx(895;WOu8zE$g1m4eMS{+Ir0Bm;i&kyf|-=7yF-oPT95G^-J`f X4o3K&m8l8^dW*r+)z4*}Q$iB}#-wW+ diff --git a/src/main/resources/assets/hbm/textures/blocks/toaster.png b/src/main/resources/assets/hbm/textures/blocks/toaster.png deleted file mode 100644 index 03835ffdfa49668271c12fa9a7754fcb45b3ee9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vff55JS=6t_NEyK)tW zqRFfdg{3LqejCk7usblRW!1e|DvC=PHiSMpEyGmpt%fzea6e2`z z`>!C0!6Nh=XYMY|LBy{|4>~O^_D08ph|+$iaEvixLdpg zPenH>aVmKge%dDUSe@(kztW&z41G_V^4LC0bOGJQ;OXk;vd$@?3CI*Iag8YP%}+_q VVel`>NG;NL&PXjTxp+`L0RV%}X2}2m diff --git a/src/main/resources/assets/hbm/textures/items/armor_battery_base.png b/src/main/resources/assets/hbm/textures/items/armor_battery_base.png deleted file mode 100644 index ad4e8b8af75b426746dd384cb3cb0faa78a80a20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmV-#0g(QQP)lG^l+tMf>{UVFd5o8T@xgq)HQ~kk46=;b@TLYj07@w{8jUPN z6h+oM8{G4}FDZ%wpC@iF*GMUydV(ZL>S7@TN~s2L%IUWT2i%`2pzIYkm8L0anzjJf zWk!+bc{iYfROU9I>$(68y3B81S6nX^2qC(9bOQh$R(DJeA9tFeTp`bMtCJ9d7vJZc zS8Mc6Kpe-8QmXg$Z2O)&hdZUUMkD;%hP9eE!^-5AynR{xq21?yR<(qL_CS=qv_LS3j3^ HP6h$! diff --git a/src/main/resources/assets/hbm/textures/items/clip_bolt_action.png b/src/main/resources/assets/hbm/textures/items/clip_bolt_action.png deleted file mode 100644 index 16364887ff90ea89156eab4499315ff15f0014f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)TCrI=N?d z7hJnYe}f=62pOUwTrhM9y$((9&E+eB>4 zDxdD&jJm^c(}+)Qc8z9$zVhmfTujNuRHfeYpOx~p0xyw|x4HE(9Be56^8U!04&W@D z>xZz(toZj%c!?xPWfVp7b8_5i2~ycjaFDM@(!NxC2MjL2*#_~vp6X^Fj*+at=hi)+ zlXamrq;*Y55ENUl0QhCh$Ls~aj4c9vS1*ycL#W2! z4t0g&+hePV+JRP3j(SvMySOg&Q@L!3g0_-%P>$^0zu*_ZLn!K%g5Db`S*P8 zrEL13-nf3jRljaLI`jJLqOD>}r}+4~w|KPh@D&`hn#g^iD|fl6NDQa$|D23p zmb^OzE(BEAo?~nia`vofu=$&zH%D8h!s5H%&B!|MjPuWxJtwW7S9$-!y;_}fqTlZ9 z67e=;kkEQ3qq~3Vg8qe4YpmJ#RFu7E&G!DS*|@$?q$@(?b`v{<|psdKVYNkCKJcA3T_|T71uU1_n*lZMmxx*P1@7JhtzB#57li1C!e=pG)-^ z@}(~oDLUu7&2B=_sx*#7i{(=ce1j*;u4*r1+n9KuF2!MD>$P1~&TKKq?}hXTdaX3y z4-^HmIUZJ*zY1eJzQ155m_>|e7A#?F~#XK3{c=mQ2%S3j3^P6vTohGdNww;HvRa01|V=}f4%(bD7BQnId{7LYlofqJAK-`pY`d-s(1Xj zIO)Ddkp*u85d8S@QJ)zI4)2}3|3Q+0nNOZT^~3k~`z`i1=$OB1O=M@t=&Q2TxMt7> Pw2{Hn)z4*}Q$iB}XSP1O diff --git a/src/main/resources/assets/hbm/textures/items/clip_euthanasia.png b/src/main/resources/assets/hbm/textures/items/clip_euthanasia.png deleted file mode 100644 index ec46c71655f701bbf58133d5df4a406a4690afc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfs^1OZ+}1#lYYILndBs11sZz)aDHiN;@Bk$3L6wAP^Gs^u#{v<5m^YZrzCz z*Q{Fvm>AAkGAB&EQ+hYi;@FO>rLoW7UbRerBbqrco#EF$^u^&jzlk3yyftS-NS;l|@nePU=1n|G?Vdmvm03>%0#LT=By}Z;C1rt33 zJwt=FTwDi$irPF~978PplYjjGZ|^FxT0v97*&)vPY5k7fpX$G#X!u{9{;MfdfUWcJ zjT5f|O>Un&@n?G2wEy>CzW8zf*!8FX&uOkpkZMUxQs`O3ew4x6({lr(X;_#9+kqn= zq!FVdQ&MBb@02n7~3IG5A diff --git a/src/main/resources/assets/hbm/textures/items/clip_hp.png b/src/main/resources/assets/hbm/textures/items/clip_hp.png deleted file mode 100644 index 86fed909a6cfde29b19ae1727badd42fbc845f7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfwZ@&-33<087!h JAns;#ND^GYJ@3mC9X+}e=#`>y1kBZA>K7_Xj zM3uj<{XLcWz$MjVH$0kDyfk0Dn{#-3&HeAJ3}@1Be~Y*p|8m_vJM*toE*X3cC}{hs z9W(F2HSVHw3Y>zDYekiqCbd_(bFbNYE3YTe{*?9Se1n2#Q=flkt8sX-;$dlwKhS9m Mp00i_>zopr03*m#$^ZZW diff --git a/src/main/resources/assets/hbm/textures/items/clip_immolator.png b/src/main/resources/assets/hbm/textures/items/clip_immolator.png deleted file mode 100644 index 286c3a2e34dd7942091bbcfdec0cccb3cd72e52d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|XRP) zw=gsSu<^WJ(?mEHh2{6g!jRoP$05(5iCB+wK}Cd$2-`jIe7rRm&J(Ud;Jo`(mX_ZV zy81ZMH2s)ajtyP!b8((<@%=uLS&Keh*Ow%;s7Kq3QA;1_z z+qMU(wtg)AORY5kAj`77UieMi8mDOrij-vur4*{Fa``SS{KOUkfN>mA6u+xgN+Hj4 zD5atT&I}?loO5(t2hO?skR(Y&>ia(S;Lq7;O};8y%#Il-@RdX@cfeoeQTPD}bb@h# SkSIt10000l6oOzO-Y-aJwIHOq=E{R~*6CBnQY#x<>nr^O z2bOjzB_QMvSO|6-jw29A5m=kOaW1=eDn2;o&F##4H#ZCa#6TwnxP~V^P1mYVND1!n zc-tx*C#S9aV|LeS1{gNP0(QH{ZufHdZg)Qn;MEFnhx?o0FgZIBK3Y5k?kxdn>T!z+ z&^T%Nnn*UQdWDx*MP_e+uDNJK`+feYZJXN1@|BmHvY>o3EmmBaTA57icF^A*uZ1;Q#mnSX{ ziXJ_B#G@a-&n2)wiQ&vM`S^XtHNSuG`W-%SeSN&-zS`eyw;5)f^+W(V$%q7zgWU#TZtw}WCl8|7KtPk`5=A7>X^aX>btDnm{r-UW|LSkWc diff --git a/src/main/resources/assets/hbm/textures/items/clip_mp.png b/src/main/resources/assets/hbm/textures/items/clip_mp.png deleted file mode 100644 index 47f5e9ce900d5b7cea573179147921834d24b367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$irPF~978Ppk51ai*ZmM3wzNqUac1#(7WiA)9mP3Ihd^ diff --git a/src/main/resources/assets/hbm/textures/items/clip_mp40.png b/src/main/resources/assets/hbm/textures/items/clip_mp40.png deleted file mode 100644 index 21ba8a490bd65a4d6e30e64ae64813bcf2467f94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf0#LT=By}Z;C1rt33 zJwt=FTwDi$ik5h~IEGmGFYVtg+H4@eqW`s;Z;pjhv6o-5UIW{U1G*PkLg$pX{)pIq zETM_f@RCfzyE-n-eg##-)dedzT=^{=^{nE&fNpTb`GUI+$BSJ~nfAD6*>u&adT(p1 zv8g$H>!9#|9*>8ck3TBQIUwXW|35=`j_7l*iBDuEa!VxNJA6~&*@n1<$wI9EKc`x% x)a>r_6tS==c~*N`@wVYbqxSttN>A(V++&rVTk-Ug5FgOJ44$rjF6*2UngGXta8v*Q diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver.png b/src/main/resources/assets/hbm/textures/items/clip_revolver.png deleted file mode 100644 index f2d1235a25621a93d61438ad5afd69fbbeb4d2a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$idK2LIEGmGFP(6Z_mBaPtF4oW>%>hg;%td57RAr*rAD;qMl@>nCmcNqTu z$gixtAf?c>gst+lB8$C4kN*j&(zw}cL3Z8bKP0`?A^7f;?e(cZS2K9J`njxgN@xNA D?|F2f diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_cursed.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_cursed.png deleted file mode 100644 index 69ab127deef96d5c59879e772c001a551777abeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$iW)p!978Ppk6v=*I;z0K5^!FT>qArx=VC;YFyRZRng5idEwLl zDoXQP9`+fuM6K>ITsG&k?9sgjEVds^9x-Vx)nQJse!z5zdGGg=Wd~S~Fv`jEzIa^E z9+f@$Z38!l{cJlssSC%WnSTfi+O_8J$1r>o$amhh+hz{O;qNN3vOD(I9dQr(0CWq3 Mr>mdKI;Vst0JwWxnE(I) diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_gold.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_gold.png deleted file mode 100644 index ceb691e347d415fa58d94fb334cdab59f4471501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ii$j4978Ppm-b!cZ7|?)nc4K$UgjX{orAS2j?7Vf=;dl3=e6#5_R%wS zj)(b7-Z&iQJHKF6*}I^k9P@j=OjG`BViM9y;O<$0#LT=By}Z;C1rt33 zJwt=FTwDi$iWYggIEGmGFYQ^#*X$tR@{>PA+u>S+hUxNIQcX%bmhEpl@<@B*pG(`S zPsU73w%if6CnYcMo2ttf@hr*asAC%{rW~D_cm0j@^u+>t63HE`Let)I#wIXs(r21= zp>^F_jy>~^DeYdSr_=xY=qAkr8(k)^Vfk}#apf7^8ja5;bLOaM91v)K;Sj)}@R9$1 x?JnI1lO`(3=QK4fUc<6~(KN#qPYX4EGO+#X-SA0Rj34M)22WQ%mvv4FO#o$BaYFzA diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_lead.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_lead.png deleted file mode 100644 index 6a8db96e26a2e77b316e5c7b21a94c5579837f39..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=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$iuQTBIEGmGFP*TFm&uUF_3m=N>71JwZBH+8@$#I=)+yCFuZc0D@g$GE zx;vY6N#motKmR-~59^ru|4{C^2WII7vyH#FpPOkvG012K6U*AIj%&ZR2Ay*7Zewuf z_;UaLL|zu<3EKsn9$cPhwW2hQB_fzRsb|k!f&1&ZSGYE9j%Qu*QZlyhimQZ6ubff1 z!gOVJzTHpHOB_?k`ZD2VcM0o?{Pb5RWKWnIDKlg+STdy4-gHWLTcDb4*c4wd`*mU! Z!{xtGx5RdQsRR0i!PC{xWt~$(697}!c_#n> diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare.png deleted file mode 100644 index fbe0afb48cd2db6d527a1dde49ce14f0fdb90ed2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfzopr09WE@~ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare2.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare2.png deleted file mode 100644 index 0652e60670678025eff9f80b02bdf666eaf3e261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfwL)r!UjhwnZBJ+&~QB!(ldc`Mx$nolK8ryWxH7QTpw|qNOZ2VJ2~mA z&fI&?nfD#hVOE+{^8Mcaz3GZd8?T)^SF*ruY3rGsIoXAlhQHpm6|M+x-@_&_@rcC1 zGi(e_9R9tp_x-y3Cb_kxShtV8zi>sW@8V0Z)XlOpz6z`Mu3-wewn9#HZ{#)qH}~3( sP0LNmoVEFjtjlGMe~cfLd-oTz%gLo|I6Frp73gpVPgg&ebxsLQ07`OUjQ{`u diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_nopip.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_nopip.png deleted file mode 100644 index 6597e4329ca02573182c2832a7591cff5a38a44a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyU#$>;50bOdo|T9XD*@QDNV(X`5h~EZ}zudB;)<@pJhkKiv!0#CciWx6VVpfP!_A1=v%^8|~MJB|N zA#l}sr=#zmHQiim_uZ_z`IYj`12t@?bF2H0y_cLiZ_WQF74NogJiB;W<5&3#y{ICW zY_;D#96K1f6L!oi+L88FETL&d)kC1PUVb z03!HkW7ux8KD3F6e@b8b!LZ-5Gv9tQ11Ar4=&>jYKfae``72*~k|c@O&Y(N9Q$8sD z4LvRv7h~*S^=Yva-ab6Joi}H2^a_40K%5b zn|Mf!qKNf+4M1JjL{Y?Iu}~UdKA%IYp%M5vgU=9}aMHrhcKTBQ(uYUh-e2j&qTPOo z4cuSfP3%@xr2x`2^*z@B)$0#LT=By}Z;C1rt33 zJwt=FTwDi$iWYggIEGmGFP-4X*Py_|Vkx}u$;sLFAK%^e|HT;}n3=oLTV;`)*@l#I zC+UtC(=Vjlo^-x);l%>4l^Vx1vK%jD%=Fi;y6bo$<+M2Wb{1I!83}Q&+iH&XUA><< zCJ44gHhtRhe!2*ctO1vXvd`VhO4^j=ebwhfv#onboFyt=akR{0BLD!t^fc4 diff --git a/src/main/resources/assets/hbm/textures/items/clip_rpg.png b/src/main/resources/assets/hbm/textures/items/clip_rpg.png deleted file mode 100644 index 804ae9d38424668eefd35f4c0420b7ca634bfffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$idJ~KIEGmGFP*rN_ppM1tL9{l*%tx=0u5VlUwLU9750HmZpJ_kniz9!3V2NePvE*?OlePW&ive4}mO@s33t znX{ZUS=UVwb*kazyu)za;MkM7TUdDRG7Et2&_>NpU)asRzr9IS7;I~-g%4sX!m zsIV{GH>+ZX-fAyR?-_<{YfDR6%(qUc=B_>ez5W{aT))Ko^5w;wf!=2DboFyt=akR{ E0I;if`2YX_ diff --git a/src/main/resources/assets/hbm/textures/items/clip_spark.png b/src/main/resources/assets/hbm/textures/items/clip_spark.png deleted file mode 100644 index 89838862808a18bfdebbe7392733063e3cec950e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfwTqJ9?GtIF-zn9CMaKM(Jo+E;QUDFPQxT_2X@u!hMkU6l-9U3ul7*h z*}|lHNF}ap>;8>tHvi8?YTp<=rm6 zP*w*Qfr&R$I2jI{S(XjNzrExhlJVr zbD0@zOs{iJ=(kDuD3;W7a+f!!LumNp=18O2H{WQ!|2nfRaY63woVS6$*yb}P{JH(3 RR~i@w44$rjF6*2UngB3|efa&mYm3kyB3Dl>DOx3qTPPe@~kn8~PdxoKwTcB9~BsYlI3boFyt=akR{0MAoQQ~&?~ diff --git a/src/main/resources/assets/hbm/textures/items/clip_uboinik.png b/src/main/resources/assets/hbm/textures/items/clip_uboinik.png deleted file mode 100644 index 8a71a2243b313e7e9428e584e310ae1da0cba047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmV-~0ek+5P)lz$FF@dL&997N)q$BM^>jY}44<82lHO+FRQA zBhJRcpCBAagf!8^Myn7Z1~mzUBsOaicC*KN67<2bZ*J$!zL|l4BBcj`i;%pMOBU_7 zmO4d3AMtv08cVDe^Rak(c@`4`q$TN2VKAOC7|+z@%V4rv3xSLHI6N^fi|bj%%U9>d z>i`)^Hm@&$-+NC);37gF!ERsFYPG~O^p`_63Va<`7706#!f~9$Q{Pl<1_xz}oL%Dn zxx12UIggC~bNc=Uz}|+%nq5j1x3ovp8vBzuuvjNRqgTa?Y#P0)ihn{{4`dO5;c&?9 z_7ebJWOI|f!;5UAfZA)|BI*TbkDy*yCT!&`L-g=DS2Iu!njKQ@k!i6%nX6Aiwi$Dv iJ2A_cXm(8PpYRO=2!4BabgLx*0000TV!{`BZCDJ3=CQq!<+DX7F_Nb6Mw<&;$Ub?=$uQ diff --git a/src/main/resources/assets/hbm/textures/items/clip_xvl1456.png b/src/main/resources/assets/hbm/textures/items/clip_xvl1456.png deleted file mode 100644 index d705aa68071598f1c81112712cec38b99c535621..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ine>YIEGmGFP*ee@UQ}p>&&LEu1QKF3zIshV%E+;~Q>APCQaDOY?I$yNccJ{_3^2gIZ)` zdcIweeM_&%@joS_cGl5c@)w%$83arUcaydKIbjdumJ zm`t^~8lGv}q|M&We}i$WUO>-&<9pKQIr@4oiZEmdDg-V%6E9om$RpQ&MS92E+C?&d S&aVY}fx*+&&t;ucLK6TG$aoh3 diff --git a/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png b/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png index 544a44f775789dcf648550998109e536b8018749..63f8aa742e72d392d9352bcf4fbb50477cb80d9e 100644 GIT binary patch delta 330 zcmV-Q0k!`30`&rrG=D5fL_t(Ijm45dPQpMGhQC&93Y4IU663~n$3@(`@Br*QfgFP? z&@ESR;i4xnt_+JJ$;6=8g0bn0gF3ECAW-bW#J8Ho`~L6E%!B_ZA%qFT&;V4*0Qc7y z=6yb+T6Ji3`$SPh6h#17W#F3UQuAE0RPi_*BhIhrbUN0r6My99&ku)Zp=lf((r7lR z4|>a_==8ZSV|9SKy7|33r&pGYS=@av7uT=74q0qv#QV!F7rYZ{`L+cYYZ}gwJCHk|=zI zIh=Q{#ma!R`EzC&4nm~dM#=)=a14paz)Jxs?A5$n&6yjd?;P9)=-6g0#LT=By}Z;C1rt33 zJwt=FTwDi$ikduK978Ppm-ZR*9Z=w5{`tQ<;wOi-b+uNwkyo>}X{v>a((g%0Y3?Ty z*(}c#*snGHeOPTqvDYyP{t0Wh+OcxDdFp(-7w*QD5$+m)EJyf7qf?ZI!;ryaO5*S@vwYN%z}0&lM^mtD}k0#LT=By}Z;C1rt33 zJ+nVO$@hV3PIDDnlF(XvK<6eW5rb^mMN$QvPQ-)exJ-`>}z;3k+I>y kdzO~_4W)fKpDmK=d`i~IPZX+<1^SA?)78&qol`;+0QnSsdjJ3c diff --git a/src/main/resources/assets/hbm/textures/items/limiter.png b/src/main/resources/assets/hbm/textures/items/limiter.png deleted file mode 100644 index e81eb2b2623dbc589108648857406baae553742d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfwb}slZ-_Q*cfGAIkum$t!kRLO#Q??o^X{XBYqec&|RfSFxqHl{x2m!}mJ7Gmnj1f7GmTl@}A?RAiV?oVLCF zZr#%6l||>C)>gEZG-?;bIU5|6I4;<5`LuXlEqk9fhuUwYPuA?8Iljxx@D>r=wNCs0 zv$vU^&wtBya2Ouba=QQB#5ed?-up+#IaYNQuX~`mbX9&fukWc@~ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_1.png b/src/main/resources/assets/hbm/textures/items/mechanism_1.png deleted file mode 100644 index 06c19bffe64e8d83c85043bc9beb1b271f0e96cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf6O=UC6#{xdf*na9v=Stiqo@=01Z4&UC!n9#FxYDibK;QRCtPe=eoLATNvUM1SjplMjToeV)IgBv?er=Mj$s*$S1^~`E=6S|B zcbF{(BH~3PS(}K6uc``T3|W?i1RHGb2_~VQrU_N0EKA051b%pfAP!K~<@@%+1G=s| u-2a`(?|HAdi^0obWLX*`{t9Oj{3)L9{C69oBAu`R0000 diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_3.png b/src/main/resources/assets/hbm/textures/items/mechanism_3.png deleted file mode 100644 index db85d9f0a9916c4bb57dfa28b88399761a962276..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@@P)LQY`31(OVV z0dByegNwn$5CUbZQwcwcP4u1GetDku`wILRse52KKATMEDDo6h81(AhjJmLHtU(kF zy0M1k_)J*9;fiLUx(aME;$_ZzUUd$3DrLz+0GuUD?-LKM96jAQX{#{3S1?RCo9#EPdtx O0000?~sFl>;13>CqbbN8Y+CITQzvhS2#V|=_$5pJlUOR&sOH#Q$D3r$KFlnHuxQOKG#M{G!w!2p!)e)F65> zQDmmck**gGQ`IhXsGrc@+|<0|51ULQ-v%T8*T>B_DD7gu<-l6-VEQc4H~Fq6_0wl| rh*b(ZJWM{B9yjx&cCFDt|5En)_T+^&zqdRBdX>S`)z4*}Q$iB}!j5ig diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_5.png b/src/main/resources/assets/hbm/textures/items/mechanism_5.png deleted file mode 100644 index ae6dc2567ba21413176945a6f8976327aa04807a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf&zklNyJA)z%>j$psCExr_ zQ_tT%=Yg`!@8@|S9V9Il=Yk{0{Vl&)78&q Iol`;+0JRKj{{R30 diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_6.png b/src/main/resources/assets/hbm/textures/items/mechanism_6.png deleted file mode 100644 index 6656fe1cd088117c0bde78a96329d9c24dcba1f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf?fddbcp8k|qQ#hu07|1#B;ni_rk=7&`qk@gL$F~_DIud!o^wFcm(oKmC zHq+H&Cd_V~-v|T`U(fH?=-L_iL-NT^JEIxDcKpk~A9Ms{+<}&L49hC-Ht#R6+hozx z#;8_ef6#6bs( f>|gg3#2FZLzelk~Mx9OqdXmA@)z4*}Q$iB}kh*u? diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_7.png b/src/main/resources/assets/hbm/textures/items/mechanism_7.png deleted file mode 100644 index 9166afeb4083da0cef28b75f9b1c56c2381a4c92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)M>rm5U%3Asy{7s!Rs3#9l2<$4}Ke1HjB zMMMwa6BM}U1q^hRf?F42`FFgdZElO0OQQ`4_N~sj=YAg_-#M@&wDpHVp&+*lt;77MOAok)SFY*y7Ff#Glnz$b8>!JETVCFusTzK5K{$>a z4+gA+P`%;08o+GiF`4Vs&))!;%ylKc7ZmYC0)Q{yM>h=B2PijFOy)YJwoSR2Vm9&! zIq*G?l@RR5@&UeY*T#$c=bA0XbQt7JoD+h+_YRBm`re$GT7J+?$QrqUR vGUxU2eIvKfC2Fzopr0Qlu3+5i9m diff --git a/src/main/resources/assets/hbm/textures/items/spill2.png b/src/main/resources/assets/hbm/textures/items/spill2.png deleted file mode 100644 index 71543c6a52985ad011be96749806043c73e36afa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#VfUIEF|} zO-^uNvazxGFL{AMco&0@Vq4M-hFvPkJ|9j`*YA0;YhTUJLmgKmN~8{R#qb?_DZGb) ZLFcmgJH@cpxj-`*JYD@<);T3K0RXoiCD;G} diff --git a/src/main/resources/assets/hbm/textures/items/spill3.png b/src/main/resources/assets/hbm/textures/items/spill3.png deleted file mode 100644 index c3849264e77be8775fb74eb297c3fdf9b2c3e963..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf^#JQqc>};9+p=;kuTfJwpSikHOQ` K&t;ucLK6Tddmroo diff --git a/src/main/resources/assets/hbm/textures/items/spill5.png b/src/main/resources/assets/hbm/textures/items/spill5.png deleted file mode 100644 index 2229332edc8119d826fe0c8b3d4ec134cf64526b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf@vJ4EpMw}a`ch0W@YGUwo^>bP0 Hl+XkKX>}aI diff --git a/src/main/resources/assets/hbm/textures/items/spill6.png b/src/main/resources/assets/hbm/textures/items/spill6.png deleted file mode 100644 index ab1e426a893c0fb6441ce1ac32c8d22113430325..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#VfgTe~DWM4fY3diA diff --git a/src/main/resources/assets/hbm/textures/items/spill8.png b/src/main/resources/assets/hbm/textures/items/spill8.png deleted file mode 100644 index 324a56ed9e773d33165e54b20c7393e596c81221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf0#LT=By}Z;C1rt33 zJ=4@yqg0@pHcuDF5DWjaeX)EE1{}@hUt}-+R@kJtH09qBanG(d**9~PK6w`2`0}{P z;iE?K+V64#`&aCoU^AC_(@F0&Pg(t0_){J;bgfIV{IPq}iBO9@bth)=8b9IIOWDUW zuXL{RiK%-k?(Qs|E9^6M&;K}sbBPNk+>J9x)OuDRS8X>Zfh|m{lI^`pF8gz-rMuU> S**OL1A_h-aKbLh*2~7Y2{bk+& diff --git a/src/main/resources/assets/hbm/textures/items/thermo_unit_empty.png b/src/main/resources/assets/hbm/textures/items/thermo_unit_empty.png deleted file mode 100644 index 7c2d6c29160a05ba19d47806f810bbebbab9824b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3_IkQFhFJJ7owQN#kO7bDUWT=ocO`L}EjVXjqVwpM?K;gDdpxqr1b!84 zQa$d<_xxS#8vU2gp9{IW1oOBa5U+gy)8ZZXvI?EPxaaao0!|CwRxSFz>qAE@TUflUHDuw_{1i^rsdoo7u8p`>&G^A`CV9=ar#URQ<_$z!BmA~9-6A}ww#|) z{A}7>;W8$k4LriR0bUQc&1JP_WV^+3I?2GuuysMabMXy^0}tM_IQ^Z0#LT=By}Z;C1rt33 zJ+nVO$@hV3ZhE>nhFJJ7on*_`6Xp7aio^N>w|9y!*18^`}#8++H2MS>~a#1RX_Wv`FVncZGwsQp|j^_=;)saSMRxg zeO`B2L`S)Ti)Fwf84=gUO*%_2#U+P^25qYK(syLMwY)<=;QH1nx%w|vH5_)-cNIji yIw`3Ilt|xY{u9{{@F1Vv>$5g{mY2a#Yma-1t2RwFYyJuf9R^QVKbLh*2~7YWEr!eh diff --git a/src/main/resources/assets/hbm/textures/items/thermo_unit_exo.png b/src/main/resources/assets/hbm/textures/items/thermo_unit_exo.png deleted file mode 100644 index 585c82e13c98f09f32b996c56121254f320c3226..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3?s>X6hFJJ7outcm$U&g>HHTv9lC7aJOpT5c7d&9$IM?t{>FU=I<$_QZ zl_hLCv#f2NIWD`K8E%p@S^w_O>e}6RIUEG;sZ3<|oOI$+e7H}6mvT&+eTc$oqdj4U z_il$oy)oF>`B_lp;p`O*e4oX(#~U>A?e_ao+N!t9Z`M)q;|EI(59L}OtF?99+xhW^ z@5ei*XO_flIqbB9S@A@p&=ZC8#UieXQ@@!{OVw1pz5I)i$b#Cg9ZaF2o;SZuifdwO z`MsQ@J@kNj5|iupi?#<2GPN+(TL;Wq{br@+y(a|%wG3--Z?8W8+mH|FQwC30KbLh* G2~7aQqm0e~ diff --git a/src/main/resources/assets/hbm/textures/items/toothpicks.png b/src/main/resources/assets/hbm/textures/items/toothpicks.png deleted file mode 100644 index f3a513abd2a07b64dab71b8b30ae63dffa7ac7fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfaSXBO zO-@)~_Q6E>uYXsSTFxw!Cp#Y2II$TeUVf6G&~wN=?Xd~NvdrHrulMlB*SH6^jjh-J9!;s1Be$NMnhEeN-lGx2Z$!0ok}PWOEU z!Y|L=Tz3IEjI0e=g*z{7*cIN*YWsIW%vMjJfaziAVs(U0000YT%V3D1Zuh@rO6>JdvmY zi5h6eXe^I(aU6(P>9qEFckiNfHTwQgPJaONdb>(+E9hr9=GS{ja2*8OYeE45kLM+w zuE$Xje7m3Xy;#PGX3D!J?{ISq9+bgE$#A(}Z)rqfUWYj!GU&6DZECTx%!Xrg8V sA{0__W!O!#@EZ_WrIoSByc}Kk0V{_#zHxq0h5!Hn07*qoM6N<$g1NJ3Q2+n{ diff --git a/src/main/resources/assets/hbm/textures/items/trinitite_new.png b/src/main/resources/assets/hbm/textures/items/trinitite_new.png deleted file mode 100644 index 1cfce1f23bec49fe1a17f74cb38386db54140d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@p%bqTdAr}5~C$8pWa^!LS{ySiCfQrqv2OMlXY$9Ao|La-Kp0mu@T0y|P z{MK7r-9(M0AyUU*FZ%8s>R3@5<6FUh<#j0Q!{fgV9_n&zpKkoIfZ@Q~tuy_;*Rmec zKYur-oYAsp4R7S*pIuxBuD#uPCP{+5p@KPYJ%@wcWJkq+GKm%Ylo(8SpS*4Rx$e34 zE(W$%1;sBM<&1S1?6(aZr-d~95#JRm!IU&(`$L8c1q|kI!tS+w{>H#@k+rf>@r&q$ urwXUkAIH6VqqIgMDA)e_#~=QwKNu=)7D;w0xb6UYkHOQ`&t;ucLK6V3ii55I diff --git a/src/main/resources/assets/hbm/textures/items/xanax_2.png b/src/main/resources/assets/hbm/textures/items/xanax.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/xanax_2.png rename to src/main/resources/assets/hbm/textures/items/xanax.png