Merge pull request #62 from KJP12/pr/patchBadStateInPlaceOfEntity

Replaced bad usage of BlockStateTag with BlockEntityTag

Author: samolego

src/main/java/org/samo_lego/golfiv/casts/ItemStackChecker.java

@@ -17,6 +17,11 @@
  * Checks iItemStacks.
  */
 public interface ItemStackChecker {
+    /**
+     * NBT Key {@code BlockEntityTag} for {@link BlockItem BlockItems} containing block entities.
+     */
+    String BLOCK_ENTITY_TAG_KEY = "BlockEntityTag";
+
     /**
      * Cached unluck singleton
      */
@@ -70,7 +75,7 @@ static ItemStack fakeStack(ItemStack original, boolean spoofCount) {
 
         if (item instanceof BannerItem) {
             // Lets dropping banners not be a surprising change, and for illager patrol leaders to have a proper banner.
-            cleanBanner(original.getSubNbt(BlockItem.BLOCK_STATE_TAG_KEY), fakedStack);
+            cleanBanner(original.getSubNbt(BLOCK_ENTITY_TAG_KEY), fakedStack);
         }
 
         if (item instanceof SkullItem) {
@@ -167,7 +172,7 @@ static ItemStack inventoryStack(ItemStack stack) {
             boolean flag = true;
             if (item instanceof BannerItem) {
                 flag = false;
-                cleanBanner(stack.getSubNbt(BlockItem.BLOCK_STATE_TAG_KEY), fake);
+                cleanBanner(stack.getSubNbt(BLOCK_ENTITY_TAG_KEY), fake);
             }
 
             // Transfer SkullProperties.
@@ -181,9 +186,9 @@ static ItemStack inventoryStack(ItemStack stack) {
 
                 // Rewrite shulker items
                 if (block instanceof ShulkerBoxBlock) {
-                    NbtCompound blockEntity = stack.getSubNbt(BlockItem.BLOCK_STATE_TAG_KEY);
+                    NbtCompound blockEntity = stack.getSubNbt(BLOCK_ENTITY_TAG_KEY);
                     if (blockEntity != null) {
-                        NbtCompound fakeEntity = fake.getOrCreateSubNbt(BlockItem.BLOCK_STATE_TAG_KEY);
+                        NbtCompound fakeEntity = fake.getOrCreateSubNbt(BLOCK_ENTITY_TAG_KEY);
                         if (blockEntity.contains("LootTable", NbtElement.STRING_TYPE)) {
                             fakeEntity.put("LootTable", blockEntity.get("LootTable"));
                         }
@@ -348,7 +353,7 @@ static void cleanBanner(NbtCompound blockEntity, ItemStack faked) {
                     }
                 }
             }
-            faked.getOrCreateSubNbt(BlockItem.BLOCK_STATE_TAG_KEY).put("Patterns", fakePatterns);
+            faked.getOrCreateSubNbt(BLOCK_ENTITY_TAG_KEY).put("Patterns", fakePatterns);
         }
     }
 }