From 1d15eb006591fffb4467ba8a30ec8405ba1e699e Mon Sep 17 00:00:00 2001
From: Marcel Konrad <mkonrad98@alice-dsl.net>
Date: Mon, 23 Sep 2019 19:37:31 +0200
Subject: [PATCH] Remove proxy classes as they are not needed

---
 .../exopandora/worldhandler/WorldHandler.java | 20 ++++++-------------
 .../worldhandler/proxy/ClientProxy.java       | 19 ------------------
 .../worldhandler/proxy/CommonProxy.java       |  9 ---------
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 src/main/java/exopandora/worldhandler/proxy/ClientProxy.java
 delete mode 100644 src/main/java/exopandora/worldhandler/proxy/CommonProxy.java

diff --git a/src/main/java/exopandora/worldhandler/WorldHandler.java b/src/main/java/exopandora/worldhandler/WorldHandler.java
index d19fe0d..809086d 100644
--- a/src/main/java/exopandora/worldhandler/WorldHandler.java
+++ b/src/main/java/exopandora/worldhandler/WorldHandler.java
@@ -5,24 +5,22 @@ import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
 
 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.content.Content;
 import exopandora.worldhandler.helper.CommandHelper;
-import exopandora.worldhandler.proxy.ClientProxy;
-import exopandora.worldhandler.proxy.CommonProxy;
 import exopandora.worldhandler.util.UtilKeyBinding;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig.Type;
 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.javafmlmod.FMLJavaModLoadingContext;
 
@@ -37,13 +35,9 @@ public class WorldHandler
 	
 	public static String USERNAME = null;
 	
-	private static CommonProxy SIDEPROXY;
-	
 	public WorldHandler()
 	{
-		SIDEPROXY = DistExecutor.runForDist(() -> ClientProxy::new, () -> CommonProxy::new);
 		IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-		modEventBus.addListener(this::commonSetup);
 		modEventBus.addListener(this::clientSetup);
 		MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
 		ModLoadingContext.get().registerConfig(Type.CLIENT, Config.CLIENT_SPEC, Main.MODID + ".toml");
@@ -54,15 +48,13 @@ public class WorldHandler
 		modEventBus.addGenericListener(Category.class, Category::register);
 	}
 	
-	@SubscribeEvent
-	public void commonSetup(FMLCommonSetupEvent event)
-	{
-		SIDEPROXY.setup();
-	}
-	
 	@SubscribeEvent
 	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();
 		ClientRegistry.registerKeyBinding(KEY_WORLD_HANDLER);
 		UtilKeyBinding.updatePosKeys();
diff --git a/src/main/java/exopandora/worldhandler/proxy/ClientProxy.java b/src/main/java/exopandora/worldhandler/proxy/ClientProxy.java
deleted file mode 100644
index 1c23681..0000000
--- a/src/main/java/exopandora/worldhandler/proxy/ClientProxy.java
+++ /dev/null
@@ -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);
-	}
-}
diff --git a/src/main/java/exopandora/worldhandler/proxy/CommonProxy.java b/src/main/java/exopandora/worldhandler/proxy/CommonProxy.java
deleted file mode 100644
index 8cc414b..0000000
--- a/src/main/java/exopandora/worldhandler/proxy/CommonProxy.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package exopandora.worldhandler.proxy;
-
-public class CommonProxy
-{
-	public void setup()
-	{
-		
-	}
-}