Updated to 1.21

.github/workflows/build.yml

@@ -0,0 +1,37 @@
+# Automatically build the project and run any configured tests for every push
+# and submitted pull request. This can help catch issues that only occur on
+# certain platforms or Java versions, and provides a first line of defence
+# against bad commits.
+
+name: build
+on: [pull_request, push]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [
+          21,    # Current Java LTS
+        ]
+    runs-on: ubuntu-22.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v2
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'microsoft'
+      - name: make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: build/libs/

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "java.gradle.buildServer.enabled": "off",
-    "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml"
+    "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml",
+    "java.configuration.updateBuildConfiguration": "automatic"
 }

gradle.properties

@@ -1,21 +1,21 @@
 org.gradle.jvmargs   = -Xmx1G
 
 #Fabric properties 
-minecraft_version    = 1.20.6
-yarn_mappings        = 1.20.6+build.1
+minecraft_version    = 1.21
+yarn_mappings        = 1.21+build.1
 loader_version       = 0.15.11
 
 #Mod properties 
-mod_version          = 1.4.1
+mod_version          = 1.4.2
 maven_group          = com.craftycorvid.improvedSigns
 archives_base_name   = improvedsigns
 
 #Dependencies
-fabric_api_version   = 0.98.0+1.20.6
-midnightlib_version  = 1.5.5-fabric
-modmenu_version      = 10.0.0-beta.1
+fabric_api_version   = 0.100.1+1.21
+midnightlib_version  = 1.5.7-fabric
+modmenu_version      = 11.0.0-beta.1
 
 #Distribution
 curseforge_id        = 384963
 modrinth_id          = tEcCNQe7
-changelog            = Updated to 1.20.6
+changelog            = Updated to 1.21

src/main/generated/.cache/44fa4be9ab3d3c5f733c75f93ae888efcd0a8339

@@ -1,45 +1,45 @@
-// 1.20.5	2024-04-23T23:52:04.1135912	Improved Signs/Recipes
-046c9ce5df20e59ae6e570fa0b9ec955a51e915b data\improved-signs\recipes\reset_oak_sign.json
-2850e259c73f968540e2d2b026a9a9176133d4a2 data\improved-signs\advancements\recipes\decorations\reset_jungle_hanging_sign.json
-1fa7ee54322e22967437b75dccda0ad417dc6221 data\improved-signs\advancements\recipes\decorations\reset_spruce_sign.json
-d24ce996a0ded100ada82a568f562adc9133bae8 data\improved-signs\recipes\reset_cherry_hanging_sign.json
-221c0273897ca0f0c6da02785ddc73c2eed57ebd data\improved-signs\recipes\reset_jungle_sign.json
-266a43ec57b0a163d59113476cf7bcd0dc1287d6 data\improved-signs\advancements\recipes\decorations\reset_warped_sign.json
-1dbf29b68b82c160d4ea941c8e891faa6bee7b25 data\improved-signs\recipes\reset_spruce_hanging_sign.json
-f0ffa29f5f40249584bba97e7b01b69fbed97471 data\improved-signs\advancements\recipes\decorations\reset_birch_hanging_sign.json
-1e5f0b8f15f67973f809f016043a9cbde33d194b data\improved-signs\advancements\recipes\decorations\reset_mangrove_sign.json
-dfb1921dd8b58aedcddfe3bf6d50d596eb4a29ef data\improved-signs\recipes\reset_spruce_sign.json
-df90959a7681f83300f9c3fd33539bfd8488ebf2 data\improved-signs\advancements\recipes\decorations\reset_jungle_sign.json
-905d4493e6b3e51630067da21b1e3d880f88631f data\improved-signs\recipes\reset_birch_sign.json
-f6fbd50e1dec7a5360e0a4db7ce65ab11eb5728a data\improved-signs\recipes\reset_dark_oak_sign.json
-172bf1e4f273a370b06379bb876aa5122fb1b636 data\improved-signs\advancements\recipes\decorations\reset_oak_hanging_sign.json
-71a9c85aead4afac0b95d06ef1799030bdfa4182 data\improved-signs\advancements\recipes\decorations\reset_mangrove_hanging_sign.json
-25a1675c89b9b1b7b34e7d085d179d0c404fbb68 data\improved-signs\recipes\reset_oak_hanging_sign.json
-aac08f4646295ff6503f07b9b29420a36ee1a59c data\improved-signs\recipes\reset_warped_sign.json
-87599caf55ae850df9592566462b40a70faad550 data\improved-signs\recipes\reset_birch_hanging_sign.json
-bcf8b51dac53490f80ef8288f61d485fab4fb954 data\improved-signs\advancements\recipes\decorations\reset_birch_sign.json
-7e45cf9773f7bf72a8b145d3173b4c3ab4de6454 data\improved-signs\recipes\reset_dark_oak_hanging_sign.json
-78b241542656c1275a2da91f6dc6f6b3dedfd5b2 data\improved-signs\advancements\recipes\decorations\reset_spruce_hanging_sign.json
-c2eff74c2fe1bca89169d0b97555f4ee9c2bc261 data\improved-signs\advancements\recipes\decorations\reset_dark_oak_hanging_sign.json
-8bc592306547398b73b91d22d82d5c172c792621 data\improved-signs\recipes\reset_warped_hanging_sign.json
-2e1952ac0eabc0e141e4d455d169babf65924ee1 data\improved-signs\recipes\reset_bamboo_hanging_sign.json
-c165ec2ab1ea80ee1fd7dd8fe25683eb8196c4a2 data\improved-signs\recipes\reset_crimson_sign.json
-6b7cda64229ef0542eb78739bf9fe188e24b0862 data\improved-signs\advancements\recipes\decorations\reset_acacia_hanging_sign.json
-5771b4c323522da739111da50b567ad64d8aac2c data\improved-signs\recipes\reset_acacia_sign.json
-b49da6578ec51e7e7290704221aa0fb62ab4c0bf data\improved-signs\advancements\recipes\decorations\reset_bamboo_hanging_sign.json
-3aa766424385a874e7131391909989165fc19b3b data\improved-signs\recipes\reset_cherry_sign.json
-93eef38406195bada248755129b8592053f7d98d data\improved-signs\advancements\recipes\decorations\reset_oak_sign.json
-3bc146207af289b4b74b99451ea934e3b534bb53 data\improved-signs\advancements\recipes\decorations\reset_crimson_sign.json
-747b041c2ffd3fce9721a4e47adebdf8f8548e8d data\improved-signs\recipes\reset_crimson_hanging_sign.json
-41867280ef16c0c4c0def94d2e9a4486b64a7e63 data\improved-signs\recipes\reset_acacia_hanging_sign.json
-09b38d16027d711a99285f024fe7f168711d7007 data\improved-signs\recipes\reset_jungle_hanging_sign.json
-20cd67ddfaf3323570e28b86b8faca7139bf87c1 data\improved-signs\advancements\recipes\decorations\reset_cherry_hanging_sign.json
-85134fdee1b8e80ea28b838c8466b84e3d6b2941 data\improved-signs\recipes\reset_bamboo_sign.json
-9c3c70896f30d943a8f44675473fbd9d9ae3c2b7 data\improved-signs\advancements\recipes\decorations\reset_bamboo_sign.json
-727fbc3e2929dc280d4d9d7c9e6ae7a560d9312f data\improved-signs\advancements\recipes\decorations\reset_crimson_hanging_sign.json
-36edf1e876ec282d8b30478887655d12d23fc972 data\improved-signs\advancements\recipes\decorations\reset_dark_oak_sign.json
-64c13e60bc37c5806709271459935cf126e91f2f data\improved-signs\advancements\recipes\decorations\reset_acacia_sign.json
-84b201d6bc6df345a716eaea96b2470b173e4cf2 data\improved-signs\advancements\recipes\decorations\reset_cherry_sign.json
-d60d9fb2814bb998b63e39e9b13f97962a275e3b data\improved-signs\recipes\reset_mangrove_sign.json
-a921c95314db89adc0ccbf383eed631c4975288b data\improved-signs\recipes\reset_mangrove_hanging_sign.json
-22b516f3e96118db50503ff00832a4b344773514 data\improved-signs\advancements\recipes\decorations\reset_warped_hanging_sign.json
+// 1.21	2024-06-13T18:46:37.1224251	Improved Signs/Recipes
+22b516f3e96118db50503ff00832a4b344773514 data\improved-signs\advancement\recipes\decorations\reset_warped_hanging_sign.json
+046c9ce5df20e59ae6e570fa0b9ec955a51e915b data\improved-signs\recipe\reset_oak_sign.json
+41867280ef16c0c4c0def94d2e9a4486b64a7e63 data\improved-signs\recipe\reset_acacia_hanging_sign.json
+b49da6578ec51e7e7290704221aa0fb62ab4c0bf data\improved-signs\advancement\recipes\decorations\reset_bamboo_hanging_sign.json
+727fbc3e2929dc280d4d9d7c9e6ae7a560d9312f data\improved-signs\advancement\recipes\decorations\reset_crimson_hanging_sign.json
+36edf1e876ec282d8b30478887655d12d23fc972 data\improved-signs\advancement\recipes\decorations\reset_dark_oak_sign.json
+1dbf29b68b82c160d4ea941c8e891faa6bee7b25 data\improved-signs\recipe\reset_spruce_hanging_sign.json
+d60d9fb2814bb998b63e39e9b13f97962a275e3b data\improved-signs\recipe\reset_mangrove_sign.json
+1e5f0b8f15f67973f809f016043a9cbde33d194b data\improved-signs\advancement\recipes\decorations\reset_mangrove_sign.json
+a921c95314db89adc0ccbf383eed631c4975288b data\improved-signs\recipe\reset_mangrove_hanging_sign.json
+71a9c85aead4afac0b95d06ef1799030bdfa4182 data\improved-signs\advancement\recipes\decorations\reset_mangrove_hanging_sign.json
+93eef38406195bada248755129b8592053f7d98d data\improved-signs\advancement\recipes\decorations\reset_oak_sign.json
+25a1675c89b9b1b7b34e7d085d179d0c404fbb68 data\improved-signs\recipe\reset_oak_hanging_sign.json
+d24ce996a0ded100ada82a568f562adc9133bae8 data\improved-signs\recipe\reset_cherry_hanging_sign.json
+5771b4c323522da739111da50b567ad64d8aac2c data\improved-signs\recipe\reset_acacia_sign.json
+6b7cda64229ef0542eb78739bf9fe188e24b0862 data\improved-signs\advancement\recipes\decorations\reset_acacia_hanging_sign.json
+c165ec2ab1ea80ee1fd7dd8fe25683eb8196c4a2 data\improved-signs\recipe\reset_crimson_sign.json
+747b041c2ffd3fce9721a4e47adebdf8f8548e8d data\improved-signs\recipe\reset_crimson_hanging_sign.json
+3aa766424385a874e7131391909989165fc19b3b data\improved-signs\recipe\reset_cherry_sign.json
+f0ffa29f5f40249584bba97e7b01b69fbed97471 data\improved-signs\advancement\recipes\decorations\reset_birch_hanging_sign.json
+df90959a7681f83300f9c3fd33539bfd8488ebf2 data\improved-signs\advancement\recipes\decorations\reset_jungle_sign.json
+85134fdee1b8e80ea28b838c8466b84e3d6b2941 data\improved-signs\recipe\reset_bamboo_sign.json
+2e1952ac0eabc0e141e4d455d169babf65924ee1 data\improved-signs\recipe\reset_bamboo_hanging_sign.json
+f6fbd50e1dec7a5360e0a4db7ce65ab11eb5728a data\improved-signs\recipe\reset_dark_oak_sign.json
+3bc146207af289b4b74b99451ea934e3b534bb53 data\improved-signs\advancement\recipes\decorations\reset_crimson_sign.json
+266a43ec57b0a163d59113476cf7bcd0dc1287d6 data\improved-signs\advancement\recipes\decorations\reset_warped_sign.json
+1fa7ee54322e22967437b75dccda0ad417dc6221 data\improved-signs\advancement\recipes\decorations\reset_spruce_sign.json
+78b241542656c1275a2da91f6dc6f6b3dedfd5b2 data\improved-signs\advancement\recipes\decorations\reset_spruce_hanging_sign.json
+87599caf55ae850df9592566462b40a70faad550 data\improved-signs\recipe\reset_birch_hanging_sign.json
+905d4493e6b3e51630067da21b1e3d880f88631f data\improved-signs\recipe\reset_birch_sign.json
+c2eff74c2fe1bca89169d0b97555f4ee9c2bc261 data\improved-signs\advancement\recipes\decorations\reset_dark_oak_hanging_sign.json
+20cd67ddfaf3323570e28b86b8faca7139bf87c1 data\improved-signs\advancement\recipes\decorations\reset_cherry_hanging_sign.json
+7e45cf9773f7bf72a8b145d3173b4c3ab4de6454 data\improved-signs\recipe\reset_dark_oak_hanging_sign.json
+172bf1e4f273a370b06379bb876aa5122fb1b636 data\improved-signs\advancement\recipes\decorations\reset_oak_hanging_sign.json
+09b38d16027d711a99285f024fe7f168711d7007 data\improved-signs\recipe\reset_jungle_hanging_sign.json
+8bc592306547398b73b91d22d82d5c172c792621 data\improved-signs\recipe\reset_warped_hanging_sign.json
+64c13e60bc37c5806709271459935cf126e91f2f data\improved-signs\advancement\recipes\decorations\reset_acacia_sign.json
+221c0273897ca0f0c6da02785ddc73c2eed57ebd data\improved-signs\recipe\reset_jungle_sign.json
+bcf8b51dac53490f80ef8288f61d485fab4fb954 data\improved-signs\advancement\recipes\decorations\reset_birch_sign.json
+84b201d6bc6df345a716eaea96b2470b173e4cf2 data\improved-signs\advancement\recipes\decorations\reset_cherry_sign.json
+9c3c70896f30d943a8f44675473fbd9d9ae3c2b7 data\improved-signs\advancement\recipes\decorations\reset_bamboo_sign.json
+aac08f4646295ff6503f07b9b29420a36ee1a59c data\improved-signs\recipe\reset_warped_sign.json
+2850e259c73f968540e2d2b026a9a9176133d4a2 data\improved-signs\advancement\recipes\decorations\reset_jungle_hanging_sign.json
+dfb1921dd8b58aedcddfe3bf6d50d596eb4a29ef data\improved-signs\recipe\reset_spruce_sign.json

src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d

@@ -1,23 +1,23 @@
-// 1.20.5	2024-04-23T23:52:04.1125854	Improved Signs/Block Loot Tables
-276bd259774eea8cae592b98bf9da77842e10f71 data\minecraft\loot_tables\blocks\cherry_sign.json
-7e8c46d8d8e9a1cf304bb8519874f1ee0f15f025 data\minecraft\loot_tables\blocks\crimson_hanging_sign.json
-151eba57877fcb9a5006a5446f806657c789479b data\minecraft\loot_tables\blocks\oak_hanging_sign.json
-d061b4fcdd2876e7a63f10d1e8a7a8f673242965 data\minecraft\loot_tables\blocks\jungle_sign.json
-89e238ca51896cc393cf135862b2464badd54e0a data\minecraft\loot_tables\blocks\acacia_sign.json
-d57dfddf61bed714fa2e83cb14d6cef43344dd1b data\minecraft\loot_tables\blocks\jungle_hanging_sign.json
-107950deaebf5ce0b179e519a49bf9bdcc4100a9 data\minecraft\loot_tables\blocks\birch_sign.json
-ac2ca0f1355651731909680e0cc10999caca66fb data\minecraft\loot_tables\blocks\spruce_sign.json
-0609c4ba0d0c0b0b35834327a40745c14dc452bc data\minecraft\loot_tables\blocks\bamboo_hanging_sign.json
-696c597769a29c45642029d0b4cc0aa1927120ae data\minecraft\loot_tables\blocks\acacia_hanging_sign.json
-e02288026d295d56ca898cd9cdeff8c516575ead data\minecraft\loot_tables\blocks\spruce_hanging_sign.json
-ae92f6bc89e80f856e1ff50db7f5f4b589763bde data\minecraft\loot_tables\blocks\oak_sign.json
-4b2d9dbf0c9d4b67f00126a0aacdea839cd8765a data\minecraft\loot_tables\blocks\warped_hanging_sign.json
-e609aaab83529e4d39128e90902c8c68c9f786c8 data\minecraft\loot_tables\blocks\crimson_sign.json
-15a7cf76e3d4a48cfa47954fbe424c97ac589d5d data\minecraft\loot_tables\blocks\bamboo_sign.json
-d728f6180f4fe2b2e81bc3ee1a91cc78a115b09d data\minecraft\loot_tables\blocks\cherry_hanging_sign.json
-0655f879f54da8ba93a6b5175573c3728dd37014 data\minecraft\loot_tables\blocks\warped_sign.json
-fe8a7169bdc39aa457a96e47bdcb4560975256d1 data\minecraft\loot_tables\blocks\mangrove_hanging_sign.json
-bf57455fc80306ceca5b048972447a8b5fc19f85 data\minecraft\loot_tables\blocks\birch_hanging_sign.json
-1c6d9871f7df6a39d4c1f210fa30a1447bb0659d data\minecraft\loot_tables\blocks\mangrove_sign.json
-4393ecb58b58b9f2331c97b6d9aca3cf2219ec38 data\minecraft\loot_tables\blocks\dark_oak_sign.json
-961515292674552de44b6527249816eed31b96b6 data\minecraft\loot_tables\blocks\dark_oak_hanging_sign.json
+// 1.21	2024-06-13T18:46:37.1214235	Improved Signs/Block Loot Tables
+71b22c9c13f76f0a18dc2e55b78d0eb06df9b9ee data\minecraft\loot_table\blocks\bamboo_hanging_sign.json
+45cfab351f54d3b5af42032a487c715de9050356 data\minecraft\loot_table\blocks\spruce_sign.json
+de88b71ecf5b5f299640dab969d614acb0c90e04 data\minecraft\loot_table\blocks\crimson_sign.json
+d15b4086b926fe6868cdfbf50a9208d001690aea data\minecraft\loot_table\blocks\oak_hanging_sign.json
+bd0a6a0b4428ac53baccf0d37a6b518b2b781d88 data\minecraft\loot_table\blocks\warped_hanging_sign.json
+4638261fff6fa66380d77dbf36db4dfdbc620759 data\minecraft\loot_table\blocks\birch_hanging_sign.json
+f1974fc554290d2e73e299dc4e5bee1949e70e52 data\minecraft\loot_table\blocks\jungle_hanging_sign.json
+c95aee6d0c32159deed44af3892b8df84f897a94 data\minecraft\loot_table\blocks\mangrove_hanging_sign.json
+de0afd95e3735a02cdb11deea81eaff7855ee7d1 data\minecraft\loot_table\blocks\dark_oak_sign.json
+cacf842e497cc188fc7c807cc1691322baa977b7 data\minecraft\loot_table\blocks\dark_oak_hanging_sign.json
+d19e80a1a481f5320fc694b517a2fe1bb96539ab data\minecraft\loot_table\blocks\acacia_hanging_sign.json
+567a94b27b7ef46a256733d0830e48e43f8aa49c data\minecraft\loot_table\blocks\spruce_hanging_sign.json
+bc3fcd5b85c96f1398049f14c92621b4de9e459e data\minecraft\loot_table\blocks\jungle_sign.json
+6aaa48af7a60762b51e61ae33b7d8a6e9514d5f2 data\minecraft\loot_table\blocks\bamboo_sign.json
+b23eb5b05b749a27406267c87f9acbfcc3710742 data\minecraft\loot_table\blocks\mangrove_sign.json
+c819c10a8ae70c6dea98bb29bad7716da3a8974f data\minecraft\loot_table\blocks\warped_sign.json
+1205457c83c081489f2d7d24d0d3d7f4c7297eda data\minecraft\loot_table\blocks\cherry_hanging_sign.json
+d2fa93f6a1bf6bf45675343bb2a0fe543fdbb277 data\minecraft\loot_table\blocks\crimson_hanging_sign.json
+1a68748fb336f4eb2ce06dd5909c06ad512fb2ba data\minecraft\loot_table\blocks\cherry_sign.json
+3d6ba90b73a1d51a8812e5a9f15b4435a9ed2730 data\minecraft\loot_table\blocks\oak_sign.json
+c83395db4e6703898cfb5847c9bf9aafd5654f22 data\minecraft\loot_table\blocks\acacia_sign.json
+30b2b6f51c8352d3f9a1cdd67ddc4bc401d34848 data\minecraft\loot_table\blocks\birch_sign.json

