Skip to content

Commit 8c2206b

Browse files
NxerNxer
authored
Merge pull request #799 from Taskeren/loading
Refactor on Loading Events
2 parents 274020c + 93a6633 commit 8c2206b

File tree

3 files changed

+58
-58
lines changed

3 files changed

+58
-58
lines changed

‎src/main/java/com/Nxer/TwistSpaceTechnology/CommonProxy.java

+52-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
11
package com.Nxer.TwistSpaceTechnology;
22

3+
import static com.Nxer.TwistSpaceTechnology.loader.RecipeLoader.loadRecipesServerStarted;
4+
35
import net.minecraftforge.common.MinecraftForge;
46

57
import com.Nxer.TwistSpaceTechnology.combat.DamageEventHandler;
68
import com.Nxer.TwistSpaceTechnology.combat.PlayerEventHandler;
9+
import com.Nxer.TwistSpaceTechnology.combat.items.ItemRegister;
710
import com.Nxer.TwistSpaceTechnology.command.CombatRework_Command;
811
import com.Nxer.TwistSpaceTechnology.command.TST_AdminCommand;
912
import com.Nxer.TwistSpaceTechnology.command.TST_Command;
13+
import com.Nxer.TwistSpaceTechnology.common.api.ModBlocksHandler;
14+
import com.Nxer.TwistSpaceTechnology.common.api.ModItemsHandler;
15+
import com.Nxer.TwistSpaceTechnology.common.entity.EntityMountableBlock;
16+
import com.Nxer.TwistSpaceTechnology.common.ic2Crop.CropInfo;
1017
import com.Nxer.TwistSpaceTechnology.common.item.ItemYamato;
1118
import com.Nxer.TwistSpaceTechnology.common.machine.TST_BigBroArray;
19+
import com.Nxer.TwistSpaceTechnology.common.machine.singleBlock.hatch.GT_Hatch_RackComputationMonitor;
1220
import com.Nxer.TwistSpaceTechnology.common.recipeMap.recipeResult.ResultInsufficientTier;
1321
import com.Nxer.TwistSpaceTechnology.config.Config;
1422
import com.Nxer.TwistSpaceTechnology.event.ServerEvent;
1523
import com.Nxer.TwistSpaceTechnology.event.StartServerEvent;
1624
import com.Nxer.TwistSpaceTechnology.event.TickingEvent;
25+
import com.Nxer.TwistSpaceTechnology.loader.LazyStaticsInitLoader;
26+
import com.Nxer.TwistSpaceTechnology.loader.MachineLoader;
27+
import com.Nxer.TwistSpaceTechnology.loader.MaterialLoader;
28+
import com.Nxer.TwistSpaceTechnology.loader.OreDictLoader;
29+
import com.Nxer.TwistSpaceTechnology.loader.RecipeLoader;
30+
import com.Nxer.TwistSpaceTechnology.loader.TCLoader;
1731
import com.Nxer.TwistSpaceTechnology.network.TST_Network;
1832
import com.Nxer.TwistSpaceTechnology.system.DysonSphereProgram.logic.DSP_WorldSavedData;
1933
import com.Nxer.TwistSpaceTechnology.system.ProcessingArrayBackend.PAHelper;
@@ -23,26 +37,31 @@
2337
import bartworks.API.SideReference;
2438
import cpw.mods.fml.common.FMLCommonHandler;
2539
import cpw.mods.fml.common.event.FMLInitializationEvent;
40+
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
2641
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
2742
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
2843
import cpw.mods.fml.common.event.FMLServerStartedEvent;
2944
import cpw.mods.fml.common.event.FMLServerStartingEvent;
45+
import cpw.mods.fml.common.registry.EntityRegistry;
3046
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
3147
import gregtech.common.render.GTTextureBuilder;
3248

