From fa0e628505ff04335c45677595e2335c0c855471 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 26 Aug 2024 15:20:56 +0200 Subject: Small adjustments to waterline (#2978) * do some tooltip clarifying and disable maintenance properly * Disable hatch locking for all waterline multis --- .../purification/GT_MetaTileEntity_PurificationUnitBase.java | 12 ++++++++++++ .../GT_MetaTileEntity_PurificationUnitClarifier.java | 2 +- .../GT_MetaTileEntity_PurificationUnitDegasifier.java | 8 +------- .../GT_MetaTileEntity_PurificationUnitFlocculation.java | 9 +-------- .../GT_MetaTileEntity_PurificationUnitOzonation.java | 2 +- .../GT_MetaTileEntity_PurificationUnitParticleExtractor.java | 7 +------ .../GT_MetaTileEntity_PurificationUnitPhAdjustment.java | 8 +------- .../GT_MetaTileEntity_PurificationUnitPlasmaHeater.java | 8 +------- .../GT_MetaTileEntity_PurificationUnitUVTreatment.java | 2 +- 9 files changed, 20 insertions(+), 38 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java index 0abf9d525f..6a7a9a4675 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java @@ -44,6 +44,7 @@ import gregtech.api.enums.VoidingMode; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; @@ -159,6 +160,17 @@ public abstract class GT_MetaTileEntity_PurificationUnitBase d.offsetY == 0 && r.isNotRotated() && !f.isVerticallyFliped(); } - @Override - protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) { - // Do nothing, we don't want to lock hatches to recipe maps since this can cause - // them to reject our catalyst fluids - } - public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { casingCount = 0; if (!checkPiece(STRUCTURE_PIECE_MAIN, STRUCTURE_X_OFFSET, STRUCTURE_Y_OFFSET, STRUCTURE_Z_OFFSET)) return false; @@ -275,7 +268,7 @@ public class GT_MetaTileEntity_PurificationUnitFlocculation + GT_Utility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) .addInfo("Controller block for the Flocculation Purification Unit.") - .addInfo("Must be linked to a Purification Plant to work.") + .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( "Supply with " + EnumChatFormatting.WHITE diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java index f569273445..a539cd157e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitOzonation.java @@ -183,7 +183,7 @@ public class GT_MetaTileEntity_PurificationUnitOzonation + GT_Utility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) .addInfo("Controller block for the Ozonation Purification Unit.") - .addInfo("Must be linked to a Purification Plant to work.") + .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( "Will explode if the input hatch contains more than " + EnumChatFormatting.RED diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java index 85c8541772..17945f7cc9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java @@ -262,7 +262,7 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor + GT_Utility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) .addInfo("Controller block for the Absolute Baryonic Perfection Purification Unit.") - .addInfo("Must be linked to a Purification Plant to work.") + .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( "Insert " + EnumChatFormatting.WHITE @@ -424,11 +424,6 @@ public class GT_MetaTileEntity_PurificationUnitParticleExtractor return -1; } - @Override - protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) { - // Do nothing to avoid hatches being annoying - } - @Override protected void runMachine(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.runMachine(aBaseMetaTileEntity, aTick); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java index 70be953443..99495dc484 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java @@ -242,12 +242,6 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment return new GT_MetaTileEntity_PurificationUnitPhAdjustment(this.mName); } - @Override - protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) { - // Do nothing, we don't want to lock hatches to recipe maps since this can cause - // them to reject our catalyst fluids - } - @Override public void construct(ItemStack stackSize, boolean hintsOnly) { buildPiece( @@ -330,7 +324,7 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment + GT_Utility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) .addInfo("Controller block for the pH Neutralization Purification Unit.") - .addInfo("Must be linked to a Purification Plant to work.") + .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( "Initial pH value every cycle varies from " + EnumChatFormatting.RED diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java index f4e96d4466..8b10cae9b7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPlasmaHeater.java @@ -210,12 +210,6 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater return new GT_MetaTileEntity_PurificationUnitPlasmaHeater(this.mName); } - @Override - protected void setHatchRecipeMap(GT_MetaTileEntity_Hatch_Input hatch) { - // Do nothing, we don't want to lock hatches to recipe maps since this can cause - // them to reject our catalyst fluids - } - @Override public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirection side, ForgeDirection facing, int colorIndex, boolean active, boolean redstoneLevel) { @@ -290,7 +284,7 @@ public class GT_MetaTileEntity_PurificationUnitPlasmaHeater + GT_Utility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) .addInfo("Controller block for the Extreme Temperature Fluctuation Purification Unit.") - .addInfo("Must be linked to a Purification Plant to work.") + .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( "Complete heating cycles by first heating the water to " + EnumChatFormatting.RED diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java index fb83797e83..f542216617 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitUVTreatment.java @@ -228,7 +228,7 @@ public class GT_MetaTileEntity_PurificationUnitUVTreatment + GT_Utility.formatNumbers(getWaterTier()) + EnumChatFormatting.RESET) .addInfo("Controller block for the High Energy Laser Purification Unit.") - .addInfo("Must be linked to a Purification Plant to work.") + .addInfo("Must be linked to a Purification Plant using a data stick to work.") .addSeparator() .addInfo( "During operation, swap the lens in the " + EnumChatFormatting.WHITE -- cgit