diff --git a/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java b/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java index 5398b1b..115a774 100644 --- a/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java +++ b/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java @@ -58,8 +58,8 @@ public void postInit(FMLPostInitializationEvent event) { } @Mod.EventHandler - public void serverStarted(FMLServerStartedEvent event) { - proxy.serverStarted(event); + public void loadCompeted(FMLLoadCompleteEvent event) { + proxy.loadCompeted(event); } public static final CreativeTabs BoxTab = new CreativeTabs("BoxPlusPlus") { diff --git a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java index cbd8c30..7485382 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java @@ -1,18 +1,13 @@ package com.silvermoon.boxplusplus.common; -import net.minecraftforge.common.MinecraftForge; - import com.silvermoon.boxplusplus.common.config.Config; import com.silvermoon.boxplusplus.common.loader.BlockRegister; import com.silvermoon.boxplusplus.common.loader.ItemRegister; import com.silvermoon.boxplusplus.common.loader.RecipeLoader; import com.silvermoon.boxplusplus.common.loader.TileEntitiesLoader; -import com.silvermoon.boxplusplus.event.ServerEvent; import com.silvermoon.boxplusplus.network.NetworkLoader; import com.silvermoon.boxplusplus.util.ResultModuleRequirement; -import bartworks.API.SideReference; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.*; import gregtech.api.recipe.check.CheckRecipeResultRegistry; @@ -31,20 +26,16 @@ public void preInit(FMLPreInitializationEvent event) { public void init(FMLInitializationEvent event) { TileEntitiesLoader.register(); CheckRecipeResultRegistry.register(new ResultModuleRequirement(0, false)); - - ServerEvent serverEvent = new ServerEvent(); - if (SideReference.Side.Server) { - MinecraftForge.EVENT_BUS.register(serverEvent); - } - FMLCommonHandler.instance() - .bus() - .register(serverEvent); } // postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed) public void postInit(FMLPostInitializationEvent event) {} public void serverStarted(FMLServerStartedEvent event) { + + } + + public void loadCompeted(FMLLoadCompleteEvent event) { new RecipeLoader().run(); } } diff --git a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java index 3d3ad8b..ec4dd9f 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java @@ -19,13 +19,7 @@ public class RecipeLoader implements Runnable { - public static boolean hasLoadedRecipe; - public synchronized void run() { - if (hasLoadedRecipe) { - return; - } - hasLoadedRecipe = true; addBoxRecipe(); addMachineBlockRecipe(); addModuleRecipe(); diff --git a/src/main/java/com/silvermoon/boxplusplus/event/ServerEvent.java b/src/main/java/com/silvermoon/boxplusplus/event/ServerEvent.java deleted file mode 100644 index b37b1d3..0000000 --- a/src/main/java/com/silvermoon/boxplusplus/event/ServerEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.silvermoon.boxplusplus.event; - -import static com.silvermoon.boxplusplus.boxplusplus.LOG; - -import net.minecraft.entity.player.EntityPlayerMP; - -import com.silvermoon.boxplusplus.network.NetworkLoader; -import com.silvermoon.boxplusplus.network.packet.ServerJoinedPacket; - -import bartworks.API.SideReference; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; - -public class ServerEvent { - - @SubscribeEvent(priority = EventPriority.LOWEST) - public void PlayerJoinServerEvent(PlayerEvent.PlayerLoggedInEvent event) { - LOG.info("PlayerJoinServerEvent running"); - if (event == null || !(event.player instanceof EntityPlayerMP player) || !SideReference.Side.Server) return; - NetworkLoader.instance.sendTo(new ServerJoinedPacket(), player); - LOG.info("PlayerJoinServerEvent run finished"); - } -} diff --git a/src/main/java/com/silvermoon/boxplusplus/network/NetworkLoader.java b/src/main/java/com/silvermoon/boxplusplus/network/NetworkLoader.java index 1e45d08..3dbbc8f 100644 --- a/src/main/java/com/silvermoon/boxplusplus/network/NetworkLoader.java +++ b/src/main/java/com/silvermoon/boxplusplus/network/NetworkLoader.java @@ -1,7 +1,6 @@ package com.silvermoon.boxplusplus.network; import com.silvermoon.boxplusplus.Tags; -import com.silvermoon.boxplusplus.network.packet.ServerJoinedPacket; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; @@ -15,8 +14,5 @@ public class NetworkLoader { public static void init() { instance.registerMessage(MessageRouting.Handler.class, MessageRouting.class, nextID++, Side.SERVER); - - instance.registerMessage(ServerJoinedPacket.class, ServerJoinedPacket.class, nextID++, Side.SERVER); - instance.registerMessage(ServerJoinedPacket.class, ServerJoinedPacket.class, nextID++, Side.CLIENT); } } diff --git a/src/main/java/com/silvermoon/boxplusplus/network/packet/ServerJoinedPacket.java b/src/main/java/com/silvermoon/boxplusplus/network/packet/ServerJoinedPacket.java deleted file mode 100644 index dafd012..0000000 --- a/src/main/java/com/silvermoon/boxplusplus/network/packet/ServerJoinedPacket.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.silvermoon.boxplusplus.network.packet; - -import com.silvermoon.boxplusplus.common.loader.ServerInitLoader; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class ServerJoinedPacket implements IMessage, IMessageHandler { - - @Override - public void fromBytes(ByteBuf buf) { - - } - - @Override - public void toBytes(ByteBuf buf) { - - } - - @Override - public IMessage onMessage(ServerJoinedPacket message, MessageContext ctx) { - ServerInitLoader.initOnPlayerJoinedSever(); - return null; - } -}