Update to MUI2 RC3

dependencies.gradle

@@ -40,7 +40,7 @@
 dependencies {
     // Published dependencies
     api("codechicken:codechickenlib:3.2.3.358")
-    api("com.cleanroommc:modularui:2.5.0-rc2") { transitive = false }
+    api("com.cleanroommc:modularui:2.5.0-rc3") { transitive = false }
     api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
     api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700")
     api("appeng:ae2-uel:v0.56.4") { transitive = false }

src/main/java/gregtech/GregTechMod.java

@@ -31,7 +31,8 @@
      acceptedMinecraftVersions = "[1.12.2,1.13)",
      version = GTInternalTags.VERSION,
      dependencies = "required:forge@[14.23.5.2847,);" + "required-after:codechickenlib@[3.2.3,);" +
-             "required-after:modularui@[2.3,);" + "required-after:mixinbooter@[8.0,);" + "after:appliedenergistics2;" +
+             "required-after:modularui@[2.5.0-rc,);" + "required-after:mixinbooter@[8.0,);" +
+             "after:appliedenergistics2;" +
              "after:forestry;" + "after:extrabees;" + "after:extratrees;" + "after:genetics;" + "after:magicbees;" +
              "after:jei@[4.15.0,);" + "after:crafttweaker@[4.1.20,);" + "after:groovyscript@[1.2.0,);" +
              "after:theoneprobe;" + "after:hwyla;")

src/main/java/gregtech/api/mui/GTGuis.java

@@ -9,6 +9,7 @@
 
 import net.minecraft.item.ItemStack;
 
+import com.cleanroommc.modularui.api.IPanelHandler;
 import com.cleanroommc.modularui.factory.GuiManager;
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.utils.Alignment;
@@ -103,6 +104,9 @@ public PopupPanel(@NotNull String name, int width, int height, boolean disableBe
                     .onMousePressed(mouseButton -> {
                         if (mouseButton == 0 || mouseButton == 1) {
                             this.closeIfOpen(true);
+                            if (isSynced() && getSyncHandler() instanceof IPanelHandler handler) {
+                                handler.deleteCachedPanel();
+                            }
                             return true;
                         }
                         return false;

src/main/java/gregtech/api/mui/LocaleAccessor.java

@@ -0,0 +1,20 @@
+package gregtech.api.mui;
+
+import net.minecraft.client.resources.Locale;
+
+// todo remove in next mui2 version
+public interface LocaleAccessor {
+
+    String gregtech$getRawKey(String s);
+
+    ThreadLocal<LocaleAccessor> accessor = new ThreadLocal<>();
+
+    static String getRawKey(String s) {
+        if (accessor.get() == null) return s;
+        return accessor.get().gregtech$getRawKey(s);
+    }
+
+    static void setLocale(Locale locale) {
+        accessor.set((LocaleAccessor) locale);
+    }
+}

src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java

@@ -52,11 +52,10 @@ public GTFluidSyncHandler(IFluidTank tank) {
     @Override
     public void detectAndSendChanges(boolean init) {
         var current = getFluid();
-        if (current == null && lastFluid == null) return;
-        if (current == null || lastFluid == null || lastFluid.getFluid() != current.getFluid()) {
+        if (init || current == null || lastFluid == null || current.isFluidEqual(lastFluid)) {
             lastFluid = current == null ? null : current.copy();
             syncToClient(UPDATE_TANK, buffer -> NetworkUtils.writeFluidStack(buffer, current));
-        } else if (current.amount != lastFluid.amount) {
+        } else if (lastFluid != null && current.amount != lastFluid.amount) {
             lastFluid.amount = current.amount;
             syncToClient(UPDATE_AMOUNT, buffer -> buffer.writeInt(current.amount));
         }

src/main/java/gregtech/common/covers/CoverConveyor.java

@@ -43,7 +43,6 @@
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
-import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.DynamicDrawable;
 import com.cleanroommc.modularui.factory.GuiData;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
@@ -545,7 +544,6 @@ protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncMana
                             .onMousePressed(mouseButton -> {
                                 int val = throughput.getValue() - getIncrementValue(MouseData.create(mouseButton));
                                 throughput.setValue(val, true, true);
-                                Interactable.playButtonClickSound();
                                 return true;
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
@@ -560,7 +558,6 @@ protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncMana
                             .onMousePressed(mouseButton -> {
                                 int val = throughput.getValue() + getIncrementValue(MouseData.create(mouseButton));
                                 throughput.setValue(val, true, true);
-                                Interactable.playButtonClickSound();
                                 return true;
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(true)))));

src/main/java/gregtech/common/covers/CoverPump.java

@@ -41,7 +41,6 @@
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
-import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.DynamicDrawable;
 import com.cleanroommc.modularui.factory.GuiData;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
@@ -226,7 +225,6 @@ protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
                             .onMousePressed(mouseButton -> {
                                 int val = throughput.getValue() - getIncrementValue(MouseData.create(mouseButton));
                                 throughput.setValue(val);
-                                Interactable.playButtonClickSound();
                                 return true;
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
@@ -241,7 +239,6 @@ protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
                             .onMousePressed(mouseButton -> {
                                 int val = throughput.getValue() + getIncrementValue(MouseData.create(mouseButton));
                                 throughput.setValue(val);
-                                Interactable.playButtonClickSound();
                                 return true;
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(true)))));

src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java

@@ -26,7 +26,6 @@
 import codechicken.lib.raytracer.CuboidRayTraceResult;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.widget.IWidget;
-import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.DynamicDrawable;
 import com.cleanroommc.modularui.drawable.GuiTextures;
 import com.cleanroommc.modularui.drawable.Rectangle;
@@ -50,8 +49,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Keyboard;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
@@ -149,8 +149,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
     protected Flow createWidgets(GuiData data, PanelSyncManager syncManager) {
         var name = new StringSyncValue(this::getColorStr, this::updateColor);
 
-        // todo unneeded cast in mui2 rc3
-        var entrySelectorSH = (PanelSyncHandler) syncManager.panel("entry_selector", entrySelector(getType()), true);
+        var entrySelectorSH = syncManager.panel("entry_selector", entrySelector(getType()), true);
 
         return Flow.column().coverChildrenHeight().top(24)
                 .margin(7, 0).widthRel(1f)
@@ -173,6 +172,7 @@ protected Flow createWidgets(GuiData data, PanelSyncManager syncManager) {
                                 .onMousePressed(i -> {
                                     if (entrySelectorSH.isPanelOpen()) {
                                         entrySelectorSH.closePanel();
+                                        entrySelectorSH.deleteCachedPanel();
                                     } else {
                                         entrySelectorSH.openPanel();
                                     }
@@ -284,14 +284,19 @@ public void writeToNBT(@NotNull NBTTagCompound nbt) {
 
     protected PanelSyncHandler.IPanelBuilder entrySelector(EntryTypes<T> type) {
         return (syncManager, syncHandler) -> {
-            Set<String> names = VirtualEnderRegistry.getEntryNames(getOwner(), type);
+            List<IWidget> rows = new ArrayList<>();
+            for (String name : VirtualEnderRegistry.getEntryNames(getOwner(), type)) {
+                rows.add(createRow(name, syncManager, type));
+            }
             return GTGuis.createPopupPanel("entry_selector", 168, 112)
                     .child(IKey.lang("cover.generic.ender.known_channels")
                             .color(UI_TITLE_COLOR)
                             .asWidget()
                             .top(6)
                             .left(4))
-                    .child(ListWidget.builder(names, name -> createRow(name, syncManager, type))
+                    .child(new ListWidget<>()
+                            .children(rows)
+                            // .builder(names, name -> createRow(name, syncManager, type))
                             .background(GTGuiTextures.DISPLAY.asIcon()
                                     .width(168 - 8)
                                     .height(112 - 20))
@@ -391,7 +396,6 @@ protected IWidget createRow(final String name, final PanelSyncManager syncManage
                                         getOwner() == null ? "null" : getOwner().toString());
                                 NetworkUtils.writeStringSafe(buffer, name);
                             });
-                            Interactable.playButtonClickSound();
                             return true;
                         }));
     }

src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java

@@ -10,12 +10,13 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraftforge.items.ItemStackHandler;
 
+import com.cleanroommc.modularui.api.IPanelHandler;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.widget.IWidget;
 import com.cleanroommc.modularui.drawable.GuiTextures;
 import com.cleanroommc.modularui.factory.GuiData;
+import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.utils.Alignment;
-import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandlers;
 import com.cleanroommc.modularui.widgets.ButtonWidget;
@@ -24,8 +25,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
-
 public abstract class BaseFilterContainer extends ItemStackHandler {
 
     private int maxTransferSize = 1;
@@ -213,7 +212,7 @@ public void handleLegacyNBT(NBTTagCompound nbt) {
 
     /** Uses Cleanroom MUI */
     public IWidget initUI(GuiData data, PanelSyncManager manager) {
-        PanelSyncHandler panel = (PanelSyncHandler) manager.panel("filter_panel", (syncManager, syncHandler) -> {
+        IPanelHandler panel = manager.panel("filter_panel", (syncManager, syncHandler) -> {
             var filter = hasFilter() ? getFilter() : BaseFilter.ERROR_FILTER;
             filter.setMaxTransferSize(getMaxTransferSize());
             return filter.createPopupPanel(syncManager);
@@ -253,17 +252,13 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) {
     }
 
     public void writeInitialSyncData(PacketBuffer packetBuffer) {
-        packetBuffer.writeItemStack(this.getFilterStack());
+        NetworkUtils.writeItemStack(packetBuffer, this.getFilterStack());
         packetBuffer.writeInt(this.maxTransferSize);
         packetBuffer.writeInt(this.transferSize);
     }
 
     public void readInitialSyncData(@NotNull PacketBuffer packetBuffer) {
-        var stack = ItemStack.EMPTY;
-        try {
-            stack = packetBuffer.readItemStack();
-        } catch (IOException ignore) {}
-        this.setFilterStack(stack);
+        this.setFilterStack(NetworkUtils.readItemStack(packetBuffer));
         this.setMaxTransferSize(packetBuffer.readInt());
         this.setTransferSize(packetBuffer.readInt());
     }

src/main/java/gregtech/mixins/minecraft/L18nMixin.java

@@ -0,0 +1,21 @@
+package gregtech.mixins.minecraft;
+
+import gregtech.api.mui.LocaleAccessor;
+
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.Locale;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+// todo remove in next mui2 version
+@Mixin(I18n.class)
+public abstract class L18nMixin {
+
+    @Inject(method = "setLocale", at = @At("HEAD"))
+    private static void getLocale(Locale i18nLocaleIn, CallbackInfo ci) {
+        LocaleAccessor.setLocale(i18nLocaleIn);
+    }
+}

src/main/java/gregtech/mixins/minecraft/LocaleMixin.java

@@ -0,0 +1,23 @@
+package gregtech.mixins.minecraft;
+
+import gregtech.api.mui.LocaleAccessor;
+
+import net.minecraft.client.resources.Locale;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Map;
+
+// todo remove in next mui2 version
+@Mixin(Locale.class)
+public abstract class LocaleMixin implements LocaleAccessor {
+
+    @Shadow
+    Map<String, String> properties;
+
+    @Override
+    public String gregtech$getRawKey(String s) {
+        return this.properties.get(s);
+    }
+}