From b8e0e5e3f87fed41a4353c7851cd17d5e67d7550 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Wed, 30 Oct 2024 16:49:28 +0100 Subject: Various waterline bugfixes (#3433) --- src/main/java/gregtech/api/recipe/RecipeMaps.java | 5 ++++- src/main/java/gregtech/common/items/MetaGeneratedItem03.java | 4 ++-- .../common/tileentities/machines/multi/MTEMultiLathe.java | 2 +- .../machines/multi/purification/MTEPurificationPlant.java | 11 +++++------ .../purification/MTEPurificationUnitBaryonicPerfection.java | 10 +++++++++- .../multi/purification/MTEPurificationUnitClarifier.java | 2 +- .../multi/purification/MTEPurificationUnitDegasser.java | 4 ++-- .../multi/purification/MTEPurificationUnitFlocculation.java | 4 ++-- .../multi/purification/MTEPurificationUnitOzonation.java | 2 +- .../multi/purification/MTEPurificationUnitPhAdjustment.java | 2 +- .../multi/purification/MTEPurificationUnitPlasmaHeater.java | 4 ++-- .../multi/purification/MTEPurificationUnitUVTreatment.java | 2 +- 12 files changed, 31 insertions(+), 21 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 7f81e58370..fa984039da 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -1142,7 +1142,10 @@ public final class RecipeMaps { recipe -> recipe.getMetadataOrDefault(PurificationPlantBaseChanceKey.INSTANCE, 0.0f)) .thenComparing(GTRecipe::compareTo)) .frontend(PurificationUnitOzonationFrontend::new) - .neiHandlerInfo(builder -> builder.setMaxRecipesPerPage(1)) + .neiHandlerInfo( + builder -> builder.setMaxRecipesPerPage(1) + // When setting a builder, apparently setting a display stack is also necessary + .setDisplayStack(ItemList.Machine_Multi_PurificationUnitOzonation.get(1))) .disableOptimize() .build(); public static final RecipeMap purificationFlocculationRecipes = RecipeMapBuilder diff --git a/src/main/java/gregtech/common/items/MetaGeneratedItem03.java b/src/main/java/gregtech/common/items/MetaGeneratedItem03.java index 66fffdbebc..4bc6177c2b 100644 --- a/src/main/java/gregtech/common/items/MetaGeneratedItem03.java +++ b/src/main/java/gregtech/common/items/MetaGeneratedItem03.java @@ -1157,13 +1157,13 @@ public class MetaGeneratedItem03 extends MetaGeneratedItemX32 { addItem( Quark_Creation_Catalyst_Bottom.ID, "Bottom-Quark Releasing Catalyst", - "Can release top-quarks into environment to reshape matter", + "Can release bottom-quarks into environment to reshape matter", SubTag.NO_UNIFICATION)); ItemList.Quark_Creation_Catalyst_Top.set( addItem( Quark_Creation_Catalyst_Top.ID, "Top-Quark Releasing Catalyst", - "Can release bottom-quarks into environment to reshape matter", + "Can release top-quarks into environment to reshape matter", SubTag.NO_UNIFICATION)); ItemList.Quark_Creation_Catalyst_Unaligned.set( addItem( 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 e7404dbb09..cb25bf1724 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java @@ -247,7 +247,7 @@ public class MTEMultiLathe extends MTEExtendedPowerMultiBlockBase .beginStructureBlock(7, 5, 5, true) .addController("Front Center") .addCasingInfoMin("Solid Steel Machine Casing", 42, false) - .addCasingInfoExactly("Steel Pipe Casing", 8, false) + .addCasingInfoExactly("Grate Machine Casing", 9, false) .addInputBus("Any of the 9 Solid Steel Casing at Each End", 1) .addOutputBus("Any of the 9 Solid Steel Casing at Each End", 1) .addEnergyHatch("Any Solid Steel Casing", 1) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java index 4f22414fda..6518bc4b49 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java @@ -243,17 +243,17 @@ public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase implements ISurvivalConstructable { @@ -246,6 +249,11 @@ public class MTEPurificationUnitBaryonicPerfection numCasings = 0; if (!checkPiece(STRUCTURE_PIECE_MAIN, STRUCTURE_X_OFFSET, STRUCTURE_Y_OFFSET, STRUCTURE_Z_OFFSET)) return false; if (numCasings < MIN_CASINGS) return false; + // Blacklist stocking bus because it's incredibly buggy with this and keeps duping catalyst no matter how much + // I try to fix it. + for (MTEHatchInputBus bus : validMTEList(mInputBusses)) { + if (bus instanceof MTEHatchInputBusME) return false; + } return super.checkMachine(aBaseMetaTileEntity, aStack); } @@ -364,7 +372,7 @@ public class MTEPurificationUnitBaryonicPerfection EnumChatFormatting.GOLD, false) .addController("Front Center") - .addInputBus("Any Quark Exclusion Casing", 1) + .addInputBus("Any Quark Exclusion Casing. Stocking bus is blacklisted.", 1) .addInputHatch("Any Quark Exclusion Casing", 1) .addOutputBus("Any Quark Exclusion Casing", 1) .addOutputHatch("Any Quark Exclusion Casing", 1) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java index ed6f6d6c40..bfb3f497fd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitClarifier.java @@ -222,7 +222,7 @@ public class MTEPurificationUnitClarifier extends MTEPurificationUnitBase