GregTechCEu · ghzdude · Dec 10, 2023 · Dec 10, 2023 · Dec 10, 2023 · Dec 10, 2023
@@ -10,6 +10,8 @@
 import gregtech.api.gui.ModularUI;
 import gregtech.api.gui.widgets.LabelWidget;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.mui.GTGuiTextures;
+import gregtech.api.mui.GTGuis;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.client.renderer.ICubeRenderer;
 import gregtech.client.renderer.texture.Textures;
@@ -28,10 +30,16 @@
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widget.Widget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 
 public class SimpleGeneratorMetaTileEntity extends WorkableTieredMetaTileEntity implements IActiveOutputSide {
@@ -128,6 +136,44 @@ protected void renderOverlays(CCRenderState renderState, Matrix4 translation, IV
                 workable.isWorkingEnabled());
     }
 
+    @Override
+    public boolean usesMui2() {
+        RecipeMap<?> map = getRecipeMap();
+        return map != null && map.getRecipeMapUI().usesMui2();
+    }
+
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        RecipeMap<?> workableRecipeMap = Objects.requireNonNull(workable.getRecipeMap(), "recipe map is null");
+        int yOffset = 0;
+        if (workableRecipeMap.getMaxInputs() >= 6 || workableRecipeMap.getMaxFluidInputs() >= 6 ||
+                workableRecipeMap.getMaxOutputs() >= 6 || workableRecipeMap.getMaxFluidOutputs() >= 6) {
+            yOffset = FONT_HEIGHT;
+        }
+
+        ModularPanel panel = GTGuis.createPanel(this, 176, 166 + yOffset);
+        Widget<?> widget = workableRecipeMap.getRecipeMapUI().buildWidget(workable::getProgressPercent, importItems,
+                exportItems, importFluids, exportFluids, yOffset, guiSyncManager);
+
+        panel.child(widget)
+                .child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
+                // .child(new ItemSlot()
+                // .slot(SyncHandlers.itemSlot(chargerInventory, 0))
+                // .pos(79, 62 + yOffset)
+                // .background(GTGuiTextures.SLOT, GTGuiTextures.CHARGER_OVERLAY)
+                // .tooltip(t -> t.addLine(IKey.lang("gregtech.gui.charger_slot.tooltip", GTValues.VNF[getTier()],
+                // GTValues.VNF[getTier()]))))
+                .bindPlayerInventory();
+
+        if (exportItems.getSlots() + exportFluids.getTanks() <= 9) {
+            panel.child(new Widget<>()
+                    .size(17)
+                    .pos(152, 63 + yOffset)
+                    .background(GTGuiTextures.getLogo(getUITheme())));
+        }
+        return panel;
+    }
+
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return createGuiTemplate(entityPlayer).build(getHolder(), entityPlayer);

@@ -21,6 +21,8 @@
 import gregtech.api.gui.widgets.ToggleButtonWidget;
 import gregtech.api.items.itemhandlers.GTItemStackHandler;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.mui.GTGuiTextures;
+import gregtech.api.mui.GTGuis;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.util.GTTransferUtils;
 import gregtech.api.util.GTUtility;
@@ -54,11 +56,21 @@
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.value.sync.SyncHandlers;
+import com.cleanroommc.modularui.widget.Widget;
+import com.cleanroommc.modularui.widgets.ItemSlot;
+import com.cleanroommc.modularui.widgets.ToggleButton;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 
 import static gregtech.api.capability.GregtechDataCodes.*;
@@ -478,6 +490,90 @@ public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer)
         clearInventory(itemBuffer, chargerInventory);
     }
 
