Fixed proxy being null

Author: Clashsoft

BrewingAPI.java

@@ -30,10 +30,9 @@
 import clashsoft.cslib.reflect.CSReflection;
 import clashsoft.cslib.util.CSLog;
 import clashsoft.cslib.util.CSUtil;
-import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.*;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -68,6 +67,21 @@ public class BrewingAPI extends ClashsoftMod
 	@SidedProxy(clientSide = "clashsoft.brewingapi.client.BAPIClientProxy", serverSide = "clashsoft.brewingapi.common.BAPIProxy")
 	public static BAPIProxy			proxy;
 
+	static
+	{
+		if (proxy == null)
+		{
+			if (FMLCommonHandler.instance().getEffectiveSide().isClient())
+			{
+				proxy = CSReflection.createInstance("clashsoft.brewingapi.client.BAPIClientProxy");
+			}
+			else
+			{
+				proxy = new BAPIProxy();
+			}
+		}
+	}
+	
 	// API Stuff
 
 	private static Boolean			mpmInstalled			= null;

common/BAPIProxy.java

@@ -10,17 +10,17 @@
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 public class BAPIProxy extends BaseProxy
 {
 	@Override
 	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
 	{
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
-		if (tileEntity instanceof TileEntityBrewingStand2)
-			return new ContainerBrewingStand2(player.inventory, (TileEntityBrewingStand2) tileEntity);
+		if (ID == BrewingAPI.brewingStand2ID)
+		{
+			return new ContainerBrewingStand2(player.inventory, (TileEntityBrewingStand2) world.getTileEntity(x, y, z));
+		}
 		return null;
 	}