From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: 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. --- .../xmod/thermalfoundation/HANDLER_TF.java | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java') diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java index 36cac34040..6804737ebf 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java +++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java @@ -6,32 +6,32 @@ import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; import gtPlusPlus.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; -public class HANDLER_TF { +public class HANDLER_TF{ - public static void init() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + public static void preInit(){ + if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation){ + TF_Fluids.preInit(); + TF_Items.preInit(); + TF_Blocks.preInit(); + } + } + + public static void init(){ + if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation){ TF_Fluids.init(); - TF_Blocks.init(); + TF_Blocks.init(); TF_Items.init(); - } + } } - public static void postInit() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + public static void postInit(){ + if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation){ TF_Fluids.postInit(); TF_Items.postInit(); TF_Blocks.postInit(); - if (LoadedMods.Gregtech) { + if(LoadedMods.Gregtech){ TF_Gregtech_Recipes.run(); - } - } - } - - public static void preInit() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { - TF_Fluids.preInit(); - TF_Items.preInit(); - TF_Blocks.preInit(); - } - } + } + } + } } -- cgit