diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 9bcebd6..ab21c70 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -22,6 +22,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.relauncher.Side; import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.events.ClientHandler; import makeo.gadomancy.client.events.RenderEventHandler; @@ -310,4 +311,9 @@ public class ClientProxy extends CommonProxy { public void runDelayedClientSide(Runnable run) { this.clientActions.add(run); } + + @Override + public Side getSide() { + return Side.CLIENT; + } } diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 46c9084..1c88bba 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -12,10 +12,11 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; -import makeo.gadomancy.client.ClientProxy; import makeo.gadomancy.common.aura.AuraEffects; import makeo.gadomancy.common.containers.ContainerArcanePackager; import makeo.gadomancy.common.containers.ContainerInfusionClaw; @@ -46,22 +47,18 @@ import thaumcraft.common.entities.golems.EntityGolemBase; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file - * + *
* Created by makeo @ 29.11.2014 14:18
*/
public class CommonProxy implements IGuiHandler {
public static boolean serverOnlineState;
- public static final EventHandlerGolem EVENT_HANDLER_GOLEM = new EventHandlerGolem();
-
public void onConstruct() {}
public void preInitalize() {
PacketHandler.init();
-
RegisteredItems.preInit();
-
RegisteredBlocks.init();
RegisteredItems.init();
RegisteredGolemStuff.init();
@@ -69,21 +66,10 @@ public class CommonProxy implements IGuiHandler {
public void initalize() {
NetworkRegistry.INSTANCE.registerGuiHandler(Gadomancy.instance, this);
-
- MinecraftForge.EVENT_BUS.register(CommonProxy.EVENT_HANDLER_GOLEM);
- FMLCommonHandler.instance().bus().register(new EventHandlerNetwork());
- EventHandlerWorld worldEventHandler = new EventHandlerWorld();
- MinecraftForge.EVENT_BUS.register(worldEventHandler);
- FMLCommonHandler.instance().bus().register(worldEventHandler);
- MinecraftForge.EVENT_BUS.register(new EventHandlerEntity());
-
RegisteredEnchantments.init();
RegisteredRecipes.init();
-
SyncDataHolder.initialize();
-
RegisteredEntities.init();
-
DimensionManager.registerProviderType(ModConfig.dimOuterId, WorldProviderTCEldrich.class, true);
DimensionManager.registerDimension(ModConfig.dimOuterId, ModConfig.dimOuterId);
}
@@ -91,14 +77,10 @@ public class CommonProxy implements IGuiHandler {
public void postInitalize() {
RegisteredPotions.init();
AuraEffects.AER.getTickInterval(); // initalize AuraEffects
-
RegisteredResearches.init();
RegisteredIntegrations.init();
-
RegisteredResearches.postInit();
-
RegisteredItems.postInit();
-
ModSubstitutions.postInit();
}
@@ -125,15 +107,12 @@ public class CommonProxy implements IGuiHandler {
@Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
- switch (ID) {
- case 0:
- return new ContainerGolem(player.inventory, ((EntityGolemBase) world.getEntityByID(x)).inventory);
- case 1:
- return new ContainerInfusionClaw(player.inventory, (IInventory) world.getTileEntity(x, y, z));
- case 2:
- return new ContainerArcanePackager(player.inventory, (IInventory) world.getTileEntity(x, y, z));
- }
- return null;
+ return switch (ID) {
+ case 0 -> new ContainerGolem(player.inventory, ((EntityGolemBase) world.getEntityByID(x)).inventory);
+ case 1 -> new ContainerInfusionClaw(player.inventory, (IInventory) world.getTileEntity(x, y, z));
+ case 2 -> new ContainerArcanePackager(player.inventory, (IInventory) world.getTileEntity(x, y, z));
+ default -> null;
+ };
}
@Override
@@ -144,6 +123,35 @@ public class CommonProxy implements IGuiHandler {
public void runDelayedClientSide(Runnable run) {}
public Side getSide() {
- return this instanceof ClientProxy ? Side.CLIENT : Side.SERVER;
+ return Side.SERVER;
+ }
+
+ public EventHandlerGolem EVENT_HANDLER_GOLEM;
+ public EventHandlerNetwork EVENT_HANDLER_NETWORK;
+ public EventHandlerWorld EVENT_HANDLER_WORLD;
+ public EventHandlerEntity EVENT_HANDLER_ENTITY;
+
+ public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+ EVENT_HANDLER_GOLEM = new EventHandlerGolem();
+ MinecraftForge.EVENT_BUS.register(EVENT_HANDLER_GOLEM);
+ EVENT_HANDLER_NETWORK = new EventHandlerNetwork();
+ FMLCommonHandler.instance().bus().register(EVENT_HANDLER_NETWORK);
+ EVENT_HANDLER_WORLD = new EventHandlerWorld();
+ MinecraftForge.EVENT_BUS.register(EVENT_HANDLER_WORLD);
+ FMLCommonHandler.instance().bus().register(EVENT_HANDLER_WORLD);
+ EVENT_HANDLER_ENTITY = new EventHandlerEntity();
+ MinecraftForge.EVENT_BUS.register(EVENT_HANDLER_ENTITY);
+ }
+
+ public void onServerStopped(FMLServerStoppedEvent event) {
+ MinecraftForge.EVENT_BUS.unregister(EVENT_HANDLER_GOLEM);
+ EVENT_HANDLER_GOLEM = null;
+ FMLCommonHandler.instance().bus().unregister(EVENT_HANDLER_NETWORK);
+ EVENT_HANDLER_NETWORK = null;
+ MinecraftForge.EVENT_BUS.unregister(EVENT_HANDLER_WORLD);
+ FMLCommonHandler.instance().bus().unregister(EVENT_HANDLER_WORLD);
+ EVENT_HANDLER_WORLD = null;
+ MinecraftForge.EVENT_BUS.unregister(EVENT_HANDLER_ENTITY);
+ EVENT_HANDLER_ENTITY = null;
}
}
diff --git a/src/main/java/makeo/gadomancy/common/Gadomancy.java b/src/main/java/makeo/gadomancy/common/Gadomancy.java
index b918d50..8780218 100644
--- a/src/main/java/makeo/gadomancy/common/Gadomancy.java
+++ b/src/main/java/makeo/gadomancy/common/Gadomancy.java
@@ -14,6 +14,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import makeo.gadomancy.api.GadomancyApi;
import makeo.gadomancy.common.api.DefaultApiHandler;
import makeo.gadomancy.common.data.config.ModConfig;
@@ -83,7 +85,6 @@ public class Gadomancy {
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
Gadomancy.proxy.initalize();
-
FMLInterModComms.sendMessage(Thaumcraft.MODID, "dimensionBlacklist", ModConfig.dimOuterId + ":0");
}
@@ -91,4 +92,14 @@ public class Gadomancy {
public void postInit(FMLPostInitializationEvent event) {
Gadomancy.proxy.postInitalize();
}
+
+ @Mod.EventHandler
+ public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+ Gadomancy.proxy.onServerAboutToStart(event);
+ }
+
+ @Mod.EventHandler
+ public void onServerStopped(FMLServerStoppedEvent event) {
+ Gadomancy.proxy.onServerStopped(event);
+ }
}
diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java
index eb19cb6..19550c0 100644
--- a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java
+++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java
@@ -33,7 +33,7 @@ import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
import makeo.gadomancy.api.AuraEffect;
-import makeo.gadomancy.common.events.EventHandlerEntity;
+import makeo.gadomancy.common.Gadomancy;
import makeo.gadomancy.common.integration.IntegrationThaumicTinkerer;
import makeo.gadomancy.common.registration.RegisteredIntegrations;
import makeo.gadomancy.common.registration.RegisteredPotions;
@@ -201,8 +201,9 @@ public class AuraEffects {
@Override
public void doEntityEffect(ChunkCoordinates originTile, Entity e) {
- if (!EventHandlerEntity.registeredLuxPylons.contains(originTile))
- EventHandlerEntity.registeredLuxPylons.add(originTile);
+ if (!Gadomancy.proxy.EVENT_HANDLER_ENTITY.registeredLuxPylons.contains(originTile)) {
+ Gadomancy.proxy.EVENT_HANDLER_ENTITY.registeredLuxPylons.add(originTile);
+ }
}
@Override
diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java
index 1e68f09..176fece 100644
--- a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java
+++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java
@@ -38,7 +38,7 @@ import thaumcraft.common.items.armor.Hover;
*/
public class EventHandlerEntity {
- public static List