aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-06 19:32:27 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-06 19:32:27 +1000
commitcbe0e497be8e466c380a5b4fa781b314ede9ada3 (patch)
treeb85848b432adf458e3abda466ee46d9dfc3e454b /src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
parentc40416b036c0e89451e1558253ccf07bbee028d0 (diff)
downloadGT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.tar.gz
GT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.tar.bz2
GT5-Unofficial-cbe0e497be8e466c380a5b4fa781b314ede9ada3.zip
Revert "$ Cleaned up the entire project."
This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java40
1 files changed, 21 insertions, 19 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index a234d006da..2b3c23daf1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -6,7 +6,9 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
-import gtPlusPlus.xmod.gregtech.loaders.*;
+import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks;
+import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
public class HANDLER_GT {
@@ -14,33 +16,33 @@ public class HANDLER_GT {
public static GT_Config mMaterialProperties = null;
@SuppressWarnings("unused")
- public static void init() {
+ public static void preInit(){
+ new MetaGeneratedGregtechItems();
+ if (mMaterialProperties != null){
+ GT_Materials.init(mMaterialProperties);
+ }
+ GregtechFluidHandler.run();
+ }
- // Load General Blocks and set up some Basic Meta Tile Entitie states
- Gregtech_Blocks.run();
+ @SuppressWarnings("unused")
+ public static void init(){
- // Register Tile Entities
+ //Load General Blocks and set up some Basic Meta Tile Entitie states
+ Gregtech_Blocks.run();
+
+ //Register Tile Entities
COMPAT_HANDLER.registerGregtechMachines();
-
- // Add Custom Pipes, Wires and Cables.
+
+ //Add Custom Pipes, Wires and Cables.
GregtechConduits.run();
new MetaGeneratedGregtechTools();
new ProcessingToolHeadChoocher().run();
RecipeGen_BlastSmelterGT.generateRecipes();
-
- }
-
- public static void postInit() {
-
+
}
- @SuppressWarnings("unused")
- public static void preInit() {
- new MetaGeneratedGregtechItems();
- if (HANDLER_GT.mMaterialProperties != null) {
- GT_Materials.init(HANDLER_GT.mMaterialProperties);
- }
- GregtechFluidHandler.run();
+ public static void postInit(){
+
}
}