From b072f7ad9bada91039f43f3ebf7bad909e13187a Mon Sep 17 00:00:00 2001 From: Gustavo Date: Sat, 21 Feb 2026 10:57:33 +1100 Subject: [PATCH 1/2] remove remaining singleblock ldlib ui stuff --- .../api/machine/SimpleGeneratorMachine.java | 59 +------ .../api/machine/SimpleTieredMachine.java | 167 +----------------- .../api/machine/steam/SimpleSteamMachine.java | 53 +----- .../registry/registrate/MachineBuilder.java | 1 + .../gtceu/common/data/GTMachines.java | 6 - .../common/data/machines/GTMachineUtils.java | 3 +- .../integration/kjs/GregTechKubeJSPlugin.java | 6 +- .../machine/KJSTieredMachineBuilder.java | 7 - 8 files changed, 12 insertions(+), 290 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java index 1e23a3f118b..852dcd7ed94 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java @@ -3,37 +3,18 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo; import com.gregtechceu.gtceu.api.capability.recipe.*; -import com.gregtechceu.gtceu.api.gui.editor.EditableMachineUI; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardEmitter; -import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine; import com.gregtechceu.gtceu.api.recipe.GTRecipe; -import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.content.ContentModifier; import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction; import com.gregtechceu.gtceu.api.recipe.modifier.ParallelLogic; import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier; -import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI; -import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; -import com.lowdragmc.lowdraglib.utils.Position; -import com.lowdragmc.lowdraglib.utils.Size; - -import net.minecraft.Util; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; - -import com.google.common.collect.Tables; import it.unimi.dsi.fastutil.ints.Int2IntFunction; import lombok.Getter; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.EnumMap; -import java.util.LinkedHashMap; -import java.util.function.BiFunction; public class SimpleGeneratorMachine extends WorkableTieredMachine - implements IFancyUIMachine, IEnvironmentalHazardEmitter { + implements IEnvironmentalHazardEmitter { @Getter private final float hazardStrengthPerOperation; @@ -81,7 +62,7 @@ public int tintColor(int index) { * @param recipe recipe * @return A {@link ModifierFunction} for the given Simple Generator */ - public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @NotNull GTRecipe recipe) { + public static ModifierFunction recipeModifier(MetaMachine machine, GTRecipe recipe) { if (!(machine instanceof SimpleGeneratorMachine generator)) { return RecipeModifier.nullWrongType(SimpleGeneratorMachine.class, machine); } @@ -119,40 +100,4 @@ public void afterWorking() { public long getDisplayRecipeVoltage() { return GTValues.V[this.tier]; } - - ////////////////////////////////////// - // *********** GUI ***********// - ////////////////////////////////////// - - @SuppressWarnings("UnstableApiUsage") - public static BiFunction EDITABLE_UI_CREATOR = Util - .memoize((path, recipeType) -> new EditableMachineUI("generator", path, () -> { - WidgetGroup template = recipeType.getRecipeUI().createEditableUITemplate(false, false).createDefault(); - WidgetGroup group = new WidgetGroup(0, 0, template.getSize().width + 4 + 8, - template.getSize().height + 8); - Size size = group.getSize(); - template.setSelfPosition(new Position( - (size.width - 4 - template.getSize().width) / 2 + 4, - (size.height - template.getSize().height) / 2)); - group.addWidget(template); - return group; - }, (template, machine) -> { - if (machine instanceof SimpleGeneratorMachine generatorMachine) { - var storages = Tables.newCustomTable(new EnumMap<>(IO.class), - LinkedHashMap, Object>::new); - storages.put(IO.IN, ItemRecipeCapability.CAP, generatorMachine.importItems.storage); - storages.put(IO.OUT, ItemRecipeCapability.CAP, generatorMachine.exportItems.storage); - storages.put(IO.IN, FluidRecipeCapability.CAP, generatorMachine.importFluids); - storages.put(IO.OUT, FluidRecipeCapability.CAP, generatorMachine.exportFluids); - - generatorMachine.getRecipeType().getRecipeUI().createEditableUITemplate(false, false).setupUI( - template, - new GTRecipeTypeUI.RecipeHolder(generatorMachine.recipeLogic::getProgressPercent, - storages, - new CompoundTag(), - Collections.emptyList(), - false, false)); - createEnergyBar().setupUI(template, generatorMachine); - } - })); } diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java index e2e3a655937..b31c96df51c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java @@ -4,42 +4,16 @@ import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.recipe.*; -import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.gui.editor.EditableMachineUI; -import com.gregtechceu.gtceu.api.gui.editor.EditableUI; -import com.gregtechceu.gtceu.api.gui.fancy.ConfiguratorPanel; -import com.gregtechceu.gtceu.api.gui.fancy.IFancyConfigurator; -import com.gregtechceu.gtceu.api.gui.fancy.IFancyConfiguratorButton; -import com.gregtechceu.gtceu.api.gui.widget.GhostCircuitSlotWidget; -import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; -import com.gregtechceu.gtceu.api.machine.fancyconfigurator.CircuitFancyConfigurator; -import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine; import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot; import com.gregtechceu.gtceu.api.machine.trait.AutoOutputTrait; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.api.recipe.GTRecipeType; -import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.ISubscription; -import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; -import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; -import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; -import com.lowdragmc.lowdraglib.gui.util.ClickData; -import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; -import com.lowdragmc.lowdraglib.utils.Position; - -import net.minecraft.Util; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; - -import com.google.common.collect.Tables; import it.unimi.dsi.fastutil.ints.Int2IntFunction; import lombok.Getter; import org.jetbrains.annotations.Nullable; @@ -51,7 +25,7 @@ * All simple single machines are implemented here. */ public class SimpleTieredMachine extends WorkableTieredMachine - implements IFancyUIMachine, IHasCircuitSlot { + implements IHasCircuitSlot { @Getter @SaveField @@ -144,143 +118,4 @@ public void onMachineDestroyed() { public long getDisplayRecipeVoltage() { return GTValues.V[this.tier]; } - - ////////////////////////////////////// - // *********** GUI ***********// - ////////////////////////////////////// - - @Override - public void attachConfigurators(ConfiguratorPanel configuratorPanel) { - IFancyUIMachine.super.attachConfigurators(configuratorPanel); - - if (autoOutput.supportsAutoOutputFluids()) { - configuratorPanel.attachConfigurators(createAutoOutputFluidConfigurator()); - } - if (autoOutput.supportsAutoOutputItems()) { - configuratorPanel.attachConfigurators(createAutoOutputItemConfigurator()); - } - - if (isCircuitSlotEnabled()) { - configuratorPanel.attachConfigurators(new CircuitFancyConfigurator(circuitInventory.storage)); - } - } - - private IFancyConfigurator createAutoOutputFluidConfigurator() { - return createAutoOutputConfigurator( - GuiTextures.IO_CONFIG_FLUID_MODES_BUTTON, - "gtceu.gui.fluid_auto_output", - this.autoOutput::isAutoOutputFluids, - (cd, nextState) -> this.autoOutput.setAllowAutoOutputFluids(nextState)); - } - - private IFancyConfigurator createAutoOutputItemConfigurator() { - return createAutoOutputConfigurator( - GuiTextures.IO_CONFIG_ITEM_MODES_BUTTON, - "gtceu.gui.item_auto_output", - this.autoOutput::isAutoOutputItems, - (cd, nextState) -> this.autoOutput.setAllowAutoOutputItems(nextState)); - } - - private IFancyConfigurator createAutoOutputConfigurator(ResourceTexture modesButtonTexture, - String tooltipBaseLangKey, - BooleanSupplier stateSupplier, - BiConsumer onToggle) { - var toggle = new IFancyConfiguratorButton.Toggle( - new GuiTextureGroup( - GuiTextures.TOGGLE_BUTTON_BACK.getSubTexture(0, 0, 1, 0.5), - modesButtonTexture.getSubTexture(0, 1 / 3f, 1, 1 / 3f)), - new GuiTextureGroup( - GuiTextures.TOGGLE_BUTTON_BACK.getSubTexture(0, 0.5, 1, 0.5), - modesButtonTexture.getSubTexture(0, 2 / 3f, 1, 1 / 3f)), - stateSupplier, - onToggle); - - toggle.setTooltipsSupplier(enabled -> { - var key = tooltipBaseLangKey + '.' + (enabled ? "enabled" : "disabled"); - return List.of(Component.translatable(key)); - }); - - return toggle; - } - - @SuppressWarnings("UnstableApiUsage") - public static BiFunction EDITABLE_UI_CREATOR = Util - .memoize((path, recipeType) -> new EditableMachineUI("simple", path, () -> { - WidgetGroup template = recipeType.getRecipeUI().createEditableUITemplate(false, false).createDefault(); - SlotWidget batterySlot = createBatterySlot().createDefault(); - WidgetGroup group = new WidgetGroup(0, 0, template.getSize().width, - Math.max(template.getSize().height, 78)); - template.setSelfPosition(new Position(0, (group.getSize().height - template.getSize().height) / 2)); - batterySlot.setSelfPosition(new Position(group.getSize().width / 2 - 9, group.getSize().height - 18)); - group.addWidget(batterySlot); - group.addWidget(template); - - // TODO fix this. - // if (ConfigHolder.INSTANCE.machines.ghostCircuit) { - // SlotWidget circuitSlot = createCircuitConfigurator().createDefault(); - // circuitSlot.setSelfPosition(new Position(120, 62)); - // group.addWidget(circuitSlot); - // } - - return group; - }, (template, machine) -> { - if (machine instanceof SimpleTieredMachine tieredMachine) { - var storages = Tables.newCustomTable(new EnumMap<>(IO.class), - LinkedHashMap, Object>::new); - storages.put(IO.IN, ItemRecipeCapability.CAP, tieredMachine.importItems.storage); - storages.put(IO.OUT, ItemRecipeCapability.CAP, tieredMachine.exportItems.storage); - storages.put(IO.IN, FluidRecipeCapability.CAP, tieredMachine.importFluids); - storages.put(IO.OUT, FluidRecipeCapability.CAP, tieredMachine.exportFluids); - storages.put(IO.IN, CWURecipeCapability.CAP, tieredMachine.importComputation); - storages.put(IO.OUT, CWURecipeCapability.CAP, tieredMachine.exportComputation); - - tieredMachine.getRecipeType().getRecipeUI().createEditableUITemplate(false, false).setupUI(template, - new GTRecipeTypeUI.RecipeHolder(tieredMachine.recipeLogic::getProgressPercent, - storages, - new CompoundTag(), - Collections.emptyList(), - false, false)); - createBatterySlot().setupUI(template, tieredMachine); - // createCircuitConfigurator().setupUI(template, tieredMachine); - } - })); - - /** - * Create a battery slot widget. - */ - protected static EditableUI createBatterySlot() { - return new EditableUI<>("battery_slot", SlotWidget.class, () -> { - var slotWidget = new SlotWidget(); - slotWidget.setBackground(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY); - return slotWidget; - }, (slotWidget, machine) -> { - slotWidget.setHandlerSlot(machine.chargerInventory, 0); - slotWidget.setCanPutItems(true); - slotWidget.setCanTakeItems(true); - slotWidget.setHoverTooltips(LangHandler.getMultiLang("gtceu.gui.charger_slot.tooltip", - GTValues.VNF[machine.getTier()], GTValues.VNF[machine.getTier()]).toArray(Component[]::new)); - }); - } - - /** - * Create a ghost circuit slot widget. - */ - protected static EditableUI createCircuitConfigurator() { - return new EditableUI<>("circuit_configurator", GhostCircuitSlotWidget.class, () -> { - var slotWidget = new GhostCircuitSlotWidget(); - slotWidget.setBackground(GuiTextures.SLOT, GuiTextures.INT_CIRCUIT_OVERLAY); - return slotWidget; - }, (slotWidget, machine) -> { - slotWidget.setCircuitInventory(machine.circuitInventory); - slotWidget.setCanPutItems(false); - slotWidget.setCanTakeItems(false); - slotWidget.setHoverTooltips( - LangHandler.getMultiLang("gtceu.gui.configurator_slot.tooltip").toArray(Component[]::new)); - }); - } - - // Method provided to override - protected IGuiTexture getCircuitSlotOverlay() { - return GuiTextures.INT_CIRCUIT_OVERLAY; - } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java index 42a5a224244..8ba4dbe9535 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java @@ -4,13 +4,8 @@ import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability; -import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.gui.UITemplate; -import com.gregtechceu.gtceu.api.gui.widget.PredicatedImageWidget; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IExhaustVentMachine; -import com.gregtechceu.gtceu.api.machine.feature.IUIMachine; import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; @@ -23,16 +18,9 @@ import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.common.recipe.condition.VentCondition; -import com.lowdragmc.lowdraglib.gui.modular.ModularUI; -import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; -import com.lowdragmc.lowdraglib.utils.Position; - import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.entity.player.Player; -import com.google.common.collect.Tables; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; @@ -43,7 +31,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class SimpleSteamMachine extends SteamWorkableMachine implements IExhaustVentMachine, IUIMachine { +public class SimpleSteamMachine extends SteamWorkableMachine implements IExhaustVentMachine { @SaveField public final NotifiableItemStackHandler importItems; @@ -103,7 +91,7 @@ public float getVentingDamage() { @SuppressWarnings("DataFlowIssue") @Override - public @NotNull Direction getVentingDirection() { + public Direction getVentingDirection() { return getOutputFacing(); } @@ -121,7 +109,7 @@ public void updateModelVentDirection() { } @Override - public void setOutputFacing(@NotNull Direction outputFacing) { + public void setOutputFacing(Direction outputFacing) { var oldFacing = getOutputFacing(); super.setOutputFacing(outputFacing); if (getOutputFacing() != oldFacing) { @@ -139,7 +127,7 @@ public void setFrontFacing(Direction facing) { } @Override - public void setUpwardsFacing(@NotNull Direction upwardsFacing) { + public void setUpwardsFacing(Direction upwardsFacing) { var oldFacing = getUpwardsFacing(); super.setUpwardsFacing(upwardsFacing); if (getUpwardsFacing() != oldFacing) { @@ -171,7 +159,7 @@ public double getConversionRate() { * @param recipe recipe * @return A {@link ModifierFunction} for the given Steam Machine */ - public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @NotNull GTRecipe recipe) { + public static ModifierFunction recipeModifier(MetaMachine machine, GTRecipe recipe) { if (!(machine instanceof SimpleSteamMachine steamMachine)) { return RecipeModifier.nullWrongType(SimpleSteamMachine.class, machine); } @@ -190,35 +178,4 @@ public void afterWorking() { needsVenting = true; checkVenting(); } - - ////////////////////////////////////// - // *********** GUI ***********// - ////////////////////////////////////// - - @Override - public ModularUI createUI(Player entityPlayer) { - var storages = Tables.newCustomTable(new EnumMap<>(IO.class), LinkedHashMap, Object>::new); - storages.put(IO.IN, ItemRecipeCapability.CAP, importItems.storage); - storages.put(IO.OUT, ItemRecipeCapability.CAP, exportItems.storage); - - var group = getRecipeType().getRecipeUI().createUITemplate(recipeLogic::getProgressPercent, - storages, - new CompoundTag(), - Collections.emptyList(), - true, - isHighPressure); - Position pos = new Position((Math.max(group.getSize().width + 4 + 8, 176) - 4 - group.getSize().width) / 2 + 4, - 32); - group.setSelfPosition(pos); - return new ModularUI(176, 166, this, entityPlayer) - .background(GuiTextures.BACKGROUND_STEAM.get(isHighPressure)) - .widget(group) - .widget(new LabelWidget(5, 5, getBlockState().getBlock().getDescriptionId())) - .widget(new PredicatedImageWidget(pos.x + group.getSize().width / 2 - 9, - pos.y + group.getSize().height / 2 - 9, 18, 18, - GuiTextures.INDICATOR_NO_STEAM.get(isHighPressure)) - .setPredicate(recipeLogic::isWaiting)) - .widget(UITemplate.bindPlayerInventory(entityPlayer.getInventory(), - GuiTextures.SLOT_STEAM.get(isHighPressure), 7, 84, true)); - } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java index 5c81e6cd373..59bc6f3fb28 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java @@ -147,6 +147,7 @@ public class MachineBuilder new SimpleTieredMachine(holder, tier, defaultTankSizeFunction), (tier, builder) -> builder .langValue("%s Macerator %s".formatted(VLVH[tier], VLVT[tier])) .ui(GTSingleblockMachinePanels.MACERATOR) - // .editableUI(SimpleTieredMachine.EDITABLE_UI_CREATOR.apply(GTCEu.id("macerator"), - // GTRecipeTypes.MACERATOR_RECIPES)) .rotationState(RotationState.NON_Y_AXIS) .recipeType(GTRecipeTypes.MACERATOR_RECIPES) .addOutputLimit(ItemRecipeCapability.CAP, switch (tier) { @@ -311,8 +309,6 @@ public class GTMachines { public static final MachineDefinition[] ROCK_CRUSHER = registerTieredMachines("rock_crusher", RockCrusherMachine::new, (tier, builder) -> builder .langValue("%s Rock Crusher %s".formatted(VLVH[tier], VLVT[tier])) - .editableUI(SimpleTieredMachine.EDITABLE_UI_CREATOR.apply(GTCEu.id("rock_crusher"), - GTRecipeTypes.ROCK_BREAKER_RECIPES)) .ui(GTSingleblockMachinePanels.GENERAL_MACHINE) .rotationState(RotationState.NON_Y_AXIS) .recipeType(GTRecipeTypes.ROCK_BREAKER_RECIPES) @@ -326,8 +322,6 @@ public class GTMachines { public static final MachineDefinition[] AIR_SCRUBBER = registerTieredMachines("air_scrubber", AirScrubberMachine::new, (tier, builder) -> builder .langValue("%s Air Scrubber %s".formatted(VLVH[tier], VLVT[tier])) - .editableUI(SimpleTieredMachine.EDITABLE_UI_CREATOR.apply(GTCEu.id("air_scrubber"), - GTRecipeTypes.AIR_SCRUBBER_RECIPES)) .ui(GTSingleblockMachinePanels.GENERAL_MACHINE) .rotationState(RotationState.NON_Y_AXIS) .recipeType(GTRecipeTypes.AIR_SCRUBBER_RECIPES) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java index 0f38a7e3604..b9adb7cd90d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java @@ -346,9 +346,9 @@ public static MachineDefinition[] registerSimpleGenerator(GTRegistrate registrat tankScalingFunction), (tier, builder) -> builder .langValue("%s %s Generator %s".formatted(VLVH[tier], toEnglishName(name), VLVT[tier])) - .editableUI(SimpleGeneratorMachine.EDITABLE_UI_CREATOR.apply(GTCEu.id(name), recipeType)) .rotationState(RotationState.ALL) .recipeType(recipeType) + .ui(GTSingleblockMachinePanels.GENERAL_MACHINE) .recipeModifier(SimpleGeneratorMachine::recipeModifier, true) .addOutputLimit(ItemRecipeCapability.CAP, 0) .addOutputLimit(FluidRecipeCapability.CAP, 0) @@ -1003,7 +1003,6 @@ public MachineDefinition[] register() { } return builder .langValue("%s %s %s".formatted(VLVH[tier], toEnglishName(name), VLVT[tier])) - .editableUI(SimpleTieredMachine.EDITABLE_UI_CREATOR.apply(GTCEu.id(name), recipeType)) .rotationState(RotationState.NON_Y_AXIS) .recipeType(recipeType) .workableTieredHullModel(GTCEu.id("block/machines/" + name)) diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java index 282112a3928..0f47155c47c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java @@ -160,8 +160,7 @@ public void init() { GTRegistryInfo.MACHINE.addType("simple", KJSWrappingMachineBuilder.class, (id) -> new KJSWrappingMachineBuilder(id, - new KJSTieredMachineBuilder(id, SimpleTieredMachine::new, - SimpleTieredMachine.EDITABLE_UI_CREATOR, false)), + new KJSTieredMachineBuilder(id, SimpleTieredMachine::new, false)), true); GTRegistryInfo.MACHINE.addType("custom", KJSWrappingMachineBuilder.class, (id) -> new KJSWrappingMachineBuilder(id, new KJSTieredMachineBuilder(id)), @@ -170,8 +169,7 @@ public void init() { KJSSteamMachineBuilder::new, false); GTRegistryInfo.MACHINE.addType("generator", KJSWrappingMachineBuilder.class, (id) -> new KJSWrappingMachineBuilder(id, - new KJSTieredMachineBuilder(id, SimpleGeneratorMachine::new, - SimpleGeneratorMachine.EDITABLE_UI_CREATOR, true)), + new KJSTieredMachineBuilder(id, SimpleGeneratorMachine::new, true)), false); GTRegistryInfo.MACHINE.addType("multiblock", (Class>) (Class) MultiblockMachineBuilder.class, diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java index 1151cabefd5..f383a66fae5 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java @@ -48,8 +48,6 @@ public class KJSTieredMachineBuilder extends BuilderBase { @Setter public transient boolean isGenerator = false; - public transient BiFunction editableUI; - public KJSTieredMachineBuilder(ResourceLocation id) { super(id); this.addDefaultTooltips = false; @@ -57,11 +55,9 @@ public KJSTieredMachineBuilder(ResourceLocation id) { } public KJSTieredMachineBuilder(ResourceLocation id, TieredCreationFunction machine, - BiFunction editableUI, boolean isGenerator) { super(id); this.machine = machine; - this.editableUI = editableUI; this.isGenerator = isGenerator; } @@ -111,9 +107,6 @@ public void generateLang(@NotNull LangEventJS lang) { if (builder.recipeTypes().length > 0) { GTRecipeType recipeType = builder.recipeTypes()[0]; - if (this.editableUI != null && builder.editableUI() == null) { - builder.editableUI(this.editableUI.apply(this.id, recipeType)); - } if (tankScalingFunction != null && addDefaultTooltips) { builder.tooltips( GTMachineUtils.workableTiered(tier, GTValues.V[tier], GTValues.V[tier] * 64, recipeType, From 151f6c12c5f202faa2d4d42bd752e3b635941f0f Mon Sep 17 00:00:00 2001 From: Gustavo Date: Sat, 21 Feb 2026 11:03:32 +1100 Subject: [PATCH 2/2] spotless --- .../gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java | 1 - .../kjs/builders/machine/KJSTieredMachineBuilder.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java index 8ba4dbe9535..cf78ace3a7d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java @@ -23,7 +23,6 @@ import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.NotNull; import java.util.*; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java index f383a66fae5..ac1fa4bd609 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/KJSTieredMachineBuilder.java @@ -2,7 +2,6 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo; -import com.gregtechceu.gtceu.api.gui.editor.EditableMachineUI; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; @@ -23,7 +22,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; -import java.util.function.BiFunction; import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName;