Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git

build.xml

@@ -4,23 +4,25 @@
 	<property file="build.properties" />
 	
 	<target name="clean">
-		<delete file="${dir.development}\mcp\src\common\mcmod.info" />
+		<delete file="${dir.development}\mcp\src\minecraft\mcmod.info" />
-		<delete dir="${dir.development}\mcp\src\common\ee3" />
+		<delete dir="${dir.development}\mcp\src\minecraft\com" />
 		<delete dir="${dir.development}\mcp\reobf\minecraft" />
 	</target>
 	
 	<target name="build">
-		<copy todir="${dir.development}\mcp\src\common">
+		<copy todir="${dir.development}\mcp\src\minecraft">
-			<fileset dir="${dir.development}\source\Equivalent-Exchange-3\ee3_client\" />
 			<fileset dir="${dir.development}\source\Equivalent-Exchange-3\ee3_common\" />
 		</copy>
-		<replace dir="${dir.development}\mcp\src\common" token="@VERSION@" value="${release.mod.version}" />
+		<replace dir="${dir.development}\mcp\src\minecraft" token="@VERSION@" value="${release.mod.version}" />
 	</target>
 	
 	<target name="recompile">
 		<exec dir="${dir.development}\mcp" executable="cmd" os="Windows 7">
 			<arg line="/c recompile.bat" />
 		</exec>
+		<exec dir="${dir.development}\mcp" executable="cmd" os="Windows 8">
+			<arg line="/c recompile.bat" />
+		</exec>
 		<exec dir="${dir.development}\mcp" executable="bash" os="Linux">
 			<arg line="recompile.sh" />
 		</exec>
@@ -33,6 +35,9 @@
 		<exec dir="${dir.development}\mcp" executable="cmd" os="Windows 7">
 			<arg line="/c reobfuscate.bat" />
 		</exec>
+		<exec dir="${dir.development}\mcp" executable="cmd" os="Windows 8">
+			<arg line="/c reobfuscate.bat" />
+		</exec>
 		<exec dir="${dir.development}\mcp" executable="bash" os="Linux">
 			<arg line="reobfuscate.sh" />
 		</exec>
@@ -70,7 +75,7 @@
 		<!-- Build the jar -->
 		<mkdir dir="${dir.release}\${release.minecraft.version}\${release.mod.version}" />
 		<jar destfile="${dir.release}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar">
-			<fileset dir="${dir.development}\mcp\src\common\"	includes="mcmod.info" />
+			<fileset dir="${dir.development}\mcp\src\minecraft\" includes="mcmod.info" />
 			<fileset dir="${dir.development}\mcp\reobf\minecraft" />
 			<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
 		</jar>

ee3_common/com/pahimar/ee3/EquivalentExchange3.java

@@ -1,4 +1,26 @@
-package ee3.common;
+package com.pahimar.ee3;
+
+import com.pahimar.ee3.block.ModBlocks;
+import com.pahimar.ee3.core.handlers.AddonHandler;
+import com.pahimar.ee3.core.handlers.ConfigurationHandler;
+import com.pahimar.ee3.core.handlers.EntityLivingHandler;
+import com.pahimar.ee3.core.handlers.FuelHandler;
+import com.pahimar.ee3.core.handlers.ItemPickupHandler;
+import com.pahimar.ee3.core.handlers.LocalizationHandler;
+import com.pahimar.ee3.core.handlers.ActionRequestHandler;
+import com.pahimar.ee3.core.handlers.PacketHandler;
+import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler;
+import com.pahimar.ee3.core.handlers.RenderTickHandler;
+import com.pahimar.ee3.core.handlers.VersionCheckTickHandler;
+import com.pahimar.ee3.core.handlers.WorldTransmutationHandler;
+import com.pahimar.ee3.core.helper.LogHelper;
+import com.pahimar.ee3.core.helper.VersionHelper;
+import com.pahimar.ee3.core.proxy.CommonProxy;
+import com.pahimar.ee3.creativetab.CreativeTabEE3;
+import com.pahimar.ee3.item.ModItems;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.recipe.RecipesTransmutationStone;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.common.MinecraftForge;
@@ -17,27 +39,6 @@ import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
-import ee3.client.core.handlers.RenderTickHandler;
-import ee3.common.block.ModBlocks;
-import ee3.common.core.CommonProxy;
-import ee3.common.core.CreativeTabEE3;
-import ee3.common.core.handlers.ModActionHandler;
-import ee3.common.core.handlers.AddonHandler;
-import ee3.common.core.handlers.ConfigurationHandler;
-import ee3.common.core.handlers.EntityLivingHandler;
-import ee3.common.core.handlers.FuelHandler;
-import ee3.common.core.handlers.ItemPickupHandler;
-import ee3.common.core.handlers.LocalizationHandler;
-import ee3.common.core.handlers.PacketHandler;
-import ee3.common.core.handlers.PlayerDestroyItemHandler;
-import ee3.common.core.handlers.VersionCheckTickHandler;
-import ee3.common.core.handlers.WorldTransmutationHandler;
-import ee3.common.core.helper.LogHelper;
-import ee3.common.core.helper.VersionHelper;
-import ee3.common.item.ModItems;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.Reference;
-import ee3.common.recipe.RecipesTransmutationStone;
 
 /**
  * EquivalentExchange3
@@ -110,7 +111,7 @@ public class EquivalentExchange3 {
         // Register the EntityLiving Handler
         MinecraftForge.EVENT_BUS.register(new EntityLivingHandler());
         
-        MinecraftForge.EVENT_BUS.register(new ModActionHandler());
+        MinecraftForge.EVENT_BUS.register(new ActionRequestHandler());
         
         MinecraftForge.EVENT_BUS.register(new WorldTransmutationHandler());
         

ee3_common/com/pahimar/ee3/block/BlockCalcinator.java

@@ -1,10 +1,11 @@
-package ee3.common.block;
+package com.pahimar.ee3.block;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.GuiIds;
+import com.pahimar.ee3.lib.RenderIds;
+import com.pahimar.ee3.lib.Strings;
+import com.pahimar.ee3.tileentity.TileCalcinator;
 
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.GuiIds;
-import ee3.common.lib.RenderIds;
-import ee3.common.lib.Strings;
-import ee3.common.tile.TileCalcinator;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

ee3_common/com/pahimar/ee3/block/BlockEE.java

@@ -1,4 +1,4 @@
-package ee3.common.block;
+package com.pahimar.ee3.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;

ee3_common/com/pahimar/ee3/block/BlockRedWaterFlowing.java

@@ -1,9 +1,10 @@
-package ee3.common.block;
+package com.pahimar.ee3.block;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Sprites;
+import com.pahimar.ee3.lib.Strings;
 
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.Reference;
-import ee3.common.lib.Sprites;
-import ee3.common.lib.Strings;
 import net.minecraft.block.BlockFlowing;
 import net.minecraft.block.material.Material;
 

ee3_common/com/pahimar/ee3/block/BlockRedWaterStill.java

@@ -1,8 +1,9 @@
-package ee3.common.block;
+package com.pahimar.ee3.block;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.Sprites;
+import com.pahimar.ee3.lib.Strings;
 
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.Sprites;
-import ee3.common.lib.Strings;
 import net.minecraft.block.BlockStationary;
 import net.minecraft.block.material.Material;
 

ee3_common/com/pahimar/ee3/block/ModBlocks.java

@@ -1,10 +1,11 @@
-package ee3.common.block;
+package com.pahimar.ee3.block;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.BlockIds;
+import com.pahimar.ee3.lib.Strings;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.BlockIds;
-import ee3.common.lib.Strings;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java

@@ -1,4 +1,4 @@
-package ee3.client.gui;
+package com.pahimar.ee3.client.gui.inventory;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -6,13 +6,14 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
+import com.pahimar.ee3.inventory.ContainerCalcinator;
+import com.pahimar.ee3.lib.Sprites;
+import com.pahimar.ee3.lib.Strings;
+import com.pahimar.ee3.tileentity.TileCalcinator;
+
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.container.ContainerCalcinator;
-import ee3.common.lib.Sprites;
-import ee3.common.lib.Strings;
-import ee3.common.tile.TileCalcinator;
 
 /**
  * GuiCalcinator

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java

@@ -1,4 +1,4 @@
-package ee3.client.gui;
+package com.pahimar.ee3.client.gui.inventory;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,9 +7,10 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
+import com.pahimar.ee3.inventory.ContainerPortableCrafting;
+
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
-import ee3.common.container.ContainerPortableCrafting;
 
 /**
  * GuiPortableCrafting

ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java

@@ -1,9 +1,10 @@
-package ee3.client.render;
+package com.pahimar.ee3.client.model;
 
 import org.lwjgl.opengl.GL11;
 
-import ee3.common.lib.Sprites;
+import com.pahimar.ee3.lib.Sprites;
-import ee3.common.tile.TileCalcinator;
+import com.pahimar.ee3.tileentity.TileCalcinator;
+
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraftforge.client.ForgeHooksClient;

ee3_common/com/pahimar/ee3/client/renderer/ItemCalcinatorRenderer.java

@@ -1,9 +1,11 @@
-package ee3.client.render;
+package com.pahimar.ee3.client.renderer;
 
 import org.lwjgl.opengl.GL11;
 
-import ee3.common.lib.Reference;
+import com.pahimar.ee3.client.model.ModelCalcinator;
-import ee3.common.lib.Sprites;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Sprites;
+
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.ForgeHooksClient;
@@ -18,11 +20,11 @@ import net.minecraftforge.client.IItemRenderer;
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  * 
  */
