From e14fd93609659e983caa3353c1de4c8e2f034f01 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Sun, 22 Sep 2024 19:47:29 +0200 Subject: Waterline tweaks (#3256) Co-authored-by: Martin Robertz --- .../maps/PurificationUnitFlocculatorFrontend.java | 32 +++++++------- .../recipe/maps/PurificationUnitLaserFrontend.java | 51 +++++++++++++++++----- .../maps/PurificationUnitPhAdjustmentFrontend.java | 16 ++++--- .../maps/PurificationUnitPlasmaHeaterFrontend.java | 22 ++++++---- 4 files changed, 81 insertions(+), 40 deletions(-) (limited to 'src/main/java/gregtech/api/recipe/maps') diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java index d0373d4310..36ba1637a4 100644 --- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java +++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitFlocculatorFrontend.java @@ -78,21 +78,23 @@ public class PurificationUnitFlocculatorFrontend extends PurificationUnitRecipeM @Override public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) { super.drawNEIOverlays(neiCachedRecipe); + // Just to make sure these are only added once, otherwise these keep getting added every display tick + if (neiCachedRecipe.mInputs.size() == 1) { + // Display flocculation chemical + neiCachedRecipe.mInputs.add( + new PositionedStack( + GTUtility.getFluidDisplayStack(Materials.PolyAluminiumChloride.getFluid(100000L), true), + 5, + -1, + false)); - // Display flocculation chemical - neiCachedRecipe.mInputs.add( - new PositionedStack( - GTUtility.getFluidDisplayStack(Materials.PolyAluminiumChloride.getFluid(100000L), true), - 5, - -1, - false)); - - // Display waste output - neiCachedRecipe.mOutputs.add( - new PositionedStack( - GTUtility.getFluidDisplayStack(Materials.FlocculationWasteLiquid.getFluid(100000L), true), - 147, - 48, - false)); + // Display waste output + neiCachedRecipe.mOutputs.add( + new PositionedStack( + GTUtility.getFluidDisplayStack(Materials.FlocculationWasteLiquid.getFluid(100000L), true), + 147, + 48, + false)); + } } } diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java index 9c90acd8ad..d198cec7fe 100644 --- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java +++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitLaserFrontend.java @@ -4,33 +4,64 @@ import java.util.List; import net.minecraft.item.ItemStack; +import org.jetbrains.annotations.NotNull; + +import com.google.common.collect.ImmutableList; +import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture; import com.gtnewhorizons.modularui.api.math.Pos2d; +import com.gtnewhorizons.modularui.api.math.Size; import codechicken.nei.PositionedStack; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.recipe.BasicUIPropertiesBuilder; import gregtech.api.recipe.NEIRecipePropertiesBuilder; -import gregtech.api.recipe.RecipeMapFrontend; -import gregtech.common.gui.modularui.UIHelper; import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitUVTreatment; import gregtech.nei.GTNEIDefaultHandler; -public class PurificationUnitLaserFrontend extends RecipeMapFrontend { +public class PurificationUnitLaserFrontend extends PurificationUnitRecipeMapFrontend { public PurificationUnitLaserFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, NEIRecipePropertiesBuilder neiPropertiesBuilder) { - super(uiPropertiesBuilder, neiPropertiesBuilder); + super( + 120, + uiPropertiesBuilder.logoPos(new Pos2d(147, 102)) + .progressBarTexture(new FallbackableUITexture(GTUITextures.PROGRESSBAR_UV_TREATMENT)), + neiPropertiesBuilder.recipeBackgroundSize(new Size(170, 120))); + } + + @Override + public @NotNull List getFluidInputPositions(int fluidInputCount) { + return ImmutableList.of(new Pos2d(10, 89)); + } + + @Override + public @NotNull List getFluidOutputPositions(int fluidOutputCount) { + return ImmutableList.of(new Pos2d(147, 89)); } @Override public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) { final int numLenses = MTEPurificationUnitUVTreatment.LENS_ITEMS.size(); - List positions = UIHelper.getGridPositions(numLenses, 12, -4, 3, 3); - // Put in lens items - for (int i = 0; i < numLenses; ++i) { - Pos2d position = positions.get(i); - ItemStack lens = MTEPurificationUnitUVTreatment.LENS_ITEMS.get(i); - neiCachedRecipe.mInputs.add(new PositionedStack(lens, position.x, position.y, false)); + List positions = ImmutableList.of( + new Pos2d(62, -6), + new Pos2d(40, -1), + new Pos2d(32, 20), + new Pos2d(52, 27), + new Pos2d(75, 29), + new Pos2d(98, 27), + new Pos2d(118, 20), + new Pos2d(110, -1), + new Pos2d(88, -6)); + + if (neiCachedRecipe.mInputs.size() < numLenses) { + // Put in lens items + for (int i = 0; i < numLenses; ++i) { + Pos2d position = positions.get(i); + ItemStack lens = MTEPurificationUnitUVTreatment.LENS_ITEMS.get(i); + neiCachedRecipe.mInputs.add(new PositionedStack(lens, position.x, position.y, false)); + } } + super.drawNEIOverlays(neiCachedRecipe); } } diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java index e78d2a395a..51cf4dbd54 100644 --- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java +++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPhAdjustmentFrontend.java @@ -67,12 +67,14 @@ public class PurificationUnitPhAdjustmentFrontend extends PurificationUnitRecipe @Override public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) { - neiCachedRecipe.mInputs.add(new PositionedStack(Materials.SodiumHydroxide.getDust(64), 3, 1, false)); - neiCachedRecipe.mInputs.add( - new PositionedStack( - GTUtility.getFluidDisplayStack(Materials.HydrochloricAcid.getFluid(1000L), true), - 147, - 1, - false)); + if (neiCachedRecipe.mInputs.size() == 1) { + neiCachedRecipe.mInputs.add(new PositionedStack(Materials.SodiumHydroxide.getDust(64), 3, 1, false)); + neiCachedRecipe.mInputs.add( + new PositionedStack( + GTUtility.getFluidDisplayStack(Materials.HydrochloricAcid.getFluid(1000L), true), + 147, + 1, + false)); + } } } diff --git a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java index a7f35c86a5..5299a17fa5 100644 --- a/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java +++ b/src/main/java/gregtech/api/recipe/maps/PurificationUnitPlasmaHeaterFrontend.java @@ -47,13 +47,19 @@ public class PurificationUnitPlasmaHeaterFrontend extends PurificationUnitRecipe @Override public void drawNEIOverlays(GTNEIDefaultHandler.CachedDefaultRecipe neiCachedRecipe) { - neiCachedRecipe.mInputs.add( - new PositionedStack(GTUtility.getFluidDisplayStack(Materials.Helium.getPlasma(10L), true), 26, 53, false)); - neiCachedRecipe.mInputs.add( - new PositionedStack( - GTUtility.getFluidDisplayStack(Materials.SuperCoolant.getFluid(100L), true), - 107, - 52, - false)); + if (neiCachedRecipe.mInputs.size() == 1) { + neiCachedRecipe.mInputs.add( + new PositionedStack( + GTUtility.getFluidDisplayStack(Materials.Helium.getPlasma(10L), true), + 26, + 53, + false)); + neiCachedRecipe.mInputs.add( + new PositionedStack( + GTUtility.getFluidDisplayStack(Materials.SuperCoolant.getFluid(100L), true), + 107, + 52, + false)); + } } } -- cgit