diff --git a/src/main/java/com/hbm/inventory/gui/GUIFusionBreeder.java b/src/main/java/com/hbm/inventory/gui/GUIFusionBreeder.java index 25e924d1c..ec88e3c0d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFusionBreeder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFusionBreeder.java @@ -4,10 +4,12 @@ import com.hbm.inventory.container.ContainerFusionBreeder; import com.hbm.lib.RefStrings; import com.hbm.render.util.GaugeUtil; import com.hbm.tileentity.machine.fusion.TileEntityFusionBreeder; +import com.hbm.util.BobMathUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; public class GUIFusionBreeder extends GuiInfoContainer { @@ -26,6 +28,9 @@ public class GUIFusionBreeder extends GuiInfoContainer { @Override public void drawScreen(int mouseX, int mouseY, float interp) { super.drawScreen(mouseX, mouseY, interp); + + drawCustomInfoStat(mouseX, mouseY, guiLeft + 79, guiTop + 23, 18, 18, mouseX, mouseY, EnumChatFormatting.GREEN + "-> " + EnumChatFormatting.RESET + (int) Math.ceil(breeder.neutronEnergy) + " flux/t"); + drawCustomInfoStat(mouseX, mouseY, guiLeft + 67, guiTop + 46, 42, 14, mouseX, mouseY, BobMathUtil.format((int) Math.ceil(breeder.progress)) + " / " + BobMathUtil.format((int) Math.ceil(breeder.capacity)) + " flux"); breeder.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 18, 16, 52); breeder.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 18, 16, 52); diff --git a/src/main/java/com/hbm/inventory/recipes/FusionRecipe.java b/src/main/java/com/hbm/inventory/recipes/FusionRecipe.java index c85e07637..6b07f227f 100644 --- a/src/main/java/com/hbm/inventory/recipes/FusionRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/FusionRecipe.java @@ -30,9 +30,9 @@ public class FusionRecipe extends GenericRecipe { duration(list); power(list); - list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("gui.recipe.fusionIn") + ": " + BobMathUtil.getShortNumber(ignitionTemp) + "KyU/t"); - list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("gui.recipe.fusionOut") + ": " + BobMathUtil.getShortNumber(outputTemp) + "TU/t"); - list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("gui.recipe.fusionFlux") + ": " + ((int)(neutronFlux * 10)) / 10D + " flux/t"); + list.add(EnumChatFormatting.LIGHT_PURPLE + I18nUtil.resolveKey("gui.recipe.fusionIn") + ": " + BobMathUtil.getShortNumber(ignitionTemp) + "KyU/t"); + list.add(EnumChatFormatting.LIGHT_PURPLE + I18nUtil.resolveKey("gui.recipe.fusionOut") + ": " + BobMathUtil.getShortNumber(outputTemp) + "TU/t"); + list.add(EnumChatFormatting.LIGHT_PURPLE + I18nUtil.resolveKey("gui.recipe.fusionFlux") + ": " + ((int)(neutronFlux * 10)) / 10D + " flux/t"); input(list); output(list); diff --git a/src/main/resources/assets/hbm/textures/models/fusion/boiler.png b/src/main/resources/assets/hbm/textures/models/fusion/boiler.png index 8d3954820..4a62137d5 100644 Binary files a/src/main/resources/assets/hbm/textures/models/fusion/boiler.png and b/src/main/resources/assets/hbm/textures/models/fusion/boiler.png differ diff --git a/src/main/resources/assets/hbm/textures/models/fusion/mhdt.png b/src/main/resources/assets/hbm/textures/models/fusion/mhdt.png index aea4ba30e..0836580c2 100644 Binary files a/src/main/resources/assets/hbm/textures/models/fusion/mhdt.png and b/src/main/resources/assets/hbm/textures/models/fusion/mhdt.png differ