diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4a166b42..bd85938d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -16,6 +16,7 @@ New - Capacitor Banks can now be used to add the Flux upgrade to TiC tools Changes +- #1378 Soul Vial filled in a Powered Spawner now produce identical item stacks to enable their use in auto crafting systems - Updated implementation of RF API to correctly handle IEnergyReceivers that are not IEnergyHandlers - SAG Mill no longer produces dusts for metals that are not available - Corrected Experience Obelisk tooltip diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index c0018750..14878f7c 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -93,13 +93,25 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(world.isRemote) { return true; - } - if(!containsSoul(itemstack)) { - return true; } - + if(!containsSoul(itemstack)) { + return false; + } + if(player == null) { + return false; + } + if(itemstack.stackSize > 1) { + return false; + } + + Entity mob; NBTTagCompound root = itemstack.stackTagCompound; - Entity mob = EntityList.createEntityFromNBT(root, world); + if(root.hasKey("isStub")) { + String entityId = root.getString("id"); + mob = EntityList.createEntityByName(entityId, world); + } else { + mob = EntityList.createEntityFromNBT(root, world); + } if (mob == null) { return true; } @@ -123,7 +135,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { world.spawnEntityInWorld(mob); if(mob instanceof EntityLiving) { ((EntityLiving)mob).playLivingSound(); - } + } Entity riddenByEntity = mob.riddenByEntity; while(riddenByEntity != null) { @@ -161,7 +173,6 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { } String entityId = EntityList.getEntityString(entity); - // System.out.println("ItemSoulVessel.itemInteractionForEntity: " + entityId); if(isBlackListed(entityId)) { return false; } @@ -188,6 +199,16 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { return false; } + public ItemStack createVesselWithEntityStub(String entityId) { + NBTTagCompound root = new NBTTagCompound(); + root.setString("id", entityId); + root.setBoolean("isStub", true); + + ItemStack res = new ItemStack(this); + res.stackTagCompound = root; + return res; + } + public ItemStack createVesselWithEntity(Entity ent) { String entityId = EntityList.getEntityString(ent); diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 4f51421b..5cd98702 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -73,11 +73,11 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { if(getStackInSlot(0) == null || getStackInSlot(1) != null) { return; } - Entity ent = logic.createEntity(false); - if(ent == null) { + String name = logic.getEntityNameToSpawn(); + if(name == NULL_ENTITY_NAME) { return; } - ItemStack res = EnderIO.itemSoulVessel.createVesselWithEntity(ent); + ItemStack res = EnderIO.itemSoulVessel.createVesselWithEntityStub(logic.getEntityNameToSpawn()); decrStackSize(0, 1); setInventorySlotContents(1, res); }