Removed Mixin. Closes #421, #422

This commit is contained in:
Adubbz 2015-03-08 14:59:07 +11:00
parent fb55340562
commit bb7a5d11f5
6 changed files with 2 additions and 38 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "Mixin"]
path = Mixin
url = https://github.com/SpongePowered/Mixin.git

1
Mixin

@ -1 +0,0 @@
Subproject commit 02948566fd1a55b7dcea011b82e907694250d058

View File

@ -15,8 +15,6 @@ buildscript {
} }
} }
evaluationDependsOn('Mixin')
apply plugin: "forge" apply plugin: "forge"
apply plugin: "curseforge" apply plugin: "curseforge"
@ -49,20 +47,13 @@ minecraft {
// add some stuff to the version // add some stuff to the version
version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}" version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}"
dependencies {
compile project('Mixin')
}
jenkins { jenkins {
job = 'BiomesOPlenty' job = 'BiomesOPlenty'
} }
def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + 'mixins.srg'
reobf.addExtraSrgFile mixinSrg
// Source compiler configuration // Source compiler configuration
tasks.withType(JavaCompile) { 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.deprecation = true
options.encoding = 'utf8' options.encoding = 'utf8'
} }
@ -72,15 +63,9 @@ def commonManifest = {
attributes 'FMLCorePluginContainsFMLMod': 'true' attributes 'FMLCorePluginContainsFMLMod': 'true'
attributes 'ForceLoadAsMod': true attributes 'ForceLoadAsMod': true
attributes 'FMLAT': 'biomesoplenty_at.cfg' attributes 'FMLAT': 'biomesoplenty_at.cfg'
attributes 'TweakClass': "org.spongepowered.asm.launch.MixinTweaker"
attributes 'TweakOrder': "10000"
} }
jar { jar {
from(project("Mixin").sourceSets.main.output) {
exclude 'LICENSE.txt'
}
manifest commonManifest manifest commonManifest
classifier = 'universal' classifier = 'universal'
} }
@ -147,7 +132,6 @@ tasks.build.dependsOn('createChangelog')
task sourceJar(type: Jar) { task sourceJar(type: Jar) {
from sourceSets.main.allJava from sourceSets.main.allJava
from project("Mixin").sourceSets.main.allJava
from (sourceSets.main.output) { from (sourceSets.main.output) {
include 'LICENSE.txt' include 'LICENSE.txt'
} }
@ -157,7 +141,6 @@ task sourceJar(type: Jar) {
task deobfJar(type: Jar) { task deobfJar(type: Jar) {
from sourceSets.main.output from sourceSets.main.output
from project("Mixin").sourceSets.main.output
manifest commonManifest manifest commonManifest
classifier = 'deobf' classifier = 'deobf'

View File

@ -1 +0,0 @@
include "Mixin"

View File

@ -13,24 +13,15 @@ import java.util.Map;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; 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; import biomesoplenty.common.asm.transformers.BOPAccessTransformer;
@TransformerExclusions("biomesoplenty.common.asm") @TransformerExclusions("biomesoplenty.common.asm")
public class BOPLoadingPlugin implements IFMLLoadingPlugin public class BOPLoadingPlugin implements IFMLLoadingPlugin
{ {
public BOPLoadingPlugin()
{
MixinBootstrap.init();
MixinEnvironment.getCurrentEnvironment().addConfiguration("mixins.biomesoplenty.json");
}
@Override @Override
public String[] getASMTransformerClass() public String[] getASMTransformerClass()
{ {
return new String[] { MixinBootstrap.TRANSFORMER_CLASS }; return null;
} }
@Override @Override

View File

@ -1,5 +0,0 @@
{
"package": "biomesoplenty.common.mixin",
"mixins": [
]
}