MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove proxy classes as they are not needed

Browse Source
This commit is contained in:
Marcel Konrad
2019-09-23 19:37:31 +02:00
parent 15f8585113
commit 1d15eb0065
3 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/exopandora/worldhandler/WorldHandler.java
View File

@@ -5,24 +5,22 @@ import org.apache.logging.log4j.Logger;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import exopandora.worldhandler.config.Config; import exopandora.worldhandler.config.Config;
import exopandora.worldhandler.event.ClientEventHandler;
import exopandora.worldhandler.event.KeyHandler;
import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.category.Category;
import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Content;
import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.helper.CommandHelper;
import exopandora.worldhandler.proxy.ClientProxy;
import exopandora.worldhandler.proxy.CommonProxy;
import exopandora.worldhandler.util.UtilKeyBinding; import exopandora.worldhandler.util.UtilKeyBinding;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.settings.KeyBinding;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig.Type; import net.minecraftforge.fml.config.ModConfig.Type;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -37,13 +35,9 @@ public class WorldHandler
public static String USERNAME = null; public static String USERNAME = null;
private static CommonProxy SIDEPROXY;
public WorldHandler() public WorldHandler()
{ {
SIDEPROXY = DistExecutor.runForDist(() -> ClientProxy::new, () -> CommonProxy::new);
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
modEventBus.addListener(this::commonSetup);
modEventBus.addListener(this::clientSetup); modEventBus.addListener(this::clientSetup);
MinecraftForge.EVENT_BUS.addListener(this::serverStarting); MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
ModLoadingContext.get().registerConfig(Type.CLIENT, Config.CLIENT_SPEC, Main.MODID + ".toml"); ModLoadingContext.get().registerConfig(Type.CLIENT, Config.CLIENT_SPEC, Main.MODID + ".toml");
@@ -54,15 +48,13 @@ public class WorldHandler
modEventBus.addGenericListener(Category.class, Category::register); modEventBus.addGenericListener(Category.class, Category::register);
} }
@SubscribeEvent
public void commonSetup(FMLCommonSetupEvent event)
{
SIDEPROXY.setup();
}
@SubscribeEvent @SubscribeEvent
public void clientSetup(FMLClientSetupEvent event) public void clientSetup(FMLClientSetupEvent event)
{ {
MinecraftForge.EVENT_BUS.addListener(KeyHandler::keyInputEvent);
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::renderWorldLastEvent);
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientChatEvent);
USERNAME = Minecraft.getInstance().getSession().getUsername(); USERNAME = Minecraft.getInstance().getSession().getUsername();
ClientRegistry.registerKeyBinding(KEY_WORLD_HANDLER); ClientRegistry.registerKeyBinding(KEY_WORLD_HANDLER);
UtilKeyBinding.updatePosKeys(); UtilKeyBinding.updatePosKeys();

19
src/main/java/exopandora/worldhandler/proxy/ClientProxy.java
View File

@@ -1,19 +0,0 @@
package exopandora.worldhandler.proxy;
import exopandora.worldhandler.event.ClientEventHandler;
import exopandora.worldhandler.event.KeyHandler;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge;
@OnlyIn(Dist.CLIENT)
public class ClientProxy extends CommonProxy
{
@Override
public void setup()
{
MinecraftForge.EVENT_BUS.addListener(KeyHandler::keyInputEvent);
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::renderWorldLastEvent);
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientChatEvent);
}
}

9
src/main/java/exopandora/worldhandler/proxy/CommonProxy.java
View File

@@ -1,9 +0,0 @@
package exopandora.worldhandler.proxy;
public class CommonProxy
{
public void setup()
{
}
}