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 2d7daa138..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_advanced_cell.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_advanced_cell_12.png b/src/main/resources/assets/hbm/textures/items/battery_advanced_cell_12.png
deleted file mode 100644
index 1c8abd22e..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_advanced_cell_12.png and /dev/null differ
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 4894e71c4..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_advanced_cell_4.png and /dev/null differ
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 c0850c814..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_advanced_new.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_generic_new.png b/src/main/resources/assets/hbm/textures/items/battery_generic_new.png
deleted file mode 100644
index ee5e0700c..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_generic_new.png and /dev/null differ
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 866038f30..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_lithium.png and /dev/null differ
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 213fb76ee..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_lithium_cell.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_lithium_cell_3.png b/src/main/resources/assets/hbm/textures/items/battery_lithium_cell_3.png
deleted file mode 100644
index 4e84bc3e7..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_lithium_cell_3.png and /dev/null differ
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 0957fabbf..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_lithium_cell_6.png and /dev/null differ
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 e927c3d28..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_red_cell.png and /dev/null differ
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 5f5daea67..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_red_cell_24.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_red_cell_6.png b/src/main/resources/assets/hbm/textures/items/battery_red_cell_6.png
deleted file mode 100644
index e62b45089..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_red_cell_6.png and /dev/null differ
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 1e1d8032c..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_sc_lead.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_plutonium.png b/src/main/resources/assets/hbm/textures/items/battery_sc_plutonium.png
deleted file mode 100644
index 653f943a0..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_sc_plutonium.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_polonium.png b/src/main/resources/assets/hbm/textures/items/battery_sc_polonium.png
deleted file mode 100644
index caf144316..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_sc_polonium.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_sc_technetium.png b/src/main/resources/assets/hbm/textures/items/battery_sc_technetium.png
deleted file mode 100644
index 949e1c98c..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_sc_technetium.png and /dev/null differ
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 6c9b5a74f..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_sc_uranium.png and /dev/null differ
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 96af24f72..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell.png and /dev/null differ
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 ab884158d..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_2.png and /dev/null differ
diff --git a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_4.png b/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_4.png
deleted file mode 100644
index fe84f7e26..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_cell_4.png and /dev/null differ
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 55b08bbac..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_schrabidium_new.png and /dev/null differ
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 07b43371f..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_100.png and /dev/null differ
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 4f256236f..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_1000.png and /dev/null differ
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 df7e274cf..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_10000.png and /dev/null differ
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 54cb53a86..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_25.png and /dev/null differ
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 d9635c1e3..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_2500.png and /dev/null differ
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 3b525dafd..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_6.png and /dev/null differ
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 e52d25bbd..000000000
Binary files a/src/main/resources/assets/hbm/textures/items/battery_spark_cell_power.png and /dev/null differ