Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13

The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
This commit is contained in:
modmuss50 2018-07-19 10:48:30 +01:00
parent 4ea0dc1e9a
commit b65e963f12
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
119 changed files with 975 additions and 1146 deletions

15
ModCompatibility/.gitignore vendored Normal file
View file

@ -0,0 +1,15 @@
/bin
/out
/run/*
/build
/eclipse
/.gradle
*.iml
*.ipr
*.iws
/.metadata
/.settings
/classpath
.idea/*
/logs/
/classes/

View file

@ -0,0 +1,153 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven'
apply plugin: 'maven-publish'
sourceCompatibility = 1.8
targetCompatibility = 1.8
repositories {
maven {
name = "Modmuss50"
url = "http://maven.modmuss50.me/"
}
maven {
// JEI, TiC
name "TiC"
url "http://dvs1.progwml6.com/files/maven"
}
maven {
name = "Amadornes"
url "http://maven.amadornes.com/"
}
maven {
// CraftTweaker2
name "Jared"
url "http://maven.blamejared.com/"
}
maven {
// TheOneProbe
url "http://maven.tterrag.com/"
}
maven {
// IC2
name = "ic2"
url = "http://maven.ic2.player.to/"
}
maven {
// HWYLA
name "TehNut"
url "http://tehnut.info/maven/"
}
maven {
name 'CB Repo'
url "http://chickenbones.net/maven/"
}
maven {
// CoFH
name 'Covers'
url "http://maven.covers1624.net/"
}
ivy {
name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision].[ext]"
}
maven {
name "OpenComputer"
url "http://maven.cil.li/"
}
}
version = "2.16.0"
def ENV = System.getenv()
if (ENV.BUILD_NUMBER) {
version = version + "." + "${System.getenv().BUILD_NUMBER}"
}
minecraft {
version = "1.12.2-14.23.4.2705"
mappings = "snapshot_20171003"
replace "@MODVERSION@", project.version
useDepAts = true
runDir = "run"
}
group = 'TechRebornModCompatibility'
dependencies {
//Some dep we use wants the older jei, so this ingores it. We grab the latest anyway, so it shoudnt cause any issues.
def withoutOldJEI = { exclude module: 'jei_1.12.2' }
deobfCompile('RebornCore:RebornCore-1.12.2:+:universal') {
transitive = false
}
compile "mcp.mobius.waila:Hwyla:+"
compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.12.323"
compile name: 'buildcraft', version: '7.99.17', ext: 'jar'
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.19-11"
deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.+'
deobfCompile 'cofh:ThermalDynamics:1.12.2-2.5+:universal'
deobfCompile 'cofh:ThermalExpansion:1.12.2-5.5+:universal'
deobfCompile 'MCMultiPart2:MCMultiPart:2.4.1'
deobfCompile "li.cil.oc:OpenComputers:MC1.12.2-1.7.2+"
deobfCompile "blusunrize:ImmersiveEngineering:0.12-+:deobf"
}
task deobfJar(type: Jar) {
from sourceSets.main.output
exclude "**/*.psd"
classifier = 'dev'
}
jar {
exclude "**/*.psd"
classifier = 'universal'
}
build.dependsOn deobfJar
task signJar(type: SignJar, dependsOn: reobfJar) {
onlyIf {
project.hasProperty('keyStore')
}
if (project.hasProperty('keyStore')) {
keyStore = project.keyStore
alias = project.keyStoreAlias
storePass = project.keyStorePass
keyPass = project.keyStoreKeyPass
inputFile = jar.archivePath
outputFile = jar.archivePath
}
}
build.dependsOn signJar
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'

Binary file not shown.

View file

@ -0,0 +1,6 @@
#Mon Feb 19 13:23:28 GMT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

172
ModCompatibility/gradlew vendored Normal file
View file

