Port more miscellaneous blocks to MUI2

dependencies.gradle

@@ -40,7 +40,7 @@
 dependencies {
     // Published dependencies
     api("codechicken:codechickenlib:3.2.3.358")
-    api("com.cleanroommc:modularui:3.0.4") { transitive = false }
+    api("com.cleanroommc:modularui:3.0.5") { transitive = false }
     api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
     api("curse.maven:inventory-bogosorter-632327:7102721-deobf-6717233-sources-6717234") // Inventory BogoSorter − v1.5.0
     api("curse.maven:key-binding-patch-928895:5951859") // Key Binding Patch v1.3.3.3, needed by Inventory BogoSorter v1.5.0+

src/main/java/gregtech/api/GTValues.java

@@ -1,13 +1,14 @@
 package gregtech.api;
 
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.random.XoShiRo256PlusPlusRandom;
 import gregtech.common.ConfigHolder;
 
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.time.LocalDate;
+import java.time.MonthDay;
 import java.util.Random;
 import java.util.function.Supplier;
 
@@ -191,14 +192,29 @@ public static boolean isDeobfEnvironment() {
      */
     public static final int FALLBACK = -1;
 
-    public static Supplier<Boolean> FOOLS = () -> {
-        String[] yearMonthDay = LocalDate.now().toString().split("-");
-        return ConfigHolder.misc.specialEvents && yearMonthDay[1].equals("04") && yearMonthDay[2].equals("01");
-    };
+    public static final MonthDay DAY_APRIL_FOOLS = MonthDay.of(4, 1);
+    public static final MonthDay DAY_XMAS_EVE = MonthDay.of(12, 24);
+    public static final MonthDay DAY_XMAS = MonthDay.of(12, 25);
 
-    public static Supplier<Boolean> XMAS = () -> {
-        String[] yearMonthDay = LocalDate.now().toString().split("-");
-        return ConfigHolder.misc.specialEvents && yearMonthDay[1].equals("12") &&
-                (yearMonthDay[2].equals("24") || yearMonthDay[2].equals("25"));
-    };
+    /**
+     * Check if today is April 1st.
+     */
+    public static boolean isAprilFools() {
+        if (!ConfigHolder.misc.specialEvents) return false;
+        return GTUtility.isToday(DAY_APRIL_FOOLS);
+    }
+
+    /**
+     * Check if today is the day of, or eve of Xmas.
+     */
+    public static boolean isXMAS() {
+        if (!ConfigHolder.misc.specialEvents) return false;
+        return GTUtility.isToday(DAY_XMAS_EVE) || GTUtility.isToday(DAY_XMAS);
+    }
+
+    @Deprecated
+    public static final Supplier<Boolean> FOOLS = GTValues::isAprilFools;
+
+    @Deprecated
+    public static final Supplier<Boolean> XMAS = GTValues::isXMAS;
 }

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -95,7 +95,6 @@ public static int assignId() {
     public static final int STORE_TAPED = assignId();
     public static final int RECIPE_MAP_INDEX = assignId();
     public static final int IS_FRONT_FACE_FREE = assignId();
-    public static final int MAINTENANCE_MULTIPLIER = assignId();
     public static final int UPDATE_UPWARDS_FACING = assignId();
     public static final int UPDATE_FLIP = assignId();
     public static final int LOCK_FILL = assignId();

src/main/java/gregtech/api/capability/IMaintenanceHatch.java

@@ -37,9 +37,13 @@ public interface IMaintenanceHatch {
      */
     Tuple<Byte, Integer> readMaintenanceData();
 
-    double getDurationMultiplier();
+    default double getDurationMultiplier() {
+        return 1.0d;
+    }
 
-    double getTimeMultiplier();
+    default double getTimeMultiplier() {
+        return 1.0d;
+    }
 
     boolean startWithoutProblems();
 }

src/main/java/gregtech/api/capability/impl/FilteredItemHandler.java

@@ -27,6 +27,11 @@ public FilteredItemHandler(MetaTileEntity metaTileEntity, int size) {
         super(metaTileEntity, size);
     }
 
+    public FilteredItemHandler(MetaTileEntity metaTileEntity, int size, Predicate<ItemStack> fillPredicate) {
+        super(metaTileEntity, size);
+        this.fillPredicate = fillPredicate;
+    }
+
     public FilteredItemHandler(MetaTileEntity metaTileEntity, NonNullList<ItemStack> stacks) {
         super(metaTileEntity, stacks);
     }
@@ -36,6 +41,18 @@ public FilteredItemHandler setFillPredicate(Predicate<ItemStack> fillPredicate)
         return this;
     }
 
+    @Override
+    public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
+        if (!isItemValid(slot, stack)) return stack;
+        return super.insertItem(slot, stack, simulate);
+    }
+
+    @Override
+    public void setStackInSlot(int slot, @NotNull ItemStack stack) {
+        if (!isItemValid(slot, stack)) return;
+        super.setStackInSlot(slot, stack);
+    }
+
     @Override
     public boolean isItemValid(int slot, @NotNull ItemStack stack) {
         return fillPredicate == null || fillPredicate.test(stack);

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

@@ -22,8 +22,6 @@
 import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.screen.UISettings;
 import com.cleanroommc.modularui.utils.Alignment;
-import com.cleanroommc.modularui.utils.Color;
-import com.cleanroommc.modularui.utils.MouseData;
 import com.cleanroommc.modularui.value.BoolValue;
 import com.cleanroommc.modularui.value.sync.EnumSyncValue;
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
@@ -148,32 +146,6 @@ default IKey createEnabledKey(@NotNull String keyBase, @NotNull BooleanSupplier
         return IKey.lang(() -> enabledState.getAsBoolean() ? enabled : disabled);
     }
 
-    default int getIncrementValue(MouseData data) {
-        int adjust = 1;
-        if (data.shift) adjust *= 4;
-        if (data.ctrl) adjust *= 16;
-        if (data.alt) adjust *= 64;
-        return adjust;
-    }
-
-    default IKey createAdjustOverlay(boolean increment) {
-        final StringBuilder builder = new StringBuilder();
-        builder.append(increment ? '+' : '-');
-        builder.append(getIncrementValue(MouseData.create(-1)));
-
-        float scale = 1f;
-        if (builder.length() == 3) {
-            scale = 0.8f;
-        } else if (builder.length() == 4) {
-            scale = 0.6f;
-        } else if (builder.length() > 4) {
-            scale = 0.5f;
-        }
-        return IKey.str(builder.toString())
-                .color(Color.WHITE.main)
-                .scale(scale);
-    }
-
     /**
      * Get a BoolValue for use with toggle buttons which are "linked together,"
      * meaning only one of them can be pressed at a time.

src/main/java/gregtech/api/items/itemhandlers/GTItemStackHandler.java

@@ -6,6 +6,8 @@
 import net.minecraft.util.NonNullList;
 import net.minecraftforge.items.ItemStackHandler;
 
+import org.jetbrains.annotations.NotNull;
+
 public class GTItemStackHandler extends ItemStackHandler {
 
     final private MetaTileEntity metaTileEntity;
@@ -26,7 +28,7 @@ public GTItemStackHandler(MetaTileEntity metaTileEntity, NonNullList<ItemStack>
     }
 
     @Override
-    public void setStackInSlot(int slot, ItemStack stack) {
+    public void setStackInSlot(int slot, @NotNull ItemStack stack) {
         if (ItemStack.areItemStacksEqual(stack, getStackInSlot(slot)))
             return;
 

src/main/java/gregtech/api/items/toolitem/ItemGTToolbelt.java

@@ -4,12 +4,12 @@
 import gregtech.api.items.IDyeableItem;
 import gregtech.api.items.gui.ItemUIFactory;
 import gregtech.api.items.toolitem.behavior.IToolBehavior;
-import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.material.properties.ToolProperty;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.LocalizationUtils;
 import gregtech.api.util.TextFormattingUtil;
 import gregtech.client.utils.TooltipHelper;
@@ -59,6 +59,7 @@
 import com.cleanroommc.modularui.widgets.slot.SlotGroup;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -70,6 +71,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
@@ -106,6 +108,19 @@ public ItemStack getToolInSlot(@NotNull ItemStack toolbelt, int slot) {
         return handler.getStackInSlot(slot);
     }
 
+    /**
+     * Iterate over non-empty slots of the given toolbelt.
+     */
+    public void iterateSlots(@NotNull ItemStack toolBelt, @NotNull Consumer<@NotNull ItemStack> stackConsumer) {
+        ToolStackHandler handler = getHandler(toolBelt);
+        if (handler == FALLBACK) return;
+        for (int index = 0; index < handler.getSlots(); index++) {
+            ItemStack stack = handler.getStackInSlot(index);
+            if (stack.isEmpty()) continue;
+            stackConsumer.accept(stack);
+        }
+    }
+
     @Override
     public ModularPanel buildUI(HandGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
         final var usedStack = guiData.getUsedItemStack();
@@ -406,11 +421,6 @@ public void setOnCraftIngredient(ItemStack stack, Ingredient ingredient) {
         }
     }
 
-    public boolean damageAgainstMaintenanceProblem(ItemStack stack, String toolClass,
-                                                   @Nullable EntityPlayer entityPlayer) {
-        return getHandler(stack).checkMaintenanceAgainstTools(toolClass, true, entityPlayer);
-    }
-
     public boolean supportsIngredient(ItemStack stack, Ingredient ingredient) {
         return getHandler(stack).checkIngredientAgainstTools(ingredient) != -1;
     }
@@ -478,12 +488,13 @@ public void setSelectedTool(int slot, ItemStack stack) {
                                                     float hitY, float hitZ, @NotNull EnumHand hand) {
         EnumActionResult result = IDyeableItem.super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
         if (result == EnumActionResult.PASS) {
-            ItemStack stack = player.getHeldItem(hand);
-            ToolStackHandler handler = getHandler(stack);
-            if (handler.getSelectedStack().isEmpty() &&
-                    world.getTileEntity(pos) instanceof MetaTileEntityHolder holder &&
-                    holder.getMetaTileEntity() instanceof MetaTileEntityMaintenanceHatch maintenance) {
-                maintenance.fixMaintenanceProblemsWithToolbelt(player, this, stack);
+            ItemStack toolbeltStack = player.getHeldItem(hand);
+            ToolStackHandler handler = getHandler(toolbeltStack);
+            if (handler.getSelectedStack().isEmpty() && GTUtility.getMetaTileEntity(world,
+                    pos) instanceof MetaTileEntityMaintenanceHatch maintenanceHatch) {
+                List<ItemStack> tools = new ObjectArrayList<>();
+                iterateSlots(toolbeltStack, tools::add);
+                maintenanceHatch.fixMaintenanceProblemsWithTools(player, tools);
                 return EnumActionResult.SUCCESS;
             }
             return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
@@ -739,18 +750,6 @@ protected void update() {
             }
         }
 
-        public boolean checkMaintenanceAgainstTools(String toolClass, boolean doCraftingDamage,
-                                                    @Nullable EntityPlayer entityPlayer) {
-            for (int i = 0; i < this.getSlots(); i++) {
-                ItemStack stack = this.getStackInSlot(i);
-                if (ToolHelper.isTool(stack, toolClass)) {
-                    if (doCraftingDamage) ToolHelper.damageItemWhenCrafting(stack, entityPlayer);
-                    return true;
-                }
-            }
-            return false;
-        }
-
         public int checkIngredientAgainstTools(Ingredient ingredient) {
             for (int i = 0; i < this.getSlots(); i++) {
                 ItemStack stack = this.getStackInSlot(i);

src/main/java/gregtech/api/items/toolitem/ToolHelper.java

@@ -374,7 +374,7 @@ public static void onActionDone(@NotNull EntityPlayer player, @NotNull World wor
     /**
      * @return if any of the specified tool classes exists in the tool
      */
-    public static boolean isTool(ItemStack tool, String... toolClasses) {
+    public static boolean isTool(@NotNull ItemStack tool, @Nullable String @NotNull... toolClasses) {
         if (toolClasses.length == 1) {
             return tool.getItem().getToolClasses(tool).contains(toolClasses[0]);
         }