Fix up tooltips, crib acceptance, and normalize the lathe to use all item pipe casings (#3057)

Co-authored-by: boubou19 <miisterunknown@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

2 files changed, 20 insertions, 12 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java
index 5d10d55277..65d4bc93d3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java
@@ -201,7 +201,7 @@ public class MTEMultiAutoclave extends MTEExtendedPowerMultiBlockBase<MTEMultiAu
             .addInfo("Needs a minimum of 128 Pressure Containment Casings.")
             .addInfo(AuthorVolence)
             .addSeparator()
-            .beginStructureBlock(7, 5, 5, true)
+            .beginStructureBlock(7, 7, 9, true)
             .addController("Front Center")
             .addCasingInfoMin("Pressure Containment Casings", 128, false)
             .addCasingInfoExactly("Item Pipe Casings", 7, true)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java
index e0c8e35444..3b01d0ec1e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java
@@ -73,6 +73,9 @@ public class MTEMultiLathe extends MTEEnhancedMultiBlockBase<MTEMultiLathe> impl
 
     public enum PipeTiers {
 
+        Tin(1, 0.75F),
+        Brass(1, 0.8F),
+        Electrum(2, 0.9F),
         Platinum(4, 1F),
         Osmium(8, 1.25F),
         Quantium(12, 1.5F),
@@ -91,19 +94,22 @@ public class MTEMultiLathe extends MTEEnhancedMultiBlockBase<MTEMultiLathe> impl
     private PipeTiers getPipeData() {
         pipeTier = getPipeTier();
         return switch (pipeTier) {
-            case 2 -> PipeTiers.Osmium;
-            case 3 -> PipeTiers.Quantium;
-            case 4 -> PipeTiers.FluxedElectrum;
-            case 5 -> PipeTiers.BlackPlutonium;
-            default -> PipeTiers.Platinum;
+            case 2 -> PipeTiers.Brass;
+            case 3 -> PipeTiers.Electrum;
+            case 4 -> PipeTiers.Platinum;
+            case 5 -> PipeTiers.Osmium;
+            case 6 -> PipeTiers.Quantium;
+            case 7 -> PipeTiers.FluxedElectrum;
+            case 8 -> PipeTiers.BlackPlutonium;
+            default -> PipeTiers.Tin;
         };
     }
 
     // get tier from block meta
     private static Integer getTierFromMeta(Block block, Integer metaID) {
         if (block != GregTechAPI.sBlockCasings11) return -1;
-        if (metaID < 3 || metaID > 7) return -1;
-        return (metaID - 2);
+        if (metaID < 0 || metaID > 7) return -1;
+        return metaID + 1;
     }
 
     private void setPipeTier(int tier) {
@@ -150,6 +156,9 @@ public class MTEMultiLathe extends MTEEnhancedMultiBlockBase<MTEMultiLathe> impl
             ofBlocksTiered(
                 MTEMultiLathe::getTierFromMeta,
                 ImmutableList.of(
+                    Pair.of(GregTechAPI.sBlockCasings11, 0),
+                    Pair.of(GregTechAPI.sBlockCasings11, 1),
+                    Pair.of(GregTechAPI.sBlockCasings11, 2),
                     Pair.of(GregTechAPI.sBlockCasings11, 3),
                     Pair.of(GregTechAPI.sBlockCasings11, 4),
                     Pair.of(GregTechAPI.sBlockCasings11, 5),
@@ -220,8 +229,8 @@ public class MTEMultiLathe extends MTEEnhancedMultiBlockBase<MTEMultiLathe> impl
         tt.addMachineType("Lathe")
             .addInfo("Controller Block for the Industrial Precision Lathe")
             .addInfo("Gains 2 parallels per voltage tier,")
-            .addInfo("and 4 parallels per pipe casing tier (16 for Black Plutonium)")
-            .addInfo("Better pipe casings increase speed")
+            .addInfo("and 4 parallels per pipe casing tier starting at Platinum, 16 for Black Plutonium")
+            .addInfo("Better item pipe casings increase speed")
             .addInfo("Only uses 80% of the recipe's required energy")
             .addInfo(AuthorVolence)
             .addSeparator()
@@ -270,9 +279,8 @@ public class MTEMultiLathe extends MTEEnhancedMultiBlockBase<MTEMultiLathe> impl
         getBaseMetaTileEntity().sendBlockEvent(GregTechTileClientEvents.CHANGE_CUSTOM_DATA, getUpdateData());
         if (!checkPiece(STRUCTURE_PIECE_BODY, 3, 4, -1) && !checkPiece(STRUCTURE_PIECE_BODY_ALT, 3, 4, -1))
             return false;
-        return this.mMaintenanceHatches.size() == 1 && pipeTier >= -1
+        return this.mMaintenanceHatches.size() == 1 && pipeTier > 0
             && mEnergyHatches.size() >= 1
-            && mInputBusses.size() >= 1
             && mMufflerHatches.size() == 1;
     }