Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/silvermoon/boxplusplus/boxplusplus.java
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
17 changes: 4 additions & 13 deletions src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
24 changes: 0 additions & 24 deletions src/main/java/com/silvermoon/boxplusplus/event/ServerEvent.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}
}

This file was deleted.

Loading