Port Covers to Mui2 Part 2

src/main/java/gregtech/api/cover/CoverUIFactory.java

@@ -13,7 +13,10 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 
+import org.jetbrains.annotations.ApiStatus;
+
 @Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2.10")
 public final class CoverUIFactory extends UIFactory<CoverWithUI> {
 
     public static final CoverUIFactory INSTANCE = new CoverUIFactory();

src/main/java/gregtech/api/cover/CoverWithUI.java

@@ -1,7 +1,5 @@
 package gregtech.api.cover;
 
-import gregtech.api.gui.IUIHolder;
-import gregtech.api.gui.ModularUI;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuiTheme;
 import gregtech.api.mui.GregTechGuiScreen;
@@ -17,6 +15,7 @@
 import com.cleanroommc.modularui.api.IGuiHolder;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.drawable.DynamicDrawable;
 import com.cleanroommc.modularui.drawable.ItemDrawable;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
@@ -30,30 +29,36 @@
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.widget.ParentWidget;
+import com.cleanroommc.modularui.widget.Widget;
 import com.cleanroommc.modularui.widgets.ToggleButton;
 import com.cleanroommc.modularui.widgets.layout.Flow;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
 
-public interface CoverWithUI extends Cover, IUIHolder, IGuiHolder<SidedPosGuiData> {
+public interface CoverWithUI extends Cover, IGuiHolder<SidedPosGuiData>, gregtech.api.gui.IUIHolder {
 
     @ApiStatus.Experimental
     default boolean usesMui2() {
-        return false;
+        // this is gonna cause problems if implementing classes expect this to be false
+        // all of our covers use mui2 though
+        return true;
     }
 
     default void openUI(EntityPlayerMP player) {
         if (usesMui2()) {
             CoverGuiFactory.open(player, this);
         } else {
+            // todo remove in 2.10
             CoverUIFactory.INSTANCE.openUI(this, player);
         }
     }
 
     @Deprecated
-    default ModularUI createUI(EntityPlayer player) {
+    @ApiStatus.ScheduledForRemoval(inVersion = "2.10")
+    default gregtech.api.gui.ModularUI createUI(EntityPlayer player) {
         return null;
     }
 
@@ -104,11 +109,22 @@ default void markAsDirty() {
      * Create the Title bar widget for a Cover.
      */
     static Flow createTitleRow(ItemStack stack) {
+        return createTitleRow(() -> stack);
+    }
+
+    /**
+     * Create the Title bar widget for a Cover.
+     */
+    static Flow createTitleRow(Supplier<ItemStack> stack) {
+        ItemDrawable itemDrawable = new ItemDrawable();
         return Flow.row()
                 .pos(4, 4)
                 .height(16).coverChildrenWidth()
-                .child(new ItemDrawable(stack).asWidget().size(16).marginRight(4))
-                .child(IKey.str(stack.getDisplayName())
+                .child(new Widget<>()
+                        .overlay(new DynamicDrawable(() -> itemDrawable.setItem(stack.get())))
+                        .size(16)
+                        .marginRight(4))
+                .child(IKey.dynamic(() -> stack.get().getDisplayName())
                         .color(UI_TITLE_COLOR)
                         .asWidget().heightRel(1.0f));
     }

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

@@ -458,6 +458,22 @@ private static String id(String path) {
     public static final UITexture RESEARCH_STATION_OVERLAY = fullImage(
             "textures/gui/overlay/research_station_overlay.png", ColorType.DEFAULT);
 
+    // Texture Areas
+    public static final UITexture[] BUTTON_FLUID = slice("textures/blocks/cover/cover_interface_fluid_button.png", 18,
+            36, null);
+    public static final UITexture[] BUTTON_ITEM = slice("textures/blocks/cover/cover_interface_item_button.png", 18, 36,
+            null);
+    public static final UITexture[] BUTTON_ENERGY = slice("textures/blocks/cover/cover_interface_energy_button.png", 18,
+            36, null);
+    public static final UITexture[] BUTTON_MACHINE = slice("textures/blocks/cover/cover_interface_machine_button.png",
+            18, 36, null);
+    public static final UITexture[] BUTTON_INTERFACE = slice(
+            "textures/blocks/cover/cover_interface_computer_button.png", 18, 36, null);
+    public static final UITexture COVER_INTERFACE_MACHINE_ON_PROXY = fullImage(
+            "textures/blocks/cover/cover_interface_machine_on_proxy.png");
+    public static final UITexture COVER_INTERFACE_MACHINE_OFF_PROXY = fullImage(
+            "textures/blocks/cover/cover_interface_machine_off_proxy.png");
+
     // BUTTONS
 
     public static final UITexture BUTTON = new UITexture.Builder()

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

@@ -304,6 +304,8 @@ public void handleClick(MouseData data) {
     public void readOnServer(int id, PacketBuffer buf) {
         if (id == TRY_CLICK_CONTAINER) {
             var data = MouseData.readPacket(buf);
+            if (canLockFluid())
+                toggleLockFluid();
             if (isPhantom()) {
                 tryClickPhantom(data);
             } else {
@@ -316,14 +318,6 @@ public void readOnServer(int id, PacketBuffer buf) {
             setFluid(fluid);
         } else if (id == PHANTOM_SCROLL) {
             tryScrollPhantom(MouseData.readPacket(buf));
-        } else if (id == LOCK_FLUID) {
-            boolean locked = buf.readBoolean();
-            var fluidStack = NetworkUtils.readFluidStack(buf);
-            if (fluidStack == null) {
-                this.lockHandler.accept(locked);
-            } else {
-                this.jeiHandler.accept(fluidStack);
-            }
         }
     }
 
@@ -341,19 +335,26 @@ public void tryClickPhantom(MouseData data) {
                     }
                 } else {
                     FluidStack cellFluid = fluidHandlerItem.drain(Integer.MAX_VALUE, false);
-                    if ((this.showAmountOnSlot.getAsBoolean() || currentFluid == null) && cellFluid != null) {
+                    if (!GTUtility.areFluidStacksEqual(cellFluid, currentFluid)) {
+
+                        // drain existing
+                        if (this.canDrainSlot()) {
+                            int amt = data.shift ? Integer.MAX_VALUE : 1000;
+                            this.tank.drain(amt, true);
+                        }
+
+                        // then fill
                         if (this.canFillSlot()) {
-                            if (!this.showAmountOnSlot.getAsBoolean()) {
-                                cellFluid.amount = 1;
+                            FluidStack fill;
+                            if (this.showAmountOnSlot.getAsBoolean() && !GTUtility.isEmpty(cellFluid)) {
+                                fill = GTUtility.copy(cellFluid);
+                            } else {
+                                fill = GTUtility.copy(1, cellFluid);
                             }
-                            if (this.tank.fill(cellFluid, true) > 0) {
-                                this.phantomFluid = cellFluid.copy();
+                            if (fill == null || this.tank.fill(fill, true) > 0) {
+                                this.phantomFluid = fill;
                             }
                         }
-                    } else {
-                        if (this.canDrainSlot()) {
-                            this.tank.drain(data.shift ? Integer.MAX_VALUE : 1000, true);
-                        }
                     }
                 }
             }

src/main/java/gregtech/api/util/virtualregistry/VirtualEnderRegistry.java

@@ -7,7 +7,6 @@
 import net.minecraft.world.World;
 import net.minecraft.world.storage.MapStorage;
 import net.minecraft.world.storage.WorldSavedData;
-import net.minecraftforge.fluids.IFluidTank;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -91,18 +90,6 @@ private static VirtualRegistryMap getRegistry(UUID owner) {
         return VIRTUAL_REGISTRIES.computeIfAbsent(owner, key -> new VirtualRegistryMap());
     }
 
-    // remove if tank app is removed
-    public static Map<UUID, Map<String, IFluidTank>> createTankMap() {
-        Map<UUID, Map<String, IFluidTank>> map = new HashMap<>();
-        for (var uuid : VIRTUAL_REGISTRIES.keySet()) {
-            map.put(uuid, new HashMap<>());
-            for (var name : getEntryNames(uuid, EntryTypes.ENDER_FLUID)) {
-                map.get(uuid).put(name, getEntry(uuid, EntryTypes.ENDER_FLUID, name));
-            }
-        }
-        return map;
-    }
-
     @Override
     public final void readFromNBT(NBTTagCompound nbt) {
         if (nbt.hasKey(PUBLIC_KEY)) {

src/main/java/gregtech/api/util/virtualregistry/VirtualRegistryMap.java

@@ -6,6 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -49,7 +50,7 @@ public void clear() {
     }
 
     public Set<String> getEntryNames(EntryTypes<?> type) {
-        return registryMap.get(type).keySet();
+        return registryMap.getOrDefault(type, Collections.emptyMap()).keySet();
     }
 
     @Override

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

@@ -15,6 +15,7 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer;
 import gregtech.common.covers.filter.ItemFilterContainer;
+import gregtech.common.mui.widget.GTTextFieldWidget;
 import gregtech.common.pipelike.itempipe.tile.TileEntityItemPipe;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -53,11 +54,8 @@
 import com.cleanroommc.modularui.value.sync.EnumSyncValue;
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
-import com.cleanroommc.modularui.value.sync.StringSyncValue;
-import com.cleanroommc.modularui.widget.ParentWidget;
 import com.cleanroommc.modularui.widgets.ButtonWidget;
 import com.cleanroommc.modularui.widgets.layout.Flow;
-import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
@@ -498,11 +496,6 @@ public <T> T getCapability(Capability<T> capability, T defaultValue) {
         return defaultValue;
     }
 
-    @Override
-    public boolean usesMui2() {
-        return true;
-    }
-
     @Override
     public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
         var panel = GTGuis.createPanel(this, 176, 192 + 18);
@@ -514,7 +507,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
                 .bindPlayerInventory();
     }
 
-    protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncManager) {
+    protected Flow createUI(GuiData data, PanelSyncManager guiSyncManager) {
         var column = Flow.column().top(24).margin(7, 0)
                 .widthRel(1f).coverChildrenHeight();
 
@@ -526,16 +519,12 @@ protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncMana
 
         IntSyncValue throughput = new IntSyncValue(this::getTransferRate, this::setTransferRate);
 
-        StringSyncValue formattedThroughput = new StringSyncValue(throughput::getStringValue,
-                throughput::setStringValue);
-
         EnumSyncValue<DistributionMode> distributionMode = new EnumSyncValue<>(DistributionMode.class,
                 this::getDistributionMode, this::setDistributionMode);
 
         guiSyncManager.syncValue("manual_io", manualIOmode);
         guiSyncManager.syncValue("conveyor_mode", conveyorMode);
         guiSyncManager.syncValue("distribution_mode", distributionMode);
-        guiSyncManager.syncValue("throughput", throughput);
 
         if (createThroughputRow())
             column.child(Flow.row().coverChildrenHeight()
@@ -548,11 +537,12 @@ protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncMana
                                 return true;
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
-                    .child(new TextFieldWidget()
+                    .child(new GTTextFieldWidget()
                             .left(18).right(18)
+                            .setPostFix(" items/s")
                             .setTextColor(Color.WHITE.darker(1))
                             .setNumbers(1, maxItemTransferRate)
-                            .value(formattedThroughput)
+                            .value(throughput)
                             .background(GTGuiTextures.DISPLAY))
                     .child(new ButtonWidget<>()
                             .right(0).width(18)