Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix slates becoming initialized incorrectly when broken

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-04-13 17:14:50 -04:00
parent 2d64c4ec18
commit bae6839c71
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/at/petrak/hexcasting/common/items/ItemSlate.java
View file

@ -33,7 +33,7 @@ public class ItemSlate extends BlockItem implements DataHolderItem {
var tag = stack.getTag();
if (tag != null && tag.contains("BlockEntityTag", Tag.TAG_COMPOUND)) {
var bet = tag.getCompound("BlockEntityTag");
return bet.contains(BlockEntitySlate.TAG_PATTERN, Tag.TAG_COMPOUND);
return bet.contains(BlockEntitySlate.TAG_PATTERN, Tag.TAG_COMPOUND) && !bet.getCompound(BlockEntitySlate.TAG_PATTERN).isEmpty();
}
return false;
}
@ -50,6 +50,8 @@ public class ItemSlate extends BlockItem implements DataHolderItem {
}
var patTag = beTag.getCompound(BlockEntitySlate.TAG_PATTERN);
if (patTag.isEmpty())
return null;
var out = new CompoundTag();
out.put(SpellDatum.TAG_PATTERN, patTag);
return out;
@ -61,17 +63,12 @@ public class ItemSlate extends BlockItem implements DataHolderItem {
return false;
}
if (!stack.hasTag())
return true;
var beTag = stack.getTagElement("BlockEntityTag");
return beTag == null || !beTag.contains(BlockEntitySlate.TAG_PATTERN, Tag.TAG_COMPOUND);
return readDatumTag(stack) == null;
}
@Override
public void writeDatum(ItemStack stack, SpellDatum<?> datum) {
if (this.canWrite(stack, datum) && datum.getPayload() instanceof HexPattern pat) {
CompoundTag tag = stack.getOrCreateTag();
var beTag = stack.getOrCreateTagElement("BlockEntityTag");
beTag.put(BlockEntitySlate.TAG_PATTERN, pat.serializeToNBT());
}