From c3ff13bce06f9b1081c4118ba7c499a599fc9f5b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 20 Jul 2017 20:53:00 -0500 Subject: [PATCH] More. recipes. --- .../common/crafting/ModCraftingRecipes.java | 45 +++++++++++++++---- .../botania/common/lexicon/LexiconData.java | 6 +-- .../botania/recipes/custombrick_10.json | 1 + .../botania/recipes/custombrick_11.json | 1 + .../botania/recipes/custombrick_12.json | 1 + .../botania/recipes/custombrick_13.json | 1 + .../botania/recipes/custombrick_14.json | 1 + .../botania/recipes/custombrick_15.json | 1 + .../botania/recipes/custombrick_4_alt.json | 1 + .../assets/botania/recipes/custombrick_5.json | 1 + .../assets/botania/recipes/custombrick_6.json | 1 + .../assets/botania/recipes/custombrick_7.json | 1 + .../assets/botania/recipes/custombrick_8.json | 1 + .../assets/botania/recipes/custombrick_9.json | 1 + .../assets/botania/recipes/mushroom_0.json | 1 + .../assets/botania/recipes/mushroom_1.json | 1 + .../assets/botania/recipes/mushroom_10.json | 1 + .../assets/botania/recipes/mushroom_11.json | 1 + .../assets/botania/recipes/mushroom_12.json | 1 + .../assets/botania/recipes/mushroom_13.json | 1 + .../assets/botania/recipes/mushroom_14.json | 1 + .../assets/botania/recipes/mushroom_15.json | 1 + .../assets/botania/recipes/mushroom_2.json | 1 + .../assets/botania/recipes/mushroom_3.json | 1 + .../assets/botania/recipes/mushroom_4.json | 1 + .../assets/botania/recipes/mushroom_5.json | 1 + .../assets/botania/recipes/mushroom_6.json | 1 + .../assets/botania/recipes/mushroom_7.json | 1 + .../assets/botania/recipes/mushroom_8.json | 1 + .../assets/botania/recipes/mushroom_9.json | 1 + 30 files changed, 67 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index fc9f662be..eb7ad7806 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -19,7 +19,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.common.Botania; @@ -147,7 +146,7 @@ public final class ModCraftingRecipes { public static ResourceLocation recipeEnderDagger; public static ResourceLocation recipeDarkQuartz; public static ResourceLocation recipeBlazeQuartz; - public static List recipesLavenderQuartz; + public static ResourceLocation recipeLavenderQuartz; public static ResourceLocation recipeRedQuartz; public static ResourceLocation recipeSunnyQuartz; public static ResourceLocation recipeAlfPortal; @@ -462,17 +461,18 @@ public final class ModCraftingRecipes { public static void init() { // Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet - recipesPetals = allOfGroup("petal"); + recipesPetals = allOfGroup(ModItems.petal.getRegistryName()); recipePestleAndMortar = ModItems.pestleAndMortar.getRegistryName(); - recipesDyes = allOfGroup("dye"); + recipesDyes = allOfGroup(ModItems.dye.getRegistryName()); recipeFertilizerPowder = gogPath("fertilizer_powder"); recipeFerilizerDye = path("fertilizer_dye"); recipesPetalsDouble = allOfGroup("petal_double"); - recipesPetalBlocks = allOfGroup("petalblock"); + recipesPetalBlocks = allOfGroup(ModBlocks.petalBlock.getRegistryName()); recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct"); recipeApothecary = path("altar_0"); recipeLexicon = ModItems.lexicon.getRegistryName(); + recipesTwigWand = allOfGroup(ModItems.twigWand.getRegistryName()); recipeLivingwoodTwig = path("manaresource_3"); recipeRuneAltar = ModBlocks.runeAltar.getRegistryName(); recipeTerraPlate = ModBlocks.terraPlate.getRegistryName(); @@ -486,7 +486,7 @@ public final class ModCraftingRecipes { recipeEndPortal = gogPath("end_portal_frame"); } - recipesSpreader = allOfGroup("spreader"); + recipesSpreader = allOfGroup(ModBlocks.spreader.getRegistryName()); recipePool = path("pool_0"); recipePoolDiluted = path("pool_2"); @@ -564,7 +564,7 @@ public final class ModCraftingRecipes { recipeFelPumpkin = ModBlocks.felPumpkin.getRegistryName(); recipeAnimatedTorch = ModBlocks.animatedTorch.getRegistryName(); recipeManaBlaster = ModItems.manaGun.getRegistryName(); - recipesAltGrassSeeds = allOfGroup("grassseeds"); + recipesAltGrassSeeds = allOfGroup(ModItems.grassSeeds.getRegistryName()); recipeDirtRod = ModItems.dirtRod.getRegistryName(); recipeTerraformRod = ModItems.terraformRod.getRegistryName(); recipeManasteelPick = ModItems.manasteelPick.getRegistryName(); @@ -704,6 +704,31 @@ public final class ModCraftingRecipes { recipeDreamwoodTwig = path("manaresource_13"); recipeGaiaPylon = path("pylon_2"); recipeGaiaIngot = path("manaresource_14"); + recipeLivingrockDecor1 = path("livingrock_1"); + recipeLivingrockDecor2 = path("livingrock_2"); + recipeLivingrockDecor3 = path("livingrock_3"); + recipeLivingrockDecor4 = path("livingrock_4"); + recipeLivingwoodDecor1 = path("livingwood_1"); + recipeLivingwoodDecor2 = path("livingwood_2"); + recipeLivingwoodDecor3 = path("livingwood_3"); + recipeLivingwoodDecor4 = path("livingwood_4"); + recipeLivingwoodDecor5 = path("livingwood_5"); + recipeDarkQuartz = path("quartz_0"); + recipeBlazeQuartz = path("quartz_2"); + recipeLavenderQuartz = path("quartz_3"); + recipeRedQuartz = path("quartz_4"); + recipeSunnyQuartz = path("quartz_6"); + recipesShinyFlowers = allOfGroup(ModBlocks.shinyFlower.getRegistryName()); + recipesMiniIsland = allOfGroup(ModBlocks.floatingFlower.getRegistryName()); + recipeAzulejo = path("custombrick_4"); + recipesAzulejoCycling = allOfGroup("azulejo_cycling"); + recipeStarfield = ModBlocks.starfield.getRegistryName(); + recipesMushrooms = allOfGroup(ModBlocks.mushroom.getRegistryName()); + recipePhantomInk = ModItems.phantomInk.getRegistryName(); + recipeBlazeBlock = gogPath("blazeblock"); + recipeCacophonium = ModItems.cacophonium.getRegistryName(); + recipesPavement = allOfGroup(ModFluffBlocks.pavement.getRegistryName()); + } private static ResourceLocation gogPath(String path) { @@ -719,7 +744,11 @@ public final class ModCraftingRecipes { } private static List allOfGroup(String group) { - String jsonGroup = LibMisc.MOD_ID + ":" + group; + return allOfGroup(new ResourceLocation(LibMisc.MOD_ID, group)); + } + + private static List allOfGroup(ResourceLocation group) { + String jsonGroup = group.toString(); return ForgeRegistries.RECIPES.getEntries().stream() .filter(e -> jsonGroup.equals(e.getValue().getGroup())) diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 81fcdbe7c..dd77447be 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1294,8 +1294,6 @@ public final class LexiconData { new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")) .setIcon(new ItemStack(Items.WRITABLE_BOOK)); - if(true) return; - if (ConfigHandler.relicsEnabled) { relics = new AlfheimLexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); relics.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.dice)); @@ -1339,7 +1337,7 @@ public final class LexiconData { new PageCraftingRecipe("11", ModCraftingRecipes.recipeDarkQuartz), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), - new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), + new PageCraftingRecipe("14", ModCraftingRecipes.recipeLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16")); else @@ -1355,7 +1353,7 @@ public final class LexiconData { new PageCraftingRecipe("9", ModCraftingRecipes.recipeLivingwoodDecor5), new PageText("10"), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), - new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), + new PageCraftingRecipe("14", ModCraftingRecipes.recipeLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz)); diff --git a/src/main/resources/assets/botania/recipes/custombrick_10.json b/src/main/resources/assets/botania/recipes/custombrick_10.json index 20b29c5b2..1d0247cb4 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_10.json +++ b/src/main/resources/assets/botania/recipes/custombrick_10.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 10 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_11.json b/src/main/resources/assets/botania/recipes/custombrick_11.json index 7e979f2ab..bcf169ba2 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_11.json +++ b/src/main/resources/assets/botania/recipes/custombrick_11.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 11 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_12.json b/src/main/resources/assets/botania/recipes/custombrick_12.json index c29069264..55e555ec4 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_12.json +++ b/src/main/resources/assets/botania/recipes/custombrick_12.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 12 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_13.json b/src/main/resources/assets/botania/recipes/custombrick_13.json index acebbc311..2e9f7a9ac 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_13.json +++ b/src/main/resources/assets/botania/recipes/custombrick_13.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 13 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_14.json b/src/main/resources/assets/botania/recipes/custombrick_14.json index b93c2eba9..1b26978cd 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_14.json +++ b/src/main/resources/assets/botania/recipes/custombrick_14.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 14 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_15.json b/src/main/resources/assets/botania/recipes/custombrick_15.json index dc20cfc98..49f3203a9 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_15.json +++ b/src/main/resources/assets/botania/recipes/custombrick_15.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 15 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_4_alt.json b/src/main/resources/assets/botania/recipes/custombrick_4_alt.json index 07fa70286..1c691c72c 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_4_alt.json +++ b/src/main/resources/assets/botania/recipes/custombrick_4_alt.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 4 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_5.json b/src/main/resources/assets/botania/recipes/custombrick_5.json index 7cbe5c5f3..faaaddd3f 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_5.json +++ b/src/main/resources/assets/botania/recipes/custombrick_5.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 5 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_6.json b/src/main/resources/assets/botania/recipes/custombrick_6.json index eccaa0e50..67b38711a 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_6.json +++ b/src/main/resources/assets/botania/recipes/custombrick_6.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 6 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_7.json b/src/main/resources/assets/botania/recipes/custombrick_7.json index 1c099c246..0a0dd4796 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_7.json +++ b/src/main/resources/assets/botania/recipes/custombrick_7.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 7 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_8.json b/src/main/resources/assets/botania/recipes/custombrick_8.json index ec43c1511..1cc97ca66 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_8.json +++ b/src/main/resources/assets/botania/recipes/custombrick_8.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 8 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/custombrick_9.json b/src/main/resources/assets/botania/recipes/custombrick_9.json index ecd4e0912..338175a8f 100644 --- a/src/main/resources/assets/botania/recipes/custombrick_9.json +++ b/src/main/resources/assets/botania/recipes/custombrick_9.json @@ -3,6 +3,7 @@ "item": "botania:custombrick", "data": 9 }, + "group": "botania:azulejo_cycling", "ingredients": [ { "item": "botania:custombrick", diff --git a/src/main/resources/assets/botania/recipes/mushroom_0.json b/src/main/resources/assets/botania/recipes/mushroom_0.json index d574a1dd7..deea9d02c 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_0.json +++ b/src/main/resources/assets/botania/recipes/mushroom_0.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 0 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_1.json b/src/main/resources/assets/botania/recipes/mushroom_1.json index 15cca1621..fe9e539ca 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_1.json +++ b/src/main/resources/assets/botania/recipes/mushroom_1.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 1 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_10.json b/src/main/resources/assets/botania/recipes/mushroom_10.json index ccab824f0..851fe4e01 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_10.json +++ b/src/main/resources/assets/botania/recipes/mushroom_10.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 10 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_11.json b/src/main/resources/assets/botania/recipes/mushroom_11.json index f577004dd..c97fc8ebb 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_11.json +++ b/src/main/resources/assets/botania/recipes/mushroom_11.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 11 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_12.json b/src/main/resources/assets/botania/recipes/mushroom_12.json index 859ed96c7..e3f4e18c8 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_12.json +++ b/src/main/resources/assets/botania/recipes/mushroom_12.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 12 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_13.json b/src/main/resources/assets/botania/recipes/mushroom_13.json index 3d9e3ff48..0cda1a2b6 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_13.json +++ b/src/main/resources/assets/botania/recipes/mushroom_13.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 13 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_14.json b/src/main/resources/assets/botania/recipes/mushroom_14.json index 91637e7fd..e0df3f8a4 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_14.json +++ b/src/main/resources/assets/botania/recipes/mushroom_14.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 14 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_15.json b/src/main/resources/assets/botania/recipes/mushroom_15.json index c32a0fcac..dc4d387ef 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_15.json +++ b/src/main/resources/assets/botania/recipes/mushroom_15.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 15 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_2.json b/src/main/resources/assets/botania/recipes/mushroom_2.json index 1ddbf16d6..c56cca362 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_2.json +++ b/src/main/resources/assets/botania/recipes/mushroom_2.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 2 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_3.json b/src/main/resources/assets/botania/recipes/mushroom_3.json index 632e0356a..c07b4f540 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_3.json +++ b/src/main/resources/assets/botania/recipes/mushroom_3.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 3 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_4.json b/src/main/resources/assets/botania/recipes/mushroom_4.json index 0c07f4800..c0cba9ce3 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_4.json +++ b/src/main/resources/assets/botania/recipes/mushroom_4.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 4 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_5.json b/src/main/resources/assets/botania/recipes/mushroom_5.json index 648b5490f..79f8e683d 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_5.json +++ b/src/main/resources/assets/botania/recipes/mushroom_5.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 5 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_6.json b/src/main/resources/assets/botania/recipes/mushroom_6.json index bf758fe0f..b065f36aa 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_6.json +++ b/src/main/resources/assets/botania/recipes/mushroom_6.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 6 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_7.json b/src/main/resources/assets/botania/recipes/mushroom_7.json index d3f2239e5..6e60c3cbd 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_7.json +++ b/src/main/resources/assets/botania/recipes/mushroom_7.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 7 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_8.json b/src/main/resources/assets/botania/recipes/mushroom_8.json index 5cf12aa8e..3409c13a6 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_8.json +++ b/src/main/resources/assets/botania/recipes/mushroom_8.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 8 }, + "group": "botania:mushroom", "ingredients": [ [ { diff --git a/src/main/resources/assets/botania/recipes/mushroom_9.json b/src/main/resources/assets/botania/recipes/mushroom_9.json index 68797d335..9fad2c137 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_9.json +++ b/src/main/resources/assets/botania/recipes/mushroom_9.json @@ -3,6 +3,7 @@ "item": "botania:mushroom", "data": 9 }, + "group": "botania:mushroom", "ingredients": [ [ {