From ac64102f77589d52d882611e6a5d1c6826152596 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 30 Apr 2026 13:41:41 +0200 Subject: [PATCH] stabbing more unused crap to death --- changelog | 2 + src/main/java/com/hbm/items/ModItems.java | 92 ------------------ .../com/hbm/items/machine/ItemBattery.java | 4 - .../hbm/items/machine/ItemSelfcharger.java | 55 ----------- src/main/java/com/hbm/main/MainRegistry.java | 30 ++++++ .../oil/TileEntityMachineGasFlare.java | 15 +++ .../hbm/manual/concepts/fluidhandling.json | 10 ++ .../assets/hbm/manual/concepts/fluidid.json | 11 +++ .../hbm/manual/machine/solarboiler.json | 11 +++ .../textures/items/battery_advanced_cell.png | Bin 190 -> 0 bytes .../items/battery_advanced_cell_12.png | Bin 271 -> 0 bytes .../items/battery_advanced_cell_4.png | Bin 332 -> 0 bytes .../textures/items/battery_advanced_new.png | Bin 345 -> 0 bytes .../textures/items/battery_generic_new.png | Bin 316 -> 0 bytes .../hbm/textures/items/battery_lithium.png | Bin 242 -> 0 bytes .../textures/items/battery_lithium_cell.png | Bin 179 -> 0 bytes .../textures/items/battery_lithium_cell_3.png | Bin 203 -> 0 bytes .../textures/items/battery_lithium_cell_6.png | Bin 261 -> 0 bytes .../hbm/textures/items/battery_red_cell.png | Bin 187 -> 0 bytes .../textures/items/battery_red_cell_24.png | Bin 312 -> 0 bytes .../hbm/textures/items/battery_red_cell_6.png | Bin 258 -> 0 bytes .../hbm/textures/items/battery_sc_lead.png | Bin 298 -> 0 bytes .../textures/items/battery_sc_plutonium.png | Bin 304 -> 0 bytes .../textures/items/battery_sc_polonium.png | Bin 305 -> 0 bytes .../textures/items/battery_sc_technetium.png | Bin 317 -> 0 bytes .../hbm/textures/items/battery_sc_uranium.png | Bin 321 -> 0 bytes .../items/battery_schrabidium_cell.png | Bin 168 -> 0 bytes .../items/battery_schrabidium_cell_2.png | Bin 202 -> 0 bytes .../items/battery_schrabidium_cell_4.png | Bin 312 -> 0 bytes .../items/battery_schrabidium_new.png | Bin 287 -> 0 bytes .../textures/items/battery_spark_cell_100.png | Bin 346 -> 0 bytes .../items/battery_spark_cell_1000.png | Bin 330 -> 0 bytes .../items/battery_spark_cell_10000.png | Bin 317 -> 0 bytes .../textures/items/battery_spark_cell_25.png | Bin 298 -> 0 bytes .../items/battery_spark_cell_2500.png | Bin 391 -> 0 bytes .../textures/items/battery_spark_cell_6.png | Bin 287 -> 0 bytes .../items/battery_spark_cell_power.png | Bin 253 -> 0 bytes 37 files changed, 79 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/com/hbm/items/machine/ItemSelfcharger.java create mode 100644 src/main/resources/assets/hbm/manual/concepts/fluidhandling.json create mode 100644 src/main/resources/assets/hbm/manual/concepts/fluidid.json create mode 100644 src/main/resources/assets/hbm/manual/machine/solarboiler.json delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_advanced_cell.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_advanced_cell_12.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_advanced_cell_4.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_advanced_new.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_generic_new.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_lithium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_lithium_cell.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_lithium_cell_3.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_lithium_cell_6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_red_cell.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_red_cell_24.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_red_cell_6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_sc_lead.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_sc_plutonium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_sc_polonium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_sc_technetium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_sc_uranium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_4.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_schrabidium_new.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_100.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_1000.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_10000.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_25.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_2500.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_6.png delete mode 100644 src/main/resources/assets/hbm/textures/items/battery_spark_cell_power.png diff --git a/changelog b/changelog index 465525748..eb4d93fad 100644 --- a/changelog +++ b/changelog @@ -24,6 +24,8 @@ * Tungsten carbide is made in the pyrolysis oven using syngas and tungsten powder * Many recipes that used to use neutron reflectors now use alternative materials like HSS plates or weapon steel * This effectively means that neutron reflectors are post oil 3 +* Removed legacy battery items and selfchargers +* Added more QMAW pages ## Fixed * Fixed uncrafting of the nickel RTG pellet not respecting item metadata diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 2606f293b..f42a98753 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1538,44 +1538,12 @@ public class ModItems { public static Item custom_dirty; public static Item custom_schrab; public static Item custom_fall; - - @Deprecated public static Item battery_generic; - @Deprecated public static Item battery_advanced; - @Deprecated public static Item battery_lithium; - @Deprecated public static Item battery_schrabidium; - @Deprecated public static Item battery_red_cell; - @Deprecated public static Item battery_red_cell_6; - @Deprecated public static Item battery_red_cell_24; - @Deprecated public static Item battery_advanced_cell; - @Deprecated public static Item battery_advanced_cell_4; - @Deprecated public static Item battery_advanced_cell_12; - @Deprecated public static Item battery_lithium_cell; - @Deprecated public static Item battery_lithium_cell_3; - @Deprecated public static Item battery_lithium_cell_6; - @Deprecated public static Item battery_schrabidium_cell; - @Deprecated public static Item battery_schrabidium_cell_2; - @Deprecated public static Item battery_schrabidium_cell_4; - @Deprecated public static Item battery_spark_cell_6; - @Deprecated public static Item battery_spark_cell_25; - @Deprecated public static Item battery_spark_cell_100; - @Deprecated public static Item battery_spark_cell_1000; - @Deprecated public static Item battery_spark_cell_2500; - @Deprecated public static Item battery_spark_cell_10000; - @Deprecated public static Item battery_spark_cell_power; public static Item battery_pack; public static Item battery_creative; public static Item cube_power; public static Item battery_spark; public static Item battery_trixite; - - @Deprecated public static Item battery_sc_uranium; - @Deprecated public static Item battery_sc_technetium; - @Deprecated public static Item battery_sc_plutonium; - @Deprecated public static Item battery_sc_polonium; - @Deprecated public static Item battery_sc_gold; - @Deprecated public static Item battery_sc_lead; - @Deprecated public static Item battery_sc_americium; public static Item battery_sc; @@ -3738,43 +3706,13 @@ public class ModItems { custom_schrab = new ItemCustomLore().setUnlocalizedName("custom_schrab").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_schrab"); custom_fall = new ItemCustomLore().setUnlocalizedName("custom_fall").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_fall"); - battery_generic = new ItemBattery(5000, 100, 100).setUnlocalizedName("battery_generic").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_generic_new"); - battery_advanced = new ItemBattery(20000, 500, 500).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_advanced_new"); - battery_lithium = new ItemBattery(250000, 1000, 1000).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_lithium"); - battery_schrabidium = new ItemBattery(1000000, 5000, 5000).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_schrabidium_new"); battery_spark = new Item().setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":battery_spark"); battery_trixite = new Item().setUnlocalizedName("battery_trixite").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":battery_trixite"); - battery_red_cell = new ItemBattery(15000, 100, 100).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_red_cell"); - battery_red_cell_6 = new ItemBattery(15000 * 6, 100, 100).setUnlocalizedName("battery_red_cell_6").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_red_cell_6"); - battery_red_cell_24 = new ItemBattery(15000 * 24, 100, 100).setUnlocalizedName("battery_red_cell_24").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_red_cell_24"); - battery_advanced_cell = new ItemBattery(60000, 500, 500).setUnlocalizedName("battery_advanced_cell").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_advanced_cell"); - battery_advanced_cell_4 = new ItemBattery(60000 * 4, 500, 500).setUnlocalizedName("battery_advanced_cell_4").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_advanced_cell_4"); - battery_advanced_cell_12 = new ItemBattery(60000 * 12, 500, 500).setUnlocalizedName("battery_advanced_cell_12").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_advanced_cell_12"); - battery_lithium_cell = new ItemBattery(750000, 1000, 1000).setUnlocalizedName("battery_lithium_cell").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_lithium_cell"); - battery_lithium_cell_3 = new ItemBattery(750000 * 3, 1000, 1000).setUnlocalizedName("battery_lithium_cell_3").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_lithium_cell_3"); - battery_lithium_cell_6 = new ItemBattery(750000 * 6, 1000, 1000).setUnlocalizedName("battery_lithium_cell_6").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_lithium_cell_6"); - battery_schrabidium_cell = new ItemBattery(3000000, 5000, 5000).setUnlocalizedName("battery_schrabidium_cell").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell"); - battery_schrabidium_cell_2 = new ItemBattery(3000000 * 2, 5000, 5000).setUnlocalizedName("battery_schrabidium_cell_2").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_2"); - battery_schrabidium_cell_4 = new ItemBattery(3000000 * 4, 5000, 5000).setUnlocalizedName("battery_schrabidium_cell_4").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_4"); - battery_spark_cell_6 = new ItemBattery(100000000L * 6L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_6").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_6"); - battery_spark_cell_25 = new ItemBattery(100000000L * 25L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_25").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_25"); - battery_spark_cell_100 = new ItemBattery(100000000L * 100L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_100").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_100"); - battery_spark_cell_1000 = new ItemBattery(100000000L * 1000L, 20000000, 20000000).setUnlocalizedName("battery_spark_cell_1000").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_1000"); - battery_spark_cell_2500 = new ItemBattery(100000000L * 2500L, 20000000, 20000000).setUnlocalizedName("battery_spark_cell_2500").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_2500"); - battery_spark_cell_10000 = new ItemBattery(100000000L * 10000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_10000").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_10000"); - battery_spark_cell_power = new ItemBattery(100000000L * 1000000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_power").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_spark_cell_power"); battery_pack = new ItemBatteryPack().setUnlocalizedName("battery_pack").setTextureName(RefStrings.MODID + ":battery_generic_new"); battery_creative = new ItemBatteryCreative().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new"); cube_power = new ItemBattery(1000000000000000000L, 1000000000000000L, 1000000000000000L).setUnlocalizedName("cube_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":cube_power"); - battery_sc_uranium = new ItemSelfcharger(5).setUnlocalizedName("battery_sc_uranium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_uranium"); - battery_sc_technetium = new ItemSelfcharger(25).setUnlocalizedName("battery_sc_technetium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_technetium"); - battery_sc_plutonium = new ItemSelfcharger(100).setUnlocalizedName("battery_sc_plutonium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_plutonium"); - battery_sc_polonium = new ItemSelfcharger(500).setUnlocalizedName("battery_sc_polonium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_polonium"); - battery_sc_gold = new ItemSelfcharger(2500).setUnlocalizedName("battery_sc_gold").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_gold"); - battery_sc_lead = new ItemSelfcharger(5000).setUnlocalizedName("battery_sc_lead").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_lead"); - battery_sc_americium = new ItemSelfcharger(10000).setUnlocalizedName("battery_sc_americium").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":battery_sc_americium"); battery_sc = new ItemBatterySC().setUnlocalizedName("battery_sc").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_sc"); battery_potato = new ItemBattery(1000, 0, 100).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato"); @@ -5234,31 +5172,8 @@ public class ModItems { GameRegistry.registerItem(siphon, siphon.getUnlocalizedName()); //Batteries - GameRegistry.registerItem(battery_generic, battery_generic.getUnlocalizedName()); - GameRegistry.registerItem(battery_red_cell, battery_red_cell.getUnlocalizedName()); - GameRegistry.registerItem(battery_red_cell_6, battery_red_cell_6.getUnlocalizedName()); - GameRegistry.registerItem(battery_red_cell_24, battery_red_cell_24.getUnlocalizedName()); - GameRegistry.registerItem(battery_advanced, battery_advanced.getUnlocalizedName()); - GameRegistry.registerItem(battery_advanced_cell, battery_advanced_cell.getUnlocalizedName()); - GameRegistry.registerItem(battery_advanced_cell_4, battery_advanced_cell_4.getUnlocalizedName()); - GameRegistry.registerItem(battery_advanced_cell_12, battery_advanced_cell_12.getUnlocalizedName()); - GameRegistry.registerItem(battery_lithium, battery_lithium.getUnlocalizedName()); - GameRegistry.registerItem(battery_lithium_cell, battery_lithium_cell.getUnlocalizedName()); - GameRegistry.registerItem(battery_lithium_cell_3, battery_lithium_cell_3.getUnlocalizedName()); - GameRegistry.registerItem(battery_lithium_cell_6, battery_lithium_cell_6.getUnlocalizedName()); - GameRegistry.registerItem(battery_schrabidium, battery_schrabidium.getUnlocalizedName()); - GameRegistry.registerItem(battery_schrabidium_cell, battery_schrabidium_cell.getUnlocalizedName()); - GameRegistry.registerItem(battery_schrabidium_cell_2, battery_schrabidium_cell_2.getUnlocalizedName()); - GameRegistry.registerItem(battery_schrabidium_cell_4, battery_schrabidium_cell_4.getUnlocalizedName()); GameRegistry.registerItem(battery_spark, battery_spark.getUnlocalizedName()); GameRegistry.registerItem(battery_trixite, battery_trixite.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_6, battery_spark_cell_6.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_25, battery_spark_cell_25.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_100, battery_spark_cell_100.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_1000, battery_spark_cell_1000.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_2500, battery_spark_cell_2500.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_10000, battery_spark_cell_10000.getUnlocalizedName()); - GameRegistry.registerItem(battery_spark_cell_power, battery_spark_cell_power.getUnlocalizedName()); GameRegistry.registerItem(battery_pack, battery_pack.getUnlocalizedName()); GameRegistry.registerItem(battery_sc, battery_sc.getUnlocalizedName()); @@ -5267,13 +5182,6 @@ public class ModItems { GameRegistry.registerItem(battery_potato, battery_potato.getUnlocalizedName()); GameRegistry.registerItem(battery_potatos, battery_potatos.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_uranium, battery_sc_uranium.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_technetium, battery_sc_technetium.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_plutonium, battery_sc_plutonium.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_polonium, battery_sc_polonium.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_gold, battery_sc_gold.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_lead, battery_sc_lead.getUnlocalizedName()); - GameRegistry.registerItem(battery_sc_americium, battery_sc_americium.getUnlocalizedName()); GameRegistry.registerItem(hev_battery, hev_battery.getUnlocalizedName()); GameRegistry.registerItem(fusion_core, fusion_core.getUnlocalizedName()); GameRegistry.registerItem(energy_core, energy_core.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemBattery.java b/src/main/java/com/hbm/items/machine/ItemBattery.java index fa9fa8cb8..bc35e2803 100644 --- a/src/main/java/com/hbm/items/machine/ItemBattery.java +++ b/src/main/java/com/hbm/items/machine/ItemBattery.java @@ -47,10 +47,6 @@ public class ItemBattery extends Item implements IBatteryItem { @Override public EnumRarity getRarity(ItemStack p_77613_1_) { - if(this == ModItems.battery_schrabidium) { - return EnumRarity.rare; - } - if(this == ModItems.fusion_core || this == ModItems.energy_core) { return EnumRarity.uncommon; } diff --git a/src/main/java/com/hbm/items/machine/ItemSelfcharger.java b/src/main/java/com/hbm/items/machine/ItemSelfcharger.java deleted file mode 100644 index 635df6cb1..000000000 --- a/src/main/java/com/hbm/items/machine/ItemSelfcharger.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hbm.items.machine; - -import java.util.List; - -import com.hbm.util.BobMathUtil; - -import api.hbm.energymk2.IBatteryItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -public class ItemSelfcharger extends Item implements IBatteryItem { - - long charge; - - public ItemSelfcharger(long charge) { - this.charge = charge; - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add(EnumChatFormatting.YELLOW + "" + BobMathUtil.getShortNumber(charge) + "HE/t"); - } - - @Override - public void chargeBattery(ItemStack stack, long i) { } - - @Override - public void setCharge(ItemStack stack, long i) { } - - @Override - public void dischargeBattery(ItemStack stack, long i) { } - - @Override - public long getCharge(ItemStack stack) { - return charge; - } - - @Override - public long getMaxCharge(ItemStack stack) { - return charge; - } - - @Override - public long getChargeRate(ItemStack stack) { - return 0; - } - - @Override - public long getDischargeRate(ItemStack stack) { - return charge; - } - -} diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 1cde5f4e1..d5407f218 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1574,6 +1574,36 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.cheater_virus_seed"); ignoreMappings.add("hbm:tile.iter"); ignoreMappings.add("hbm:tile.plasma_heater"); + ignoreMappings.add("hbm:item.battery_generic"); + ignoreMappings.add("hbm:item.battery_advanced"); + ignoreMappings.add("hbm:item.battery_lithium"); + ignoreMappings.add("hbm:item.battery_schrabidium"); + ignoreMappings.add("hbm:item.battery_red_cell"); + ignoreMappings.add("hbm:item.battery_red_cell_6"); + ignoreMappings.add("hbm:item.battery_red_cell_24"); + ignoreMappings.add("hbm:item.battery_advanced_cell"); + ignoreMappings.add("hbm:item.battery_advanced_cell_4"); + ignoreMappings.add("hbm:item.battery_advanced_cell_12"); + ignoreMappings.add("hbm:item.battery_lithium_cell"); + ignoreMappings.add("hbm:item.battery_lithium_cell_3"); + ignoreMappings.add("hbm:item.battery_lithium_cell_6"); + ignoreMappings.add("hbm:item.battery_schrabidium_cell"); + ignoreMappings.add("hbm:item.battery_schrabidium_cell_2"); + ignoreMappings.add("hbm:item.battery_schrabidium_cell_4"); + ignoreMappings.add("hbm:item.battery_spark_cell_6"); + ignoreMappings.add("hbm:item.battery_spark_cell_25"); + ignoreMappings.add("hbm:item.battery_spark_cell_100"); + ignoreMappings.add("hbm:item.battery_spark_cell_1000"); + ignoreMappings.add("hbm:item.battery_spark_cell_2500"); + ignoreMappings.add("hbm:item.battery_spark_cell_10000"); + ignoreMappings.add("hbm:item.battery_spark_cell_power"); + ignoreMappings.add("hbm:item.battery_sc_uranium"); + ignoreMappings.add("hbm:item.battery_sc_technetium"); + ignoreMappings.add("hbm:item.battery_sc_plutonium"); + ignoreMappings.add("hbm:item.battery_sc_polonium"); + ignoreMappings.add("hbm:item.battery_sc_gold"); + ignoreMappings.add("hbm:item.battery_sc_lead"); + ignoreMappings.add("hbm:item.battery_sc_americium"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java index fa3ddbccf..b10cf16a4 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java @@ -227,6 +227,21 @@ public class TileEntityMachineGasFlare extends TileEntityMachineBase implements } MainRegistry.proxy.effectNT(data); + + /*NBTTagCompound smokeData = new NBTTagCompound(); + smokeData.setString("type", "tower"); + smokeData.setFloat("lift", 2F); + smokeData.setFloat("base", 0.5F); + smokeData.setFloat("max", 2F); + smokeData.setFloat("strafe", 0.025F); + smokeData.setInteger("life", 150 + worldObj.rand.nextInt(20)); + smokeData.setInteger("color", 0x202020); + + smokeData.setDouble("posX", xCoord + 0.5); + smokeData.setDouble("posZ", zCoord + 0.5); + smokeData.setDouble("posY", yCoord + 11); + + MainRegistry.proxy.effectNT(smokeData);*/ } } } diff --git a/src/main/resources/assets/hbm/manual/concepts/fluidhandling.json b/src/main/resources/assets/hbm/manual/concepts/fluidhandling.json new file mode 100644 index 000000000..34132984a --- /dev/null +++ b/src/main/resources/assets/hbm/manual/concepts/fluidhandling.json @@ -0,0 +1,10 @@ +{ + "name": "Fluid Identification", + "icon": ["hbm:item.fluid_icon", 1, 1], + "title": { + "en_US": "Concept: Fluid Handling" + }, + "content": { + "en_US": "" + } +} diff --git a/src/main/resources/assets/hbm/manual/concepts/fluidid.json b/src/main/resources/assets/hbm/manual/concepts/fluidid.json new file mode 100644 index 000000000..83bf1e7b0 --- /dev/null +++ b/src/main/resources/assets/hbm/manual/concepts/fluidid.json @@ -0,0 +1,11 @@ +{ + "name": "Fluid Identification", + "icon": ["hbm:item.fluid_identifier_multi", 1, 1], + "trigger": [["hbm:item.fluid_identifier_multi", 1, 32767]], + "title": { + "en_US": "Concept: Fluid Identification" + }, + "content": { + "en_US": "An important concept in NTM that is not commonly seen in other mods is fluid identification. While many mods have pipes that allow any fluid to pass, and tanks that simply assume the first type of fluid that is inserted, in NTM, all pipes and tanks need their type defined before they can be used. This has the inherent advantage that there is never any ambiguity as to what fluid can be in a given pipeline or tank, and systems with many pipelines next to each other, or tanks with many passing pipes, will always be separated due to pipes of different types never connecting.

