Merge branch 'controls-refactor' into 1.12.2

Fixes incompatibilities with a lot of mods while using vehicles. Fixes #401 Fixes #936 Fixes #1016
FlansMods · Mar 10, 2019 · be28038 · be28038
2 parents af1ecdf + c56339c
commit be28038
Show file tree

Hide file tree

Showing 41 changed files with 571 additions and 1,027 deletions.
diff --git a/src/main/java/com/flansmod/client/ClientEventHandler.java b/src/main/java/com/flansmod/client/ClientEventHandler.java
diff --git a/src/main/java/com/flansmod/client/ClientProxy.java b/src/main/java/com/flansmod/client/ClientProxy.java
@@ -33,6 +33,8 @@
 import net.minecraftforge.fml.common.discovery.ContainerType;
 import net.minecraftforge.fml.common.discovery.ModCandidate;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import com.flansmod.client.debug.EntityDebugAABB;
 import com.flansmod.client.debug.EntityDebugDot;
@@ -50,6 +52,9 @@
 import com.flansmod.client.gui.GuiGunModTable;
 import com.flansmod.client.gui.GuiMechaInventory;
 import com.flansmod.client.gui.GuiPaintjobTable;
+import com.flansmod.client.handlers.ClientEventHandler;
+import com.flansmod.client.handlers.FlansModResourceHandler;
+import com.flansmod.client.handlers.KeyInputHandler;
 import com.flansmod.client.model.RenderAAGun;
 import com.flansmod.client.model.RenderBullet;
 import com.flansmod.client.model.RenderFlag;
@@ -102,6 +107,7 @@
 import com.flansmod.common.types.InfoType;
 import com.flansmod.common.types.PaintableType;
 
+@SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy
 {
 	public static String modelDir = "com.flansmod.client.model.";