Skip to content

Commit ebe330a

Browse files
gustovafinggustovafing
authored
Switch to use MUI repo (#4759)
1 parent ffb7001 commit ebe330a

667 files changed

Lines changed: 2355 additions & 57720 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dependencies.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ dependencies {
1111
jarJar(modApi(forge.configuration.get()))
1212

1313
// Math Parser
14-
jarJar(implementation(libs.evalEx.get()))
15-
additionalRuntimeClasspath(libs.evalEx.get())
14+
compileOnly(libs.evalEx.get())
15+
16+
// MUI
17+
jarJar(modImplementation(forge.mui.get()))
1618

1719
// Mixin (& Extras)
1820
annotationProcessor(variantOf(libs.mixin) { classifier("processor") })
@@ -124,4 +126,6 @@ dependencies {
124126
modExtraLocalRuntime(forge.flywheel.forge)
125127

126128
modLocalRuntime(forge.curios)
129+
130+
127131
}

‎gradle/forge.versions.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jei = "15.20.0.115"
88
rei = "12.1.785"
99
emi = "1.1.13+1.20.1"
1010
ae2 = "15.0.18"
11+
mui = "3.1.5"
1112
kubejs = "2001.6.5-build.16"
1213
rhino = "2001.2.3-build.10"
1314
architectury = "9.2.14"
@@ -60,6 +61,8 @@ configuration = { module = "dev.toma.configuration:configuration-forge-1.2
6061
mixinExtras-common = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtras" }
6162
mixinExtras-forge = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinExtras" }
6263

64+
mui = { module = "brachy.modularui:modularui-mc1.20.1", version.ref = "mui" }
65+
6366
jei-common-api = { module = "mezz.jei:jei-1.20.1-common-api", version.ref = "jei" }
6467
jei-forge-api = { module = "mezz.jei:jei-1.20.1-forge-api", version.ref = "jei" }
6568
jei-forge-impl = { module = "mezz.jei:jei-1.20.1-forge", version.ref = "jei" }

‎gradle/scripts/repositories.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ repositories {
1111
}
1212
}
1313

14+
maven {
15+
name 'GTCEu Maven'
16+
url 'https://maven.gtceu.com'
17+
}
18+
1419
maven { // JEI
1520
name = "Jared's Maven"
1621
url = "https://maven.blamejared.com/"

‎src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
1111
import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight;
1212
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
13-
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
1413
import com.gregtechceu.gtceu.api.pipenet.*;
1514
import com.gregtechceu.gtceu.api.sync_system.ManagedSyncBlockEntity;
1615
import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged;
@@ -39,6 +38,7 @@
3938
import net.minecraft.world.level.block.state.BlockState;
4039
import net.minecraft.world.phys.BlockHitResult;
4140

41+
import brachy.modularui.drawable.UITexture;
4242
import com.mojang.datafixers.util.Pair;
4343
import lombok.Getter;
4444
import org.jetbrains.annotations.NotNull;

‎src/main/java/com/gregtechceu/gtceu/api/capability/IMonitorComponent.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.gregtechceu.gtceu.api.capability;
22

3-
import com.gregtechceu.gtceu.api.mui.base.drawable.IDrawable;
4-
53
import net.minecraft.core.BlockPos;
64
import net.minecraftforge.items.IItemHandler;
75

6+
import brachy.modularui.api.drawable.IDrawable;
87
import org.jetbrains.annotations.Nullable;
98

109
public interface IMonitorComponent {

‎src/main/java/com/gregtechceu/gtceu/api/capability/recipe/IO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.gregtechceu.gtceu.api.capability.recipe;
22

33
import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget;
4-
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
54

65
import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
76
import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
87

8+
import brachy.modularui.drawable.UITexture;
99
import lombok.Getter;
1010

1111
/**

‎src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
77
import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight;
88
import com.gregtechceu.gtceu.api.machine.MetaMachine;
9-
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
9+
import com.gregtechceu.gtceu.api.mui.factory.CoverUIFactory;
1010
import com.gregtechceu.gtceu.api.sync_system.ISyncManaged;
1111
import com.gregtechceu.gtceu.api.sync_system.SyncDataHolder;
1212
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
@@ -29,6 +29,7 @@
2929
import net.minecraft.world.phys.BlockHitResult;
3030
import net.minecraftforge.items.IItemHandlerModifiable;
3131

32+
import brachy.modularui.drawable.UITexture;
3233
import lombok.Getter;
3334
import org.jetbrains.annotations.MustBeInvokedByOverriders;
3435
import org.jetbrains.annotations.Nullable;
@@ -149,7 +150,7 @@ public boolean canConnectRedstone() {
149150
public InteractionResult onScrewdriverClick(Player playerIn, InteractionHand hand, BlockHitResult hitResult) {
150151
if (this instanceof IMuiCover muiCover) {
151152
if (playerIn instanceof ServerPlayer serverPlayer) {
152-
com.gregtechceu.gtceu.common.mui.factory.CoverUIFactory.INSTANCE.open(serverPlayer, muiCover);
153+
CoverUIFactory.INSTANCE.open(serverPlayer, muiCover);
153154
}
154155
return InteractionResult.sidedSuccess(playerIn.level().isClientSide);
155156
}

‎src/main/java/com/gregtechceu/gtceu/api/cover/IMuiCover.java‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
package com.gregtechceu.gtceu.api.cover;
22

3-
import com.gregtechceu.gtceu.api.mui.base.IUIHolder;
4-
import com.gregtechceu.gtceu.api.mui.factory.SidedPosGuiData;
5-
import com.gregtechceu.gtceu.api.mui.value.BoolValue;
6-
import com.gregtechceu.gtceu.api.mui.value.sync.EnumSyncValue;
7-
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
8-
import com.gregtechceu.gtceu.api.mui.widgets.SlotGroupWidget;
9-
import com.gregtechceu.gtceu.api.mui.widgets.layout.Flow;
10-
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
11-
import com.gregtechceu.gtceu.client.mui.screen.UISettings;
12-
import com.gregtechceu.gtceu.common.data.mui.GTMuiWidgets;
3+
import com.gregtechceu.gtceu.api.mui.GTGuiScreen;
134
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
145
import com.gregtechceu.gtceu.common.mui.GTGuiTheme;
156
import com.gregtechceu.gtceu.common.mui.GTGuis;
7+
import com.gregtechceu.gtceu.common.mui.GTMuiWidgets;
8+
9+
import brachy.modularui.api.IUIHolder;
10+
import brachy.modularui.factory.SidedPosGuiData;
11+
import brachy.modularui.screen.ModularPanel;
12+
import brachy.modularui.screen.ModularScreen;
13+
import brachy.modularui.screen.UISettings;
14+
import brachy.modularui.value.BoolValue;
15+
import brachy.modularui.value.sync.EnumSyncValue;
16+
import brachy.modularui.value.sync.PanelSyncManager;
17+
import brachy.modularui.widgets.SlotGroupWidget;
18+
import brachy.modularui.widgets.layout.Flow;
1619

1720
public interface IMuiCover extends IUIHolder<SidedPosGuiData> {
1821

@@ -33,8 +36,13 @@ default GTGuiTheme getUITheme() {
3336
}
3437

3538
@Override
36-
default ModularPanel buildUI(SidedPosGuiData data, PanelSyncManager syncManager, UISettings settings) {
37-
ModularPanel panel = GTGuis.createPanel(this.self(), 176, 192 + 18);
39+
default ModularScreen createScreen(SidedPosGuiData data, ModularPanel<?> mainPanel) {
40+
return new GTGuiScreen(mainPanel);
41+
}
42+
43+
@Override
44+
default ModularPanel<?> buildUI(SidedPosGuiData data, PanelSyncManager syncManager, UISettings settings) {
45+
ModularPanel<?> panel = ModularPanel.defaultPanel(self().coverDefinition.getId().getPath(), 176, 192 + 18);
3846

3947
panel.child(GTMuiWidgets.createTitleBar(this.self().getAttachItem(), 176, GTGuiTextures.BACKGROUND));
4048

‎src/main/java/com/gregtechceu/gtceu/api/cover/filter/Filter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.gregtechceu.gtceu.api.cover.filter;
22

3-
import com.gregtechceu.gtceu.api.mui.factory.GuiData;
4-
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
5-
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
6-
import com.gregtechceu.gtceu.client.mui.screen.UISettings;
7-
83
import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
94

105
import net.minecraft.nbt.CompoundTag;
116

7+
import brachy.modularui.factory.GuiData;
8+
import brachy.modularui.screen.ModularPanel;
9+
import brachy.modularui.screen.UISettings;
10+
import brachy.modularui.value.sync.PanelSyncManager;
11+
1212
import java.util.function.Consumer;
1313
import java.util.function.Predicate;
1414

@@ -21,7 +21,7 @@ default WidgetGroup openConfigurator(int x, int y) {
2121
/**
2222
* @return Filter panel when opened by itself (including the player inventory)
2323
*/
24-
ModularPanel getPanel(GuiData data, PanelSyncManager syncManager, UISettings settings);
24+
ModularPanel<?> getPanel(GuiData data, PanelSyncManager syncManager, UISettings settings);
2525

2626
CompoundTag saveFilter();
2727

‎src/main/java/com/gregtechceu/gtceu/api/cover/filter/FluidFilter.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.gregtechceu.gtceu.api.cover.filter;
22

3-
import com.gregtechceu.gtceu.api.mui.factory.GuiData;
4-
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
5-
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
6-
import com.gregtechceu.gtceu.client.mui.screen.UISettings;
7-
83
import net.minecraft.nbt.CompoundTag;
94
import net.minecraft.world.item.ItemStack;
105
import net.minecraft.world.level.ItemLike;
116
import net.minecraftforge.fluids.FluidStack;
127

8+
import brachy.modularui.factory.GuiData;
9+
import brachy.modularui.screen.ModularPanel;
10+
import brachy.modularui.screen.UISettings;
11+
import brachy.modularui.value.sync.PanelSyncManager;
1312
import org.apache.commons.lang3.NotImplementedException;
1413

1514
import java.util.HashMap;
@@ -57,7 +56,7 @@ public int testFluidAmount(FluidStack fluidStack) {
5756
}
5857

5958
@Override
60-
public ModularPanel getPanel(GuiData data, PanelSyncManager syncManager, UISettings settings) {
59+
public ModularPanel<?> getPanel(GuiData data, PanelSyncManager syncManager, UISettings settings) {
6160
return null;
6261
}
6362

0 commit comments

Comments
 (0)