+    @Override
+    public boolean usesMui2() {
+        RecipeMap<?> map = getRecipeMap();
+        return map != null && map.getRecipeMapUI().usesMui2();
+    }
+
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        RecipeMap<?> workableRecipeMap = Objects.requireNonNull(workable.getRecipeMap(), "recipe map is null");
+        int yOffset = 0;
+        if (workableRecipeMap.getMaxInputs() >= 6 || workableRecipeMap.getMaxFluidInputs() >= 6 ||
+                workableRecipeMap.getMaxOutputs() >= 6 || workableRecipeMap.getMaxFluidOutputs() >= 6) {
+            yOffset = FONT_HEIGHT;
+        }
+
+        ModularPanel panel = GTGuis.createPanel(this, 176, 166 + yOffset);
+        Widget<?> widget = workableRecipeMap.getRecipeMapUI().buildWidget(workable::getProgressPercent, importItems,
+                exportItems, importFluids, exportFluids, yOffset, guiSyncManager);
+
+        BooleanSyncValue hasEnergy = new BooleanSyncValue(workable::isHasNotEnoughEnergy);
+
+        panel.child(widget)
+                .child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
+                .child(new ItemSlot()
+                        .slot(SyncHandlers.itemSlot(chargerInventory, 0))
+                        .pos(79, 62 + yOffset)
+                        .background(GTGuiTextures.SLOT, GTGuiTextures.CHARGER_OVERLAY)
+                        .addTooltipLine(IKey.lang("gregtech.gui.charger_slot.tooltip",
+                                GTValues.VNF[getTier()], GTValues.VNF[getTier()])))
+                .child(new Widget<>()
+                        .size(18, 18)
+                        .pos(79, 42 + yOffset)
+                        .background(GTGuiTextures.INDICATOR_NO_ENERGY)
+                        // todo flicker appears on ui open even when it has enough energy
+                        // will need to test this
+                        .setEnabledIf($ -> hasEnergy.getBoolValue()))
+                .bindPlayerInventory();
+
+        int leftButtonStartX = 7;
+
+        if (exportItems.getSlots() > 0) {
+
+            panel.child(new ToggleButton()
+                    .pos(leftButtonStartX, 62 + yOffset)
+                    .overlay(GTGuiTextures.BUTTON_ITEM_OUTPUT)
+                    .value(new BooleanSyncValue(() -> autoOutputItems, val -> autoOutputItems = val))
+                    .addTooltip(true, IKey.lang("gregtech.gui.item_auto_output.tooltip.enabled"))
+                    .addTooltip(false, IKey.lang("gregtech.gui.item_auto_output.tooltip.disabled")));
+
+            leftButtonStartX += 18;
+        }
+
+        if (exportFluids.getTanks() > 0) {
+
+            panel.child(new ToggleButton()
+                    .pos(leftButtonStartX, 62 + yOffset)
+                    .overlay(GTGuiTextures.BUTTON_FLUID_OUTPUT)
+                    .value(new BooleanSyncValue(() -> autoOutputFluids, val -> autoOutputFluids = val))
+                    .addTooltip(true, IKey.lang("gregtech.gui.fluid_auto_output.tooltip.enabled"))
+                    .addTooltip(false, IKey.lang("gregtech.gui.fluid_auto_output.tooltip.disabled")));
+        }
+
+        if (exportItems.getSlots() + exportFluids.getTanks() <= 9) {
+            panel.child(new Widget<>()
+                    .size(17)
+                    .pos(152, 63 + yOffset)
+                    .background(GTGuiTextures.getLogo(getUITheme())));
+
+            if (hasGhostCircuitInventory() && circuitInventory != null) {
+                panel.child(new gregtech.api.mui.widget.GhostCircuitSlotWidget()
+                        .pos(124, 62 + yOffset)
+                        .slot(SyncHandlers.itemSlot(circuitInventory, 0))
+                        .background(GTGuiTextures.SLOT, GTGuiTextures.INT_CIRCUIT_OVERLAY));
+            }
+        }
+        return panel;
+    }
+
+    @Override
+    protected ModularUI createUI(EntityPlayer entityPlayer) {
+        return createGuiTemplate(entityPlayer).build(getHolder(), entityPlayer);
+    }
+
+    @Deprecated
     protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
         RecipeMap<?> workableRecipeMap = workable.getRecipeMap();
         int yOffset = 0;
@@ -557,11 +653,6 @@ protected void getCircuitSlotTooltip(SlotWidget widget) {
         widget.setTooltipText("gregtech.gui.configurator_slot.tooltip", configString);
     }
 
-    @Override
-    protected ModularUI createUI(EntityPlayer entityPlayer) {
-        return createGuiTemplate(entityPlayer).build(getHolder(), entityPlayer);
-    }
-
     @Override
     public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);

@@ -8,6 +8,8 @@
 import gregtech.api.gui.GuiTextures;
 import gregtech.api.gui.ModularUI;
 import gregtech.api.gui.widgets.ImageWidget;
+import gregtech.api.mui.GTGuiTheme;
+import gregtech.api.mui.GTGuis;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.util.GTUtility;
 import gregtech.client.particle.VanillaParticleEffects;
@@ -34,6 +36,11 @@
 import codechicken.lib.render.pipeline.ColourMultiplier;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.factory.PosGuiData;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widget.Widget;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.Nullable;
