diff --git a/src/generated/resources/data/botania/recipes/petal/agricarnation.json b/src/generated/resources/data/botania/recipes/petal_apothecary/agricarnation.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/agricarnation.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/agricarnation.json diff --git a/src/generated/resources/data/botania/recipes/petal/bellethorn.json b/src/generated/resources/data/botania/recipes/petal_apothecary/bellethorn.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/bellethorn.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/bellethorn.json diff --git a/src/generated/resources/data/botania/recipes/petal/bergamute.json b/src/generated/resources/data/botania/recipes/petal_apothecary/bergamute.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/bergamute.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/bergamute.json diff --git a/src/generated/resources/data/botania/recipes/petal/bubbell.json b/src/generated/resources/data/botania/recipes/petal_apothecary/bubbell.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/bubbell.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/bubbell.json diff --git a/src/generated/resources/data/botania/recipes/petal/clayconia.json b/src/generated/resources/data/botania/recipes/petal_apothecary/clayconia.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/clayconia.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/clayconia.json diff --git a/src/generated/resources/data/botania/recipes/petal/daffomill.json b/src/generated/resources/data/botania/recipes/petal_apothecary/daffomill.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/daffomill.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/daffomill.json diff --git a/src/generated/resources/data/botania/recipes/petal/dandelifeon.json b/src/generated/resources/data/botania/recipes/petal_apothecary/dandelifeon.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/dandelifeon.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/dandelifeon.json diff --git a/src/generated/resources/data/botania/recipes/petal/dreadthorn.json b/src/generated/resources/data/botania/recipes/petal_apothecary/dreadthorn.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/dreadthorn.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/dreadthorn.json diff --git a/src/generated/resources/data/botania/recipes/petal/endoflame.json b/src/generated/resources/data/botania/recipes/petal_apothecary/endoflame.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/endoflame.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/endoflame.json diff --git a/src/generated/resources/data/botania/recipes/petal/entropinnyum.json b/src/generated/resources/data/botania/recipes/petal_apothecary/entropinnyum.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/entropinnyum.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/entropinnyum.json diff --git a/src/generated/resources/data/botania/recipes/petal/exoflame.json b/src/generated/resources/data/botania/recipes/petal_apothecary/exoflame.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/exoflame.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/exoflame.json diff --git a/src/generated/resources/data/botania/recipes/petal/fallen_kanade.json b/src/generated/resources/data/botania/recipes/petal_apothecary/fallen_kanade.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/fallen_kanade.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/fallen_kanade.json diff --git a/src/generated/resources/data/botania/recipes/petal/gourmaryllis.json b/src/generated/resources/data/botania/recipes/petal_apothecary/gourmaryllis.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/gourmaryllis.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/gourmaryllis.json diff --git a/src/generated/resources/data/botania/recipes/petal/heisei_dream.json b/src/generated/resources/data/botania/recipes/petal_apothecary/heisei_dream.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/heisei_dream.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/heisei_dream.json diff --git a/src/generated/resources/data/botania/recipes/petal/hopperhock.json b/src/generated/resources/data/botania/recipes/petal_apothecary/hopperhock.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/hopperhock.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/hopperhock.json diff --git a/src/generated/resources/data/botania/recipes/petal/hyacidus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/hyacidus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/hyacidus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/hyacidus.json diff --git a/src/generated/resources/data/botania/recipes/petal/hydroangeas.json b/src/generated/resources/data/botania/recipes/petal_apothecary/hydroangeas.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/hydroangeas.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/hydroangeas.json diff --git a/src/generated/resources/data/botania/recipes/petal/jaded_amaranthus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/jaded_amaranthus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/jaded_amaranthus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/jaded_amaranthus.json diff --git a/src/generated/resources/data/botania/recipes/petal/jiyuulia.json b/src/generated/resources/data/botania/recipes/petal_apothecary/jiyuulia.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/jiyuulia.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/jiyuulia.json diff --git a/src/generated/resources/data/botania/recipes/petal/kekimurus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/kekimurus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/kekimurus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/kekimurus.json diff --git a/src/generated/resources/data/botania/recipes/petal/loonium.json b/src/generated/resources/data/botania/recipes/petal_apothecary/loonium.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/loonium.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/loonium.json diff --git a/src/generated/resources/data/botania/recipes/petal/manastar.json b/src/generated/resources/data/botania/recipes/petal_apothecary/manastar.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/manastar.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/manastar.json diff --git a/src/generated/resources/data/botania/recipes/petal/marimorphosis.json b/src/generated/resources/data/botania/recipes/petal_apothecary/marimorphosis.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/marimorphosis.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/marimorphosis.json diff --git a/src/generated/resources/data/botania/recipes/petal/medumone.json b/src/generated/resources/data/botania/recipes/petal_apothecary/medumone.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/medumone.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/medumone.json diff --git a/src/generated/resources/data/botania/recipes/petal/munchdew.json b/src/generated/resources/data/botania/recipes/petal_apothecary/munchdew.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/munchdew.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/munchdew.json diff --git a/src/generated/resources/data/botania/recipes/petal/narslimmus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/narslimmus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/narslimmus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/narslimmus.json diff --git a/src/generated/resources/data/botania/recipes/petal/orechid.json b/src/generated/resources/data/botania/recipes/petal_apothecary/orechid.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/orechid.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/orechid.json diff --git a/src/generated/resources/data/botania/recipes/petal/orechid_ignem.json b/src/generated/resources/data/botania/recipes/petal_apothecary/orechid_ignem.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/orechid_ignem.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/orechid_ignem.json diff --git a/src/generated/resources/data/botania/recipes/petal/pollidisiac.json b/src/generated/resources/data/botania/recipes/petal_apothecary/pollidisiac.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/pollidisiac.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/pollidisiac.json diff --git a/src/generated/resources/data/botania/recipes/petal/pure_daisy.json b/src/generated/resources/data/botania/recipes/petal_apothecary/pure_daisy.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/pure_daisy.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/pure_daisy.json diff --git a/src/generated/resources/data/botania/recipes/petal/rafflowsia.json b/src/generated/resources/data/botania/recipes/petal_apothecary/rafflowsia.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/rafflowsia.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/rafflowsia.json diff --git a/src/generated/resources/data/botania/recipes/petal/rannuncarpus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/rannuncarpus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/rannuncarpus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/rannuncarpus.json diff --git a/src/generated/resources/data/botania/recipes/petal/rosa_arcana.json b/src/generated/resources/data/botania/recipes/petal_apothecary/rosa_arcana.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/rosa_arcana.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/rosa_arcana.json diff --git a/src/generated/resources/data/botania/recipes/petal/shulk_me_not.json b/src/generated/resources/data/botania/recipes/petal_apothecary/shulk_me_not.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/shulk_me_not.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/shulk_me_not.json diff --git a/src/generated/resources/data/botania/recipes/petal/solegnolia.json b/src/generated/resources/data/botania/recipes/petal_apothecary/solegnolia.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/solegnolia.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/solegnolia.json diff --git a/src/generated/resources/data/botania/recipes/petal/spectranthemum.json b/src/generated/resources/data/botania/recipes/petal_apothecary/spectranthemum.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/spectranthemum.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/spectranthemum.json diff --git a/src/generated/resources/data/botania/recipes/petal/spectrolus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/spectrolus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/spectrolus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/spectrolus.json diff --git a/src/generated/resources/data/botania/recipes/petal/tangleberrie.json b/src/generated/resources/data/botania/recipes/petal_apothecary/tangleberrie.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/tangleberrie.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/tangleberrie.json diff --git a/src/generated/resources/data/botania/recipes/petal/thermalily.json b/src/generated/resources/data/botania/recipes/petal_apothecary/thermalily.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/thermalily.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/thermalily.json diff --git a/src/generated/resources/data/botania/recipes/petal/tigerseye.json b/src/generated/resources/data/botania/recipes/petal_apothecary/tigerseye.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/tigerseye.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/tigerseye.json diff --git a/src/generated/resources/data/botania/recipes/petal/vazkii_head.json b/src/generated/resources/data/botania/recipes/petal_apothecary/vazkii_head.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/vazkii_head.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/vazkii_head.json diff --git a/src/generated/resources/data/botania/recipes/petal/vinculotus.json b/src/generated/resources/data/botania/recipes/petal_apothecary/vinculotus.json similarity index 100% rename from src/generated/resources/data/botania/recipes/petal/vinculotus.json rename to src/generated/resources/data/botania/recipes/petal_apothecary/vinculotus.json diff --git a/src/generated/resources/data/botania/recipes/rune/air.json b/src/generated/resources/data/botania/recipes/runic_altar/air.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/air.json rename to src/generated/resources/data/botania/recipes/runic_altar/air.json diff --git a/src/generated/resources/data/botania/recipes/rune/autumn.json b/src/generated/resources/data/botania/recipes/runic_altar/autumn.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/autumn.json rename to src/generated/resources/data/botania/recipes/runic_altar/autumn.json diff --git a/src/generated/resources/data/botania/recipes/rune/earth.json b/src/generated/resources/data/botania/recipes/runic_altar/earth.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/earth.json rename to src/generated/resources/data/botania/recipes/runic_altar/earth.json diff --git a/src/generated/resources/data/botania/recipes/rune/envy.json b/src/generated/resources/data/botania/recipes/runic_altar/envy.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/envy.json rename to src/generated/resources/data/botania/recipes/runic_altar/envy.json diff --git a/src/generated/resources/data/botania/recipes/rune/fire.json b/src/generated/resources/data/botania/recipes/runic_altar/fire.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/fire.json rename to src/generated/resources/data/botania/recipes/runic_altar/fire.json diff --git a/src/generated/resources/data/botania/recipes/rune/gluttony.json b/src/generated/resources/data/botania/recipes/runic_altar/gluttony.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/gluttony.json rename to src/generated/resources/data/botania/recipes/runic_altar/gluttony.json diff --git a/src/generated/resources/data/botania/recipes/rune/greed.json b/src/generated/resources/data/botania/recipes/runic_altar/greed.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/greed.json rename to src/generated/resources/data/botania/recipes/runic_altar/greed.json diff --git a/src/generated/resources/data/botania/recipes/rune/head.json b/src/generated/resources/data/botania/recipes/runic_altar/head.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/head.json rename to src/generated/resources/data/botania/recipes/runic_altar/head.json diff --git a/src/generated/resources/data/botania/recipes/rune/lust.json b/src/generated/resources/data/botania/recipes/runic_altar/lust.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/lust.json rename to src/generated/resources/data/botania/recipes/runic_altar/lust.json diff --git a/src/generated/resources/data/botania/recipes/rune/mana.json b/src/generated/resources/data/botania/recipes/runic_altar/mana.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/mana.json rename to src/generated/resources/data/botania/recipes/runic_altar/mana.json diff --git a/src/generated/resources/data/botania/recipes/rune/pride.json b/src/generated/resources/data/botania/recipes/runic_altar/pride.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/pride.json rename to src/generated/resources/data/botania/recipes/runic_altar/pride.json diff --git a/src/generated/resources/data/botania/recipes/rune/sloth.json b/src/generated/resources/data/botania/recipes/runic_altar/sloth.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/sloth.json rename to src/generated/resources/data/botania/recipes/runic_altar/sloth.json diff --git a/src/generated/resources/data/botania/recipes/rune/spring.json b/src/generated/resources/data/botania/recipes/runic_altar/spring.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/spring.json rename to src/generated/resources/data/botania/recipes/runic_altar/spring.json diff --git a/src/generated/resources/data/botania/recipes/rune/summer.json b/src/generated/resources/data/botania/recipes/runic_altar/summer.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/summer.json rename to src/generated/resources/data/botania/recipes/runic_altar/summer.json diff --git a/src/generated/resources/data/botania/recipes/rune/water.json b/src/generated/resources/data/botania/recipes/runic_altar/water.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/water.json rename to src/generated/resources/data/botania/recipes/runic_altar/water.json diff --git a/src/generated/resources/data/botania/recipes/rune/winter.json b/src/generated/resources/data/botania/recipes/runic_altar/winter.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/winter.json rename to src/generated/resources/data/botania/recipes/runic_altar/winter.json diff --git a/src/generated/resources/data/botania/recipes/rune/wrath.json b/src/generated/resources/data/botania/recipes/runic_altar/wrath.json similarity index 100% rename from src/generated/resources/data/botania/recipes/rune/wrath.json rename to src/generated/resources/data/botania/recipes/runic_altar/wrath.json diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 5ad1cfed8..68b654ffa 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -194,7 +194,7 @@ public class RecipeBrew implements IRecipe { @Override public void write(@Nonnull PacketBuffer buf, @Nonnull RecipeBrew recipe) { - buf.writeResourceLocation(recipe.getBrew().getRegistryName()); + buf.writeRegistryIdUnsafe(BotaniaAPI.brewRegistry, recipe.getBrew()); buf.writeVarInt(recipe.getIngredients().size()); for (Ingredient input : recipe.getIngredients()) { input.write(buf); diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java index 2c5cea819..eed7ee86f 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java @@ -12,6 +12,7 @@ import com.google.gson.annotations.SerializedName; import net.minecraft.client.Minecraft; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; @@ -34,13 +35,17 @@ public class RotatingRecipeComponent extends RotatingItemListComponentBase { protected List makeIngredients() { Map> map; if ("runic_altar".equals(recipeType)) { - map = Collections.emptyMap(); // BotaniaAPI.runeAltarRecipes; + map = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.RUNE_TYPE); } else if ("petal_apothecary".equals(recipeType)) { map = Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.PETAL_TYPE); } else { throw new IllegalArgumentException("Type must be 'runic_altar' or 'petal_apothecary'!"); } - return map.get(new ResourceLocation(recipeName)).getIngredients(); + IRecipe recipe = map.get(new ResourceLocation(recipeName)); + if (recipe == null) { + throw new RuntimeException("Missing recipe " + recipeName); + } + return recipe.getIngredients(); } @Override diff --git a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java index 2dca92418..bcf843c33 100644 --- a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java @@ -144,7 +144,7 @@ public class PetalProvider extends RecipeProvider { } private static ResourceLocation idFor(ResourceLocation name) { - return new ResourceLocation(name.getNamespace(), "petal/" + name.getPath()); + return new ResourceLocation(name.getNamespace(), "petal_apothecary/" + name.getPath()); } private static class FinishedRecipe implements IFinishedRecipe { diff --git a/src/main/java/vazkii/botania/data/recipes/RuneProvider.java b/src/main/java/vazkii/botania/data/recipes/RuneProvider.java index 3c996271d..64481a370 100644 --- a/src/main/java/vazkii/botania/data/recipes/RuneProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RuneProvider.java @@ -87,7 +87,7 @@ public class RuneProvider extends RecipeProvider { } private static ResourceLocation idFor(String s) { - return prefix("rune/" + s); + return prefix("runic_altar/" + s); } private static class FinishedRecipe implements IFinishedRecipe {