aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/GTplusplus.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-08-23 17:56:58 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-08-23 17:56:58 +1000
commit7573ee56c6d8ee08319ef17ca28b46efcc5c6ed1 (patch)
tree00e7e660431f875ea4bc5f7bf542a04d502779f3 /src/Java/gtPlusPlus/GTplusplus.java
parent7e63e4fd8a705391c45e5940e00cda5964fbfd01 (diff)
parent3162fe2ce21d5a2905854b0e313d997a240944c0 (diff)
downloadGT5-Unofficial-7573ee56c6d8ee08319ef17ca28b46efcc5c6ed1.tar.gz
GT5-Unofficial-7573ee56c6d8ee08319ef17ca28b46efcc5c6ed1.tar.bz2
GT5-Unofficial-7573ee56c6d8ee08319ef17ca28b46efcc5c6ed1.zip
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
Diffstat (limited to 'src/Java/gtPlusPlus/GTplusplus.java')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 91efec62fb..bd79aeb764 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -20,6 +20,7 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
import gregtech.api.util.EmptyRecipeMap;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -30,6 +31,7 @@ import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.handler.events.LoginEventHandler;
import gtPlusPlus.core.item.general.RF2EU_Battery;
import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.gregtech.CustomGTMaterials;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -206,6 +208,11 @@ public class GTplusplus implements ActionListener {
FMLCommonHandler.instance().bus().register(new LoginEventHandler());
Utils.LOG_INFO("Login Handler Initialized");
+ //Early load materials
+ try {
+ CustomGTMaterials.run();
+ } catch (Throwable t){}
+
if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
removeCircuitRecipeMap(); //Bye shitty recipes.
}
@@ -243,6 +250,10 @@ public class GTplusplus implements ActionListener {
this.dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes);
this.dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes);
}
+
+ for (Materials s : gtPlusPlus.core.material.gregtech.CustomGTMaterials.Custom_GT_Materials){
+ Utils.LOG_INFO("Verification for New Material: "+s.mName);
+ }
// ~
//ReflectionUtils.becauseIWorkHard();