Merge branch 'master' of https://github.com/TechReborn/TechReborn
This commit is contained in:
commit
eaa4d304d7
3 changed files with 16 additions and 2 deletions
|
@ -2,6 +2,7 @@ package techreborn;
|
|||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
|
@ -21,6 +22,7 @@ import techreborn.init.ModParts;
|
|||
import techreborn.init.ModRecipes;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.packets.PacketHandler;
|
||||
import techreborn.proxies.CommonProxy;
|
||||
import techreborn.util.LogHelper;
|
||||
import techreborn.world.TROreGen;
|
||||
|
||||
|
@ -29,6 +31,9 @@ import java.io.File;
|
|||
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS)
|
||||
public class Core {
|
||||
public static ConfigTechReborn config;
|
||||
|
||||
@SidedProxy(clientSide = ModInfo.CLIENT_PROXY_CLASS, serverSide = ModInfo.SERVER_PROXY_CLASS)
|
||||
public static CommonProxy proxy;
|
||||
|
||||
@Mod.Instance
|
||||
public static Core INSTANCE;
|
||||
|
@ -52,8 +57,7 @@ public class Core {
|
|||
//Register Multiparts
|
||||
ModParts.init();
|
||||
// Recipes
|
||||
ModRecipes.init();
|
||||
|
||||
ModRecipes.init();
|
||||
//Compat
|
||||
CompatManager.init(event);
|
||||
// WorldGen
|
||||
|
|
5
src/main/java/techreborn/proxies/ClientProxy.java
Normal file
5
src/main/java/techreborn/proxies/ClientProxy.java
Normal file
|
@ -0,0 +1,5 @@
|
|||
package techreborn.proxies;
|
||||
|
||||
public class ClientProxy extends CommonProxy{
|
||||
|
||||
}
|
5
src/main/java/techreborn/proxies/CommonProxy.java
Normal file
5
src/main/java/techreborn/proxies/CommonProxy.java
Normal file
|
@ -0,0 +1,5 @@
|
|||
package techreborn.proxies;
|
||||
|
||||
public class CommonProxy {
|
||||
|
||||
}
|
Loading…
Add table
Reference in a new issue