diff options
author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-17 11:28:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-17 15:28:12 +0000 |
commit | 0d27316cbbfb7ddaac334b93273833d94ad26a67 (patch) | |
tree | 773cbdb83b09ec638a54e257a8373279cf096b71 /src | |
parent | a306b633d206c30db81f375da4927d0d0792aa8b (diff) | |
download | GT5-Unofficial-0d27316cbbfb7ddaac334b93273833d94ad26a67.tar.gz GT5-Unofficial-0d27316cbbfb7ddaac334b93273833d94ad26a67.tar.bz2 GT5-Unofficial-0d27316cbbfb7ddaac334b93273833d94ad26a67.zip |
Fix steam min casings (#3216)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src')
7 files changed, 14 insertions, 14 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 6043b0f306..52338322a3 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 @@ -260,7 +260,7 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im if (tierGearBoxCasing == 1 && tierPipeCasing == 1 && tierFireBoxCasing == 1 && tierMachineCasing == 1 - && tCountCasing > 60 + && tCountCasing >= 60 && checkHatches()) { updateHatchTexture(); tierMachine = 1; @@ -269,7 +269,7 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im if (tierGearBoxCasing == 2 && tierPipeCasing == 2 && tierFireBoxCasing == 2 && tierMachineCasing == 2 - && tCountCasing > 60 + && tCountCasing >= 60 && checkHatches()) { updateHatchTexture(); tierMachine = 2; 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 fb6ffe0cda..c8b441738b 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 @@ -205,12 +205,12 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im tierMachineCasing = -1; if (!checkPiece(STRUCTUR_PIECE_MAIN, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET)) return false; if (tierMachineCasing < 0) return false; - if (tierMachineCasing == 1 && mCountCasing > 25 && checkHatches()) { + if (tierMachineCasing == 1 && mCountCasing >= 25 && checkHatches()) { updateHatchTexture(); tierMachine = 1; return true; } - if (tierMachineCasing == 2 && mCountCasing > 25 && checkHatches()) { + if (tierMachineCasing == 2 && mCountCasing >= 25 && checkHatches()) { updateHatchTexture(); tierMachine = 2; return true; 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 92fc531946..01e719130e 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 @@ -249,7 +249,7 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> if (tierPipeCasing < 0 && tierMachineCasing < 0 && tierSimpleBlock < 0) return false; if (tierPipeCasing == 1 && tierMachineCasing == 1 && tierSimpleBlock == 1 - && tCountCasing > 35 + && tCountCasing >= 35 && checkHatches()) { updateHatchTexture(); tierMachine = 1; @@ -257,7 +257,7 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer> } if (tierPipeCasing == 2 && tierMachineCasing == 2 && tierSimpleBlock == 2 - && tCountCasing > 35 + && tCountCasing >= 35 && checkHatches()) { updateHatchTexture(); tierMachine = 2; 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 274711850a..0a94a3068e 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 @@ -201,12 +201,12 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl mCounCasing = 0; if (!checkPiece(STRUCTUR_PIECE_MAIN, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET)) return false; if (tierMachineCasing < 0) return false; - if (tierMachineCasing == 1 && mCounCasing > 14 && checkHatches()) { + if (tierMachineCasing == 1 && mCounCasing >= 14 && checkHatches()) { updateHatchTexture(); tierMachine = 1; return true; } - if (tierMachineCasing == 2 && mCounCasing > 14 && checkHatches()) { + if (tierMachineCasing == 2 && mCounCasing >= 14 && checkHatches()) { updateHatchTexture(); tierMachine = 2; return true; 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 2576c24749..edbbb574ee 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 @@ -258,7 +258,7 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I if (tierGearBoxCasing < 0 && tierPipeCasing < 0 && tierMachineCasing < 0) return false; if (tierGearBoxCasing == 1 && tierPipeCasing == 1 && tierMachineCasing == 1 - && tCountCasing > 90 + && tCountCasing >= 90 && !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty() && !mSteamOutputs.isEmpty() @@ -270,7 +270,7 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I } if (tierGearBoxCasing == 2 && tierPipeCasing == 2 && tierMachineCasing == 2 - && tCountCasing > 90 + && tCountCasing >= 90 && !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty() && !mSteamOutputs.isEmpty() 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 de0c104c3c..4967ab4ee2 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 @@ -267,7 +267,7 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements if (tierGearBoxCasing < 0 && tierPipeCasing < 0 && tierMachineCasing < 0) return false; if (tierGearBoxCasing == 1 && tierPipeCasing == 1 && tierMachineCasing == 1 - && tCountCasing > 55 + && tCountCasing >= 55 && checkHatches()) { updateHatchTexture(); tierMachine = 1; @@ -275,7 +275,7 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements } if (tierGearBoxCasing == 2 && tierPipeCasing == 2 && tierMachineCasing == 2 - && tCountCasing > 55 + && tCountCasing >= 55 && checkHatches()) { updateHatchTexture(); tierMachine = 2; 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 e29cc81baf..ea0a78ccf0 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 @@ -267,11 +267,11 @@ public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> impl .addStructureInfo("") .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 1) .addStructureInfo(EnumChatFormatting.GOLD + "10" + EnumChatFormatting.GRAY + " Bronze Frame Box") - .addStructureInfo(EnumChatFormatting.GOLD + "10" + EnumChatFormatting.GRAY + " Wooden Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "9" + EnumChatFormatting.GRAY + " Wooden Casing") .addStructureInfo("") .addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2) .addStructureInfo(EnumChatFormatting.GOLD + "10" + EnumChatFormatting.GRAY + " Steel Frame Box") - .addStructureInfo(EnumChatFormatting.GOLD + "10 " + EnumChatFormatting.GRAY + " Wooden Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "9 " + EnumChatFormatting.GRAY + " Wooden Casing") .addStructureInfo("") .toolTipFinisher(AuthorEvgenWarGold); return tt; |