Update 1.3.0

Fox2Code · Aug 1, 2024 · ddb683c · ddb683c
1 parent 7301954
commit ddb683c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -11,11 +11,10 @@ dependencies {
     api 'org.ow2.asm:asm-util:9.7'
     api 'org.ow2.asm:asm-commons:9.7'
     api 'org.semver4j:semver4j:5.3.0'
-    // api 'org.spongepowered:mixin:0.8.5'
-    api 'net.fabricmc:sponge-mixin:0.13.4+mixin.0.8.5' // <- https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
-    api 'io.github.llamalad7:mixinextras-common:0.3.6' // <- https://github.com/LlamaLad7/MixinExtras/releases
-    api 'com.github.bawnorton.mixinsquared:mixinsquared-common:0.1.2-beta.6' // <- https://github.com/Bawnorton/MixinSquared/releases
-    api 'it.unimi.dsi:fastutil-core:8.5.13'
+    api 'net.fabricmc:sponge-mixin:0.15.0+mixin.0.8.7' // <- https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
+    api 'io.github.llamalad7:mixinextras-common:0.4.0' // <- https://github.com/LlamaLad7/MixinExtras/releases
+    api 'com.github.bawnorton.mixinsquared:mixinsquared-common:0.2.0-beta.6' // <- https://github.com/Bawnorton/MixinSquared/releases
+    api 'it.unimi.dsi:fastutil-core:8.5.14'
 
     // Mixin dependencies
     api 'com.google.code.gson:gson:2.10.1'

diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/DependencyHelper.java b/common/src/main/java/com/fox2code/foxloader/launcher/DependencyHelper.java
@@ -38,14 +38,13 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
             new Dependency("org.semver4j:semver4j:5.3.0", MAVEN_CENTRAL, "org.semver4j.Semver"),
             new Dependency("org.apache.commons:commons-lang3:3.3.2", MAVEN_CENTRAL, "org.apache.commons.lang3.tuple.Pair"),
             new Dependency("org.luaj:luaj-jse:3.0.1", MAVEN_CENTRAL, "org.luaj.vm2.Globals"),
-            new Dependency("it.unimi.dsi:fastutil-core:8.5.13", MAVEN_CENTRAL, "it.unimi.dsi.fastutil.Pair"),
+            new Dependency("it.unimi.dsi:fastutil-core:8.5.14", MAVEN_CENTRAL, "it.unimi.dsi.fastutil.Pair"),
             // new Dependency("org.spongepowered:mixin:0.8.5", SPONGE_POWERED, "org.spongepowered.asm.mixin.Mixins"),
-            new Dependency("net.fabricmc:sponge-mixin:0.13.4+mixin.0.8.5", FABRIC_MC, "org.spongepowered.asm.mixin.Mixins"),
-            new Dependency("io.github.llamalad7:mixinextras-common:0.3.6",
+            new Dependency("net.fabricmc:sponge-mixin:0.15.0+mixin.0.8.7", FABRIC_MC, "org.spongepowered.asm.mixin.Mixins"),
+            new Dependency("io.github.llamalad7:mixinextras-common:0.4.0",
                     MAVEN_CENTRAL, "com.llamalad7.mixinextras.MixinExtrasBootstrap"),
-            new Dependency("com.github.bawnorton.mixinsquared:mixinsquared-common:0.1.2-beta.6",
-                    JITPACK, "com.bawnorton.mixinsquared.MixinSquaredBootstrap",
-                    "https://github.com/Bawnorton/MixinSquared/releases/download/0.1.2-beta.6/mixinsquared-common-0.1.2-beta.6.jar"),
+            new Dependency("com.github.bawnorton.mixinsquared:mixinsquared-common:0.2.0-beta.6",
+                    FOX2CODE, "com.bawnorton.mixinsquared.MixinSquaredBootstrap"),
             jFallback, // jFallback have special handling in dev plugin
     };
 

diff --git a/common/src/main/java/com/fox2code/foxloader/loader/mixin/MixinService.java b/common/src/main/java/com/fox2code/foxloader/loader/mixin/MixinService.java
@@ -111,18 +111,23 @@ public Class<?> findAgentClass(String name, boolean initialize) throws ClassNotF
 
     @Override
     public ClassNode getClassNode(String name) throws ClassNotFoundException, IOException {
-        return this.getClassNode(name, false);
+        return this.getClassNode(name, false, 0);
     }
 
     @Override
     public ClassNode getClassNode(String name, boolean runTransformers) throws ClassNotFoundException, IOException {
+        return this.getClassNode(name, runTransformers, 0);
+    }
+
+    @Override
+    public ClassNode getClassNode(String name, boolean runTransformers, int readerFlags) throws ClassNotFoundException, IOException {
         ClassNode classNode = new ClassNode();
         InputStream is = FoxLauncher.getFoxClassLoader().getResourceAsStream(name.replace('.', '/') + ".class");
         if (is == null) {
             System.err.println("Failed to find class \"" + name + "\" for mixin");
             throw new ClassNotFoundException(name);
         }
-        new ClassReader(is).accept(classNode, 0);
+        new ClassReader(is).accept(classNode, readerFlags);
         // Always apply PreLoader
         PreLoader.patchForMixin(classNode, name);
         return classNode;

diff --git a/common/src/main/java/com/fox2code/foxloader/loader/packet/ServerHello.java b/common/src/main/java/com/fox2code/foxloader/loader/packet/ServerHello.java
@@ -14,7 +14,7 @@
 public final class ServerHello extends FoxPacket {
     /**
 	 * <p>The current version of the Server Hello packet.</p>
-     * <b>V0</b> - <i>Block and Item registry entries and metadata</i>.<br/>
+     * <b>V0</b> - <i>Block and Item registry entries and metadata</i>.<br>
      * <b>V1</b> - <i>Entity type registry metadata appended to the end</i>.
      */
     public static final short SERVER_HELLO_VERSION = 1;