-public class RenderItemCalcinator implements IItemRenderer {
+public class ItemCalcinatorRenderer implements IItemRenderer {
 
 	private ModelCalcinator calcinatorModel;
 	
-	public RenderItemCalcinator() {
+	public ItemCalcinatorRenderer() {
 		calcinatorModel = new ModelCalcinator(1/16F);
 	}
 	

ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFX.java

@@ -1,12 +1,13 @@
-package ee3.client.render;
+package com.pahimar.ee3.client.renderer.texturefx;
 
 import org.lwjgl.opengl.GL11;
 
+import com.pahimar.ee3.block.ModBlocks;
+import com.pahimar.ee3.lib.Sprites;
+
 import net.minecraft.client.renderer.RenderEngine;
 import net.minecraftforge.client.MinecraftForgeClient;
 import cpw.mods.fml.client.FMLTextureFX;
-import ee3.common.block.ModBlocks;
-import ee3.common.lib.Sprites;
 
 /**
  * TextureRedWaterFX

ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFlowFX.java

@@ -1,12 +1,13 @@
-package ee3.client.render;
+package com.pahimar.ee3.client.renderer.texturefx;
 
 import net.minecraft.client.renderer.RenderEngine;
 
 import org.lwjgl.opengl.GL11;
 
+import com.pahimar.ee3.block.ModBlocks;
+import com.pahimar.ee3.lib.Sprites;
+
 import cpw.mods.fml.client.FMLTextureFX;
-import ee3.common.block.ModBlocks;
-import ee3.common.lib.Sprites;
 
 /**
  * TextureRedWaterFlowFX

ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java

@@ -1,8 +1,9 @@
-package ee3.client.render;
+package com.pahimar.ee3.client.renderer.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import ee3.common.tile.TileCalcinator;
+import com.pahimar.ee3.client.model.ModelCalcinator;
+import com.pahimar.ee3.tileentity.TileCalcinator;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -16,7 +17,7 @@ import net.minecraft.tileentity.TileEntity;
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  * 
  */
-public class RenderCalcinator extends TileEntitySpecialRenderer {
+public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer {
 
     static final float scale = (float) (1.0 / 16.0);
     

ee3_common/com/pahimar/ee3/core/addons/AddonRedPower2.java

@@ -1,13 +1,14 @@
-package ee3.common.core.addons;
+package com.pahimar.ee3.core.addons;
 
 import java.util.logging.Level;
 
+import com.pahimar.ee3.core.helper.LogHelper;
+import com.pahimar.ee3.core.helper.RecipeHelper;
+import com.pahimar.ee3.recipe.RecipesTransmutationStone;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 
-import ee3.common.core.helper.LogHelper;
-import ee3.common.core.helper.RecipeHelper;
-import ee3.common.recipe.RecipesTransmutationStone;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.src.ModLoader;

ee3_common/com/pahimar/ee3/core/handlers/ActionRequestHandler.java

@@ -0,0 +1,14 @@
+package com.pahimar.ee3.core.handlers;
+
+import com.pahimar.ee3.event.ActionRequestEvent;
+
+import net.minecraftforge.event.ForgeSubscribe;
+
+public class ActionRequestHandler {
+
+    @ForgeSubscribe
+    public void onModActionEvent(ActionRequestEvent event) {
+
+    }
+    
+}

ee3_common/com/pahimar/ee3/core/handlers/AddonHandler.java

@@ -1,6 +1,6 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
-import ee3.common.core.addons.AddonRedPower2;
+import com.pahimar.ee3.core.addons.AddonRedPower2;
 
 /**
  * AddonHandler

ee3_common/com/pahimar/ee3/core/handlers/ConfigurationHandler.java

@@ -1,16 +1,18 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.io.File;
 import java.util.logging.Level;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.block.ModBlocks;
+import com.pahimar.ee3.item.ModItems;
+import com.pahimar.ee3.lib.BlockIds;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.ItemIds;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Strings;
+
 import cpw.mods.fml.common.FMLLog;
-import ee3.common.EquivalentExchange3;
-import ee3.common.block.ModBlocks;
-import ee3.common.item.ModItems;
-import ee3.common.lib.BlockIds;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.ItemIds;
-import ee3.common.lib.Reference;
-import ee3.common.lib.Strings;
 import net.minecraftforge.common.Configuration;
 import static net.minecraftforge.common.Configuration.*;
 

ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java

@@ -1,12 +1,13 @@
-package ee3.client.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import ee3.common.item.ITransmutationStone;
+import com.pahimar.ee3.item.IChargeable;
-import ee3.common.item.IChargeable;
+import com.pahimar.ee3.item.ITransmutationStone;
-import ee3.common.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.ConfigurationSettings;
-import ee3.common.lib.Sprites;
+import com.pahimar.ee3.lib.Sprites;
+
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.EnumMovingObjectType;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;

ee3_common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java

@@ -1,8 +1,9 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
+
+import com.pahimar.ee3.core.helper.ItemDropHelper;
+import com.pahimar.ee3.core.helper.RedWaterHelper;
+import com.pahimar.ee3.lib.Reference;
 
-import ee3.common.core.helper.ItemDropHelper;
-import ee3.common.core.helper.RedWaterHelper;
-import ee3.common.lib.Reference;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;

ee3_common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java

@@ -1,8 +1,9 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.util.ArrayList;
 
-import ee3.common.core.helper.GeneralHelper;
+import com.pahimar.ee3.core.helper.GeneralHelper;
+
 import net.minecraft.item.ItemStack;
 
 /**

ee3_common/com/pahimar/ee3/core/handlers/FuelHandler.java

@@ -1,4 +1,4 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.IFuelHandler;

ee3_common/com/pahimar/ee3/core/handlers/ItemPickupHandler.java

@@ -1,4 +1,4 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.EntityItemPickupEvent;

ee3_common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java

@@ -1,8 +1,21 @@
-package ee3.client.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.util.EnumSet;
 import java.util.logging.Level;
 
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.core.helper.KeyBindingHelper;
+import com.pahimar.ee3.core.helper.LogHelper;
+import com.pahimar.ee3.item.IKeyBound;
+import com.pahimar.ee3.item.ITransmutationStone;
+import com.pahimar.ee3.item.ModItems;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.GuiIds;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.network.PacketTypeHandler;
+import com.pahimar.ee3.network.packet.PacketEE;
+import com.pahimar.ee3.network.packet.PacketKeyPressed;
+
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -12,18 +25,6 @@ import cpw.mods.fml.client.registry.KeyBindingRegistry;
 import cpw.mods.fml.common.TickType;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.client.core.helper.KeyBindingHelper;
-import ee3.common.EquivalentExchange3;
-import ee3.common.core.helper.LogHelper;
-import ee3.common.item.IKeyBound;
-import ee3.common.item.ITransmutationStone;
-import ee3.common.item.ModItems;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.GuiIds;
-import ee3.common.lib.Reference;
-import ee3.common.network.PacketEE;
-import ee3.common.network.PacketKeyPressed;
-import ee3.common.network.PacketTypeHandler;
 
 /**
  * KeyBindingHandler

ee3_common/com/pahimar/ee3/core/handlers/LocalizationHandler.java

@@ -1,8 +1,9 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
+
+import com.pahimar.ee3.core.helper.LocalizationHelper;
+import com.pahimar.ee3.lib.Localizations;
 
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.core.helper.LocalizationHelper;
-import ee3.common.lib.Localizations;
 
 /**
  * LocalizationHandler

ee3_common/com/pahimar/ee3/core/handlers/PacketHandler.java

@@ -1,15 +1,16 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import com.pahimar.ee3.network.PacketTypeHandler;
+import com.pahimar.ee3.network.packet.PacketEE;
+
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;
 
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.Player;
-import ee3.common.network.PacketEE;
-import ee3.common.network.PacketTypeHandler;
 
 /**
  * PacketHandler

ee3_common/com/pahimar/ee3/core/handlers/PlayerDestroyItemHandler.java

@@ -1,4 +1,4 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;

ee3_common/com/pahimar/ee3/core/handlers/RenderTickHandler.java

@@ -1,10 +1,17 @@
-package ee3.client.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.util.EnumSet;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import com.pahimar.ee3.core.helper.RenderUtils;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
+import com.pahimar.ee3.core.helper.VersionHelper;
+import com.pahimar.ee3.item.ITransmutationStone;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.Reference;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.RenderHelper;
@@ -17,12 +24,6 @@ import net.minecraft.util.MovingObjectPosition;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.ITickHandler;
 import cpw.mods.fml.common.TickType;
-import ee3.client.core.helper.RenderUtils;
-import ee3.common.core.helper.TransmutationHelper;
-import ee3.common.core.helper.VersionHelper;
-import ee3.common.item.ITransmutationStone;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.Reference;
 
 public class RenderTickHandler implements ITickHandler {
 

ee3_common/com/pahimar/ee3/core/handlers/SoundHandler.java

@@ -1,11 +1,13 @@
-package ee3.client.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.io.File;
 import java.util.logging.Level;
+
+import com.pahimar.ee3.core.helper.LogHelper;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Sounds;
+
 import cpw.mods.fml.common.FMLCommonHandler;
-import ee3.common.core.helper.LogHelper;
-import ee3.common.lib.Reference;
-import ee3.common.lib.Sounds;
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.event.ForgeSubscribe;
 

ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java

@@ -1,16 +1,17 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
 
 import java.util.EnumSet;
 
+import com.pahimar.ee3.core.helper.VersionHelper;
+import com.pahimar.ee3.lib.Colours;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.Reference;
+
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.ITickHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.TickType;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.core.helper.VersionHelper;
-import ee3.common.lib.Colours;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.Reference;
 
 /**
  * VersionCheckTickHandler

ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java

@@ -1,6 +1,7 @@
-package ee3.common.core.handlers;
+package com.pahimar.ee3.core.handlers;
+
+import com.pahimar.ee3.event.WorldTransmutationEvent;
 
-import ee3.common.event.WorldTransmutationEvent;
 import net.minecraftforge.event.ForgeSubscribe;
 
 

ee3_common/com/pahimar/ee3/core/helper/GeneralHelper.java

@@ -1,4 +1,4 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 

ee3_common/com/pahimar/ee3/core/helper/ItemDropHelper.java

@@ -1,8 +1,9 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
+
+import com.pahimar.ee3.item.ModItems;
 
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
-import ee3.common.item.ModItems;
 
 /**
  * ItemDropHelper

ee3_common/com/pahimar/ee3/core/helper/KeyBindingHelper.java

@@ -1,4 +1,4 @@
-package ee3.client.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 

ee3_common/com/pahimar/ee3/core/helper/LocalizationHelper.java

@@ -1,4 +1,4 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 /**
  * LocalizationHelper

ee3_common/com/pahimar/ee3/core/helper/LogHelper.java

@@ -1,12 +1,13 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.Reference;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.Reference;
 
 /**
  * LogHelper

ee3_common/com/pahimar/ee3/core/helper/NBTHelper.java

@@ -1,4 +1,4 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

ee3_common/com/pahimar/ee3/core/helper/QualityHelper.java

@@ -1,4 +1,4 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import net.minecraft.item.ItemStack;
 

ee3_common/com/pahimar/ee3/core/helper/RecipeHelper.java

@@ -1,4 +1,4 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 

ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java

@@ -1,7 +1,8 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
+
+import com.pahimar.ee3.block.ModBlocks;
+import com.pahimar.ee3.lib.ConfigurationSettings;
 
-import ee3.common.block.ModBlocks;
-import ee3.common.lib.ConfigurationSettings;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.util.AxisAlignedBB;

ee3_common/com/pahimar/ee3/core/helper/RenderUtils.java

@@ -1,4 +1,4 @@
-package ee3.client.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import org.lwjgl.opengl.GL11;
 

ee3_common/com/pahimar/ee3/core/helper/TransmutationHelper.java

@@ -1,9 +1,10 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import java.util.ArrayList;
 
-import ee3.common.core.handlers.EquivalencyHandler;
+import com.pahimar.ee3.core.handlers.EquivalencyHandler;
-import ee3.common.lib.Sounds;
+import com.pahimar.ee3.lib.Sounds;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSand;
 import net.minecraft.block.BlockLeaves;

ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java

@@ -1,4 +1,4 @@
-package ee3.common.core.helper;
+package com.pahimar.ee3.core.helper;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -6,13 +6,14 @@ import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import com.pahimar.ee3.lib.Colours;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Strings;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.lib.Colours;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.Reference;
-import ee3.common.lib.Strings;
 
 /**
  * VersionHelper

ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java

@@ -1,4 +1,20 @@
-package ee3.client.core;
+package com.pahimar.ee3.core.proxy;
+
+import com.pahimar.ee3.client.renderer.ItemCalcinatorRenderer;
+import com.pahimar.ee3.client.renderer.texturefx.TextureRedWaterFX;
+import com.pahimar.ee3.client.renderer.texturefx.TextureRedWaterFlowFX;
+import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer;
+import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler;
+import com.pahimar.ee3.core.handlers.KeyBindingHandler;
+import com.pahimar.ee3.core.handlers.RenderTickHandler;
+import com.pahimar.ee3.core.handlers.SoundHandler;
+import com.pahimar.ee3.core.helper.KeyBindingHelper;
+import com.pahimar.ee3.lib.BlockIds;
+import com.pahimar.ee3.lib.RenderIds;
+import com.pahimar.ee3.lib.Sprites;
+import com.pahimar.ee3.network.PacketTypeHandler;
+import com.pahimar.ee3.network.packet.PacketRequestEvent;
+import com.pahimar.ee3.tileentity.TileCalcinator;
 
 import net.minecraft.item.EnumRarity;
 import net.minecraftforge.client.EnumHelperClient;
@@ -12,23 +28,7 @@ import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
-import ee3.client.core.handlers.DrawBlockHighlightHandler;
+import static com.pahimar.ee3.lib.CustomItemRarity.*;
-import ee3.client.core.handlers.KeyBindingHandler;
-import ee3.client.core.handlers.RenderTickHandler;
-import ee3.client.core.handlers.SoundHandler;
-import ee3.client.core.helper.KeyBindingHelper;
-import ee3.client.render.RenderCalcinator;
-import ee3.client.render.RenderItemCalcinator;
-import ee3.client.render.TextureRedWaterFX;
-import ee3.client.render.TextureRedWaterFlowFX;
-import ee3.common.core.CommonProxy;
-import ee3.common.lib.BlockIds;
-import ee3.common.lib.RenderIds;
-import ee3.common.lib.Sprites;
-import ee3.common.network.PacketTypeHandler;
-import ee3.common.network.PacketWorldEvent;
-import ee3.common.tile.TileCalcinator;
-import static ee3.common.lib.CustomItemRarity.*;
 
 /**
  * ClientProxy
@@ -105,7 +105,7 @@ public class ClientProxy extends CommonProxy {
         FMLClientHandler.instance().getClient().renderEngine.registerTextureFX(new TextureRedWaterFX());
         FMLClientHandler.instance().getClient().renderEngine.registerTextureFX(new TextureRedWaterFlowFX());
 
-        MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new RenderItemCalcinator());
+        MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer());
     }
 
     @Override
@@ -113,13 +113,13 @@ public class ClientProxy extends CommonProxy {
 
         super.initTileEntities();
 
-        ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new RenderCalcinator());
+        ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new TileEntityCalcinatorRenderer());
     }
 
     @Override
     public void sendWorldEventPacket(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
 
-        PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketWorldEvent(eventType, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, data)));
+        PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketRequestEvent(eventType, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, data)));
     }
 
 }

ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java

@@ -1,17 +1,18 @@
-package ee3.common.core;
+package com.pahimar.ee3.core.proxy;
+
+import com.pahimar.ee3.client.gui.inventory.GuiCalcinator;
+import com.pahimar.ee3.client.gui.inventory.GuiPortableCrafting;
+import com.pahimar.ee3.inventory.ContainerCalcinator;
+import com.pahimar.ee3.inventory.ContainerPortableCrafting;
+import com.pahimar.ee3.lib.GuiIds;
+import com.pahimar.ee3.lib.Strings;
+import com.pahimar.ee3.tileentity.TileCalcinator;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.world.World;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.registry.GameRegistry;
-import ee3.client.gui.GuiCalcinator;
-import ee3.client.gui.GuiPortableCrafting;
-import ee3.common.container.ContainerCalcinator;
-import ee3.common.container.ContainerPortableCrafting;
-import ee3.common.lib.GuiIds;
-import ee3.common.lib.Strings;
-import ee3.common.tile.TileCalcinator;
 
 /**
  * CommonProxy

ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java

@@ -1,9 +1,10 @@
-package ee3.common.core;
+package com.pahimar.ee3.creativetab;
+
+import com.pahimar.ee3.item.ModItems;
+import com.pahimar.ee3.lib.ItemIds;
 
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
-import ee3.common.item.ModItems;
-import ee3.common.lib.ItemIds;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 

ee3_common/com/pahimar/ee3/emc/EMCEntry.java

@@ -1,4 +1,4 @@
-package ee3.common.emc;
+package com.pahimar.ee3.emc;
 
 import java.util.Collections;
 import java.util.HashMap;

ee3_common/com/pahimar/ee3/emc/EMCRegistry.java

@@ -1,4 +1,4 @@
-package ee3.common.emc;
+package com.pahimar.ee3.emc;
 
 import java.util.HashMap;
 import java.util.Map;

ee3_common/com/pahimar/ee3/emc/EMCType.java

@@ -1,4 +1,4 @@
-package ee3.common.emc;
+package com.pahimar.ee3.emc;
 
 /**
  * EMCType

ee3_common/com/pahimar/ee3/event/ActionRequestEvent.java

@@ -1,24 +1,25 @@
-package ee3.common.event;
+package com.pahimar.ee3.event;
 
 import static net.minecraftforge.event.Event.Result.*;
-import ee3.common.lib.ModAction;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.event.Cancelable;
+import net.minecraftforge.event.Event;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 
 @Cancelable
-public class ModActionEvent extends PlayerEvent {
+public class ActionRequestEvent extends PlayerEvent {
     
-    public final ModAction modAction;
+    public final Event modEvent;
     public final int x, y, z;
     public final int sideHit;
     
     public Result allowEvent;
     
-    public ModActionEvent(EntityPlayer player, ModAction modAction, int x, int y, int z, int sideHit) {
+    public ActionRequestEvent(EntityPlayer player, Event modEvent, int x, int y, int z, int sideHit) {
 
         super(player);
-        this.modAction = modAction;
+        this.modEvent = modEvent;
         this.x = x;
         this.y = y;
         this.z = z;

ee3_common/com/pahimar/ee3/event/WorldTransmutationEvent.java

@@ -0,0 +1,23 @@
+package com.pahimar.ee3.event;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+import net.minecraftforge.event.Event;
+
+public class WorldTransmutationEvent extends Event {
+    
+    public final EntityPlayer player; 
+    public final World world;
+    public final int x, y, z;
+    public final String data;
+
+    public WorldTransmutationEvent(EntityPlayer player, World world, int x, int y, int z, String data) {
+        
+        this.player = player;
+        this.world = world;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.data = data;
+    }
+}

ee3_common/com/pahimar/ee3/inventory/ContainerCalcinator.java

@@ -1,6 +1,7 @@
-package ee3.common.container;
+package com.pahimar.ee3.inventory;
+
+import com.pahimar.ee3.tileentity.TileCalcinator;
 
-import ee3.common.tile.TileCalcinator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;

ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java

@@ -1,4 +1,4 @@
-package ee3.common.container;
+package com.pahimar.ee3.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

ee3_common/com/pahimar/ee3/item/IChargeable.java

@@ -1,4 +1,4 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
 
 import net.minecraft.item.ItemStack;
 

ee3_common/com/pahimar/ee3/item/IKeyBound.java

@@ -1,4 +1,4 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

ee3_common/com/pahimar/ee3/item/ITransmutationStone.java

@@ -1,4 +1,4 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
 
 import net.minecraft.entity.player.EntityPlayer;
 

ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java

@@ -1,16 +1,17 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
 
 import java.util.List;
 
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.Colours;
+import com.pahimar.ee3.lib.Strings;
+
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.Colours;
-import ee3.common.lib.Strings;
 
 public class ItemAlchemyBag extends ItemEE {
 

ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java

@@ -1,7 +1,11 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
 
 import java.util.List;
 
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.CustomItemRarity;
+import com.pahimar.ee3.lib.Strings;
+
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
@@ -9,9 +13,6 @@ import net.minecraft.util.MathHelper;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.CustomItemRarity;
-import ee3.common.lib.Strings;
 
 /**
  * ItemAlchemyDust

ee3_common/com/pahimar/ee3/item/ItemEE.java

@@ -1,7 +1,8 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
+
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Sprites;
 
-import ee3.common.lib.Reference;
-import ee3.common.lib.Sprites;
 import net.minecraft.item.Item;
 
 /**

ee3_common/com/pahimar/ee3/item/ItemInertStone.java

@@ -1,7 +1,8 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.Strings;
 
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.Strings;
 
 /**
  * ItemInertStone

ee3_common/com/pahimar/ee3/item/ItemMiniumShard.java

@@ -1,7 +1,8 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.Strings;
 
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.Strings;
 
 /**
  * ItemMiniumShard

ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java

@@ -1,4 +1,15 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
+import com.pahimar.ee3.lib.Colours;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.CustomItemRarity;
+import com.pahimar.ee3.lib.GuiIds;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Strings;
+import com.pahimar.ee3.network.PacketTypeHandler;
+import com.pahimar.ee3.network.packet.PacketKeyPressed;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -8,16 +19,6 @@ import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 import cpw.mods.fml.common.network.PacketDispatcher;
-import ee3.common.EquivalentExchange3;
-import ee3.common.core.helper.TransmutationHelper;
-import ee3.common.lib.Colours;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.CustomItemRarity;
-import ee3.common.lib.GuiIds;
-import ee3.common.lib.Reference;
-import ee3.common.lib.Strings;
-import ee3.common.network.PacketKeyPressed;
-import ee3.common.network.PacketTypeHandler;
 
 /**
  * ItemMiniumStone

ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java

@@ -1,21 +1,22 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.core.helper.NBTHelper;
+import com.pahimar.ee3.core.helper.TransmutationHelper;
+import com.pahimar.ee3.lib.ConfigurationSettings;
+import com.pahimar.ee3.lib.CustomItemRarity;
+import com.pahimar.ee3.lib.GuiIds;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Sounds;
+import com.pahimar.ee3.lib.Strings;
+import com.pahimar.ee3.lib.RequestEvents;
+import com.pahimar.ee3.network.PacketTypeHandler;
+import com.pahimar.ee3.network.packet.PacketKeyPressed;
+import com.pahimar.ee3.network.packet.PacketRequestEvent;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
-import ee3.common.EquivalentExchange3;
-import ee3.common.core.helper.NBTHelper;
-import ee3.common.core.helper.TransmutationHelper;
-import ee3.common.lib.ConfigurationSettings;
-import ee3.common.lib.CustomItemRarity;
-import ee3.common.lib.GuiIds;
-import ee3.common.lib.Reference;
-import ee3.common.lib.Sounds;
-import ee3.common.lib.Strings;
-import ee3.common.lib.WorldEvents;
-import ee3.common.network.PacketKeyPressed;
-import ee3.common.network.PacketTypeHandler;
-import ee3.common.network.PacketWorldEvent;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
@@ -83,7 +84,7 @@ public class ItemPhilosopherStone extends ItemEE
         //boolean result = TransmutationHelper.transmuteInWorld(world, entityPlayer, itemStack, x, y, z);
         boolean result = true;
         if (!world.isRemote) {
-            EquivalentExchange3.proxy.sendWorldEventPacket(WorldEvents.TRANSMUTATION, x, y, z, (byte)sideHit, (byte)getCharge(itemStack), (byte)getCharge(itemStack), (byte)getCharge(itemStack), "50:0");
+            EquivalentExchange3.proxy.sendWorldEventPacket(RequestEvents.TRANSMUTATION, x, y, z, (byte)sideHit, (byte)getCharge(itemStack), (byte)getCharge(itemStack), (byte)getCharge(itemStack), "50:0");
         }
         /*
         if (result) {

ee3_common/com/pahimar/ee3/item/ModItems.java

@@ -1,10 +1,11 @@
-package ee3.common.item;
+package com.pahimar.ee3.item;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.lib.ItemIds;
+import com.pahimar.ee3.lib.Strings;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.EquivalentExchange3;
-import ee3.common.lib.ItemIds;
-import ee3.common.lib.Strings;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

ee3_common/com/pahimar/ee3/lib/BlockIds.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * BlockIds

ee3_common/com/pahimar/ee3/lib/Colours.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * Colours

ee3_common/com/pahimar/ee3/lib/ConfigurationSettings.java

@@ -1,7 +1,8 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
+
+import com.pahimar.ee3.item.ModItems;
 
 import net.minecraftforge.common.Configuration;
-import ee3.common.item.ModItems;
 
 /**
  * ConfigurationSettings

ee3_common/com/pahimar/ee3/lib/CustomItemRarity.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * CustomItemRarity

ee3_common/com/pahimar/ee3/lib/GuiIds.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * GuiIds

ee3_common/com/pahimar/ee3/lib/ItemIds.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * ItemIds

ee3_common/com/pahimar/ee3/lib/Localizations.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * Localizations

ee3_common/com/pahimar/ee3/lib/PacketIds.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * PacketIds

ee3_common/com/pahimar/ee3/lib/Reference.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * Reference
@@ -21,7 +21,7 @@ public class Reference {
     public static final String CHANNEL_NAME = MOD_ID;
     public static final int SECOND_IN_TICKS = 20;
     public static final int SHIFTED_ID_RANGE_CORRECTION = 256;
-    public static final String SERVER_PROXY_CLASS = "ee3.common.core.CommonProxy";
+    public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy";
-    public static final String CLIENT_PROXY_CLASS = "ee3.client.core.ClientProxy";
+    public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.core.proxy.ClientProxy";
 
 }

ee3_common/com/pahimar/ee3/lib/RenderIds.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * RenderIds

ee3_common/com/pahimar/ee3/lib/RequestEvents.java

@@ -1,7 +1,7 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 
-public class WorldEvents {
+public class RequestEvents {
     
     public static final byte TRANSMUTATION = 0;
 

ee3_common/com/pahimar/ee3/lib/Sounds.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 /**
  * Sounds

ee3_common/com/pahimar/ee3/lib/Sprites.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 
 public class Sprites {

ee3_common/com/pahimar/ee3/lib/Strings.java

@@ -1,4 +1,4 @@
-package ee3.common.lib;
+package com.pahimar.ee3.lib;
 
 public class Strings {
 	

ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java

@@ -1,12 +1,17 @@
-package ee3.common.network;
+package com.pahimar.ee3.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.network.packet.PacketEE;
+import com.pahimar.ee3.network.packet.PacketKeyPressed;
+import com.pahimar.ee3.network.packet.PacketTileUpdate;
+import com.pahimar.ee3.network.packet.PacketRequestEvent;
+
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.Packet250CustomPayload;
 
-import ee3.common.lib.Reference;
 
 
 /**
@@ -21,7 +26,7 @@ import ee3.common.lib.Reference;
 public enum PacketTypeHandler {
 	KEY(PacketKeyPressed.class),
 	TILE(PacketTileUpdate.class),
-	WORLD_EVENT(PacketWorldEvent.class);
+	REQUEST_EVENT(PacketRequestEvent.class);
 	
 	private Class<? extends PacketEE> clazz;
 	

ee3_common/com/pahimar/ee3/network/packet/PacketEE.java

@@ -1,10 +1,12 @@
-package ee3.common.network;
+package com.pahimar.ee3.network.packet;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.pahimar.ee3.network.PacketTypeHandler;
+
 import net.minecraft.network.INetworkManager;
 import cpw.mods.fml.common.network.Player;
 
@@ -19,8 +21,8 @@ import cpw.mods.fml.common.network.Player;
  */
 public class PacketEE {
 	
-	protected PacketTypeHandler packetType;
+	public PacketTypeHandler packetType;
-	protected boolean isChunkDataPacket;
+	public boolean isChunkDataPacket;
 	
 	public PacketEE(PacketTypeHandler packetType, boolean isChunkDataPacket) {
 		this.packetType = packetType;

ee3_common/com/pahimar/ee3/network/packet/PacketKeyPressed.java

@@ -1,20 +1,22 @@
-package ee3.common.network;
+package com.pahimar.ee3.network.packet;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee3.item.IKeyBound;
+import com.pahimar.ee3.item.ITransmutationStone;
+import com.pahimar.ee3.lib.GuiIds;
+import com.pahimar.ee3.lib.ItemIds;
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.network.PacketTypeHandler;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.INetworkManager;
 
 import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import ee3.common.EquivalentExchange3;
-import ee3.common.item.IKeyBound;
-import ee3.common.item.ITransmutationStone;
-import ee3.common.lib.GuiIds;
-import ee3.common.lib.ItemIds;
-import ee3.common.lib.Reference;
 
 /**
  * PacketKeyPressed

ee3_common/com/pahimar/ee3/network/packet/PacketRequestEvent.java

@@ -1,9 +1,14 @@
-package ee3.common.network;
+package com.pahimar.ee3.network.packet;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.pahimar.ee3.event.ActionRequestEvent;
+import com.pahimar.ee3.event.WorldTransmutationEvent;
+import com.pahimar.ee3.lib.RequestEvents;
+import com.pahimar.ee3.network.PacketTypeHandler;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.INetworkManager;
 import net.minecraft.world.World;
@@ -12,12 +17,8 @@ import net.minecraftforge.event.Event;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
 import cpw.mods.fml.common.network.Player;
-import ee3.common.event.ModActionEvent;
-import ee3.common.event.WorldTransmutationEvent;
-import ee3.common.lib.ModAction;
-import ee3.common.lib.WorldEvents;
 
-public class PacketWorldEvent extends PacketEE {
+public class PacketRequestEvent extends PacketEE {
 
     public byte eventType;
     public int originX, originY, originZ;
@@ -25,14 +26,14 @@ public class PacketWorldEvent extends PacketEE {
     public byte rangeX, rangeY, rangeZ;
     public String data;
 
-    public PacketWorldEvent() {
+    public PacketRequestEvent() {
 
-        super(PacketTypeHandler.WORLD_EVENT, false);
+        super(PacketTypeHandler.REQUEST_EVENT, false);
     }
 
-    public PacketWorldEvent(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
+    public PacketRequestEvent(byte eventType, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
 
-        super(PacketTypeHandler.WORLD_EVENT, false);
+        super(PacketTypeHandler.REQUEST_EVENT, false);
         this.eventType = eventType;
         this.originX = originX;
         this.originY = originY;
@@ -100,28 +101,23 @@ public class PacketWorldEvent extends PacketEE {
 
     public void execute(INetworkManager manager, Player player) {
 
-        /*
-         * Server knows the world, the player, and all the packet data
-         * Server checks (for each block);
-         *  1) If the action on that block is allowed for the player
-         *  2) If the action is a valid action
-         *  
-         *  AoE options are; 1x1, 3x3, 5x5, and 7x7
-         *  Charge options; 0, 1, 2, 3
-         *  so Range would be 1, 2, 4, 6
-         *  1 + 0, 1 + 1, 1 + 3, 1 + 5 
-         */
-        
         EntityPlayer thePlayer = (EntityPlayer) player;
-        ModActionEvent modActionEvent;
+        ActionRequestEvent actionRequestEvent = null;
-        WorldTransmutationEvent worldTransmutationEvent;
+        Event actionEvent = null;;
         
-        modActionEvent= new ModActionEvent(thePlayer, ModAction.TRANSMUTATION, originX, originY, originZ, (int) sideHit);
+        // TODO Move this logic to a ActionEvent handler to post an appropriate event depending on the request received
-        MinecraftForge.EVENT_BUS.post(modActionEvent);
         
-        if (modActionEvent.allowEvent != Result.DENY) {
+        if (eventType == RequestEvents.TRANSMUTATION) {
-            worldTransmutationEvent = new WorldTransmutationEvent(thePlayer, thePlayer.worldObj, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, data);
+            actionEvent = new WorldTransmutationEvent(thePlayer, thePlayer.worldObj, originX, originY, originZ, data);
-            MinecraftForge.EVENT_BUS.post(worldTransmutationEvent);
+        }
+        
+        if (actionEvent != null) {
+            actionRequestEvent = new ActionRequestEvent(thePlayer, actionEvent, originX, originY, originZ, (int) sideHit);
+            MinecraftForge.EVENT_BUS.post(actionRequestEvent);
+            
+            if (actionRequestEvent.allowEvent != Result.DENY) {
+                MinecraftForge.EVENT_BUS.post(actionEvent);
+            }
         }
         
     }

ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java

@@ -1,9 +1,11 @@
-package ee3.common.network;
+package com.pahimar.ee3.network.packet;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import com.pahimar.ee3.network.PacketTypeHandler;
+
 import cpw.mods.fml.common.network.Player;
 
 import net.minecraft.network.INetworkManager;

ee3_common/com/pahimar/ee3/recipe/RecipesCalcinator.java

@@ -1,4 +1,4 @@
-package ee3.common.recipe;
+package com.pahimar.ee3.recipe;
 
 /**
  * RecipesCalcinator

ee3_common/com/pahimar/ee3/recipe/RecipesTransmutationStone.java

@@ -1,4 +1,4 @@
-package ee3.common.recipe;
+package com.pahimar.ee3.recipe;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,17 +6,18 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import com.pahimar.ee3.core.handlers.EquivalencyHandler;
+import com.pahimar.ee3.core.helper.GeneralHelper;
+import com.pahimar.ee3.core.helper.RecipeHelper;
+import com.pahimar.ee3.item.ModItems;
+import com.pahimar.ee3.lib.Reference;
+
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
-import ee3.common.core.handlers.EquivalencyHandler;
-import ee3.common.core.helper.GeneralHelper;
-import ee3.common.core.helper.RecipeHelper;
-import ee3.common.item.ModItems;
-import ee3.common.lib.Reference;
 
 /**
  * RecipesTransmutationStone

ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java

@@ -1,7 +1,8 @@
-package ee3.common.tile;
+package com.pahimar.ee3.tileentity;
+
+import com.pahimar.ee3.block.ModBlocks;
+import com.pahimar.ee3.lib.Strings;
 
-import ee3.common.block.ModBlocks;
-import ee3.common.lib.Strings;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

ee3_common/com/pahimar/ee3/tileentity/TileEE.java

@@ -1,7 +1,8 @@
-package ee3.common.tile;
+package com.pahimar.ee3.tileentity;
+
+import com.pahimar.ee3.lib.Reference;
+import com.pahimar.ee3.lib.Strings;
 
-import ee3.common.lib.Reference;
-import ee3.common.lib.Strings;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;

ee3_common/ee3/common/core/handlers/ModActionHandler.java

@@ -1,13 +0,0 @@
-package ee3.common.core.handlers;
-
-import ee3.common.event.ModActionEvent;
-import net.minecraftforge.event.ForgeSubscribe;
-
-public class ModActionHandler {
-
-    @ForgeSubscribe
-    public void onModActionEvent(ModActionEvent event) {
-
-    }
-    
-}

ee3_common/ee3/common/event/WorldTransmutationEvent.java

@@ -1,29 +0,0 @@
-package ee3.common.event;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import net.minecraftforge.event.Event;
-
-public class WorldTransmutationEvent extends Event {
-    
-    public final EntityPlayer player; 
-    public final World world;
-    public final int originX, originY, originZ;
-    public final byte sideHit;
-    public final byte rangeX, rangeY, rangeZ;
-    public final String data;
-
-    public WorldTransmutationEvent(EntityPlayer player, World world, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
-        
-        this.player = player;
-        this.world = world;
-        this.originX = originX;
-        this.originY = originY;
-        this.originZ = originZ;
-        this.sideHit = sideHit;
-        this.rangeX = rangeX;
-        this.rangeY = rangeY;
-        this.rangeZ = rangeZ;
-        this.data = data;
-    }
-}

ee3_common/ee3/common/lib/ModAction.java

@@ -1,14 +0,0 @@
-package ee3.common.lib;
-
-
-public enum ModAction {
-    
-    TRANSMUTATION(WorldEvents.TRANSMUTATION);
-    
-    public int actionId;
-    
-    ModAction(int actionId) {
-        this.actionId = actionId;
-    }
-
-}

resources/ee3/lang/de_DE.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>German (DE) Localization File</comment>
@@ -31,7 +31,7 @@
 	<entry key="item.alchemyBag.brown.name">Brauner Alchemiebeutel</entry>
 	<entry key="item.alchemyBag.green.name">Grüner Alchemiebeutel</entry>
 	<entry key="item.alchemyBag.red.name">Roter Alchemiebeutel</entry>
-	<entry key="item.alchemyBag.black.name">Schwarzer Alchemiebeutel</entry></entry>
+	<entry key="item.alchemyBag.black.name">Schwarzer Alchemiebeutel</entry>
 	<entry key="tile.redWaterStill.name">Rotes Wasser (Still)</entry>
 	<entry key="tile.redWaterFlowing.name">Rotes Wasser (Fließend)</entry>
 	<entry key="tile.calcinator.name">Kalzinierer</entry>

resources/ee3/lang/zh_CN.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>Chinese (Simplified)(zh_CN) Localization File</comment>
-	<entry key="key.extra">其他</entry>
+	<entry key="key.extra">額外</entry>
 	<entry key="key.release">松开</entry>
 	<entry key="key.toggle">切换</entry>
 	<entry key="key.charge">充</entry>