Reworked the whole repo.

5 files changed, 0 insertions, 748 deletions

diff --git a/java/darkknight/jewelrycraft/events/BucketHandler.java b/java/darkknight/jewelrycraft/events/BucketHandler.java
deleted file mode 100644
index 871f26e..0000000
--- a/java/darkknight/jewelrycraft/events/BucketHandler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com
- *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public License
- * 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
- */
-package darkknight.jewelrycraft.events;
-
-import java.util.HashMap;
-import java.util.Map;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import net.minecraftforge.event.entity.player.FillBucketEvent;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.block.BlockMoltenMetal;
-import darkknight.jewelrycraft.util.JewelryNBT;
-
-public class BucketHandler
-{
-    public static BucketHandler INSTANCE = new BucketHandler();
-    public Map<Block, Item> buckets = new HashMap<Block, Item>();
-    
-    /**
-     * 
-     */
-    private BucketHandler()
-    {}
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onBucketFill(FillBucketEvent event)
-    {
-        ItemStack result = fillCustomBucket(event.world, event.target);
-        if (result == null) return;
-        event.result = result;
-        event.setResult(Result.ALLOW);
-    }
-    
-    /**
-     * @param world
-     * @param pos
-     * @return
-     */
-    private ItemStack fillCustomBucket(World world, MovingObjectPosition pos)
-    {
-        Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ);
-        Item bucket = buckets.get(block);
-        if (bucket != null && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) != Blocks.air && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) instanceof BlockMoltenMetal){
-            world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ);
-            ItemStack item = new ItemStack(bucket);
-            String ingotData = JewelrycraftMod.saveData.getString(pos.blockX + " " + pos.blockY + " " + pos.blockZ + " " + world.provider.dimensionId);
-            if (ingotData != null && ingotData != ""){
-                String[] splitData = ingotData.split(":");
-                if (splitData.length == 3){
-                    int itemID, itemDamage;
-                    try{
-                        itemID = Integer.parseInt(splitData[0]);
-                        itemDamage = Integer.parseInt(splitData[1]);
-                        Integer.parseInt(splitData[2]);
-                        JewelryNBT.addMetal(item, new ItemStack(Item.getItemById(itemID), 1, itemDamage));
-                    }
-                    catch(Exception e){
-                        e.printStackTrace();
-                    }
-                }
-            }
-            return item;
-        }else return null;
-    }
-}
\ No newline at end of file
diff --git a/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/java/darkknight/jewelrycraft/events/EntityEventHandler.java
deleted file mode 100644
index f9cbd19..0000000
--- a/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ /dev/null
@@ -1,465 +0,0 @@
-package darkknight.jewelrycraft.events;
-
-import ibxm.Player;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.MathHelper;
-import net.minecraftforge.client.event.EntityViewRenderEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
-import net.minecraftforge.event.entity.item.ItemTossEvent;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
-import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
-import net.minecraftforge.event.entity.living.LivingFallEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent;
-import net.minecraftforge.event.world.WorldEvent;
-import org.lwjgl.opengl.GL11;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.config.ConfigHandler;
-import darkknight.jewelrycraft.curses.Curse;
-import darkknight.jewelrycraft.damage.DamageSourceList;
-import darkknight.jewelrycraft.entities.EntityHalfHeart;
-import darkknight.jewelrycraft.entities.EntityHeart;
-import darkknight.jewelrycraft.item.ItemBaseJewelry;
-import darkknight.jewelrycraft.item.ItemBracelet;
-import darkknight.jewelrycraft.item.ItemList;
-import darkknight.jewelrycraft.lib.Reference;
-import darkknight.jewelrycraft.network.PacketClearColorCache;
-import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
-import darkknight.jewelrycraft.network.PacketSendCurseStats;
-import darkknight.jewelrycraft.network.PacketSendPlayerInfo;
-import darkknight.jewelrycraft.util.BlockUtils;
-import darkknight.jewelrycraft.util.JewelryNBT;
-import darkknight.jewelrycraft.util.JewelrycraftUtil;
-import darkknight.jewelrycraft.util.PlayerUtils;
-
-/**
- * Code taken from OpenBlocks
- */
-public class EntityEventHandler
-{
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onEntityJoinWorld(EntityJoinWorldEvent event)
-    {
-        if (event.entity instanceof EntityPlayerMP) JewelrycraftMod.netWrapper.sendTo(new PacketClearColorCache(), (EntityPlayerMP)event.entity);
-        if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-        final Entity entity = event.entity;
-        if (!event.world.isRemote && entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            boolean shouldGiveManual = ItemList.guide != null && !persistTag.getBoolean("givenGuide");
-            if (shouldGiveManual){
-                ItemStack manual = new ItemStack(ItemList.guide);
-                if (!player.inventory.addItemStackToInventory(manual)) BlockUtils.dropItemStackInWorld(player.worldObj, player.posX, player.posY, player.posZ, manual);
-                persistTag.setBoolean("givenGuide", true);
-            }
-            boolean render = persistTag.getBoolean("fancyRender");
-            JewelrycraftMod.fancyRender = render;
-            for(Curse curse: Curse.getCurseList())
-                if (!persistTag.hasKey(curse.getName())) persistTag.setInteger(curse.getName(), 0);
-            persistTag.setBoolean("sendInfo", true);
-        }
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onEntityUpdate(LivingUpdateEvent event)
-    {
-        Entity entity = event.entity;
-        if (entity.getEntityData().getBoolean("stunned") && entity.getEntityData().getInteger("stunTime") > 0){
-            entity.motionX *= 0D;
-            entity.motionZ *= 0D;
-            entity.motionY *= 0D;
-            entity.rotationPitch = entity.prevRotationPitch;
-            entity.rotationYaw = entity.prevRotationYaw;
-            entity.getEntityData().setInteger("stunTime", entity.getEntityData().getInteger("stunTime") - 1);
-            if (entity.getEntityData().getInteger("stunTime") == 0) entity.getEntityData().setBoolean("stunned", false);
-            entity.worldObj.spawnParticle("spell", entity.posX, entity.posY + entity.height, entity.posZ, 0.0D, 0.3D, 0.0D);
-        }
-        if (entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            playerInfo.setBoolean("fancyRender", JewelrycraftMod.fancyRender);
-            if (playerInfo.getBoolean("stunned") && playerInfo.getInteger("stunTime") > 0){
-                player.motionX *= 0D;
-                player.motionZ *= 0D;
-                player.motionY *= 0D;
-                player.rotationPitch = entity.prevRotationPitch;
-                player.rotationYaw = entity.prevRotationYaw;
-                playerInfo.setInteger("stunTime", playerInfo.getInteger("stunTime") - 1);
-                if (playerInfo.getInteger("stunTime") == 0) playerInfo.setBoolean("stunned", false);
-                player.worldObj.spawnParticle("spell", entity.posX, entity.posY + 0.5F, entity.posZ, 0.0D, 0.3D, 0.0D);
-            }
-            for(int i = 0; i < 18; i++)
-                if (playerInfo.hasKey("ext" + i)){
-                    NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
-                    ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                    ((ItemBaseJewelry)item.getItem()).action(item, player);
-                }
-            if (!player.worldObj.isRemote){
-                if (playerInfo.hasKey("reselectCurses") && !playerInfo.getBoolean("reselectCurses")){
-                    playerInfo.setInteger("curseTime", playerInfo.getInteger("curseTime") - 10000);
-                    if (playerInfo.getInteger("curseTime") <= 0) playerInfo.setBoolean("reselectCurses", true);
-                }
-                if (playerInfo.hasKey("playerCursePointsChanged") && playerInfo.getBoolean("playerCursePointsChanged")){
-                    int points = playerInfo.getInteger("cursePoints");
-                    for(int i = 1; i <= JewelrycraftMod.MAX_CURSES; i++)
-                        if (points > (i - 1) * 1750) addCurse(player, playerInfo, i);
-                    if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") || playerInfo.getBoolean("reselectCurses")){
-                        playerInfo.setInteger("curseTime", 23000);
-                        playerInfo.setBoolean("reselectCurses", false);
-                    }
-                    JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-                }
-                if (playerInfo.getBoolean("playerCursePointsChanged")) playerInfo.setBoolean("playerCursePointsChanged", false);
-                if (playerInfo.getBoolean("sendInfo")){
-                    JewelrycraftMod.netWrapper.sendToAll(new PacketSendCurseStats());
-                    playerInfo.setBoolean("sendInfo", false);
-                }
-                for(Curse curse: Curse.getCurseList())
-                    if (playerInfo.getInteger(curse.getName()) > 0) curse.action(player.worldObj, player);
-            }
-        }
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onEntityAttacked(LivingAttackEvent event)
-    {
-        Entity entity = event.entityLiving;
-        if (entity instanceof EntityPlayer && !(event.source.getEntity() instanceof EntityPlayer)){
-            EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            if (event.source.getEntity() != null && event.source.getEntity().getEntityData().getBoolean("stunned")) event.setCanceled(true);
-            if (!player.worldObj.isRemote) for(int i = 0; i < 18; i++)
-                if (playerInfo.hasKey("ext" + i)){
-                    NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
-                    ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                    if (((ItemBaseJewelry)item.getItem()).onPlayerAttackedCacellable(item, player, event.source, event.ammount)){
-                        event.setCanceled(true);
-                        break;
-                    }
-                    if (playerInfo.getBoolean("negateDamage")){
-                        playerInfo.setBoolean("negateDamage", false);
-                        event.setCanceled(true);
-                        break;
-                    }
-                    ((ItemBaseJewelry)item.getItem()).onPlayerAttacked(item, player, event.source, event.ammount);
-                }
-            if (player.getHealth() != player.prevHealth){
-                if (playerInfo.getFloat("WhiteHeart") > 0){
-                    playerInfo.setFloat("WhiteHeart", 0f);
-                    JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-                }
-                if (playerInfo.getFloat("BlueHeart") > 0){
-                    float damage = playerInfo.getFloat("BlueHeart") - event.ammount;
-                    if (damage >= 0){
-                        playerInfo.setFloat("BlueHeart", damage);
-                        JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-                        player.heal(event.ammount);
-                    }else{
-                        playerInfo.setFloat("BlueHeart", 0f);
-                        JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-                        player.heal(Math.abs(damage));
-                    }
-                }else if (playerInfo.getFloat("BlackHeart") > 0){
-                    AxisAlignedBB axisalignedbb = player.boundingBox.expand(2.0D, 0.0D, 2.0D);
-                    List enemies = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, axisalignedbb);
-                    if (enemies != null && !enemies.isEmpty()){
-                        Iterator iterator = enemies.iterator();
-                        while (iterator.hasNext()){
-                            Entity enemy = (Entity)iterator.next();
-                            enemy.attackEntityFrom(DamageSourceList.blackHeart, 5f * event.ammount);
-                        }
-                    }
-                    float damage = playerInfo.getFloat("BlackHeart") - event.ammount;
-                    if (damage >= 0){
-                        playerInfo.setFloat("BlackHeart", damage);
-                        JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-                        player.heal(event.ammount);
-                    }else{
-                        playerInfo.setFloat("BlackHeart", 0f);
-                        JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-                        player.heal(Math.abs(damage));
-                    }
-                }
-            }
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0) curse.attackedAction(player.worldObj, player);
-        }else if (event.source.getEntity() instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)event.source.getEntity();
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            for(int i = 0; i < 18; i++)
-                if (playerInfo.hasKey("ext" + i)){
-                    NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
-                    ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                    if (((ItemBaseJewelry)item.getItem()).onEntityAttackedCacellable(item, player, entity, event.ammount)){
-                        event.setCanceled(true);
-                        break;
-                    }
-                    if (playerInfo.getBoolean("weakDamage")){
-                        playerInfo.setBoolean("weakDamage", false);
-                        event.setCanceled(true);
-                        break;
-                    }
-                    ((ItemBaseJewelry)item.getItem()).onEntityAttacked(item, player, entity, event.ammount);
-                }
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0) curse.attackedByPlayerAction(entity.worldObj, player, entity);
-        }
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onPlayerRespawn(PlayerEvent.Clone event)
-    {
-        EntityPlayer player = event.entityPlayer;
-        if (!player.worldObj.isRemote){
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            if (playerInfo.hasKey("cursePoints") && playerInfo.getInteger("cursePoints") > 0){
-                int points = playerInfo.getInteger("cursePoints");
-                for(int i = 1; i <= JewelrycraftMod.MAX_CURSES; i++)
-                    if (points > (i - 1) * 1750) addCurse(player, playerInfo, i);
-                if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") || playerInfo.getBoolean("reselectCurses")){
-                    playerInfo.setInteger("curseTime", 23000);
-                    playerInfo.setBoolean("reselectCurses", false);
-                }
-            }
-            playerInfo.setBoolean("sendInfo", true);
-            playerInfo.setFloat("BlueHeart", 0f);
-            playerInfo.setFloat("BlackHeart", 0f);
-            playerInfo.setFloat("WhiteHeart", 0f); 
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0) curse.respawnAction(player.worldObj, player);
-        }
-        if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-    }
-    
-    /**
-     * @param player
-     * @param playerInfo
-     * @param curse
-     */
-    public void addCurse(EntityPlayer player, NBTTagCompound playerInfo, int curseNo)
-    {
-        if (Curse.availableCurses.size() > 0 && curseNo > Curse.getCurseList().size() - Curse.availableCurses.size()){
-            int no = JewelrycraftUtil.rand.nextInt(Curse.availableCurses.size());
-            Curse cur = Curse.availableCurses.get(no);
-            playerInfo.setInteger(cur.getName(), 1);
-            Curse.availableCurses.remove(cur);
-            playerInfo.setBoolean("sendInfo", true);
-        }
-    }
-    
-    public static void addCurse(EntityPlayer player, NBTTagCompound playerInfo, int curseID, int grade)
-    {
-        Curse cur = Curse.getCurseList().get(curseID);
-        if (Curse.availableCurses.size() > 0 && Curse.availableCurses.contains(cur)){
-            playerInfo.setInteger(cur.getName(), grade);
-            Curse.availableCurses.remove(cur);
-            playerInfo.setBoolean("sendInfo", true);
-        }
-    }
-    
-    @SubscribeEvent
-    public void itemToss(ItemTossEvent event)
-    {
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(event.player, "Jewelrycraft");
-        for(Curse curse: Curse.getCurseList())
-            if (playerInfo.getInteger(curse.getName()) > 0 && curse.itemToss()){
-                EntityItem entityitem = new EntityItem(event.player.worldObj, event.player.posX + 0.5D, event.player.posY + 0.5D, event.player.posZ + 0.5D, event.entityItem.getEntityItem());
-                entityitem.motionX = 0;
-                entityitem.motionZ = 0;
-                entityitem.motionY = 0.11000000298023224D;
-                event.player.worldObj.spawnEntityInWorld(entityitem);
-                List players = MinecraftServer.getServer().getConfigurationManager().playerEntityList;
-                Iterator plrs = players.iterator();
-                while (plrs.hasNext())
-                    ((EntityPlayerMP)plrs.next()).addChatComponentMessage(new ChatComponentText("<" + event.player.getDisplayName() + "> This is MY item! MINE! I will NEVER give it to you! Mine! Mine! MINE!"));
-                event.setCanceled(true);
-            }
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void playerFileSave(PlayerEvent.SaveToFile event)
-    {
-        if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onEntityDead(LivingDeathEvent event)
-    {
-        final Entity entity = event.entity;
-        Random rand = new Random();
-        String[] types = {"Red", "Blue", "White", "Black"};
-        if (!entity.worldObj.isRemote && !(entity instanceof EntityPlayer) && entity instanceof EntityLiving){
-            EntityLiving live = (EntityLiving)entity;
-            String type = types[rand.nextInt(4)];
-            if (rand.nextInt(6) == 0){
-                if (type == "White"){
-                    EntityHeart h = new EntityHalfHeart(live.worldObj);
-                    h.setType(type);
-                    h.setLocationAndAngles(live.posX, live.posY, live.posZ, MathHelper.wrapAngleTo180_float(rand.nextFloat() * 360.0F), 0.0F);
-                    live.worldObj.spawnEntityInWorld(h);
-                }else{
-                    for(int i = 1; i <= 1 + rand.nextInt(1 + (int)(live.getMaxHealth() / 20)); i++){
-                        EntityHeart[] hearts = {new EntityHeart(live.worldObj), new EntityHalfHeart(entity.worldObj)};
-                        EntityHeart h = hearts[rand.nextInt(2)];
-                        h.setType(type);
-                        h.setLocationAndAngles(live.posX, live.posY, live.posZ, MathHelper.wrapAngleTo180_float(rand.nextFloat() * 360.0F), 0.0F);
-                        live.worldObj.spawnEntityInWorld(h);
-                    }
-                }
-            }
-        }
-        if (entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            playerInfo.setFloat("BlueHeart", 0f);
-            playerInfo.setFloat("BlackHeart", 0f);
-            playerInfo.setFloat("WhiteHeart", 0f); 
-            if (playerInfo.hasKey("reselectCurses") && playerInfo.getBoolean("reselectCurses")){
-                for(Curse l: Curse.getCurseList()){
-                    if (playerInfo.getInteger(l.getName()) == 1){
-                        playerInfo.setInteger(l.getName(), 0);
-                        if (!Curse.availableCurses.contains(l)) Curse.availableCurses.add(l);
-                    }else if (playerInfo.getInteger(l.getName()) >= 2) playerInfo.setInteger(l.getName(), 1);
-                }
-                if (entity.worldObj.isRemote) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-            }
-            playerInfo.setBoolean("sendInfo", true);
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0) curse.deathAction(player.worldObj, player);
-        }
-        if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onWorldLoad(WorldEvent.Load event)
-    {
-        if (!event.world.isRemote){
-            new File(JewelrycraftMod.dir + File.separator + "Jewelrycraft").mkdirs();
-            JewelrycraftMod.liquidsConf = new File(JewelrycraftMod.dir + File.separator + "Jewelrycraft", "JLP" + event.world.getWorldInfo().getWorldName() + ".cfg");
-            try{
-                if (!JewelrycraftMod.liquidsConf.exists()) JewelrycraftMod.liquidsConf.createNewFile();
-            }
-            catch(IOException e){
-                e.printStackTrace();
-            }
-        }
-        if (FMLCommonHandler.instance().getEffectiveSide().isServer()) try{
-            if (JewelrycraftMod.liquidsConf.exists()) JewelrycraftMod.saveData = CompressedStreamTools.readCompressed(new FileInputStream(JewelrycraftMod.liquidsConf));
-        }
-        catch(EOFException e){
-            e.printStackTrace();
-        }
-        catch(IOException e){
-            e.printStackTrace();
-        }
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onWorldSave(WorldEvent.Save event)
-    {
-        if (FMLCommonHandler.instance().getEffectiveSide().isServer()) try{
-            if (JewelrycraftMod.liquidsConf.exists()) CompressedStreamTools.writeCompressed(JewelrycraftMod.saveData, new FileOutputStream(JewelrycraftMod.liquidsConf));
-        }
-        catch(EOFException e){
-            e.printStackTrace();
-        }
-        catch(IOException e){
-            e.printStackTrace();
-        }
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    @SideOnly (Side.CLIENT)
-    public void fogColors(EntityViewRenderEvent.FogColors event)
-    {
-        if (event.entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)event.entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            if (persistTag.getBoolean("nearStartedRitual")){
-                event.red = 0f;
-                event.green = 0f;
-                event.blue = 0f;
-            }
-        }
-        if (event.isCancelable()) event.setCanceled(true);
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    @SideOnly (Side.CLIENT)
-    public void fogDensity(EntityViewRenderEvent.FogDensity event)
-    {}
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    @SideOnly (Side.CLIENT)
-    public void renderFog(EntityViewRenderEvent.RenderFogEvent event)
-    {
-        if (event.entity instanceof EntityPlayer){
-            EntityPlayer player = (EntityPlayer)event.entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            if (persistTag.getBoolean("nearStartedRitual")){
-                GL11.glFogi(GL11.GL_FOG_MODE, GL11.GL_EXP);
-                GL11.glFogf(GL11.GL_FOG_DENSITY, 0.6F);
-            }
-        }
-        if (event.isCancelable()) event.setCanceled(true);
-    }
-}
\ No newline at end of file
diff --git a/java/darkknight/jewelrycraft/events/KeyBindings.java b/java/darkknight/jewelrycraft/events/KeyBindings.java
deleted file mode 100644
index a032047..0000000
--- a/java/darkknight/jewelrycraft/events/KeyBindings.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package darkknight.jewelrycraft.events;
-
-import net.minecraft.client.settings.KeyBinding;
-import org.lwjgl.input.Keyboard;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.InputEvent;
-import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.network.PacketKeyPressEvent;
-
-public class KeyBindings
-{
-    public static KeyBinding render = new KeyBinding("Pretty Render", Keyboard.KEY_Z, "Jewelrycraft");
-    public static KeyBinding inventory = new KeyBinding("Jewelry Inventory", Keyboard.KEY_J, "Jewelrycraft");
-    
-    /**
-     * 
-     */
-    public KeyBindings()
-    {
-        ClientRegistry.registerKeyBinding(render);
-        ClientRegistry.registerKeyBinding(inventory);
-    }
-    
-    /**
-     * @param event
-     */
-    @SubscribeEvent
-    public void onKeyInput(InputEvent.KeyInputEvent event)
-    {
-        if (render.isPressed()) JewelrycraftMod.fancyRender = !JewelrycraftMod.fancyRender;
-        if (inventory.isPressed()) JewelrycraftMod.netWrapper.sendToServer(new PacketKeyPressEvent(0));
-    }
-}
\ No newline at end of file
diff --git a/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
deleted file mode 100644
index d85620a..0000000
--- a/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package darkknight.jewelrycraft.events;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraftforge.client.event.RenderPlayerEvent;
-import org.lwjgl.opengl.GL11;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.entities.renders.RenderHelper;
-import darkknight.jewelrycraft.lib.Reference;
-import darkknight.jewelrycraft.model.ModelMask;
-import darkknight.jewelrycraft.tileentity.renders.MaskRender;
-import darkknight.jewelrycraft.util.PlayerUtils;
-
-public class PlayerRenderHandler
-{
-    ModelMask maskModel = new ModelMask();
-    MaskRender mask = new MaskRender();
-    
-    public static String[] infamyCache = new String[] {};
-    
-    @SubscribeEvent
-    public void renderScreen(RenderPlayerEvent.Specials.Post event)
-    {        
-        if (infamyCache != null)
-        {
-            Iterator<EntityPlayer> players = event.entityPlayer.worldObj.playerEntities.iterator();
-            
-            while(players.hasNext())
-            {
-                EntityPlayer player = players.next();
-                if (checkPlayerInfamy(player.getDisplayName()) && event.entityPlayer.getDisplayName().equals(player.getDisplayName()))
-                {
-                    float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick;
-                    float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick;
-                    float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick;
-                    GL11.glPushMatrix();
-                    GL11.glColor4f(1, 1, 1, 1);
-                    GL11.glRotatef(yawOffset, 0, -1, 0);
-                    GL11.glRotatef(yaw - 90, 0, 1, 0);
-                    GL11.glRotatef(pitch, 0, 0, -1);
-                    GL11.glRotatef(90F, 0, 1F, 0F);
-                    RenderHelper.translateToHeadLevel(player);
-                    GL11.glScalef(1.6f, 1.6f, 1.6f);
-                    GL11.glTranslatef(-0.25F, -0.25F, -0.25F);
-                    mask.doRender(event.entityPlayer, 0F, 0F, 0F, 0F, 0F);
-                    GL11.glPopMatrix();
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string
-     * @return
-     */
-    private boolean checkPlayerInfamy(String string)
-    {
-        for (int i = 0; i < infamyCache.length; i++)
-            if (infamyCache[i].equals(string)) return true;
-        
-        return false;
-    }
-}
diff --git a/java/darkknight/jewelrycraft/events/ScreenHandler.java b/java/darkknight/jewelrycraft/events/ScreenHandler.java
deleted file mode 100644
index 7121f3e..0000000
--- a/java/darkknight/jewelrycraft/events/ScreenHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package darkknight.jewelrycraft.events;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiChat;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
-import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent;
-import org.lwjgl.opengl.GL11;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.curses.Curse;
-
-public class ScreenHandler extends Gui
-{
-    private Minecraft mc;
-    public static NBTTagCompound tagCache = null;
-    public static int cooldown;
-    static ResourceLocation texture;
-    static ResourceLocation hearts = new ResourceLocation("jewelrycraft", "textures/gui/hearts.png");
-    
-    public ScreenHandler(Minecraft mc, ResourceLocation tex)
-    {
-        super();
-        this.mc = mc;
-        texture = tex;
-    }
-    
-    @SubscribeEvent
-    public void renderScreen(RenderGameOverlayEvent event)
-    {
-//        if (event.type != ElementType.TEXT) Gui.drawRect(0, 0, mc.displayWidth, mc.displayHeight, 0xff000000);
-        if (event.isCancelable() || event.type != ElementType.ALL || tagCache == null) return;
-        if (!mc.gameSettings.showDebugInfo && !(mc.currentScreen instanceof GuiChat)){
-            int count = 0;
-            int size = 32;
-            ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
-            if (tagCache.hasKey("cursePoints") && tagCache.getInteger("cursePoints") > 0){
-                mc.renderEngine.bindTexture(texture);
-                for(Curse curse: Curse.getCurseList()){
-                    if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
-                        Gui.drawRect(0, (size / 2 + 6) * count, 24 + mc.fontRenderer.getStringWidth(curse.getName().split(":")[1]), 4 + (size / 2 + 6) * count + 16, 0xaf000000);
-                        Gui.drawRect(2, 2 + (size / 2 + 6) * count, 22 + mc.fontRenderer.getStringWidth(curse.getName().split(":")[1]), 2 + (size / 2 + 6) * count + 16, 0x95700064);
-                        count++;
-                    }
-                }
-                count = 0;
-                for(Curse curse: Curse.getCurseList())
-                    if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
-                        int tag = curse.getID();
-                        GL11.glPushMatrix();
-                        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-                        GL11.glDisable(GL11.GL_LIGHTING);
-                        GL11.glScalef(0.5f, 0.5f, 0.0f);
-                        drawTexturedModalRect(4, 4 + (size + 12) * count, tag % size * size, tag / size * size, size, size);
-                        GL11.glPopMatrix();
-                        count++;
-                    }
-                count = 0;
-                size = 16;
-                for(Curse curse: Curse.getCurseList())
-                    if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
-                        int tag = curse.getID();
-                        mc.fontRenderer.drawStringWithShadow(curse.getName().split(":")[1], 20, 7 + (size + 6) * count, 16777215);
-                        if (tagCache.getInteger(curse.getName()) == 2){
-                            mc.renderEngine.bindTexture(hearts);
-                            GL11.glPushMatrix();
-                            GL11.glEnable(GL11.GL_BLEND);
-                            GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                            GL11.glColor4f(1f, 1f, 1f, 0.5f);
-                            drawTexturedModalRect(15 + mc.fontRenderer.getStringWidth(curse.getName().split(":")[1]), 8 + (size + 6) * count, 3 * size, 0, size, size);
-                            GL11.glPopMatrix();
-                        }
-                        count++;
-                    }
-            }
-            GL11.glPushMatrix();
-            GL11.glColor4f(1f, 1f, 1f, 1.0f);
-            mc.renderEngine.bindTexture(hearts);
-            count = 0;
-            size = 16;
-            if (tagCache.getFloat("BlueHeart") > 0){
-                for(int i = 0; i < (int)tagCache.getFloat("BlueHeart") / 2; i++)
-                    drawTexturedModalRect(2 + 13 * i, resolution.getScaledHeight() / 2 - 25 + 16 * count, 0 * size, 0 * size, size, size);
-                if (tagCache.getFloat("BlueHeart") % 2 != 0) drawTexturedModalRect(2 + 13 * ((int)tagCache.getFloat("BlueHeart") / 2), resolution.getScaledHeight() / 2 - 25 + 16 * count, 0 * size, 1 * size, size, size);
-            }
-            count++;
-            if (tagCache.getFloat("BlackHeart") > 0){
-                for(int i = 0; i < MathHelper.ceiling_float_int((tagCache.getFloat("BlackHeart")) / 2.0F); i++)
-                    drawTexturedModalRect(2 + 13 * i, resolution.getScaledHeight() / 2 - 25 + 16 * count, 1 * size, 0 * size, size, size);
-                if (tagCache.getFloat("BlackHeart") % 2 != 0) drawTexturedModalRect(2 + 13 * ((int)tagCache.getFloat("BlackHeart") / 2), resolution.getScaledHeight() / 2 - 25 + 16 * count, 1 * size, 1 * size, size, size);
-            }
-            count++;
-            if (tagCache.getFloat("WhiteHeart") > 0)
-                drawTexturedModalRect(2, resolution.getScaledHeight() / 2 - 25 + 16 * count, 2 * size, 1 * size, size, size);
-            GL11.glPopMatrix();
-        }
-    }
-}
\ No newline at end of file