@ -0,0 +1,172 @@
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# 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"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
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
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
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`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

84
ModCompatibility/gradlew.bat vendored Normal file
View file

@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
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
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

View file

@ -0,0 +1 @@
rootProject.name = "TechRebornModCompatibility-1.12.2"

View file

@ -0,0 +1,44 @@
package techreborn.compat;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.compat.CompatManager;
import techreborn.compat.compat.ICompatModule;
@Mod(modid = "techrebornmodcompatibility")
public class TRModCompat {
@Mod.EventHandler
public void preinit(FMLPreInitializationEvent event){
CompatManager.isIC2Loaded = Loader.isModLoaded("ic2");
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.preInit(event);
}
}
@Mod.EventHandler
public void init(FMLInitializationEvent event){
// Compat
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.init(event);
}
}
@Mod.EventHandler
public void postinit(FMLPostInitializationEvent event){
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.postInit(event);
}
}
@Mod.EventHandler
public void serverStarting(FMLServerStartingEvent event){
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.serverStarting(event);
}
}
}

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat;
package techreborn.compat.compat;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat;
package techreborn.compat.compat;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
@ -32,15 +32,15 @@ import net.minecraftforge.fml.relauncher.Side;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.registration.impl.ConfigRegistryFactory;
import techreborn.compat.buildcraft.BuildcraftBuildersCompat;
import techreborn.compat.buildcraft.BuildcraftCompat;
import techreborn.compat.crafttweaker.CraftTweakerCompat;
import techreborn.compat.ic2.RecipesIC2;
import techreborn.compat.immersiveengineering.RecipeImmersiveEngineering;
import techreborn.compat.opencomputers.CompatOpenComputers;
import techreborn.compat.theoneprobe.TheOneProbeCompat;
import techreborn.compat.thermalexpansion.RecipeThermalExpansion;
import techreborn.compat.tinkers.CompatModuleTinkers;
import techreborn.compat.compat.buildcraft.BuildcraftBuildersCompat;
import techreborn.compat.compat.buildcraft.BuildcraftCompat;
import techreborn.compat.compat.crafttweaker.CraftTweakerCompat;
import techreborn.compat.compat.ic2.RecipesIC2;
import techreborn.compat.compat.immersiveengineering.RecipeImmersiveEngineering;
import techreborn.compat.compat.opencomputers.CompatOpenComputers;
import techreborn.compat.compat.theoneprobe.TheOneProbeCompat;
import techreborn.compat.compat.thermalexpansion.RecipeThermalExpansion;
import techreborn.compat.compat.tinkers.CompatModuleTinkers;
import techreborn.lib.ModInfo;
import java.lang.annotation.Annotation;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat;
package techreborn.compat.compat;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.buildcraft;
package techreborn.compat.compat.buildcraft;
import buildcraft.builders.BCBuildersBlocks;
import net.minecraft.item.ItemStack;
@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import reborncore.common.util.RebornCraftingHelper;
import reborncore.common.util.RecipeRemover;
import techreborn.Core;
import techreborn.compat.CompatConfigs;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.CompatConfigs;
import techreborn.compat.compat.ICompatModule;
import techreborn.init.ModItems;
/**

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.buildcraft;
package techreborn.compat.compat.buildcraft;
import buildcraft.api.fuels.IFuel;
import buildcraft.lib.fluid.FuelRegistry;
@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import reborncore.common.RebornCoreConfig;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.compat.CompatConfigs;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.CompatConfigs;
import techreborn.compat.compat.ICompatModule;
/**
* Created by Mark on 02/06/2017.

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.api.liquid.ILiquidStack;
import stanhebben.zenscript.annotations.ZenClass;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import java.util.Optional;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.IAction;
@ -34,7 +34,7 @@ import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import techreborn.api.Reference;
import techreborn.api.recipe.machines.ScrapboxRecipe;
import techreborn.compat.crafttweaker.CTGeneric.Remove;
import techreborn.compat.compat.crafttweaker.CTGeneric.Remove;
/**
* Created by Mark on 02/06/2017.

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.api.item.IIngredient;
@ -37,7 +37,7 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
import static crafttweaker.api.minecraft.CraftTweakerMC.getItemStack;
import static crafttweaker.api.minecraft.CraftTweakerMC.getLiquidStack;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.crafttweaker;
package techreborn.compat.compat.crafttweaker;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.ic2;
package techreborn.compat.compat.ic2;
import ic2.api.item.IC2Items;
import ic2.core.ref.ItemName;
@ -41,7 +41,7 @@ import reborncore.common.util.RebornCraftingHelper;
import techreborn.api.recipe.machines.CompressorRecipe;
import techreborn.api.recipe.machines.ExtractorRecipe;
import techreborn.api.recipe.machines.GrinderRecipe;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
import techreborn.init.ModBlocks;
import techreborn.init.ModItems;
import techreborn.init.recipes.RecipeMethods;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.immersiveengineering;
package techreborn.compat.compat.immersiveengineering;
import blusunrize.immersiveengineering.common.IEContent;
@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
public class RecipeImmersiveEngineering implements ICompatModule {
@Override

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei;
package techreborn.compat.compat.jei;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei;
package techreborn.compat.compat.jei;
import mezz.jei.api.recipe.transfer.IRecipeTransferInfo;
import net.minecraft.inventory.Slot;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei;
package techreborn.compat.compat.jei;
public class RecipeCategoryUids {
public static final String ALLOY_SMELTER = "TechReborn.AlloySmelter";

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei;
package techreborn.compat.compat.jei;
import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IGuiItemStackGroup;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei;
package techreborn.compat.compat.jei;
import mezz.jei.api.*;
import mezz.jei.api.gui.IAdvancedGuiHandler;
@ -65,47 +65,47 @@ import techreborn.api.recipe.machines.*;
import techreborn.blocks.cable.EnumCableType;
import techreborn.client.gui.*;
import techreborn.client.gui.slot.GuiSlotConfiguration;
import techreborn.compat.CompatConfigs;
import techreborn.compat.CompatManager;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeWrapper;
import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory;
import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeWrapper;
import techreborn.compat.jei.blastFurnace.BlastFurnaceRecipeCategory;
import techreborn.compat.jei.blastFurnace.BlastFurnaceRecipeWrapper;
import techreborn.compat.jei.centrifuge.CentrifugeRecipeCategory;
import techreborn.compat.jei.centrifuge.CentrifugeRecipeWrapper;
import techreborn.compat.jei.chemicalReactor.ChemicalReactorRecipeCategory;
import techreborn.compat.jei.chemicalReactor.ChemicalReactorRecipeWrapper;
import techreborn.compat.jei.compressor.CompressorRecipeCategory;
import techreborn.compat.jei.compressor.CompressorRecipeWrapper;
import techreborn.compat.jei.distillationTower.DistillationTowerRecipeCategory;
import techreborn.compat.jei.distillationTower.DistillationTowerRecipeWrapper;
import techreborn.compat.jei.extractor.ExtractorRecipeCategory;
import techreborn.compat.jei.extractor.ExtractorRecipeWrapper;
import techreborn.compat.jei.fluidReplicator.FluidReplicatorRecipeCategory;
import techreborn.compat.jei.fluidReplicator.FluidReplicatorRecipeWrapper;
import techreborn.compat.jei.fusionReactor.FusionReactorRecipeCategory;
import techreborn.compat.jei.fusionReactor.FusionReactorRecipeWrapper;
import techreborn.compat.jei.generators.fluid.FluidGeneratorRecipeCategory;
import techreborn.compat.jei.generators.fluid.FluidGeneratorRecipeWrapper;
import techreborn.compat.jei.grinder.GrinderRecipeCategory;
import techreborn.compat.jei.grinder.GrinderRecipeWrapper;
import techreborn.compat.jei.implosionCompressor.ImplosionCompressorRecipeCategory;
import techreborn.compat.jei.implosionCompressor.ImplosionCompressorRecipeWrapper;
import techreborn.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipeCategory;
import techreborn.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipeWrapper;
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeCategory;
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeWrapper;
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeCategory;
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeWrapper;
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeCategory;
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeMaker;
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeWrapper;
import techreborn.compat.jei.scrapbox.ScrapboxRecipeCategory;
import techreborn.compat.jei.scrapbox.ScrapboxRecipeWrapper;
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory;
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeWrapper;
import techreborn.compat.compat.CompatConfigs;
import techreborn.compat.compat.CompatManager;
import techreborn.compat.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
import techreborn.compat.compat.jei.alloySmelter.AlloySmelterRecipeWrapper;
import techreborn.compat.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory;
import techreborn.compat.compat.jei.assemblingMachine.AssemblingMachineRecipeWrapper;
import techreborn.compat.compat.jei.blastFurnace.BlastFurnaceRecipeCategory;
import techreborn.compat.compat.jei.blastFurnace.BlastFurnaceRecipeWrapper;
import techreborn.compat.compat.jei.centrifuge.CentrifugeRecipeCategory;
import techreborn.compat.compat.jei.centrifuge.CentrifugeRecipeWrapper;
import techreborn.compat.compat.jei.chemicalReactor.ChemicalReactorRecipeCategory;
import techreborn.compat.compat.jei.chemicalReactor.ChemicalReactorRecipeWrapper;
import techreborn.compat.compat.jei.compressor.CompressorRecipeCategory;
import techreborn.compat.compat.jei.compressor.CompressorRecipeWrapper;
import techreborn.compat.compat.jei.distillationTower.DistillationTowerRecipeCategory;
import techreborn.compat.compat.jei.distillationTower.DistillationTowerRecipeWrapper;
import techreborn.compat.compat.jei.extractor.ExtractorRecipeCategory;
import techreborn.compat.compat.jei.extractor.ExtractorRecipeWrapper;
import techreborn.compat.compat.jei.fluidReplicator.FluidReplicatorRecipeCategory;
import techreborn.compat.compat.jei.fluidReplicator.FluidReplicatorRecipeWrapper;
import techreborn.compat.compat.jei.fusionReactor.FusionReactorRecipeCategory;
import techreborn.compat.compat.jei.fusionReactor.FusionReactorRecipeWrapper;
import techreborn.compat.compat.jei.generators.fluid.FluidGeneratorRecipeCategory;
import techreborn.compat.compat.jei.generators.fluid.FluidGeneratorRecipeWrapper;
import techreborn.compat.compat.jei.grinder.GrinderRecipeCategory;
import techreborn.compat.compat.jei.grinder.GrinderRecipeWrapper;
import techreborn.compat.compat.jei.implosionCompressor.ImplosionCompressorRecipeCategory;
import techreborn.compat.compat.jei.implosionCompressor.ImplosionCompressorRecipeWrapper;
import techreborn.compat.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipeCategory;
import techreborn.compat.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipeWrapper;
import techreborn.compat.compat.jei.industrialGrinder.IndustrialGrinderRecipeCategory;
import techreborn.compat.compat.jei.industrialGrinder.IndustrialGrinderRecipeWrapper;
import techreborn.compat.compat.jei.industrialSawmill.IndustrialSawmillRecipeCategory;
import techreborn.compat.compat.jei.industrialSawmill.IndustrialSawmillRecipeWrapper;
import techreborn.compat.compat.jei.rollingMachine.RollingMachineRecipeCategory;
import techreborn.compat.compat.jei.rollingMachine.RollingMachineRecipeMaker;
import techreborn.compat.compat.jei.rollingMachine.RollingMachineRecipeWrapper;
import techreborn.compat.compat.jei.scrapbox.ScrapboxRecipeCategory;
import techreborn.compat.compat.jei.scrapbox.ScrapboxRecipeWrapper;
import techreborn.compat.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory;
import techreborn.compat.compat.jei.vacuumFreezer.VacuumFreezerRecipeWrapper;
import techreborn.dispenser.BehaviorDispenseScrapbox;
import techreborn.init.IC2Duplicates;
import techreborn.init.ModBlocks;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.alloySmelter;
package techreborn.compat.compat.jei.alloySmelter;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.alloySmelter;
package techreborn.compat.compat.jei.alloySmelter;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -32,7 +32,7 @@ import net.minecraft.client.Minecraft;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.assemblingMachine;
package techreborn.compat.compat.jei.assemblingMachine;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.*;
@ -30,8 +30,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.assemblingMachine;
package techreborn.compat.compat.jei.assemblingMachine;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -31,7 +31,7 @@ import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.blastFurnace;
package techreborn.compat.compat.jei.blastFurnace;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.blastFurnace;
package techreborn.compat.compat.jei.blastFurnace;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -33,7 +33,7 @@ import net.minecraft.client.Minecraft;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.BlastFurnaceRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.centrifuge;
package techreborn.compat.compat.jei.centrifuge;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.centrifuge;
package techreborn.compat.compat.jei.centrifuge;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -32,7 +32,7 @@ import net.minecraft.client.Minecraft;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.CentrifugeRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.chemicalReactor;
package techreborn.compat.compat.jei.chemicalReactor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.chemicalReactor;
package techreborn.compat.compat.jei.chemicalReactor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -32,7 +32,7 @@ import net.minecraft.client.Minecraft;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.ChemicalReactorRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.compressor;
package techreborn.compat.compat.jei.compressor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.compressor;
package techreborn.compat.compat.jei.compressor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -31,7 +31,7 @@ import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.machines.CompressorRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.distillationTower;
package techreborn.compat.compat.jei.distillationTower;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.distillationTower;
package techreborn.compat.compat.jei.distillationTower;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -32,7 +32,7 @@ import net.minecraft.client.Minecraft;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.DistillationTowerRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.extractor;
package techreborn.compat.compat.jei.extractor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.extractor;
package techreborn.compat.compat.jei.extractor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -31,7 +31,7 @@ import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.machines.ExtractorRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.fluidReplicator;
package techreborn.compat.compat.jei.fluidReplicator;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -33,8 +33,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.fluidReplicator;
package techreborn.compat.compat.jei.fluidReplicator;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.fusionReactor;
package techreborn.compat.compat.jei.fusionReactor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -33,7 +33,7 @@ import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,14 +22,14 @@
* SOFTWARE.
*/
package techreborn.compat.jei.fusionReactor;
package techreborn.compat.compat.jei.fusionReactor;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import techreborn.api.reactor.FusionReactorRecipe;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeUtil;
import javax.annotation.Nonnull;
import java.util.Arrays;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.generators.fluid;
package techreborn.compat.compat.jei.generators.fluid;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -34,7 +34,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.api.generator.EFluidGenerator;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
public class FluidGeneratorRecipeCategory implements IRecipeCategory<FluidGeneratorRecipeWrapper> {

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.generators.fluid;
package techreborn.compat.compat.jei.generators.fluid;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.grinder;
package techreborn.compat.compat.jei.grinder;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.grinder;
package techreborn.compat.compat.jei.grinder;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -31,7 +31,7 @@ import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.machines.GrinderRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.implosionCompressor;
package techreborn.compat.compat.jei.implosionCompressor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.implosionCompressor;
package techreborn.compat.compat.jei.implosionCompressor;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -31,7 +31,7 @@ import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.industrialElectrolyzer;
package techreborn.compat.compat.jei.industrialElectrolyzer;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.industrialElectrolyzer;
package techreborn.compat.compat.jei.industrialElectrolyzer;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -32,7 +32,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.industrialGrinder;
package techreborn.compat.compat.jei.industrialGrinder;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -34,8 +34,8 @@ import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialGrinder;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.industrialGrinder;
package techreborn.compat.compat.jei.industrialGrinder;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -34,7 +34,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import reborncore.common.powerSystem.PowerSystem;
import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;
import java.util.Collections;

View file

@ -1,99 +1,99 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.compat.jei.industrialSawmill;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IGuiItemStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
import javax.annotation.Nonnull;
public class IndustrialSawmillRecipeCategory implements IRecipeCategory<IndustrialSawmillRecipeWrapper> {
private final String title;
public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/industrial_sawmill.png");
private final IDrawable background;
private final IDrawable tankOverlay;
private static final int[] INPUT_SLOTS = { 0, 1 };
private static final int[] OUTPUT_SLOTS = { 2, 3, 4 };
private static final int[] INPUT_TANKS = { 0 };
public IndustrialSawmillRecipeCategory(IGuiHelper guiHelper) {
title = StringUtils.t("tile.techreborn:industrial_sawmill.name");
background = guiHelper.createDrawable(texture, 7, 15, 141, 55);
tankOverlay = guiHelper.createDrawable(texture, 176, 86, 12, 47);
}
@Override
public String getModName() {
return ModInfo.MOD_NAME;
}
@Nonnull
@Override
public String getUid() {
return RecipeCategoryUids.INDUSTRIAL_SAWMILL;
}
@Nonnull
@Override
public String getTitle() {
return title;
}
@Nonnull
@Override
public IDrawable getBackground() {
return background;
}
@Override
public void setRecipe(IRecipeLayout recipeLayout, IndustrialSawmillRecipeWrapper recipeWrapper, IIngredients ingredients) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 24, 10);
guiItemStacks.init(INPUT_SLOTS[1], true, 24, 28);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 76, 19);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 94, 19);
guiItemStacks.init(OUTPUT_SLOTS[2], false, 112, 19);
IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks();
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileIndustrialSawmill.TANK_CAPACITY, true, tankOverlay);
RecipeUtil.setRecipeItems(recipeLayout, ingredients, INPUT_SLOTS, OUTPUT_SLOTS, INPUT_TANKS, null);
}
}
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.compat.compat.jei.industrialSawmill;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IGuiItemStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import techreborn.tiles.multiblock.TileIndustrialSawmill;
import javax.annotation.Nonnull;
public class IndustrialSawmillRecipeCategory implements IRecipeCategory<IndustrialSawmillRecipeWrapper> {
private final String title;
public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/industrial_sawmill.png");
private final IDrawable background;
private final IDrawable tankOverlay;
private static final int[] INPUT_SLOTS = { 0, 1 };
private static final int[] OUTPUT_SLOTS = { 2, 3, 4 };
private static final int[] INPUT_TANKS = { 0 };
public IndustrialSawmillRecipeCategory(IGuiHelper guiHelper) {
title = StringUtils.t("tile.techreborn:industrial_sawmill.name");
background = guiHelper.createDrawable(texture, 7, 15, 141, 55);
tankOverlay = guiHelper.createDrawable(texture, 176, 86, 12, 47);
}
@Override
public String getModName() {
return ModInfo.MOD_NAME;
}
@Nonnull
@Override
public String getUid() {
return RecipeCategoryUids.INDUSTRIAL_SAWMILL;
}
@Nonnull
@Override
public String getTitle() {
return title;
}
@Nonnull
@Override
public IDrawable getBackground() {
return background;
}
@Override
public void setRecipe(IRecipeLayout recipeLayout, IndustrialSawmillRecipeWrapper recipeWrapper, IIngredients ingredients) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 24, 10);
guiItemStacks.init(INPUT_SLOTS[1], true, 24, 28);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 76, 19);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 94, 19);
guiItemStacks.init(OUTPUT_SLOTS[2], false, 112, 19);
IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks();
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileIndustrialSawmill.TANK_CAPACITY, true, tankOverlay);
RecipeUtil.setRecipeItems(recipeLayout, ingredients, INPUT_SLOTS, OUTPUT_SLOTS, INPUT_TANKS, null);
}
}

View file

@ -1,96 +1,96 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.compat.jei.industrialSawmill;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.gui.IDrawableAnimated;
import mezz.jei.api.gui.IDrawableStatic;
import mezz.jei.api.ingredients.IIngredients;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
/**
* @author drcrazy
*/
public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper<IndustrialSawmillRecipe> {
public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/industrial_sawmill.png");
private final IDrawableAnimated progress;
public IndustrialSawmillRecipeWrapper(
@Nonnull
IJeiHelpers jeiHelpers,
@Nonnull
IndustrialSawmillRecipe baseRecipe) {
super(baseRecipe);
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
IDrawableStatic progressStatic = guiHelper.createDrawable(texture, 176, 14, 20, 13);
int ticksPerCycle = baseRecipe.tickTime();
this.progress = guiHelper.createAnimatedDrawable(progressStatic, ticksPerCycle,
IDrawableAnimated.StartDirection.LEFT, false);
}
@Override
public void getIngredients(
@Nonnull
final IIngredients ingredients) {
ingredients.setInput(FluidStack.class, this.baseRecipe.fluidStack);
super.getIngredients(ingredients);
}
@Override
@Nonnull
public List<FluidStack> getFluidInputs() {
if (baseRecipe.fluidStack != null) {
return Collections.singletonList(baseRecipe.fluidStack);
} else {
return Collections.emptyList();
}
}
@Override
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 48, 23);
if (minecraft.fontRenderer != null) {
int x = 70;
int y = 40;
int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRenderer.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444);
minecraft.fontRenderer.drawString("FE: " + baseRecipe.euPerTick + " FE/t", x, y += lineHeight, 0x444444);
}
}
}
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.compat.compat.jei.industrialSawmill;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.gui.IDrawableAnimated;
import mezz.jei.api.gui.IDrawableStatic;
import mezz.jei.api.ingredients.IIngredients;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
/**
* @author drcrazy
*/
public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper<IndustrialSawmillRecipe> {
public static final ResourceLocation texture = new ResourceLocation("techreborn",
"textures/gui/industrial_sawmill.png");
private final IDrawableAnimated progress;
public IndustrialSawmillRecipeWrapper(
@Nonnull
IJeiHelpers jeiHelpers,
@Nonnull
IndustrialSawmillRecipe baseRecipe) {
super(baseRecipe);
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
IDrawableStatic progressStatic = guiHelper.createDrawable(texture, 176, 14, 20, 13);
int ticksPerCycle = baseRecipe.tickTime();
this.progress = guiHelper.createAnimatedDrawable(progressStatic, ticksPerCycle,
IDrawableAnimated.StartDirection.LEFT, false);
}
@Override
public void getIngredients(
@Nonnull
final IIngredients ingredients) {
ingredients.setInput(FluidStack.class, this.baseRecipe.fluidStack);
super.getIngredients(ingredients);
}
@Override
@Nonnull
public List<FluidStack> getFluidInputs() {
if (baseRecipe.fluidStack != null) {
return Collections.singletonList(baseRecipe.fluidStack);
} else {
return Collections.emptyList();
}
}
@Override
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 48, 23);
if (minecraft.fontRenderer != null) {
int x = 70;
int y = 40;
int lineHeight = minecraft.fontRenderer.FONT_HEIGHT;
minecraft.fontRenderer.drawString("Time: " + baseRecipe.tickTime / 20 + " s", x, y, 0x444444);
minecraft.fontRenderer.drawString("FE: " + baseRecipe.euPerTick + " FE/t", x, y += lineHeight, 0x444444);
}
}
}

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.rollingMachine;
package techreborn.compat.compat.jei.rollingMachine;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.*;
@ -32,7 +32,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.rollingMachine;
package techreborn.compat.compat.jei.rollingMachine;
import mezz.jei.api.IJeiHelpers;
import net.minecraft.item.crafting.IRecipe;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.rollingMachine;
package techreborn.compat.compat.jei.rollingMachine;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.ingredients.IIngredients;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.scrapbox;
package techreborn.compat.compat.jei.scrapbox;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,11 +22,11 @@
* SOFTWARE.
*/
package techreborn.compat.jei.scrapbox;
package techreborn.compat.compat.jei.scrapbox;
import mezz.jei.api.IJeiHelpers;
import techreborn.api.recipe.machines.ScrapboxRecipe;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.vacuumFreezer;
package techreborn.compat.compat.jei.vacuumFreezer;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable;
@ -32,8 +32,8 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeCategory;
import net.minecraft.util.ResourceLocation;
import reborncore.common.util.StringUtils;
import techreborn.compat.jei.RecipeCategoryUids;
import techreborn.compat.jei.RecipeUtil;
import techreborn.compat.compat.jei.RecipeCategoryUids;
import techreborn.compat.compat.jei.RecipeUtil;
import techreborn.lib.ModInfo;
import javax.annotation.Nonnull;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.jei.vacuumFreezer;
package techreborn.compat.compat.jei.vacuumFreezer;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
@ -31,7 +31,7 @@ import mezz.jei.api.gui.IDrawableStatic;
import net.minecraft.client.Minecraft;
import techreborn.api.recipe.machines.VacuumFreezerRecipe;
import techreborn.client.gui.TRBuilder;
import techreborn.compat.jei.BaseRecipeWrapper;
import techreborn.compat.compat.jei.BaseRecipeWrapper;
import javax.annotation.Nonnull;

View file

@ -22,14 +22,14 @@
* SOFTWARE.
*/
package techreborn.compat.opencomputers;
package techreborn.compat.compat.opencomputers;
import li.cil.oc.api.Driver;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
public class CompatOpenComputers implements ICompatModule {
@Override

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.opencomputers;
package techreborn.compat.compat.opencomputers;
import li.cil.oc.api.Network;
import li.cil.oc.api.driver.DriverBlock;

View file

@ -22,14 +22,14 @@
* SOFTWARE.
*/
//package techreborn.compat.psi;
//package techreborn.compat.compat.psi;
//
//import net.minecraftforge.fml.common.event.FMLInitializationEvent;
//import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
//import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
//import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
//import techreborn.compat.ICompatModule;
//import techreborn.compat.psi.spell.trick.block.PieceTrickBlockTap;
//import techreborn.compat.compat.ICompatModule;
//import techreborn.compat.compat.psi.spell.trick.block.PieceTrickBlockTap;
//import vazkii.psi.api.PsiAPI;
//import vazkii.psi.api.spell.Spell;
//import vazkii.psi.api.spell.SpellPiece;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
//package techreborn.compat.psi.spell.trick.block;
//package techreborn.compat.compat.psi.spell.trick.block;
//
//import java.util.Random;
//

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.theoneprobe;
package techreborn.compat.compat.theoneprobe;
import mcjty.theoneprobe.api.IProbeConfig;
import mcjty.theoneprobe.api.IProbeConfigProvider;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.theoneprobe;
package techreborn.compat.compat.theoneprobe;
import mcjty.theoneprobe.api.*;
import mcjty.theoneprobe.apiimpl.providers.ChestInfoTools;

View file

@ -22,16 +22,16 @@
* SOFTWARE.
*/
package techreborn.compat.theoneprobe;
package techreborn.compat.compat.theoneprobe;
import mcjty.theoneprobe.TheOneProbe;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
import static techreborn.compat.CompatConfigs.enableTOP;
import static techreborn.compat.compat.CompatConfigs.enableTOP;
/**
* Created by Mark on 04/06/2016.

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.thermalexpansion;
package techreborn.compat.compat.thermalexpansion;
import cofh.api.util.ThermalExpansionHelper;
import cofh.thermalfoundation.init.TFFluids;
@ -38,7 +38,7 @@ import techreborn.api.fluidreplicator.FluidReplicatorRecipe;
import techreborn.api.fluidreplicator.FluidReplicatorRecipeList;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
import techreborn.init.ModItems;
import techreborn.init.recipes.RecipeMethods;
import techreborn.items.ItemDusts;

View file

@ -22,13 +22,13 @@
* SOFTWARE.
*/
package techreborn.compat.tinkers;
package techreborn.compat.compat.tinkers;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.ICompatModule;
import techreborn.compat.compat.ICompatModule;
/**
* @author Prospector on 08/05/16

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
//package techreborn.compat.tinkers;
//package techreborn.compat.compat.tinkers;
//
//import net.minecraft.item.EnumRarity;
//import net.minecraft.nbt.NBTTagCompound;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.waila;
package techreborn.compat.compat.waila;
import mcp.mobius.waila.api.IWailaPlugin;
import mcp.mobius.waila.api.IWailaRegistrar;

View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.waila;
package techreborn.compat.compat.waila;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;

View file

@ -33,56 +33,6 @@ repositories {
name = "Modmuss50"
url = "http://maven.modmuss50.me/"
}
maven {
// JEI, TiC
name "TiC"
url "http://dvs1.progwml6.com/files/maven"
}
maven {
name = "Amadornes"
url "http://maven.amadornes.com/"
}
maven {
// CraftTweaker2
name "Jared"
url "http://maven.blamejared.com/"
}
maven {
// TheOneProbe
url "http://maven.tterrag.com/"
}
maven {
// IC2
name = "ic2"
url = "http://maven.ic2.player.to/"
}
maven {
// HWYLA
name "TehNut"
url "http://tehnut.info/maven/"
}
maven {
name 'CB Repo'
url "http://chickenbones.net/maven/"
}
maven {
// CoFH
name 'Covers'
url "http://maven.covers1624.net/"
}
ivy {
name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision].[ext]"
}
maven {
name "OpenComputer"
url "http://maven.cil.li/"
}
}
configurations {
shade
compile.extendsFrom shade
}
version = "2.16.0"
@ -109,27 +59,11 @@ license {
group = 'TechReborn'
dependencies {
//Some dep we use wants the older jei, so this ingores it. We grab the latest anyway, so it shoudnt cause any issues.
def withoutOldJEI = { exclude module: 'jei_1.12.2' }
deobfCompile('RebornCore:RebornCore-1.12.2:+:universal') {
transitive = false
}
compile "mcp.mobius.waila:Hwyla:+"
compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.12.323"
compile name: 'buildcraft', version: '7.99.17', ext: 'jar'
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.19-11"
deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.+'
deobfCompile 'cofh:ThermalDynamics:1.12.2-2.5+:universal'
deobfCompile 'cofh:ThermalExpansion:1.12.2-5.5+:universal'
deobfCompile 'MCMultiPart2:MCMultiPart:2.4.1'
deobfCompile "li.cil.oc:OpenComputers:MC1.12.2-1.7.2+"
deobfCompile "blusunrize:ImmersiveEngineering:0.12-+:deobf"
}
processResources
{
// this will ensure that this task is redone when the versions change.

View file

@ -55,8 +55,6 @@ import techreborn.api.TechRebornAPI;
import techreborn.blocks.cable.EnumCableType;
import techreborn.client.GuiHandler;
import techreborn.command.TechRebornDevCommand;
import techreborn.compat.CompatManager;
import techreborn.compat.ICompatModule;
import techreborn.dispenser.BehaviorDispenseScrapbox;
import techreborn.entities.EntityNukePrimed;
import techreborn.events.BlockBreakHandler;
@ -120,11 +118,6 @@ public class Core {
ModFixs dataFixes = FMLCommonHandler.instance().getDataFixer().init(ModInfo.MOD_ID, 1);
ModTileEntities.initDataFixer(dataFixes);
CompatManager.isIC2Loaded = Loader.isModLoaded("ic2");
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.preInit(event);
}
//Ore Dictionary
OreDict.init();
proxy.preInit(event);
@ -144,10 +137,6 @@ public class Core {
MinecraftForge.EVENT_BUS.register(new ModLoot());
// Sounds
ModSounds.init();
// Compat
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.init(event);
}
// Client only init, needs to be done before parts system
proxy.init(event);
// WorldGen
@ -180,10 +169,6 @@ public class Core {
@Mod.EventHandler
public void postinit(FMLPostInitializationEvent event) throws Exception {
// Has to be done here as Buildcraft registers their recipes late
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.postInit(event);
}
proxy.postInit(event);
ModRecipes.postInit();
@ -197,9 +182,6 @@ public class Core {
@Mod.EventHandler
public void serverStarting(FMLServerStartingEvent event) {
event.registerServerCommand(new TechRebornDevCommand());
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
compatModule.serverStarting(event);
}
}
@SubscribeEvent

View file

@ -32,8 +32,6 @@ public interface ISubItemRetriever {
ItemStack getCellByName(String name, int count);
ItemStack getCellByName(String name, int count, boolean lookForIC2);
ItemStack getDustByName(String name);
ItemStack getDustByName(String name, int count);

View file

@ -43,8 +43,6 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.Core;
import techreborn.client.container.builder.slot.FilteredSlot;
import techreborn.client.container.builder.slot.UpgradeSlot;
import techreborn.compat.CompatManager;
import techreborn.utils.IC2ItemCharger;
import java.util.function.Consumer;
import java.util.function.IntConsumer;
@ -89,8 +87,7 @@ public class ContainerTileInventoryBuilder {
public ContainerTileInventoryBuilder energySlot(final int index, final int x, final int y) {
this.parent.slots.add(new FilteredSlot(this.tile, index, x, y)
.setFilter(stack -> stack.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP)
|| (CompatManager.isIC2Loaded && IC2ItemCharger.isIC2PoweredItem(stack))));
.setFilter(stack -> stack.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP)));
return this;
}

View file

@ -33,9 +33,6 @@ public class ConfigTechReborn {
@ConfigRegistry(config = "recipes", category = "railcraft", key = "disableRailcraftNugget", comment = "When true TechReborn will remove Railcraft's Iron Nugget to steel nugget recipe.")
public static boolean disableRailcraftSteelNuggetRecipe = false;
@ConfigRegistry(config = "recipes", category = "ic2", key = "deduplicate", comment = "Changes a lot of recipes and hides blocks to integrate TechReborn into IC2")
public static boolean REMOVE_DUPLICATES = false;
@ConfigRegistry(config = "misc", category = "general", key = "enableGemTools", comment = "Enable Gem armor and tools")
public static boolean enableGemArmorAndTools = true;

View file

@ -1,151 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.init;
import ic2.core.block.BlockIC2Fence;
import ic2.core.block.BlockTexGlass;
import ic2.core.block.type.ResourceBlock;
import ic2.core.block.wiring.CableType;
import ic2.core.item.block.ItemCable;
import ic2.core.item.type.CraftingItemType;
import ic2.core.item.type.MiscResourceType;
import ic2.core.item.type.NuclearResourceType;
import ic2.core.ref.BlockName;
import ic2.core.ref.ItemName;
import ic2.core.ref.TeBlock;
import net.minecraft.item.ItemStack;
import reborncore.api.recipe.RecipeHandler;
import reborncore.common.util.OreUtil;
import techreborn.Core;
import techreborn.api.recipe.machines.ExtractorRecipe;
import techreborn.items.ItemParts;
/**
* Created by modmuss50 on 16/07/2016.
*/
public class IC2Dict {
//TODO IC2
public static void init() {
IC2Duplicates.GRINDER.setIc2Stack(BlockName.te.getItemStack(TeBlock.macerator.getName()));
IC2Duplicates.ELECTRICAL_FURNACE.setIc2Stack(BlockName.te.getItemStack(TeBlock.electric_furnace.getName()));
IC2Duplicates.IRON_FURNACE.setIc2Stack(BlockName.te.getItemStack(TeBlock.iron_furnace.getName()));
IC2Duplicates.GENERATOR.setIc2Stack(BlockName.te.getItemStack(TeBlock.generator.getName()));
IC2Duplicates.EXTRACTOR.setIc2Stack(BlockName.te.getItemStack(TeBlock.extractor.getName()));
IC2Duplicates.RECYCLER.setIc2Stack(BlockName.te.getItemStack(TeBlock.recycler.getName()));
IC2Duplicates.COMPRESSOR.setIc2Stack(BlockName.te.getItemStack(TeBlock.compressor.getName()));
IC2Duplicates.BAT_BOX.setIc2Stack(BlockName.te.getItemStack(TeBlock.batbox.getName()));
IC2Duplicates.MFE.setIc2Stack(BlockName.te.getItemStack(TeBlock.mfe.getName()));
IC2Duplicates.MFSU.setIc2Stack(BlockName.te.getItemStack(TeBlock.mfsu.getName()));
IC2Duplicates.LVT.setIc2Stack(BlockName.te.getItemStack(TeBlock.lv_transformer.getName()));
IC2Duplicates.MVT.setIc2Stack(BlockName.te.getItemStack(TeBlock.mv_transformer.getName()));
IC2Duplicates.HVT.setIc2Stack(BlockName.te.getItemStack(TeBlock.hv_transformer.getName()));
IC2Duplicates.CABLE_COPPER.setIc2Stack(getIC2Cable(CableType.copper, 0));
IC2Duplicates.CABLE_GOLD.setIc2Stack(getIC2Cable(CableType.gold, 0));
IC2Duplicates.CABLE_ICOPPER.setIc2Stack(getIC2Cable(CableType.copper, 1));
IC2Duplicates.CABLE_IGOLD.setIc2Stack(getIC2Cable(CableType.gold, 1));
IC2Duplicates.CABLE_HV.setIc2Stack(getIC2Cable(CableType.tin, 0));
IC2Duplicates.CABLE_IHV.setIc2Stack(getIC2Cable(CableType.tin, 1));
IC2Duplicates.CABLE_IIHV.setIc2Stack(getIC2Cable(CableType.tin, 2));
IC2Duplicates.CABLE_GLASSFIBER.setIc2Stack(getIC2Cable(CableType.glass, 0));
IC2Duplicates.MIXED_METAL.setIc2Stack(ItemName.ingot.getItemStack("alloy"));
IC2Duplicates.CARBON_FIBER.setIc2Stack(ItemName.crafting.getItemStack("carbon_fibre"));
IC2Duplicates.CARBON_MESH.setIc2Stack(ItemName.crafting.getItemStack("carbon_mesh"));
IC2Duplicates.REFINED_IRON.setIc2Stack(ItemName.plate.getItemStack("iron"));
IC2Duplicates.SCRAP.setIc2Stack(ItemName.crafting.getItemStack(CraftingItemType.scrap));
IC2Duplicates.FREQ_TRANSMITTER.setIc2Stack(ItemName.frequency_transmitter.getItemStack());
//Rubber - ore dic: itemRubber, hidden from JEI
//Rubber Sap - only used to make rubber, hidden from JEI
//Rubber tree blocks, hidden when deduplication is on, and rubber tress are not set to gen, includes tree taps
//Circuits are hidden in JEI
RecipeHandler.addRecipe(
new ExtractorRecipe(ItemName.misc_resource.getItemStack("resin"),
ItemParts.getPartByName("rubber", 3), 400, 2));
try {
CraftingItemType.circuit.getName();
OreUtil.registerOre("reBattery", ItemName.re_battery.getItemStack());
OreUtil.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
OreUtil.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
OreUtil.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
OreUtil.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
OreUtil.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
OreUtil.registerOre("energyCrystal", ItemName.energy_crystal.getItemStack());
OreUtil.registerOre("drillBasic", ItemName.drill.getItemStack());
OreUtil.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
OreUtil.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
industrialTnt.setItemDamage(1);
OreUtil.registerOre("industrialTnt", industrialTnt);
OreUtil.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
OreUtil.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
OreUtil.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
OreUtil.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
OreUtil.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
OreUtil.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
OreUtil.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
OreUtil.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron));
OreUtil.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
OreUtil.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
OreUtil.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
OreUtil.registerOre("plateIridiumAlloy", ItemName.crafting.getItemStack(CraftingItemType.iridium));
} catch (NoClassDefFoundError notFound) {
Core.logHelper.warn(
"Can't enable integration: IC2 installed but cannot be hooked\n" +
"Do you use incompatible IC2 version?\n" +
"Please create issue on github and provide FULL LOG and mod list");
} catch (Throwable error) {
Core.logHelper.warn(
"Exception thrown during IC2 integration init\n" +
"Do you use incompatible IC2 version?\n" +
"Please create issue on github and provide FULL LOG and mod list.\n" +
"Error stack trace: ");
error.printStackTrace();
}
}
public static ItemStack getIC2Cable(CableType type, int insulation) {
if (insulation > type.maxInsulation) {
return null;
}
return ItemCable.getCable(type, insulation);
}
}

Some files were not shown because too many files have changed in this diff Show more