Add hotkey 'refillListClear' to clear refill and ran out items

Fix refill list to immediately refresh in UI when there are changes to it

Author: mms0316

README.md

@@ -55,6 +55,7 @@ Features:
   * If new config 'highlightRefillInInventory' is not disabled, lacking item in containers will be highlighted
   * Color may be controlled by new config 'highlightRefillInInventoryColor'
   * If config 'blockInfoLinesEnabled' is not disabled, lacking items will be shown as an Info Overlay
+  * If hotkey 'refillListClear' is pressed, the list of lacking items will be cleared
 * EasyPlace: Addition of config 'easyPlacePickBlockHalt'
   * Reduces player speed if Pick Block fails or picks a Shulker Box
 * EasyPlace and Material List: Addition of configs 'easyPlaceAvoidBeacons' and 'materialListAvoidBeacons', and hotkeys 'beaconRegister', 'beaconUnregister' and 'beaconUnregisterAll'

src/main/java/fi/dy/masa/litematica/config/Hotkeys.java

@@ -51,6 +51,7 @@ public class Hotkeys
     public static final ConfigHotkey PICK_BLOCK_FIRST                   = new ConfigHotkey("pickBlockFirst",                    "BUTTON_3",     KeybindSettings.PRESS_ALLOWEXTRA).apply(HOTKEYS_KEY);
     public static final ConfigHotkey PICK_BLOCK_LAST                    = new ConfigHotkey("pickBlockLast",                     "",             KeybindSettings.MODIFIER_INGAME).apply(HOTKEYS_KEY);
     public static final ConfigHotkey PICK_BLOCK_TOGGLE                  = new ConfigHotkey("pickBlockToggle",                   "M,BUTTON_3").apply(HOTKEYS_KEY);
+    public static final ConfigHotkey REFILL_LIST_CLEAR                  = new ConfigHotkey("refillListClear",                   "",     "Clear list of items to refill and restock");
     public static final ConfigHotkey RENDER_INFO_OVERLAY                = new ConfigHotkey("renderInfoOverlay",                 "I",             KeybindSettings.PRESS_ALLOWEXTRA).apply(HOTKEYS_KEY);
     public static final ConfigHotkey RENDER_OVERLAY_THROUGH_BLOCKS      = new ConfigHotkey("renderOverlayThroughBlocks",        "RIGHT_CONTROL", KeybindSettings.PRESS_ALLOWEXTRA).apply(HOTKEYS_KEY);
     public static final ConfigHotkey RERENDER_SCHEMATIC                 = new ConfigHotkey("rerenderSchematic",                 "F3,M").apply(HOTKEYS_KEY);
@@ -141,6 +142,7 @@ public class Hotkeys
             PICK_BLOCK_FIRST,
             PICK_BLOCK_LAST,
             PICK_BLOCK_TOGGLE,
+            REFILL_LIST_CLEAR,
             RENDER_INFO_OVERLAY,
             RENDER_OVERLAY_THROUGH_BLOCKS,
             RERENDER_SCHEMATIC,

src/main/java/fi/dy/masa/litematica/event/KeyCallbacks.java

@@ -84,6 +84,7 @@ public static void init(MinecraftClient mc)
         Hotkeys.PICK_BLOCK_FIRST.getKeybind().setCallback(callbackHotkeys);
         Hotkeys.PICK_BLOCK_LAST.getKeybind().setCallback(callbackHotkeys);
         Hotkeys.PICK_BLOCK_TOGGLE.getKeybind().setCallback(new KeyCallbackToggleBooleanConfigWithMessage(Configs.Generic.PICK_BLOCK_ENABLED));
+        Hotkeys.REFILL_LIST_CLEAR.getKeybind().setCallback(callbackHotkeys);
         Hotkeys.RERENDER_SCHEMATIC.getKeybind().setCallback(callbackHotkeys);
         Hotkeys.SAVE_AREA_AS_IN_MEMORY_SCHEMATIC.getKeybind().setCallback(callbackHotkeys);
         Hotkeys.SAVE_AREA_AS_SCHEMATIC_TO_FILE.getKeybind().setCallback(callbackHotkeys);
@@ -516,6 +517,12 @@ else if (key == Hotkeys.PICK_BLOCK_LAST.getKeybind())
 
                 return false;
             }
+            else if (key == Hotkeys.REFILL_LIST_CLEAR.getKeybind())
+            {
+                AddonUtils.clearRefillItems();
+                AddonUtils.clearRanOutItems();
+                return true;
+            }
             else if (key == Hotkeys.SAVE_AREA_AS_SCHEMATIC_TO_FILE.getKeybind())
             {
                 return SchematicUtils.saveSchematic(false);

src/main/java/fi/dy/masa/litematica/util/AddonUtils.java

@@ -464,12 +464,20 @@ public static void addRanOutItem(ItemStack stack) {
         }
 
         ranOutItems.add(stack.copy());
+
+        lastRefillTimeCheck = 0;
     }
 
     public static List<ItemStack> getRanOutItems() {
         return ranOutItems;
     }
 
+    public static void clearRanOutItems() {
+        ranOutItems.clear();
+
+        lastRefillTimeCheck = 0;
+    }
+
     public static void addRefillItem(ItemStack stack) {
         for (var item : refillItems) {
             if (InventoryUtils.areStacksEqualIgnoreNbt(item, stack)) {
@@ -478,12 +486,19 @@ public static void addRefillItem(ItemStack stack) {
         }
 
         refillItems.add(stack.copy());
+
+        lastRefillTimeCheck = 0;
     }
 
     public static List<ItemStack> getRefillItems() {
         return refillItems;
     }
 
+    public static void clearRefillItems() {
+        refillItems.clear();
+
+        lastRefillTimeCheck = 0;
+    }
 
     public static void checkClearLastItems() {
         if (!Configs.Generic.HIGHLIGHT_REFILL_IN_INV.getBooleanValue()) return;