diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
7 files changed, 132 insertions, 62 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 51f8504144..29b1aec3b6 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 @@ -312,8 +312,8 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33 * tierMachine) - .setSpeedBoost(1.5 / tierMachine); + .setEUtDiscount(1.25 * tierMachine) + .setSpeedBoost(1.6 / tierMachine); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } @@ -327,11 +327,11 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Centrifuge") - .addInfo("33.3% faster than a single block steam machine would run") - .addInfo("Uses only 66.6% of the steam/s that a single block steam machine would use") - .addInfo("Processes 8x parallel") - .addInfo("Steel tier produces at twice the speed but with twice the steam consumption") + .addInfo("Controller Block for the Steam Separator") + .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") .addSeparator() .beginStructureBlock(5, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -344,13 +344,13 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im + EnumChatFormatting.GRAY + " Any casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addStructureInfo(EnumChatFormatting.BLUE + "Basic " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo(EnumChatFormatting.GOLD + "60-65x" + EnumChatFormatting.GRAY + " Bronze Plated Bricks") .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Bronze Gear Box Casing") .addStructureInfo(EnumChatFormatting.GOLD + "3x" + EnumChatFormatting.GRAY + " Bronze Firebox Casing") .addStructureInfo(EnumChatFormatting.GOLD + "4x" + EnumChatFormatting.GRAY + " Bronze Pipe Casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "60-65x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing") @@ -375,10 +375,20 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im 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 - + tag.getInteger("tierMachine") + + tierMachineText + 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 8ca445622a..3d5add5131 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 @@ -256,8 +256,8 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33 * tierMachine) - .setSpeedBoost(1.5 / tierMachine); + .setEUtDiscount(1.25 * tierMachine) + .setSpeedBoost(1.6 / tierMachine); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } @@ -271,11 +271,11 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Compressor") - .addInfo("33.3% faster than the single block Steam Compressor") - .addInfo("Uses only 66.6% of the steam/s that the single block Steam Compressor uses") - .addInfo("Processes 8x parallel") - .addInfo("Steel tier produces at twice the speed but with twice the steam consumption") + .addInfo("Controller Block for the Steam Squasher") + .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") .addSeparator() .beginStructureBlock(3, 3, 4, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -287,10 +287,10 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im + EnumChatFormatting.GRAY + " Any casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addStructureInfo(EnumChatFormatting.BLUE + "Basic " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo(EnumChatFormatting.GOLD + "25-30x" + EnumChatFormatting.GRAY + " Bronze Plated Bricks") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "25-30x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo("") @@ -312,10 +312,20 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im 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 - + tag.getInteger("tierMachine") + + tierMachineText + 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 1209b9c0bc..fe27dd947b 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 @@ -306,8 +306,8 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33 * tierMachine) - .setSpeedBoost(1.5 / tierMachine); + .setEUtDiscount(1.25 * tierMachine) + .setSpeedBoost(1.6 / tierMachine); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } @@ -321,11 +321,11 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Forge Hammer") - .addInfo("33.3% faster than the single block Steam Forge Hammer") - .addInfo("Uses only 66.6% of the steam/s that the single block Forge Hammer uses") - .addInfo("Processes 8x parallel") - .addInfo("Steel tier produces at twice the speed but with twice the steam consumption") + .addInfo("Controller Block for the Steam Presser") + .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") .addSeparator() .beginStructureBlock(6, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -337,12 +337,12 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> + EnumChatFormatting.GRAY + " Any casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addStructureInfo(EnumChatFormatting.BLUE + "Basic " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo(EnumChatFormatting.GOLD + "35-39x" + EnumChatFormatting.GRAY + " Bronze Plated Bricks") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Bronze Pipe Casing") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Iron Block") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "35-39x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Steel Pipe Casing") @@ -371,10 +371,20 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> 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 - + tag.getInteger("tierMachine") + + tierMachineText + 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 5478dc303c..bc1a86dae1 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 @@ -255,8 +255,8 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33 * tierMachine) - .setSpeedBoost(1.5 / tierMachine); + .setEUtDiscount(1.25 * tierMachine) + .setSpeedBoost(1.6 / tierMachine); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } @@ -270,11 +270,11 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Macerator") - .addInfo("33.3% faster than the single block Steam Macerator") - .addInfo("Uses only 66.6% of the steam/s that the single block Steam Macerator uses") - .addInfo("Processes 8x parallel") - .addInfo("Steel tier produces at twice the speed but with twice the steam consumption") + .addInfo("Controller Block for the Steam Grinder") + .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") .addSeparator() .beginStructureBlock(3, 3, 3, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -286,10 +286,10 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl + EnumChatFormatting.GRAY + " Any casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addStructureInfo(EnumChatFormatting.BLUE + "Basic " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo(EnumChatFormatting.GOLD + "14-22x" + EnumChatFormatting.GRAY + " Bronze Plated Bricks") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "14-22x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo("") @@ -311,10 +311,20 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl 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 - + tag.getInteger("tierMachine") + + tierMachineText + 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 6429d556c5..fbd9828aba 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 @@ -310,8 +310,8 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33 * tierMachine) - .setSpeedBoost(1.5 / tierMachine); + .setEUtDiscount(1.25 * tierMachine) + .setSpeedBoost(1.6 / tierMachine); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } @@ -325,11 +325,11 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Mixer") - .addInfo("33.3% faster than a single block steam machine would run") - .addInfo("Uses only 66.6% of the steam/s that a single block steam machine would use") - .addInfo("Processes 8x parallel") - .addInfo("Steel tier produces at twice the speed but with twice the steam consumption") + .addInfo("Controller Block for the Steam Blender") + .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") .addSeparator() .beginStructureBlock(7, 6, 7, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -343,13 +343,13 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I + EnumChatFormatting.GRAY + " Any casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addStructureInfo(EnumChatFormatting.BLUE + "Basic " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo(EnumChatFormatting.GOLD + "90-100x" + EnumChatFormatting.GRAY + " Bronze Plated Bricks") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Bronze Gear Box Casing") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Bronze Pipe Casing") .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Block of Iron") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "90-100x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing") @@ -374,10 +374,20 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I 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 - + tag.getInteger("tierMachine") + + tierMachineText + 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 6b6bc4ca62..947ea29947 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 @@ -331,8 +331,8 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33 * tierMachine) - .setSpeedBoost(1.5 / tierMachine); + .setEUtDiscount(1.25 * tierMachine) + .setSpeedBoost(1.6 / tierMachine); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } @@ -346,11 +346,11 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements protected MultiblockTooltipBuilder createTooltip() { MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Steam Washer") - .addInfo("33.3% faster than a single block steam machine would run") - .addInfo("Uses only 66.6% of the steam/s that a single block steam machine would use") - .addInfo("Processes 8x parallel") - .addInfo("Steel tier produces at twice the speed but with twice the steam consumption") + .addInfo("Controller Block for the Steam Purifier") + .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") .addSeparator() .beginStructureBlock(5, 5, 5, false) .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1) @@ -363,13 +363,13 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements + EnumChatFormatting.GRAY + " Any casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addStructureInfo(EnumChatFormatting.BLUE + "Basic " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo(EnumChatFormatting.GOLD + "55-59x" + EnumChatFormatting.GRAY + " Bronze Plated Bricks") .addStructureInfo(EnumChatFormatting.GOLD + "24x" + EnumChatFormatting.GRAY + " Any Glass") .addStructureInfo(EnumChatFormatting.GOLD + "12x" + EnumChatFormatting.GRAY + " Bronze Pipe Casing") .addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Bronze Gear Box Casing") .addStructureInfo("") - .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier") .addStructureInfo( EnumChatFormatting.GOLD + "55-59x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing") .addStructureInfo(EnumChatFormatting.GOLD + "24x" + EnumChatFormatting.GRAY + " Any Glass") @@ -394,10 +394,20 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements 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 - + tag.getInteger("tierMachine") + + tierMachineText + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.multiblock.curparallelism") + ": " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java index a397a80974..e29cc81baf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java @@ -321,10 +321,20 @@ public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> impl super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); + int tierMachine = tag.getInteger("mSetTier"); + String tierMachineText; + if (tierMachine == 1) { + tierMachineText = "Bronze"; + } else if (tierMachine == 2) { + tierMachineText = "Steel"; + } else { + tierMachineText = String.valueOf(tierMachine); + } + currenttip.add( - StatCollector.translateToLocal("GT5U.machines.tier") + ": " + StatCollector.translateToLocal("GTPP.machines.tier") + ": " + EnumChatFormatting.BLUE - + tag.getInteger("mSetTier") + + tierMachineText + EnumChatFormatting.RESET); currenttip.add( StatCollector.translateToLocal("GT5U.biomes.humidity") + " " |