diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java index b8eaef71..d5c87d13 100644 --- a/src/resonantinduction/ResonantInduction.java +++ b/src/resonantinduction/ResonantInduction.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.ShapedOreRecipe; import resonantinduction.contractor.BlockEMContractor; +import resonantinduction.contractor.EntityContractorItem; import resonantinduction.contractor.TileEntityEMContractor; import resonantinduction.entangler.ItemQuantumEntangler; import resonantinduction.tesla.BlockTesla; @@ -25,6 +26,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; +import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -132,6 +134,8 @@ public class ResonantInduction // Tiles GameRegistry.registerTileEntity(TileEntityTesla.class, blockTesla.getUnlocalizedName()); GameRegistry.registerTileEntity(TileEntityEMContractor.class, blockEMContractor.getUnlocalizedName()); + + EntityRegistry.registerModEntity(EntityContractorItem.class, "EntityContractorItem", 0, this, 40, 5, true); ResonantInduction.proxy.registerRenderers(); @@ -155,7 +159,7 @@ public class ResonantInduction } @EventHandler - public void preInit(FMLPostInitializationEvent evt) + public void postInit(FMLPostInitializationEvent evt) { /** * Recipes diff --git a/src/resonantinduction/contractor/EntityContractorItem.java b/src/resonantinduction/contractor/EntityContractorItem.java index 858f0981..842970f8 100644 --- a/src/resonantinduction/contractor/EntityContractorItem.java +++ b/src/resonantinduction/contractor/EntityContractorItem.java @@ -31,6 +31,8 @@ public class EntityContractorItem extends EntityItem { super.onUpdate(); + System.out.println(worldObj.isRemote + " " + motionX + " " + motionY + " " + motionZ); + if(!doGravityThisTick) { motionY = 0; @@ -53,6 +55,8 @@ public class EntityContractorItem extends EntityItem item.dataWatcher = entityItem.getDataWatcher(); + item.delayBeforeCanPickup = entityItem.delayBeforeCanPickup; + return item; } } diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/contractor/TileEntityEMContractor.java index 481a0da3..14940233 100644 --- a/src/resonantinduction/contractor/TileEntityEMContractor.java +++ b/src/resonantinduction/contractor/TileEntityEMContractor.java @@ -1,5 +1,6 @@ package resonantinduction.contractor; +import java.util.ArrayList; import java.util.List; import net.minecraft.entity.Entity; @@ -41,6 +42,11 @@ public class TileEntityEMContractor extends TileEntity { entityItem.setDead(); + if(worldObj.isRemote) + { + continue; + } + EntityContractorItem newItem = EntityContractorItem.get(entityItem); worldObj.spawnEntityInWorld(newItem);