From 15235474672fb96c91df57618a4e63a78dc83457 Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 13 Aug 2024 11:21:44 +0200 Subject: [PATCH] removed more crap --- changelog | 7 +- gradle.properties | 14 ++- src/main/java/com/hbm/blocks/ModBlocks.java | 20 ---- .../com/hbm/blocks/generic/BlockCrystal.java | 34 ------ .../java/com/hbm/crafting/MineralRecipes.java | 2 - .../hbm/inventory/recipes/PressRecipes.java | 1 - src/main/java/com/hbm/items/ModItems.java | 3 - src/main/java/com/hbm/main/ClientProxy.java | 1 - .../java/com/hbm/main/CraftingManager.java | 1 - src/main/java/com/hbm/main/MainRegistry.java | 6 + .../com/hbm/render/block/RenderCrystal.java | 108 ------------------ .../hbm/textures/blocks/brick_dungeon.png | Bin 706 -> 0 bytes .../textures/blocks/brick_dungeon_circle.png | Bin 598 -> 0 bytes .../textures/blocks/brick_dungeon_flat.png | Bin 422 -> 0 bytes .../textures/blocks/brick_dungeon_tile.png | Bin 507 -> 0 bytes .../blocks/cheater_virus_seed_alt.png | Bin 372 -> 0 bytes .../hbm/textures/blocks/crystal_energy.png | Bin 488 -> 0 bytes .../hbm/textures/blocks/crystal_power.png | Bin 648 -> 0 bytes .../hbm/textures/blocks/crystal_robust.png | Bin 419 -> 0 bytes .../hbm/textures/blocks/crystal_trixite.png | Bin 215 -> 0 bytes .../hbm/textures/blocks/deco_steel_alt.png | Bin 332 -> 0 bytes .../hbm/textures/blocks/deco_titanium_alt.png | Bin 330 -> 0 bytes .../hbm/textures/blocks/deco_tungsten_alt.png | Bin 331 -> 0 bytes .../hbm/textures/blocks/fwatz_computer.png | Bin 275 -> 0 bytes .../textures/blocks/fwatz_conductor_side.png | Bin 384 -> 0 bytes .../hbm/textures/blocks/fwatz_cooler.png | Bin 261 -> 0 bytes .../hbm/textures/blocks/fwatz_cooler_top.png | Bin 341 -> 0 bytes .../assets/hbm/textures/blocks/fwatz_core.png | Bin 503 -> 0 bytes .../hbm/textures/blocks/fwatz_hatch.png | Bin 468 -> 0 bytes .../hbm/textures/blocks/fwatz_plasma.png | Bin 4244 -> 0 bytes .../textures/blocks/fwatz_plasma.png.mcmeta | 45 -------- .../hbm/textures/blocks/fwatz_scaffold.png | Bin 358 -> 0 bytes .../assets/hbm/textures/blocks/fwatz_tank.png | Bin 335 -> 0 bytes .../assets/hbm/textures/blocks/hazmat.png | Bin 437 -> 0 bytes .../assets/hbm/textures/blocks/hazmat_alt.png | Bin 663 -> 0 bytes .../blocks/machine_gas_furnace_fron_on.png | Bin 549 -> 0 bytes .../blocks/machine_gas_furnace_front_off.png | Bin 523 -> 0 bytes .../blocks/machine_gas_furnace_off.png | Bin 447 -> 0 bytes .../blocks/machine_gas_furnace_on.png | Bin 736 -> 0 bytes .../blocks/machine_gas_furnace_side.png | Bin 435 -> 0 bytes .../blocks/machine_gas_furnace_top.png | Bin 427 -> 0 bytes .../hbm/textures/blocks/machine_generator.png | Bin 425 -> 0 bytes .../blocks/machine_generator_side.png | Bin 453 -> 0 bytes .../blocks/machine_keyforge_side_side.png | Bin 605 -> 0 bytes .../blocks/machine_keyforge_top_alt.png | Bin 552 -> 0 bytes .../textures/blocks/machine_minirtg_side.png | Bin 475 -> 0 bytes .../textures/blocks/machine_minirtg_top.png | Bin 590 -> 0 bytes .../hbm/textures/blocks/machine_selenium.png | Bin 257 -> 0 bytes .../blocks/machine_telelinker_side.png | Bin 559 -> 0 bytes .../blocks/machine_telelinker_top.png | Bin 531 -> 0 bytes .../assets/hbm/textures/blocks/muffler.png | Bin 800 -> 0 bytes .../hbm/textures/blocks/turret_cheapo.png | Bin 290 -> 0 bytes .../hbm/textures/blocks/turret_cwis.png | Bin 242 -> 0 bytes .../hbm/textures/blocks/turret_flamer.png | Bin 272 -> 0 bytes .../hbm/textures/blocks/turret_heavy.png | Bin 226 -> 0 bytes .../hbm/textures/blocks/turret_light.png | Bin 251 -> 0 bytes .../hbm/textures/blocks/turret_rocket.png | Bin 247 -> 0 bytes .../assets/hbm/textures/blocks/turret_tau.png | Bin 258 -> 0 bytes .../assets/hbm/textures/items/pellet_coal.png | Bin 151 -> 0 bytes 59 files changed, 19 insertions(+), 223 deletions(-) delete mode 100644 src/main/java/com/hbm/blocks/generic/BlockCrystal.java delete mode 100644 src/main/java/com/hbm/render/block/RenderCrystal.java delete mode 100644 src/main/resources/assets/hbm/textures/blocks/brick_dungeon.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/brick_dungeon_circle.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/brick_dungeon_flat.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/brick_dungeon_tile.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/cheater_virus_seed_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/crystal_energy.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/crystal_power.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/crystal_robust.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/crystal_trixite.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/deco_steel_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/deco_titanium_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/deco_tungsten_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_computer.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_conductor_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_cooler.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_cooler_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_core.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_hatch.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png.mcmeta delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_scaffold.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/fwatz_tank.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/hazmat.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/hazmat_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_fron_on.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_front_off.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_off.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_on.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_generator.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_generator_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_keyforge_side_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_keyforge_top_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_minirtg_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_minirtg_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_selenium.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_telelinker_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_telelinker_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/muffler.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_cheapo.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_cwis.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_flamer.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_heavy.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_light.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_rocket.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/turret_tau.png delete mode 100644 src/main/resources/assets/hbm/textures/items/pellet_coal.png diff --git a/changelog b/changelog index 71781d6b4..e6bde3d38 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,7 @@ * Plushies ## Changed +* Updated chinese localization * The fluid burner, heat exchanging heater and cooling tower now use the single steel pipe items instead of the larger steel pipes * Reduced the amount of condensers needed for crafting the cooling towers * Liquefactors and solidifiers now have a base processing time of 5 seconds per operation (instead of 10) @@ -17,6 +18,7 @@ * Decreased hardness of slag blocks * Removed legacy circuits * Removed a bunch of random unused items +* Centrifuges are now configurable via `hbmMachines.json` ## Fixed * Fixed crash caused by decontaminating items with the radiolysis machine @@ -27,6 +29,7 @@ * Fixed radiolysis recipes not showing up in NEI unless the usage recipes are loaded first * Fixed autocrafter's grid not properly updating when using NEI drag and drop for the filter * Fixed all carbon-based crucible materials having the wrong ID, this fix will shift IDs but prevent collisions with silicon -* Fixed primary bedrock ore fraction roasing yielding one extra pile of crumbs +* Fixed primary bedrock ore fraction roasting yielding one extra pile of crumbs * Fixed filing cabinets being unreasonably laggy due to the old packet code -* Fixed the secure access door taking way longer to craft than any other door \ No newline at end of file +* Fixed the secure access door taking way longer to craft than any other door +* Fixed issues with the spotlight crafting recipes \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e925744a2..05ee52d24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ credits=HbMinecraft,\ \ Alcater (GUI textures, porting),\ \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, better particle diodes),\ \ Pheo (textures, various machines, models, weapons),\ - \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide),\ + \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron),\ \ LePeep (coilgun model, BDCL QC),\ \ Adam29 (liquid petroleum, ethanol, electric furnace),\ \ Pvndols (thorium fuel recipe, gas turbine),\ @@ -19,15 +19,16 @@ credits=HbMinecraft,\ \ Doctor17 (russian localization)),\ \ Pashtet (russian localization),\ \ Bismarck (chinese localization),\ + \ Creeper-banner (chinese localization),\ \ Maksymisio (polish localization)\ \ el3ctro4ndre (italian localization),\ \ Pu-238 (Tom impact effects),\ - \ UFFR (RTGs, guns, casings, euphemium capacitor),\ - \ Frooz (models),\ + \ UFFR (RTG pellets, guns, casings, euphemium capacitor),\ + \ Frooz (gun models),\ \ VT-6/24 (models, textures),\ \ Nos (models),\ \ Minecreep (models),\ - \ 70k (textures, glyphid AI, strand caster),\ + \ 70k (textures, glyphid AI, strand caster, electrolyzer changes),\ \ haru315 (spiral point algorithm),\ \ Sten89 (models),\ \ Pixelguru26 (textures),\ @@ -37,13 +38,14 @@ credits=HbMinecraft,\ \ Silly541 (config for safe ME drives),\ \ Voxelstice (OpenComputers integration, turbine spinup),\ \ BallOfEnergy1 (OpenComputers integration),\ - \ martemen (project settings),\ \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\ \ SuperCraftAlex (tooltips)\ \ Ice-Arrow (research reactor tweaks),\ \ 245tt (anvil GUI improvements),\ \ KoblizekXD (doors),\ \ FOlkvangrField (custom machine parts),\ + \ RosaTryp (centrifuge config),\ \ Toshayo (satellite loot system, project settings, gradle curse task),\ + \ martemen (project settings),\ \ OvermindDL1 (project settings),\ - \ impbk2002 (project settings),\ + \ impbk2002 (project settings)\ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 51c055603..6736f4aa9 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -148,11 +148,6 @@ public class ModBlocks { public static Block ore_tikite; - public static Block crystal_power; - public static Block crystal_energy; - public static Block crystal_robust; - public static Block crystal_trixite; - public static Block block_thorium; public static Block block_thorium_fuel; public static Block block_uranium; @@ -273,8 +268,6 @@ public class ModBlocks { public static Block snowglobe; public static Block plushie; - public static Block hazmat; - public static Block gravel_obsidian; public static Block gravel_diamond; public static Block asphalt; @@ -1329,11 +1322,6 @@ public class ModBlocks { ore_bedrock_oil = new BlockGeneric(Material.rock).setBlockName("ore_bedrock_oil").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(1_000_000).setBlockTextureName(RefStrings.MODID + ":ore_bedrock_oil"); ore_tikite = new BlockDragonProof(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt"); - - crystal_power = new BlockCrystal(Material.glass).setBlockName("crystal_power").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_power"); - crystal_energy = new BlockCrystal(Material.glass).setBlockName("crystal_energy").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_energy"); - crystal_robust = new BlockCrystal(Material.glass).setBlockName("crystal_robust").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(10.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":crystal_robust"); - crystal_trixite = new BlockCrystal(Material.glass).setBlockName("crystal_trixite").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_trixite"); block_uranium = new BlockHazard().makeBeaconable().setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(50.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium"); block_u233 = new BlockHazard().makeBeaconable().setDisplayEffect(ExtDisplayEffect.RADFOG).setBlockName("block_u233").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(50.0F).setBlockTextureName(RefStrings.MODID + ":block_u233"); @@ -1454,7 +1442,6 @@ public class ModBlocks { bobblehead = new BlockBobble().setBlockName("bobblehead").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron"); plushie = new BlockPlushie().setBlockName("plushie").setStepSound(Block.soundTypeCloth).setResistance(50_0000.0F).setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_fiberglass_side"); - hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":hazmat"); gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(240.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian"); gravel_diamond = new BlockFalling(Material.sand).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond"); @@ -2451,12 +2438,6 @@ public class ModBlocks { //Secret register(stone_keyhole); - //Crystals - GameRegistry.registerBlock(crystal_power, crystal_power.getUnlocalizedName()); - GameRegistry.registerBlock(crystal_energy, crystal_energy.getUnlocalizedName()); - GameRegistry.registerBlock(crystal_robust, crystal_robust.getUnlocalizedName()); - GameRegistry.registerBlock(crystal_trixite, crystal_trixite.getUnlocalizedName()); - //Resource-bearing Stones register(stone_resource); register(stalagmite); @@ -2599,7 +2580,6 @@ public class ModBlocks { GameRegistry.registerBlock(bobblehead, ItemBlockMeta.class, bobblehead.getUnlocalizedName()); GameRegistry.registerBlock(snowglobe, ItemBlockMeta.class, snowglobe.getUnlocalizedName()); GameRegistry.registerBlock(plushie, ItemBlockBase.class, plushie.getUnlocalizedName()); - GameRegistry.registerBlock(hazmat, hazmat.getUnlocalizedName()); GameRegistry.registerBlock(deco_rbmk, deco_rbmk.getUnlocalizedName()); GameRegistry.registerBlock(deco_rbmk_smooth, deco_rbmk_smooth.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockCrystal.java b/src/main/java/com/hbm/blocks/generic/BlockCrystal.java deleted file mode 100644 index 0204d0f78..000000000 --- a/src/main/java/com/hbm/blocks/generic/BlockCrystal.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hbm.blocks.generic; - -import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; - -public class BlockCrystal extends BlockDragonProof { - - public BlockCrystal(Material mat) { - super(mat); - } - - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderType() { - return renderID; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int onBlockPlaced(World world, int x, int y, int z, int side, float hX, float hY, float hZ, int meta) { - return side; - } -} diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 5632a9dd6..db125cf8c 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -423,8 +423,6 @@ public class MineralRecipes { add1To9Pair(ModItems.powder_paleogenite, ModItems.powder_paleogenite_tiny); add1To9Pair(ModItems.ingot_osmiridium, ModItems.nugget_osmiridium); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth }); - GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat }); GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { "##", "##", '#', ModItems.powder_balefire }); add9To1(ModItems.cell_balefire, ModItems.egg_balefire_shard); diff --git a/src/main/java/com/hbm/inventory/recipes/PressRecipes.java b/src/main/java/com/hbm/inventory/recipes/PressRecipes.java index 204553081..db090d982 100644 --- a/src/main/java/com/hbm/inventory/recipes/PressRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/PressRecipes.java @@ -64,7 +64,6 @@ public class PressRecipes extends SerializableRecipe { makeRecipe(StampType.FLAT, new OreDictStack(LAPIS.dust()), new ItemStack(Items.dye, 1, 4)); makeRecipe(StampType.FLAT, new OreDictStack(DIAMOND.dust()), Items.diamond); makeRecipe(StampType.FLAT, new OreDictStack(EMERALD.dust()), Items.emerald); - makeRecipe(StampType.FLAT, new ComparableStack(ModItems.pellet_coal), Items.diamond); makeRecipe(StampType.FLAT, new ComparableStack(ModItems.biomass), ModItems.biomass_compressed); makeRecipe(StampType.FLAT, new OreDictStack(ANY_COKE.gem()), ModItems.ingot_graphite); makeRecipe(StampType.FLAT, new ComparableStack(ModItems.meteorite_sword_reforged), ModItems.meteorite_sword_hardened); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 7bd4d7df8..0dd074de1 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -663,7 +663,6 @@ public class ModItems { public static Item turbine_titanium; public static Item blade_tungsten; public static Item turbine_tungsten; - public static Item pellet_coal; public static Item ring_starmetal; public static Item flywheel_beryllium; @@ -2970,7 +2969,6 @@ public class ModItems { 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"); - pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_coal"); 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"); @@ -6239,7 +6237,6 @@ public class ModItems { GameRegistry.registerItem(pellet_charged, pellet_charged.getUnlocalizedName()); GameRegistry.registerItem(pellet_gas, pellet_gas.getUnlocalizedName()); GameRegistry.registerItem(magnetron, magnetron.getUnlocalizedName()); - GameRegistry.registerItem(pellet_coal, pellet_coal.getUnlocalizedName()); //Engine Pieces GameRegistry.registerItem(piston_selenium, piston_selenium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 6f3b52609..59c4708a6 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -852,7 +852,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerBlockHandler(new RenderPipe()); RenderingRegistry.registerBlockHandler(new RenderBattery()); RenderingRegistry.registerBlockHandler(new RenderAnvil()); - RenderingRegistry.registerBlockHandler(new RenderCrystal()); RenderingRegistry.registerBlockHandler(new RenderCable()); RenderingRegistry.registerBlockHandler(new RenderCableClassic()); RenderingRegistry.registerBlockHandler(new RenderTestPipe()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 4ece7c653..9b8c65473 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -102,7 +102,6 @@ public class CraftingManager { addRecipeAuto(Mats.MAT_DURA.make(ModItems.bolt, 16), new Object[] { "D", "D", 'D', DURA.ingot()}); addRecipeAuto(new ItemStack(ModItems.bolt_spike, 2), new Object[] { "BB", "B ", "B ", 'B', STEEL.bolt()}); addRecipeAuto(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', STEEL.block() }); - addRecipeAuto(new ItemStack(ModItems.pellet_coal, 1), new Object[] { "PFP", "FOF", "PFP", 'P', COAL.dust(), 'F', Items.flint, 'O', ModBlocks.gravel_obsidian }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_RUBBER.ingot() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 16), new Object[] { "DD", 'D', FIBER.ingot()}); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 27e0248d4..dd263e35e 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1392,6 +1392,12 @@ public class MainRegistry { ignoreMappings.add("hbm:item.energy_ball"); ignoreMappings.add("hbm:item.discharge"); ignoreMappings.add("hbm:item.empblast"); + ignoreMappings.add("hbm:tile.crystal_power"); + ignoreMappings.add("hbm:tile.crystal_energy"); + ignoreMappings.add("hbm:tile.crystal_robust"); + ignoreMappings.add("hbm:tile.crystal_trixite"); + ignoreMappings.add("hbm:tile.hazmat"); + ignoreMappings.add("hbm:item.pellet_coal"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/render/block/RenderCrystal.java b/src/main/java/com/hbm/render/block/RenderCrystal.java deleted file mode 100644 index 6cf4f830d..000000000 --- a/src/main/java/com/hbm/render/block/RenderCrystal.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hbm.render.block; - -import org.lwjgl.opengl.GL11; - -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.BlockCrystal; -import com.hbm.main.ResourceManager; -import com.hbm.render.util.ObjUtil; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.obj.WavefrontObject; - -public class RenderCrystal implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - - GL11.glPushMatrix(); - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, 0); - tessellator.setColorOpaque_F(1, 1, 1); - - if(renderer.hasOverrideBlockTexture()) { - iicon = renderer.overrideBlockTexture; - } - - GL11.glRotated(180, 0, 1, 0); - tessellator.startDrawingQuads(); - - if(block == ModBlocks.crystal_power) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_power, iicon, tessellator, 0, false); - if(block == ModBlocks.crystal_energy) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_energy, iicon, tessellator, 0, false); - if(block == ModBlocks.crystal_robust) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_robust, iicon, tessellator, 0, false); - if(block == ModBlocks.crystal_trixite) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_trixite, iicon, tessellator, 0, false); - - tessellator.draw(); - - GL11.glPopMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, 0); - tessellator.setColorOpaque_F(1, 1, 1); - - if(renderer.hasOverrideBlockTexture()) { - iicon = renderer.overrideBlockTexture; - } - - tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); - tessellator.setColorOpaque_F(1, 1, 1); - - float flip = 0; - float rotation = 0; - - int meta = world.getBlockMetadata(x, y, z); - - if(meta == 0) - flip = (float)Math.PI; - - if(meta == 2) - rotation = 90F / 180F * (float) Math.PI; - - if(meta == 3) - rotation = 270F / 180F * (float) Math.PI; - - if(meta == 4) - rotation = 180F / 180F * (float)Math.PI; - - if(rotation != 0F || meta == 5) - flip = (float)Math.PI * 0.5F; - - tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); - - if(block == ModBlocks.crystal_power) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_power, iicon, tessellator, rotation, flip, true); - if(block == ModBlocks.crystal_energy) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_energy, iicon, tessellator, rotation, flip, true); - if(block == ModBlocks.crystal_robust) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_robust, iicon, tessellator, rotation, flip, true); - if(block == ModBlocks.crystal_trixite) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_trixite, iicon, tessellator, rotation, flip, true); - - tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockCrystal.renderID; - } -} diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon.png deleted file mode 100644 index a6b18a2347853a46b18b53eed0fb2853e4b85913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 706 zcmV;z0zLhSP)b9lTB6m9>P_ErAk25{UC} z`;Kl(s%h2tog@DH|4;b%_&^9j(==pRhI5XxEXng6Ap~_@^Zx!$2!ZGG$vn?kYq{NS zsAXBG>l$klI@Ro6QFAJz17pHBpc<(u#PH3&^x{fqWnWhOL1S&}qthGof>HD4}NvNs{tu;xKptWXM z7M5jUnkGUBe1CtFrYTA(6u{ft8;{2Wr4+B%3#AmsnDsk=5Q47j7>0p=G16|jVBnjSogb<`@N*u=kZ2n#L-qSP<#u&8Lv~9~U3@fzP z>&1S*Uuy{=08nk)5<=j9zZ1tXQ54a(EzUVY2mpi-h@yz1D3DUF)i#?A>g(%^q9`~X zk9hC7-|r};SeAv$<$~6l?RHC+W#oAdKomukWl5H0sGpx70II5@ZQC`zF$U)xhrzrXDFd%X9I z0M0q`JZD)JthKyeFN`s(A=NYu<2bH#rIZv!fl>csw4f|Dq^x o&avHYnWl+2j*(I_jw1kn0f5ty@vUrK)&Kwi07*qoM6N<$g0K)ddjJ3c diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_circle.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_circle.png deleted file mode 100644 index 7a5f296809c88aaceb769b112a797fbb7106f45b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 zcmV-c0;&CpP)y;5QV>;owXCBs6Th5KtO6G=+pEG`htC$N>u?-T1Wyy zR00Lk5Zk-6y>M(L>RwsvnRCvZGwVKo`I^l#v1w>x13=J#6Cs%S#V%Gd%|&=Zu+QW{eL%5lO_DSXDKP`4w7MbJjW_a&=1?A3r?*BY7f4IbZ z-`3fB&e`OQozVfRiiotMtQCj|Ap}AQhzJLVC*+(-DIp!Za}MWRuciZtF=A#EML}7X zYvuui!2qBIm|Xqn*+U4VlrS@zruC*%q^gu<$@8LNe|(Ipq9THbkaKS1Y8t%v{kMqV zy~lgs*QhE%m7*xnutwc9s~e$X?!ZC_IOiA+hYW|UH(IQlQ%Zyo{sY(?qpPXw8XK1F zea@M8yC0~QH(RV-jJC0jW=2(23`_WZ`5iNBO-z;mh%xrfn?T*a7$Z&7(CrR@ESF2n zGW+9Wa?X8heZg8uN{JXFuSNya>r+xn)OC%DID!Ul?;cq`PuM#+M%6Qas<)cozS$wg z$aHenzY*sg8Z_`YU$Oc-V=x$SfAw}W%^(i^$Hha}xoi3J%m&Fw4+?EHo kvx}`5yM5?V(e)nu18IUZq8o$sDF6Tf07*qoM6N<$f`m~Fi~s-t diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_flat.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_flat.png deleted file mode 100644 index 646165eb1cef0ca45bdd7a5d67ba062bcd5941ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmV;X0a^ZuP)89P)-N9^fwpg@&$@5XrNHF2o;)5848Y8A_Z!G@9F$TpGgMPb0oWkDcf8hm zYtpniClRrmdhfK>Ff-O#j4=Sd005cET8mQ3ZG}<_nMr0c=VZ=_hCUt-JTo^cfV*$n zVjwmEb57iS1G=V*zP`S#T1jG&Naegj2$8+c55KN-|zR{>)Ncq zC?}aoYmK!Q$8mgJP_YEPhUpq-*?H~ph+wUC`xCW-8USjoxchb>A~?^Jf3BT2?Sxgo Q^Z)<=07*qoM6N<$f`U7_k^lez diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_tile.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_tile.png deleted file mode 100644 index 484111395ab82f7bb14d4fff8b2302a32a8fe327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 507 zcmVM1$*-c0SNc$UTY;H$jpg+5}6t6x}vI-QZO@2L>PA@fZjW*I=@8( zRh`&pw1_}Nuxds%qq~!N;O2e)r}HUR>oMNT-W z#u$YA#6DgB7dy*stdawaWGR#_i8{E|<%E@VKF>I`1Na xnN2!-*@D-XZbNAnXxPje*psGK?uTUB~$dwm-O#JoD$zpV8r$WdZo`W+pJwF);uT=0kpa)=E@BExNq`+o#AU2BcPoW_a9@)23>m zkDpr8y;TAH?|~hsO|prWNGjqUSRd94bm6vXNq)HpKS?zU8MXFFXlc?hO6J-q`DE8# z8|oxa(k#1hP)NklXZAxEDys|lxVg5$rFc7 zPw=+UY-Q#?P{=SmnTyr4{*5`XJ!qw$S(_Ahj$RfV>dL-9iYKEe&2_-+Q<*80ZBnun z)=|ZPkD?<8#gn-5!5F0gpw8M2MGX5A$i5U#JqMw98iE(BEf=9*+x7tD-=%dimmTr7 zbuXTVA4QtOD;MK(Bj6ANnmhzg=2i7o6~|$zFmML+wVDzO#nY?oiuIPOWGQS(RZ5e$ zMi2+$Y2W5fnd@q}$0jfP@*7VGo?1ap(|};s4d8aPxpc`x@wN(#!n)Fo^%=IM{zV>& zw*ril?B{6zlsfoK(1%@JnznR_dM@k59fh<@#8!&&I98-FwO(xJTT4! e<2>;1^T02jI_{d5qDF-P0000PY>zyrnsO`rDN8npdS2l&z_4u0+<9aaU^3iU*0B^@#V8ProBFQL7iHvpwWI;o1L zca#B?3sPJ*&H&bhoWG*s)FarxBfMQs1~852<};GP@(9}#iWMbf0xihp3B}7L+M~Qh z13wFZTC=CdZjmqK`b;(_RnTeN)4QTrFVP?6UtJ^+D_S1G7id37cW_{uDDOX$GPFFB z+Y`9|3gQrN#XvXtOHIW59o1)~peV=+yHs}pP2^gL#qmXqAMy}ys(@8cCAJ1F`lSvP zYy@xQw!q5+ssltL_tR(Wb$)=~`#>)j#Y{$Y!DK;pBHIjYgPf7g02F~HD8nB40p2cB z_H!>A`W50%Wkzz+3Jeojhh9FuP|7O-9N>S8uoz&Z&SVB^0WBy7IgBvf!FbnYzY9sP zRrp4}AD~Wfy6@SH2Wrl}y;>#G$*rMsMs`b<35Jiz7w{L3@_&{gprYQ^OK+KRo{95@ zwkJv~Xm}5${*AqvH-OyEWP3mblp89*9|9H>qp0SjXc7q0}ul&Ff{^|#=e&Ff{u72R^ i2d;kL>IeS2ANUE!dvZ5A3|CYD0000+n(3vb}gh3D}8cmfyhasw9%!vCw5zP_YQd|L;E zDruZfl4-Ln%O8xGrU?MB@4IzN+@pa2;5d$tkHavCiI_RAtt7%8l|W#)ZCf?bbzNf8 zk}_eBhL)MZ%$VmHL=azi&;>8OO{sBD3Y9(*(Iw}AF N002ovPDHLkV1nZ0x9$J{ diff --git a/src/main/resources/assets/hbm/textures/blocks/crystal_trixite.png b/src/main/resources/assets/hbm/textures/blocks/crystal_trixite.png deleted file mode 100644 index 30fddb0b3b6a51b8d5708da8c4305b76a43ec01c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK^7}kp977^n zlTB`Y{cq1Kd(hI{%`L@_`>L+Rp6M!Ib(Ul)aMgjHy8gFtp64LnPAjE=h%nFd e5VL13BKQSck7gTj+g=R-0000X?jdF zC^{cckMU($9uF+=4UVe(I(=jV$T<&VHP?NizY&5w=%-)>nEC5S0f0p0)i?tU@J0N3 zP~iJ}lWp*IU486SO6jwGyTb8;`4+kd5gK}QFVfzOs$yN&{}#^k9OT<+r4$em=6N1s c_N+w&zbNZx3+P52z5oCK07*qoM6N<$f`pQXLjV8( diff --git a/src/main/resources/assets/hbm/textures/blocks/deco_tungsten_alt.png b/src/main/resources/assets/hbm/textures/blocks/deco_tungsten_alt.png deleted file mode 100644 index b99a7abb9754c739e4900c4dad1067ef5d9fa0dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)=A|5Be!s0cQR>QUD+kc{R>J1AGy` z9u)Zg-eenmT~{AFl~Vd_->z`HV7`U!L4<}L-HWt0qpDcf^}mJlJO}x9S}6rYgn6Ea dm_2I|!7rtWWv?RrAGiPj002ovPDHLkV1nxPilqPm diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_computer.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_computer.png deleted file mode 100644 index 1a00908d66d04483c34457f6efc9c027af9593d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(F9Ky z#}EtusS^%zHW=`@8aFM^dmxkdU}txQp5CK1ZbDB^ns)@$&Hl4TZSB{4XM?sso-wU; zrlDJQ?@xY*&yoRKJM!3G@4Iai?yzH_WI>o#_GLsH!K{pFW&7^ SsWt$*jlt8^&t;ucLK6TGr)OON diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_conductor_side.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_conductor_side.png deleted file mode 100644 index 822c86ba4bff2d0c3db4095f2383e4418c88e18d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~LCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33Jwt=FTwDi$ivD`K zIEGmGZ=H0Ti!o55wS1;bkq2L}T*4xiJeAgmP7|H^#M`*}6}%p~8TDRHt_Zuo#aqfW z#-R4|_FHH7f4dT;BqLX8qwAW<&h*zKMW);LQDL*DB7U>%EkD%IV`? zM^}aU`)G)Lf8XNd+}Qs33TySj*KeN`&CV(N>t(mUcGAf;mtHPirt8qL?7_{u?`uy7 zg?_bOo4G7gs!j0f*ZwHI|G(Md!VC{Qlh!pz5M|D>%NAdL|E@zp-xaP_*%Mbfe4MgW zGT5j4oRjLEy)Hg$tFcqi`gqN$i^UVB>rb3v!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVTQIn^O zV~B5&OpYnO^>H6AoMui!lS z(u(>63BS$&Ssh>QMQ3N+dU%1swd>}GRmL~ESDd^y_n?_;ja|?ck&k;PZsQ49!mb?2 zrX#=WyZ5$tJUfm#hAuc{mX)V3etXrauPT4$eCBTQkN?&s*_#P;4TGnvpUXO@geCwi CfnR(8 diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler_top.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler_top.png deleted file mode 100644 index c4eb67842577df6f921aca1715a7f29cc78c13a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwt=FTwDi$ijI1^IEGmGmrgL`J7gfhQfU`!Wi@?@=H*MzqR-roc+HTcqPP0%y4pwI zvd*b7{rkC@;dr5i@~ybOI~pGk-uixbWyj)x^G<8hg=HC+UH2-pX*O&NW)w?UJLSmY zK!cC9U1w?zzE*shdt0RRpu{rIbyGL|dRo=;W$(si`OCTDwJQs`{yOYsh_n5#dcaFv zn~`tdOsx;Qm#GF8$SZu?C=@0XevoDTdM0^=w~dSR{s_uzvkG_lu%6sH$#i**N2bZe?^J zG%heMF)*zP3cvsW0dz@3K~y+Tg;GmO13?fiNSJ&lN)z$T?>UFm`jw7P%S-(GN z+u?}ox`ttdh^kKS;7VNaEvo;Fkl891mTcCJ&K@dYn95WpHV&`;Fn6r z#o`gGh%6}r7j&@g8`NtyuV3cmeo7vvjA_UZdrxGK4-<*>%2bN2bZe?^J zG%heMF)~90YwQ330Z~arK~y+Tb&=gl0#Ou&4=C!WV=yW;L_vjMh~0?@I^sppkNw|N z7d=1_M3)glB|cAG6jWE;^dQlL^qtw`nKS(?ma_Mrz4l(`9OZ=YLd;r_3XldMsTKql z)-C+5XaPT}p*X_)6j45{!~!C6*F8+7Hqz-$$Js5Fj=Tt1f1vPuRUfwXCX9GX0n*={zk8jZ`>W%V$po)*;eqN>%- zp;FrYPXQbH{c*2%_pzqFhBKdA?#q%gJ86gxZ3NZoseFE4Rdhp^NF|@&iv=da5`N&@ ziZ+9*M_*g2*DtWdArk^}HVg(6Tm`{Bfy@?~YfT6$l@q(kCO1YK0{lnU%0G|ABq)zn zDC~2&LS9qmY5_MT0>B=@pJ^;00>}*ht02rA(%SpIc+kW4i!qD@{%Dn z>~>l>^P41h&ws);9MlHqP60{UEPnNZTgJ+}Azmxl6zkz|Z9$pCB=xCqdlOViIDK64g{x-2gzdqo<{A zVWVT2nHW-}n->2~%kRs-cMAj4$m?`pv8%a?@KocQ=4yf;mA1CNEIs~nXuE*09MpsxTnBtMcw8Yar8Gl|ya0diTd(@_Hc_E~3*NDHavs@L9?mRf zx+ud`dv^4@>yr$26z7C)Q@t3vTn{qkzq5H1+_VGpv!xl{`8sn&{QS-;|BVGIW4M71 z`y=v9*njLf+_rjx`QW1K>JB-{x^$5d%J_qPQJd1`zaE>WkHmh=8a@}I{CO4Tw#$?= zIxbE#RxU+ShmqWy>%x+Jk0#m`c8;|kDipWy-Om=^J^q1BEK%~7{e|yM+{OOtbBNbs z`kha=SgwfQ-T8``>!!>YlW~f-KkdXGRqoF}xeC3g<+*C#!iW}x4nhZJsU2G2?&T(XXy zp@)|i8hs6$a(bI{C>mGL%5c1@^quCNuKelNxaDHuspZa26^(d=UZhG>dFgp0R}bIg zKghF4T+JqLWyXf#6+G1L8!Gcnc%Cpx^X2!*OT@NuJpH3#kV5fq>Y-@`q}@>_#rY)^ z=BSDYtsXpO)Of|9hWqUC(Qd~khX{TaGF=!1nrIp z<-DUis2)ObMey@qU`W8yhri7x9~L;{h1@GOm6BqI@B8MoOSMycbN8}r{9Q>eS+@7S z`QoU!0^`TCUyVT4j6Sk)hCTDN9dQh@uoqvL;I8N}qaURFWZmOTQDoraiY&0v>^qD;|Z1PRW z%DZ)RDFJn(vbSSOy@<-<659B47EF`<;!(FSI>mIlgy+#qN;>gCv_mc*B;Fh;jS-h| z>>~x1n99$U!WETzvkX>K$tuzAvkqo@r7zIW!|i?5`+Riz-&q9`{C)3 zXHL=@FKdsE;Pp~<&6$((jTy9fCQSb@mYj)K<^yZR_LZnd^^|5YFKHi@Vc!kCqnj$x zAQPqWx0ygLVuh4G&|ezCf96Z&3!}Kky%Npu`HkMC>Z>^D6i@MwuCdH#_pzrcE2oFN zRg}3ObOYpc3stns<>(9RU4lOtXP;|gxpbb5fHudJGKD@3Y8sb^sYL16xC=B`hI?jX z6wQh74{Ft(Le!#v4cS$L=xSo!Nl>&bL4~I4$lF%C9=_eA?%6(%Z?I!2DVFvkDoEq+ z7ds4T5W}iW=W?is3GO72r#964*vVlQSX3QjV{t>UTjJW)85^9Hr@!0_hNf` z@95{Dl+c&YefISHcOO|+Vyc>L^ypU_aqdsP)kZdEUUE7$%y7}Tx;>r z_f6^gL9YkGd={z5DYCVT{ftjbj%?W%!D%iNxxC9Z(iT2a2R0H}z8TGd{*}kBF#~KS>bG*5dARLpoww()UyFaT4tQlJz4OMZ4n5BUGjcf|t zRcQ;ULX#q2h{AeXeidT>M$JZ_@^_O7z)Zp>vyglD@cd!QmBL?d;Fl-3`tNV*%`8k* zZ<`c!;=1)s4^Vu6dc#ft3Mx=Gg(RKlU0JFsZ)`l2%Y1X^1^K`}C3Q}O)&gRVDFakS zX1Y{{k&6-y1(Q%t_~n}v5JJd8?8fnKT0*zU1vM(%c%pX$NTNQyJL&n6tkZ+3TPT%( zGNpkbcWfKyuPjg#)Jhu}6m!C5fDcfr=s0%X*z~^a+^W)i*?`<%)5TLo&`EI*+wO*q zG*<64TXnh;uvF(#jMW;Y>T2{?YRIiiXLK8}JA9=?UQds~iQ7^3S~oHEbF_ z2_3`~d)8Z$-bmip%f({LD_bUpi*+lqITrdVhqY~-Vqv6mytVN* z2Qtg8YRy$22CDXc$r_XY^xLYNLl>l7&GjCJ(k zp}Z*>tErm3)lU-3Z~j~BR+I?Wh!eEO&=_xMGc zT01$4At%Q97HBGV)K);n!R_AK)gWJ*x65Gp112~9z_%2FMa^7mAGfnvgA4)6u_c?g&0ccit>LF`$QMf=VZopth(CEq z=v{XdP*F&v_n}6;I+RM$PUa6^Pd%G%4%!WDu(se*pqLXBiYGWHvL)_29L6)B$bW+} zC;pLxMCkpa7YPg5xY=K9(M~Mz3|^0>vc4No$SOC~Hda%h>l%#Xc@}GO10Tq+S(fXZ zl*Txktn+yI?9G_+-^#Hb(h78wtf*2_qC95=2{d=FcyS$0Q2Ta1&Nt9JHPZi?pqoSa z5Vp_2ehMz}+=I3fp;oi=he0UCuyqC*xA&z6tRyJ1b>p<6+$DH{_!q(bu2*mHcTSa1 z4eSVHT)N>{t;7z?OdW2K%~m&4nwfh!iNWzQd@DMHY{|7Vsmw-8LWdf(78JNx+W}!` z97x8x8@>&zW01NV#os*T-oNIM!Qg|ye#|52a=6^{FkRtaP330!*VQzp#pyOXC?|PF z;9`f&Sa4L&)AoDb>?X8c@`2t>)>uwom_*KHD$;5@cI5R)_j_-Yi3kU7OAg|GJicD{ z8IxjQ|F#3Ba>z@AT?tBGmg|vFbrp?9xh?#F&;M%uc)r0?XnAXZyP-|aJ9HcQ5DNX2 zZ4m!j`rT_sp^-bF*dz^k5oJS`^Eez;z9`2IkIpV9jXm6NZc9;5^}J!52R7QA$Q$U` z17WY0q$`yT-HJvb2iO!?KAIyyT^j+oo(s#8^rgNDIf%Mq*TIQ|f{2Of3Y;wHDn>kl zffrUwiZ1(1EvYIctVJWzPE?CsQD(ubc6lyJj~HT=!teyBo2rI>x}PhW{#{eks1P;C z`ypfOgx6~x*r48qh|EwFQYT9D>}CIMGS+8{{$akV+B0w>*!W(UYz}s;SJP@ppRt8F zpCI_-1>P&&z*DRv8GfAfMJ->FLlhRn-E}?6`9Fhk`VC$yFGlm<5l>ODcS}x(0P3c& zD=t}Q^_P=_$@%^Q*@aaI+0+H|lFlJbSdVTrf7WNp^vG47xsyJtanq*ay0t!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(PK{+ z#}Etu(us~-hYSQ`bNV^X#Qk9VebwzT5Rq>W)-Izc$Mk)pcxFE}InAg@pt> zxg*hWCeXTF;>}slH9C@iGK!{a7Vp^nUG;|Hh8xBj#cy=EELI=nb_jp=Bq&>BVt@0k zy{BcqNwzii-;p>mJ=O8~z4Z&`K3<)}v$TB81kK_J6F1e@h51!)zG3?zUi$b&%WuAH z(UX{qQ_R=0DS1e*`LjB~n{9);G`Ftm^VmdKI;Vst0D1w5 AdH?_b diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_tank.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_tank.png deleted file mode 100644 index 248ae197db1c6cdc9f88ec051a088e33ae6166d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(HTz{ z#}Etuqm$2aH93g1vdjFr-ump2dO*R$Y?Z&)7tMF|54f=C`~K1v>pMn{${s&vd_4EC zz_K7jB=_W|WlKt(=WSnNaW8Pv8%0e3>!O&a~t+CP6zsn!PC{xWt~$(69BIthfV+h diff --git a/src/main/resources/assets/hbm/textures/blocks/hazmat.png b/src/main/resources/assets/hbm/textures/blocks/hazmat.png deleted file mode 100644 index 92997dc0b254e071bdc9e30198dc751d3fc41e03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmV;m0ZRUfP)YE;CClNt6^gYAq3gt;s?_!OR{_qc+w&>RIXE6+yZzwPBrqiff(oVtkB9C~ryrU|nD)<=v2L12txRaMaUciL8GV`X_|UF)*zbm6@U7+w1gLHl_=;q}VR%F9JFJEuVS z9w`JE$D9C)pC-i@=d)x4EzuI!o3^KIzZ-=B#j>z~Xf+L7uL4raBbj{8-x zjB3-UP+g01jG5JDqqwH|6nMY2)s!^vJZ^rLFFyDK*nI5OSVukE00000NkvXXu0mjfnAXQh diff --git a/src/main/resources/assets/hbm/textures/blocks/hazmat_alt.png b/src/main/resources/assets/hbm/textures/blocks/hazmat_alt.png deleted file mode 100644 index 049f1bae850a987108109d4cfe27d51d2e3c0552..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmV;I0%-k-P)h0OW{w!GT~P2%4&B zB;0X#%d9g!)1L-Co()9@#as1$l=}HoYAM1nJZ8QA&3=Dmnji#+_xCa8NZ-F=w>xLO zzCo#iwUv}0gbt%rMkG^;r4(VBKq=_^=bW8=Kx+_rht?TuGa`^Pl%fF8&VjYy+z*^P zAOc+no6T1ML?ERT#_=IBLI`kq`IMAS06|X^cyB4i5~D>ah!ILL48s{QLf^k;wYqK_ zHEg%vh|!@`!i3PFR3&H2dVQeQe-tgwU1AJ4_lfoT2Ip8wJ;St6h5t%3@QER~a9i@2-|20Gym0NlD1LBWFXcnpzD|mi{$bgE8DnHM`viGx|X` zYsV$dCQs`Io+gK3d9}7*sfsZZT^C5H4K=0#b7t|Ym9=9V5F^a9Bc+*XIz{WmY89we z2%#AXkh2iNhLn106}-QPDFwWDgs??x%P_nIBHrIn%3XH5k61gBl0m78Qf->GnVkP% zhQX4v!MTe?<7c+pi`$KxOCU8$=RHCFc1FIa|Dc!JRwjfTrty@fXq@PoG|d@2LO)002ovPDHLkV1kv4DG&ev diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_fron_on.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_fron_on.png deleted file mode 100644 index 6763f77a438e312b246abd4565c2baaf43314fa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 549 zcmV+=0^0qFP)7IwB)>N<@7c2exRM$kY`Gc$MQoO{pQE1sV}Ib#e$2(;E{tx-xL zgupq+1wshIFhmG(6H|pkfo8J_faiHgDR0R8{hmjd&*!Ma;Xo8c07Oy5>2!KXxCgb} zZn4&;B8$c1pM+Yimc9+c5as(mPft%oQN(020bn#5-X(WBFD#c!TCElUzVG7!7-O*3 zqP2cVz6firZ!PS0JB%>^SZlA!$%jT!gp?A`^H{A`SZmpAHV7fuZnvm>K2N1m;e0+L zrKH<^<#;>-q}h(gBUovxhbb!8nyv6bZpdYX8K79T46M)a17iO~=^?Ds+3|^^JqFSvYrR04yq&oqZ3Sx!OF==f zu-U>+W4Ib~?<;)CBcKcKlrwW?I5TJD{r%I$ag2zdwMJ`=QVJ2lIY$N&A&MeIq!3fJ zT8;5|41ni(_`Y8tU$0kQVYAtwZnqoOS^%uI-0%07glACa^BH4I-ekAi{YvQf`+02? zMW`SMXti2cYgw&U04x^YPs!8i2ZzIf$z%dR5CnJtaU5feL2LbzoHf>37bRRS7veYu zz!>wd^WTM9Yw>*_&+|AQj~HV(olb}d=kpm=tybxDI;3fe@B4(|j3h|_@@Ywupta89 z^?DtETCIi>5iXYtK(6h7piZY#;R;HrJej5`0KV_%e#l~_Qt5Gpdc97&-Oe56oMX9M zK9w*UjSADN)#^h+6h#26*Xx`#pMMpK!*IrWy)H;~&LPw3hZ_!uxq*H=BRsqSFc=Kj zZnvmLqd~XZWxwAupMTM8HYu0OIYC6Q*5Y{{#uyfhZ^Cd!5Cl{z6_j(1D2mWp(`+{B z^?F!q^JQks1!y!Hg>Q7uAz?UkNs^GJDL+5Y{~+^7hPSsNX__J;`~k0q)=gYU3R?gG N002ovPDHLkV1ju~=0*Sj diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_off.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_off.png deleted file mode 100644 index 92fb934f88da4cc49599613695d197e3c41450b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmV;w0YLtVP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B00We8KK~y+Tjgd=ggg_KUvz08wrDWQmOUOhJ z#Q$F#0-~VwEF)(D2buK(GU+vB6P;7_#BNO*aw&>i);;f4l}{g9^E^+}^sa>w$#T^& z46f@cpl#bXt-kNaaXj6LknA>1Q^S^*BQGh|3h<`1Cjx}6aq%d!Osf`C)40QcS*0nh?ao;z?e{3C4u(zFv5 zMUm&Z7!sUT!~^h{w+_0>O>_ez_kBLA@%h5vpu_^O!OTrC%<#N7-Y|^o<)X&dfdR7t zSYSi~P+KuNeLegFs2zqO-t#;GUbSGv+yG8&+cu$l2`o`Wnu>f^fa5qYY;$_%IF7j= p55+5y6Y(7>fGCZ0(SOJ^e*gjTlFs{}J|h4C002ovPDHLkV1kYlunzzL diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_on.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_on.png deleted file mode 100644 index 2addbfbe7f5cb4512ebf7d34b5c5901cf01936a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmV<60w4W}P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B00#QjsK~y+TjgD(m5@8g__e<3{nN7WDtVuC7 zEeF91BrSMN%A`>)O6&z(cG*>Exiup$xJWJ%yGtO5TCWOx(VM;j-@&XSj85^Y|NQ67 z|2gOUp65Xd%0V%oK2mlH8BR%Js<2)b-DPpDEUp&>CmiJ@@hL@Tci$&IggkC1Qp}42 zzb=MeNg-5?JU@(0R^k(t_;}M3rRb#08}~z&olR?)am-H}k#a7U;%2j)F235CaCGcA zZwh}Ij@yoojIT%9G9=i=*RwjLnq|}UXg;8U@$a8@aB1^lTd3`hDO*D#JGHVff}BX+ zy^TScd60D8XpJkOp0-d=jjEhR^lP0jhXEin)PT%%UjxUyrY*F945M={4#Ssdk$Nfz z9$f>c(f+njOO46gV45|qE<8gjIX*!dBxWeP(G7!oO4s!0RnXUV$G?fDeO8wU%)gn_ zA*FmW;fNIT1fN!5=VGjVVa9+IWGUdamvhl- zmN}8|FZ*j>KRUKatr#$D`}B>1zflY})Sd*7Z_=I_iwRMcJc+G+mNR~0g~69Oaw+Ir zdOJVD5!S|0`n-O4epdbUU4Q@Htq319n^6E140{LIw8aD@iMhO(Yt~|f+Bhv={HR}? z8SdWcyqGeEdAt_0gSjzj+vaJgK-z?dXSs9vv^rfG_z7>0qpmY@&11Yi{&YF_#uLeW1m^tF~y SDvEdj0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;VFFSW*B00VGL8K~y+Tt&-bngfI|>`?~rVf}n_p^>86r z6_I+NAShHSiVA|-_M!Tl#Ladu%3kbuF-*w+XOfw`d=mP;uj~4qfP_MqSCS-=W%)1! zLE!uT7vcNl=LGq-ZJy`Zwk?X{VQ^iSim2y~ec#7%tg6a!96=BcgRbk?z%lbYPt$}* z6X+0!VQ88rO;cV$QIvIEmu2a??&F5GZ4vR9EX%?$)HID7pf1bu?F5QE&x@i!#MyBi zk%&}MDqt`fEwi}&{>v66Q&}dML3RE z0JMp;zkp5QoC7I&;g6;w>bc`O2bARoY&?Gs=p-}XOFc3Nbf0|I1G@Y d5VD65gkNJ2?B#ek)o}m-002ovPDHLkV1m)mwN?NC diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_top.png deleted file mode 100644 index aa647253511fc7baa29f5c2c0419dc7287090a0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 427 zcmV;c0aX5pP)N2bZe?^J zG%hhNHDpIvQUCw}DM>^@R5(wKl1XlaKnz85T{s33-OTe8(hU+QyR6tn>cizxzXa(d zi~NP$*G8 zG)-OCl-`W)_d6s$aw127uIunPj>y=@BtL=QilPVxlcZ5k0KGAhT(8&5 zh&OS1+$@Hiv~vjbQeMD{N^&KC#U Vum>IxCG!9P002ovPDHLkV1oZLr~Lo` diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_generator.png b/src/main/resources/assets/hbm/textures/blocks/machine_generator.png deleted file mode 100644 index 4a3bcf52e6792a7ba15396bee6438a92ac7736cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmV;a0apHrP)N2bZe?^J zG%heMHvEiZ-v9ssCrLy>R5(wKlFe>|Fc5@!E2LPY1QMYDhj2$!Pz0B%LFM=H`D@wKAsy1ws+VPFNH zzab1mhdW?V6mc3rWKVF=^#RZG>bgeCvJ6W>5L8tqylEO+&-2`MUEN`tCN^*^8{;?% z=So|rWZ;*j%jIHP8ys|ffZ6e2P?jZ54BmGXMZvmRn&+8t#Orf~aA{(5J#>;JQW)QV z@K;LWXYAS)+LQy7xTo6`6`=p?2s(Tfd} zciXnYv1IF8N^}rQCT~i~jVoN2bZe?^J zG%heMHvEiZ-v9ssLrFwIR5(wKlCe&MP!xvm3m8`&G*KrPSCSGaP&yPCcmRWe5GSKV z5a?U!pou!U_#nmy@w@l5rLD&FOLOznT+aD=PE{C&qtVE=ZO`+j)9GwBi=v2AAiJ(R zUcw!frs=Jrs;auKo2KD}o4=S$CW;!1rybBQIF3`6WlIdOT3iN9yHRT^TURvP^>R&~+U$gge9Mh5AnR zzoNa@6SXQVLI3DDj^!aq5(yvYirai>BH#GFFJWU!gloh5nU=xo>2OeDMBLFzbm;qj zKA+QpAl$D(Va6&Qf*?>Ulaoqmw341tQLrp3f!WoVV(d|1nT&V!=GzsP0M3@`j!JeNr`bl%bJb`d)}JA`4#XZIrjsmne9zVGwt zuW&M%05F|S$v$k+Pp7bL8>JNYgb=u{%WkU?yYT(xRmX8~948h_DcNl`*eqpIP5 zll#Nra9;?4xv|Bd-$$MQjKu&!5HKE(F$@EM-*X)$CnOh>rGqGgTBQ^_h%5&|u#(Aa zHe0C#NgR>+9>Bot*)Y&1U2GXfMt{(==SyrB*3XtCZsF zkvIqf27>{!*$jZq!WOkk={keaXtXbcfOL-Yiwpc;KbTIZj7B3Civv%YDJ1~E*E*40ko&XPUJz&C*j92u8cu7qTG8#aaBK@r(>OmrN7UeF$FVIO+e)_IhF7Z<04L=Nj&0p!Fq_TJgb+|DaW$V4 z{`!#wwqCDy;3$eXIxh3|+jowH+Rfm!X5!dZ0>@w)25@YPZl{%Gkm>b$n_Mo({l+8U zrg^a6zVzGRIt^U!sjTCMh9FQwdO qV45aUN`}KBK@d=_RuA%?=kXV?12Aev_F`cG00004`RaF3t$73R5 z?=gy^AkT9WfIQDp)s~nf31wM!2&zg|Rj4X;U8AZT4u`YA>2xB5fH4MR40T;|_xx2y z;N!OshzI~8f`|}8I17|ziHKmWWj31;z5`EQbOc^LyF;GBcDp5nKnMX5!2o#gQB@X; z1+Fps_lxV_cIc19tP`(BuOp;BEoXH#JS7lAL-R#?VMvipJT1P z2pBVLWODN`IKATp&KWo#?&^;pAG@IZ$@{P7A`mn1SJH2Y91|b+pI$?``}Ydvj(1<) z(lpIQ03d|WBM;RPog+p>7jnJp5#)LY<&HO>@A2N_y+8NUG!0pnwJ|ovpsK7^tB$~C zv!Sl**1CwW-|xFej9CX*uh)!5BbuhcTHEH|dr#9e?aE1(WgL&k-VOd2zW}=P#wxsj R`qKaa002ovPDHLkV1nNe&0+um diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_top.png deleted file mode 100644 index b6d0a8511384f7f32830d6e44498bd11bd5bf942..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0OqQr8+#Y;3l1=lk|`3(5e4J ziG@Hrgc6jHfI4U#5|vOglnyT@@BZlUxHk=*dZxoY_xt7h{hp&*tyTcgT2mASi^T$f zTCGN``1W@dMZtJH#sG}RW1MpdXpCV#pRWL%b1W7MoO4)fanAAd^i&bNyu1)XKtvD` zthK3k&JjXDDTPuBAoU@HieNsUqm)8xjZzBlJ^g-vMgIQ&ezFxpNTdQ#mL<+Py!Z5a zJ^KAV)8`ReTU*#)6Mj!8TwPt!?RJx$Xi@%22beyO$V{cIu<#~-%k+7~@$oTbSpr~; zSrRCv5D{)}ZYX|^*gMKuujcF><=l2I$P9e`^pQrRLEIWpWgsFbrIO#fZky(A&h_;* z^?IG{!;__CSru&}TTFQ8AjcSk)|xEKn9XK5=NNR_6c#o%HdZ!bVkq$jetd6}8CW;a z+|2>F?Od>PkTdAC5fQxiNr6NH?>(EFo4k5mdE7oc;jY`JUavE=FzB>-_x=NqkB@{9 z5=k-?cbjDyr)TGU`}&2Mt!9OV)3bAc1dJi7R;v|yz23@&dGBd9n+YHyJUl!QLP-Ba zgyC?w%ph(ehI4;^pL(q|T5GJeNrCr%dCD=w2#BDywKcr=X-i5e%Cbyg0CRbH$z(D~ c5C2<#01;;wV!RfnuIvo|MNaw{t*?sP z`;fDQW5XdXqgOZ6zDOkJyM=1+V@sGIq1^X43Tpk2O& zzdcOnEZO`2%YKoD!28SZFKQJq6P)RPK|HPM(&wpqi_8-w7=H#&1^R)()78&qol`;+ E06R8jDgXcg diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_side.png deleted file mode 100644 index 2333c9bb3cf5e13a54b5a677463f977d82d399c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcmV+~0?_@5P)1u52O@Hp+mIO(M=iw#jpn?tx zP(ldRYoUhi?L9#UI_n;^XeE58^7CF^o zu>in!Ex^LaztKI|WRNxwF1K&>?%T&}x(6wPvuw#0J7$3Sxo%^fZtzq5BSeO x1s#;~^x1Kot$eSALI|OTZEb`Q3fS5M>L0-6Mr|vIG_e2x002ovPDHLkV1ntr{4M|h diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_top.png deleted file mode 100644 index 99a32b91fd6c495b472a13d807976cf05e8c1f33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^>XP)Igj3I#*jYqeLf zv+^&nvJh=;gI0pui5x5`!W|qgo~(+nZQIm$CoD_KDga6iR(z%>cY1vN4n-jZ zA6|t#-tTZ)6%Pa{qa8*n=0|@K&VpGuNfJ8k79$n&(K;dWVcx-w&L&C?IREEn zZYn^MBmkVba*UMKdG9=xVarbkn9XKf zZ*8E|fS32aK9Pqyb9S3L~nziS7Yx#Z`jSxadzA-`w4Xo_}{SPYj VPE;%I0HOc@002ovPDHLkV1hOv{ z8wI3T9~Funx+8U-rk~=Vm_ZU7z|Lm-HzdKNWET1*L4Pi z0a=z|nkJ1#gCGbf7K^y93qTl#BuT>Mg5kaU3%o4sjd@$8iXPfZ1$@<2V?G!G6D|*X!YV9**PC z?RK$k8zBUhN(J%w_?WNPYoaLPcs#ORuK~!ijQ{=Ew#{TR`6B?BPNzISKcg0l1-|cd zadE-FfB!fhk7QYfWm)8TPQTwr*L50=2CnN8h9P;LQ!bY&7K^_bPfkvFdU~Q-Cr!F@H~$~p}=f5 zqgt(Uetr%>5CoLVWjdV>$Kw(4@bHi?m&?D-wOWnMX2W*7CCf5Or4on3f$4OLX_|i< zna}5hVTf8Tm-xOnoehhIYG6sZ=6OQ>2vK+}r>#9*-H1$G;M*)hg|F8(r6l&Ux7Y diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_cheapo.png b/src/main/resources/assets/hbm/textures/blocks/turret_cheapo.png deleted file mode 100644 index b47cd705ec722df4b1abbd99a18e8d47ca0e4b18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfUOt~yzLfpHTw3pkt#^NIFXVZhDB%-1O>V*a>SP8zX@<&qkLT=OHQkuuxy-7r zjv2fStJ(~GgM;kveSg!p-cu`-_p>;IAg90J#3gce`}fW}mlElA*@SI@2G@L!JI(XX zG4x!tKhnm3FzWT{Ri9p;VZBl+s~45M-o-4N>9dV}YRzRszb^qz%Z2}z?V6giQPyx_ m?(G)g^2M)r?cZ9=X+JeD`^|J0g*!k`GI+ZBxvX}k%$Z3ymFnp`^zb7Cbbc(^CPuYoM z%~lS@i0h`EQLm#TxD1Y^Ts`wyX3zJ`_j{k$-p^r7xV=r_X-AM&F`HJ+zKYoEZ~aUc nsJYDw*7#a0BZ3`njxgN@xNAwNY3} diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_flamer.png b/src/main/resources/assets/hbm/textures/blocks/turret_flamer.png deleted file mode 100644 index 471bf68f3cc83ce44f40394294836d64d1a8ecfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfY1@BbH}yc`MAk`R&So z`&#?IZ`=1PpD&)DI`e~)Fc4c8_u(>!cY5HH5C?phbi0g1!63eTReu$kW?I3;M2Mwh|-ATNd^TScG8 zOfb)1uvP5$;i&A3CcXEs=LObT?tRU9KmUVS`I%kp2cAt|mdSPRq0-SHng3$?HJRbZ UtzUng4)hX(r>mdKI;Vst0EUuq1ONa4 diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_heavy.png b/src/main/resources/assets/hbm/textures/blocks/turret_heavy.png deleted file mode 100644 index 7922fff7bc072337a39aba48cb1686b577c9c3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf&_dkYMgSv~jAoLHPTFWre__WQl_U9wpU&M{61VoHdd zw*IwAr(4zD{AV}M@orf6nnhf4%d+I$czLdk%YQRYPtW;Z`^)fHuHP4i-wPlAtaJCj Y|KDL|+WID5pd%SPUHx3vIVCg!0CEyoO#lD@ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_light.png b/src/main/resources/assets/hbm/textures/blocks/turret_light.png deleted file mode 100644 index cefc65660c54637a90acea806a6036d316c59116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf|B+--zTnlJ!_H1hkKX5+g8rIY{JWM&XRQk zG|BU&ZWvPXHGtVK5J+o^}87gAd8D1>gB_0S8nb5?caZWTkaLr{ux5LdrNC=80%9!J@#)g+68nygQu&X%Q~loCIAt+V4MH| diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_rocket.png b/src/main/resources/assets/hbm/textures/blocks/turret_rocket.png deleted file mode 100644 index 0a5a4c41469620805b423570e8e8666f85d68022..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfo`a9k}KlLGtM12aA3hv{j(pQo)&Lg zAHUzIpt#uB=GX6ujX;p-m#nYc#a;LJPpjx+<{3LSZ~k1*1_WX=j^yifZDgFWD}KL% z$(@F$e~l$KW*WSG?fg;7XYS6OKkG&GCvf@Av+0y#d&1Pkd*D^RL_@0yGqchK2_WE; ox8u2f{7?hCLbg*Hza9g_&dok`-{FVdQ&MBb@0BrDGBLDyZ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_tau.png b/src/main/resources/assets/hbm/textures/blocks/turret_tau.png deleted file mode 100644 index 19be1105c8942943fbd09750aea83a7e2a1455c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf9g%=Ly zXWjbucD~rZJ+6Twv!3r{ipahiwR)eL-459@t__y4tO}k&tOmy}l*-oL7j_j44NdG( zJZ;1n;eYgd;*&l1wGMoI)RZ@8_Ve(%*R>Li9jC({Z4!NcXVFdm54Y#@?J2l*!=#sC zN#?4Bf6g3Kuc>d?qxCEN(4SwWvHJZINm^XBPs}SA`k(pxXir;p5$Fj9Pgg&ebxsLQ E0Bieal>h($ diff --git a/src/main/resources/assets/hbm/textures/items/pellet_coal.png b/src/main/resources/assets/hbm/textures/items/pellet_coal.png deleted file mode 100644 index 0672275f859dbe13ace7e9ab3fed9288815b92ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfFVdQ&MBb@0C){D3jhEB