From 4ee1a066ac4d49691f78c2adf1fbc72db778273d Mon Sep 17 00:00:00 2001 From: QuImUfu Date: Thu, 25 Jul 2024 21:07:09 +0200 Subject: [PATCH] fix recipes --- gradle.properties | 2 +- .../assets/colourful_portals/lang/de_de.json | 4 +- .../assets/colourful_portals/lang/en_us.json | 4 +- .../{items/gems.json => item/crystals.json} | 0 .../black_dyes.json => item/dyes/black.json} | 0 .../blue_dyes.json => item/dyes/blue.json} | 0 .../brown_dyes.json => item/dyes/brown.json} | 0 .../cyan_dyes.json => item/dyes/cyan.json} | 0 .../gray_dyes.json => item/dyes/gray.json} | 0 .../green_dyes.json => item/dyes/green.json} | 0 .../dyes/light_blue.json} | 0 .../dyes/light_gray.json} | 0 .../lime_dyes.json => item/dyes/lime.json} | 0 .../dyes/magenta.json} | 0 .../dyes/orange.json} | 0 .../pink_dyes.json => item/dyes/pink.json} | 0 .../dyes/purple.json} | 0 .../red_dyes.json => item/dyes/red.json} | 0 .../white_dyes.json => item/dyes/white.json} | 0 .../dyes/yellow.json} | 0 .../c/tags/{items => item}/slime_balls.json | 0 .../recipe/colour_blob_bright.json | 37 +++++++++++++++++++ .../{recipes => recipe}/colour_blob_dark.json | 18 ++++----- .../portal_fluid_bucket.json | 4 +- .../recipes/colour_blob_bright.json | 37 ------------------- 25 files changed, 55 insertions(+), 51 deletions(-) rename src/main/resources/data/c/tags/{items/gems.json => item/crystals.json} (100%) rename src/main/resources/data/c/tags/{items/black_dyes.json => item/dyes/black.json} (100%) rename src/main/resources/data/c/tags/{items/blue_dyes.json => item/dyes/blue.json} (100%) rename src/main/resources/data/c/tags/{items/brown_dyes.json => item/dyes/brown.json} (100%) rename src/main/resources/data/c/tags/{items/cyan_dyes.json => item/dyes/cyan.json} (100%) rename src/main/resources/data/c/tags/{items/gray_dyes.json => item/dyes/gray.json} (100%) rename src/main/resources/data/c/tags/{items/green_dyes.json => item/dyes/green.json} (100%) rename src/main/resources/data/c/tags/{items/light_blue_dyes.json => item/dyes/light_blue.json} (100%) rename src/main/resources/data/c/tags/{items/light_gray_dyes.json => item/dyes/light_gray.json} (100%) rename src/main/resources/data/c/tags/{items/lime_dyes.json => item/dyes/lime.json} (100%) rename src/main/resources/data/c/tags/{items/magenta_dyes.json => item/dyes/magenta.json} (100%) rename src/main/resources/data/c/tags/{items/orange_dyes.json => item/dyes/orange.json} (100%) rename src/main/resources/data/c/tags/{items/pink_dyes.json => item/dyes/pink.json} (100%) rename src/main/resources/data/c/tags/{items/purple_dyes.json => item/dyes/purple.json} (100%) rename src/main/resources/data/c/tags/{items/red_dyes.json => item/dyes/red.json} (100%) rename src/main/resources/data/c/tags/{items/white_dyes.json => item/dyes/white.json} (100%) rename src/main/resources/data/c/tags/{items/yellow_dyes.json => item/dyes/yellow.json} (100%) rename src/main/resources/data/c/tags/{items => item}/slime_balls.json (100%) create mode 100644 src/main/resources/data/colourful_portals/recipe/colour_blob_bright.json rename src/main/resources/data/colourful_portals/{recipes => recipe}/colour_blob_dark.json (50%) rename src/main/resources/data/colourful_portals/{recipes => recipe}/portal_fluid_bucket.json (87%) delete mode 100644 src/main/resources/data/colourful_portals/recipes/colour_blob_bright.json diff --git a/gradle.properties b/gradle.properties index 82de50d..6ceba3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.21+build.2 loader_version=0.15.11 # Mod Properties -mod_version=0.9.5.1 +mod_version=0.9.5.2 maven_group=quimufu.colourful-portalRepresentations archives_base_name=colourful-portalRepresentations diff --git a/src/main/resources/assets/colourful_portals/lang/de_de.json b/src/main/resources/assets/colourful_portals/lang/de_de.json index 1af092e..32ef1b3 100644 --- a/src/main/resources/assets/colourful_portals/lang/de_de.json +++ b/src/main/resources/assets/colourful_portals/lang/de_de.json @@ -22,5 +22,7 @@ "colourful_portals.midnightconfig.yellow": "Blöcke, die gelbe Portale erzeugen", "item.colourful_portals.colour_blob_bright": "Heller Farbmix", "item.colourful_portals.colour_blob_dark": "Dunkler Farbmix", - "item.colourful_portals.portal_fluid_bucket": "Farbeimer" + "item.colourful_portals.portal_fluid_bucket": "Farbeimer", + "tag.block.c.crystals": "Kristalle", + "tag.block.c.slime_balls": "Schleimbälle" } \ No newline at end of file diff --git a/src/main/resources/assets/colourful_portals/lang/en_us.json b/src/main/resources/assets/colourful_portals/lang/en_us.json index 11fafb5..ed391fa 100644 --- a/src/main/resources/assets/colourful_portals/lang/en_us.json +++ b/src/main/resources/assets/colourful_portals/lang/en_us.json @@ -22,5 +22,7 @@ "colourful_portals.midnightconfig.yellow": "Blocks that create yellow portals", "item.colourful_portals.colour_blob_bright": "Bright Colour Mix", "item.colourful_portals.colour_blob_dark": "Dark Colour Mix", - "item.colourful_portals.portal_fluid_bucket": "Colourful Bucket" + "item.colourful_portals.portal_fluid_bucket": "Colourful Bucket", + "tag.block.c.slime_balls": "Slime Balls", + "tag.block.c.crystals": "Crystals" } \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/gems.json b/src/main/resources/data/c/tags/item/crystals.json similarity index 100% rename from src/main/resources/data/c/tags/items/gems.json rename to src/main/resources/data/c/tags/item/crystals.json diff --git a/src/main/resources/data/c/tags/items/black_dyes.json b/src/main/resources/data/c/tags/item/dyes/black.json similarity index 100% rename from src/main/resources/data/c/tags/items/black_dyes.json rename to src/main/resources/data/c/tags/item/dyes/black.json diff --git a/src/main/resources/data/c/tags/items/blue_dyes.json b/src/main/resources/data/c/tags/item/dyes/blue.json similarity index 100% rename from src/main/resources/data/c/tags/items/blue_dyes.json rename to src/main/resources/data/c/tags/item/dyes/blue.json diff --git a/src/main/resources/data/c/tags/items/brown_dyes.json b/src/main/resources/data/c/tags/item/dyes/brown.json similarity index 100% rename from src/main/resources/data/c/tags/items/brown_dyes.json rename to src/main/resources/data/c/tags/item/dyes/brown.json diff --git a/src/main/resources/data/c/tags/items/cyan_dyes.json b/src/main/resources/data/c/tags/item/dyes/cyan.json similarity index 100% rename from src/main/resources/data/c/tags/items/cyan_dyes.json rename to src/main/resources/data/c/tags/item/dyes/cyan.json diff --git a/src/main/resources/data/c/tags/items/gray_dyes.json b/src/main/resources/data/c/tags/item/dyes/gray.json similarity index 100% rename from src/main/resources/data/c/tags/items/gray_dyes.json rename to src/main/resources/data/c/tags/item/dyes/gray.json diff --git a/src/main/resources/data/c/tags/items/green_dyes.json b/src/main/resources/data/c/tags/item/dyes/green.json similarity index 100% rename from src/main/resources/data/c/tags/items/green_dyes.json rename to src/main/resources/data/c/tags/item/dyes/green.json diff --git a/src/main/resources/data/c/tags/items/light_blue_dyes.json b/src/main/resources/data/c/tags/item/dyes/light_blue.json similarity index 100% rename from src/main/resources/data/c/tags/items/light_blue_dyes.json rename to src/main/resources/data/c/tags/item/dyes/light_blue.json diff --git a/src/main/resources/data/c/tags/items/light_gray_dyes.json b/src/main/resources/data/c/tags/item/dyes/light_gray.json similarity index 100% rename from src/main/resources/data/c/tags/items/light_gray_dyes.json rename to src/main/resources/data/c/tags/item/dyes/light_gray.json diff --git a/src/main/resources/data/c/tags/items/lime_dyes.json b/src/main/resources/data/c/tags/item/dyes/lime.json similarity index 100% rename from src/main/resources/data/c/tags/items/lime_dyes.json rename to src/main/resources/data/c/tags/item/dyes/lime.json diff --git a/src/main/resources/data/c/tags/items/magenta_dyes.json b/src/main/resources/data/c/tags/item/dyes/magenta.json similarity index 100% rename from src/main/resources/data/c/tags/items/magenta_dyes.json rename to src/main/resources/data/c/tags/item/dyes/magenta.json diff --git a/src/main/resources/data/c/tags/items/orange_dyes.json b/src/main/resources/data/c/tags/item/dyes/orange.json similarity index 100% rename from src/main/resources/data/c/tags/items/orange_dyes.json rename to src/main/resources/data/c/tags/item/dyes/orange.json diff --git a/src/main/resources/data/c/tags/items/pink_dyes.json b/src/main/resources/data/c/tags/item/dyes/pink.json similarity index 100% rename from src/main/resources/data/c/tags/items/pink_dyes.json rename to src/main/resources/data/c/tags/item/dyes/pink.json diff --git a/src/main/resources/data/c/tags/items/purple_dyes.json b/src/main/resources/data/c/tags/item/dyes/purple.json similarity index 100% rename from src/main/resources/data/c/tags/items/purple_dyes.json rename to src/main/resources/data/c/tags/item/dyes/purple.json diff --git a/src/main/resources/data/c/tags/items/red_dyes.json b/src/main/resources/data/c/tags/item/dyes/red.json similarity index 100% rename from src/main/resources/data/c/tags/items/red_dyes.json rename to src/main/resources/data/c/tags/item/dyes/red.json diff --git a/src/main/resources/data/c/tags/items/white_dyes.json b/src/main/resources/data/c/tags/item/dyes/white.json similarity index 100% rename from src/main/resources/data/c/tags/items/white_dyes.json rename to src/main/resources/data/c/tags/item/dyes/white.json diff --git a/src/main/resources/data/c/tags/items/yellow_dyes.json b/src/main/resources/data/c/tags/item/dyes/yellow.json similarity index 100% rename from src/main/resources/data/c/tags/items/yellow_dyes.json rename to src/main/resources/data/c/tags/item/dyes/yellow.json diff --git a/src/main/resources/data/c/tags/items/slime_balls.json b/src/main/resources/data/c/tags/item/slime_balls.json similarity index 100% rename from src/main/resources/data/c/tags/items/slime_balls.json rename to src/main/resources/data/c/tags/item/slime_balls.json diff --git a/src/main/resources/data/colourful_portals/recipe/colour_blob_bright.json b/src/main/resources/data/colourful_portals/recipe/colour_blob_bright.json new file mode 100644 index 0000000..344e936 --- /dev/null +++ b/src/main/resources/data/colourful_portals/recipe/colour_blob_bright.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "c:dyes/white" + }, + { + "tag": "c:dyes/yellow" + }, + { + "tag": "c:dyes/pink" + }, + { + "tag": "c:dyes/lime" + }, + { + "tag": "c:dyes/light_gray" + }, + { + "tag": "c:dyes/orange" + }, + { + "tag": "c:dyes/light_blue" + }, + { + "tag": "c:dyes/magenta" + }, + { + "tag": "c:slime_balls" + } + ], + "result": { + "count": 1, + "id": "colourful_portals:colour_blob_bright" + } +} \ No newline at end of file diff --git a/src/main/resources/data/colourful_portals/recipes/colour_blob_dark.json b/src/main/resources/data/colourful_portals/recipe/colour_blob_dark.json similarity index 50% rename from src/main/resources/data/colourful_portals/recipes/colour_blob_dark.json rename to src/main/resources/data/colourful_portals/recipe/colour_blob_dark.json index 03aebd3..17ad321 100644 --- a/src/main/resources/data/colourful_portals/recipes/colour_blob_dark.json +++ b/src/main/resources/data/colourful_portals/recipe/colour_blob_dark.json @@ -3,28 +3,28 @@ "category": "misc", "ingredients": [ { - "tag": "c:black_dyes" + "tag": "c:dyes/black" }, { - "tag": "c:gray_dyes" + "tag": "c:dyes/gray" }, { - "tag": "c:blue_dyes" + "tag": "c:dyes/blue" }, { - "tag": "c:red_dyes" + "tag": "c:dyes/red" }, { - "tag": "c:brown_dyes" + "tag": "c:dyes/brown" }, { - "tag": "c:green_dyes" + "tag": "c:dyes/green" }, { - "tag": "c:purple_dyes" + "tag": "c:dyes/purple" }, { - "tag": "c:cyan_dyes" + "tag": "c:dyes/cyan" }, { "tag": "c:slime_balls" @@ -32,6 +32,6 @@ ], "result": { "count": 1, - "item": "colourful_portals:colour_blob_dark" + "id": "colourful_portals:colour_blob_dark" } } \ No newline at end of file diff --git a/src/main/resources/data/colourful_portals/recipes/portal_fluid_bucket.json b/src/main/resources/data/colourful_portals/recipe/portal_fluid_bucket.json similarity index 87% rename from src/main/resources/data/colourful_portals/recipes/portal_fluid_bucket.json rename to src/main/resources/data/colourful_portals/recipe/portal_fluid_bucket.json index f22a37a..7fbb527 100644 --- a/src/main/resources/data/colourful_portals/recipes/portal_fluid_bucket.json +++ b/src/main/resources/data/colourful_portals/recipe/portal_fluid_bucket.json @@ -18,7 +18,7 @@ "item": "minecraft:ender_eye" }, "D": { - "tag": "c:gems" + "tag": "c:crystals" } }, "pattern": [ @@ -28,7 +28,7 @@ ], "result": { "count": 1, - "item": "colourful_portals:portal_fluid_bucket" + "id": "colourful_portals:portal_fluid_bucket" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/colourful_portals/recipes/colour_blob_bright.json b/src/main/resources/data/colourful_portals/recipes/colour_blob_bright.json deleted file mode 100644 index 847ea9f..0000000 --- a/src/main/resources/data/colourful_portals/recipes/colour_blob_bright.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "c:white_dyes" - }, - { - "tag": "c:yellow_dyes" - }, - { - "tag": "c:pink_dyes" - }, - { - "tag": "c:lime_dyes" - }, - { - "tag": "c:light_gray_dyes" - }, - { - "tag": "c:orange_dyes" - }, - { - "tag": "c:light_blue_dyes" - }, - { - "tag": "c:magenta_dyes" - }, - { - "tag": "c:slime_balls" - } - ], - "result": { - "count": 1, - "item": "colourful_portals:colour_blob_bright" - } -} \ No newline at end of file