mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 12:42:36 +00:00
#1378 Soul Vial filled in a Powered Spawner now produce identical item stacks to enable their use in auto crafting systems
This commit is contained in:
1 parent
5cc63eacf6
commit
4e5a985f24
3 files changed
+32
-10
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user