Add support for server accelerated sorting, refactor and document

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,50 +18,46 @@
 
 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 {
-    public static final String MOD_ID = "clientsort";
-    public static final String MOD_NAME = "ClientSort";
-    public static final ModLogger LOG = new ModLogger(MOD_NAME);
     public static final KeyMapping SORT_KEY = new KeyMapping(
             translationKey("key", "group.sort"), InputConstants.Type.MOUSE,
             InputConstants.MOUSE_BUTTON_MIDDLE, translationKey("key", "group"));
 
     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;