Update to 19w46b

Also sort the shrinked directories to the top of the suggestion list (like in file viewers)

46b changed the exact code I am modifying so this one doesn't work on 46a

Signed-off-by: liach <[email protected]>

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.5-SNAPSHOT'
+	id 'fabric-loom' version '0.2.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -14,7 +14,7 @@ minecraft {
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraftVersion}"
-	mappings "net.fabricmc:yarn:${project.yarnMappings}"
+	mappings "net.fabricmc:yarn:${project.yarnMappings}:v2"
 	modCompile "net.fabricmc:fabric-loader:${project.loaderVersion}"
 }
 

gradle.properties

@@ -2,10 +2,10 @@
 org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraftVersion=19w38b
-yarnMappings=19w38b+build.4
-loaderVersion=0.6.2+build.166
+minecraftVersion=19w46b
+yarnMappings=19w46b+build.1
+loaderVersion=0.6.4+build.169
 # Mod Properties
-modVersion=0.2.0
+modVersion=0.3.0
 mavenGroup=com.github.liachmodded
 archivesBaseName=pathsuggestion

src/main/java/com/github/liachmodded/pathsuggestion/PathSuggestion.java

@@ -4,7 +4,7 @@
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.ListIterator;
 import net.minecraft.text.Text;
@@ -16,16 +16,21 @@
 public final class PathSuggestion {
 
   private static final char[] SEPARATORS = new char[]{'.', ':', '/'};
+  private static final Comparator<Suggestion> SUGGESTION_COMPARATOR = (a, b) -> {
+    boolean l = a instanceof ShrinkedSuggestion;
+    boolean r = b instanceof ShrinkedSuggestion;
+    return l == r ? a.compareTo(b) : l ? -1 : 1;
+  };
 
   private PathSuggestion() {}
 
   public static void shrinkSuggestions(Suggestions suggestions) {
     final List<Suggestion> entries = suggestions.getList();
-    Collections.sort(entries);
+    entries.sort(null);
 
     final int sharedPrefix = getCommonPrefix(entries.get(0).getText(), entries.get(entries.size() - 1).getText(), 0);
 
-    final List<Suggestion> updated = new ArrayList<>();
+    final List<Suggestion> updated = new ArrayList<>(entries.size());
     final ListIterator<Suggestion> iterator = entries.listIterator();
     while (iterator.hasNext()) {
       final Suggestion current = iterator.next();
@@ -71,6 +76,8 @@ public static void shrinkSuggestions(Suggestions suggestions) {
       }
     }
 
+    updated.sort(SUGGESTION_COMPARATOR);
+
     entries.clear();
     entries.addAll(updated);
   }

src/main/java/com/github/liachmodded/pathsuggestion/RefreshableCommandSuggestor.java

@@ -0,0 +1,7 @@
+package com.github.liachmodded.pathsuggestion;
+
+public interface RefreshableCommandSuggestor {
+
+  void refresh();
+
+}

src/main/java/com/github/liachmodded/pathsuggestion/mixin/CommandSuggestorMixin.java

@@ -0,0 +1,35 @@
+package com.github.liachmodded.pathsuggestion.mixin;
+
+import com.github.liachmodded.pathsuggestion.PathSuggestion;
+import com.github.liachmodded.pathsuggestion.RefreshableCommandSuggestor;
+import com.mojang.brigadier.suggestion.Suggestions;
+import net.minecraft.client.gui.screen.CommandSuggestor;
+import org.spongepowered.asm.mixin.Implements;
+import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Mixin(CommandSuggestor.class)
+@Implements(@Interface(iface = RefreshableCommandSuggestor.class, prefix = "refreshable$"))
+public abstract class CommandSuggestorMixin {
+
+  @Shadow
+  public abstract void refresh();
+
+  @Inject(method = "showSuggestions(Z)V", at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/suggestion/Suggestions;isEmpty()Z", remap = false), locals = LocalCapture.CAPTURE_FAILHARD)
+  public void onCreatingSuggestionWindow(boolean showFirstSuggestion, CallbackInfo ci, Suggestions suggestions) {
+    if (!suggestions.isEmpty()) {
+      PathSuggestion.shrinkSuggestions(suggestions);
+    }
+  }
+
+  @Intrinsic
+  public void refreshable$refresh() {
+    this.refresh();
+  }
+}

src/main/java/com/github/liachmodded/pathsuggestion/mixin/CommandScreenSuggestionWindowMixin.java → src/main/java/com/github/liachmodded/pathsuggestion/mixin/CommandSuggestorWindowMixin.java

@@ -1,8 +1,9 @@
 package com.github.liachmodded.pathsuggestion.mixin;
 
+import com.github.liachmodded.pathsuggestion.RefreshableCommandSuggestor;
 import com.github.liachmodded.pathsuggestion.ShrinkedSuggestion;
 import com.mojang.brigadier.suggestion.Suggestion;
-import net.minecraft.client.gui.screen.ingame.AbstractCommandBlockScreen;
+import net.minecraft.client.gui.screen.CommandSuggestor;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -11,23 +12,23 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-@Mixin(targets = "net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen$SuggestionWindow")
-public abstract class CommandScreenSuggestionWindowMixin {
+@Mixin(CommandSuggestor.SuggestionWindow.class)
+public abstract class CommandSuggestorWindowMixin {
 
-  @Shadow(aliases = {"field_2770", "this$0"}) // see chat screen one
+  @Shadow(aliases = {"field_21615", "this$0"})
   @Final
-  private AbstractCommandBlockScreen field_2770;
+  private CommandSuggestor field_21615;
 
   @Shadow
   public abstract void discard();
 
   @Inject(method = "complete()V",
-      at = @At("RETURN"),
+      at = @At("TAIL"),
       locals = LocalCapture.CAPTURE_FAILHARD)
   public void onComplete(CallbackInfo ci, Suggestion suggestion, int cursor) {
     if (suggestion instanceof ShrinkedSuggestion) {
       discard();
-      ((CommandScreenAccessor) field_2770).callUpdateCommand();
+      ((RefreshableCommandSuggestor) field_21615).refresh();
     }
   }
 }

src/main/resources/fabric.mod.json

@@ -19,6 +19,7 @@
     "pathsuggestion.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.4.0"
+    "fabricloader": ">=0.6.3",
+    "minecraft": ">=1.15-alpha.19.46.b"
   }
 }

src/main/resources/pathsuggestion.mixins.json

@@ -3,12 +3,8 @@
   "package": "com.github.liachmodded.pathsuggestion.mixin",
   "compatibilityLevel": "JAVA_8",
   "client": [
-    "ChatScreenAccessor",
-    "ChatScreenMixin",
-    "ChatScreenSuggestionWindowMixin",
-    "CommandScreenAccessor",
-    "CommandScreenMixin",
-    "CommandScreenSuggestionWindowMixin"
+    "CommandSuggestorMixin",
+    "CommandSuggestorWindowMixin"
   ],
   "injectors": {
     "defaultRequire": 1