From 0f42277b9eb0124ad5173848f49b8b8844c897f1 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:45:33 -0500 Subject: [PATCH 1/4] #2671 but mui2 --- .../multiblock/MultiMapMultiblockController.java | 12 ++++++++++++ .../multiblock/ui/MultiblockUIFactory.java | 14 ++++++++++++++ src/main/resources/assets/gregtech/lang/en_us.lang | 2 ++ 3 files changed, 28 insertions(+) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java index 85ccc575bdd..470f37cca9d 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java @@ -7,6 +7,7 @@ import gregtech.api.mui.GTGuiTextures; import gregtech.api.pattern.TraceabilityPredicate; import gregtech.api.recipes.RecipeMap; +import gregtech.api.util.GTUtility; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -156,6 +157,17 @@ protected MultiblockUIFactory createUIFactory() { }); } + @Override + protected void configureDisplayText(MultiblockUIFactory.Builder builder) { + builder.setWorkingStatus(recipeMapWorkable.isWorkingEnabled(), recipeMapWorkable.isActive()) + .addRecipeMapLine(getCurrentRecipeMap()) + .addEnergyUsageLine(this.getEnergyContainer()) + .addEnergyTierLine(GTUtility.getTierByVoltage(recipeMapWorkable.getMaxVoltage())) + .addParallelsLine(recipeMapWorkable.getParallelLimit()) + .addWorkingStatusLine() + .addProgressLine(recipeMapWorkable.getProgressPercent()); + } + @Override public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java index 7d69ac374d0..d16af2e63fe 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java @@ -9,6 +9,7 @@ import gregtech.api.metatileentity.multiblock.ProgressBarMultiblock; import gregtech.api.mui.GTGuiTextures; import gregtech.api.mui.GTGuis; +import gregtech.api.recipes.RecipeMap; import gregtech.api.util.GTLog; import gregtech.api.util.JsonUtils; import gregtech.api.util.KeyUtil; @@ -809,6 +810,19 @@ public Builder addFuelNeededLine(String fuelName, int previousRecipeDuration) { return this; } + /** + * Adds the name of the current recipe map to the display. + * @param map the {@link RecipeMap} to get the name of + */ + public Builder addRecipeMapLine(RecipeMap map) { + if (!isStructureFormed) return this; + + IKey mapName = KeyUtil.lang(TextFormatting.YELLOW, map.getTranslationKey()); + addKey(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.machine_mode", mapName)); + + return this; + } + /** Insert an empty line into the text list. */ public Builder addEmptyLine() { this.textList.add(IKey.LINE_FEED); diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 934cc7407a0..4c73706b857 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -5909,6 +5909,8 @@ gregtech.multiblock.hpca.info_coolant_name=PCB Coolant gregtech.multiblock.hpca.info_bridging_enabled=Bridging Enabled gregtech.multiblock.hpca.info_bridging_disabled=Bridging Disabled +gregtech.multiblock.machine_mode=Machine Mode: %s + gregtech.command.usage=Usage: /gregtech gregtech.command.worldgen.usage=Usage: /gregtech worldgen gregtech.command.worldgen.reload.usage=Usage: /gregtech worldgen reload From d728ebd1f766fd2a41e994e555bce89e040f1db3 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:53:18 -0500 Subject: [PATCH 2/4] spotless... --- .../api/metatileentity/multiblock/ui/MultiblockUIFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java index d16af2e63fe..f1650af8d6d 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java @@ -812,6 +812,7 @@ public Builder addFuelNeededLine(String fuelName, int previousRecipeDuration) { /** * Adds the name of the current recipe map to the display. + * * @param map the {@link RecipeMap} to get the name of */ public Builder addRecipeMapLine(RecipeMap map) { From e6bfb315f3b3c4f6eea0a327ab1a6a2e91e75f53 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Fri, 14 Feb 2025 18:41:48 -0500 Subject: [PATCH 3/4] I merged the wrong branch in :skull: --- .../multiblock/MultiMapMultiblockController.java | 3 ++- .../multiblock/ui/MultiblockUIBuilder.java | 15 +++++++++++++++ .../multiblock/ui/MultiblockUIFactory.java | 1 - 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java index 470f37cca9d..1fccce2d897 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/MultiMapMultiblockController.java @@ -3,6 +3,7 @@ import gregtech.api.capability.GregtechDataCodes; import gregtech.api.capability.GregtechTileCapabilities; import gregtech.api.capability.IMultipleRecipeMaps; +import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder; import gregtech.api.metatileentity.multiblock.ui.MultiblockUIFactory; import gregtech.api.mui.GTGuiTextures; import gregtech.api.pattern.TraceabilityPredicate; @@ -158,7 +159,7 @@ protected MultiblockUIFactory createUIFactory() { } @Override - protected void configureDisplayText(MultiblockUIFactory.Builder builder) { + protected void configureDisplayText(MultiblockUIBuilder builder) { builder.setWorkingStatus(recipeMapWorkable.isWorkingEnabled(), recipeMapWorkable.isActive()) .addRecipeMapLine(getCurrentRecipeMap()) .addEnergyUsageLine(this.getEnergyContainer()) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java index 15c349eb883..e4f201e4343 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java @@ -2,6 +2,7 @@ import gregtech.api.GTValues; import gregtech.api.capability.IEnergyContainer; +import gregtech.api.recipes.RecipeMap; import gregtech.api.util.JsonUtils; import gregtech.api.util.KeyUtil; import gregtech.api.util.TextFormattingUtil; @@ -427,6 +428,20 @@ public MultiblockUIBuilder addFuelNeededLine(String fuelName, int previousRecipe return this; } + /** + * Adds the name of a recipe map to the display. + * + * @param map the {@link RecipeMap} to get the name of + */ + public MultiblockUIBuilder addRecipeMapLine(RecipeMap map) { + if (!isStructureFormed) return this; + + IKey mapName = KeyUtil.lang(TextFormatting.YELLOW, map.getTranslationKey()); + addKey(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.machine_mode", mapName)); + + return this; + } + /** Insert an empty line into the text list. */ public MultiblockUIBuilder addEmptyLine() { addKey(IKey.LINE_FEED); diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java index 9b8ecc07fa0..12574eebf59 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java @@ -7,7 +7,6 @@ import gregtech.api.metatileentity.multiblock.ProgressBarMultiblock; import gregtech.api.mui.GTGuiTextures; import gregtech.api.mui.GTGuis; -import gregtech.api.recipes.RecipeMap; import gregtech.api.util.GTLog; import gregtech.api.util.KeyUtil; From 90d92093b755aea0945f3f3013e9561743480912 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Tue, 25 Feb 2025 19:09:25 -0500 Subject: [PATCH 4/4] Merge in the correct branch pt2 --- .../api/metatileentity/multiblock/ui/MultiblockUIBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java index e985d326070..5127de40bfb 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java @@ -3,7 +3,6 @@ import gregtech.api.GTValues; import gregtech.api.capability.IEnergyContainer; import gregtech.api.recipes.RecipeMap; -import gregtech.api.util.JsonUtils; import gregtech.api.util.KeyUtil; import gregtech.api.util.TextFormattingUtil; import gregtech.common.ConfigHolder;