From bb7a5d11f56e38d54dfd013540b294ed01d33c17 Mon Sep 17 00:00:00 2001
From: Adubbz <a.dubbz@hotmail.com>
Date: Sun, 8 Mar 2015 14:59:07 +1100
Subject: [PATCH] Removed Mixin. Closes #421, #422

---
 .gitmodules                                   |  3 ---
 Mixin                                         |  1 -
 build.gradle                                  | 19 +------------------
 settings.gradle                               |  1 -
 .../common/asm/BOPLoadingPlugin.java          | 11 +----------
 src/main/resources/mixins.biomesoplenty.json  |  5 -----
 6 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 160000 Mixin
 delete mode 100644 settings.gradle
 delete mode 100644 src/main/resources/mixins.biomesoplenty.json

diff --git a/.gitmodules b/.gitmodules
index 6877aff6e..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Mixin"]
-	path = Mixin
-	url = https://github.com/SpongePowered/Mixin.git
diff --git a/Mixin b/Mixin
deleted file mode 160000
index 02948566f..000000000
--- a/Mixin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 02948566fd1a55b7dcea011b82e907694250d058
diff --git a/build.gradle b/build.gradle
index 09929473b..1c73ad46f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,6 @@ buildscript {
     }
 }
 
-evaluationDependsOn('Mixin')
-
 apply plugin: "forge"
 apply plugin: "curseforge"
 
@@ -49,20 +47,13 @@ minecraft {
 // add some stuff to the version
 version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}"
 
-dependencies {
-    compile project('Mixin')
-}
-
 jenkins {
     job = 'BiomesOPlenty'
 }
 
-def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + 'mixins.srg'
-reobf.addExtraSrgFile mixinSrg
-
 // Source compiler configuration
 tasks.withType(JavaCompile) {
-    options.compilerArgs += [ /*'-Xlint:all', '-Xlint:-path', '-Xlint:-processing',*/ "-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinSrg}" ]
+    //options.compilerArgs += [ '-Xlint:all', '-Xlint:-path', '-Xlint:-processing' ]
     //options.deprecation = true
     options.encoding = 'utf8'
 }
@@ -72,15 +63,9 @@ def commonManifest = {
     attributes 'FMLCorePluginContainsFMLMod': 'true'
     attributes 'ForceLoadAsMod': true
     attributes 'FMLAT': 'biomesoplenty_at.cfg'
-    attributes 'TweakClass': "org.spongepowered.asm.launch.MixinTweaker"
-    attributes 'TweakOrder': "10000"
 }
 
 jar {
-    from(project("Mixin").sourceSets.main.output) {
-        exclude 'LICENSE.txt'
-    }
-
     manifest commonManifest
     classifier = 'universal'
 }
@@ -147,7 +132,6 @@ tasks.build.dependsOn('createChangelog')
 
 task sourceJar(type: Jar) {
     from sourceSets.main.allJava
-    from project("Mixin").sourceSets.main.allJava
     from (sourceSets.main.output) {
         include 'LICENSE.txt'
     }
@@ -157,7 +141,6 @@ task sourceJar(type: Jar) {
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
-    from project("Mixin").sourceSets.main.output
 
     manifest commonManifest
     classifier = 'deobf'
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index b2f31891b..000000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include "Mixin"
diff --git a/src/main/java/biomesoplenty/common/asm/BOPLoadingPlugin.java b/src/main/java/biomesoplenty/common/asm/BOPLoadingPlugin.java
index e70c664ed..60300827b 100644
--- a/src/main/java/biomesoplenty/common/asm/BOPLoadingPlugin.java
+++ b/src/main/java/biomesoplenty/common/asm/BOPLoadingPlugin.java
@@ -13,24 +13,15 @@ import java.util.Map;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
 
-import org.spongepowered.asm.launch.MixinBootstrap;
-import org.spongepowered.asm.mixin.MixinEnvironment;
-
 import biomesoplenty.common.asm.transformers.BOPAccessTransformer;
 
 @TransformerExclusions("biomesoplenty.common.asm")
 public class BOPLoadingPlugin implements IFMLLoadingPlugin
 {
-    public BOPLoadingPlugin()
-    {
-        MixinBootstrap.init();
-        MixinEnvironment.getCurrentEnvironment().addConfiguration("mixins.biomesoplenty.json");
-    }
-
     @Override
     public String[] getASMTransformerClass()
     {
-        return new String[] { MixinBootstrap.TRANSFORMER_CLASS };
+        return null;
     }
 
     @Override
diff --git a/src/main/resources/mixins.biomesoplenty.json b/src/main/resources/mixins.biomesoplenty.json
deleted file mode 100644
index ace3d4269..000000000
--- a/src/main/resources/mixins.biomesoplenty.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "package": "biomesoplenty.common.mixin",
-  "mixins": [
-  ]
-}