From 3e225299b1be4c3459dd34e952dbbef7ae5c81e2 Mon Sep 17 00:00:00 2001 From: craftycorvid Date: Sun, 21 Jun 2026 17:55:51 +0200 Subject: [PATCH 1/2] Update to 26.2 Build: - minecraft 26.2, loader 0.19.3, fabric-api 0.152.2+26.2 - loom 1.17-SNAPSHOT, gradle wrapper 9.5.1 - fabric.mod.json depends: minecraft ~26.2, fabricloader >=0.19.3 API changes (verified against decompiled 26.2): - ChatFormatting.X.getColor() removed -> TextColor.X.getValue() - InventoryChangeTrigger moved advancements.criterion -> advancements.triggers Release workflow: bump RELEASE_NAME/CHANGE_LOG to 26.2 (mod version stays 1.6.0, per port convention). Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/workflows/publish.yml | 4 ++-- build.gradle | 2 +- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../craftycorvid/improvedSigns/ImprovedSignsUtils.java | 6 +++--- .../craftycorvid/improvedSigns/datagen/RecipeDatagen.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b13ba1..4633eb4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,9 +3,9 @@ on: [ workflow_dispatch ] env: VERSION: 1.6.0 - RELEASE_NAME: Improved Signs 1.6.0 for Minecraft 26.1.2 + RELEASE_NAME: Improved Signs 1.6.0 for Minecraft 26.2 CHANGE_LOG: | - - Port to 26.1.2 + - Port to 26.2 MODRINTH_TOKEN: ${{ secrets.PUBLISH_MODRINTH_TOKEN }} CURSEFORGE_TOKEN: ${{ secrets.PUBLISH_CURSEFORGE_TOKEN }} GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index 452de7d..85a6a84 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' + id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT' } version = "${project.mod_version}+mc${project.minecraft_version}" diff --git a/gradle.properties b/gradle.properties index dd9f3be..968bf1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true -#Fabric properties -minecraft_version = 26.1.2 -loader_version = 0.19.1 +#Fabric properties +minecraft_version = 26.2 +loader_version = 0.19.3 #Mod properties mod_version = 1.6.0 @@ -12,4 +12,4 @@ maven_group = com.craftycorvid.improvedSigns archives_base_name = improved-signs #Dependencies -fabric_api_version = 0.145.4+26.1.2 +fabric_api_version = 0.152.2+26.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbc3ce4..5dd3c01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/craftycorvid/improvedSigns/ImprovedSignsUtils.java b/src/main/java/com/craftycorvid/improvedSigns/ImprovedSignsUtils.java index 18554cd..b16cd8d 100644 --- a/src/main/java/com/craftycorvid/improvedSigns/ImprovedSignsUtils.java +++ b/src/main/java/com/craftycorvid/improvedSigns/ImprovedSignsUtils.java @@ -6,7 +6,6 @@ import java.util.Optional; import static com.craftycorvid.improvedSigns.ImprovedSignsMod.MOD_CONFIG; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.component.DataComponentMap; @@ -16,6 +15,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; +import net.minecraft.network.chat.TextColor; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; @@ -62,10 +62,10 @@ private static Optional> parseSignCustomData(CompoundTag return SignText.DIRECT_CODEC.parse(NbtOps.INSTANCE, nbtCompound.getCompoundOrEmpty(key)) .result().map(signText -> Arrays.stream(signText.getMessages(false)).map(text -> { int color = signText.getColor().equals(DyeColor.BLACK) - ? ChatFormatting.DARK_PURPLE.getColor() + ? TextColor.DARK_PURPLE.getValue() : signText.getColor().getTextColor(); return text.copy().setStyle(Style.EMPTY.withItalic(signText.hasGlowingText()) - .withColor(color).withShadowColor(ChatFormatting.WHITE.getColor())); + .withColor(color).withShadowColor(TextColor.WHITE.getValue())); }).toList()); } diff --git a/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java b/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java index 7650b60..5ff68b8 100644 --- a/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java +++ b/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletableFuture; import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.advancements.triggers.InventoryChangeTrigger; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8558fef..0c7088b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,8 +29,8 @@ "improvedSigns.mixins.json" ], "depends": { - "fabricloader": ">=0.19.1", + "fabricloader": ">=0.19.3", "fabric-api": "*", - "minecraft": "~26.1.2" + "minecraft": "~26.2" } } \ No newline at end of file From dbca82a2bf46b94ea7887887f29d1f3125d73d06 Mon Sep 17 00:00:00 2001 From: craftycorvid Date: Sun, 21 Jun 2026 18:09:16 +0200 Subject: [PATCH 2/2] Fix loot datagen to copy sign text from the block entity LootTableDatagen used copyData(EntityTarget.TARGET_ENTITY), which serializes source: "target_entity" (reads an entity, wrong for block drops) and would break sign-retain-on-break. 26.2 adds LootContext.BlockEntityTarget but copyData has no block-entity overload and exposes no public block-entity NbtProvider factory, so build one by parsing BLOCK_ENTITY's serialized name through the public inline codec. Regenerated tables now emit source: "block_entity" (the correct, working value) and pick up 26.2 format cleanups. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../9f0ae3aae2fc8273d605f8f028bb77b998bc057b | 49 ------------------- .../fe9732827f0505b62f4241b5603bc7e17f0a1a8d | 25 ---------- .../recipe/acacia_hanging_sign.json | 2 - .../improved-signs/recipe/acacia_sign.json | 2 - .../recipe/bamboo_hanging_sign.json | 2 - .../improved-signs/recipe/bamboo_sign.json | 2 - .../recipe/birch_hanging_sign.json | 2 - .../improved-signs/recipe/birch_sign.json | 2 - .../recipe/cherry_hanging_sign.json | 2 - .../improved-signs/recipe/cherry_sign.json | 2 - .../recipe/crimson_hanging_sign.json | 2 - .../improved-signs/recipe/crimson_sign.json | 2 - .../recipe/dark_oak_hanging_sign.json | 2 - .../improved-signs/recipe/dark_oak_sign.json | 2 - .../recipe/jungle_hanging_sign.json | 2 - .../improved-signs/recipe/jungle_sign.json | 2 - .../recipe/mangrove_hanging_sign.json | 2 - .../improved-signs/recipe/mangrove_sign.json | 2 - .../recipe/oak_hanging_sign.json | 2 - .../data/improved-signs/recipe/oak_sign.json | 2 - .../recipe/pale_oak_hanging_sign.json | 2 - .../improved-signs/recipe/pale_oak_sign.json | 2 - .../recipe/spruce_hanging_sign.json | 2 - .../improved-signs/recipe/spruce_sign.json | 2 - .../recipe/warped_hanging_sign.json | 2 - .../improved-signs/recipe/warped_sign.json | 2 - .../blocks/acacia_hanging_sign.json | 1 - .../loot_table/blocks/acacia_sign.json | 1 - .../blocks/bamboo_hanging_sign.json | 1 - .../loot_table/blocks/bamboo_sign.json | 1 - .../loot_table/blocks/birch_hanging_sign.json | 1 - .../loot_table/blocks/birch_sign.json | 1 - .../blocks/cherry_hanging_sign.json | 1 - .../loot_table/blocks/cherry_sign.json | 1 - .../blocks/crimson_hanging_sign.json | 1 - .../loot_table/blocks/crimson_sign.json | 1 - .../blocks/dark_oak_hanging_sign.json | 1 - .../loot_table/blocks/dark_oak_sign.json | 1 - .../blocks/jungle_hanging_sign.json | 1 - .../loot_table/blocks/jungle_sign.json | 1 - .../blocks/mangrove_hanging_sign.json | 1 - .../loot_table/blocks/mangrove_sign.json | 1 - .../loot_table/blocks/oak_hanging_sign.json | 1 - .../minecraft/loot_table/blocks/oak_sign.json | 1 - .../blocks/pale_oak_hanging_sign.json | 1 - .../loot_table/blocks/pale_oak_sign.json | 1 - .../blocks/spruce_hanging_sign.json | 1 - .../loot_table/blocks/spruce_sign.json | 1 - .../blocks/warped_hanging_sign.json | 1 - .../loot_table/blocks/warped_sign.json | 1 - .../datagen/LootTableDatagen.java | 34 ++++++++----- 51 files changed, 23 insertions(+), 157 deletions(-) delete mode 100644 src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b delete mode 100644 src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d diff --git a/src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b b/src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b deleted file mode 100644 index 88eeed3..0000000 --- a/src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b +++ /dev/null @@ -1,49 +0,0 @@ -// 1.21.4 -999999999-01-01T00:00:00 Improved Signs/ -42453305f6e276ca712b96850ca0286b8390813f data/improved-signs/advancement/recipes/decorations/acacia_hanging_sign.json -f4a127ad95542778d0a5b7e48881e70bb5734713 data/improved-signs/advancement/recipes/decorations/acacia_sign.json -5ff62826f0832d58dc752c82b3026e89d284066d data/improved-signs/advancement/recipes/decorations/bamboo_hanging_sign.json -0f26c4c83797e8d4df087670ec5ad4f1361502f1 data/improved-signs/advancement/recipes/decorations/bamboo_sign.json -beabe906a93a8081bdaf927dcaac19d974cac99d data/improved-signs/advancement/recipes/decorations/birch_hanging_sign.json -11c1ab8447cf885ee9132f43a383d74b65abd25b data/improved-signs/advancement/recipes/decorations/birch_sign.json -618888846075c52ba84d3fa96b96938fec8a3b69 data/improved-signs/advancement/recipes/decorations/cherry_hanging_sign.json -ea305367412eab4b8135bda24c729714027a5420 data/improved-signs/advancement/recipes/decorations/cherry_sign.json -3fdec79f3e2198bd4a67e7aa18f90f1ba6434669 data/improved-signs/advancement/recipes/decorations/crimson_hanging_sign.json -6aa36743d7fe45befd8b90fecf5ae171b39691f1 data/improved-signs/advancement/recipes/decorations/crimson_sign.json -92786e8461ec8d37b1a23c18dea7af7e4c1e9f33 data/improved-signs/advancement/recipes/decorations/dark_oak_hanging_sign.json -93c2f2dba830d6cc03540a883496f69749050997 data/improved-signs/advancement/recipes/decorations/dark_oak_sign.json -8428ebd6a714f7448566a04d7e98f560e2508dc8 data/improved-signs/advancement/recipes/decorations/jungle_hanging_sign.json -b08b4984bf8fc1671ddb7b03ace1fc8ef96a10d1 data/improved-signs/advancement/recipes/decorations/jungle_sign.json -32991d10d7aff9efeebb650750a0835eb4393c0a data/improved-signs/advancement/recipes/decorations/mangrove_hanging_sign.json -50db3bd5a86f319771cbee21d33f98ecf424a636 data/improved-signs/advancement/recipes/decorations/mangrove_sign.json -c3deebbcdea90821bbe1f235b83f811a96637f29 data/improved-signs/advancement/recipes/decorations/oak_hanging_sign.json -0c72c40b52a27bb18860df0faac14678bba7b505 data/improved-signs/advancement/recipes/decorations/oak_sign.json -20cdb122d1ceef250b2e1e27df80106681245962 data/improved-signs/advancement/recipes/decorations/pale_oak_hanging_sign.json -990a5d5bca39166d7e21cb5121bcfcb8293ca162 data/improved-signs/advancement/recipes/decorations/pale_oak_sign.json -a3b63ee4f43c89464e1ad5aaadca42030336e284 data/improved-signs/advancement/recipes/decorations/spruce_hanging_sign.json -759fe5e6228781369cf9433c36a9bd0fa5dfeb52 data/improved-signs/advancement/recipes/decorations/spruce_sign.json -60057a4dfd6df4e1c115873641bc56bec505f03c data/improved-signs/advancement/recipes/decorations/warped_hanging_sign.json -519486ffb35072420d233d79a061a2c33ab937b5 data/improved-signs/advancement/recipes/decorations/warped_sign.json -d9fb3502b20edab5ad53f89d041ed30ca03961da data/improved-signs/recipe/acacia_hanging_sign.json -aba4aa5fb0bcc1519e74ec5c166d992102628d1e data/improved-signs/recipe/acacia_sign.json -fe1159050d3450a551de501778319400355632a2 data/improved-signs/recipe/bamboo_hanging_sign.json -f72d2c94ff3c23faf4bbac040e1da197dcd07ce4 data/improved-signs/recipe/bamboo_sign.json -51f412cffda6af9ebd2f2d433d934b36fede1561 data/improved-signs/recipe/birch_hanging_sign.json -2e663278122b8aa09ac5393268b700a0392803aa data/improved-signs/recipe/birch_sign.json -8afab208284bcff0fd1fb6f07683326013d506d8 data/improved-signs/recipe/cherry_hanging_sign.json -97bcaeb8ec230457d8401fb014483412699ee177 data/improved-signs/recipe/cherry_sign.json -b8c3a154d30c29ba268f8cf6d024ca4a4b5803c2 data/improved-signs/recipe/crimson_hanging_sign.json -bccb015b8af2675e91ee420d31418585cf5b6df2 data/improved-signs/recipe/crimson_sign.json -24637ad86f81df57cb59e76ef2ab4ae51166667c data/improved-signs/recipe/dark_oak_hanging_sign.json -10ee7f8495f0736507a380341d6e68984d6b9ee7 data/improved-signs/recipe/dark_oak_sign.json -b67da200a4badc0392baba20922049e2e283a5f0 data/improved-signs/recipe/jungle_hanging_sign.json -1888619850f0d953d2cc180e1dc7b403cf53f05e data/improved-signs/recipe/jungle_sign.json -944f399232623bff76ff0d4f820b171c3b9fefde data/improved-signs/recipe/mangrove_hanging_sign.json -8473b6e0bb57e226d3ae8d7411ee5bc6f0338332 data/improved-signs/recipe/mangrove_sign.json -faaa1dd8605ab93646829aaafd90de2a76651078 data/improved-signs/recipe/oak_hanging_sign.json -92de58b39a45ba9a52c3040327a20a0e639546a2 data/improved-signs/recipe/oak_sign.json -4e4c95673945907293fb0c927eeef6a8e6f5db6b data/improved-signs/recipe/pale_oak_hanging_sign.json -6ae13c97c24d208b1efaaa4c430a085d23fa4db0 data/improved-signs/recipe/pale_oak_sign.json -332e09f18d408b0c8456dae8f6e9e639bec4c306 data/improved-signs/recipe/spruce_hanging_sign.json -3ed8e043988c65f7700d5a43dcf8d2e23b59fbc7 data/improved-signs/recipe/spruce_sign.json -e1b4825995d464ba47ca3be82bf50399a66bb1a8 data/improved-signs/recipe/warped_hanging_sign.json -4ddea1eb679c195d5388ba1470e0e7d8a0fa3a26 data/improved-signs/recipe/warped_sign.json diff --git a/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d b/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d deleted file mode 100644 index 3093aeb..0000000 --- a/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d +++ /dev/null @@ -1,25 +0,0 @@ -// 1.21.4 -999999999-01-01T00:00:00 Improved Signs/Block Loot Tables -d19e80a1a481f5320fc694b517a2fe1bb96539ab data/minecraft/loot_table/blocks/acacia_hanging_sign.json -c83395db4e6703898cfb5847c9bf9aafd5654f22 data/minecraft/loot_table/blocks/acacia_sign.json -71b22c9c13f76f0a18dc2e55b78d0eb06df9b9ee data/minecraft/loot_table/blocks/bamboo_hanging_sign.json -6aaa48af7a60762b51e61ae33b7d8a6e9514d5f2 data/minecraft/loot_table/blocks/bamboo_sign.json -4638261fff6fa66380d77dbf36db4dfdbc620759 data/minecraft/loot_table/blocks/birch_hanging_sign.json -30b2b6f51c8352d3f9a1cdd67ddc4bc401d34848 data/minecraft/loot_table/blocks/birch_sign.json -1205457c83c081489f2d7d24d0d3d7f4c7297eda data/minecraft/loot_table/blocks/cherry_hanging_sign.json -1a68748fb336f4eb2ce06dd5909c06ad512fb2ba data/minecraft/loot_table/blocks/cherry_sign.json -d2fa93f6a1bf6bf45675343bb2a0fe543fdbb277 data/minecraft/loot_table/blocks/crimson_hanging_sign.json -de88b71ecf5b5f299640dab969d614acb0c90e04 data/minecraft/loot_table/blocks/crimson_sign.json -cacf842e497cc188fc7c807cc1691322baa977b7 data/minecraft/loot_table/blocks/dark_oak_hanging_sign.json -de0afd95e3735a02cdb11deea81eaff7855ee7d1 data/minecraft/loot_table/blocks/dark_oak_sign.json -f1974fc554290d2e73e299dc4e5bee1949e70e52 data/minecraft/loot_table/blocks/jungle_hanging_sign.json -bc3fcd5b85c96f1398049f14c92621b4de9e459e data/minecraft/loot_table/blocks/jungle_sign.json -c95aee6d0c32159deed44af3892b8df84f897a94 data/minecraft/loot_table/blocks/mangrove_hanging_sign.json -b23eb5b05b749a27406267c87f9acbfcc3710742 data/minecraft/loot_table/blocks/mangrove_sign.json -d15b4086b926fe6868cdfbf50a9208d001690aea data/minecraft/loot_table/blocks/oak_hanging_sign.json -3d6ba90b73a1d51a8812e5a9f15b4435a9ed2730 data/minecraft/loot_table/blocks/oak_sign.json -a519f58e45e4a7893584401c2f10abc10f4541c1 data/minecraft/loot_table/blocks/pale_oak_hanging_sign.json -6bc5ee56f217dcaf070b89276a20b65df7a0cc48 data/minecraft/loot_table/blocks/pale_oak_sign.json -567a94b27b7ef46a256733d0830e48e43f8aa49c data/minecraft/loot_table/blocks/spruce_hanging_sign.json -45cfab351f54d3b5af42032a487c715de9050356 data/minecraft/loot_table/blocks/spruce_sign.json -bd0a6a0b4428ac53baccf0d37a6b518b2b781d88 data/minecraft/loot_table/blocks/warped_hanging_sign.json -c819c10a8ae70c6dea98bb29bad7716da3a8974f data/minecraft/loot_table/blocks/warped_sign.json diff --git a/src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json index 445ecc1..4ae0a62 100644 --- a/src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:acacia_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:acacia_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/acacia_sign.json b/src/main/generated/data/improved-signs/recipe/acacia_sign.json index b01f013..46cafcf 100644 --- a/src/main/generated/data/improved-signs/recipe/acacia_sign.json +++ b/src/main/generated/data/improved-signs/recipe/acacia_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:acacia_sign" ], "result": { - "count": 1, "id": "minecraft:acacia_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json index 8b58c2b..e9daccb 100644 --- a/src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:bamboo_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:bamboo_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/bamboo_sign.json b/src/main/generated/data/improved-signs/recipe/bamboo_sign.json index 65c1eec..dfccc68 100644 --- a/src/main/generated/data/improved-signs/recipe/bamboo_sign.json +++ b/src/main/generated/data/improved-signs/recipe/bamboo_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:bamboo_sign" ], "result": { - "count": 1, "id": "minecraft:bamboo_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json index 562f128..1100870 100644 --- a/src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:birch_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:birch_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/birch_sign.json b/src/main/generated/data/improved-signs/recipe/birch_sign.json index 2120311..98156fe 100644 --- a/src/main/generated/data/improved-signs/recipe/birch_sign.json +++ b/src/main/generated/data/improved-signs/recipe/birch_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:birch_sign" ], "result": { - "count": 1, "id": "minecraft:birch_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json index e9afc61..c06ba98 100644 --- a/src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:cherry_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:cherry_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/cherry_sign.json b/src/main/generated/data/improved-signs/recipe/cherry_sign.json index f72eb5e..1371f1f 100644 --- a/src/main/generated/data/improved-signs/recipe/cherry_sign.json +++ b/src/main/generated/data/improved-signs/recipe/cherry_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:cherry_sign" ], "result": { - "count": 1, "id": "minecraft:cherry_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json index f2d6090..b1844c3 100644 --- a/src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:crimson_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:crimson_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/crimson_sign.json b/src/main/generated/data/improved-signs/recipe/crimson_sign.json index 3223894..b0d2810 100644 --- a/src/main/generated/data/improved-signs/recipe/crimson_sign.json +++ b/src/main/generated/data/improved-signs/recipe/crimson_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:crimson_sign" ], "result": { - "count": 1, "id": "minecraft:crimson_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json index 2859a39..3407363 100644 --- a/src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:dark_oak_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:dark_oak_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/dark_oak_sign.json b/src/main/generated/data/improved-signs/recipe/dark_oak_sign.json index 242728f..252523d 100644 --- a/src/main/generated/data/improved-signs/recipe/dark_oak_sign.json +++ b/src/main/generated/data/improved-signs/recipe/dark_oak_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:dark_oak_sign" ], "result": { - "count": 1, "id": "minecraft:dark_oak_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json index 17e97e5..7b63aa5 100644 --- a/src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:jungle_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:jungle_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/jungle_sign.json b/src/main/generated/data/improved-signs/recipe/jungle_sign.json index d53da74..227d1ee 100644 --- a/src/main/generated/data/improved-signs/recipe/jungle_sign.json +++ b/src/main/generated/data/improved-signs/recipe/jungle_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:jungle_sign" ], "result": { - "count": 1, "id": "minecraft:jungle_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json index 47f26fc..accad14 100644 --- a/src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:mangrove_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:mangrove_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/mangrove_sign.json b/src/main/generated/data/improved-signs/recipe/mangrove_sign.json index a23cee6..0e405c3 100644 --- a/src/main/generated/data/improved-signs/recipe/mangrove_sign.json +++ b/src/main/generated/data/improved-signs/recipe/mangrove_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:mangrove_sign" ], "result": { - "count": 1, "id": "minecraft:mangrove_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json index a387842..2e65f4a 100644 --- a/src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:oak_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:oak_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/oak_sign.json b/src/main/generated/data/improved-signs/recipe/oak_sign.json index 487c034..a631cf5 100644 --- a/src/main/generated/data/improved-signs/recipe/oak_sign.json +++ b/src/main/generated/data/improved-signs/recipe/oak_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:oak_sign" ], "result": { - "count": 1, "id": "minecraft:oak_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/pale_oak_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/pale_oak_hanging_sign.json index e1d8219..55dd441 100644 --- a/src/main/generated/data/improved-signs/recipe/pale_oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/pale_oak_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:pale_oak_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:pale_oak_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/pale_oak_sign.json b/src/main/generated/data/improved-signs/recipe/pale_oak_sign.json index 4b03422..da51de9 100644 --- a/src/main/generated/data/improved-signs/recipe/pale_oak_sign.json +++ b/src/main/generated/data/improved-signs/recipe/pale_oak_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:pale_oak_sign" ], "result": { - "count": 1, "id": "minecraft:pale_oak_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json index 19be083..a160375 100644 --- a/src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:spruce_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:spruce_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/spruce_sign.json b/src/main/generated/data/improved-signs/recipe/spruce_sign.json index 1faa9eb..b718c79 100644 --- a/src/main/generated/data/improved-signs/recipe/spruce_sign.json +++ b/src/main/generated/data/improved-signs/recipe/spruce_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:spruce_sign" ], "result": { - "count": 1, "id": "minecraft:spruce_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json index 42c6212..264f5db 100644 --- a/src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:warped_hanging_sign" ], "result": { - "count": 1, "id": "minecraft:warped_hanging_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/warped_sign.json b/src/main/generated/data/improved-signs/recipe/warped_sign.json index 20ac9e2..c303f5d 100644 --- a/src/main/generated/data/improved-signs/recipe/warped_sign.json +++ b/src/main/generated/data/improved-signs/recipe/warped_sign.json @@ -1,11 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", "ingredients": [ "minecraft:warped_sign" ], "result": { - "count": 1, "id": "minecraft:warped_sign" } } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/loot_table/blocks/acacia_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/acacia_hanging_sign.json index dba8fa6..129dff1 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/acacia_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/acacia_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/acacia_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/acacia_sign.json index 82a7d5b..19fb0bf 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/acacia_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/acacia_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/bamboo_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/bamboo_hanging_sign.json index 741f70c..4f966da 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/bamboo_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/bamboo_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/bamboo_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/bamboo_sign.json index dabc3b3..e666be3 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/bamboo_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/bamboo_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/birch_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/birch_hanging_sign.json index 29b1442..caa9009 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/birch_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/birch_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/birch_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/birch_sign.json index 39260bf..a776aaa 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/birch_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/birch_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/cherry_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/cherry_hanging_sign.json index 1e18af9..1b1c2ba 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/cherry_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/cherry_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/cherry_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/cherry_sign.json index d77fa01..9d71903 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/cherry_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/cherry_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/crimson_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/crimson_hanging_sign.json index 7ce4fc2..48eb101 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/crimson_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/crimson_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/crimson_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/crimson_sign.json index 606d7a3..41e594b 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/crimson_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/crimson_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_hanging_sign.json index 0a590e4..58c0170 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_sign.json index 066d1f1..30a6cc0 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/dark_oak_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/jungle_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/jungle_hanging_sign.json index 6359a04..204b365 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/jungle_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/jungle_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/jungle_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/jungle_sign.json index 1e7dda3..1792617 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/jungle_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/jungle_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/mangrove_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/mangrove_hanging_sign.json index 554196b..bbf4493 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/mangrove_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/mangrove_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/mangrove_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/mangrove_sign.json index adbc8e5..87b4f88 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/mangrove_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/mangrove_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/oak_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/oak_hanging_sign.json index ebda1e6..b5bb674 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/oak_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/oak_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/oak_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/oak_sign.json index 57e689e..91c47a3 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/oak_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/oak_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_hanging_sign.json index 3372b7b..27eb5f7 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_sign.json index 8e25ae6..8d4456a 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/pale_oak_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/spruce_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/spruce_hanging_sign.json index ed26abb..321d23f 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/spruce_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/spruce_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/spruce_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/spruce_sign.json index 2bf9c1f..755c708 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/spruce_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/spruce_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/warped_hanging_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/warped_hanging_sign.json index 49e6498..98cea7f 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/warped_hanging_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/warped_hanging_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/generated/data/minecraft/loot_table/blocks/warped_sign.json b/src/main/generated/data/minecraft/loot_table/blocks/warped_sign.json index b93027a..a56faba 100644 --- a/src/main/generated/data/minecraft/loot_table/blocks/warped_sign.json +++ b/src/main/generated/data/minecraft/loot_table/blocks/warped_sign.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" diff --git a/src/main/java/com/craftycorvid/improvedSigns/datagen/LootTableDatagen.java b/src/main/java/com/craftycorvid/improvedSigns/datagen/LootTableDatagen.java index adac689..b9419b1 100644 --- a/src/main/java/com/craftycorvid/improvedSigns/datagen/LootTableDatagen.java +++ b/src/main/java/com/craftycorvid/improvedSigns/datagen/LootTableDatagen.java @@ -2,19 +2,29 @@ import java.util.concurrent.CompletableFuture; import com.craftycorvid.improvedSigns.loot.condition.SignTextLootCondition; +import com.mojang.serialization.JavaOps; import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootSubProvider; import net.minecraft.core.HolderLookup; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.storage.loot.LootContext.EntityTarget; +import net.minecraft.world.level.storage.loot.LootContext.BlockEntityTarget; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.functions.CopyCustomDataFunction; +import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider; +import net.minecraft.world.level.storage.loot.providers.nbt.NbtProvider; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; public class LootTableDatagen extends FabricBlockLootSubProvider { + // CopyCustomDataFunction.copyData only has public overloads for EntityTarget and NbtProvider; + // 26.2 exposes no factory for a block-entity NbtProvider, so parse the BlockEntityTarget's + // serialized name ("block_entity") through the public inline codec to get one. + private static final NbtProvider BLOCK_ENTITY = ContextNbtProvider.INLINE_CODEC + .parse(JavaOps.INSTANCE, BlockEntityTarget.BLOCK_ENTITY.getSerializedName()).result() + .orElseThrow(); + public LootTableDatagen(FabricPackOutput output, CompletableFuture registryLookup) { super(output, registryLookup); @@ -48,16 +58,18 @@ public void generate() { addSignNBTDropTable(Blocks.WARPED_HANGING_SIGN); } + // copyData(NbtProvider) is deprecated in 26.2, but it is the only public overload that can copy + // from a block entity (copyData(EntityTarget) cannot), so the deprecation is accepted here. + @SuppressWarnings("deprecation") public void addSignNBTDropTable(Block sign) { - this.add(sign, LootTable.lootTable().withPool(this.applyExplosionCondition(sign, - LootPool.lootPool().setRolls(ConstantValue.exactly(1.0F)).add( - // TODO: EntityTarget needs to be "block_entity" not "THIS", need to figure - // out a way to make that happen. - LootItem.lootTableItem(sign) - .apply(CopyCustomDataFunction.copyData(EntityTarget.TARGET_ENTITY) - .copy("front_text", "BlockEntityTag.front_text") - .copy("back_text", "BlockEntityTag.back_text") - .copy("is_waxed", "BlockEntityTag.is_waxed") - .when(SignTextLootCondition.builder())))))); + this.add(sign, + LootTable.lootTable().withPool(this.applyExplosionCondition(sign, + LootPool.lootPool().setRolls(ConstantValue.exactly(1.0F)).add( + LootItem.lootTableItem(sign) + .apply(CopyCustomDataFunction.copyData(BLOCK_ENTITY) + .copy("front_text", "BlockEntityTag.front_text") + .copy("back_text", "BlockEntityTag.back_text") + .copy("is_waxed", "BlockEntityTag.is_waxed") + .when(SignTextLootCondition.builder())))))); } }