From 2c9e5c97492fe923ceb997cb7f98488456a689a2 Mon Sep 17 00:00:00 2001
From: Irtimaled <irtimaled@gmail.com>
Date: Sun, 24 May 2020 11:58:16 -0700
Subject: [PATCH] Use Mixin 0.8

---
 build.gradle                                       |  5 +++--
 .../java/com/irtimaled/bbor/launch/Tweaker.java    |  2 +-
 src/main/resources/mixins.bbor.json                |  2 +-
 src/main/resources/profile.json                    | 14 +++++++++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index e948b79..895654a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,10 +30,11 @@ repositories {
 }
 
 dependencies {
-    implementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') { transitive = false }
+    implementation('org.spongepowered:mixin:0.8') { transitive = false }
     implementation('net.minecraft:launchwrapper:1.12') { transitive = false }
-    implementation 'org.ow2.asm:asm:6.2'
+    implementation 'org.ow2.asm:asm-tree:6.2'
     implementation 'org.ow2.asm:asm-commons:6.2'
+    implementation "org.ow2.asm:asm-util:6.2"
 }
 
 minecraft {
diff --git a/src/main/java/com/irtimaled/bbor/launch/Tweaker.java b/src/main/java/com/irtimaled/bbor/launch/Tweaker.java
index 881e8b9..b7707d4 100644
--- a/src/main/java/com/irtimaled/bbor/launch/Tweaker.java
+++ b/src/main/java/com/irtimaled/bbor/launch/Tweaker.java
@@ -33,8 +33,8 @@ public abstract class Tweaker implements ITweaker {
     @Override
     public void injectIntoClassLoader(LaunchClassLoader classLoader) {
         MixinBootstrap.init();
-        Mixins.addConfiguration("mixins.bbor.json");
         MixinEnvironment.getDefaultEnvironment().setSide(isClient() ? MixinEnvironment.Side.CLIENT : MixinEnvironment.Side.SERVER);
+        Mixins.addConfiguration("mixins.bbor.json");
     }
 
     protected abstract boolean isClient();
diff --git a/src/main/resources/mixins.bbor.json b/src/main/resources/mixins.bbor.json
index a58ad2f..657649e 100644
--- a/src/main/resources/mixins.bbor.json
+++ b/src/main/resources/mixins.bbor.json
@@ -1,6 +1,6 @@
 {
   "required": true,
-  "minVersion": "0.7.11",
+  "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
   "target": "@env(DEFAULT)",
   "package": "com.irtimaled.bbor.mixin",
diff --git a/src/main/resources/profile.json b/src/main/resources/profile.json
index 4e88b50..3b2afab 100644
--- a/src/main/resources/profile.json
+++ b/src/main/resources/profile.json
@@ -17,17 +17,29 @@
       "url": "https://github.com/irtimaled/maven/releases/download/"
     },
     {
-      "name": "org.spongepowered:mixin:0.7.11-SNAPSHOT",
+      "name": "org.spongepowered:mixin:0.8",
       "url": "https://github.com/irtimaled/maven/releases/download/"
     },
     {
       "name": "org.ow2.asm:asm:6.2",
       "url": "https://repo1.maven.org/maven2/"
     },
+    {
+      "name": "org.ow2.asm:asm-tree:6.2",
+      "url": "https://repo1.maven.org/maven2/"
+    },
     {
       "name": "org.ow2.asm:asm-commons:6.2",
       "url": "https://repo1.maven.org/maven2/"
     },
+    {
+      "name": "org.ow2.asm:asm-util:6.2",
+      "url": "https://repo1.maven.org/maven2/"
+    },
+    {
+      "name": "org.ow2.asm:asm-analysis:6.2",
+      "url": "https://repo1.maven.org/maven2/"
+    },
     {
       "name": "net.minecraft:launchwrapper:1.12"
     }
-- 
2.44.0