Skip to content

Commit

Permalink
Removed Mixin. Closes #421, #422
Browse files Browse the repository at this point in the history
  • Loading branch information
Adubbz committed Mar 8, 2015
1 parent fb55340 commit bb7a5d1
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 38 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,3 +0,0 @@
[submodule "Mixin"]
path = Mixin
url = https://github.com/SpongePowered/Mixin.git
1 change: 0 additions & 1 deletion Mixin
Submodule Mixin deleted from 029485
19 changes: 1 addition & 18 deletions build.gradle
Expand Up @@ -15,8 +15,6 @@ buildscript {
}
}

evaluationDependsOn('Mixin')

apply plugin: "forge"
apply plugin: "curseforge"

Expand Down Expand Up @@ -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'
}
Expand All @@ -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'
}
Expand Down Expand Up @@ -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'
}
Expand All @@ -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'
Expand Down
1 change: 0 additions & 1 deletion settings.gradle

This file was deleted.

11 changes: 1 addition & 10 deletions src/main/java/biomesoplenty/common/asm/BOPLoadingPlugin.java
Expand Up @@ -13,24 +13,15 @@
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
Expand Down
5 changes: 0 additions & 5 deletions src/main/resources/mixins.biomesoplenty.json

This file was deleted.

0 comments on commit bb7a5d1

Please sign in to comment.