Backup -- this will be reset

Author: NotRyken

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.0
+
+- Enabled server accelerated sorting
+
 ## 1.2.0-beta.1
 
 - Fixed version metadata

build.gradle

@@ -25,6 +25,7 @@ subprojects {
         // Alternate license
         matching(includes: [
                 "**/inventory/**",
+                "**/main/**",
                 "**/mixin/**",
                 "**/network/**",
                 "**/util/inject/**",
@@ -160,7 +161,7 @@ String versionChangelog() {
 }
 
 static String capsLoader(String loader) {
-    switch(loader) {
+    switch (loader) {
         case "fabric": return "Fabric"
         case "quilt": return "Quilt"
         case "forge": return "Forge"

common/src/main/java/dev/terminalmc/clientsort/ClientSort.java

@@ -18,13 +18,16 @@
 
 import com.mojang.blaze3d.platform.InputConstants;
 import dev.terminalmc.clientsort.config.Config;
-import dev.terminalmc.clientsort.inventory.sort.SortMode;
+import dev.terminalmc.clientsort.inventory.sort.SortOrder;
 import dev.terminalmc.clientsort.network.InteractionManager;
 import dev.terminalmc.clientsort.util.ModLogger;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 import static dev.terminalmc.clientsort.util.Localization.translationKey;
 
 public class ClientSort {
@@ -37,31 +40,28 @@ public class ClientSort {
 
     public static boolean searchOrderUpdated = false;
 
-    public static boolean emiReloading = false;
+    public static Lock emiReloadLock = new ReentrantLock();
     public static boolean updateBlockedByEmi = false;
 
     public static void init() {
         Config.getAndSave();
     }
-
-    public static void onEndTick(Minecraft mc) {
-    }
-
+    
     public static void onConfigSaved(Config config) {
         Config.Options options = config.options;
-        options.sortMode = SortMode.SORT_MODES.get(options.sortModeStr);
-        options.shiftSortMode = SortMode.SORT_MODES.get(options.shiftSortModeStr);
-        options.ctrlSortMode = SortMode.SORT_MODES.get(options.ctrlSortModeStr);
-        options.altSortMode = SortMode.SORT_MODES.get(options.altSortModeStr);
+        options.sortOrder = SortOrder.SORT_MODES.get(options.sortOrderStr);
+        options.shiftSortOrder = SortOrder.SORT_MODES.get(options.shiftSortOrderStr);
+        options.ctrlSortOrder = SortOrder.SORT_MODES.get(options.ctrlSortOrderStr);
+        options.altSortOrder = SortOrder.SORT_MODES.get(options.altSortOrderStr);
         options.sortSoundLoc = ResourceLocation.tryParse(options.sortSound);
-        setInteractionManagerTickRate(config);
+        setInteractionManagerTickRate(config.options);
     }
-    
-    public static void setInteractionManagerTickRate(Config config) {
+
+    public static void setInteractionManagerTickRate(Config.Options options) {
         if (Minecraft.getInstance().getSingleplayerServer() == null) {
-            InteractionManager.setTickRate(config.options.interactionRateServer);
+            InteractionManager.setTickRate(options.interactionRateServer);
         } else {
-            InteractionManager.setTickRate(config.options.interactionRateClient);
+            InteractionManager.setTickRate(options.interactionRateClient);
         }
     }
 }

…ientsort/compat/itemlocks/ItemLocks.java …rt/compat/itemlocks/ItemLocksCompat.javacommon/src/main/java/dev/terminalmc/clientsort/compat/itemlocks/ItemLocks.java renamed to common/src/main/java/dev/terminalmc/clientsort/compat/itemlocks/ItemLocksCompat.java common/src/main/java/dev/terminalmc/clientsort/compat/itemlocks/ItemLocks.java renamed to common/src/main/java/dev/terminalmc/clientsort/compat/itemlocks/ItemLocksCompat.java

@@ -24,18 +24,22 @@
 import static com.kirdow.itemlocks.client.input.KeyBindings.isBypass;
 import static com.kirdow.itemlocks.proxy.Components.getComponent;
 
-public class ItemLocks {
+public class ItemLocksCompat {
+    /**
+     * @param slot the slot to check.
+     * @return {@code true} if the slot is valid, locked, and the bypass is not
+     * active.
+     */
     static boolean isLocked(Slot slot) {
         if (!(slot.container instanceof Inventory)) return false;
-        int index = adjustForInventory(((ISlot) slot).mouseWheelie_getIndexInInv());
+        int index = adjustForInventory(((ISlot) slot).clientSort$getIndexInInv());
         return getComponent(LockManager.class).isLockedSlotRaw(index) && !isBypass();
     }
 
     /**
      * Moves the hotbar from 0-8 to 27-35.
      */
     private static int adjustForInventory(int slot) {
-        // 
         if (0 <= slot && slot <= 8) {
             return slot + 27;
         } else if (9 <= slot && slot <= 35) {

common/src/main/java/dev/terminalmc/clientsort/compat/itemlocks/ItemLocksWrapper.java

@@ -21,10 +21,17 @@
 public class ItemLocksWrapper {
     private static boolean hasFailed = false;
 
+    /**
+     * Wraps {@link ItemLocksCompat#isLocked} to catch errors if the ItemLocks
+     * mod is not loaded or the expected method is not available.
+     * @param slot the slot to check.
+     * @return {@code true} if the slot is valid, locked, and the bypass is not
+     * active.
+     */
     public static boolean isLocked(Slot slot) {
         if (hasFailed) return false;
         try {
-            return ItemLocks.isLocked(slot);
+            return ItemLocksCompat.isLocked(slot);
         } catch (NoClassDefFoundError | NoSuchMethodError ignored) {
             hasFailed = true;
             return false;

common/src/main/java/dev/terminalmc/clientsort/config/Config.java

@@ -19,7 +19,8 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import dev.terminalmc.clientsort.ClientSort;
-import dev.terminalmc.clientsort.inventory.sort.SortMode;
+import dev.terminalmc.clientsort.inventory.sort.SortOrder;
+import dev.terminalmc.clientsort.platform.Services;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -31,7 +32,7 @@
 import java.nio.file.StandardCopyOption;
 
 public class Config {
-    private static final Path DIR_PATH = Path.of("config");
+    private static final Path CONFIG_DIR = Services.PLATFORM.getConfigDir();
     private static final String FILE_NAME = ClientSort.MOD_ID + ".json";
     private static final String BACKUP_FILE_NAME = ClientSort.MOD_ID + ".unreadable.json";
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
@@ -45,71 +46,63 @@ public static Options options() {
     }
 
     public static class Options {
-        // General
+        
+        // General options
+        
         public static final int interactionRateMin = 1;
         public static final int interactionRateMax = 100;
         public static final int interactionRateServerDefault = 10;
         public int interactionRateServer = interactionRateServerDefault;
 
         public static final int interactionRateClientDefault = 1;
         public int interactionRateClient = interactionRateClientDefault;
+        
+        public static final boolean serverAcceleratedSortingDefault = true;
+        public boolean serverAcceleratedSorting = serverAcceleratedSortingDefault;
 
-        public static final HotbarMode hotbarModeDefault = HotbarMode.HARD;
-        public HotbarMode hotbarMode = hotbarModeDefault;
-        public enum HotbarMode {
-            NONE,
-            HARD,
-            SOFT;
+        public static final boolean optimizedCreativeSortingDefault = true;
+        public boolean optimizedCreativeSorting = optimizedCreativeSortingDefault;
 
-            public String lowerName() {
-                return switch(this) {
-                    case NONE -> "merge";
-                    case HARD -> "split";
-                    case SOFT -> "off";
-                };
-            }
+        public static final HotbarScope hotbarScopeDefault = HotbarScope.HOTBAR;
+        public HotbarScope hotbarScope = hotbarScopeDefault;
+        public enum HotbarScope {
+            HOTBAR,
+            INVENTORY,
+            NONE
         }
 
-        public static final ExtraSlotMode extraSlotModeDefault = ExtraSlotMode.NONE;
-        public ExtraSlotMode extraSlotMode = extraSlotModeDefault;
-        public enum ExtraSlotMode {
-            NONE,
+        public static final ExtraSlotScope extraSlotScopeDefault = ExtraSlotScope.EXTRA;
+        public ExtraSlotScope extraSlotScope = extraSlotScopeDefault;
+        public enum ExtraSlotScope {
+            EXTRA,
             HOTBAR,
-            INVENTORY;
-
-            public String lowerName() {
-                return switch(this) {
-                    case NONE -> "none";
-                    case HOTBAR -> "hotbar";
-                    case INVENTORY -> "inventory";
-                };
-            }
+            INVENTORY,
+            NONE
         }
 
         public static final boolean lmbBundleDefault = false;
         public boolean lmbBundle = lmbBundleDefault;
 
-        // Sorting
-        public static final String sortModeDefault = SortMode.CREATIVE.name;
-        public String sortModeStr = sortModeDefault;
-        public transient SortMode sortMode;
-
-        public static final String shiftSortModeDefault = SortMode.QUANTITY.name;
-        public String shiftSortModeStr = shiftSortModeDefault;
-        public transient SortMode shiftSortMode;
+        // Sort mode options
+        
+        public static final String sortOrderDefault = SortOrder.CREATIVE.name;
+        public String sortOrderStr = sortOrderDefault;
+        public transient SortOrder sortOrder;
 
-        public static final String ctrlSortModeDefault = SortMode.ALPHABET.name;
-        public String ctrlSortModeStr = ctrlSortModeDefault;
-        public transient SortMode ctrlSortMode;
+        public static final String shiftSortOrderDefault = SortOrder.QUANTITY.name;
+        public String shiftSortOrderStr = shiftSortOrderDefault;
+        public transient SortOrder shiftSortOrder;
 
-        public static final String altSortModeDefault = SortMode.RAW_ID.name;
-        public String altSortModeStr = altSortModeDefault;
-        public transient SortMode altSortMode;
+        public static final String ctrlSortOrderDefault = SortOrder.ALPHABET.name;
+        public String ctrlSortOrderStr = ctrlSortOrderDefault;
+        public transient SortOrder ctrlSortOrder;
 
-        public static final boolean optimizedCreativeSortingDefault = true;
-        public boolean optimizedCreativeSorting = optimizedCreativeSortingDefault;
+        public static final String altSortOrderDefault = SortOrder.RAW_ID.name;
+        public String altSortOrderStr = altSortOrderDefault;
+        public transient SortOrder altSortOrder;
+        
+        // Sorting sound options
 
-        // Sounds
         public static final boolean soundEnabledDefault = false;
         public boolean soundEnabled = soundEnabledDefault;
 
@@ -135,11 +128,54 @@ public String lowerName() {
 
         public static final boolean soundAllowOverlapDefault = true;
         public boolean soundAllowOverlap = soundAllowOverlapDefault;
+        
+        // Legacy from pre v1.3.0
+
+        public static final HotbarMode hotbarModeDefault = HotbarMode.HARD;
+        public HotbarMode hotbarMode = hotbarModeDefault;
+        public enum HotbarMode {
+            NONE,
+            HARD,
+            SOFT;
+
+            public HotbarScope update() {
+                return switch(this) {
+                    case NONE -> HotbarScope.INVENTORY;
+                    case HARD -> HotbarScope.HOTBAR;
+                    case SOFT -> HotbarScope.NONE;
+                };
+            }
+        }
+
+        public static final ExtraSlotMode extraSlotModeDefault = ExtraSlotMode.NONE;
+        public ExtraSlotMode extraSlotMode = extraSlotModeDefault;
+        public enum ExtraSlotMode {
+            NONE,
+            HOTBAR,
+            INVENTORY;
+
+            public ExtraSlotScope update() {
+                return switch(this) {
+                    case NONE -> ExtraSlotScope.NONE;
+                    case HOTBAR -> ExtraSlotScope.HOTBAR;
+                    case INVENTORY -> ExtraSlotScope.INVENTORY;
+                };
+            }
+        }
+        
+        public String sortModeStr = sortOrderDefault;
+        public String shiftSortModeStr = shiftSortOrderDefault;
+        public String ctrlSortModeStr = ctrlSortOrderDefault;
+        public String altSortModeStr = altSortOrderDefault;
     }
 
-    // Cleanup
+    // Validation
 
-    private void cleanup() {
+    /**
+     * Ensures that all config values are valid.
+     */
+    private void validate() {
+        update();
         // interactionRateServer
         if (options.interactionRateServer < Options.interactionRateMin)
             options.interactionRateServer = Options.interactionRateMin;
@@ -174,7 +210,35 @@ private void cleanup() {
         if (options.soundVolume > Options.soundVolumeMax)
             options.soundVolume = Options.soundVolumeMax;
     }
-
+    
+    
+    private void update() {
+        if (options.hotbarMode != Options.hotbarModeDefault) {
+            options.hotbarScope = options.hotbarMode.update();
+            options.hotbarMode = Options.hotbarModeDefault;
+        }
+        if (options.extraSlotMode != Options.extraSlotModeDefault) {
+            options.extraSlotScope = options.extraSlotMode.update();
+            options.extraSlotMode = Options.extraSlotModeDefault;
+        }
+        if (!Options.sortOrderDefault.equals(options.sortModeStr)) {
+            options.sortOrderStr = options.sortModeStr;
+            options.sortModeStr = Options.sortOrderDefault;
+        }
+        if (!Options.shiftSortOrderDefault.equals(options.shiftSortModeStr)) {
+            options.shiftSortOrderStr = options.shiftSortModeStr;
+            options.shiftSortModeStr = Options.shiftSortOrderDefault;
+        }
+        if (!Options.ctrlSortOrderDefault.equals(options.ctrlSortModeStr)) {
+            options.ctrlSortOrderStr = options.ctrlSortModeStr;
+            options.ctrlSortModeStr = Options.ctrlSortOrderDefault;
+        }
+        if (!Options.altSortOrderDefault.equals(options.altSortModeStr)) {
+            options.altSortOrderStr = options.altSortModeStr;
+            options.altSortModeStr = Options.altSortOrderDefault;
+        }
+    }
+    
     // Instance management
 
     private static Config instance = null;
@@ -201,7 +265,7 @@ public static Config resetAndSave() {
     // Load and save
 
     public static @NotNull Config load() {
-        Path file = DIR_PATH.resolve(FILE_NAME);
+        Path file = CONFIG_DIR.resolve(FILE_NAME);
         Config config = null;
         if (Files.exists(file)) {
             config = load(file, GSON);
@@ -228,8 +292,8 @@ public static Config resetAndSave() {
     private static void backup() {
         try {
             ClientSort.LOG.warn("Copying {} to {}", FILE_NAME, BACKUP_FILE_NAME);
-            if (!Files.isDirectory(DIR_PATH)) Files.createDirectories(DIR_PATH);
-            Path file = DIR_PATH.resolve(FILE_NAME);
+            if (!Files.isDirectory(CONFIG_DIR)) Files.createDirectories(CONFIG_DIR);
+            Path file = CONFIG_DIR.resolve(FILE_NAME);
             Path backupFile = file.resolveSibling(BACKUP_FILE_NAME);
             Files.move(file, backupFile, StandardCopyOption.ATOMIC_MOVE,
                     StandardCopyOption.REPLACE_EXISTING);
@@ -240,10 +304,10 @@ private static void backup() {
 
     public static void save() {
         if (instance == null) return;
-        instance.cleanup();
+        instance.validate();
         try {
-            if (!Files.isDirectory(DIR_PATH)) Files.createDirectories(DIR_PATH);
-            Path file = DIR_PATH.resolve(FILE_NAME);
+            if (!Files.isDirectory(CONFIG_DIR)) Files.createDirectories(CONFIG_DIR);
+            Path file = CONFIG_DIR.resolve(FILE_NAME);
             Path tempFile = file.resolveSibling(file.getFileName() + ".tmp");
             try (OutputStreamWriter writer = new OutputStreamWriter(
                     new FileOutputStream(tempFile.toFile()), StandardCharsets.UTF_8)) {