Fluid types are usually defined via a fluid identifier, shift-click will open the GUI which allows up to two types to be saved (with left and right click), and right click in the air will switch the primary and secondary saved type (only the primary type is used when identifying). Fluid containers, pipes and boilers can be identified with right click, and shift-click will identify all connected pipes of the same type (with a maximum distance of 64 blocks). Other machines may feature a fluid identifier slot instead, simply insert the fluid identifier item into the slot and the type of the connected fluid tank will change.

Some machines feature no slot at all, either their fluid types are static and cannot be changed due to restrictions of how the machine works, or the machine has a different way of changing types, like a recipe selector switch." + } +} diff --git a/src/main/resources/assets/hbm/manual/machine/solarboiler.json b/src/main/resources/assets/hbm/manual/machine/solarboiler.json new file mode 100644 index 000000000..784b12884 --- /dev/null +++ b/src/main/resources/assets/hbm/manual/machine/solarboiler.json @@ -0,0 +1,11 @@ +{ + "name": "Solar Tower Boiler", + "icon": ["hbm:tile.machine_solar_boiler", 1, 0], + "trigger": [["hbm:tile.machine_solar_boiler"], ["hbm:tile.solar_mirror"]], + "title": { + "en_US": "Solar Tower Boiler" + }, + "content": { + "en_US": "The solar tower boiler is a simple machine that can turn water into steam. It requires focused sunlight to do so, coming from heliostat mirrors. Right-click the boiler to save its position, then click on the mirrors that should be pointed at this boiler. Mirrors cannot be tilted past 45°, so it is important to put the boiler at an elevated position (hence solar TOWER boiler). In other words: The horizontal distance between the mirrors and the boiler cannot exceed the vertical distance. Consequently, the higher up the boiler is, the more mirrors can be connected to it.

