diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
6 files changed, 12 insertions, 78 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java index 29b1aec3b6..6043b0f306 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java @@ -331,7 +331,7 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") - .addInfo("Processing Speed & Steam Consumption is doubled under High Pressure") + .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) .addSeparator() .beginStructureBlock(5, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -374,21 +374,10 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); - - int tierMachine = tag.getInteger("tierMachine"); - String tierMachineText; - if (tierMachine == 1) { - tierMachineText = "Basic"; - } else if (tierMachine == 2) { - tierMachineText = "High Pressure"; - } else { - tierMachineText = String.valueOf(tierMachine); - } - currenttip.add( StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + tierMachineText + + getSteamTierTextForWaila(tag) + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java index 3d5add5131..fb6ffe0cda 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java @@ -275,7 +275,7 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") - .addInfo("Processing Speed & Steam Consumption is doubled under High Pressure") + .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) .addSeparator() .beginStructureBlock(3, 3, 4, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -311,21 +311,10 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); - - int tierMachine = tag.getInteger("tierMachine"); - String tierMachineText; - if (tierMachine == 1) { - tierMachineText = "Basic"; - } else if (tierMachine == 2) { - tierMachineText = "High Pressure"; - } else { - tierMachineText = String.valueOf(tierMachine); - } - currenttip.add( StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + tierMachineText + + getSteamTierTextForWaila(tag) + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java index fe27dd947b..92fc531946 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java @@ -325,7 +325,7 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") - .addInfo("Processing Speed & Steam Consumption is doubled under High Pressure") + .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) .addSeparator() .beginStructureBlock(6, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -370,21 +370,10 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); - - int tierMachine = tag.getInteger("tierMachine"); - String tierMachineText; - if (tierMachine == 1) { - tierMachineText = "Basic"; - } else if (tierMachine == 2) { - tierMachineText = "High Pressure"; - } else { - tierMachineText = String.valueOf(tierMachine); - } - currenttip.add( StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + tierMachineText + + getSteamTierTextForWaila(tag) + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java index bc1a86dae1..274711850a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java @@ -274,7 +274,7 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") - .addInfo("Processing Speed & Steam Consumption is doubled under High Pressure") + .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) .addSeparator() .beginStructureBlock(3, 3, 3, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -310,21 +310,10 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); - - int tierMachine = tag.getInteger("tierMachine"); - String tierMachineText; - if (tierMachine == 1) { - tierMachineText = "Basic"; - } else if (tierMachine == 2) { - tierMachineText = "High Pressure"; - } else { - tierMachineText = String.valueOf(tierMachine); - } - currenttip.add( StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + tierMachineText + + getSteamTierTextForWaila(tag) + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java index fbd9828aba..2576c24749 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java @@ -329,7 +329,7 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") - .addInfo("Processing Speed & Steam Consumption is doubled under High Pressure") + .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) .addSeparator() .beginStructureBlock(7, 6, 7, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -373,21 +373,10 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); - - int tierMachine = tag.getInteger("tierMachine"); - String tierMachineText; - if (tierMachine == 1) { - tierMachineText = "Basic"; - } else if (tierMachine == 2) { - tierMachineText = "High Pressure"; - } else { - tierMachineText = String.valueOf(tierMachine); - } - currenttip.add( StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + tierMachineText + + getSteamTierTextForWaila(tag) + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java index 947ea29947..de0c104c3c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java @@ -350,7 +350,7 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements .addInfo("25% faster than using single block steam machines of the same pressure") .addInfo("Only consumes steam at 62.5% of the L/s normally required") .addInfo("Processes up to 8 items at once") - .addInfo("Processing Speed & Steam Consumption is doubled under High Pressure") + .addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE) .addSeparator() .beginStructureBlock(5, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -393,21 +393,10 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); - - int tierMachine = tag.getInteger("tierMachine"); - String tierMachineText; - if (tierMachine == 1) { - tierMachineText = "Basic"; - } else if (tierMachine == 2) { - tierMachineText = "High Pressure"; - } else { - tierMachineText = String.valueOf(tierMachine); - } - currenttip.add( StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.YELLOW - + tierMachineText + + getSteamTierTextForWaila(tag) + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " |