diff options
Diffstat (limited to 'src/main')
24 files changed, 109 insertions, 77 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java index e428c10c70..abbe441a25 100644 --- a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java +++ b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java @@ -58,6 +58,7 @@ public class GT_Multiblock_Tooltip_Builder { private static final String TT_structure = StatCollector.translateToLocal("GT5U.MBTT.Structure"); private static final String TT_controller = StatCollector.translateToLocal("GT5U.MBTT.Controller"); private static final String TT_minimum = StatCollector.translateToLocal("GT5U.MBTT.Minimum"); + private static final String TT_tiered = StatCollector.translateToLocal("GT5U.MBTT.Tiered"); private static final String TT_maintenancehatch = StatCollector.translateToLocal("GT5U.MBTT.MaintenanceHatch"); private static final String TT_energyhatch = StatCollector.translateToLocal("GT5U.MBTT.EnergyHatch"); private static final String TT_dynamohatch = StatCollector.translateToLocal("GT5U.MBTT.DynamoHatch"); @@ -173,38 +174,18 @@ public class GT_Multiblock_Tooltip_Builder { */ public GT_Multiblock_Tooltip_Builder beginVariableStructureBlock(int wmin, int wmax, int hmin, int hmax, int lmin, int lmax, boolean hollow) { - if (hollow) { - sLines.add( - TT_dimensions + COLON - + wmin - + "-" - + wmax - + "x" - + hmin - + "-" - + hmax - + "x" - + lmin - + "-" - + lmax - + " (WxHxL) " - + TT_hollow); - } else { - sLines.add( - TT_dimensions + COLON - + wmin - + "-" - + wmax - + "x" - + hmin - + "-" - + hmax - + "x" - + lmin - + "-" - + lmax - + " (WxHxL)"); - } + sLines.add( + TT_dimensions + COLON + + wmin + + (wmin != wmax ? "-" + wmax : "") + + "x" + + hmin + + (hmin != hmax ? "-" + hmax : "") + + "x" + + lmin + + (lmin != lmax ? "-" + lmax : "") + + " (WxHxL) " + + (hollow ? TT_hollow : "")); sLines.add(TT_structure + COLON); return this; } @@ -212,7 +193,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Controller: info - * + * * @param info Positional information. * @return Instance this method was called on. */ @@ -223,21 +204,67 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> - * (indent)minCountx casingName (minimum) - * + * (indent)minCountx casingName (minimum) (tiered) + * * @param casingName Name of the Casing. * @param minCount Minimum needed for valid structure check. * @return Instance this method was called on. + * + * @deprecated Replaced by {@link #addCasingInfoMin(String, int, boolean)} + * */ + @Deprecated public GT_Multiblock_Tooltip_Builder addCasingInfo(String casingName, int minCount) { - sLines.add(TAB + minCount + "x " + casingName + " " + TT_minimum); + return addCasingInfoMin(casingName, minCount, false); + } + + /** + * Add a line of information about the structure:<br> + * (indent)countx casingName (tiered) + * + * @param casingName Name of the Casing. + * @param isTiered Flag if this casing accepts multiple tiers (e.g. coils) + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addCasingInfoExactly(String casingName, int count, boolean isTiered) { + sLines.add(TAB + count + "x " + casingName + (isTiered ? " " + TT_tiered : "")); + return this; + } + + /** + * Add a line of information about the structure:<br> + * (indent)minCountx casingName (minimum) (tiered) + * + * @param casingName Name of the Casing. + * @param minCount Minimum needed for valid structure check. + * @param isTiered Flag if this casing accepts multiple tiers (e.g. coils) + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addCasingInfoMin(String casingName, int minCount, boolean isTiered) { + sLines.add(TAB + minCount + "x " + casingName + " " + TT_minimum + (isTiered ? " " + TT_tiered : "")); + return this; + } + + /** + * Add a line of information about the structure:<br> + * (indent)minCountx - maxCountx casingName (minimum) (tiered) + * + * @param casingName Name of the Casing. + * @param minCount Minimum needed for valid structure check. + * @param maxCount Maximum needed for valid structure check. + * @param isTiered Flag if this casing accepts multiple tiers (e.g. coils) + * @return Instance this method was called on. + */ + public GT_Multiblock_Tooltip_Builder addCasingInfoRange(String casingName, int minCount, int maxCount, + boolean isTiered) { + sLines.add(TAB + minCount + "x - " + maxCount + "x " + casingName + (isTiered ? " " + TT_tiered : "")); return this; } /** * Use this method to add a structural part that isn't covered by the other methods.<br> * (indent)name: info - * + * * @param name Name of the hatch or other component. * @param info Positional information. * @return Instance this method was called on. @@ -250,7 +277,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Maintenance Hatch: info - * + * * @param info Positional information. * @return Instance this method was called on. */ @@ -262,7 +289,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Muffler Hatch: info - * + * * @param info Location where the hatch goes * @return Instance this method was called on. */ @@ -274,7 +301,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Energy Hatch: info - * + * * @param info Positional information. * @return Instance this method was called on. */ @@ -286,7 +313,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Dynamo Hatch: info - * + * * @param info Positional information. * @return Instance this method was called on. */ @@ -298,7 +325,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Input Bus: info - * + * * @param info Location where the bus goes * @return Instance this method was called on. */ @@ -310,7 +337,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Input Hatch: info - * + * * @param info Location where the hatch goes * @return Instance this method was called on. */ @@ -322,7 +349,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Output Bus: info - * + * * @param info Location where the bus goes * @return Instance this method was called on. */ @@ -334,7 +361,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Add a line of information about the structure:<br> * (indent)Output Hatch: info - * + * * @param info Location where the bus goes * @return Instance this method was called on. */ @@ -346,7 +373,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Use this method to add a structural part that isn't covered by the other methods.<br> * (indent)name: info - * + * * @param name Name of the hatch or other component. * @param info Positional information. * @param dots The valid locations for this part when asked to display hints @@ -473,7 +500,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Use this method to add non-standard structural info.<br> * (indent)info - * + * * @param info The line to be added. * @return Instance this method was called on. */ @@ -485,7 +512,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Use this method to add non-standard structural info.<br> * (indent)info - * + * * @param channel the name of subchannel * @param purpose the purpose of subchannel * @return Instance this method was called on. @@ -497,7 +524,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Use this method to add non-standard structural hint. This info will appear before the standard structural hint. - * + * * @param info The line to be added. This should be an entry into minecraft's localization system. * @return Instance this method was called on. */ @@ -509,7 +536,7 @@ public class GT_Multiblock_Tooltip_Builder { /** * Use this method to add an entry to standard structural hint without creating a corresponding line in structure * information - * + * * @param name The name of block This should be an entry into minecraft's localization system. * @param dots Possible locations of this block * @return Instance this method was called on. diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java index aa082afee0..fd724c57ea 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java @@ -62,7 +62,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB .addInfo("the height of empty space within").addInfo("Make sure your Energy Hatch matches! ?") .addInfo("Machines that cause pollution aren't allowed to be put in.").addSeparator() .beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true).addController("Top center") - .addCasingInfo("Plascrete", 20) + .addCasingInfoRange("Plascrete", 20, 1007, false) .addStructureInfo(GT_Values.cleanroomGlass + "% of the Plascrete can be replaced with Reinforced Glass") // check .addStructureInfo("Other material can be used in place of Plascrete. See config for detail") // check .addOtherStructurePart("Filter Machine Casing", "Top besides controller and edges") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index bd3dfdc2a3..381df634d2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -92,7 +92,7 @@ public class GT_MetaTileEntity_DieselEngine extends .addInfo("Boosted: Produces 6144EU/t at 150% fuel efficiency") .addInfo("You need to wait for it to reach 300% to output full power") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false) - .addController("Front center").addCasingInfo("Stable Titanium Machine Casing", 16) + .addController("Front center").addCasingInfoRange("Stable Titanium Machine Casing", 16, 22, false) .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") .addOtherStructurePart("Engine Intake Machine Casing", "8x, ring around controller") .addStructureInfo("Engine Intake Casings must not be obstructed in front (only air blocks)") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 37a9b924e8..79204817f5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -97,7 +97,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace "For each perfect overclock the EBF will reduce recipe time 4 times (instead of 2) (100% efficiency)") .addInfo("Additionally gives +100K for every tier past MV") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true) - .addController("Front bottom").addCasingInfo("Heat Proof Machine Casing", 0) + .addController("Front bottom").addCasingInfoRange("Heat Proof Machine Casing", 0, 15, false) .addOtherStructurePart("Heating Coils", "Two middle Layers") .addEnergyHatch("Any bottom layer casing", 3).addMaintenanceHatch("Any bottom layer casing", 3) .addMufflerHatch("Top middle", 2).addInputBus("Any bottom layer casing", 3) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java index 66951a889d..78e059db2a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java @@ -44,7 +44,7 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die .addInfo("Boosted: Produces 32700EU/t at 150% fuel efficiency") .addInfo("You need to wait for it to reach 300% to output full power") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false) - .addController("Front center").addCasingInfo("Robust Tungstensteel Machine Casing", 16) + .addController("Front center").addCasingInfoRange("Robust Tungstensteel Machine Casing", 16, 22, false) .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") .addOtherStructurePart("Extreme Engine Intake Machine Casing", "8x, ring around controller") .addStructureInfo("Extreme Engine Intake Casings must not be obstructed in front (only air blocks)") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 2ff938d2f4..7742af798a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -73,7 +73,8 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it").addSeparator() .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfo("LuV Machine Casing", 79).addStructureInfo("Cover the coils with casing") + .addCasingInfoRange("LuV Machine Casing", 79, 123, false) + .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Superconducting Coil Block", "Center part of the ring") .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be LuV or better") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index 413245d43f..de7a54ae93 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -73,7 +73,8 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it").addSeparator() .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfo("Fusion Machine Casing", 79).addStructureInfo("Cover the coils with casing") + .addCasingInfoRange("Fusion Machine Casing", 79, 123, false) + .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be ZPM or better") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index ebc88c28f3..09d8a46c26 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -73,7 +73,8 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it").addSeparator() .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfo("Fusion Machine Casing Mk II", 79).addStructureInfo("Cover the coils with casing") + .addCasingInfoRange("Fusion Machine Casing Mk II", 79, 123, false) + .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UV or better") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java index e5921aaf32..4405044703 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java @@ -99,7 +99,7 @@ public class GT_MetaTileEntity_HeatExchanger extends .addInfo("Read the wiki article to understand how it works") .addInfo("Then go to the Discord to understand the wiki").addSeparator() .beginStructureBlock(3, 4, 3, false).addController("Front bottom") - .addCasingInfo("Stable Titanium Machine Casing", 20) + .addCasingInfoRange("Stable Titanium Machine Casing", 20, 32, false) .addOtherStructurePart("Titanium Pipe Casing", "Center 2 blocks").addMaintenanceHatch("Any casing", 1) .addInputHatch("Hot fluid, bottom center", 2).addInputHatch("Distilled water, any casing", 1) .addOutputHatch("Cold fluid, top center", 3).addOutputHatch("Steam/SH Steam, any casing", 1) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java index ed7ca009c5..4374e3ad7e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_ImplosionCompressor tt.addMachineType("Implosion Compressor").addInfo("Explosions are fun") .addInfo("Controller block for the Implosion Compressor") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfo("Solid Steel Machine Casing", 16) + .addController("Front center").addCasingInfoRange("Solid Steel Machine Casing", 16, 24, false) .addStructureInfo("Casings can be replaced with Explosion Warning Signs") .addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1) .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).toolTipFinisher("Gregtech"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index 93d42acec0..6bd2da57db 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -126,7 +126,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends formatNumbers(500.0 / getEfficiencyIncrease()))) // ? check semifluid again .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, false) .addController("Front bottom") - .addCasingInfo(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24) // ? + .addCasingInfoRange(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24, 31, false) // ? .addOtherStructurePart(getCasingMaterial() + " Fire Boxes", "Bottom layer, 3 minimum") .addOtherStructurePart(getCasingMaterial() + " Pipe Casing Blocks", "Inner 3 blocks") .addMaintenanceHatch("Any firebox", 1).addMufflerHatch("Any firebox", 1) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index a6739e6fa2..76d2ce80d3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -92,7 +92,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor tt.addMachineType("Chemical Reactor").addInfo("Controller block for the Large Chemical Reactor") .addInfo("Does not lose efficiency when overclocked").addInfo("Accepts fluids instead of fluid cells") .addSeparator().beginStructureBlock(3, 3, 3, false).addController("Front center") - .addCasingInfo("Chemically Inert Machine Casing", 8) + .addCasingInfoRange("Chemically Inert Machine Casing", 8, 22, false) .addOtherStructurePart("PTFE Pipe Machine Casing", "Center") .addOtherStructurePart("Heating Coil", "Adjacent to the PTFE Pipe Machine Casing", 1) .addEnergyHatch("Any casing", 1, 2).addMaintenanceHatch("Any casing", 1, 2) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 79078febec..99eb312b76 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT .addInfo("See the Advanced Large Gas Turbine as the next, uncapped, option") // .addInfo("The excess fuel that gets consumed will be voided!") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, true) - .addController("Front center").addCasingInfo("Stainless Steel Turbine Casing", 24) + .addController("Front center").addCasingInfoRange("Stainless Steel Turbine Casing", 8, 30, false) .addDynamoHatch("Back center", 1).addMaintenanceHatch("Side centered", 2) .addMufflerHatch("Side centered", 2).addInputHatch("Gas Fuel, Side centered", 2) .toolTipFinisher("Gregtech"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java index fbad39dd32..f1a7427463 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java @@ -48,7 +48,7 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit .addInfo("Needs a Turbine, place inside controller").addInfo("Only accepts gases above 800k EU/bucket") .addInfo("Has no maximum EU/t output, only depends on the Dynamo Hatch") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, true) - .addController("Front center").addCasingInfo("Advanced Gas Turbine Casing", 24) + .addController("Front center").addCasingInfoRange("Advanced Gas Turbine Casing", 8, 30, false) .addDynamoHatch("Back center", 1).addMaintenanceHatch("Side centered", 2) .addMufflerHatch("Side centered", 2).addInputHatch("Gas Fuel, Side centered", 2) .toolTipFinisher("Gregtech"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index 20a62fc13c..d6e2f16a3d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -54,7 +54,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La .addInfo("Power output depends on turbine and fitting") .addInfo("Use screwdriver to adjust fitting of turbine").addSeparator() .beginStructureBlock(3, 3, 4, true).addController("Front center") - .addCasingInfo("Titanium Turbine Casing", 24).addDynamoHatch("Back center", 1) + .addCasingInfoRange("Titanium Turbine Casing", 8, 31, false).addDynamoHatch("Back center", 1) .addMaintenanceHatch("Side centered", 2).addInputHatch("Superheated Steam, Side centered", 2) .addOutputHatch("Steam, Side centered", 2).toolTipFinisher("Gregtech"); return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 5479d277e2..d778abbc36 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -53,7 +53,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar .addInfo("Needs a Turbine, place inside controller") .addInfo("Use your Fusion Reactor to produce the Plasma").addSeparator() .beginStructureBlock(3, 3, 4, true).addController("Front center") - .addCasingInfo("Tungstensteel Turbine Casing", 24).addDynamoHatch("Back center", 1) + .addCasingInfoRange("Tungstensteel Turbine Casing", 8, 31, false).addDynamoHatch("Back center", 1) .addMaintenanceHatch("Side centered", 2).addInputHatch("Plasma Fluid, Side centered", 2) .addOutputHatch("Molten Fluid, optional, Side centered", 2).toolTipFinisher("Gregtech"); return tt; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 8ccd605b3a..3ccc635d92 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -55,10 +55,10 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg .addInfo("Outputs Distilled Water as well as producing power") .addInfo("Power output depends on turbine and fitting") .addInfo("Use screwdriver to adjust fitting of turbine").addSeparator() - .beginStructureBlock(3, 3, 4, true).addController("Front center").addCasingInfo("Turbine Casing", 24) - .addDynamoHatch("Back center", 1).addMaintenanceHatch("Side centered", 2) - .addInputHatch("Steam, Side centered", 2).addOutputHatch("Distilled Water, Side centered", 2) - .toolTipFinisher("Gregtech"); + .beginStructureBlock(3, 3, 4, true).addController("Front center") + .addCasingInfoRange("Turbine Casing", 8, 31, false).addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2).addInputHatch("Steam, Side centered", 2) + .addOutputHatch("Distilled Water, Side centered", 2).toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index aec44c664d..95825c9eb0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -91,7 +91,7 @@ public class GT_MetaTileEntity_MultiFurnace extends tt.addMachineType("Furnace").addInfo("Controller Block for the Multi Smelter") .addInfo("Smelts up to 8-8192 items at once").addInfo("Items smelted increases with coil tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front bottom").addCasingInfo("Heat Proof Machine Casing", 8) + .addController("Front bottom").addCasingInfoRange("Heat Proof Machine Casing", 8, 14, false) .addOtherStructurePart("Heating Coils", "Middle layer").addEnergyHatch("Any bottom casing", 1) .addMaintenanceHatch("Any bottom casing", 1).addMufflerHatch("Top Middle", 2) .addInputBus("Any bottom casing", 1).addOutputBus("Any bottom casing", 1).toolTipFinisher("Gregtech"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index becb1fcf47..f2be5d276d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -115,7 +115,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult .addInfo("(Values compared to cracking in the Chemical Reactor)") .addInfo("Place the appropriate circuit in the controller").addSeparator() .beginStructureBlock(5, 3, 3, true).addController("Front center") - .addCasingInfo("Clean Stainless Steel Machine Casing", 18) + .addCasingInfoRange("Clean Stainless Steel Machine Casing", 18, 21, false) .addOtherStructurePart("2 Rings of 8 Coils", "Each side of the controller") .addInfo("Gets 10% EU/t reduction per coil tier, up to a maximum of 50%") .addEnergyHatch("Any casing", 1, 2, 3).addMaintenanceHatch("Any casing", 1, 2, 3) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index a53288d50c..ff0cae44af 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -86,9 +86,10 @@ public class GT_MetaTileEntity_ProcessingArray .addInfo("Doesn't work on certain machines, deal with it") .addInfo("Use it if you hate GT++, or want even more speed later on").addSeparator() .beginStructureBlock(3, 3, 3, true).addController("Front center") - .addCasingInfo("Robust Tungstensteel Machine Casing", 14).addEnergyHatch("Any casing", 1) - .addMaintenanceHatch("Any casing", 1).addInputBus("Any casing", 1).addInputHatch("Any casing", 1) - .addOutputBus("Any casing", 1).addOutputHatch("Any casing", 1).toolTipFinisher("Gregtech"); + .addCasingInfoRange("Robust Tungstensteel Machine Casing", 14, 24, false) + .addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1).addInputBus("Any casing", 1) + .addInputHatch("Any casing", 1).addOutputBus("Any casing", 1).addOutputHatch("Any casing", 1) + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 6203c71e7e..f87664a5fb 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -100,7 +100,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends .addInfo("CuNi: 50%, FeAlCr: 100%, Ni4Cr: 150%, TPV: 200%, etc.") .addInfo("EU/t is not affected by Coil tier").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(5, 4, 5, true).addController("Front center") - .addCasingInfo("Pyrolyse Oven Casing", 60) + .addCasingInfoRange("Pyrolyse Oven Casing", 60, 80, false) .addOtherStructurePart("Heating Coils", "Center 3x1x3 of the bottom layer") .addEnergyHatch("Any bottom layer casing", 1).addMaintenanceHatch("Any bottom layer casing", 1) .addMufflerHatch("Center 3x1x3 area in top layer", 2).addInputBus("Center 3x1x3 area in top layer", 2) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java index 681a4dfd63..463e00f7cd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java @@ -43,7 +43,7 @@ public class GT_MetaTileEntity_VacuumFreezer final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Vacuum Freezer").addInfo("Controller Block for the Vacuum Freezer") .addInfo("Cools hot ingots and cells").addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfo("Frost Proof Machine Casing", 16) + .addController("Front center").addCasingInfoRange("Frost Proof Machine Casing", 16, 24, false) .addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1).addInputHatch("Any casing", 1) .addOutputHatch("Any casing", 1).addInputBus("Any casing", 1).addOutputBus("Any casing", 1) .toolTipFinisher("Gregtech"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java index d4810aa195..ddf232680d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java @@ -93,7 +93,7 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Macerator").addInfo("Controller for the Macerator").addSeparator() .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2 + getMaxStacks(), 7, 9, true) - .addController("Bottom Front Center").addCasingInfo("Test Casing", 60) + .addController("Bottom Front Center").addCasingInfoExactly("Test Casing", 60, false) .addEnergyHatch("Any bottom layer casing") .addInputHatch("Any non-optional external facing casing on the stacks") .addInputBus("Any non-optional external facing casing on the stacks") diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index a7fbfa8ef2..34f046c2e6 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -21,6 +21,7 @@ GT5U.MBTT.Hollow=(Hollow) GT5U.MBTT.Structure=Structure GT5U.MBTT.Controller=Controller GT5U.MBTT.Minimum=(minimum) +GT5U.MBTT.Tiered=(tiered) GT5U.MBTT.MaintenanceHatch=Maintenance Hatch GT5U.MBTT.MufflerHatch=Muffler Hatch GT5U.MBTT.EnergyHatch=Energy Hatch |