~williewillus/violet-moon

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
3 3

[PATCH botania] Small alch catalyst lexicon entry changes

Details
Message ID
<20231008210229.6235-1-actuallyadarsh@gmail.com>
DKIM signature
missing
Download raw message
Patch: +11 -35
Added sunny quartz deconstruction and gunpowder -> flint to entry, removed chiselled brick because the stonecutter exists, and fixed the glowstone recipes to show only the relevant recipes, #4460 for more info
---
 .../8482c265eb392e1fe5c3863ee4f62f310932c269  |  1 -
 .../mana_infusion/chiseled_stone_bricks.json  | 14 ---------
 .../data/recipes/ManaInfusionProvider.java    |  1 -
 .../resources/assets/botania/lang/en_us.json  |  1 -
 .../en_us/entries/devices/mana_alchemy.json   | 29 +++++++------------
 5 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json

diff --git a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269
index 37253c9e4..a5a1678f2 100644
--- a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269
+++ b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269
@@ -25,7 +25,6 @@ ceca0dae725cff1bca93e23fd1e8dc8baf9dd4fe data/botania/recipes/mana_infusion/calc
fd176a9200155eb163c73ecdc2e6fdf37868c771 data/botania/recipes/mana_infusion/cherry_leaves_dupe.json
3e679f2e08e1285a4e14b8629c718abfb25ba3dc data/botania/recipes/mana_infusion/cherry_log_to_oak_log.json
ebda178cf528f07d1f1b7323089dece5899b3d04 data/botania/recipes/mana_infusion/cherry_sapling_to_oak_sapling.json
ef5a86af7a3ea575f7498a0b86a3ab8e242860e2 data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
8d18a6f31499831a17ee179bc6b05efe13c334a6 data/botania/recipes/mana_infusion/chorus_fruit_to_flower.json
c5d7e14e0dac7f26c8bbedc138df4ba3e273fca8 data/botania/recipes/mana_infusion/clay_deconstruct.json
05184f64748e5d381fcbaddcc9ecce2fbe23a6ab data/botania/recipes/mana_infusion/clayconia_chibi.json
diff --git a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
deleted file mode 100644
index 8ee7c9948..000000000
--- a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
@@ -1,14 +0,0 @@
{
  "type": "botania:mana_infusion",
  "catalyst": {
    "type": "block",
    "block": "botania:alchemy_catalyst"
  },
  "input": {
    "item": "minecraft:stone_bricks"
  },
  "mana": 150,
  "output": {
    "item": "minecraft:chiseled_stone_bricks"
  }
}
\ No newline at end of file
diff --git a/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java
index 84a831cc9..318f25e77 100644
--- a/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java
+++ b/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java
@@ -95,7 +95,6 @@ public void buildRecipes(Consumer<net.minecraft.data.recipes.FinishedRecipe> con
		consumer.accept(deconstruct("elf_quartz_deconstruct", BotaniaItems.elfQuartz, BotaniaBlocks.elfQuartz));
		consumer.accept(deconstruct("sunny_quartz_deconstruct", BotaniaItems.sunnyQuartz, BotaniaBlocks.sunnyQuartz));

		consumer.accept(FinishedRecipe.alchemy(id("chiseled_stone_bricks"), new ItemStack(Blocks.CHISELED_STONE_BRICKS, 1), ingr(Blocks.STONE_BRICKS), 150));
		consumer.accept(FinishedRecipe.alchemy(id("ice"), new ItemStack(Blocks.ICE), ingr(Blocks.SNOW_BLOCK), 2250));

		final String vineLilypadGroup = "botania:vine_and_lily_pad_cycle";
diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json
index 946ca0973..f6ec315f6 100644
--- a/Xplat/src/main/resources/assets/botania/lang/en_us.json
+++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json
@@ -2412,7 +2412,6 @@
  "botania.page.manaAlchemy5": "Breaking down $(item)Glowstone Blocks$(0)",
  "botania.page.manaAlchemy31": "Quartz",
  "botania.page.manaAlchemy6": "Breaking down $(item)Quartz Blocks$(0)",
  "botania.page.manaAlchemy7": "Creating $(item)Chiseled Stone Bricks$(0)",
  "botania.page.manaAlchemy8": "Compressing $(item)Snow$(0) into $(item)Ice$(0)",
  "botania.page.manaAlchemy32": "Vines & Lily Pad",
  "botania.page.manaAlchemy9": "Converting between $(item)Vines$(0) and $(item)Lilypads$(0)",
diff --git a/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json b/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json
index a3db640e7..affdc854e 100644
--- a/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json
+++ b/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json
@@ -39,10 +39,7 @@
    {
      "type": "botania:mana_infusion",
      "text": "botania.page.manaAlchemy5",
      "recipes": [
        "botania:mana_infusion/redstone_to_glowstone_dust",
        "botania:mana_infusion/glowstone_deconstruct"
      ]
      "recipes": "botania:mana_infusion/glowstone_deconstruct"
    },
    {
      "type": "botania:mana_infusion",
@@ -55,14 +52,10 @@
        "botania:mana_infusion/blaze_quartz_deconstruct",
        "botania:mana_infusion/lavender_quartz_deconstruct",
        "botania:mana_infusion/red_quartz_deconstruct",
        "botania:mana_infusion/elf_quartz_deconstruct"
        "botania:mana_infusion/elf_quartz_deconstruct",
        "botania:mana_infusion/sunny_quartz_deconstruct"
      ]
    },
    {
      "type": "botania:mana_infusion",
      "text": "botania.page.manaAlchemy7",
      "recipes": "botania:mana_infusion/chiseled_stone_bricks"
    },
    {
      "type": "botania:mana_infusion",
      "text": "botania.page.manaAlchemy8",
@@ -92,9 +85,7 @@
    {
      "type": "botania:mana_infusion",
      "text": "botania.page.manaAlchemy12",
      "recipes": [
        "botania:mana_infusion/potato_unpoison"
      ]
      "recipes": "botania:mana_infusion/potato_unpoison"
    },
    {
      "type": "botania:mana_infusion",
@@ -104,7 +95,10 @@
    {
      "type": "botania:mana_infusion",
      "text": "botania.page.manaAlchemy14",
      "recipes": "botania:mana_infusion/flint_to_gunpowder"
      "recipes": [
        "botania:mana_infusion/gunpowder_to_flint",
        "botania:mana_infusion/flint_to_gunpowder"
      ]
    },
    {
      "type": "botania:mana_infusion",
@@ -121,8 +115,8 @@
      "heading": "botania.page.manaAlchemy35",
      "text": "botania.page.manaAlchemy17",
      "recipes": [
        "botania:mana_infusion/cactus_to_slime",
        "botania:mana_infusion/slime_to_cactus"
        "botania:mana_infusion/slime_to_cactus",
        "botania:mana_infusion/cactus_to_slime"
      ]
    },
    {
@@ -136,8 +130,7 @@
      "text": "botania.page.manaAlchemy19",
      "recipes": [
        "botania:mana_infusion/glowstone_dust_to_redstone",
        "botania:mana_infusion/redstone_to_glowstone_dust",
        "botania:mana_infusion/glowstone_deconstruct"
        "botania:mana_infusion/redstone_to_glowstone_dust"
      ]
    },
    {
-- 
2.34.1

[botania/patches/linux.yml] build success

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CW3DFV8WNB4W.RJYKMJDR17E8@cirno2>
In-Reply-To
<20231008210229.6235-1-actuallyadarsh@gmail.com> (view parent)
DKIM signature
missing
Download raw message
botania/patches/linux.yml: SUCCESS in 19m18s

[Small alch catalyst lexicon entry changes][0] from [Adarsh][1]

[0]: https://lists.sr.ht/~williewillus/violet-moon/patches/45481
[1]: actuallyadarsh@gmail.com

✓ #1071226 SUCCESS botania/patches/linux.yml https://builds.sr.ht/~williewillus/job/1071226
Details
Message ID
<875y39b1nt.fsf@vincent-lee.net>
In-Reply-To
<20231008210229.6235-1-actuallyadarsh@gmail.com> (view parent)
DKIM signature
missing
Download raw message
Adarsh <actuallyadarsh@gmail.com> writes:

> Added sunny quartz deconstruction and gunpowder -> flint to entry, removed chiselled brick because the stonecutter exists, and fixed the glowstone recipes to show only the relevant recipes, #4460 for more info
> ---
>  .../8482c265eb392e1fe5c3863ee4f62f310932c269  |  1 -
>  .../mana_infusion/chiseled_stone_bricks.json  | 14 ---------
>  .../data/recipes/ManaInfusionProvider.java    |  1 -
>  .../resources/assets/botania/lang/en_us.json  |  1 -
>  .../en_us/entries/devices/mana_alchemy.json   | 29 +++++++------------
>  5 files changed, 11 insertions(+), 35 deletions(-)
>  delete mode 100644 Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
>
> diff --git a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269
> index 37253c9e4..a5a1678f2 100644
> --- a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269
> +++ b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269
> @@ -25,7 +25,6 @@ ceca0dae725cff1bca93e23fd1e8dc8baf9dd4fe data/botania/recipes/mana_infusion/calc
>  fd176a9200155eb163c73ecdc2e6fdf37868c771 data/botania/recipes/mana_infusion/cherry_leaves_dupe.json
>  3e679f2e08e1285a4e14b8629c718abfb25ba3dc data/botania/recipes/mana_infusion/cherry_log_to_oak_log.json
>  ebda178cf528f07d1f1b7323089dece5899b3d04 data/botania/recipes/mana_infusion/cherry_sapling_to_oak_sapling.json
> -ef5a86af7a3ea575f7498a0b86a3ab8e242860e2 data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
>  8d18a6f31499831a17ee179bc6b05efe13c334a6 data/botania/recipes/mana_infusion/chorus_fruit_to_flower.json
>  c5d7e14e0dac7f26c8bbedc138df4ba3e273fca8 data/botania/recipes/mana_infusion/clay_deconstruct.json
>  05184f64748e5d381fcbaddcc9ecce2fbe23a6ab data/botania/recipes/mana_infusion/clayconia_chibi.json
> diff --git a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json b/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
> deleted file mode 100644
> index 8ee7c9948..000000000
> --- a/Xplat/src/generated/resources/data/botania/recipes/mana_infusion/chiseled_stone_bricks.json
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -{
> -  "type": "botania:mana_infusion",
> -  "catalyst": {
> -    "type": "block",
> -    "block": "botania:alchemy_catalyst"
> -  },
> -  "input": {
> -    "item": "minecraft:stone_bricks"
> -  },
> -  "mana": 150,
> -  "output": {
> -    "item": "minecraft:chiseled_stone_bricks"
> -  }
> -}

I don't think we want to remove this, actually. The stonecutter is not
automatable in vanilla.

> \ No newline at end of file
> diff --git a/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java
> index 84a831cc9..318f25e77 100644
> --- a/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java
> +++ b/Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java
> @@ -95,7 +95,6 @@ public void buildRecipes(Consumer<net.minecraft.data.recipes.FinishedRecipe> con
>  		consumer.accept(deconstruct("elf_quartz_deconstruct", BotaniaItems.elfQuartz, BotaniaBlocks.elfQuartz));
>  		consumer.accept(deconstruct("sunny_quartz_deconstruct", BotaniaItems.sunnyQuartz, BotaniaBlocks.sunnyQuartz));
>  
> -		consumer.accept(FinishedRecipe.alchemy(id("chiseled_stone_bricks"), new ItemStack(Blocks.CHISELED_STONE_BRICKS, 1), ingr(Blocks.STONE_BRICKS), 150));
>  		consumer.accept(FinishedRecipe.alchemy(id("ice"), new ItemStack(Blocks.ICE), ingr(Blocks.SNOW_BLOCK), 2250));
>  
>  		final String vineLilypadGroup = "botania:vine_and_lily_pad_cycle";
> diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json
> index 946ca0973..f6ec315f6 100644
> --- a/Xplat/src/main/resources/assets/botania/lang/en_us.json
> +++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json
> @@ -2412,7 +2412,6 @@
>    "botania.page.manaAlchemy5": "Breaking down $(item)Glowstone Blocks$(0)",
>    "botania.page.manaAlchemy31": "Quartz",
>    "botania.page.manaAlchemy6": "Breaking down $(item)Quartz Blocks$(0)",
> -  "botania.page.manaAlchemy7": "Creating $(item)Chiseled Stone Bricks$(0)",
>    "botania.page.manaAlchemy8": "Compressing $(item)Snow$(0) into $(item)Ice$(0)",
>    "botania.page.manaAlchemy32": "Vines & Lily Pad",
>    "botania.page.manaAlchemy9": "Converting between $(item)Vines$(0) and $(item)Lilypads$(0)",
> diff --git a/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json b/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json
> index a3db640e7..affdc854e 100644
> --- a/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json
> +++ b/Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json
> @@ -39,10 +39,7 @@
>      {
>        "type": "botania:mana_infusion",
>        "text": "botania.page.manaAlchemy5",
> -      "recipes": [
> -        "botania:mana_infusion/redstone_to_glowstone_dust",
> -        "botania:mana_infusion/glowstone_deconstruct"
> -      ]
> +      "recipes": "botania:mana_infusion/glowstone_deconstruct"
>      },
>      {
>        "type": "botania:mana_infusion",
> @@ -55,14 +52,10 @@
>          "botania:mana_infusion/blaze_quartz_deconstruct",
>          "botania:mana_infusion/lavender_quartz_deconstruct",
>          "botania:mana_infusion/red_quartz_deconstruct",
> -        "botania:mana_infusion/elf_quartz_deconstruct"
> +        "botania:mana_infusion/elf_quartz_deconstruct",
> +        "botania:mana_infusion/sunny_quartz_deconstruct"
>        ]
>      },
> -    {
> -      "type": "botania:mana_infusion",
> -      "text": "botania.page.manaAlchemy7",
> -      "recipes": "botania:mana_infusion/chiseled_stone_bricks"
> -    },
>      {
>        "type": "botania:mana_infusion",
>        "text": "botania.page.manaAlchemy8",
> @@ -92,9 +85,7 @@
>      {
>        "type": "botania:mana_infusion",
>        "text": "botania.page.manaAlchemy12",
> -      "recipes": [
> -        "botania:mana_infusion/potato_unpoison"
> -      ]
> +      "recipes": "botania:mana_infusion/potato_unpoison"
>      },
>      {
>        "type": "botania:mana_infusion",
> @@ -104,7 +95,10 @@
>      {
>        "type": "botania:mana_infusion",
>        "text": "botania.page.manaAlchemy14",
> -      "recipes": "botania:mana_infusion/flint_to_gunpowder"
> +      "recipes": [
> +        "botania:mana_infusion/gunpowder_to_flint",
> +        "botania:mana_infusion/flint_to_gunpowder"
> +      ]
>      },
>      {
>        "type": "botania:mana_infusion",
> @@ -121,8 +115,8 @@
>        "heading": "botania.page.manaAlchemy35",
>        "text": "botania.page.manaAlchemy17",
>        "recipes": [
> -        "botania:mana_infusion/cactus_to_slime",
> -        "botania:mana_infusion/slime_to_cactus"
> +        "botania:mana_infusion/slime_to_cactus",
> +        "botania:mana_infusion/cactus_to_slime"

Any reason you flipped these? It's fine but wondering if there was a reason.

>        ]
>      },
>      {
> @@ -136,8 +130,7 @@
>        "text": "botania.page.manaAlchemy19",
>        "recipes": [
>          "botania:mana_infusion/glowstone_dust_to_redstone",
> -        "botania:mana_infusion/redstone_to_glowstone_dust",
> -        "botania:mana_infusion/glowstone_deconstruct"
> +        "botania:mana_infusion/redstone_to_glowstone_dust"
>        ]
>      },
>      {
Details
Message ID
<CAJSrJi9EemrHd_fFpWRg8+mad89qL5R=gupa6Dz1w4qmGJ96kg@mail.gmail.com>
In-Reply-To
<875y39b1nt.fsf@vincent-lee.net> (view parent)
DKIM signature
missing
Download raw message
> I don't think we want to remove this, actually. The stonecutter is not
> automatable in vanilla.

That's fine, will amend as requested. Wondering what Chiselled Stone
Bricks need a special recipe for though.

> Any reason you flipped these? It's fine but wondering if there was a reason.

Lexicon subheadings for these recipes list Slime and Gunpowder first,
was probably a bit nitpicky so apologies there

Also quick question, is it okay if I change the
"group":"botania:x_cycle" in this file to their individual recipes?
Currently when cycling through e.g. the crop alchemy recipes, although
the recipes show fine, they don't display sequentially (like Seeds ->
Potato, Potato -> Carrot etc.)
Reply to thread Export thread (mbox)