Added Extra Utils and Forestry support back (jaredlll08#527)

* Added TiC melting

* updated mods and added extrautils2-1.12-1.6.1.jar

* Added ExtraUtils2 Support

* Optimized imports.

* partial forestry support

* finished forestry support

* deleted old reference files

* fixed a few requested things.

* changes to respect class moves to mtlib

build.gradle

@@ -19,7 +19,7 @@ compileJava {
 }
 
 minecraft {
-    version = "1.12-14.21.1.2415"
+    version = "1.12.1-14.22.1.2480"
     runDir = "run"
     mappings = "snapshot_20170624"
     useDepAts = true
@@ -38,24 +38,29 @@ repositories {
     maven {
         url "http://chickenbones.net/maven/"
     }
-
     maven {
         url "http://www.ryanliptak.com/maven/"
     }
     maven {
         url "https://maven.chaosfield.at/"
     }
+
+    maven {
+        url = "http://maven.ic2.player.to/"
+    }
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_1.12:4.7.2.76"
-    deobfCompile "com.blamejared:MTLib:3.0.0.1"
-    deobfCompile "cofh:ThermalExpansion:1.12-5.3.3.15:deobf"
+    deobfCompile "mezz.jei:jei_1.12.1:4.7.+"
+    deobfCompile "com.blamejared:MTLib:3.0.+"
+    deobfCompile ("cofh:ThermalExpansion:1.12-5.3.+:deobf") {
+        exclude group: 'mezz.jei'
+    }
     deobfCompile "betterwithmods:BetterWithMods:1.12-2.0.8-110"
-    deobfCompile "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12-r113"
+    deobfCompile "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.1-r+"
     deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.1.+"
     deobfCompile "slimeknights:TConstruct:1.12-2.7.3.30"
-
+    deobfCompile 'net.sengir.forestry:forestry_1.12.1:5.+'
 }
 
 processResources {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Aug 26 16:46:42 EDT 2017
+#Fri Sep 15 21:40:52 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 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=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@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=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

src/main/java/com/blamejared/ModTweaker.java

@@ -1,15 +1,16 @@
 package com.blamejared;
 
-import com.blamejared.api.annotations.Handler;
-import crafttweaker.*;
-import crafttweaker.mc1120.commands.*;
-import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
-import mezz.jei.JustEnoughItems;
-import net.minecraftforge.fml.common.*;
-import net.minecraftforge.fml.common.event.*;
+import crafttweaker.CraftTweakerAPI;
+import crafttweaker.IAction;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 
 import static com.blamejared.reference.Reference.*;
 

src/main/java/com/blamejared/api/annotations/Handler.java

@@ -1,6 +1,9 @@
 package com.blamejared.api.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

src/main/java/com/blamejared/compat/actuallyaddition/AtomicReconstructor.java

@@ -1,16 +1,20 @@
 package com.blamejared.compat.actuallyaddition;
 
 import com.blamejared.ModTweaker;
-import com.blamejared.api.annotations.*;
-import com.blamejared.mtlib.helpers.*;
-import com.blamejared.mtlib.utils.*;
-import crafttweaker.annotations.*;
+import com.blamejared.mtlib.helpers.InputHelper;
+import com.blamejared.mtlib.helpers.LogHelper;
+import com.blamejared.mtlib.utils.BaseListAddition;
+import com.blamejared.mtlib.utils.BaseListRemoval;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IItemStack;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
-import stanhebben.zenscript.annotations.*;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 
 @ZenClass("mods.actuallyadditions.AtomicReconstructor")
 @ModOnly("actuallyadditions")

src/main/java/com/blamejared/compat/actuallyaddition/BallOfFur.java

@@ -1,16 +1,20 @@
 package com.blamejared.compat.actuallyaddition;
 
 import com.blamejared.ModTweaker;
-import com.blamejared.api.annotations.*;
-import com.blamejared.mtlib.helpers.*;
-import com.blamejared.mtlib.utils.*;
-import crafttweaker.annotations.*;
+import com.blamejared.mtlib.helpers.InputHelper;
+import com.blamejared.mtlib.helpers.LogHelper;
+import com.blamejared.mtlib.utils.BaseListAddition;
+import com.blamejared.mtlib.utils.BaseListRemoval;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IItemStack;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn;
-import stanhebben.zenscript.annotations.*;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 
 @ZenClass("mods.actuallyadditions.BallOfFur")
 @ModOnly("actuallyadditions")

src/main/java/com/blamejared/compat/actuallyaddition/Compost.java

@@ -1,18 +1,22 @@
 package com.blamejared.compat.actuallyaddition;
 
 import com.blamejared.ModTweaker;
-import com.blamejared.api.annotations.*;
-import com.blamejared.mtlib.helpers.*;
-import com.blamejared.mtlib.utils.*;
+import com.blamejared.mtlib.helpers.InputHelper;
+import com.blamejared.mtlib.helpers.LogHelper;
+import com.blamejared.mtlib.utils.BaseListAddition;
+import com.blamejared.mtlib.utils.BaseListRemoval;
 import crafttweaker.CraftTweakerAPI;
-import crafttweaker.annotations.*;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IItemStack;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe;
 import net.minecraft.block.Block;
-import stanhebben.zenscript.annotations.*;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 
 @ZenClass("mods.actuallyadditions.Compost")
 @ModOnly("actuallyadditions")

src/main/java/com/blamejared/compat/actuallyaddition/Crusher.java

@@ -1,17 +1,21 @@
 package com.blamejared.compat.actuallyaddition;
 
 import com.blamejared.ModTweaker;
-import com.blamejared.api.annotations.*;
-import com.blamejared.mtlib.helpers.*;
-import com.blamejared.mtlib.utils.*;
-import crafttweaker.annotations.*;
+import com.blamejared.mtlib.helpers.InputHelper;
+import com.blamejared.mtlib.helpers.LogHelper;
+import com.blamejared.mtlib.utils.BaseListAddition;
+import com.blamejared.mtlib.utils.BaseListRemoval;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IItemStack;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import stanhebben.zenscript.annotations.Optional;
-import stanhebben.zenscript.annotations.*;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 
 @ZenClass("mods.actuallyadditions.Crusher")
 @ModOnly("actuallyadditions")

src/main/java/com/blamejared/compat/actuallyaddition/Empowerer.java

@@ -1,17 +1,21 @@
 package com.blamejared.compat.actuallyaddition;
 
 import com.blamejared.ModTweaker;
-import com.blamejared.api.annotations.*;
-import com.blamejared.mtlib.helpers.*;
-import com.blamejared.mtlib.utils.*;
-import crafttweaker.annotations.*;
+import com.blamejared.mtlib.helpers.InputHelper;
+import com.blamejared.mtlib.helpers.LogHelper;
+import com.blamejared.mtlib.utils.BaseListAddition;
+import com.blamejared.mtlib.utils.BaseListRemoval;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IItemStack;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
 import stanhebben.zenscript.annotations.Optional;
-import stanhebben.zenscript.annotations.*;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 
 @ZenClass("mods.actuallyadditions.Empowerer")
 @ModOnly("actuallyadditions")

src/main/java/com/blamejared/compat/actuallyaddition/TreasureChest.java

@@ -1,16 +1,20 @@
 package com.blamejared.compat.actuallyaddition;
 
 import com.blamejared.ModTweaker;
-import com.blamejared.api.annotations.*;
-import com.blamejared.mtlib.helpers.*;
-import com.blamejared.mtlib.utils.*;
-import crafttweaker.annotations.*;
+import com.blamejared.mtlib.helpers.InputHelper;
+import com.blamejared.mtlib.helpers.LogHelper;
+import com.blamejared.mtlib.utils.BaseListAddition;
+import com.blamejared.mtlib.utils.BaseListRemoval;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IItemStack;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot;
-import stanhebben.zenscript.annotations.*;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 
 @ZenClass("mods.actuallyadditions.TreasureChest")
 @ModOnly("actuallyadditions")

src/main/java/com/blamejared/compat/betterwithmods/Anvil.java

@@ -5,11 +5,11 @@
 import betterwithmods.common.registry.anvil.ShapedAnvilRecipe;
 import betterwithmods.common.registry.anvil.ShapelessAnvilRecipe;
 import betterwithmods.module.gameplay.AnvilRecipes;
-import com.blamejared.api.annotations.Handler;
 import com.blamejared.mtlib.helpers.InputHelper;
 import com.blamejared.mtlib.utils.BaseUndoable;
 import crafttweaker.CraftTweakerAPI;
-import crafttweaker.annotations.*;
+import crafttweaker.annotations.ModOnly;
+import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IIngredient;
 import crafttweaker.api.item.IItemStack;
 import net.minecraft.item.crafting.IRecipe;
@@ -18,9 +18,7 @@
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 
 @ZenClass("mods.betterwithmods.Anvil")