Revert "1.20.2 update (MeteorDevelopment#4119)"

This reverts commit 5d04f80.

.github/ISSUE_TEMPLATE/bug.yml

@@ -8,34 +8,32 @@ body:
       label: Describe the bug
       description: |
         A clear and concise description of what the issue is.
-        Provide as much information as possible, videos, images, etc.
-      placeholder: |
-          This module is broken / not working as intended.
-          It should do X but it does Y instead.
+        Provide as much information as possible, videos, crash reports, etc.
+        DO NOT PASTE A CRASH REPORT HERE!!!!
     validations:
       required: true
   - type: textarea
     id: reproducing
     attributes:
       label: Steps to reproduce
       description: How do you trigger this bug?
-      placeholder: |
-          1. I did this thing;
-          2. Then I did this other thing, which caused the bug.
+      render: bash
     validations:
       required: true
+  - type: input
+    id: crash-report
+    attributes:
+      label: Link to crash report/log if applicable (https://mclo.gs)
   - type: input
     id: meteor-version
     attributes:
       label: Meteor Version
-      placeholder: Meteor X.Y.Z (or X.Y.Z-build_number)
     validations:
       required: true
   - type: input
     id: mc-version
     attributes:
       label: Minecraft Version
-      placeholder: MC X.Y.Z
     validations:
       required: true
   - type: dropdown

build.gradle

@@ -1,9 +1,11 @@
 plugins {
-    id "fabric-loom" version "1.5-SNAPSHOT"
+    id "fabric-loom" version "1.2-SNAPSHOT"
     id "maven-publish"
-    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+
 archivesBaseName = project.archives_base_name
 version = project.mod_version + (project.hasProperty("devbuild") ? ("-" + project.findProperty("devbuild")) : "")
 group = project.maven_group
@@ -58,7 +60,7 @@ dependencies {
     modCompileOnly("maven.modrinth:indium:${project.indium_version}") { transitive = false }
 
     // Baritone (https://github.com/MeteorDevelopment/baritone)
-    modCompileOnly "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"
+    modInclude "baritone:fabric:${project.minecraft_version}-SNAPSHOT"
 
     // Libraries
     library "meteordevelopment:orbit:${project.orbit_version}"
@@ -67,7 +69,8 @@ dependencies {
     library "org.reflections:reflections:${project.reflections_version}"
     library("io.netty:netty-handler-proxy:${project.netty_version}") { transitive = false }
     library("io.netty:netty-codec-socks:${project.netty_version}") { transitive = false }
-    library "de.florianmichael:WaybackAuthLib:1.0.0"
+    library "com.github.LlamaLad7.MixinExtras:mixinextras-fabric:${project.mixin_extras_version}"
+    annotationProcessor "com.github.LlamaLad7.MixinExtras:mixinextras-fabric:${project.mixin_extras_version}"
 
     // Launch sub project
     shadow project(":launch")
@@ -94,37 +97,21 @@ shadowJar {
 }
 
 processResources {
-    def propertyMap = [
-        "version"          : project.version,
-        "devbuild"         : project.findProperty("devbuild") ?: "",
-        "commit"           : project.findProperty("commit") ?: "",
-        "minecraft_version": project.minecraft_version,
-        "loader_version"   : project.loader_version
-    ]
-
-    inputs.properties(propertyMap)
     filesMatching("fabric.mod.json") {
-        expand(propertyMap)
+        expand "version": project.version,
+            "devbuild": project.findProperty("devbuild") ?: "",
+            "commit": project.findProperty("commit") ?: ""
     }
 }
 
 jar {
-    from("LICENSE") {
-        rename { "${it}_${archivesBaseName}" }
-    }
+    from "LICENSE"
 
     manifest {
         attributes("Main-Class": "meteordevelopment.meteorclient.Main")
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-
-    withSourcesJar()
-}
-
 remapJar {
     dependsOn shadowJar
     inputFile.set(shadowJar.archiveFile)
@@ -135,22 +122,33 @@ javadoc {
     options.encoding = "UTF-8"
 }
 
-tasks.register("javadocJar", Jar) {
-    from javadoc
-    archiveClassifier.set("javadoc")
+task sourcesJar(type: Jar, dependsOn: classes) {
+    archiveClassifier.set("sources")
+    from sourceSets.main.allSource
 }
 
-build {
-    dependsOn javadocJar
+task javadocJar(type: Jar) {
+    archiveClassifier.set("javadoc")
+    from javadoc
 }
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        java(MavenPublication) {
             artifactId = "meteor-client"
             version = project.hasProperty("devbuild") ? (project.mod_version + "-SNAPSHOT") : project.mod_version
 
-            from components.java
+            artifact(remapJar) {
+                builtBy remapJar
+            }
+
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
+            }
+
+            artifact(javadocJar) {
+                builtBy javadocJar
+            }
         }
     }
 

gradle.properties

@@ -1,35 +1,29 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric (https://fabricmc.net/develop)
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.2
-fapi_version=0.95.3+1.20.4
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.1
+loader_version=0.14.21
+fapi_version=0.84.0+1.20.1
 
 # Mod Properties
-mod_version=0.5.6
+mod_version=0.5.4
 maven_group=meteordevelopment
 archives_base_name=meteor-client
 
 # Dependency Versions
 
-# Baritone (https://github.com/MeteorDevelopment/baritone)
-baritone_version=1.20.4
-
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.20.3-0.5.7
+sodium_version=mc1.20.1-0.5.0
 
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium_version=mc1.20.4-0.12.1
+lithium_version=mc1.20-0.11.2
 
 # Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.6.14+1.20.4
-
-# Indium (https://github.com/comp500/Indium)
-indium_version=1.0.28+mc1.20.4
+iris_version=1.6.5+1.20.1
 
 # Orbit (https://github.com/MeteorDevelopment/orbit)
-orbit_version=0.2.4
+orbit_version=0.2.3
 
 # Starscript (https://github.com/MeteorDevelopment/starscript)
 starscript_version=0.2.2
@@ -42,3 +36,9 @@ reflections_version=0.10.2
 
 # Netty (https://github.com/netty/netty)
 netty_version=4.1.90.Final
+
+# Mixin Extras (https://github.com/LlamaLad7/MixinExtras)
+mixin_extras_version=0.2.0-beta.8
+
+# Indium (https://github.com/comp500/Indium)
+indium_version=1.0.25+mc1.20.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -8,7 +8,6 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import meteordevelopment.meteorclient.commands.commands.*;
-import meteordevelopment.meteorclient.pathing.PathManagers;
 import meteordevelopment.meteorclient.utils.PostInit;
 import net.minecraft.client.network.ClientCommandSource;
 import net.minecraft.command.CommandSource;
@@ -24,19 +23,19 @@ public class Commands {
     public static final CommandSource COMMAND_SOURCE = new ClientCommandSource(null, mc);
     public static final List<Command> COMMANDS = new ArrayList<>();
 
-    @PostInit(dependencies = PathManagers.class)
+    @PostInit
     public static void init() {
         add(new VClipCommand());
         add(new HClipCommand());
         add(new DismountCommand());
-        add(new DisconnectCommand());
         add(new DamageCommand());
         add(new DropCommand());
         add(new EnchantCommand());
         add(new FakePlayerCommand());
         add(new FriendsCommand());
         add(new CommandsCommand());
         add(new InventoryCommand());
+        add(new LocateCommand());
         add(new NbtCommand());
         add(new NotebotCommand());
         add(new PeekCommand());
@@ -62,7 +61,6 @@ public static void init() {
         add(new RotationCommand());
         add(new WaypointCommand());
         add(new InputCommand());
-        add(new LocateCommand());
 
         COMMANDS.sort(Comparator.comparing(Command::getName));
     }

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

@@ -38,7 +38,7 @@ public String parse(StringReader reader) throws CommandSyntaxException {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return suggestMatching(FakePlayerManager.stream().map(fakePlayerEntity -> fakePlayerEntity.getName().getString()), builder);
+        return suggestMatching(FakePlayerManager.stream().map(FakePlayerEntity::getEntityName), builder);
     }
 
     @Override

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

@@ -41,7 +41,7 @@ public PlayerEntity parse(StringReader reader) throws CommandSyntaxException {
         PlayerEntity playerEntity = null;
 
         for (PlayerEntity p : mc.world.getPlayers()) {
-            if (p.getName().getString().equalsIgnoreCase(argument)) {
+            if (p.getEntityName().equalsIgnoreCase(argument)) {
                 playerEntity = p;
                 break;
             }
@@ -53,7 +53,7 @@ public PlayerEntity parse(StringReader reader) throws CommandSyntaxException {
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return CommandSource.suggestMatching(mc.world.getPlayers().stream().map(abstractClientPlayerEntity -> abstractClientPlayerEntity.getName().getString()), builder);
+        return CommandSource.suggestMatching(mc.world.getPlayers().stream().map(PlayerEntity::getEntityName), builder);
     }
 
     @Override

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

@@ -55,7 +55,6 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
                     for (int i = 0; i < player.getInventory().size(); i++) {
                         InvUtils.drop().slot(i);
                     }
-                    InvUtils.drop().slotOffhand();
                 })));
 
         // Armor