diff --git a/build.gradle b/build.gradle index ce61294..615a3dd 100644 --- a/build.gradle +++ b/build.gradle @@ -10,24 +10,26 @@ buildscript { name = "forge" url = "http://files.minecraftforge.net/maven" } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } } dependencies { classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -configurations { - shade - compile.extendsFrom shade + +repositories { + mavenCentral() + jcenter() + maven { + name = "shadowfacts" + url = "https://maven.shadowfacts.net/" + } } + dependencies { - shade "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - shade "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + compileOnly "net.shadowfacts:Forgelin:$forgelin_version" } + minecraft { version = mc_version + "-" + forge_version mappings = mcp_mappings @@ -35,35 +37,27 @@ minecraft { } processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } + from(sourceSets.main.resources) { exclude 'mcmod.info' } + from(sourceSets.main.resources) { include 'mcmod.info' expand 'version':version, 'mcversion':minecraft.version } into "${buildDir}/classes/main" } +def manifestCfg = { + attributes "FMLCorePlugin": "mods.betterfoliage.loader.BetterFoliageLoader" + attributes "FMLCorePluginContainsFMLMod": "mods.betterfoliage.BetterFoliageMod" + attributes "FMLAT": "BetterFoliage_at.cfg" +} + jar { - manifest { - attributes "FMLCorePlugin": "mods.betterfoliage.loader.BetterFoliageLoader" - attributes "FMLCorePluginContainsFMLMod": "mods.betterfoliage.BetterFoliageMod" - attributes "FMLAT": "BetterFoliage_at.cfg" - } - configurations.shade.each { dep -> - from(project.zipTree(dep)){ - exclude 'META-INF', 'META-INF/**' - } - } + manifest manifestCfg exclude "optifine" } -repositories { - mavenCentral() +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + manifest manifestCfg + from(sourceSets.main.kotlin) + from(sourceSets.main.resources) { exclude 'mcmod.info' } + from(sourceSets.main.resources) { include 'mcmod.info' expand 'version':version, 'mcversion':minecraft.version } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 25361f7..8058d96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,5 @@ mc_version = 1.10.2 forge_version = 12.18.3.2185 mcp_mappings = stable_29 -kotlin_version = 1.2.0 \ No newline at end of file +kotlin_version = 1.2.0 +forgelin_version = 1.6.0 \ No newline at end of file diff --git a/src/main/java/mods/betterfoliage/loader/BetterFoliageLoader.java b/src/main/java/mods/betterfoliage/loader/BetterFoliageLoader.java new file mode 100644 index 0000000..e35e8ae --- /dev/null +++ b/src/main/java/mods/betterfoliage/loader/BetterFoliageLoader.java @@ -0,0 +1,38 @@ +package mods.betterfoliage.loader; + +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; + +import java.util.Map; + +@IFMLLoadingPlugin.TransformerExclusions({ + "mods.betterfoliage.loader", + "mods.octarinecore.metaprog", + "kotlin" +}) +@IFMLLoadingPlugin.MCVersion("1.10.2") +@IFMLLoadingPlugin.SortingIndex(1400) +public class BetterFoliageLoader implements IFMLLoadingPlugin { + @Override + public String[] getASMTransformerClass() { + return new String[] { "mods.betterfoliage.loader.BetterFoliageTransformer" }; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) { + } + + @Override + public String getAccessTransformerClass() { + return null; + } +} diff --git a/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt b/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt index 1f07907..1f3df37 100644 --- a/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt +++ b/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt @@ -7,16 +7,6 @@ import net.minecraftforge.fml.relauncher.FMLLaunchHandler import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin import org.objectweb.asm.Opcodes.* -@IFMLLoadingPlugin.TransformerExclusions( - "mods.betterfoliage.loader", - "mods.octarinecore.metaprog", - "kotlin", - "mods.octarinecore.kotlin" -) -@IFMLLoadingPlugin.MCVersion("1.10.2") -@IFMLLoadingPlugin.SortingIndex(1400) -class BetterFoliageLoader : ASMPlugin(BetterFoliageTransformer::class.java) - class BetterFoliageTransformer : Transformer() { val isOptifinePresent = allAvailable(Refs.OptifineClassTransformer)