src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java

@@ -50,7 +50,7 @@ public void generate(RecipeExporter exporter) {
     public void generateClearSignRecipe(RecipeExporter exporter, Item sign) {
         ShapelessRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, sign).input(sign)
                 .criterion("has_sign", InventoryChangedCriterion.Conditions.items(sign))
-                .offerTo(exporter, new Identifier(ImprovedSignsMod.MOD_ID,
+                .offerTo(exporter, Identifier.of(ImprovedSignsMod.MOD_ID,
                         "reset_" + Registries.ITEM.getId(sign).getPath()));
     }
 }

src/main/java/com/craftycorvid/improvedSigns/loot/condition/LootConditionTypes.java

@@ -12,6 +12,6 @@ public class LootConditionTypes {
             new LootConditionType(MapCodec.unit(SignTextLootCondition.builder().build()));
 
     public static void register() {
-        Registry.register(Registries.LOOT_CONDITION_TYPE, new Identifier("sign_text"), SIGN_TEXT);
+        Registry.register(Registries.LOOT_CONDITION_TYPE, Identifier.of("sign_text"), SIGN_TEXT);
     }
 }

src/main/java/com/craftycorvid/improvedSigns/mixin/SignItemMixin.java

@@ -16,7 +16,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.SignText;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.NbtComponent;
 import net.minecraft.entity.player.PlayerEntity;
@@ -32,8 +32,8 @@
 
 @Mixin(SignItem.class)
 public class SignItemMixin extends VerticallyAttachableBlockItem {
-    public SignItemMixin(Block standingBlock, Block wallBlock, Settings settings,
-            Direction verticalAttachmentDirection) {
+    public SignItemMixin(Block standingBlock, Block wallBlock,
+            net.minecraft.item.Item.Settings settings, Direction verticalAttachmentDirection) {
         super(standingBlock, wallBlock, settings, verticalAttachmentDirection);
     }
 

src/main/resources/fabric.mod.json

@@ -31,6 +31,8 @@
   "depends": {
     "fabricloader": ">=0.15.10",
     "fabric": "*",
-    "minecraft": ["1.20.5", "1.20.6"]
+    "minecraft": [
+      "1.21"
+    ]
   }
-}
+}