diff options
13 files changed, 31 insertions, 21 deletions
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<RecipeMapBackend> 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<MTEMultiLathe> .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<MTEPuri 56, EnumChatFormatting.GOLD, false) - .addCasingInfoExactlyColored( + .addCasingInfoRangeColored( "Sterile Water Plant Casing", EnumChatFormatting.GRAY, - 77, + 71, + 72, EnumChatFormatting.GOLD, false) - .addCasingInfoRangeColored( + .addCasingInfoExactlyColored( "Reinforced Sterile Water Plant Casing", EnumChatFormatting.GRAY, - 71, - 72, + 77, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( @@ -268,7 +268,6 @@ public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase<MTEPuri 6, EnumChatFormatting.GOLD, false) - .addCasingInfoExactlyColored("Reinforced Door", EnumChatFormatting.GRAY, 1, EnumChatFormatting.GOLD, false) .addController("Front center") .addEnergyHatch(EnumChatFormatting.GOLD + "1", 1) .addMaintenanceHatch(EnumChatFormatting.GOLD + "1", 1) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java index 21fc5d97ff..0b771eb5da 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java @@ -14,6 +14,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_AR import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_GLOW; import static gregtech.api.util.GTStructureUtility.ofFrame; +import static gregtech.api.util.GTUtility.validMTEList; import java.util.ArrayList; import java.util.Arrays; @@ -40,6 +41,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.render.TextureFactory; @@ -49,6 +51,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gregtech.common.items.IDMetaItem03; import gregtech.common.items.MetaGeneratedItem03; +import gregtech.common.tileentities.machines.MTEHatchInputBusME; public class MTEPurificationUnitBaryonicPerfection extends MTEPurificationUnitBase<MTEPurificationUnitBaryonicPerfection> 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<MTEPur .addCasingInfoExactlyColored( "Iridium Frame Box", EnumChatFormatting.GRAY, - 21, + 12, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java index 603fa32b0d..34be1df762 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java @@ -474,7 +474,7 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri .addCasingInfoExactlyColored( "Bedrockium Frame Box", EnumChatFormatting.GRAY, - 126, + 124, EnumChatFormatting.GOLD, false) .addController("Front center") @@ -670,7 +670,7 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri FluidStack waterOutput = currentRecipe.mFluidOutputs[0]; FluidStack bonusOutput = new FluidStack( waterOutput.getFluid(), - (int) (waterOutput.amount * (outputMultiplier - 1.0f))); + (int) (this.effectiveParallel * waterOutput.amount * (outputMultiplier - 1.0f))); this.addOutput(bonusOutput); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java index b19cd134c2..aa561919f6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitFlocculation.java @@ -330,13 +330,13 @@ public class MTEPurificationUnitFlocculation extends MTEPurificationUnitBase<MTE .addCasingInfoExactlyColored( "Sterile Water Plant Casing", EnumChatFormatting.GRAY, - 16, + 30, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( "Reinforced Sterile Water Plant Casing", EnumChatFormatting.GRAY, - 30, + 16, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java index d5611ee312..f7fd9b041b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java @@ -219,7 +219,7 @@ public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPur .addCasingInfoExactlyColored( "Reactive Gas Containment Casing", EnumChatFormatting.GRAY, - 27, + 28, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java index 034cda743d..169266b828 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPhAdjustment.java @@ -408,7 +408,7 @@ public class MTEPurificationUnitPhAdjustment extends MTEPurificationUnitBase<MTE .addCasingInfoExactlyColored( "Stabilized Naquadah Water Plant Casing", EnumChatFormatting.GRAY, - 15, + 16, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java index 4b81835d37..95fc9c5fd2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java @@ -362,7 +362,7 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE .addCasingInfoExactlyColored( "Reinforced Sterile Water Plant Casing", EnumChatFormatting.GRAY, - 1091, + 669, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( @@ -387,7 +387,7 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE .addCasingInfoExactlyColored( "Superconducting Coil Block", EnumChatFormatting.GRAY, - 8, + 9, EnumChatFormatting.GOLD, false) .addController("Front center") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java index 511da85fd7..dbd6c64507 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java @@ -288,7 +288,7 @@ public class MTEPurificationUnitUVTreatment extends MTEPurificationUnitBase<MTEP .addCasingInfoExactlyColored( "High Energy Ultraviolet Emitter Casing", EnumChatFormatting.GRAY, - 24, + 29, EnumChatFormatting.GOLD, false) .addCasingInfoExactlyColored( diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg Binary files differindex 9bdb5e991a..ef84e43613 100644 --- a/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg +++ b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg |