diff --git a/ee3_client/ee3/client/core/ClientProxy.java b/ee3_client/ee3/client/core/ClientProxy.java
index 239cd2a0..708f82f7 100644
--- a/ee3_client/ee3/client/core/ClientProxy.java
+++ b/ee3_client/ee3/client/core/ClientProxy.java
@@ -1,6 +1,6 @@
package ee3.client.core;
-import net.minecraft.src.EnumRarity;
+import net.minecraft.item.EnumRarity;
import net.minecraftforge.client.EnumHelperClient;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
diff --git a/ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java b/ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java
index 7fff34ce..6f5c00a7 100644
--- a/ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java
+++ b/ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java
@@ -7,9 +7,8 @@ import ee3.common.item.ITransmutationStone;
import ee3.common.item.IChargeable;
import ee3.common.lib.ConfigurationSettings;
import ee3.common.lib.Sprites;
-import net.minecraft.src.EnumMovingObjectType;
-import net.minecraft.src.RenderEngine;
-import net.minecraft.src.Tessellator;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.EnumMovingObjectType;
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.event.ForgeSubscribe;
diff --git a/ee3_client/ee3/client/core/handlers/KeyBindingHandler.java b/ee3_client/ee3/client/core/handlers/KeyBindingHandler.java
index b5b46b53..d4a079b9 100644
--- a/ee3_client/ee3/client/core/handlers/KeyBindingHandler.java
+++ b/ee3_client/ee3/client/core/handlers/KeyBindingHandler.java
@@ -3,10 +3,10 @@ package ee3.client.core.handlers;
import java.util.EnumSet;
import java.util.logging.Level;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.KeyBinding;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.common.TickType;
diff --git a/ee3_client/ee3/client/core/handlers/RenderTickHandler.java b/ee3_client/ee3/client/core/handlers/RenderTickHandler.java
index a433e164..6e59551e 100644
--- a/ee3_client/ee3/client/core/handlers/RenderTickHandler.java
+++ b/ee3_client/ee3/client/core/handlers/RenderTickHandler.java
@@ -6,15 +6,13 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import net.minecraft.client.Minecraft;
-import net.minecraft.src.Block;
-import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemBlock;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.MovingObjectPosition;
-import net.minecraft.src.RenderHelper;
-import net.minecraft.src.RenderItem;
-import net.minecraft.src.ScaledResolution;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.util.MovingObjectPosition;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.ITickHandler;
diff --git a/ee3_client/ee3/client/core/helper/KeyBindingHelper.java b/ee3_client/ee3/client/core/helper/KeyBindingHelper.java
index a7935779..00ebfd14 100644
--- a/ee3_client/ee3/client/core/helper/KeyBindingHelper.java
+++ b/ee3_client/ee3/client/core/helper/KeyBindingHelper.java
@@ -1,7 +1,8 @@
package ee3.client.core.helper;
import java.util.ArrayList;
-import net.minecraft.src.KeyBinding;
+
+import net.minecraft.client.settings.KeyBinding;
/**
* KeyBindings
diff --git a/ee3_client/ee3/client/core/helper/RenderUtils.java b/ee3_client/ee3/client/core/helper/RenderUtils.java
index c3be40ae..831eb9a3 100644
--- a/ee3_client/ee3/client/core/helper/RenderUtils.java
+++ b/ee3_client/ee3/client/core/helper/RenderUtils.java
@@ -2,13 +2,13 @@ package ee3.client.core.helper;
import org.lwjgl.opengl.GL11;
-import net.minecraft.src.Block;
-import net.minecraft.src.FontRenderer;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.RenderBlocks;
-import net.minecraft.src.RenderEngine;
-import net.minecraft.src.Tessellator;
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.RenderEngine;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
public class RenderUtils {
diff --git a/ee3_client/ee3/client/gui/GuiCalcinator.java b/ee3_client/ee3/client/gui/GuiCalcinator.java
index 6132db65..4032ab17 100644
--- a/ee3_client/ee3/client/gui/GuiCalcinator.java
+++ b/ee3_client/ee3/client/gui/GuiCalcinator.java
@@ -1,5 +1,9 @@
package ee3.client.gui;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.Side;
@@ -9,11 +13,6 @@ import ee3.common.container.ContainerCalcinator;
import ee3.common.lib.Sprites;
import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator;
-import net.minecraft.src.Container;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.StatCollector;
-import net.minecraft.src.TileEntityFurnace;
/**
* GuiCalcinator
diff --git a/ee3_client/ee3/client/gui/GuiPortableCrafting.java b/ee3_client/ee3/client/gui/GuiPortableCrafting.java
index 45aa8cb8..ab0acbb2 100644
--- a/ee3_client/ee3/client/gui/GuiPortableCrafting.java
+++ b/ee3_client/ee3/client/gui/GuiPortableCrafting.java
@@ -1,15 +1,15 @@
package ee3.client.gui;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import ee3.common.container.ContainerPortableCrafting;
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.StatCollector;
-import net.minecraft.src.World;
/**
* GuiPortableCrafting
diff --git a/ee3_client/ee3/client/render/ModelCalcinator.java b/ee3_client/ee3/client/render/ModelCalcinator.java
index de21b265..81782459 100644
--- a/ee3_client/ee3/client/render/ModelCalcinator.java
+++ b/ee3_client/ee3/client/render/ModelCalcinator.java
@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.lib.Sprites;
import ee3.common.tile.TileCalcinator;
-import net.minecraft.src.ModelBase;
-import net.minecraft.src.ModelRenderer;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.client.ForgeHooksClient;
/**
diff --git a/ee3_client/ee3/client/render/RenderCalcinator.java b/ee3_client/ee3/client/render/RenderCalcinator.java
index 30814cbc..44a1d140 100644
--- a/ee3_client/ee3/client/render/RenderCalcinator.java
+++ b/ee3_client/ee3/client/render/RenderCalcinator.java
@@ -4,10 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.tile.TileCalcinator;
-import net.minecraft.src.ModelBase;
-import net.minecraft.src.ModelRenderer;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.TileEntitySpecialRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
/**
* RenderCalcinator
diff --git a/ee3_client/ee3/client/render/RenderItemCalcinator.java b/ee3_client/ee3/client/render/RenderItemCalcinator.java
index 8432d6a5..b83700d3 100644
--- a/ee3_client/ee3/client/render/RenderItemCalcinator.java
+++ b/ee3_client/ee3/client/render/RenderItemCalcinator.java
@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.lib.Reference;
import ee3.common.lib.Sprites;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Tessellator;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.item.ItemStack;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.IItemRenderer;
diff --git a/ee3_client/ee3/client/render/TextureRedWaterFX.java b/ee3_client/ee3/client/render/TextureRedWaterFX.java
index adee7bc9..7e6a7433 100644
--- a/ee3_client/ee3/client/render/TextureRedWaterFX.java
+++ b/ee3_client/ee3/client/render/TextureRedWaterFX.java
@@ -2,7 +2,7 @@ package ee3.client.render;
import org.lwjgl.opengl.GL11;
-import net.minecraft.src.RenderEngine;
+import net.minecraft.client.renderer.RenderEngine;
import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.FMLTextureFX;
import ee3.common.block.ModBlocks;
diff --git a/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java b/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java
index f09b2971..20a110e7 100644
--- a/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java
+++ b/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java
@@ -1,6 +1,6 @@
package ee3.client.render;
-import net.minecraft.src.RenderEngine;
+import net.minecraft.client.renderer.RenderEngine;
import org.lwjgl.opengl.GL11;
diff --git a/ee3_common/ee3/common/EquivalentExchange3.java b/ee3_common/ee3/common/EquivalentExchange3.java
index 51db7eb8..ec9928b3 100644
--- a/ee3_common/ee3/common/EquivalentExchange3.java
+++ b/ee3_common/ee3/common/EquivalentExchange3.java
@@ -1,6 +1,6 @@
package ee3.common;
-import net.minecraft.src.CreativeTabs;
+import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
@@ -21,6 +21,7 @@ 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;
@@ -30,6 +31,7 @@ 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;
@@ -108,6 +110,10 @@ public class EquivalentExchange3 {
// Register the EntityLiving Handler
MinecraftForge.EVENT_BUS.register(new EntityLivingHandler());
+ MinecraftForge.EVENT_BUS.register(new ModActionHandler());
+
+ MinecraftForge.EVENT_BUS.register(new WorldTransmutationHandler());
+
// Register the DrawBlockHighlight Handler
proxy.registerDrawBlockHighlightHandler();
diff --git a/ee3_common/ee3/common/block/BlockCalcinator.java b/ee3_common/ee3/common/block/BlockCalcinator.java
index 4c439b54..c77ce9cc 100644
--- a/ee3_common/ee3/common/block/BlockCalcinator.java
+++ b/ee3_common/ee3/common/block/BlockCalcinator.java
@@ -5,11 +5,10 @@ import ee3.common.lib.GuiIds;
import ee3.common.lib.RenderIds;
import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.Material;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
/**
* BlockCalcinator
diff --git a/ee3_common/ee3/common/block/BlockEE.java b/ee3_common/ee3/common/block/BlockEE.java
index 95e12440..a516da3b 100644
--- a/ee3_common/ee3/common/block/BlockEE.java
+++ b/ee3_common/ee3/common/block/BlockEE.java
@@ -1,9 +1,7 @@
package ee3.common.block;
-import net.minecraft.src.BlockContainer;
-import net.minecraft.src.Material;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
/**
* BlockEE
diff --git a/ee3_common/ee3/common/block/BlockRedWaterFlowing.java b/ee3_common/ee3/common/block/BlockRedWaterFlowing.java
index 435704d4..c8b5e8fa 100644
--- a/ee3_common/ee3/common/block/BlockRedWaterFlowing.java
+++ b/ee3_common/ee3/common/block/BlockRedWaterFlowing.java
@@ -4,9 +4,8 @@ import ee3.common.EquivalentExchange3;
import ee3.common.lib.Reference;
import ee3.common.lib.Sprites;
import ee3.common.lib.Strings;
-import net.minecraft.src.BlockFlowing;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.Material;
+import net.minecraft.block.BlockFlowing;
+import net.minecraft.block.material.Material;
/**
* BlockRedWaterFlowing
diff --git a/ee3_common/ee3/common/block/BlockRedWaterStill.java b/ee3_common/ee3/common/block/BlockRedWaterStill.java
index e9081d22..6bb708e7 100644
--- a/ee3_common/ee3/common/block/BlockRedWaterStill.java
+++ b/ee3_common/ee3/common/block/BlockRedWaterStill.java
@@ -3,8 +3,8 @@ package ee3.common.block;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.Sprites;
import ee3.common.lib.Strings;
-import net.minecraft.src.BlockStationary;
-import net.minecraft.src.Material;
+import net.minecraft.block.BlockStationary;
+import net.minecraft.block.material.Material;
/**
* BlockRedWaterFlowing
diff --git a/ee3_common/ee3/common/block/ModBlocks.java b/ee3_common/ee3/common/block/ModBlocks.java
index 46f62489..c9f5807e 100644
--- a/ee3_common/ee3/common/block/ModBlocks.java
+++ b/ee3_common/ee3/common/block/ModBlocks.java
@@ -5,10 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.BlockIds;
import ee3.common.lib.Strings;
-import net.minecraft.src.Block;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Material;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
/**
* ModBlocks
diff --git a/ee3_common/ee3/common/container/ContainerCalcinator.java b/ee3_common/ee3/common/container/ContainerCalcinator.java
index 9c28da19..c317cfe6 100644
--- a/ee3_common/ee3/common/container/ContainerCalcinator.java
+++ b/ee3_common/ee3/common/container/ContainerCalcinator.java
@@ -1,13 +1,13 @@
package ee3.common.container;
import ee3.common.tile.TileCalcinator;
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.FurnaceRecipes;
-import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-import net.minecraft.src.TileEntityFurnace;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.tileentity.TileEntityFurnace;
/**
* ContainerCalcinator
diff --git a/ee3_common/ee3/common/container/ContainerPortableCrafting.java b/ee3_common/ee3/common/container/ContainerPortableCrafting.java
index dd3beb01..2c15e53c 100644
--- a/ee3_common/ee3/common/container/ContainerPortableCrafting.java
+++ b/ee3_common/ee3/common/container/ContainerPortableCrafting.java
@@ -1,9 +1,9 @@
package ee3.common.container;
-import net.minecraft.src.ContainerWorkbench;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ContainerWorkbench;
+import net.minecraft.world.World;
/**
* ContainerPortableCrafting
diff --git a/ee3_common/ee3/common/core/CommonProxy.java b/ee3_common/ee3/common/core/CommonProxy.java
index 57d7e18a..67ca0734 100644
--- a/ee3_common/ee3/common/core/CommonProxy.java
+++ b/ee3_common/ee3/common/core/CommonProxy.java
@@ -1,8 +1,8 @@
package ee3.common.core;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.EnumRarity;
-import net.minecraft.src.World;
+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;
diff --git a/ee3_common/ee3/common/core/CreativeTabEE3.java b/ee3_common/ee3/common/core/CreativeTabEE3.java
index 9ef301a0..5624df26 100644
--- a/ee3_common/ee3/common/core/CreativeTabEE3.java
+++ b/ee3_common/ee3/common/core/CreativeTabEE3.java
@@ -4,8 +4,8 @@ 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.src.CreativeTabs;
-import net.minecraft.src.Item;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
public class CreativeTabEE3 extends CreativeTabs {
diff --git a/ee3_common/ee3/common/core/addons/AddonRedPower2.java b/ee3_common/ee3/common/core/addons/AddonRedPower2.java
index 10b511f0..ae82ac29 100644
--- a/ee3_common/ee3/common/core/addons/AddonRedPower2.java
+++ b/ee3_common/ee3/common/core/addons/AddonRedPower2.java
@@ -8,8 +8,8 @@ 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.src.Block;
-import net.minecraft.src.ItemStack;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
import net.minecraft.src.ModLoader;
public class AddonRedPower2 {
diff --git a/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java b/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java
index 7aacc596..a16c4b6e 100644
--- a/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java
+++ b/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java
@@ -3,10 +3,7 @@ package ee3.common.core.handlers;
import ee3.common.core.helper.ItemDropHelper;
import ee3.common.core.helper.RedWaterHelper;
import ee3.common.lib.Reference;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.Potion;
-import net.minecraft.src.PotionEffect;
+import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
diff --git a/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java b/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java
index c1f623c5..2b2e777b 100644
--- a/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java
+++ b/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java
@@ -3,7 +3,7 @@ package ee3.common.core.handlers;
import java.util.ArrayList;
import ee3.common.core.helper.GeneralHelper;
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
/**
* EquivalencyHandler
diff --git a/ee3_common/ee3/common/core/handlers/FuelHandler.java b/ee3_common/ee3/common/core/handlers/FuelHandler.java
index 76b46261..b8c5fd6e 100644
--- a/ee3_common/ee3/common/core/handlers/FuelHandler.java
+++ b/ee3_common/ee3/common/core/handlers/FuelHandler.java
@@ -1,6 +1,6 @@
package ee3.common.core.handlers;
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.IFuelHandler;
/**
diff --git a/ee3_common/ee3/common/core/handlers/ModActionHandler.java b/ee3_common/ee3/common/core/handlers/ModActionHandler.java
new file mode 100644
index 00000000..bb29270d
--- /dev/null
+++ b/ee3_common/ee3/common/core/handlers/ModActionHandler.java
@@ -0,0 +1,13 @@
+package ee3.common.core.handlers;
+
+import ee3.common.event.ModActionEvent;
+import net.minecraftforge.event.ForgeSubscribe;
+
+public class ModActionHandler {
+
+ @ForgeSubscribe
+ public void onModActionEvent(ModActionEvent event) {
+
+ }
+
+}
diff --git a/ee3_common/ee3/common/core/handlers/PacketHandler.java b/ee3_common/ee3/common/core/handlers/PacketHandler.java
index ed87498d..b673ce29 100644
--- a/ee3_common/ee3/common/core/handlers/PacketHandler.java
+++ b/ee3_common/ee3/common/core/handlers/PacketHandler.java
@@ -3,8 +3,9 @@ package ee3.common.core.handlers;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
-import net.minecraft.src.INetworkManager;
-import net.minecraft.src.Packet250CustomPayload;
+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;
diff --git a/ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java b/ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java
new file mode 100644
index 00000000..972245fa
--- /dev/null
+++ b/ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java
@@ -0,0 +1,14 @@
+package ee3.common.core.handlers;
+
+import ee3.common.event.WorldTransmutationEvent;
+import net.minecraftforge.event.ForgeSubscribe;
+
+
+public class WorldTransmutationHandler {
+
+ @ForgeSubscribe
+ public void onWorldTransmutationEvent(WorldTransmutationEvent event) {
+ System.out.println(event.toString());
+ }
+
+}
diff --git a/ee3_common/ee3/common/core/helper/GeneralHelper.java b/ee3_common/ee3/common/core/helper/GeneralHelper.java
index 146eb8ae..83e8f18f 100644
--- a/ee3_common/ee3/common/core/helper/GeneralHelper.java
+++ b/ee3_common/ee3/common/core/helper/GeneralHelper.java
@@ -2,11 +2,11 @@ package ee3.common.core.helper;
import java.util.ArrayList;
-import net.minecraft.src.Block;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityMob;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.monster.EntityMob;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
/**
* GeneralHelper
diff --git a/ee3_common/ee3/common/core/helper/ItemDropHelper.java b/ee3_common/ee3/common/core/helper/ItemDropHelper.java
index 8fc378ef..77ecba53 100644
--- a/ee3_common/ee3/common/core/helper/ItemDropHelper.java
+++ b/ee3_common/ee3/common/core/helper/ItemDropHelper.java
@@ -1,9 +1,8 @@
package ee3.common.core.helper;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
import ee3.common.item.ModItems;
-import net.minecraft.src.EntityAgeable;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityPlayer;
/**
* ItemDropHelper
diff --git a/ee3_common/ee3/common/core/helper/NBTHelper.java b/ee3_common/ee3/common/core/helper/NBTHelper.java
index e03c938e..fc0a55b7 100644
--- a/ee3_common/ee3/common/core/helper/NBTHelper.java
+++ b/ee3_common/ee3/common/core/helper/NBTHelper.java
@@ -1,7 +1,7 @@
package ee3.common.core.helper;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
/**
* NBTHelper
diff --git a/ee3_common/ee3/common/core/helper/QualityHelper.java b/ee3_common/ee3/common/core/helper/QualityHelper.java
index e668cc9d..468aae43 100644
--- a/ee3_common/ee3/common/core/helper/QualityHelper.java
+++ b/ee3_common/ee3/common/core/helper/QualityHelper.java
@@ -1,6 +1,6 @@
package ee3.common.core.helper;
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
/**
* QualityHelper
diff --git a/ee3_common/ee3/common/core/helper/RecipeHelper.java b/ee3_common/ee3/common/core/helper/RecipeHelper.java
index e2a169dd..3e62a620 100644
--- a/ee3_common/ee3/common/core/helper/RecipeHelper.java
+++ b/ee3_common/ee3/common/core/helper/RecipeHelper.java
@@ -2,10 +2,10 @@ package ee3.common.core.helper;
import java.util.ArrayList;
-import net.minecraft.src.Block;
-import net.minecraft.src.FurnaceRecipes;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.block.Block;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
/**
diff --git a/ee3_common/ee3/common/core/helper/RedWaterHelper.java b/ee3_common/ee3/common/core/helper/RedWaterHelper.java
index d24bc1f5..d7935f3b 100644
--- a/ee3_common/ee3/common/core/helper/RedWaterHelper.java
+++ b/ee3_common/ee3/common/core/helper/RedWaterHelper.java
@@ -2,11 +2,11 @@ package ee3.common.core.helper;
import ee3.common.block.ModBlocks;
import ee3.common.lib.ConfigurationSettings;
-import net.minecraft.src.AxisAlignedBB;
-import net.minecraft.src.Block;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.MathHelper;
-import net.minecraft.src.World;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
/**
* RedWaterHelper
diff --git a/ee3_common/ee3/common/core/helper/TransmutationHelper.java b/ee3_common/ee3/common/core/helper/TransmutationHelper.java
index 348eb344..e2542555 100644
--- a/ee3_common/ee3/common/core/helper/TransmutationHelper.java
+++ b/ee3_common/ee3/common/core/helper/TransmutationHelper.java
@@ -4,14 +4,14 @@ import java.util.ArrayList;
import ee3.common.core.handlers.EquivalencyHandler;
import ee3.common.lib.Sounds;
-import net.minecraft.src.Block;
-import net.minecraft.src.BlockSand;
-import net.minecraft.src.BlockLeaves;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemBlock;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Material;
-import net.minecraft.src.World;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.BlockLeaves;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
/**
* TransmutationHelper
diff --git a/ee3_common/ee3/common/emc/EMCRegistry.java b/ee3_common/ee3/common/emc/EMCRegistry.java
index fc1f8892..c6e1904a 100644
--- a/ee3_common/ee3/common/emc/EMCRegistry.java
+++ b/ee3_common/ee3/common/emc/EMCRegistry.java
@@ -3,9 +3,9 @@ package ee3.common.emc;
import java.util.HashMap;
import java.util.Map;
-import net.minecraft.src.Block;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
/**
* EMCRegistry
diff --git a/ee3_common/ee3/common/event/ModActionEvent.java b/ee3_common/ee3/common/event/ModActionEvent.java
new file mode 100644
index 00000000..b4ab7488
--- /dev/null
+++ b/ee3_common/ee3/common/event/ModActionEvent.java
@@ -0,0 +1,38 @@
+package ee3.common.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.entity.player.PlayerEvent;
+
+@Cancelable
+public class ModActionEvent extends PlayerEvent {
+
+ public final ModAction modAction;
+ 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) {
+
+ super(player);
+ this.modAction = modAction;
+ this.x = x;
+ this.y = y;
+ this.z = z;
+ this.sideHit = sideHit;
+ if (sideHit == -1) {
+ allowEvent = DENY;
+ }
+ }
+
+ @Override
+ public void setCanceled(boolean cancel)
+ {
+ super.setCanceled(cancel);
+ allowEvent = (cancel ? DENY : allowEvent == DENY ? DENY : DEFAULT);
+ }
+
+}
diff --git a/ee3_common/ee3/common/event/WorldTransmutationEvent.java b/ee3_common/ee3/common/event/WorldTransmutationEvent.java
new file mode 100644
index 00000000..259ee151
--- /dev/null
+++ b/ee3_common/ee3/common/event/WorldTransmutationEvent.java
@@ -0,0 +1,29 @@
+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;
+ }
+}
diff --git a/ee3_common/ee3/common/item/IChargeable.java b/ee3_common/ee3/common/item/IChargeable.java
index 11d111ce..e71306ae 100644
--- a/ee3_common/ee3/common/item/IChargeable.java
+++ b/ee3_common/ee3/common/item/IChargeable.java
@@ -1,6 +1,6 @@
package ee3.common.item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
public interface IChargeable {
diff --git a/ee3_common/ee3/common/item/IKeyBound.java b/ee3_common/ee3/common/item/IKeyBound.java
index bfdb53a0..a3e9f3e8 100644
--- a/ee3_common/ee3/common/item/IKeyBound.java
+++ b/ee3_common/ee3/common/item/IKeyBound.java
@@ -1,7 +1,7 @@
package ee3.common.item;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
public interface IKeyBound {
diff --git a/ee3_common/ee3/common/item/ITransmutationStone.java b/ee3_common/ee3/common/item/ITransmutationStone.java
index fd6cd504..0e0f7b3e 100644
--- a/ee3_common/ee3/common/item/ITransmutationStone.java
+++ b/ee3_common/ee3/common/item/ITransmutationStone.java
@@ -1,6 +1,6 @@
package ee3.common.item;
-import net.minecraft.src.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayer;
/**
* ITransmutationStone
diff --git a/ee3_common/ee3/common/item/ItemAlchemyBag.java b/ee3_common/ee3/common/item/ItemAlchemyBag.java
index 3a1a52aa..4b51a4f8 100644
--- a/ee3_common/ee3/common/item/ItemAlchemyBag.java
+++ b/ee3_common/ee3/common/item/ItemAlchemyBag.java
@@ -2,9 +2,9 @@ package ee3.common.item;
import java.util.List;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.MathHelper;
+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;
diff --git a/ee3_common/ee3/common/item/ItemAlchemyDust.java b/ee3_common/ee3/common/item/ItemAlchemyDust.java
index d7de84be..7e6c8c25 100644
--- a/ee3_common/ee3/common/item/ItemAlchemyDust.java
+++ b/ee3_common/ee3/common/item/ItemAlchemyDust.java
@@ -2,12 +2,10 @@ package ee3.common.item;
import java.util.List;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.EnumRarity;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.MathHelper;
-import net.minecraft.src.StringTranslate;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+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;
diff --git a/ee3_common/ee3/common/item/ItemEE.java b/ee3_common/ee3/common/item/ItemEE.java
index f8b0a5cd..ee47e8f8 100644
--- a/ee3_common/ee3/common/item/ItemEE.java
+++ b/ee3_common/ee3/common/item/ItemEE.java
@@ -2,7 +2,7 @@ package ee3.common.item;
import ee3.common.lib.Reference;
import ee3.common.lib.Sprites;
-import net.minecraft.src.Item;
+import net.minecraft.item.Item;
/**
* ItemEE
diff --git a/ee3_common/ee3/common/item/ItemMiniumStone.java b/ee3_common/ee3/common/item/ItemMiniumStone.java
index 53a82afd..5e1151c5 100644
--- a/ee3_common/ee3/common/item/ItemMiniumStone.java
+++ b/ee3_common/ee3/common/item/ItemMiniumStone.java
@@ -1,9 +1,9 @@
package ee3.common.item;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.EnumRarity;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
diff --git a/ee3_common/ee3/common/item/ItemPhilosopherStone.java b/ee3_common/ee3/common/item/ItemPhilosopherStone.java
index 12f8aa5e..efac0b3f 100644
--- a/ee3_common/ee3/common/item/ItemPhilosopherStone.java
+++ b/ee3_common/ee3/common/item/ItemPhilosopherStone.java
@@ -16,10 +16,10 @@ import ee3.common.lib.WorldEvents;
import ee3.common.network.PacketKeyPressed;
import ee3.common.network.PacketTypeHandler;
import ee3.common.network.PacketWorldEvent;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.EnumRarity;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
/**
* ItemPhilosopherStone
diff --git a/ee3_common/ee3/common/item/ModItems.java b/ee3_common/ee3/common/item/ModItems.java
index 60105f0d..8d0bee37 100644
--- a/ee3_common/ee3/common/item/ModItems.java
+++ b/ee3_common/ee3/common/item/ModItems.java
@@ -5,10 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.ItemIds;
import ee3.common.lib.Strings;
-import net.minecraft.src.Block;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
/**
* ModItems
diff --git a/ee3_common/ee3/common/lib/ModAction.java b/ee3_common/ee3/common/lib/ModAction.java
new file mode 100644
index 00000000..b55e6c4f
--- /dev/null
+++ b/ee3_common/ee3/common/lib/ModAction.java
@@ -0,0 +1,14 @@
+package ee3.common.lib;
+
+
+public enum ModAction {
+
+ TRANSMUTATION(WorldEvents.TRANSMUTATION);
+
+ public int actionId;
+
+ ModAction(int actionId) {
+ this.actionId = actionId;
+ }
+
+}
diff --git a/ee3_common/ee3/common/network/PacketEE.java b/ee3_common/ee3/common/network/PacketEE.java
index 58563f1b..4f313251 100644
--- a/ee3_common/ee3/common/network/PacketEE.java
+++ b/ee3_common/ee3/common/network/PacketEE.java
@@ -4,8 +4,9 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+
+import net.minecraft.network.INetworkManager;
import cpw.mods.fml.common.network.Player;
-import net.minecraft.src.INetworkManager;
/**
* PacketEE
diff --git a/ee3_common/ee3/common/network/PacketKeyPressed.java b/ee3_common/ee3/common/network/PacketKeyPressed.java
index c24aa1a4..23605f2c 100644
--- a/ee3_common/ee3/common/network/PacketKeyPressed.java
+++ b/ee3_common/ee3/common/network/PacketKeyPressed.java
@@ -4,6 +4,9 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+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;
@@ -13,10 +16,6 @@ import ee3.common.lib.GuiIds;
import ee3.common.lib.ItemIds;
import ee3.common.lib.Reference;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.INetworkManager;
-import net.minecraft.src.Packet250CustomPayload;
-
/**
* PacketKeyPressed
*
diff --git a/ee3_common/ee3/common/network/PacketTileUpdate.java b/ee3_common/ee3/common/network/PacketTileUpdate.java
index 9d6b367f..99baefc7 100644
--- a/ee3_common/ee3/common/network/PacketTileUpdate.java
+++ b/ee3_common/ee3/common/network/PacketTileUpdate.java
@@ -6,7 +6,7 @@ import java.io.IOException;
import cpw.mods.fml.common.network.Player;
-import net.minecraft.src.INetworkManager;
+import net.minecraft.network.INetworkManager;
import net.minecraftforge.common.ForgeDirection;
/**
diff --git a/ee3_common/ee3/common/network/PacketTypeHandler.java b/ee3_common/ee3/common/network/PacketTypeHandler.java
index f1d8da89..01d240db 100644
--- a/ee3_common/ee3/common/network/PacketTypeHandler.java
+++ b/ee3_common/ee3/common/network/PacketTypeHandler.java
@@ -3,10 +3,11 @@ package ee3.common.network;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet250CustomPayload;
+
import ee3.common.lib.Reference;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet250CustomPayload;
/**
* PacketTypeHandler
diff --git a/ee3_common/ee3/common/network/PacketWorldEvent.java b/ee3_common/ee3/common/network/PacketWorldEvent.java
index bae0a162..20f64964 100644
--- a/ee3_common/ee3/common/network/PacketWorldEvent.java
+++ b/ee3_common/ee3/common/network/PacketWorldEvent.java
@@ -4,10 +4,18 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.INetworkManager;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+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 {
@@ -92,20 +100,6 @@ public class PacketWorldEvent extends PacketEE {
public void execute(INetworkManager manager, Player player) {
- System.out.println("World Event Packet received");
- System.out.println("eventType: " + eventType);
- System.out.println("originX: " + originX);
- System.out.println("originY: " + originY);
- System.out.println("originZ: " + originZ);
- System.out.println("sideHit: " + sideHit);
- System.out.println("rangeX: " + rangeX);
- System.out.println("rangeY: " + rangeY);
- System.out.println("rangeZ: " + rangeZ);
- System.out.println("data: " + data);
-
- EntityPlayer thePlayer = (EntityPlayer) player;
- World world = thePlayer.worldObj;
-
/*
* Server knows the world, the player, and all the packet data
* Server checks (for each block);
@@ -117,6 +111,19 @@ public class PacketWorldEvent extends PacketEE {
* so Range would be 1, 2, 4, 6
* 1 + 0, 1 + 1, 1 + 3, 1 + 5
*/
+
+ EntityPlayer thePlayer = (EntityPlayer) player;
+ ModActionEvent modActionEvent;
+ WorldTransmutationEvent worldTransmutationEvent;
+
+ modActionEvent= new ModActionEvent(thePlayer, ModAction.TRANSMUTATION, originX, originY, originZ, (int) sideHit);
+ MinecraftForge.EVENT_BUS.post(modActionEvent);
+
+ if (modActionEvent.allowEvent != Result.DENY) {
+ worldTransmutationEvent = new WorldTransmutationEvent(thePlayer, thePlayer.worldObj, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, data);
+ MinecraftForge.EVENT_BUS.post(worldTransmutationEvent);
+ }
+
}
}
diff --git a/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java b/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java
index ae63306d..9e16a0a2 100644
--- a/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java
+++ b/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java
@@ -8,10 +8,10 @@ import java.util.Map;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import net.minecraft.src.Block;
-import net.minecraft.src.FurnaceRecipes;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+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;
diff --git a/ee3_common/ee3/common/tile/TileCalcinator.java b/ee3_common/ee3/common/tile/TileCalcinator.java
index 2d8bcc72..2347f75e 100644
--- a/ee3_common/ee3/common/tile/TileCalcinator.java
+++ b/ee3_common/ee3/common/tile/TileCalcinator.java
@@ -2,10 +2,10 @@ package ee3.common.tile;
import ee3.common.block.ModBlocks;
import ee3.common.lib.Strings;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
/**
* TileCalcinator
diff --git a/ee3_common/ee3/common/tile/TileEE.java b/ee3_common/ee3/common/tile/TileEE.java
index a4dac65f..53279cc8 100644
--- a/ee3_common/ee3/common/tile/TileEE.java
+++ b/ee3_common/ee3/common/tile/TileEE.java
@@ -2,9 +2,9 @@ package ee3.common.tile;
import ee3.common.lib.Reference;
import ee3.common.lib.Strings;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.TileEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
/**
* TileEE
diff --git a/resources/ee3/lang/la_IT.xml b/resources/ee3/lang/la_IT.xml
index ffb8fcf1..381feecf 100644
--- a/resources/ee3/lang/la_IT.xml
+++ b/resources/ee3/lang/la_IT.xml
@@ -16,6 +16,22 @@
Caeruleus Afae
Amarantus Afae
Iris Afae
+ Albulus Saccus Alchimiae
+ Luteus Saccus Alchimiae
+ Rufus Purpurei Saccus Alchimiae
+ Albulus Caeruli Saccus Alchimiae
+ Flavus Saccus Alchimiae
+ Prasinus Saccus Alchimiae
+ Roseus Saccus Alchimiae
+ Canutus Saccus Alchimiae
+ Albulus Canuti Saccus Alchimiae
+ Luculentus Caerulus Saccus Alchimiae
+ Purpureus Saccus Alchimiae
+ Caeruleus Saccus Alchimiae
+ Brunus Saccus Alchimiae
+ Carpasinus Saccus Alchimiae
+ Rufus Saccus Alchimiae
+ Pullejaceus Saccus Alchimiae
Rufi Aqua (Residans)
Rufi Aqua (Fluens)
Auctor Calcus
diff --git a/resources/ee3/lang/pt_PT.xml b/resources/ee3/lang/pt_PT.xml
index 1baa6350..d54b6e1a 100644
--- a/resources/ee3/lang/pt_PT.xml
+++ b/resources/ee3/lang/pt_PT.xml
@@ -16,17 +16,31 @@
Pó Cerúleo
Pó Amarantino
Pó Iridescente
- Água Vermelha (Estagnada)
- Água Vermelha (A fluir)
+ Saco Alquímico Branco
+ Saco Alquímico Cor-de-Laranja
+ Saco Alquímico Magenta
+ Saco Alquímico Azul Claro
+ Saco Alquímico Amarelo
+ Saco Alquímico Verde Lima
+ Saco Alquímico Cor-de-Rosa
+ Saco Alquímico Cinzento
+ Saco Alquímico Cinzento Claro
+ Saco Alquímico Azul Ciano
+ Saco Alquímico Roxo
+ Saco Alquímico Azul
+ Saco Alquímico Castanho
+ Saco Alquímico Verde
+ Saco Alquímico Vermelho
+ Saco Alquímico Preto
+ Água Vermelha Estagnada
+ Água Vermelha a fluir
Calcinatório
Calcinatório
Equivalent Exchange 3
- Impuro
- Puro
A inicializar verificação da versão contra o ficheiro autoritário de versão remoto, localizado em
- A verificação da versão não concluiu com sucesso (a verificação da versão não inicializou correctamente)
- Estás actualmente a usar a versão mais actualizada para a tua versão do Minecraft
- Estás actualmente a usar uma versão desactualizada; considera actualizar aqui - @MOD_UPDATE_LOCATION@
- Erro ao ligar ao ficheiro autoritário de versão remoto (verifica a tua ligação de Internet?)
+ A verificação da versão não inicializou correctamente
+ Estás actualmente a usar a versão mais actualizada (@REMOTE_MOD_VERSION@) do Equivalent Exchange 3 para o @MINECRAFT_VERSION@
+ Existe uma versão nova do @MOD_NAME@ (@REMOTE_MOD_VERSION@) para o @MINECRAFT_VERSION@. Obtém-na aqui: @MOD_UPDATE_LOCATION@
+ Erro ao ligar ao ficheiro autoritário de versão remoto
Verificação de versão remota desactivada, a ignorar
diff --git a/resources/ee3/lang/ru_RU.xml b/resources/ee3/lang/ru_RU.xml
index 8dfae026..99564b48 100644
--- a/resources/ee3/lang/ru_RU.xml
+++ b/resources/ee3/lang/ru_RU.xml
@@ -17,7 +17,7 @@
Пурпурная Пыль
Радужная Пыль
Белая Алхимическая Сумка
- Оранжевая Alchemical Bag
+ Оранжевая Алхимическая Сумка
Пурпурная Алхимическая Сумка
Светло-Синяя Алхимическая Сумка
Желтая Алхимическая Сумка
diff --git a/resources/ee3/lang/sv_SE.xml b/resources/ee3/lang/sv_SE.xml
index 5940c38b..0939c0e4 100644
--- a/resources/ee3/lang/sv_SE.xml
+++ b/resources/ee3/lang/sv_SE.xml
@@ -8,16 +8,38 @@
Ladda
Mönjaskärva
Inert Sten
- Mönja Sten
+ Mönjasten
De Vises Sten
+ Aska
+ Mönjapulver
+ Grönskande Pulver
+ Azurblå Pulver
+ Amarant Pulver
+ Skimmrande Pulver
+ Vit Alkemisk Påse
+ Orange Alkemisk Påse
+ Magenta Alkemisk Påse
+ Ljusblå Alkemisk Påse
+ Gul Alkemisk Påse
+ Lime Alkemisk Påse
+ Rosa Alkemisk Påse
+ Grå Alkemisk Påse
+ Ljusgrå Alkemisk Påse
+ Cyan Alkemisk Påse
+ Lila Alkemisk Påse
+ Blå Alkemisk Påse
+ Brun Alkemisk Påse
+ Grön Alkemisk Påse
+ Röd Alkemisk Påse
+ Svart Alkemisk Påse
Rödvatten (Stilla)
Rödvatten (Forsande)
Kalcinator
Kalcinator
Initierar versionskontroll mot fjärrversions auktoritetsfil, lokaliserad vid
Versionskontrollen misslyckades (Versionskontrollen initierades inte korrekt)
- Du använder den mest uppdaterade versionen för din version av Minecraft
- Du använder en utdaterad version; överväg att uppdatera här - @MOD_UPDATE_LOCATION@
- Misslyckades med att ansluta till fjärrversions auktoritetsfil (Kontrollera din internetanslutning?)
- Fjärrversions versionskontroll inaktiverad, hoppar över
+ Du använder den mest uppdaterade versionen (@REMOTE_MOD_VERSION@) av Equivalent Exchange 3 för @MINECRAFT_VERSION@
+ Det finns en ny version av @MOD_NAME@ (@REMOTE_MOD_VERSION@) för @MINECRAFT_VERSION@. Hämta den här: @MOD_UPDATE_LOCATION@
+ Ett fel uppstod vid kontroll av fjärrversions auktoritetsfilen
+ Versionskontroll inaktiverad, hoppar över