1.11.2-1.0

WanionCane · Apr 24, 2017 · 42643aa · 42643aa
1 parent 217fbb1
commit 42643aa
Show file tree

Hide file tree

Showing 72 changed files with 40 additions and 1,474 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,11 +8,11 @@ buildscript {
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
-//Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup.
+//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.10.2-2.8"
-group= "wanion.unidict" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+version = "1.11.2-1.0"
+group = "wanion.unidict" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "UniDict"
 
 sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
@@ -21,15 +21,15 @@ compileJava {
 }
 
 minecraft {
-    version = "1.10.2-12.18.3.2254"
+    version = "1.11.2-13.20.0.2282"
     runDir = "run"
-
+    
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not allways work.
+    // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20161111"
+    mappings = "snapshot_20161220"
     makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
@@ -57,8 +57,7 @@ dependencies {
 
 }
 
-processResources
-{
+processResources {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
@@ -71,7 +70,7 @@ processResources
         expand 'version':project.version, 'mcversion':project.minecraft.version
     }
 
-    // copy everything else, thats not the mcmod.info
+    // copy everything else except the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,3 @@
+# 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
diff --git a/gradlew.bat b/gradlew.bat
@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Xmx3072m -XX:+HeapDumpOnOutOfMemoryError
+set DEFAULT_JVM_OPTS=
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.

diff --git a/libs/AbyssalCraft-1.10.2-1.9.3.10.jar → libs/AbyssalCraft-1.11.2-1.9.4-pre-2.jar b/libs/AbyssalCraft-1.10.2-1.9.3.10.jar → libs/AbyssalCraft-1.11.2-1.9.4-pre-2.jar
diff --git a/libs/Advanced Solar Panels-4.0.4-dev.jar b/libs/Advanced Solar Panels-4.0.4-dev.jar
diff --git a/libs/AdvancedRocketry-1.10.2-1.0.13.jar b/libs/AdvancedRocketry-1.10.2-1.0.13.jar
diff --git a/libs/BaseMetals_1.10.2-2.4.0.11.jar b/libs/BaseMetals_1.10.2-2.4.0.11.jar
diff --git a/libs/BloodMagic-1.10.2-2.1.7-76.jar → libs/BloodMagic-1.11-2.1.9-78.jar b/libs/BloodMagic-1.10.2-2.1.7-76.jar → libs/BloodMagic-1.11-2.1.9-78.jar
diff --git a/libs/Calculator-1.10.2-3.2.0.jar b/libs/Calculator-1.10.2-3.2.0.jar
diff --git a/libs/CoFHCore-1.10.2-4.1.0.155-universal.jar b/libs/CoFHCore-1.10.2-4.1.0.155-universal.jar
diff --git a/libs/CodeChickenLib-1.10.2-2.5.6.233-deobf.jar b/libs/CodeChickenLib-1.10.2-2.5.6.233-deobf.jar
diff --git a/libs/EnderCore-1.10.2-0.4.1.65-beta.jar b/libs/EnderCore-1.10.2-0.4.1.65-beta.jar
diff --git a/libs/EnderIO-1.10.2-3.1.156.jar b/libs/EnderIO-1.10.2-3.1.156.jar
diff --git a/libs/Foundry-1.10.2-2.2.2.0.jar b/libs/Foundry-1.10.2-2.2.2.0.jar
diff --git a/libs/Guide-API-1.10.2-2.0.3-46.jar b/libs/Guide-API-1.10.2-2.0.3-46.jar
diff --git a/libs/Guide-API-1.11-2.1.0-51.jar b/libs/Guide-API-1.11-2.1.0-51.jar
diff --git a/libs/ImmersiveEngineering-0.10-57-deobf.jar b/libs/ImmersiveEngineering-0.10-57-deobf.jar
diff --git a/libs/LibVulpes-1.10.2-0.1.16-universal.jar b/libs/LibVulpes-1.10.2-0.1.16-universal.jar
diff --git a/libs/MCMultiPart-1.4.0-deobf.jar b/libs/MCMultiPart-1.4.0-deobf.jar
diff --git a/libs/Mantle-1.10.2-1.1.5.jar b/libs/Mantle-1.10.2-1.1.5.jar
diff --git a/libs/Mekanism-1.10.2-9.2.1.300.jar b/libs/Mekanism-1.10.2-9.2.1.300.jar
diff --git a/libs/MoreChickens-1.10.2-1.0.11.jar b/libs/MoreChickens-1.10.2-1.0.11.jar
diff --git a/libs/OreSpawn_1.10.2-1.1.0.jar b/libs/OreSpawn_1.10.2-1.1.0.jar
diff --git a/libs/Railcraft_1.10.2-10.0.1.jar b/libs/Railcraft_1.10.2-10.0.1.jar
diff --git a/libs/RebornCore-1.10.2-2.13.5.136-dev.jar → libs/RebornCore-1.11.2-2.14.2.96-dev.jar b/libs/RebornCore-1.10.2-2.13.5.136-dev.jar → libs/RebornCore-1.11.2-2.14.2.96-dev.jar
diff --git a/libs/SonarCore-1.10.2-3.2.6.jar → libs/SonarCore-1.11.2-4.0.0.jar b/libs/SonarCore-1.10.2-3.2.6.jar → libs/SonarCore-1.11.2-4.0.0.jar
diff --git a/libs/Substratum-1.10.2-1.8.2.1.jar b/libs/Substratum-1.10.2-1.8.2.1.jar
diff --git a/libs/Substratum-1.11.2-1.9.2.0.jar b/libs/Substratum-1.11.2-1.9.2.0.jar
diff --git a/libs/TConstruct-1.10.2-2.6.3.jar b/libs/TConstruct-1.10.2-2.6.3.jar
diff --git a/libs/TechReborn-1.10.2-2.1.10.207-dev.jar → libs/TechReborn-1.11.2-2.2.1.142-dev.jar b/libs/TechReborn-1.10.2-2.1.10.207-dev.jar → libs/TechReborn-1.11.2-2.2.1.142-dev.jar
diff --git a/libs/ThermalExpansion-1.10.2-5.0.3.86-universal.jar b/libs/ThermalExpansion-1.10.2-5.0.3.86-universal.jar
diff --git a/libs/ThermalFoundation-1.10.2-2.0.3.77-universal.jar b/libs/ThermalFoundation-1.10.2-2.0.3.77-universal.jar
diff --git a/libs/WanionLib-1.10.2-1.3-dev.jar → libs/WanionLib-1.11.2-1.0-dev.jar b/libs/WanionLib-1.10.2-1.3-dev.jar → libs/WanionLib-1.11.2-1.0-dev.jar
diff --git a/libs/WaterPower-1.10.2-0.4.6.jar b/libs/WaterPower-1.10.2-0.4.6.jar
diff --git a/libs/appliedenergistics2-rv4-alpha-11.jar b/libs/appliedenergistics2-rv4-alpha-11.jar
diff --git a/libs/chickens-4.3.2.jar b/libs/chickens-4.3.2.jar
diff --git a/libs/embers-0.104.jar b/libs/embers-0.104.jar
diff --git a/libs/embers-0.206.jar b/libs/embers-0.206.jar
diff --git a/libs/forestry_1.10.2-5.2.17.368.jar b/libs/forestry_1.10.2-5.2.17.368.jar
diff --git a/libs/industrialcraft-2-2.6.173-ex110-dev.jar → libs/industrialcraft-2-2.7.12-ex111-dev.jar b/libs/industrialcraft-2-2.6.173-ex110-dev.jar → libs/industrialcraft-2-2.7.12-ex111-dev.jar
diff --git a/libs/jei_1.10.2-3.14.7.416.jar b/libs/jei_1.10.2-3.14.7.416.jar
diff --git a/libs/jei_1.11.2-4.3.3.266.jar b/libs/jei_1.11.2-4.3.3.266.jar
diff --git a/libs/modularmachines_1.10.2-1.7.0.169-deobf.jar b/libs/modularmachines_1.10.2-1.7.0.169-deobf.jar
diff --git a/libs/refinedstorage-1.2.24.jar b/libs/refinedstorage-1.2.24.jar
diff --git a/libs/refinedstorage-1.4.3.jar b/libs/refinedstorage-1.4.3.jar
diff --git a/src/main/java/wanion/unidict/Config.java b/src/main/java/wanion/unidict/Config.java
@@ -38,8 +38,8 @@ public final class Config implements UniDict.IDependency
 	public final boolean unifiedEntriesDump;
 	// input replacement
 	public final boolean inputReplacementFurnace;
-	public final boolean inputReplacementIC2;
-	public final boolean inputReplacementMekanism;
+	//public final boolean inputReplacementIC2;
+	//public final boolean inputReplacementMekanism;
 	// resource related stuff
 	public final boolean enableSpecificKindSort;
 	public final boolean enableSpecificEntrySort;
@@ -82,8 +82,8 @@ private Config()
 			unifiedEntriesDump = config.getBoolean("unifiedEntriesDump", "dump", false, "Enable this to keep track of all the unificated entries.\nthe output file will be saved on \"config\\unidict\\dump\" folder.\nonce the file is generated, you must delete it to re-generate.");
 			// input replacement
 			inputReplacementFurnace = config.getBoolean("furnace", "inputReplacement", false, "Enabling this will remove all non-standard items as input of the Furnace.");
-			inputReplacementIC2 = config.getBoolean("ic2", "inputReplacement", false, "Enabling this will remove all non-standard items as input of IC2 Machine Recipes.\nNote: this will only affect recipes that doesn't uses OreDictionary.");
-			inputReplacementMekanism = config.getBoolean("mekanism", "inputReplacement", false, "Enabling this will remove all non-standard items as input of Mekanism Machine Recipes.");
+			//inputReplacementIC2 = config.getBoolean("ic2", "inputReplacement", false, "Enabling this will remove all non-standard items as input of IC2 Machine Recipes.\nNote: this will only affect recipes that doesn't uses OreDictionary.");
+			//inputReplacementMekanism = config.getBoolean("mekanism", "inputReplacement", false, "Enabling this will remove all non-standard items as input of Mekanism Machine Recipes.");
 			// resource related stuff
 			enableSpecificKindSort = config.getBoolean("enableSpecificKindSort", resources, false, "enabling this allow you to specify the \"owner\" of each kind.\nit also will make \"S:ownerOfEveryThing\" be ignored for this kind.");
 			enableSpecificEntrySort = config.getBoolean("enableSpecificEntrySort", resources, false, "enabling this allow you to specify the \"owner\" of each entry.\nit also will make \"S:ownerOfEveryThing\" be ignored for this entry.");

diff --git a/src/main/java/wanion/unidict/UniJEIPlugin.java b/src/main/java/wanion/unidict/UniJEIPlugin.java
@@ -9,6 +9,7 @@
  */
 
 import mezz.jei.api.*;
+import mezz.jei.api.ingredients.IIngredientBlacklist;
 import mezz.jei.api.ingredients.IModIngredientRegistration;
 import net.minecraft.item.ItemStack;
 
@@ -36,8 +37,8 @@ public void registerIngredients(@Nonnull final IModIngredientRegistration iModIn
 	@Override
 	public void register(@Nonnull final IModRegistry iModRegistry)
 	{
-		final IItemBlacklist itemBlackList = iModRegistry.getJeiHelpers().getItemBlacklist();
-		stacksToHideList.forEach(itemBlackList::addItemToBlacklist);
+		final IIngredientBlacklist iIngredientBlacklist = iModRegistry.getJeiHelpers().getIngredientBlacklist();
+		stacksToHideList.forEach(iIngredientBlacklist::addIngredientToBlacklist);
 	}
 
 	@Override

diff --git a/src/main/java/wanion/unidict/api/helper/FoundryUniHelper.java b/src/main/java/wanion/unidict/api/helper/FoundryUniHelper.java
diff --git a/src/main/java/wanion/unidict/api/helper/TConUniHelper.java b/src/main/java/wanion/unidict/api/helper/TConUniHelper.java
diff --git a/src/main/java/wanion/unidict/common/Reference.java b/src/main/java/wanion/unidict/common/Reference.java
@@ -14,10 +14,10 @@ public final class Reference
 {
 	public static final String MOD_ID = "unidict";
 	public static final String MOD_NAME = "UniDict";
-	public static final String MOD_VERSION = "1.10.2-2.8";
-	public static final String DEPENDENCIES = "required-after:wanionlib@[1.10.2-1.3,);after:*";
+	public static final String MOD_VERSION = "1.11.2-1.0";
+	public static final String DEPENDENCIES = "required-after:wanionlib@[1.11.2-1.0,);after:*";
 	public static final char SLASH = separatorChar;
-	public static final String MC_VERSION = "[1.10.2]";
+	public static final String MC_VERSION = "[1.11.2]";
 
 	private Reference() {}
 }
diff --git a/src/main/java/wanion/unidict/integration/AE2Integration.java b/src/main/java/wanion/unidict/integration/AE2Integration.java
diff --git a/src/main/java/wanion/unidict/integration/AdvancedRocketryIntegration.java b/src/main/java/wanion/unidict/integration/AdvancedRocketryIntegration.java