diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 99f9c9e..bb43212 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,8 +2,8 @@ name: Publish on GitHub, CurseForge & Modrinth on: [ workflow_dispatch ] env: - VERSION: 1.4.2 - RELEASE_NAME: Improved Signs 1.4.2 for Minecraft 1.21 + VERSION: 1.4.3 + RELEASE_NAME: Improved Signs 1.4.3 for Minecraft 1.21.3 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 0534f6a..510e06a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' } version = "${project.mod_version}+mc${project.minecraft_version}" diff --git a/gradle.properties b/gradle.properties index ac316de..9401bce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,16 @@ org.gradle.jvmargs = -Xmx1G #Fabric properties -minecraft_version = 1.21.1 -yarn_mappings = 1.21.1+build.3 +minecraft_version = 1.21.3 +yarn_mappings = 1.21.3+build.2 loader_version = 0.16.9 #Mod properties -mod_version = 1.4.2 +mod_version = 1.4.3 maven_group = com.craftycorvid.improvedSigns archives_base_name = improvedsigns #Dependencies -fabric_api_version = 0.110.0+1.21.1 -midnightlib_version = 1.6.3-fabric -modmenu_version = 11.0.3 +fabric_api_version = 0.110.0+1.21.3 +midnightlib_version = 1.6.4-fabric +modmenu_version = 12.0.0-beta.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..e2847c8 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-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/main/generated/.cache/44fa4be9ab3d3c5f733c75f93ae888efcd0a8339 b/src/main/generated/.cache/44fa4be9ab3d3c5f733c75f93ae888efcd0a8339 deleted file mode 100644 index 500c0eb..0000000 --- a/src/main/generated/.cache/44fa4be9ab3d3c5f733c75f93ae888efcd0a8339 +++ /dev/null @@ -1,45 +0,0 @@ -// 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 diff --git a/src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b b/src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b new file mode 100644 index 0000000..e83274b --- /dev/null +++ b/src/main/generated/.cache/9f0ae3aae2fc8273d605f8f028bb77b998bc057b @@ -0,0 +1,45 @@ +// 1.21.3 2024-11-27T19:26:37.4697809 Improved Signs/ +24637ad86f81df57cb59e76ef2ab4ae51166667c data\improved-signs\recipe\dark_oak_hanging_sign.json +f72d2c94ff3c23faf4bbac040e1da197dcd07ce4 data\improved-signs\recipe\bamboo_sign.json +bccb015b8af2675e91ee420d31418585cf5b6df2 data\improved-signs\recipe\crimson_sign.json +50db3bd5a86f319771cbee21d33f98ecf424a636 data\improved-signs\advancement\recipes\decorations\mangrove_sign.json +332e09f18d408b0c8456dae8f6e9e639bec4c306 data\improved-signs\recipe\spruce_hanging_sign.json +d9fb3502b20edab5ad53f89d041ed30ca03961da data\improved-signs\recipe\acacia_hanging_sign.json +4ddea1eb679c195d5388ba1470e0e7d8a0fa3a26 data\improved-signs\recipe\warped_sign.json +b8c3a154d30c29ba268f8cf6d024ca4a4b5803c2 data\improved-signs\recipe\crimson_hanging_sign.json +a3b63ee4f43c89464e1ad5aaadca42030336e284 data\improved-signs\advancement\recipes\decorations\spruce_hanging_sign.json +32991d10d7aff9efeebb650750a0835eb4393c0a data\improved-signs\advancement\recipes\decorations\mangrove_hanging_sign.json +b08b4984bf8fc1671ddb7b03ace1fc8ef96a10d1 data\improved-signs\advancement\recipes\decorations\jungle_sign.json +3fdec79f3e2198bd4a67e7aa18f90f1ba6434669 data\improved-signs\advancement\recipes\decorations\crimson_hanging_sign.json +42453305f6e276ca712b96850ca0286b8390813f data\improved-signs\advancement\recipes\decorations\acacia_hanging_sign.json +0c72c40b52a27bb18860df0faac14678bba7b505 data\improved-signs\advancement\recipes\decorations\oak_sign.json +92de58b39a45ba9a52c3040327a20a0e639546a2 data\improved-signs\recipe\oak_sign.json +8473b6e0bb57e226d3ae8d7411ee5bc6f0338332 data\improved-signs\recipe\mangrove_sign.json +944f399232623bff76ff0d4f820b171c3b9fefde data\improved-signs\recipe\mangrove_hanging_sign.json +aba4aa5fb0bcc1519e74ec5c166d992102628d1e data\improved-signs\recipe\acacia_sign.json +97bcaeb8ec230457d8401fb014483412699ee177 data\improved-signs\recipe\cherry_sign.json +c3deebbcdea90821bbe1f235b83f811a96637f29 data\improved-signs\advancement\recipes\decorations\oak_hanging_sign.json +759fe5e6228781369cf9433c36a9bd0fa5dfeb52 data\improved-signs\advancement\recipes\decorations\spruce_sign.json +92786e8461ec8d37b1a23c18dea7af7e4c1e9f33 data\improved-signs\advancement\recipes\decorations\dark_oak_hanging_sign.json +519486ffb35072420d233d79a061a2c33ab937b5 data\improved-signs\advancement\recipes\decorations\warped_sign.json +51f412cffda6af9ebd2f2d433d934b36fede1561 data\improved-signs\recipe\birch_hanging_sign.json +6aa36743d7fe45befd8b90fecf5ae171b39691f1 data\improved-signs\advancement\recipes\decorations\crimson_sign.json +2e663278122b8aa09ac5393268b700a0392803aa data\improved-signs\recipe\birch_sign.json +beabe906a93a8081bdaf927dcaac19d974cac99d data\improved-signs\advancement\recipes\decorations\birch_hanging_sign.json +11c1ab8447cf885ee9132f43a383d74b65abd25b data\improved-signs\advancement\recipes\decorations\birch_sign.json +60057a4dfd6df4e1c115873641bc56bec505f03c data\improved-signs\advancement\recipes\decorations\warped_hanging_sign.json +5ff62826f0832d58dc752c82b3026e89d284066d data\improved-signs\advancement\recipes\decorations\bamboo_hanging_sign.json +b67da200a4badc0392baba20922049e2e283a5f0 data\improved-signs\recipe\jungle_hanging_sign.json +e1b4825995d464ba47ca3be82bf50399a66bb1a8 data\improved-signs\recipe\warped_hanging_sign.json +faaa1dd8605ab93646829aaafd90de2a76651078 data\improved-signs\recipe\oak_hanging_sign.json +8428ebd6a714f7448566a04d7e98f560e2508dc8 data\improved-signs\advancement\recipes\decorations\jungle_hanging_sign.json +1888619850f0d953d2cc180e1dc7b403cf53f05e data\improved-signs\recipe\jungle_sign.json +fe1159050d3450a551de501778319400355632a2 data\improved-signs\recipe\bamboo_hanging_sign.json +93c2f2dba830d6cc03540a883496f69749050997 data\improved-signs\advancement\recipes\decorations\dark_oak_sign.json +3ed8e043988c65f7700d5a43dcf8d2e23b59fbc7 data\improved-signs\recipe\spruce_sign.json +8afab208284bcff0fd1fb6f07683326013d506d8 data\improved-signs\recipe\cherry_hanging_sign.json +10ee7f8495f0736507a380341d6e68984d6b9ee7 data\improved-signs\recipe\dark_oak_sign.json +0f26c4c83797e8d4df087670ec5ad4f1361502f1 data\improved-signs\advancement\recipes\decorations\bamboo_sign.json +f4a127ad95542778d0a5b7e48881e70bb5734713 data\improved-signs\advancement\recipes\decorations\acacia_sign.json +618888846075c52ba84d3fa96b96938fec8a3b69 data\improved-signs\advancement\recipes\decorations\cherry_hanging_sign.json +ea305367412eab4b8135bda24c729714027a5420 data\improved-signs\advancement\recipes\decorations\cherry_sign.json diff --git a/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d b/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d index 5e71a48..4fdf3b1 100644 --- a/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d +++ b/src/main/generated/.cache/fe9732827f0505b62f4241b5603bc7e17f0a1a8d @@ -1,8 +1,8 @@ -// 1.21 2024-06-13T18:46:37.1214235 Improved Signs/Block Loot Tables +// 1.21.3 2024-11-27T19:26:37.4717796 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 +de88b71ecf5b5f299640dab969d614acb0c90e04 data\minecraft\loot_table\blocks\crimson_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 diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_acacia_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/acacia_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_acacia_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/acacia_hanging_sign.json index 8ee1e3c..2a645ce 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_acacia_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/acacia_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_acacia_hanging_sign" + "recipe": "improved-signs:acacia_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_acacia_hanging_sign" + "improved-signs:acacia_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_acacia_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/acacia_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_acacia_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/acacia_sign.json index a90fd36..8226256 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_acacia_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/acacia_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_acacia_sign" + "recipe": "improved-signs:acacia_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_acacia_sign" + "improved-signs:acacia_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_bamboo_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/bamboo_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_bamboo_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/bamboo_hanging_sign.json index b406edc..ad6ace0 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_bamboo_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/bamboo_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_bamboo_hanging_sign" + "recipe": "improved-signs:bamboo_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_bamboo_hanging_sign" + "improved-signs:bamboo_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_bamboo_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/bamboo_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_bamboo_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/bamboo_sign.json index 7b6fc43..96586ae 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_bamboo_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/bamboo_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_bamboo_sign" + "recipe": "improved-signs:bamboo_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_bamboo_sign" + "improved-signs:bamboo_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_birch_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/birch_hanging_sign.json similarity index 82% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_birch_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/birch_hanging_sign.json index 313049e..5509b16 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_birch_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/birch_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_birch_hanging_sign" + "recipe": "improved-signs:birch_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_birch_hanging_sign" + "improved-signs:birch_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_birch_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/birch_sign.json similarity index 84% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_birch_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/birch_sign.json index dc30b51..17b86b0 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_birch_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/birch_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_birch_sign" + "recipe": "improved-signs:birch_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_birch_sign" + "improved-signs:birch_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_cherry_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/cherry_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_cherry_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/cherry_hanging_sign.json index 2410396..e359e3b 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_cherry_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/cherry_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_cherry_hanging_sign" + "recipe": "improved-signs:cherry_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_cherry_hanging_sign" + "improved-signs:cherry_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_cherry_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/cherry_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_cherry_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/cherry_sign.json index 7c2edae..5ac5841 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_cherry_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/cherry_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_cherry_sign" + "recipe": "improved-signs:cherry_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_cherry_sign" + "improved-signs:cherry_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_crimson_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/crimson_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_crimson_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/crimson_hanging_sign.json index f77b871..c7882cc 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_crimson_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/crimson_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_crimson_hanging_sign" + "recipe": "improved-signs:crimson_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_crimson_hanging_sign" + "improved-signs:crimson_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_crimson_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/crimson_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_crimson_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/crimson_sign.json index ae11c73..c9ec0b7 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_crimson_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/crimson_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_crimson_sign" + "recipe": "improved-signs:crimson_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_crimson_sign" + "improved-signs:crimson_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_dark_oak_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/dark_oak_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_dark_oak_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/dark_oak_hanging_sign.json index 35ac091..8da46e5 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_dark_oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/dark_oak_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_dark_oak_hanging_sign" + "recipe": "improved-signs:dark_oak_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_dark_oak_hanging_sign" + "improved-signs:dark_oak_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_dark_oak_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/dark_oak_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_dark_oak_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/dark_oak_sign.json index b345fba..e87447e 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_dark_oak_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/dark_oak_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_dark_oak_sign" + "recipe": "improved-signs:dark_oak_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_dark_oak_sign" + "improved-signs:dark_oak_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_jungle_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/jungle_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_jungle_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/jungle_hanging_sign.json index c036ff6..9db066c 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_jungle_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/jungle_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_jungle_hanging_sign" + "recipe": "improved-signs:jungle_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_jungle_hanging_sign" + "improved-signs:jungle_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_jungle_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/jungle_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_jungle_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/jungle_sign.json index 380fe70..9e3da6f 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_jungle_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/jungle_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_jungle_sign" + "recipe": "improved-signs:jungle_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_jungle_sign" + "improved-signs:jungle_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_mangrove_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/mangrove_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_mangrove_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/mangrove_hanging_sign.json index 0361054..b447b84 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_mangrove_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/mangrove_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_mangrove_hanging_sign" + "recipe": "improved-signs:mangrove_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_mangrove_hanging_sign" + "improved-signs:mangrove_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_mangrove_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/mangrove_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_mangrove_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/mangrove_sign.json index cf3e2ef..7a029de 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_mangrove_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/mangrove_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_mangrove_sign" + "recipe": "improved-signs:mangrove_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_mangrove_sign" + "improved-signs:mangrove_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_oak_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/oak_hanging_sign.json similarity index 82% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_oak_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/oak_hanging_sign.json index 7cea31e..38eed7a 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/oak_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_oak_hanging_sign" + "recipe": "improved-signs:oak_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_oak_hanging_sign" + "improved-signs:oak_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_oak_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/oak_sign.json similarity index 84% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_oak_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/oak_sign.json index 73c27cb..2c1b958 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_oak_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/oak_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_oak_sign" + "recipe": "improved-signs:oak_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_oak_sign" + "improved-signs:oak_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_spruce_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/spruce_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_spruce_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/spruce_hanging_sign.json index 0b5b681..76bb5e3 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_spruce_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/spruce_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_spruce_hanging_sign" + "recipe": "improved-signs:spruce_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_spruce_hanging_sign" + "improved-signs:spruce_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_spruce_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/spruce_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_spruce_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/spruce_sign.json index 8619fbc..3f9a4e9 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_spruce_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/spruce_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_spruce_sign" + "recipe": "improved-signs:spruce_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_spruce_sign" + "improved-signs:spruce_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_warped_hanging_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/warped_hanging_sign.json similarity index 81% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_warped_hanging_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/warped_hanging_sign.json index 6d66abf..a07ae46 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_warped_hanging_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/warped_hanging_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_warped_hanging_sign" + "recipe": "improved-signs:warped_hanging_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_warped_hanging_sign" + "improved-signs:warped_hanging_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_warped_sign.json b/src/main/generated/data/improved-signs/advancement/recipes/decorations/warped_sign.json similarity index 83% rename from src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_warped_sign.json rename to src/main/generated/data/improved-signs/advancement/recipes/decorations/warped_sign.json index 598ea92..ba59ad2 100644 --- a/src/main/generated/data/improved-signs/advancement/recipes/decorations/reset_warped_sign.json +++ b/src/main/generated/data/improved-signs/advancement/recipes/decorations/warped_sign.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "improved-signs:reset_warped_sign" + "recipe": "improved-signs:warped_sign" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "improved-signs:reset_warped_sign" + "improved-signs:warped_sign" ] } } \ No newline at end of file diff --git a/src/main/generated/data/improved-signs/recipe/reset_acacia_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_acacia_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json index dd5ff47..445ecc1 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_acacia_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/acacia_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:acacia_hanging_sign" - } + "minecraft:acacia_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_acacia_sign.json b/src/main/generated/data/improved-signs/recipe/acacia_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_acacia_sign.json rename to src/main/generated/data/improved-signs/recipe/acacia_sign.json index d0667c7..b01f013 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_acacia_sign.json +++ b/src/main/generated/data/improved-signs/recipe/acacia_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:acacia_sign" - } + "minecraft:acacia_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_bamboo_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_bamboo_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json index 9dbfa93..8b58c2b 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_bamboo_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/bamboo_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:bamboo_hanging_sign" - } + "minecraft:bamboo_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_bamboo_sign.json b/src/main/generated/data/improved-signs/recipe/bamboo_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_bamboo_sign.json rename to src/main/generated/data/improved-signs/recipe/bamboo_sign.json index 0df1105..65c1eec 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_bamboo_sign.json +++ b/src/main/generated/data/improved-signs/recipe/bamboo_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:bamboo_sign" - } + "minecraft:bamboo_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_birch_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_birch_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json index eb4567a..562f128 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_birch_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/birch_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:birch_hanging_sign" - } + "minecraft:birch_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_birch_sign.json b/src/main/generated/data/improved-signs/recipe/birch_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_birch_sign.json rename to src/main/generated/data/improved-signs/recipe/birch_sign.json index 34370ec..2120311 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_birch_sign.json +++ b/src/main/generated/data/improved-signs/recipe/birch_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:birch_sign" - } + "minecraft:birch_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_cherry_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_cherry_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json index e4522f9..e9afc61 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_cherry_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/cherry_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:cherry_hanging_sign" - } + "minecraft:cherry_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_cherry_sign.json b/src/main/generated/data/improved-signs/recipe/cherry_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_cherry_sign.json rename to src/main/generated/data/improved-signs/recipe/cherry_sign.json index 602b4f7..f72eb5e 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_cherry_sign.json +++ b/src/main/generated/data/improved-signs/recipe/cherry_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:cherry_sign" - } + "minecraft:cherry_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_crimson_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_crimson_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json index 5d6c0dc..f2d6090 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_crimson_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/crimson_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:crimson_hanging_sign" - } + "minecraft:crimson_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_crimson_sign.json b/src/main/generated/data/improved-signs/recipe/crimson_sign.json similarity index 75% rename from src/main/generated/data/improved-signs/recipe/reset_crimson_sign.json rename to src/main/generated/data/improved-signs/recipe/crimson_sign.json index eff510a..3223894 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_crimson_sign.json +++ b/src/main/generated/data/improved-signs/recipe/crimson_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:crimson_sign" - } + "minecraft:crimson_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_dark_oak_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json similarity index 73% rename from src/main/generated/data/improved-signs/recipe/reset_dark_oak_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json index aa4f56d..2859a39 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_dark_oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/dark_oak_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:dark_oak_hanging_sign" - } + "minecraft:dark_oak_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_dark_oak_sign.json b/src/main/generated/data/improved-signs/recipe/dark_oak_sign.json similarity index 75% rename from src/main/generated/data/improved-signs/recipe/reset_dark_oak_sign.json rename to src/main/generated/data/improved-signs/recipe/dark_oak_sign.json index 4a057c2..242728f 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_dark_oak_sign.json +++ b/src/main/generated/data/improved-signs/recipe/dark_oak_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:dark_oak_sign" - } + "minecraft:dark_oak_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_jungle_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_jungle_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json index 5e5fbb0..17e97e5 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_jungle_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/jungle_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:jungle_hanging_sign" - } + "minecraft:jungle_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_jungle_sign.json b/src/main/generated/data/improved-signs/recipe/jungle_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_jungle_sign.json rename to src/main/generated/data/improved-signs/recipe/jungle_sign.json index cceba08..d53da74 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_jungle_sign.json +++ b/src/main/generated/data/improved-signs/recipe/jungle_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:jungle_sign" - } + "minecraft:jungle_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_mangrove_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json similarity index 73% rename from src/main/generated/data/improved-signs/recipe/reset_mangrove_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json index 7a6c8d2..47f26fc 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_mangrove_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/mangrove_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:mangrove_hanging_sign" - } + "minecraft:mangrove_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_mangrove_sign.json b/src/main/generated/data/improved-signs/recipe/mangrove_sign.json similarity index 75% rename from src/main/generated/data/improved-signs/recipe/reset_mangrove_sign.json rename to src/main/generated/data/improved-signs/recipe/mangrove_sign.json index 4994cc6..a23cee6 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_mangrove_sign.json +++ b/src/main/generated/data/improved-signs/recipe/mangrove_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:mangrove_sign" - } + "minecraft:mangrove_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_oak_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_oak_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json index 0ed1a4c..a387842 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_oak_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/oak_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:oak_hanging_sign" - } + "minecraft:oak_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_oak_sign.json b/src/main/generated/data/improved-signs/recipe/oak_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_oak_sign.json rename to src/main/generated/data/improved-signs/recipe/oak_sign.json index 0a82ff5..487c034 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_oak_sign.json +++ b/src/main/generated/data/improved-signs/recipe/oak_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:oak_sign" - } + "minecraft:oak_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_spruce_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_spruce_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json index baf6574..19be083 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_spruce_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/spruce_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:spruce_hanging_sign" - } + "minecraft:spruce_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_spruce_sign.json b/src/main/generated/data/improved-signs/recipe/spruce_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_spruce_sign.json rename to src/main/generated/data/improved-signs/recipe/spruce_sign.json index f209d37..1faa9eb 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_spruce_sign.json +++ b/src/main/generated/data/improved-signs/recipe/spruce_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:spruce_sign" - } + "minecraft:spruce_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_warped_hanging_sign.json b/src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json similarity index 74% rename from src/main/generated/data/improved-signs/recipe/reset_warped_hanging_sign.json rename to src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json index a5b43f9..42c6212 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_warped_hanging_sign.json +++ b/src/main/generated/data/improved-signs/recipe/warped_hanging_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:warped_hanging_sign" - } + "minecraft:warped_hanging_sign" ], "result": { "count": 1, diff --git a/src/main/generated/data/improved-signs/recipe/reset_warped_sign.json b/src/main/generated/data/improved-signs/recipe/warped_sign.json similarity index 76% rename from src/main/generated/data/improved-signs/recipe/reset_warped_sign.json rename to src/main/generated/data/improved-signs/recipe/warped_sign.json index bfaaf23..20ac9e2 100644 --- a/src/main/generated/data/improved-signs/recipe/reset_warped_sign.json +++ b/src/main/generated/data/improved-signs/recipe/warped_sign.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:warped_sign" - } + "minecraft:warped_sign" ], "result": { "count": 1, diff --git a/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java b/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java index cf19e62..a9f13bc 100644 --- a/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java +++ b/src/main/java/com/craftycorvid/improvedSigns/datagen/RecipeDatagen.java @@ -1,19 +1,18 @@ package com.craftycorvid.improvedSigns.datagen; import java.util.concurrent.CompletableFuture; - -import com.craftycorvid.improvedSigns.ImprovedSignsMod; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.advancement.criterion.InventoryChangedCriterion; import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; -import net.minecraft.item.Item; +import net.minecraft.data.server.recipe.RecipeGenerator; +import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.util.Identifier; public class RecipeDatagen extends FabricRecipeProvider { public RecipeDatagen(FabricDataOutput dataOutput, @@ -22,35 +21,47 @@ public RecipeDatagen(FabricDataOutput dataOutput, } @Override - public void generate(RecipeExporter exporter) { - generateClearSignRecipe(exporter, Items.OAK_SIGN); - generateClearSignRecipe(exporter, Items.OAK_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.SPRUCE_SIGN); - generateClearSignRecipe(exporter, Items.SPRUCE_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.BIRCH_SIGN); - generateClearSignRecipe(exporter, Items.BIRCH_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.JUNGLE_SIGN); - generateClearSignRecipe(exporter, Items.JUNGLE_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.ACACIA_SIGN); - generateClearSignRecipe(exporter, Items.ACACIA_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.CHERRY_SIGN); - generateClearSignRecipe(exporter, Items.CHERRY_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.DARK_OAK_SIGN); - generateClearSignRecipe(exporter, Items.DARK_OAK_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.MANGROVE_SIGN); - generateClearSignRecipe(exporter, Items.MANGROVE_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.BAMBOO_SIGN); - generateClearSignRecipe(exporter, Items.BAMBOO_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.CRIMSON_SIGN); - generateClearSignRecipe(exporter, Items.CRIMSON_HANGING_SIGN); - generateClearSignRecipe(exporter, Items.WARPED_SIGN); - generateClearSignRecipe(exporter, Items.WARPED_HANGING_SIGN); + public RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup registryLookup, + RecipeExporter exporter) { + return new RecipeGenerator(registryLookup, exporter) { + @Override + public void generate() { + generateClearSignRecipe(exporter, Items.OAK_SIGN); + generateClearSignRecipe(exporter, Items.OAK_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.SPRUCE_SIGN); + generateClearSignRecipe(exporter, Items.SPRUCE_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.BIRCH_SIGN); + generateClearSignRecipe(exporter, Items.BIRCH_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.JUNGLE_SIGN); + generateClearSignRecipe(exporter, Items.JUNGLE_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.ACACIA_SIGN); + generateClearSignRecipe(exporter, Items.ACACIA_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.CHERRY_SIGN); + generateClearSignRecipe(exporter, Items.CHERRY_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.DARK_OAK_SIGN); + generateClearSignRecipe(exporter, Items.DARK_OAK_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.MANGROVE_SIGN); + generateClearSignRecipe(exporter, Items.MANGROVE_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.BAMBOO_SIGN); + generateClearSignRecipe(exporter, Items.BAMBOO_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.CRIMSON_SIGN); + generateClearSignRecipe(exporter, Items.CRIMSON_HANGING_SIGN); + generateClearSignRecipe(exporter, Items.WARPED_SIGN); + generateClearSignRecipe(exporter, Items.WARPED_HANGING_SIGN); + } + + public void generateClearSignRecipe(RecipeExporter exporter, ItemConvertible sign) { + createShapeless(RecipeCategory.DECORATIONS, sign).input(sign) + .criterion("has_sign", InventoryChangedCriterion.Conditions.items(sign)) + .offerTo(exporter, RegistryKey.of(RegistryKeys.RECIPE, + getRecipeIdentifier(Registries.ITEM.getId(sign.asItem())))); + } + }; + } - public void generateClearSignRecipe(RecipeExporter exporter, Item sign) { - ShapelessRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, sign).input(sign) - .criterion("has_sign", InventoryChangedCriterion.Conditions.items(sign)) - .offerTo(exporter, Identifier.of(ImprovedSignsMod.MOD_ID, - "reset_" + Registries.ITEM.getId(sign).getPath())); + @Override + public String getName() { + return ""; } } diff --git a/src/main/java/com/craftycorvid/improvedSigns/event/UseSignBlockCallback.java b/src/main/java/com/craftycorvid/improvedSigns/event/UseSignBlockCallback.java index b0357bf..3d9bba8 100644 --- a/src/main/java/com/craftycorvid/improvedSigns/event/UseSignBlockCallback.java +++ b/src/main/java/com/craftycorvid/improvedSigns/event/UseSignBlockCallback.java @@ -24,7 +24,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.DyeColor; import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -97,9 +96,7 @@ public static ActionResult onUseSignBlockCallback(PlayerEntity player, World wor ItemStack handItemStack = player.getStackInHand(Hand.MAIN_HAND); Item handItem = handItemStack.getItem(); if (handItem instanceof SignChangingItem) { - ItemActionResult result = - blockState.onUseWithItem(handItemStack, world, player, hand, hitResult); - return result.toActionResult(); + return blockState.onUseWithItem(handItemStack, world, player, hand, hitResult); } Item offhandItem = player.getStackInHand(Hand.OFF_HAND).getItem(); diff --git a/src/main/java/com/craftycorvid/improvedSigns/mixin/SignItemMixin.java b/src/main/java/com/craftycorvid/improvedSigns/mixin/SignItemMixin.java index 6ef2773..769d45c 100644 --- a/src/main/java/com/craftycorvid/improvedSigns/mixin/SignItemMixin.java +++ b/src/main/java/com/craftycorvid/improvedSigns/mixin/SignItemMixin.java @@ -33,8 +33,8 @@ @Mixin(SignItem.class) public class SignItemMixin extends VerticallyAttachableBlockItem { public SignItemMixin(Block standingBlock, Block wallBlock, - net.minecraft.item.Item.Settings settings, Direction verticalAttachmentDirection) { - super(standingBlock, wallBlock, settings, verticalAttachmentDirection); + Direction verticalAttachmentDirection, net.minecraft.item.Item.Settings settings) { + super(standingBlock, wallBlock, verticalAttachmentDirection, settings); } @Inject(method = "postPlacement", at = @At(value = "INVOKE", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d2fd4b9..9e55674 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "fabricloader": ">=0.16.9", "fabric": "*", "minecraft": [ - "1.21.1" + "1.21.3" ] } } \ No newline at end of file