diff --git a/garden_of_glass/src/main/resources/data/botania/recipes/petal_apothecary/orechid.json b/garden_of_glass/src/main/resources/data/botania/recipes/petal_apothecary/orechid.json new file mode 100644 index 000000000..494501755 --- /dev/null +++ b/garden_of_glass/src/main/resources/data/botania/recipes/petal_apothecary/orechid.json @@ -0,0 +1,32 @@ +{ + "type": "botania:petal_apothecary", + "output": { + "item": "botania:orechid" + }, + "ingredients": [ + { + "tag": "botania:petals/gray" + }, + { + "tag": "botania:petals/gray" + }, + { + "tag": "botania:petals/yellow" + }, + { + "tag": "botania:petals/yellow" + }, + { + "tag": "botania:petals/green" + }, + { + "tag": "botania:petals/green" + }, + { + "tag": "botania:petals/red" + }, + { + "tag": "botania:petals/red" + } + ] +} diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 3d170e2f0..279e0f240 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -115,7 +115,6 @@ public final class ConfigHandler { public final ForgeConfigSpec.BooleanValue flowerForceCheck; public final ForgeConfigSpec.BooleanValue enderPickpocketEnabled; - public final ForgeConfigSpec.BooleanValue fallenKanadeEnabled; public final ForgeConfigSpec.BooleanValue enchanterEnabled; public final ForgeConfigSpec.BooleanValue fluxfieldEnabled; public final ForgeConfigSpec.BooleanValue relicsEnabled; @@ -158,9 +157,6 @@ public final class ConfigHandler { enderPickpocketEnabled = builder .comment("Set to false to disable the ability for the Hand of Ender to pickpocket other players' ender chests") .define("enderPickpocket.enabled", true); - fallenKanadeEnabled = builder - .comment("Set this to false to disable the Fallen Kanade flower (gives Regeneration). This config option is here for those using Blood Magic. Note: Turning this off will not remove ones already in the world, it'll simply prevent the crafting.") - .define("fallenKanade.enabled", true); enchanterEnabled = builder .comment("Set this to false to disable the Mana Enchanter. Since some people find it OP or something. This only disables the entry and creation. Old ones that are already in the world will stay.") .define("manaEnchanter.enabled", true); diff --git a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java index bcf843c33..a9118524d 100644 --- a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java @@ -99,16 +99,9 @@ public class PetalProvider extends RecipeProvider { consumer.accept(make(ModSubtiles.tigerseye, yellow, brown, orange, lime, runeAutumn)); consumer.accept(make(ModSubtiles.orechid, gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust)); - // todo 1.15 - if (Botania.gardenOfGlassLoaded) { - consumer.accept(make(ModSubtiles.orechid, gray, gray, yellow, yellow, green, green, red, red)); - } consumer.accept(make(ModSubtiles.orechidIgnem, red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust)); - // todo 1.15 config flag - if (ConfigHandler.COMMON.fallenKanadeEnabled.get()) { - consumer.accept(make(ModSubtiles.fallenKanade, white, white, yellow, yellow, orange, runeSpring)); - } + consumer.accept(make(ModSubtiles.fallenKanade, white, white, yellow, yellow, orange, runeSpring)); consumer.accept(make(ModSubtiles.exoflame, red, red, gray, lightGray, runeFire, runeSummer)); consumer.accept(make(ModSubtiles.agricarnation, lime, lime, green, yellow, runeSpring, redstoneRoot)); consumer.accept(make(ModSubtiles.hopperhock, gray, gray, lightGray, lightGray, runeAir, redstoneRoot));