Skip to content

Commit

Permalink
Now using LibLoader instead of bundling our dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
LunNova committed May 12, 2017
1 parent a51f51f commit 3bc1361
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 24 deletions.
33 changes: 14 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@ buildscript {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "nallar"
url = "https://repo.nallar.me/"
}
}
configurations.all {
resolutionStrategy.cacheChangingModulesFor 10, 'seconds'
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
classpath 'me.nallar.libloader:LibLoaderGradle:0.1-SNAPSHOT'
}
}
apply plugin: 'me.nallar.libloader.LibLoaderGradle'
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'idea'

configurations {
bundledLibs
bundledAsFile
compile {
extendsFrom bundledLibs
}
}

ext.mcVersion = "1.11.2"
ext.runMcVersion = "1.11.2"
ext.forgeVersion = "13.20.0.2216"
Expand Down Expand Up @@ -49,11 +50,10 @@ configurations.all {
}

dependencies {
bundledLibs 'org.codehaus.jackson:jackson-core-lgpl:1.9.13'
bundledLibs 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.13'
bundledLibs "me.nallar:ModPatcher:$mcVersion-SNAPSHOT:api"
bundledAsFile "me.nallar:ModPatcher:$mcVersion-SNAPSHOT:lib"
compile 'org.projectlombok:lombok:1.16.16'
libLoader 'org.codehaus.jackson:jackson-core-lgpl:1.9.13'
libLoader 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.13'
libLoader "me.nallar:ModPatcher:$mcVersion-SNAPSHOT"
compileOnly 'org.projectlombok:lombok:1.16.16'
}

tasks.withType(JavaCompile) {
Expand Down Expand Up @@ -88,16 +88,11 @@ processResources {
}

jar {
from(configurations.bundledLibs.collect { it.isDirectory() ? it : zipTree(it) }) {
exclude "META-INF/**"
}
from(configurations.bundledAsFile.collect { it })

manifest.mainAttributes("FMLCorePlugin": "nallar.tickprofiler.minecraft.CoreMod", "FMLCorePluginContainsFMLMod": "YasPlease")
}

wrapper {
gradleVersion = "3.3"
gradleVersion = "3.5"
def jvmOpts = "-Xmx2G"
inputs.property("jvmOpts", jvmOpts)
doLast {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jan 16 15:08:02 GMT 2017
#Fri May 12 22:30:15 BST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
6 changes: 3 additions & 3 deletions src/main/java/nallar/tickprofiler/minecraft/CoreMod.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package nallar.tickprofiler.minecraft;

import me.nallar.libloader.LibLoader;
import me.nallar.modpatcher.api.ModPatcher;
import nallar.tickprofiler.Log;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;

import java.util.*;


@IFMLLoadingPlugin.MCVersion("@MC_VERSION@")
@IFMLLoadingPlugin.SortingIndex(1001)
@IFMLLoadingPlugin.SortingIndex(-1)
public class CoreMod implements IFMLLoadingPlugin {
static {
ModPatcher.requireVersion(CoreMod.class.getResource("/ModPatcher-1.11.2-SNAPSHOT-lib.jar"));
LibLoader.init();
}

@Override
Expand Down

0 comments on commit 3bc1361

Please sign in to comment.