2 files changed, 66 insertions, 60 deletions

diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index cc165e2d78..06401f53ba 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -1,86 +1,90 @@
 package gtPlusPlus.core.proxy;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.event.*;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.util.particles.EntityParticleFXMysterious;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.entity.Entity;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
 
-public class ClientProxy extends CommonProxy {
+public class ClientProxy extends CommonProxy{
 
 	@Override
-	public int addArmor(final String armor) {
-		return RenderingRegistry.addNewArmourRendererPrefix(armor);
-	}
-
-	@Override
-	public void generateMysteriousParticles(final Entity theEntity) {
-		final double motionX = theEntity.worldObj.rand.nextGaussian() * 0.02D;
-		final double motionY = theEntity.worldObj.rand.nextGaussian() * 0.02D;
-		final double motionZ = theEntity.worldObj.rand.nextGaussian() * 0.02D;
-		final EntityFX particleMysterious = new EntityParticleFXMysterious(
-
-				theEntity.worldObj, theEntity.posX + theEntity.worldObj.rand.nextFloat() * theEntity.width
-
-						* 2.0F - theEntity.width,
-				theEntity.posY + 0.5D + theEntity.worldObj.rand.nextFloat()
-
-						* theEntity.height,
-				theEntity.posZ + theEntity.worldObj.rand.nextFloat() * theEntity.width
-
-						* 2.0F - theEntity.width,
-
-				motionX,
-
-				motionY,
-
-				motionZ);
-		Minecraft.getMinecraft().effectRenderer.addEffect(particleMysterious);
+	public void preInit(FMLPreInitializationEvent e) {
+		// TODO Auto-generated method stub
+		super.preInit(e);
+		//Do this weird things for textures.
+		GTplusplus.loadTextures();		
 	}
 
 	@Override
-	public void init(final FMLInitializationEvent e) {
+	public void init(FMLInitializationEvent e) {
 		// TODO Auto-generated method stub
 		super.init(e);
 	}
 
 	@Override
-	public void postInit(final FMLPostInitializationEvent e) {
+	public void postInit(FMLPostInitializationEvent e) {
 		// TODO Auto-generated method stub
 		super.postInit(e);
 	}
 
 	@Override
-	public void preInit(final FMLPreInitializationEvent e) {
-		// TODO Auto-generated method stub
-		super.preInit(e);
-		// Do this weird things for textures.
-		GTplusplus.loadTextures();
+	public void registerRenderThings(){
+		//MinecraftForgeClient.registerItemRenderer(ModItems.FluidCell.getItem(), new RenderLiquidCell());
+		//RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelMob.class, new RenderBloodSteelMob(new ModelBloodSteelMob(), 0));
+		//RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelHostileMob.class, new RenderBloodSteelMobHostile(new ModelBloodSteelMob(), 0));
+		//RenderingRegistry.registerEntityRenderingHandler(EntityGrenade.class, new RenderSnowball(ModItems.tutGrenade));
+
+		//ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBloodSteelChest.class, new BloodSteelChestRenderer());
+		//MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tutChest), new ItemRenderBloodSteelChest());
 	}
 
 	@Override
-	public void registerRenderThings() {
-		// MinecraftForgeClient.registerItemRenderer(ModItems.FluidCell.getItem(),
-		// new RenderLiquidCell());
-		// RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelMob.class,
-		// new RenderBloodSteelMob(new ModelBloodSteelMob(), 0));
-		// RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelHostileMob.class,
-		// new RenderBloodSteelMobHostile(new ModelBloodSteelMob(), 0));
-		// RenderingRegistry.registerEntityRenderingHandler(EntityGrenade.class,
-		// new RenderSnowball(ModItems.tutGrenade));
-
-		// ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBloodSteelChest.class,
-		// new BloodSteelChestRenderer());
-		// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tutChest),
-		// new ItemRenderBloodSteelChest());
+	public int addArmor(String armor){
+		return RenderingRegistry.addNewArmourRendererPrefix(armor);
 	}
 
+
+
 	@Override
-	public void serverStarting(final FMLServerStartingEvent e) {
+	public void generateMysteriousParticles(Entity theEntity)
+	{
+		double motionX = theEntity.worldObj.rand.nextGaussian() * 0.02D;
+		double motionY = theEntity.worldObj.rand.nextGaussian() * 0.02D;
+		double motionZ = theEntity.worldObj.rand.nextGaussian() * 0.02D;
+		EntityFX particleMysterious = new EntityParticleFXMysterious(
+
+				theEntity.worldObj, 
+				theEntity.posX + theEntity.worldObj.rand.nextFloat() * theEntity.width 
+
+				* 2.0F - theEntity.width, 
+				theEntity.posY + 0.5D + theEntity.worldObj.rand.nextFloat() 
+
+				* theEntity.height, 
+				theEntity.posZ + theEntity.worldObj.rand.nextFloat() * theEntity.width 
+
+				* 2.0F - theEntity.width, 
 
+				motionX, 
+
+				motionY, 
+
+				motionZ);
+		Minecraft.getMinecraft().effectRenderer.addEffect(particleMysterious);        
+	}
+
+	@Override
+	public void serverStarting(FMLServerStartingEvent e)
+	{
+		
 	}
 
+
+
 }
diff --git a/src/Java/gtPlusPlus/core/proxy/ServerProxy.java b/src/Java/gtPlusPlus/core/proxy/ServerProxy.java
index ac1f9d65c8..1f912b9022 100644
--- a/src/Java/gtPlusPlus/core/proxy/ServerProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ServerProxy.java
@@ -1,26 +1,28 @@
 package gtPlusPlus.core.proxy;
 
-import cpw.mods.fml.common.event.*;
 import gtPlusPlus.core.common.CommonProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
-public class ServerProxy extends CommonProxy {
+public class ServerProxy extends CommonProxy{
 
 	@Override
-	public void init(final FMLInitializationEvent e) {
+	public void preInit(FMLPreInitializationEvent e) {
 		// TODO Auto-generated method stub
-		super.init(e);
+		super.preInit(e);
 	}
 
 	@Override
-	public void postInit(final FMLPostInitializationEvent e) {
+	public void init(FMLInitializationEvent e) {
 		// TODO Auto-generated method stub
-		super.postInit(e);
+		super.init(e);
 	}
 
 	@Override
-	public void preInit(final FMLPreInitializationEvent e) {
+	public void postInit(FMLPostInitializationEvent e) {
 		// TODO Auto-generated method stub
-		super.preInit(e);
+		super.postInit(e);
 	}
 
 }