From 4fb07d075fbb9612dab3a4f33dc6e6b509917187 Mon Sep 17 00:00:00 2001 From: ljfa Date: Tue, 27 Jun 2023 12:27:16 +0200 Subject: [PATCH] Regenerate the resources Version bump --- gradle.properties | 2 +- src/generated/resources/.cache/cache | 10 ++++++++++ .../minecraft/tags/blocks/standing_signs.json | 1 + .../minecraft/tags/blocks/wall_signs.json | 1 + .../data/minecraft/tags/items/signs.json | 1 + .../recipes/totemic/cedar_sign.json | 20 +++++++++---------- .../loot_tables/blocks/cedar_sign.json | 12 +++++------ .../data/totemic/recipes/cedar_sign.json | 14 ++++++------- 8 files changed, 37 insertions(+), 24 deletions(-) diff --git a/gradle.properties b/gradle.properties index df4fe404..01f1e6c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ mappings_version=2022.11.06-1.18.2 forge_version=1.18.2-40.2.9 # Remember to change the dependency versions in src/main/resources/META-INF/mods.toml when changing this -mod_version=1.18.2-0.12.5 +mod_version=1.18.2-0.12.6 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 45884cce..e1a1dd99 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -7,9 +7,11 @@ edc95cefe7c2b860eb47a625a727bebe887c3072 assets/totemic/blockstates/cedar_button c616e9a9dc1fb9ee7c9438c50fb15960df274752 assets/totemic/blockstates/cedar_planks.json 8df39eab9dc34804621dd7e2f6fdf361f525f740 assets/totemic/blockstates/cedar_pressure_plate.json 69544281df84634ca8be61dc71a51588a59a44b8 assets/totemic/blockstates/cedar_sapling.json +4d5a97ca920939919b60c1d2324413a487b91787 assets/totemic/blockstates/cedar_sign.json 282d079b51a653be3a982e116877e0817e0d5d5e assets/totemic/blockstates/cedar_slab.json d7aa4e3802b9807e07a7a3bce00c540878c1a4fb assets/totemic/blockstates/cedar_stairs.json 4f71df151251a61fa3f8caf0647c23b0ece65bb7 assets/totemic/blockstates/cedar_trapdoor.json +4d5a97ca920939919b60c1d2324413a487b91787 assets/totemic/blockstates/cedar_wall_sign.json f4103d623b40d61fdabfc9f44436186b32b0d298 assets/totemic/blockstates/cedar_wood.json ae1a72d76e0dee20353a34fcbeb48783bc7899a8 assets/totemic/blockstates/drum.json 840c82ddd9331ce03b7f98ee76530ca692f4667f assets/totemic/blockstates/dummy_tipi.json @@ -45,6 +47,7 @@ eb6d61a153f0c84bcb6268d1b1e614b4dbef974a assets/totemic/models/block/cedar_leave 0bcd91efebdab45cd67b329ef26e1184bc6eb736 assets/totemic/models/block/cedar_pressure_plate.json aea06de5298d222cee989526db4b500e7c1b2df7 assets/totemic/models/block/cedar_pressure_plate_down.json 263794ad562b6b47ba235814c70854f2b3f48fda assets/totemic/models/block/cedar_sapling.json +49391116292e1c3049a485a9002b8c1f1d212fc7 assets/totemic/models/block/cedar_sign.json f2c19e34355b6e94acc0fd35adc30fccb7038b56 assets/totemic/models/block/cedar_slab.json 40138da72ed1f3b82401e92a56380dc42a99149d assets/totemic/models/block/cedar_slab_top.json 99740695886953a1a424d127a26bef27176fdc88 assets/totemic/models/block/cedar_stairs.json @@ -91,6 +94,7 @@ bf76d48653c4c0c9c860ca2379474eef34f02a80 assets/totemic/models/item/cedar_fence_ a4dddd2e08fe0d3aacf4c453372541f98faa9750 assets/totemic/models/item/cedar_planks.json 17cf2db40220f80f83a561dc6d0fa563ba047ff1 assets/totemic/models/item/cedar_pressure_plate.json b65fc3cea7630883571831ffa949e7cf95db4508 assets/totemic/models/item/cedar_sapling.json +f73bbd04f5a6a4512a9d08d1bb896ec410008c9c assets/totemic/models/item/cedar_sign.json 1c8041fbfe4d5713fbc43ce3bf0797fb1f604e79 assets/totemic/models/item/cedar_slab.json f2fcc3ae3b41594c23e116877ed42d1db2f0a925 assets/totemic/models/item/cedar_stairs.json 0a486e7548087dfb3cee4c8a648a668cc56420af assets/totemic/models/item/cedar_trapdoor.json @@ -138,6 +142,8 @@ bb79320885aca2e8441cd925504490e8e9c7a6cf data/minecraft/tags/blocks/mineable/hoe f16f7479efeeb9b1b25bc56ca8e0330239eca8ce data/minecraft/tags/blocks/mineable/pickaxe.json d027b8609404edada4b1e936fb29f3e0819597f7 data/minecraft/tags/blocks/planks.json 6e219692223af39ba78aaf4aece566461297096e data/minecraft/tags/blocks/saplings.json +8899a854dd9965b42d97d132cb10f043ba27247a data/minecraft/tags/blocks/standing_signs.json +efff8a9dbf13528077126677aa2a0f446a54053e data/minecraft/tags/blocks/wall_signs.json 0e1f723d83c74953aff35b5a31306354dce4813f data/minecraft/tags/blocks/wooden_buttons.json ba11f1864fcaf8bc84586cb7f69db80c41591db9 data/minecraft/tags/blocks/wooden_doors.json e8d3001cf429c29de1d31584b9bed25b7a000d68 data/minecraft/tags/blocks/wooden_fences.json @@ -150,6 +156,7 @@ bb79320885aca2e8441cd925504490e8e9c7a6cf data/minecraft/tags/items/leaves.json 9c768e7a741767f4b6c403db603c65b46b0a6005 data/minecraft/tags/items/logs_that_burn.json d027b8609404edada4b1e936fb29f3e0819597f7 data/minecraft/tags/items/planks.json 6e219692223af39ba78aaf4aece566461297096e data/minecraft/tags/items/saplings.json +8899a854dd9965b42d97d132cb10f043ba27247a data/minecraft/tags/items/signs.json 0e1f723d83c74953aff35b5a31306354dce4813f data/minecraft/tags/items/wooden_buttons.json ba11f1864fcaf8bc84586cb7f69db80c41591db9 data/minecraft/tags/items/wooden_doors.json e8d3001cf429c29de1d31584b9bed25b7a000d68 data/minecraft/tags/items/wooden_fences.json @@ -164,6 +171,7 @@ dcf3b45cba79e8b6555ec92cd2e976732938fdc4 data/totemic/advancements/recipes/totem a2302c0117c16d44f21cb7bdb43fcdba4b616a26 data/totemic/advancements/recipes/totemic/cedar_fence_gate.json d79525a1813eb0a44eb56cbbb6634f821d6e25f4 data/totemic/advancements/recipes/totemic/cedar_planks.json 9229a6a69046b6eb51c912c80060e252ff7a0eb8 data/totemic/advancements/recipes/totemic/cedar_pressure_plate.json +ed023ac136ebf51ad267bcccc3af70c45a93a3c0 data/totemic/advancements/recipes/totemic/cedar_sign.json dcbe7f86dc2d468daa0fcbe1b1edb5c04482f1bd data/totemic/advancements/recipes/totemic/cedar_slab.json ee57ea3899117ca8eaf7b4ba8fc3d655efa80aef data/totemic/advancements/recipes/totemic/cedar_stairs.json 8be618c88bf1a402f22b4849e45280b29eaa4e34 data/totemic/advancements/recipes/totemic/cedar_trapdoor.json @@ -189,6 +197,7 @@ d619ec6b735c0dd393b1fddddb07bd37683badec data/totemic/loot_tables/blocks/cedar_l b85cb0754f1f19d66044e8d78d00227d9d260b23 data/totemic/loot_tables/blocks/cedar_planks.json fcc9dcd45144b50ca8f709ad2097a8499700b319 data/totemic/loot_tables/blocks/cedar_pressure_plate.json 7cd55de593350856850b2b122192ac0667e0f3b7 data/totemic/loot_tables/blocks/cedar_sapling.json +dc34da2d46209fa6f12bf6bdc7412600b23cf33d data/totemic/loot_tables/blocks/cedar_sign.json 7712423c163ffee95e717f5ef9cc480b653a4d33 data/totemic/loot_tables/blocks/cedar_slab.json 7de7324b34ae55fbadde890a12f89a43c4700710 data/totemic/loot_tables/blocks/cedar_stairs.json abe67e80e605eb5a40ef5e3ef8fef93f38659db9 data/totemic/loot_tables/blocks/cedar_trapdoor.json @@ -211,6 +220,7 @@ ba7e42e3385ef88c2e87517446240b7a5a114c4e data/totemic/loot_tables/blocks/totem_t 132ae5c69de287e083e3d51720ba9867474bf8a3 data/totemic/recipes/cedar_fence_gate.json baf9703cd0e23a9ee92a7f59c3b40fdbc50b5bb9 data/totemic/recipes/cedar_planks.json ee2337ebb5bd870a8279a57099e461056cf8d649 data/totemic/recipes/cedar_pressure_plate.json +76fa2263d9da44c0401726a98d4a155152c13e94 data/totemic/recipes/cedar_sign.json db35103e8c471a8d140afafdc6d25f9869f39478 data/totemic/recipes/cedar_slab.json 3c0c83eaa4e3e065bafe202722bbf1dd5ec97274 data/totemic/recipes/cedar_stairs.json 5456d0f7bec6967c3029b04e0766cb5b587f4607 data/totemic/recipes/cedar_trapdoor.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json b/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json index 98720676..974f8793 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/standing_signs.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "totemic:cedar_sign" ] diff --git a/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json b/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json index 37e98ebb..11cd7768 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/wall_signs.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "totemic:cedar_wall_sign" ] diff --git a/src/generated/resources/data/minecraft/tags/items/signs.json b/src/generated/resources/data/minecraft/tags/items/signs.json index 98720676..974f8793 100644 --- a/src/generated/resources/data/minecraft/tags/items/signs.json +++ b/src/generated/resources/data/minecraft/tags/items/signs.json @@ -1,4 +1,5 @@ { + "replace": false, "values": [ "totemic:cedar_sign" ] diff --git a/src/generated/resources/data/totemic/advancements/recipes/totemic/cedar_sign.json b/src/generated/resources/data/totemic/advancements/recipes/totemic/cedar_sign.json index 952967f8..a585dff5 100644 --- a/src/generated/resources/data/totemic/advancements/recipes/totemic/cedar_sign.json +++ b/src/generated/resources/data/totemic/advancements/recipes/totemic/cedar_sign.json @@ -1,7 +1,13 @@ { "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemic:cedar_sign" + ] + }, "criteria": { "has_planks": { + "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -10,14 +16,13 @@ ] } ] - }, - "trigger": "minecraft:inventory_changed" + } }, "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "totemic:cedar_sign" - }, - "trigger": "minecraft:recipe_unlocked" + } } }, "requirements": [ @@ -25,10 +30,5 @@ "has_planks", "has_the_recipe" ] - ], - "rewards": { - "recipes": [ - "totemic:cedar_sign" - ] - } + ] } \ No newline at end of file diff --git a/src/generated/resources/data/totemic/loot_tables/blocks/cedar_sign.json b/src/generated/resources/data/totemic/loot_tables/blocks/cedar_sign.json index fd40ddf1..103a19d4 100644 --- a/src/generated/resources/data/totemic/loot_tables/blocks/cedar_sign.json +++ b/src/generated/resources/data/totemic/loot_tables/blocks/cedar_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { + "rolls": 1.0, "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], "entries": [ { "type": "minecraft:item", "name": "totemic:cedar_sign" } ], - "rolls": 1.0 + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/totemic/recipes/cedar_sign.json b/src/generated/resources/data/totemic/recipes/cedar_sign.json index 7d1d9015..fc86e13b 100644 --- a/src/generated/resources/data/totemic/recipes/cedar_sign.json +++ b/src/generated/resources/data/totemic/recipes/cedar_sign.json @@ -1,6 +1,11 @@ { "type": "minecraft:crafting_shaped", "group": "totemic:wooden_sign", + "pattern": [ + "###", + "###", + " X " + ], "key": { "#": { "item": "totemic:cedar_planks" @@ -9,13 +14,8 @@ "item": "minecraft:stick" } }, - "pattern": [ - "###", - "###", - " X " - ], "result": { - "count": 3, - "item": "totemic:cedar_sign" + "item": "totemic:cedar_sign", + "count": 3 } } \ No newline at end of file