From 71709d9fa14d27c4d337808acffa4a1d61b6f97c Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Tue, 12 Mar 2024 22:39:35 +0800 Subject: Fix compact fusions (#241) * fix machine not shut down when no enough startup power * tweak EU capacity and power restriction for a single hatch * fix missing OCs and code clean * too much hatch power --- .../blocks/tileEntity/LargeFusionComputer5.java | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index 63f005b9b2..99e5afeba3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -45,9 +45,22 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Fusion Reactor").addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-V.") - .addInfo("167,772,160EU/t and 320M EU capacity per Energy Hatch") + .addInfo( + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + + EnumChatFormatting.GRAY + + " EU/t and " + + EnumChatFormatting.AQUA + + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + "M" + + EnumChatFormatting.GRAY + + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") + .addInfo( + "If the recipe requires a voltage tier over " + + GT_Utility.getColoredTierNameFromTier((byte) tier()) + + EnumChatFormatting.GRAY + + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") .addInfo("chunk area of the ring center (not controller).").addInfo("Performs 4/4 overclock.") .addInfo("Startup < 160,000,000 EU: 320x Parallel").addInfo("Startup < 320,000,000 EU: 256x Parallel") @@ -79,14 +92,9 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { return 10; } - @Override - public long maxEUStore() { - return 10240800000L * (Math.min(32, this.mEnergyHatches.size() + this.eEnergyMulti.size())) / 32L; - } - @Override public long capableStartupCanonical() { - return 10_240_800_000L; + return 20_480_000_000L; } @Override @@ -142,11 +150,6 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { return 64; } - @Override - public int tierOverclock() { - return 16; - } - @Override public int extraPara(int startEnergy) { if (startEnergy < 160000000) return 5; -- cgit