From 6ba1436ac010d793d3ad86376e0cd35b3108c834 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 9 Sep 2019 00:11:26 -0500 Subject: [PATCH] Fix improper dumping of registry names in brew entries --- .../common/crafting/ModBrewRecipes.java | 2 +- .../en_us/entries/devices/brewery.json | 65 ++++--------------- .../en_us/entries/devices/complex_brews.json | 35 ++-------- .../en_us/entries/misc/tc_integration.json | 5 +- 4 files changed, 22 insertions(+), 85 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 7b520cf61..617dd61d0 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -45,7 +45,7 @@ public class ModBrewRecipes { evt.brew().accept(new RecipeBrew(prefix("healing"), ModBrews.healing, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GLISTERING_MELON_SLICE), Ingredient.fromItems(Items.POTATO))); evt.brew().accept(new RecipeBrew(prefix("jump_boost"), ModBrews.jumpBoost, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.FEATHER), Ingredient.fromItems(Items.CARROT))); evt.brew().accept(new RecipeBrew(prefix("regeneration"), ModBrews.regen, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromItems(Items.GLOWSTONE_DUST))); - evt.brew().accept(new RecipeBrew(prefix("weak_regenreation"), ModBrews.regenWeak, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromItems(Items.REDSTONE))); + evt.brew().accept(new RecipeBrew(prefix("weak_regeneration"), ModBrews.regenWeak, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromItems(Items.REDSTONE))); evt.brew().accept(new RecipeBrew(prefix("resistance"), ModBrews.resistance, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.IRON_INGOT), Ingredient.fromItems(Items.LEATHER))); evt.brew().accept(new RecipeBrew(prefix("fire_resistance"), ModBrews.fireResistance, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.MAGMA_CREAM), Ingredient.fromItems(Blocks.NETHERRACK))); evt.brew().accept(new RecipeBrew(prefix("water_breathing"), ModBrews.waterBreathing, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.GLOWSTONE_DUST))); diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json index cd1d27b52..ed63a27c0 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/brewery.json @@ -28,106 +28,67 @@ { "type": "brew", "text": "botania.page.brewery5b", - "recipe": { - "namespace": "botania", - "path": "speed" - } + "recipe": "botania:speed" }, { "type": "brew", "text": "botania.page.brewery6b", - "recipe": { - "namespace": "botania", - "path": "strength" - } + "recipe": "botania:strength" }, { "type": "brew", "text": "botania.page.brewery7b", - "recipe": { - "namespace": "botania", - "path": "haste" - } + "recipe": "botania:haste" }, { "type": "brew", "text": "botania.page.brewery8b", - "recipe": { - "namespace": "botania", - "path": "healing" - } + "recipe": "botania:healing" }, { "type": "brew", "text": "botania.page.brewery9b", - "recipe": { - "namespace": "botania", - "path": "jump_boost" - } + "recipe": "botania:jump_boost" }, { "type": "brew", "text": "botania.page.brewery10b", - "recipe": { - "namespace": "botania", - "path": "regeneration" - } + "recipe": "botania:regeneration" }, { "type": "brew", "text": "botania.page.brewery17b", - "recipe": { - "namespace": "botania", - "path": "weak_regenreation" - } + "recipe": "botania:weak_regeneration" }, { "type": "brew", "text": "botania.page.brewery11b", - "recipe": { - "namespace": "botania", - "path": "resistance" - } + "recipe": "botania:resistance" }, { "type": "brew", "text": "botania.page.brewery12b", - "recipe": { - "namespace": "botania", - "path": "fire_resistance" - } + "recipe": "botania:fire_resistance" }, { "type": "brew", "text": "botania.page.brewery13b", - "recipe": { - "namespace": "botania", - "path": "water_breathing" - } + "recipe": "botania:water_breathing" }, { "type": "brew", "text": "botania.page.brewery14b", - "recipe": { - "namespace": "botania", - "path": "invisibility" - } + "recipe": "botania:invisibility" }, { "type": "brew", "text": "botania.page.brewery15b", - "recipe": { - "namespace": "botania", - "path": "night_vision" - } + "recipe": "botania:night_vision" }, { "type": "brew", "text": "botania.page.brewery16b", - "recipe": { - "namespace": "botania", - "path": "absorption" - } + "recipe": "botania:absorption" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json index fe90cc6a1..620fb2df4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/complex_brews.json @@ -10,58 +10,37 @@ { "type": "brew", "text": "botania.page.complexBrews1b", - "recipe": { - "namespace": "botania", - "path": "overload" - } + "recipe": "botania:overload" }, { "type": "brew", "text": "botania.page.complexBrews2b", - "recipe": { - "namespace": "botania", - "path": "soul_cross" - } + "recipe": "botania:soul_cross" }, { "type": "brew", "text": "botania.page.complexBrews3b", - "recipe": { - "namespace": "botania", - "path": "feather_feet" - } + "recipe": "botania:feather_feet" }, { "type": "brew", "text": "botania.page.complexBrews4b", - "recipe": { - "namespace": "botania", - "path": "emptiness" - } + "recipe": "botania:emptiness" }, { "type": "brew", "text": "botania.page.complexBrews5b", - "recipe": { - "namespace": "botania", - "path": "bloodthirst" - } + "recipe": "botania:bloodthirst" }, { "type": "brew", "text": "botania.page.complexBrews6b", - "recipe": { - "namespace": "botania", - "path": "allure" - } + "recipe": "botania:allure" }, { "type": "brew", "text": "botania.page.complexBrews7b", - "recipe": { - "namespace": "botania", - "path": "clear" - } + "recipe": "botania:clear" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json index 1002474f9..be226f916 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json @@ -34,10 +34,7 @@ { "type": "brew", "text": "botania.page.tcIntegration6b", - "recipe": { - "namespace": "botania", - "path": "dummy" - } + "recipe": "botania:dummy" } ] } \ No newline at end of file