@@ -43,6 +50,8 @@
 
 public abstract class SteamMetaTileEntity extends MetaTileEntity {
 
+    // todo quick and dirty fix to not show input tank in ui, find better solution
+    protected static final FluidTankList EMPTY = new FluidTankList(false);
     protected static final int STEAM_CAPACITY = 16000;
 
     protected final boolean isHighPressure;
@@ -127,6 +136,35 @@ public FluidTankList createImportFluidHandler() {
         return new FluidTankList(false, steamFluidTank);
     }
 
+    @Override
+    public boolean usesMui2() {
+        RecipeMap<?> map = getRecipeMap();
+        return map != null && map.getRecipeMapUI().usesMui2();
+    }
+
+    @Override
+    public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
+        RecipeMap<?> map = Objects.requireNonNull(getRecipeMap());
+
+        ModularPanel modularPanel = GTGuis.defaultPanel(this);
+
+        // todo this method needs options to ignore certain handlers
+        // actually, steam machines manually construct their ui instead of using the recipe map ui
+        Widget<?> widget = map.getRecipeMapUI().buildWidget(workableHandler::getProgressPercent, importItems,
+                exportItems, EMPTY, exportFluids, 0, guiSyncManager);
+
+        modularPanel.child(widget)
+                .child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
+                .bindPlayerInventory();
+
+        return modularPanel;
+    }
+
+    @Override
+    public GTGuiTheme getUITheme() {
+        return isHighPressure ? GTGuiTheme.STEEL : GTGuiTheme.BRONZE;
+    }
+
     public ModularUI.Builder createUITemplate(EntityPlayer player) {
         return ModularUI.builder(GuiTextures.BACKGROUND_STEAM.get(isHighPressure), 176, 166)
                 .label(6, 6, getMetaFullName()).shouldColor(false)

@@ -1,5 +1,6 @@
 package gregtech.api.mui;
 
+import gregtech.api.GTValues;
 import gregtech.api.cover.CoverWithUI;
 import gregtech.common.ConfigHolder;
 
@@ -56,6 +57,7 @@ private static String gregtech(String s) {
             .simpleToggleButton(IDs.STANDARD_BUTTON,
                     IDs.STANDARD_SLOT,
                     ConfigHolder.client.defaultUIColor)
+            .logo(() -> GTValues.XMAS.get() ? GTGuiTextures.GREGTECH_LOGO_XMAS : GTGuiTextures.GREGTECH_LOGO)
             .build();
 
     public static final GTGuiTheme COVER = templateBuilder(Names.COVER)

@@ -0,0 +1,63 @@
+package gregtech.api.mui.widget;
+
+import gregtech.api.GregTechAPI;
+import gregtech.api.recipes.RecipeMap;
+import gregtech.api.recipes.RecipeMaps;
+import gregtech.integration.IntegrationModule;
+import gregtech.integration.jei.JustEnoughItemsModule;
+import gregtech.integration.jei.recipe.RecipeMapCategory;
+import gregtech.modules.GregTechModules;
+
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.widgets.ProgressWidget;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class RecipeProgressWidget extends ProgressWidget implements Interactable {
+
+    private RecipeMap<?> recipeMap;
+
+    public RecipeProgressWidget recipeMap(RecipeMap<?> recipeMap) {
+        this.recipeMap = recipeMap;
+        if (GregTechAPI.moduleManager.isModuleEnabled(GregTechModules.MODULE_JEI)) {
+            tooltip(t -> t.addLine(IKey.lang("gui.widget.recipeProgressWidget.default_tooltip")));
+        }
+        return this;
+    }
+
+    @Override
+    public @NotNull Result onMousePressed(int mouseButton) {
+        if (recipeMap == null) {
+            return Result.IGNORE;
+        }
+        if (mouseButton == 0 || mouseButton == 1) {
+            if (!GregTechAPI.moduleManager.isModuleEnabled(GregTechModules.MODULE_JEI)) {
+                return Result.ACCEPT;
+            }
+
+            Collection<RecipeMapCategory> categories = RecipeMapCategory.getCategoriesFor(recipeMap);
+            if (categories != null && !categories.isEmpty()) {
+                List<String> categoryID = new ArrayList<>();
+                if (recipeMap == RecipeMaps.FURNACE_RECIPES) {
+                    categoryID.add("minecraft.smelting");
+                } else {
+                    for (RecipeMapCategory category : categories) {
+                        categoryID.add(category.getUid());
+                    }
+                }
+
+                if (JustEnoughItemsModule.jeiRuntime == null) {
+                    IntegrationModule.logger.error("GTCEu JEI integration has crashed, this is not a good thing");
+                    return Result.ACCEPT;
+                }
+                JustEnoughItemsModule.jeiRuntime.getRecipesGui().showCategories(categoryID);
+                return Result.SUCCESS;
+            }
+        }
+        return Result.IGNORE;
+    }
+}
@@ -145,7 +145,6 @@ public RecipeMap(@NotNull String unlocalizedName, @NotNull R defaultRecipeBuilde
                      @NotNull RecipeMapUIFunction recipeMapUI, int maxInputs, int maxOutputs, int maxFluidInputs,
                      int maxFluidOutputs) {
         this.unlocalizedName = unlocalizedName;
-        this.recipeMapUI = recipeMapUI.apply(this);
 
         this.maxInputs = maxInputs;
         this.maxFluidInputs = maxFluidInputs;
@@ -154,6 +153,8 @@ public RecipeMap(@NotNull String unlocalizedName, @NotNull R defaultRecipeBuilde
         this.primaryRecipeCategory = GTRecipeCategory.create(GTValues.MODID, unlocalizedName, getTranslationKey(),
                 this);
 
+        this.recipeMapUI = recipeMapUI.apply(this);
+
         defaultRecipeBuilder.setRecipeMap(this);
         defaultRecipeBuilder.category(primaryRecipeCategory);
         this.recipeBuilderSample = defaultRecipeBuilder;