lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Updated the Throwing Daggers so that they can now render a custom ItemStack

Browse source
This commit is contained in:
WayofTime 2021-01-25 12:38:27 -05:00
parent 83c584983e
commit abe7333e64
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDagger.java
View file

@ -65,7 +65,7 @@ public class EntityThrowingDagger extends ProjectileItemEntity
private IntOpenHashSet piercedEntities; private IntOpenHashSet piercedEntities;
private List<Entity> hitEntities; private List<Entity> hitEntities;
private ItemStack containedStack = ItemStack.EMPTY; // private ItemStack containedStack = ItemStack.EMPTY;
private double willDrop = 0; private double willDrop = 0;
private EnumDemonWillType willType = EnumDemonWillType.DEFAULT; private EnumDemonWillType willType = EnumDemonWillType.DEFAULT;
@ -77,7 +77,7 @@ public class EntityThrowingDagger extends ProjectileItemEntity
public EntityThrowingDagger(ItemStack stack, World worldIn, LivingEntity throwerIn) public EntityThrowingDagger(ItemStack stack, World worldIn, LivingEntity throwerIn)
{ {
super(BloodMagicEntityTypes.THROWING_DAGGER.getEntityType(), throwerIn, worldIn); super(BloodMagicEntityTypes.THROWING_DAGGER.getEntityType(), throwerIn, worldIn);
this.containedStack = stack; this.setItem(stack);
if (throwerIn instanceof PlayerEntity) if (throwerIn instanceof PlayerEntity)
{ {
this.pickupStatus = AbstractArrowEntity.PickupStatus.ALLOWED; this.pickupStatus = AbstractArrowEntity.PickupStatus.ALLOWED;
@ -87,7 +87,14 @@ public class EntityThrowingDagger extends ProjectileItemEntity
public EntityThrowingDagger(ItemStack stack, World worldIn, double x, double y, double z) public EntityThrowingDagger(ItemStack stack, World worldIn, double x, double y, double z)
{ {
super(BloodMagicEntityTypes.THROWING_DAGGER.getEntityType(), x, y, z, worldIn); super(BloodMagicEntityTypes.THROWING_DAGGER.getEntityType(), x, y, z, worldIn);
this.containedStack = stack; this.setItem(stack);
}
@Override
public void setItem(ItemStack stack)
{
super.setItem(stack);
// this.containedStack = stack;
} }
protected Item getDefaultItem() protected Item getDefaultItem()
@ -301,7 +308,7 @@ public class EntityThrowingDagger extends ProjectileItemEntity
compound.putString("SoundEvent", Registry.SOUND_EVENT.getKey(this.hitSound).toString()); compound.putString("SoundEvent", Registry.SOUND_EVENT.getKey(this.hitSound).toString());
// compound.putBoolean("ShotFromCrossbow", this.getShotFromCrossbow()); // compound.putBoolean("ShotFromCrossbow", this.getShotFromCrossbow());
compound.putDouble("willDrop", willDrop); compound.putDouble("willDrop", willDrop);
this.containedStack.write(compound); // this.containedStack.write(compound);
compound.putString("willType", this.willType.name); compound.putString("willType", this.willType.name);
} }
@ -333,7 +340,7 @@ public class EntityThrowingDagger extends ProjectileItemEntity
: AbstractArrowEntity.PickupStatus.DISALLOWED; : AbstractArrowEntity.PickupStatus.DISALLOWED;
} }
this.willDrop = compound.getDouble("willDrop"); this.willDrop = compound.getDouble("willDrop");
this.containedStack = ItemStack.read(compound); // this.containedStack = ItemStack.read(compound);
this.willType = EnumDemonWillType.getType(compound.getString("willType")); this.willType = EnumDemonWillType.getType(compound.getString("willType"));
// this.setIsCritical(compound.getBoolean("crit")); // this.setIsCritical(compound.getBoolean("crit"));
@ -508,7 +515,8 @@ public class EntityThrowingDagger extends ProjectileItemEntity
protected ItemStack getArrowStack() protected ItemStack getArrowStack()
{ {
return containedStack; // Gets the item from the data manager
return getItem();
} }
// OnHitBlock // OnHitBlock