Commit 5cfb96a9 authored by primetoxinz's avatar primetoxinz

wtf deobfCompile, why don't you work?

Fix ModuleLoader issue.
parent 29b903b1
......@@ -8,20 +8,18 @@ buildscript {
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
version = "1.2.29-1.11.2"
group = "betterwithmods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
group = "betterwithmods"
archivesBaseName = "Better With Mods"
sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
sourceCompatibility = targetCompatibility = "1.8"
compileJava {
sourceCompatibility = targetCompatibility = "1.8"
}
minecraft {
version = "1.11.2-13.20.0.2282"
version = "1.11.2-13.20.0.2315"
runDir = "run"
mappings = "snapshot_20170612"
replace "%VERSION%":"${project.version}"
......@@ -31,29 +29,19 @@ repositories {
maven { url 'http://dvs1.progwml6.com/files/maven' }
maven { url "http://blamejared.com/maven" }
maven { url "http://maven.amadornes.com/" }
repositories {//Need for IE
//TODO remove this once IC2's build server is back online
maven {
name = "CurseForge"
url = "https://minecraft.curseforge.com/api/maven/"
}
}
maven { url "http://www.ryanliptak.com/maven/" }
}
dependencies {
deobfCompile "mezz.jei:jei_1.11.2:+"
//All have old MCP Mappings, causing issues in environment
deobfCompile "slimeknights.mantle:Mantle:1.11.2+"
deobfCompile "slimeknights:TConstruct:1.11.2+"
deobfCompile "slimeknights.mantle:Mantle:1.11.2-1.+"
deobfCompile "slimeknights:TConstruct:1.11.2-2.+"
deobfCompile "MineTweaker3:MineTweaker3-API:3.0.25.103"
deobfCompile "com.blamejared:MTLib:2.+"
deobfCompile "blusunrize:ImmersiveEngineering:0.11-63-145"
// deobfCompile "MCMultiPart2:MCMultiPart:2.0.1"
runtime "applecore:AppleCore:1.11.2-2.2.0:deobf"
deobfCompile "blusunrize:ImmersiveEngineering:0.11-63-147"
deobfCompile "MCMultiPart2:MCMultiPart:2.0.1"
deobfCompile "applecore:AppleCore:1.11.2-2.2.0:api"
files("libs/*")
// runtime "applecore:AppleCore:1.11.2-2.2.0:deobf"
// files("libs/*")
}
jar {
......@@ -72,19 +60,12 @@ artifacts {
}
processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
expand 'version': project.version, 'mcversion': project.minecraft.version
}
// copy everything else except the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
......
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
#Mon Oct 24 23:29:23 CEST 2016
#Fri Jun 23 14:35:45 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
......@@ -163,7 +163,9 @@ public final class ModuleLoader {
}
public static boolean isFeatureEnabled(Class<? extends Feature> clazz) {
return featureInstances.get(clazz).enabled;
if(featureInstances.containsKey(clazz))
return featureInstances.get(clazz).enabled;
return false;
}
public static void forEachModule(Consumer<Module> consumer) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment