delete SideOnly annotation in gt++ ClientProxy

1 files changed, 8 insertions, 47 deletions

diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index e45bd76544..ac93757845 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -7,6 +7,7 @@ import net.minecraft.client.renderer.entity.RenderFireball;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -22,8 +23,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.client.renderer.CustomItemBlockRenderer;
@@ -48,53 +47,32 @@ import gtPlusPlus.xmod.gregtech.common.render.FlaskRenderer;
 import gtPlusPlus.xmod.gregtech.common.render.MachineBlockRenderer;
 import ic2.core.item.ItemFluidCell;
 
-public class ClientProxy extends CommonProxy implements Runnable {
+public class ClientProxy extends CommonProxy {
 
-    private final CapeRenderer mCapeRenderer;
-
-    @SideOnly(Side.CLIENT)
-    public static boolean mFancyGraphics = false;
-
-    public ClientProxy() {
-        mCapeRenderer = new CapeRenderer();
-        // Get Graphics Mode.
-        mFancyGraphics = Minecraft.isFancyGraphicsEnabled();
-    }
+    private final CapeRenderer mCapeRenderer = new CapeRenderer();
+    public static String playerName = "";
 
     @SubscribeEvent
-    public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
+    public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
         if (ConfigSwitches.enableCustomCapes) {
             mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
         }
     }
 
-    @SideOnly(Side.CLIENT)
-    public static String playerName = "";
-
     @Override
     public void preInit(final FMLPreInitializationEvent e) {
         super.preInit(e);
-        if (ConfigSwitches.enableCustomCapes) {
-            onPreLoad();
-        }
         // Do this weird things for textures.
         GTplusplus.loadTextures();
     }
 
     @Override
     public void init(final FMLInitializationEvent e) {
-
-        /**
-         * Custom Block Renderers
-         */
         new CustomOreBlockRenderer();
         new CustomItemBlockRenderer();
         new MachineBlockRenderer();
-
         new FlaskRenderer();
-
         MinecraftForge.EVENT_BUS.register(new NEIGTPPConfig());
-
         super.init(e);
     }
 
@@ -105,12 +83,7 @@ public class ClientProxy extends CommonProxy implements Runnable {
 
     @Override
     public void registerRenderThings() {
-
-        // Standard GT++
-
-        /**
-         * Entities
-         */
+        // Entities
         RenderingRegistry
             .registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed());
         RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze());
@@ -118,10 +91,7 @@ public class ClientProxy extends CommonProxy implements Runnable {
             .registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderStaballoyConstruct());
         RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F));
         RenderingRegistry.registerEntityRenderingHandler(EntityLightningAttack.class, new RenderFireball(1F));
-
-        /**
-         * Tiles
-         */
+        // Tiles
         Logger.INFO("Registering Custom Renderer for the Lead Lined Chest.");
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecayablesChest.class, new RenderDecayChest());
     }
@@ -134,15 +104,6 @@ public class ClientProxy extends CommonProxy implements Runnable {
     @Override
     public void serverStarting(final FMLServerStartingEvent e) {}
 
-    public void onPreLoad() {
-
-    }
-
-    @Override
-    public void run() {
-
-    }
-
     @Override
     public void onLoadComplete(FMLLoadCompleteEvent event) {
         if (GTPPCore.ConfigSwitches.hideUniversalCells) {
@@ -151,7 +112,7 @@ public class ClientProxy extends CommonProxy implements Runnable {
         super.onLoadComplete(event);
     }
 
-    public void hideUniversalCells() {
+    private void hideUniversalCells() {
         ArrayList<ItemStack> itemList = new ArrayList<>();
         for (Fluid fluid : FluidRegistry.getRegisteredFluids()
             .values()) {