3349
public class CommonProxy {
3450

35-
// preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the
36-
// GameRegistry." (Remove if not needed)
3751
public void preInit(FMLPreInitializationEvent event) {
3852
Config.synchronizeConfiguration(event.getSuggestedConfigurationFile());
3953
if (Config.activateCombatStats) {
4054
MinecraftForge.EVENT_BUS.register(new PlayerEventHandler());
4155
}
4256
TwistSpaceTechnology.LOG.info(Tags.MODNAME + " at version " + Tags.VERSION);
57+
58+
MaterialLoader.load();
59+
60+
if (Config.activateCombatStats) {
61+
ItemRegister.registry();
62+
}
4363
}
4464

45-
// load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed)
4665
public void init(FMLInitializationEvent event) {
4766

4867
MinecraftForge.EVENT_BUS.register(new DSP_WorldSavedData());
@@ -71,9 +90,22 @@ public void init(FMLInitializationEvent event) {
7190
new GTTextureBuilder().setFromBlock(ModBlocks.bloodRune, 0)
7291
.build());
7392

93+
new LazyStaticsInitLoader().initStaticsOnInit();
94+
MachineLoader.loadMachines();
95+
GT_Hatch_RackComputationMonitor.run();
96+
EntityRegistry.registerModEntity(
97+
EntityMountableBlock.class,
98+
"TST:EntityMountableBlock",
99+
1,
100+
TwistSpaceTechnology.instance,
101+
256,
102+
20,
103+
false);
104+
105+
new ModBlocksHandler().initStatics();
106+
new ModItemsHandler().initStatics();
74107
}
75108

76-
// postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed)
77109
public void postInit(FMLPostInitializationEvent event) {
78110
TST_Network.registryNetwork();
79111

@@ -90,9 +122,22 @@ public void postInit(FMLPostInitializationEvent event) {
90122
if (Config.RewriteEIOTravelStaffConfig) {
91123
ItemYamato.rewriteEIOTravelStaffConfig();
92124
}
125+
126+
MachineLoader.loadMachinePostInit();
127+
OreDictLoader.loadOreDictionary();
128+
RecipeLoader.loadRecipesPostInit();
129+
130+
CropInfo.registerAllCropInfo();
131+
132+
TCLoader.load();
133+
}
134+
135+
public void complete(FMLLoadCompleteEvent event) {
136+
RecipeLoader.loadRecipes();
137+
138+
new LazyStaticsInitLoader().initStaticsOnCompleteInit();
93139
}
94140

95-
// register server commands in this event handler (Remove if not needed)
96141
public void serverStarting(FMLServerStartingEvent event) {
97142
TwistSpaceTechnology.LOG.info("Ok, " + Tags.MODNAME + " at version " + Tags.VERSION + " load success .");
98143
event.registerServerCommand(new TST_Command());
@@ -105,6 +150,7 @@ public void serverStarting(FMLServerStartingEvent event) {
105150
public void serverStarted(FMLServerStartedEvent event) {
106151
TwistSpaceTechnology.LOG.info("Init DSP Event.");
107152
StartServerEvent.INSTANCE.onLoading(event);
108-
}
109153

154+
loadRecipesServerStarted();
155+
}
110156
}

‎src/main/java/com/Nxer/TwistSpaceTechnology/TwistSpaceTechnology.java

+5-51
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
package com.Nxer.TwistSpaceTechnology;
22

3-
import static com.Nxer.TwistSpaceTechnology.loader.RecipeLoader.loadRecipesServerStarted;
4-
53
import org.apache.logging.log4j.LogManager;
64
import org.apache.logging.log4j.Logger;
75

8-
import com.Nxer.TwistSpaceTechnology.combat.items.ItemRegister;
9-
import com.Nxer.TwistSpaceTechnology.common.api.ModBlocksHandler;
10-
import com.Nxer.TwistSpaceTechnology.common.api.ModItemsHandler;
11-
import com.Nxer.TwistSpaceTechnology.common.entity.EntityMountableBlock;
12-
import com.Nxer.TwistSpaceTechnology.common.ic2Crop.CropInfo;
13-
import com.Nxer.TwistSpaceTechnology.common.machine.singleBlock.hatch.GT_Hatch_RackComputationMonitor;
14-
import com.Nxer.TwistSpaceTechnology.config.Config;
15-
import com.Nxer.TwistSpaceTechnology.loader.LazyStaticsInitLoader;
16-
import com.Nxer.TwistSpaceTechnology.loader.MachineLoader;
17-
import com.Nxer.TwistSpaceTechnology.loader.MaterialLoader;
18-
import com.Nxer.TwistSpaceTechnology.loader.OreDictLoader;
19-
import com.Nxer.TwistSpaceTechnology.loader.RecipeLoader;
20-
import com.Nxer.TwistSpaceTechnology.loader.TCLoader;
21-
226
import cpw.mods.fml.common.Mod;
237
import cpw.mods.fml.common.SidedProxy;
248
import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -27,13 +11,12 @@
2711
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
2812
import cpw.mods.fml.common.event.FMLServerStartedEvent;
2913
import cpw.mods.fml.common.event.FMLServerStartingEvent;
30-
import cpw.mods.fml.common.registry.EntityRegistry;
3114

3215
@Mod(
3316
modid = Tags.MODID,
3417
version = Tags.VERSION,
3518
name = Tags.MODNAME,
36-
dependencies = "required-before:gregtech; " + "before:dreamcraft;",
19+
dependencies = "required-after:gregtech;",
3720
acceptedMinecraftVersions = "[1.7.10]")
3821
public class TwistSpaceTechnology {
3922

@@ -56,66 +39,37 @@ public class TwistSpaceTechnology {
5639
serverSide = "com.Nxer.TwistSpaceTechnology.CommonProxy")
5740
public static CommonProxy proxy;
5841

59-
// preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the
60-
// GameRegistry." (Remove if not needed)
42+
/* Don't add codes here, see CommonProxy for codes called on both sides and ClientProxy for client-only stuff */
43+
// region FML Events
6144
@Mod.EventHandler
6245
public void preInit(FMLPreInitializationEvent event) {
63-
6446
proxy.preInit(event);
65-
MaterialLoader.load();// Load MaterialPool
66-
if (Config.activateCombatStats) {
67-
ItemRegister.registry();
68-
}
6947
}
7048

7149
@Mod.EventHandler
72-
// load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed)
7350
public void init(FMLInitializationEvent event) {
7451
proxy.init(event);
75-
new LazyStaticsInitLoader().initStaticsOnInit();
76-
MachineLoader.loadMachines();// Load Machines
77-
GT_Hatch_RackComputationMonitor.run();
78-
// NEIHandler.IMCSender();// NEI reg
79-
EntityRegistry
80-
.registerModEntity(EntityMountableBlock.class, "TST:EntityMountableBlock", 1, this, 256, 20, false);
81-
82-
new ModBlocksHandler().initStatics();
83-
new ModItemsHandler().initStatics();
8452
}
8553

8654
@Mod.EventHandler
87-
// postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed)
8855
public void postInit(FMLPostInitializationEvent event) {
8956
proxy.postInit(event);
90-
MachineLoader.loadMachinePostInit();
91-
OreDictLoader.loadOreDictionary();
92-
RecipeLoader.loadRecipesPostInit();// To init GTCM Recipemap
93-
94-
CropInfo.registerAllCropInfo();
95-
96-
TCLoader.load();
9757
}
9858

9959
@Mod.EventHandler
10060
public void completeInit(FMLLoadCompleteEvent event) {
101-
RecipeLoader.loadRecipes();// Load Recipes
102-
103-
// Init static parameters
104-
new LazyStaticsInitLoader().initStaticsOnCompleteInit();
105-
// reflect
106-
61+
proxy.complete(event);
10762
}
10863

10964
@Mod.EventHandler
110-
// register server commands in this event handler (Remove if not needed)
11165
public void serverStarting(FMLServerStartingEvent event) {
11266
proxy.serverStarting(event);
11367
}
11468

11569
@Mod.EventHandler
11670
public void serverStarted(FMLServerStartedEvent event) {
11771
proxy.serverStarted(event);
118-
loadRecipesServerStarted();
11972
}
73+
// endregion
12074

12175
}

‎src/main/resources/mcmod.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"requiredMods": [],
1717
"dependencies": [],
1818
"dependants": [],
19-
"useDependencyInformation": true
19+
"useDependencyInformation": false
2020
}]
2121
}

0 commit comments

Comments
 (0)