mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-19 11:49:33 +00:00
Refractored Code
+added Solar Factory -removed unnessecary solar and essentia generator classes +started gtnh researches +added tooltip clearance on solars (maximal output) Signed-off-by: bartimaeusnek <[email protected]>
This commit is contained in:
1 parent
980df8516a
commit
0fecf28b65
397 files changed
+8693
-9288
No files matched your search
+72
-92
@@ -12,10 +12,10 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import emt.command.CommandOutputs;
|
||||
import emt.init.EMTEntities;
|
||||
import emt.init.EMTResearches;
|
||||
import emt.init.Registry;
|
||||
import emt.network.PacketEMTKeys;
|
||||
import emt.proxy.CommonProxy;
|
||||
import emt.tile.solar.Solars;
|
||||
import emt.util.*;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
@@ -23,98 +23,78 @@ import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@Mod(
|
||||
modid = EMT.MOD_ID,
|
||||
name = EMT.NAME,
|
||||
version = EMT.VERSION,
|
||||
guiFactory = EMT.GUI_FACTORY,
|
||||
dependencies = EMT.DEPENDS
|
||||
modid = EMT.MOD_ID,
|
||||
name = EMT.NAME,
|
||||
version = EMT.VERSION,
|
||||
guiFactory = EMT.GUI_FACTORY,
|
||||
dependencies = EMT.DEPENDS
|
||||
)
|
||||
public class EMT
|
||||
{
|
||||
public static final String NAME = "Electro-Magic Tools";
|
||||
public static final String MOD_ID = "EMT";
|
||||
public static final String VERSION = "@version@";
|
||||
public static final String TEXTURE_PATH = "emt";
|
||||
public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory";
|
||||
public static final String CLIENT_PROXY = "emt.proxy.ClientProxy";
|
||||
public static final String COMMON_PROXY = "emt.proxy.CommonProxy";
|
||||
public static final String CHANNEL = "EMT";
|
||||
public static final String DEPENDS =
|
||||
"required-after:Thaumcraft;" +
|
||||
"required-after:IC2;" +
|
||||
"required-after:gregtech;"+
|
||||
"after:Avaritia;"+
|
||||
"after:MagicBees;"+
|
||||
"after:ForbiddenMagic;";
|
||||
@SidedProxy(clientSide="emt.proxy.ClientProxy", serverSide="emt.proxy.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
public static final CreativeTabs TAB = new EMTCreativeTab("EMT.creativeTab");
|
||||
public static final Logger LOGGER = LogManager.getLogger("Electro-Magic Tools");
|
||||
public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT");
|
||||
@Mod.Instance("EMT")
|
||||
public static EMT instance;
|
||||
|
||||
public boolean isSimulating()
|
||||
{
|
||||
return !FMLCommonHandler.instance().getEffectiveSide().isClient();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event)
|
||||
{
|
||||
LOGGER.info("Starting planning the world domination|start preinit");
|
||||
EMTConfigHandler.init(event.getSuggestedConfigurationFile());
|
||||
FMLCommonHandler.instance().bus().register(new EMTEventHandler());
|
||||
if (FMLCommonHandler.instance().getSide().isClient()) {
|
||||
FMLCommonHandler.instance().bus().register(new EMTClientEventHandler());
|
||||
public class EMT {
|
||||
public static final String NAME = "Electro-Magic Tools";
|
||||
public static final String MOD_ID = "EMT";
|
||||
public static final String VERSION = "@version@";
|
||||
public static final String TEXTURE_PATH = "emt";
|
||||
public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory";
|
||||
public static final String CLIENT_PROXY = "emt.proxy.ClientProxy";
|
||||
public static final String COMMON_PROXY = "emt.proxy.CommonProxy";
|
||||
public static final String CHANNEL = "EMT";
|
||||
public static final String DEPENDS =
|
||||
"required-after:Thaumcraft;" +
|
||||
"required-after:IC2;" +
|
||||
"required-after:gregtech;" +
|
||||
"after:Avaritia;" +
|
||||
"after:MagicBees;" +
|
||||
"after:ForbiddenMagic;" +
|
||||
"after:dreamcraft;";
|
||||
public static final CreativeTabs TAB = new EMTCreativeTab("EMT.creativeTab");
|
||||
public static final Logger LOGGER = LogManager.getLogger("Electro-Magic Tools");
|
||||
public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT");
|
||||
@SidedProxy(clientSide = "emt.proxy.ClientProxy", serverSide = "emt.proxy.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
@Mod.Instance("EMT")
|
||||
public static EMT instance;
|
||||
|
||||
public boolean isSimulating() {
|
||||
return !FMLCommonHandler.instance().getEffectiveSide().isClient();
|
||||
}
|
||||
Registry.registerPreInit();
|
||||
EMTEssentiasOutputs.addPrimalOutputs();
|
||||
//EMTEssentiasOutputs.addOutputs();
|
||||
registerPackets();
|
||||
LOGGER.info("Planning complete|end preinit");
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void load(FMLInitializationEvent event)
|
||||
{
|
||||
LOGGER.info("Execute the plan|start init");
|
||||
Registry.registerInit();
|
||||
//LOGGER.info("Gathering allies");
|
||||
//LOGGER.info("Loading the proxies");
|
||||
proxy.load();
|
||||
//LOGGER.info("Making mobs drop additional items");
|
||||
MinecraftForge.EVENT_BUS.register(new EMTEventHandler());
|
||||
if (FMLCommonHandler.instance().getSide().isClient()) {
|
||||
MinecraftForge.EVENT_BUS.register(new EMTClientEventHandler());
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
EMTConfigHandler.init(event.getSuggestedConfigurationFile());
|
||||
FMLCommonHandler.instance().bus().register(new EMTEventHandler());
|
||||
if (FMLCommonHandler.instance().getSide().isClient()) {
|
||||
FMLCommonHandler.instance().bus().register(new EMTClientEventHandler());
|
||||
}
|
||||
Registry.registerPreInit();
|
||||
EMTEssentiasOutputs.addPrimalOutputs();
|
||||
registerPackets();
|
||||
Solars.populateCache();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void load(FMLInitializationEvent event) {
|
||||
Registry.registerInit();
|
||||
proxy.load();
|
||||
MinecraftForge.EVENT_BUS.register(new EMTEventHandler());
|
||||
if (FMLCommonHandler.instance().getSide().isClient()) {
|
||||
MinecraftForge.EVENT_BUS.register(new EMTClientEventHandler());
|
||||
}
|
||||
EMTDungeonChestGenerator.generateLoot();
|
||||
EMTEntities.registerEMTEntities();
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy);
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
Registry.registerLate();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void onFMLServerStart(FMLServerStartingEvent event) {
|
||||
event.registerServerCommand(new CommandOutputs());
|
||||
}
|
||||
|
||||
public void registerPackets() {
|
||||
INSTANCE.registerMessage(PacketEMTKeys.class, PacketEMTKeys.class, 0, Side.SERVER);
|
||||
}
|
||||
//LOGGER.info("Adding dungeon loot");
|
||||
EMTDungeonChestGenerator.generateLoot();
|
||||
//LOGGER.info("Registering entities");
|
||||
EMTEntities.registerEMTEntities();
|
||||
//LOGGER.info("Registering the GUI Handler");
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy);
|
||||
LOGGER.info("Allies gathered.|end init");
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void postInit(FMLPostInitializationEvent event)
|
||||
{
|
||||
LOGGER.info("Starting the world takeover|start postinit");
|
||||
EMTEssentiasOutputs.addOutputs();
|
||||
Registry.registerLate();
|
||||
EMTResearches.register();
|
||||
LOGGER.info("World takeover complete. Enjoy!|end postinit");
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void onFMLServerStart(FMLServerStartingEvent event)
|
||||
{
|
||||
event.registerServerCommand(new CommandOutputs());
|
||||
}
|
||||
|
||||
public void registerPackets()
|
||||
{
|
||||
INSTANCE.registerMessage(PacketEMTKeys.class, PacketEMTKeys.class, 0, Side.SERVER);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user