diff --git a/changelog b/changelog index 68d18e5d2..c390fa1ac 100644 --- a/changelog +++ b/changelog @@ -10,3 +10,4 @@ * Fixed missing localization for meteorite ores and the new crucible materials * Removed the starmetal crystallization recipe, despite starmetal ore no longer existing * Fixed the ICF structure block detection being incorrect, omitting some parts +* Fixed armor mods adding health showing only half as much as they actually do diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index b564d1736..23498e084 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -730,6 +730,7 @@ public class ModBlocks { public static Block machine_arc_furnace_off; public static Block machine_arc_furnace_on; + public static Block machine_arc_furnace; //public static Block machine_deuterium; @@ -1838,10 +1839,9 @@ public class ModBlocks { machine_electric_furnace_on = new MachineElectricFurnace(true).setBlockName("machine_electric_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); machine_arc_furnace_off = new MachineArcFurnace(false).setBlockName("machine_arc_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_arc_furnace_on = new MachineArcFurnace(true).setBlockName("machine_arc_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); + machine_arc_furnace = new MachineArcFurnaceLarge().setBlockName("machine_arc_furnace").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); machine_microwave = new MachineMicrowave(Material.iron).setBlockName("machine_microwave").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_microwave"); - //machine_deuterium = new MachineDeuterium(Material.iron).setBlockName("machine_deuterium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); - machine_battery_potato = new MachineBattery(Material.iron, 10_000).setBlockName("machine_battery_potato").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_battery = new MachineBattery(Material.iron, 1_000_000).setBlockName("machine_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_lithium_battery = new MachineBattery(Material.iron, 50_000_000).setBlockName("machine_lithium_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); @@ -3225,6 +3225,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_electric_furnace_on, machine_electric_furnace_on.getUnlocalizedName()); GameRegistry.registerBlock(machine_arc_furnace_off, machine_arc_furnace_off.getUnlocalizedName()); GameRegistry.registerBlock(machine_arc_furnace_on, machine_arc_furnace_on.getUnlocalizedName()); + register(machine_arc_furnace); GameRegistry.registerBlock(machine_microwave, machine_microwave.getUnlocalizedName()); GameRegistry.registerBlock(machine_assembler, machine_assembler.getUnlocalizedName()); GameRegistry.registerBlock(machine_assemfac, machine_assemfac.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/MachineArcFurnaceLarge.java b/src/main/java/com/hbm/blocks/machine/MachineArcFurnaceLarge.java new file mode 100644 index 000000000..1c36d6bb2 --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/MachineArcFurnaceLarge.java @@ -0,0 +1,30 @@ +package com.hbm.blocks.machine; + +import com.hbm.blocks.BlockDummyable; +import com.hbm.tileentity.machine.TileEntityMachineArcFurnaceLarge; + +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class MachineArcFurnaceLarge extends BlockDummyable { + + public MachineArcFurnaceLarge() { + super(Material.iron); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileEntityMachineArcFurnaceLarge(); + } + + @Override + public int[] getDimensions() { + return new int[] {0, 0, 0, 0, 0, 0}; + } + + @Override + public int getOffset() { + return 0; + } +} diff --git a/src/main/java/com/hbm/items/armor/ItemModHealth.java b/src/main/java/com/hbm/items/armor/ItemModHealth.java index 6e757153a..85b5dfa43 100644 --- a/src/main/java/com/hbm/items/armor/ItemModHealth.java +++ b/src/main/java/com/hbm/items/armor/ItemModHealth.java @@ -27,7 +27,7 @@ public class ItemModHealth extends ItemArmorMod { String color = "" + (System.currentTimeMillis() % 1000 < 500 ? EnumChatFormatting.RED : EnumChatFormatting.LIGHT_PURPLE); - list.add(color + "+" + (Math.round(health * 10 / 2) * 0.1) + " health"); + list.add(color + "+" + (Math.round(health * 10) * 0.1) + " health"); list.add(""); if(this == ModItems.black_diamond) { @@ -43,7 +43,7 @@ public class ItemModHealth extends ItemArmorMod { String color = "" + (System.currentTimeMillis() % 1000 < 500 ? EnumChatFormatting.RED : EnumChatFormatting.LIGHT_PURPLE); - list.add(color + " " + stack.getDisplayName() + " (+" + (Math.round(health * 10 / 2) * 0.1) + " health)"); + list.add(color + " " + stack.getDisplayName() + " (+" + (Math.round(health * 10) * 0.1) + " health)"); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java new file mode 100644 index 000000000..2339ee8c0 --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java @@ -0,0 +1,20 @@ +package com.hbm.tileentity.machine; + +import com.hbm.tileentity.TileEntityMachineBase; + +public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase { + + public TileEntityMachineArcFurnaceLarge() { + super(30); + } + + @Override + public String getName() { + return null; + } + + @Override + public void updateEntity() { + + } +} diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode.desh.png b/src/main/resources/assets/hbm/textures/items/arc_electrode.desh.png new file mode 100644 index 000000000..007f2a98e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/arc_electrode.desh.png differ diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode.graphite.png b/src/main/resources/assets/hbm/textures/items/arc_electrode.graphite.png new file mode 100644 index 000000000..4eebcc2ae Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/arc_electrode.graphite.png differ diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode.lanthanium.png b/src/main/resources/assets/hbm/textures/items/arc_electrode.lanthanium.png new file mode 100644 index 000000000..c05b22009 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/arc_electrode.lanthanium.png differ