maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge remote-tracking branch 'origin/loadingScreen'"

Browse source 
This reverts commit 5e20dc8156, reversing
changes made to 3e5fc0bbec.
This commit is contained in:
modmuss50 2015-05-16 17:45:42 +01:00
parent 5e20dc8156
commit 1b308c56d6
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/techreborn/Core.java
View file

@ -3,7 +3,6 @@ package techreborn;
import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.ProgressManager;
import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@ -47,70 +46,52 @@ public class Core {
@Mod.EventHandler @Mod.EventHandler
public void preinit(FMLPreInitializationEvent event) public void preinit(FMLPreInitializationEvent event)
{ {
ProgressManager.ProgressBar bar = ProgressManager.push("TechReborn preInit", 1);
INSTANCE = this; INSTANCE = this;
String path = event.getSuggestedConfigurationFile().getAbsolutePath() String path = event.getSuggestedConfigurationFile().getAbsolutePath()
.replace(ModInfo.MOD_ID, "TechReborn"); .replace(ModInfo.MOD_ID, "TechReborn");
bar.step("Loading Config");
config = ConfigTechReborn.initialize(new File(path)); config = ConfigTechReborn.initialize(new File(path));
LogHelper.info("PreInitialization Complete"); LogHelper.info("PreInitialization Complete");
ProgressManager.pop(bar);
} }
@Mod.EventHandler @Mod.EventHandler
public void init(FMLInitializationEvent event) public void init(FMLInitializationEvent event)
{ {
ProgressManager.ProgressBar bar = ProgressManager.push("TechReborn Init", 11);
bar.step("Loading Blocks");
// Register ModBlocks // Register ModBlocks
ModBlocks.init(); ModBlocks.init();
bar.step("Loading Fluids");
// Register Fluids // Register Fluids
ModFluids.init(); ModFluids.init();
bar.step("Loading Items");
// Register ModItems // Register ModItems
ModItems.init(); ModItems.init();
bar.step("Loading Recipes");
// Recipes // Recipes
ModRecipes.init(); ModRecipes.init();
bar.step("Loading Client things");
//Client only init, needs to be done before parts system //Client only init, needs to be done before parts system
proxy.init(); proxy.init();
bar.step("Loading Compat");
// Compat // Compat
CompatManager.init(event); CompatManager.init(event);
bar.step("Loading WorldGen");
// WorldGen // WorldGen
GameRegistry.registerWorldGenerator(new TROreGen(), 0); GameRegistry.registerWorldGenerator(new TROreGen(), 0);
bar.step("Loading Gui Handler");
// Register Gui Handler // Register Gui Handler
NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler()); NetworkRegistry.INSTANCE.registerGuiHandler(INSTANCE, new GuiHandler());
bar.step("Loading Packets");
// packets // packets
PacketHandler.setChannels(NetworkRegistry.INSTANCE.newChannel( PacketHandler.setChannels(NetworkRegistry.INSTANCE.newChannel(
ModInfo.MOD_ID + "_packets", new PacketHandler())); ModInfo.MOD_ID + "_packets", new PacketHandler()));
bar.step("Loading Achievements");
// Achievements // Achievements
TRAchievements.init(); TRAchievements.init();
bar.step("Loading Multiblock events");
// Multiblock events // Multiblock events
MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
FMLCommonHandler.instance().bus().register(new MultiblockServerTickHandler()); FMLCommonHandler.instance().bus().register(new MultiblockServerTickHandler());
LogHelper.info("Initialization Complete"); LogHelper.info("Initialization Complete");
ProgressManager.pop(bar);
} }
@Mod.EventHandler @Mod.EventHandler
public void postinit(FMLPostInitializationEvent event) public void postinit(FMLPostInitializationEvent event)
{ {
ProgressManager.ProgressBar bar = ProgressManager.push("TechReborn Init", 1);
bar.step("Loading Recipes");
// Has to be done here as Buildcraft registers there recipes late // Has to be done here as Buildcraft registers there recipes late
RecipeManager.init(); RecipeManager.init();
//RecipeHanderer.addOreDicRecipes(); //RecipeHanderer.addOreDicRecipes();
LogHelper.info(RecipeHanderer.recipeList.size() + " recipes loaded"); LogHelper.info(RecipeHanderer.recipeList.size() + " recipes loaded");
ProgressManager.pop(bar);
} }
@Mod.EventHandler @Mod.EventHandler
@ -120,7 +101,8 @@ public class Core {
@SubscribeEvent @SubscribeEvent
public void onConfigChanged( public void onConfigChanged(
ConfigChangedEvent.OnConfigChangedEvent cfgChange) { ConfigChangedEvent.OnConfigChangedEvent cfgChange)
{
if (cfgChange.modID.equals("TechReborn")) { if (cfgChange.modID.equals("TechReborn")) {
ConfigTechReborn.Configs(); ConfigTechReborn.Configs();