Due to the boiler running off of sunlight, it will not work during the night. But you already knew that. Sunlight is also not very powerful, so in order to bring water to a boil, about a dozen mirrors are required at minimum.

The boiler has no GUI, nor can water be inserted directly, it needs to be supplied via pipes. The resulting steam can then be used in a [[steam engine|Steam Engine]], yielding power and low-pressure steam, which can then be [[condensed|Condenser]] back into usable water." + } +} diff --git a/src/main/resources/assets/hbm/textures/items/battery_advanced_cell.png b/src/main/resources/assets/hbm/textures/items/battery_advanced_cell.png deleted file mode 100644 index 2d7daa138f791ac513dc58abebebbe60320a3ede..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfhRL^dqiue(uwCk z=SRaBg{zB>2q+yoa9~5eymJRfq8(d7`S<_-e>5Ka|9}3YfA)0=ALa|lFYA{)=JB&| zbK>969Bu3O@0AqO`Ex#@BuA0i?%&R0bt%I`3G=0n^#8u1PsiupOAwF)?b^dcd R`GG!S@O1TaS?83{1OOH9Y>fZ_ diff --git a/src/main/resources/assets/hbm/textures/items/battery_advanced_cell_4.png b/src/main/resources/assets/hbm/textures/items/battery_advanced_cell_4.png deleted file mode 100644 index 4894e71c40dbd4f3da4361100e7e8c605f5781cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#X#z`)4t>Eak- z(VLvGz--2gV;|&W*PN0H=3$#L!SbFB&;QUjN|JjjCH}4FY|QxdEcHkJ+fJ>v%M8+W zY;0}a;*w8pN=P(a&XU~JBJuC`hs3UjCJw7yI~x^aCMmkKG&UyQw`&s+e3NvdfpzBQ zoL0T&ef#X3->uuu!{c;{XO(2Uq}Ao8hDRhs^b*VuJUr#bW*e>7c1(<&Ogh0|Lnj2ND^WnUCxb6kl&>(e}~ELuS^20-^33GBJqg^_{5n#$(b9*qXwyUD_f bB^VfZ{^k2?hQ){hgNMP>)z4*}Q$iB}M8kqM diff --git a/src/main/resources/assets/hbm/textures/items/battery_advanced_new.png b/src/main/resources/assets/hbm/textures/items/battery_advanced_new.png deleted file mode 100644 index c0850c8143e40816f1ba411cef0c921800623738..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!FQf6jv*HQYbR~wYcddMTc4-5k4^i16X)dF z{14tKw22p}e&pov;oHZ?BHlTBUxQxX*L8cFE(sYt^qy^9wReB`IwvnqHbs`|$1g>1 zFm7Q?=}#Pf9)eD&2nf+;`evesog(*wu*u9@d3 o9xqw4^n2)8>;7X?Z5SEktzX9k`Rtwa4d`~TzD*0PsDpPzhX zk_ibtx|_d%p>e_rhBwYfjz3@B(ot`~!|d+9@p3yq`TM@; z#*lyd8*-)HGmprm)OB2Fv^gKky;C~r!#>*y1v!`HgRNZjet<8 diff --git a/src/main/resources/assets/hbm/textures/items/battery_lithium.png b/src/main/resources/assets/hbm/textures/items/battery_lithium.png deleted file mode 100644 index 866038f30279f7dbf728a1095bba29870740c9e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf`b$F1InTUx>w(2M4JEzTU#0^EXZ&`;_{bw)t=9P8_w154=!J% zr{Hh@V3(|blZTp8Q!yXIgE`I|3mHx3YqTUR4Otb>z_8(((y@q&u=yL7DJuB?=QOZA nD3WmcheJBIvh&{7Ok2i-Ztm9~>rFQVI-0@L)z4*}Q$iB}vD#PI diff --git a/src/main/resources/assets/hbm/textures/items/battery_lithium_cell.png b/src/main/resources/assets/hbm/textures/items/battery_lithium_cell.png deleted file mode 100644 index 213fb76ee3f2aaab80800fa12bf92cf4f288d25c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfTQ>)pM2ic1t;#OD)mRL44TGnvpUXO@geCx$xk|bK diff --git a/src/main/resources/assets/hbm/textures/items/battery_lithium_cell_6.png b/src/main/resources/assets/hbm/textures/items/battery_lithium_cell_6.png deleted file mode 100644 index 0957fabbf3d644af48b8ed6af697db6e7315eec7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4 ztIzjC^;n6`ngm?8S zr`YQT#}Z`R_k7;>ezL+r1D*}nk|M<-vKR03R#0MTusLt&d->PH6VEI8ge&G0FRw9I z@Vy-T&z*Bi9gFmqefc&u^_-k(k=x>;&hWRjY?u4IzLKe{_;{gMXXiDbKNvh+{an^L HB{Ts5Mww+h diff --git a/src/main/resources/assets/hbm/textures/items/battery_red_cell.png b/src/main/resources/assets/hbm/textures/items/battery_red_cell.png deleted file mode 100644 index e927c3d28b3ec1abd2fc150e44cf4dd214909b8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfkR0Xu1!PC{xWt~$(69D7vKNSD~ diff --git a/src/main/resources/assets/hbm/textures/items/battery_red_cell_24.png b/src/main/resources/assets/hbm/textures/items/battery_red_cell_24.png deleted file mode 100644 index 5f5daea67b07bc9eba8138acd62cf2237ea8c6b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muG{P)Q@oMG;NY@c!}1+35+t@zZl?=MDf= z)eeu2d3k-~(apF>&e_M)$=Eh(2$=WYRMkYpLI@@zo!qXFfL#JLF!P=`j;ZUK%(=bn zocmryRqYBa0lNdU)!D`E9{|j~=U$a1umG0O$s2;7qK6Qed*6$<1OQc4_2!*|G);T+ z|1>CyVpxN+EJsTUll~R_h%I*p87-!7capZlH?}8Smk`M8} z_APu{?b{gtY=iloBnFS#KoQpbZHIoAJdt7#4DI5WTPz}Y?9F%8eF6=kvC5~7cn&wT zZ;jZr)l9N<19JuAiSJUyAK1b}Z5Zz`+Jsw3IEH5SI7Uu;v5W7VrOwU%2}zUoy*IbC zP&ohD_upc^Tiays3VhCSY4N>WQx|n+^UQx=XY4=6eS=|{^o5hhPXj%{;OXk;vd$@? F2>`@@XKw%i diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_lead.png b/src/main/resources/assets/hbm/textures/items/battery_sc_lead.png deleted file mode 100644 index 1e1d8032cb2a169090e8e7c936552623f414a85d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}Z0G|+7MMXs*Q$a!D|9=K!W8+z~W;HZ4EMC00qoc#!-F?lPH4`UJ^z-v` zaB#4+w2bfw^|tnKFt7z`v5R^x2&9Bdg8YL2V*rLtwRbpx(wqezk;M!Qe1}1p@p%4< z6rfZ#j>= TnbF%;pfwDhu6{1-oD!M1oajYZrE5JjJ(oB%E`8@aPYvp!x5BsWOhfD*V1jj8C(4NzPm zs-FfUk?cB!t9)ss)$Hia?9R-Ah@5i*7{~G9I)vihLQXT&?KYAm3Eq1o02GS-MKv>} zX$rvg+5>PtdjR^rk5;m&sw$b8B;>u9_g)eLl;?S{ik+NuYMMsQIj#R7Kt)kJ&O5z_ zAZ^=HmL>B%Z&ufJFkuh?P}eofvTPPpunPdgFz|Uiaygyox-JTcRsirdP0z0X22A(+ zYk&{uUIYA(Cj{r(%#>x>ZVuK~KHr0%5Y{m!vWWoSM3ZdvK1a5XdK zc@Dt&+yk)P1^|8EuXeJ~G>yzm5{d{#gd_y0EX!mUceuOu`@P&<-~S*$RaMRBJ6=;J zhr@xou9>E3iMDN%1(OB*oet*F80O zz}>am?d0ydNxDgbuaWZGDa`zjCnWdU%v2P`-5#7yr&WCtGh5a;Re9zUEVzj>ZGgg6 P00000NkvXXu0mjfHade# diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_uranium.png b/src/main/resources/assets/hbm/textures/items/battery_sc_uranium.png deleted file mode 100644 index 6c9b5a74f36b159129aecd02c9ae57e0c14f35e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmV-H0lxl;P)P@X|j<5lSP7xFIgIStY^>I-moI)oB;a1Kf5-uxT~1c%yc~VBuRqz z9ti-&V!u(%Oxx`ifc?G&V7K!Cv~9au$*i(0WoD9)_g>z6NeEDuWzi}Ya?Yu$Dmmvg z{euAId44`GbRC1#bxlze48t&62qBs<3IGTpFplGFYl?OOpzAswo^E-3zNcxLRlsTm z0B`SyOV>XGP9LYg0dCSe0A6_g9pHaFAv)J)rZi0#b1=2?@*aGJFpV)Qn+Wg;5sq)- TeNmU200000NkvXXu0mjf;6{F8 diff --git a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell.png b/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell.png deleted file mode 100644 index 96af24f72ea2ec62560df404deba642d855d6b94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf9#kQ}nk&TrAKk N22WQ%mvv4FO#tgKI4=MI diff --git a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_2.png b/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_2.png deleted file mode 100644 index ab884158d2f5b951c3d3a23bcee5a7d3cfb6c228..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfiIkS&G8MKr)ss zWEi(RV~Xh3pw;Zh7;v@3`K#|HBb9J zb&}v)EJJt_uyf zE9lBO(>%AYAOkwwws%@!GMW3q07fIG>ote6#9uBq+-~6^R)o%G0KBbMQEn?5P!K`%H$V{p0000< KMNUMnLSTYU=YsG6 diff --git a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_new.png b/src/main/resources/assets/hbm/textures/items/battery_schrabidium_new.png deleted file mode 100644 index 55b08bbac66dfa988187f6d734d76df15d2d7ce0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf$;f0m{}8!e2NTo znHYZadHMW#{~P979TB@^^7Q=9tzlo(Hl`^ZDvd0N64O}9lpwOfR603;S>m`L!=eca z*V2N#D!*3FOI*ua)fc3rPWSXC-Ups663GrO>o*qjz24<@?E_EFylRE#cd7$l zzh_{0u#Z3M`z8_Lj%bDk@7s&m3~cimFRT1I!m|Ixe}+icgXU>|ZH?#8^ejuv(6xK| iBArWWmDanvi`nPR3yx>-$=(X|A%mx@pUXO@geCx&*Ke8t diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_100.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_100.png deleted file mode 100644 index 07b43371f355865c60294fe825df45cd80b2edf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmV-g0j2(lP)+;Tl2Gh+PT` zu}mX&76HG)AF%TX@z@lK;r8Ih#$9&Z3yL84s+qSlZ{ExT{|Z@_@lUt}T5BdE&M{{q zVj^Ot6f33p1lK<9>Xkl_5_8HiTAuqH0B+R;N2@6Spi4wXiIljb0*A{9>bj0Z4pw6{ zO_PX30#4+frWmcyA}0%ViQ)P*aU$FeLJ@0ivTNJ631^HEk%O!9IVt)My)b#lYf><) zp0N4kH+VzQ-;drS2f5zeI%(YB^UZ~M@VszAcn51OZmJg?4|aUvMfI3CFvbYKLRpp~ s6miYr3SAIi39U8%`WKv&t>gXzA4cSAbK#e(MgRZ+07*qoM6N<$g3)!4vH$=8 diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_1000.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_1000.png deleted file mode 100644 index 4f256236f1fdc194f9ed6a82fffb30f555690f49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P)6-BhIAYC%-K^PxG74%&v(C?|r7`w^_yiPoj5#FFpt%6oAyiTxO)rvLRl} zIS>7N21xU^f99al=xfQQSmQk})ioAu(VvLuonMbbo6C&UZV|N|@4I=Ayyf-cVH`mc cE&Vxu0DK;uvDBBDL;wH)07*qoM6N<$g7YzuU;qFB diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_10000.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_10000.png deleted file mode 100644 index df7e274cfffb5010f18d988d0885b807fda537d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmV-D0mA-?P)VWiKZm)`<{u^#7_lcjG=8?VvGS`V@*}m#2YKs0*!3g zSP$Ypz5$pS1HhGsUU_IqHvGh2?A|z8wuwbO$<`fxI_u~YIrBh7bY=_|ys`4;#hX_q z$v$VIC*Qe*JC|gr?M>8= zcp4-Ne9A3*lF#miPXCFB=r9aw22Cv4VAcM}LB#L{1sqG+j25}iZm P00000NkvXXu0mjf07Qg) diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_25.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_25.png deleted file mode 100644 index 54cb53a866a7c899bde945df3fab341bc5aec3c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmV+_0oDGAP)oBA56ntOHio)_wqyfSrvHf{m4(q!htU zuD10<*xQR@;lV}k)Z(6n_{he8h;~jhkKNgMGYij!DqSh_BY)4F|DpjR9)XH#^rcEy z05*hdi7dTk;1Ng>V@f1VkBL6o5CX6zIx;Ya!F646oV{Nh#}`>d@O|H$tZ*wdfkz-O zyaEvN3qYj21YoVa;)}d_NQK0?Xzkh9O3+AuoYb8)IG~=%>E`dn5P)W?p!ZgV&TI-m w#eLJrt@%h3T&?i=p4|_zUEvb${=~bn15)aZY$L#DdH?_b07*qoM6N<$f{Chsxc~qF diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_2500.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_2500.png deleted file mode 100644 index d9635c1e333c69c050997dab32a7eb0db4a69360..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)m@noI^zi<1F{Z2XVYBe lg8I+h?h|m%9qz}m@dNLwvC>EH5t0A^002ovPDHLkV1j2Ar&<62 diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_6.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_6.png deleted file mode 100644 index 3b525dafd51435867c688723ac55bb70d54b85a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfM_YvQH<7HxiKN(>&~3}#CTdc@oIm}kGlKH~%l2c3u`0e!am6QtQh Zm>JmZR|b~(O$7Ov!PC{xWt~$(69Ce9Y5@QM diff --git a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_power.png b/src/main/resources/assets/hbm/textures/items/battery_spark_cell_power.png deleted file mode 100644 index e52d25bbd6e883be1fea1446be6b51ec2ee60404..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf}-9H88lxgx>DkEkfp@3bml=5i}WHR!ls2z zm5k0=KDT4KbZAH4?^$iO$8{boRu$x2^(yGQIzL-g!zV$V^3@UvroJmyY0tFf?pT$1 zZ2SHKEq0%~<~jB66JE`meV=8Ie!BhDM^%h(!#&?JvRys~bU%ZqtDnm{r-UW|WJ+Pk