Merge branch 'MeteorDevelopment:master' into feat/classgraph

Author: Big-Iron-Cheems

build.gradle.kts

@@ -69,6 +69,8 @@ configurations {
     }
 }
 
+sourceSets.create("launcher")
+
 dependencies {
     // Fabric
     minecraft(libs.minecraft)
@@ -77,11 +79,10 @@ dependencies {
 
     val fapiVersion = libs.versions.fabric.api.get()
     modInclude(fabricApi.module("fabric-api-base", fapiVersion))
-    modInclude(fabricApi.module("fabric-resource-loader-v0", fapiVersion))
     modInclude(fabricApi.module("fabric-resource-loader-v1", fapiVersion))
 
     // Compat fixes
-//    modCompileOnly(fabricApi.module("fabric-renderer-indigo", fapiVersion)) TODO: re-enable when available
+    modCompileOnly(fabricApi.module("fabric-renderer-indigo", fapiVersion))
     modCompileOnly(libs.sodium) { isTransitive = false }
     modCompileOnly(libs.lithium) { isTransitive = false }
     modCompileOnly(libs.iris) { isTransitive = false }
@@ -101,6 +102,16 @@ dependencies {
     jij(libs.waybackauthlib)
 }
 
+sourceSets {
+    val launcher = getByName("launcher")
+
+    launcher.apply {
+        java {
+            srcDir("src/launcher/java")
+        }
+    }
+}
+
 // Handle transitive dependencies for jar-in-jar
 // Based on implementation from BaseProject by FlorianMichael/EnZaXD
 // Source: https://github.com/FlorianMichael/BaseProject/blob/main/src/main/kotlin/de/florianmichael/baseproject/Fabric.kt
@@ -114,7 +125,6 @@ afterEvaluate {
         "jsr305"        // Compile time annotations only
     )
 
-
     jijConfig.incoming.resolutionResult.allDependencies.forEach { dep ->
         val requested = dep.requested.displayName
 
@@ -136,12 +146,6 @@ loom {
     accessWidenerPath = file("src/main/resources/meteor-client.accesswidener")
 }
 
-afterEvaluate {
-    tasks.migrateMappings.configure {
-        outputDir.set(project.file("src/main/java"))
-    }
-}
-
 tasks {
     processResources {
         val buildNumber = project.findProperty("build_number")?.toString() ?: ""
@@ -161,16 +165,24 @@ tasks {
         }
     }
 
+    // Compile launcher with Java 8 for backwards compatibility
+    getByName<JavaCompile>("compileLauncherJava") {
+        sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+        targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        options.compilerArgs.add("-Xlint:-options")
+    }
+
     jar {
         inputs.property("archivesName", project.base.archivesName.get())
 
         from("LICENSE") {
             rename { "${it}_${inputs.properties["archivesName"]}" }
         }
 
-        // Launch sub project
-        dependsOn(":launch:compileJava")
-        from(project(":launch").layout.buildDirectory.dir("classes/java/main"))
+        // Include launcher classes
+        val launcher = sourceSets.getByName("launcher")
+        from(launcher.output.classesDirs)
+        from(launcher.output.resourcesDir)
 
         manifest {
             attributes["Main-Class"] = "meteordevelopment.meteorclient.Main"
@@ -188,7 +200,6 @@ tasks {
     }
 
     withType<JavaCompile> {
-        options.release = 21
         options.compilerArgs.add("-Xlint:deprecation")
         options.compilerArgs.add("-Xlint:unchecked")
     }

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 minecraft = "1.21.11"
 yarn-mappings = "1.21.11+build.3"
 fabric-loader = "0.18.2"
-fabric-api = "0.139.5+1.21.11"
+fabric-api = "0.140.0+1.21.11"
 
 # Plugins
 # Loom (https://github.com/FabricMC/fabric-loom)

launch/build.gradle.kts

@@ -10,5 +10,3 @@ pluginManagement {
 }
 
 rootProject.name = "meteor-client"
-
-include("launch")

settings.gradle.kts

@@ -19,40 +19,45 @@ public static void main(String[] args) throws UnsupportedLookAndFeelException, C
         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 
         int option = JOptionPane.showOptionDialog(
-                null,
-                "To install Meteor Client you need to put it in your mods folder and run Fabric for latest Minecraft version.",
-                "Meteor Client",
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.ERROR_MESSAGE,
-                null,
-                new String[] { "Open Wiki", "Open Mods Folder" },
-                null
+            null,
+            "To install Meteor Client you need to put it in your mods folder and run Fabric for latest Minecraft version.",
+            "Meteor Client",
+            JOptionPane.YES_NO_OPTION,
+            JOptionPane.ERROR_MESSAGE,
+            null,
+            new String[]{"Open Wiki", "Open Mods Folder"},
+            null
         );
 
         switch (option) {
-            case 0: getOS().open("https://meteorclient.com/faq/installation"); break;
+            case 0:
+                getOS().open("https://meteorclient.com/faq/installation");
+                break;
             case 1: {
-                String path;
-
-                switch (getOS()) {
-                    case WINDOWS: path = System.getenv("AppData") + "/.minecraft/mods"; break;
-                    case OSX:     path = System.getProperty("user.home") + "/Library/Application Support/minecraft/mods"; break;
-                    default:      path = System.getProperty("user.home") + "/.minecraft"; break;
-                }
-
-                File mods = new File(path);
+                File mods = new File(getModsFolder());
                 if (!mods.exists()) mods.mkdirs();
-
                 getOS().open(mods);
                 break;
             }
         }
     }
 
+    private static String getModsFolder() {
+        String userHome = System.getProperty("user.home");
+        switch (getOS()) {
+            case WINDOWS:
+                return System.getenv("AppData") + "/.minecraft/mods";
+            case OSX:
+                return userHome + "/Library/Application Support/minecraft/mods";
+            default:
+                return userHome + "/.minecraft/mods";
+        }
+    }
+
     private static OperatingSystem getOS() {
         String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
 
-        if (os.contains("linux") || os.contains("unix"))  return OperatingSystem.LINUX;
+        if (os.contains("linux") || os.contains("unix")) return OperatingSystem.LINUX;
         if (os.contains("mac")) return OperatingSystem.OSX;
         if (os.contains("win")) return OperatingSystem.WINDOWS;
 
@@ -64,13 +69,13 @@ private enum OperatingSystem {
         WINDOWS {
             @Override
             protected String[] getURLOpenCommand(URL url) {
-                return new String[] { "rundll32", "url.dll,FileProtocolHandler", url.toString() };
+                return new String[]{"rundll32", "url.dll,FileProtocolHandler", url.toString()};
             }
         },
         OSX {
             @Override
             protected String[] getURLOpenCommand(URL url) {
-                return new String[] { "open", url.toString() };
+                return new String[]{"open", url.toString()};
             }
         },
         UNKNOWN;
@@ -106,7 +111,7 @@ protected String[] getURLOpenCommand(URL url) {
                 string = string.replace("file:", "file://");
             }
 
-            return new String[] { "xdg-open", string };
+            return new String[]{"xdg-open", string};
         }
     }
 }

…meteordevelopment/meteorclient/Main.java …meteordevelopment/meteorclient/Main.javalaunch/src/main/java/meteordevelopment/meteorclient/Main.java renamed to src/launcher/java/meteordevelopment/meteorclient/Main.java launch/src/main/java/meteordevelopment/meteorclient/Main.java renamed to src/launcher/java/meteordevelopment/meteorclient/Main.java

@@ -67,6 +67,7 @@ public static void init() {
         add(new InputCommand());
         add(new WaspCommand());
         add(new LocateCommand());
+        add(new HelpCommand());
 
         COMMANDS.sort(Comparator.comparing(Command::getName));
 

src/main/java/meteordevelopment/meteorclient/commands/Commands.java

@@ -0,0 +1,78 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.commands.arguments;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import meteordevelopment.meteorclient.commands.Command;
+import meteordevelopment.meteorclient.commands.Commands;
+import net.minecraft.command.CommandSource;
+import net.minecraft.text.Text;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+public class CommandArgumentType implements ArgumentType<Command> {
+    private static final CommandArgumentType INSTANCE = new CommandArgumentType();
+    private static final DynamicCommandExceptionType NO_SUCH_COMMAND = new DynamicCommandExceptionType(name -> Text.literal("Command with name " + name + " doesn't exist."));
+    private static final Collection<String> EXAMPLES = Commands.COMMANDS.stream().limit(3).map(Command::getName).collect(Collectors.toList());
+
+    private CommandArgumentType() {
+    }
+
+    public static CommandArgumentType create() {
+        return INSTANCE;
+    }
+
+    public static Command get(CommandContext<?> context) {
+        return context.getArgument("command", Command.class);
+    }
+
+    @Override
+    public Command parse(StringReader reader) throws CommandSyntaxException {
+        String name = reader.readString();
+
+        Command command = Commands.get(name);
+
+        if (command == null) {
+            for (Command c : Commands.COMMANDS) {
+                for (String alias : c.getAliases()) {
+                    if (alias.equals(name)) {
+                        command = c;
+                        break;
+                    }
+                }
+                if (command != null) break;
+            }
+        }
+
+        if (command == null) throw NO_SUCH_COMMAND.create(name);
+        return command;
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+        Set<String> suggestions = new LinkedHashSet<>();
+        for (Command c : Commands.COMMANDS) {
+            suggestions.add(c.getName());
+            suggestions.addAll(c.getAliases());
+        }
+        return CommandSource.suggestMatching(suggestions, builder);
+    }
+
+    @Override
+    public Collection<String> getExamples() {
+        return EXAMPLES;
+    }
+}

src/main/java/meteordevelopment/meteorclient/commands/arguments/CommandArgumentType.java

@@ -14,6 +14,7 @@
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import meteordevelopment.meteorclient.settings.Setting;
+import meteordevelopment.meteorclient.settings.Settings;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import net.minecraft.command.CommandSource;
 import net.minecraft.text.Text;
@@ -31,9 +32,14 @@ public static SettingArgumentType create() {
 
     public static Setting<?> get(CommandContext<?> context) throws CommandSyntaxException {
         Module module = context.getArgument("module", Module.class);
+
+        return get(context, module.settings);
+    }
+
+    public static Setting<?> get(CommandContext<?> context, Settings settings) throws CommandSyntaxException {
         String settingName = context.getArgument("setting", String.class);
 
-        Setting<?> setting = module.settings.get(settingName);
+        Setting<?> setting = settings.get(settingName);
         if (setting == null) throw NO_SUCH_SETTING.create(settingName);
 
         return setting;
@@ -48,9 +54,13 @@ public String parse(StringReader reader) throws CommandSyntaxException {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        Stream<String> stream = Streams.stream(context.getArgument("module", Module.class).settings.iterator())
-                .flatMap(settings -> Streams.stream(settings.iterator()))
-                .map(setting -> setting.name);
+        return listSuggestions(builder, context.getArgument("module", Module.class).settings);
+    }
+
+    public static CompletableFuture<Suggestions> listSuggestions(SuggestionsBuilder builder, Settings settings) {
+        Stream<String> stream = Streams.stream(settings.iterator())
+            .flatMap(sg -> Streams.stream(sg.iterator()))
+            .map(setting -> setting.name);
 
         return CommandSource.suggestMatching(stream, builder);
     }

src/main/java/meteordevelopment/meteorclient/commands/arguments/SettingArgumentType.java

@@ -12,8 +12,10 @@
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import meteordevelopment.meteorclient.settings.Setting;
+import meteordevelopment.meteorclient.settings.Settings;
 import net.minecraft.command.CommandSource;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -47,6 +49,22 @@ public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> cont
             return Suggestions.empty();
         }
 
+        return suggest(builder, setting);
+    }
+
+    public static <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder, Settings settings) {
+        Setting<?> setting;
+
+        try {
+            setting = SettingArgumentType.get(context, settings);
+        } catch (CommandSyntaxException ignored) {
+            return Suggestions.empty();
+        }
+
+        return suggest(builder, setting);
+    }
+
+    public static CompletableFuture<Suggestions> suggest(SuggestionsBuilder builder, @NotNull Setting<?> setting) {
         Iterable<Identifier> identifiers = setting.getIdentifierSuggestions();
         if (identifiers != null) {
             return CommandSource.suggestIdentifiers(identifiers, builder);