diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ccd5e1f36..5fcb0b7bc 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -82,6 +82,7 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; import vazkii.botania.common.network.PacketHandler; @@ -146,7 +147,7 @@ public class Botania { ModManaInfusionRecipes.init(); ModElvenTradeRecipes.init(); ModBrewRecipes.init(); - // LexiconData.init(); todo 1.12 + LexiconData.init(); NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); @@ -184,7 +185,7 @@ public class Botania { ModBlocks.addDispenserBehaviours(); ConfigHandler.loadPostInit(); - // LexiconData.postInit(); todo 1.12 + LexiconData.postInit(); int words = 0; for(LexiconEntry entry : BotaniaAPI.getAllEntries()) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ed835bcb1..03e41c45f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -10,32 +10,17 @@ */ package vazkii.botania.common.crafting; -import com.google.common.collect.ImmutableMap; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; 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.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.tile.TileCraftCrate; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; @@ -55,294 +40,284 @@ import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; -import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; @Mod.EventBusSubscriber public final class ModCraftingRecipes { - public static IRecipe recipeLexicon; - public static List recipesPetals; - public static List recipesDyes; - public static List recipesDyesVanilla; - public static List recipesPetalBlocks; - public static List recipesReversePetalBlocks; - public static IRecipe recipePestleAndMortar; - public static List recipesTwigWand; - public static List recipesApothecary; - public static List recipesSpreader; - public static List recipesManaLens; - public static IRecipe recipePool; - public static IRecipe recipePoolDiluted; - public static IRecipe recipePoolFabulous; - public static List recipesRuneAltar; - public static IRecipe recipeLensVelocity; - public static IRecipe recipeLensPotency; - public static IRecipe recipeLensResistance; - public static IRecipe recipeLensEfficiency; - public static IRecipe recipeLensBounce; - public static IRecipe recipeLensGravity; - public static IRecipe recipeLensBore; - public static IRecipe recipeLensDamaging; - public static IRecipe recipeLensPhantom; - public static IRecipe recipeLensMagnet; - public static IRecipe recipeLensExplosive; - public static IRecipe recipePylon; - public static IRecipe recipeDistributor; - public static IRecipe recipeLivingrockDecor1; - public static IRecipe recipeLivingrockDecor2; - public static IRecipe recipeLivingrockDecor3; - public static IRecipe recipeLivingrockDecor4; - public static IRecipe recipeLivingwoodDecor1; - public static IRecipe recipeLivingwoodDecor2; - public static IRecipe recipeLivingwoodDecor3; - public static IRecipe recipeLivingwoodDecor4; - public static IRecipe recipeLivingwoodDecor5; - public static IRecipe recipeManaVoid; - public static List recipesManaTablet; - public static IRecipe recipeManaDetector; - public static IRecipe recipeManaBlaster; - public static IRecipe recipeTurntable; - public static IRecipe recipeFertilizerPowder; - public static IRecipe recipeFerilizerDye; - public static IRecipe recipeLivingwoodTwig; - public static IRecipe recipeDirtRod; - public static IRecipe recipeTerraformRod; - public static IRecipe recipeRedstoneSpreader; - public static IRecipe recipeManaMirror; - public static IRecipe recipeManasteelHelm; - public static IRecipe recipeManasteelChest; - public static IRecipe recipeManasteelLegs; - public static IRecipe recipeManasteelBoots; - public static IRecipe recipeManasteelPick; - public static IRecipe recipeManasteelShovel; - public static IRecipe recipeManasteelAxe; - public static IRecipe recipeManasteelShears; - public static IRecipe recipeManasteelSword; - public static IRecipe recipeGrassHorn; - public static IRecipe recipeTerrasteelHelm; - public static IRecipe recipeTerrasteelChest; - public static IRecipe recipeTerrasteelLegs; - public static IRecipe recipeTerrasteelBoots; - public static IRecipe recipeTerraSword; - public static IRecipe recipeTinyPlanet; - public static IRecipe recipeManaRing; - public static IRecipe recipeAuraRing; - public static IRecipe recipeGreaterManaRing; - public static IRecipe recipeGreaterAuraRing; - public static IRecipe recipeTravelBelt; - public static IRecipe recipeKnocbackBelt; - public static IRecipe recipeIcePendant; - public static IRecipe recipeFirePendant; - public static IRecipe recipeTinyPlanetBlock; - public static IRecipe recipeAlchemyCatalyst; - public static IRecipe recipeOpenCrate; - public static IRecipe recipeForestEye; - public static IRecipe recipeRedstoneRoot; - public static IRecipe recipeForestDrum; - public static IRecipe recipeWaterRing; - public static IRecipe recipeMiningRing; - public static IRecipe recipeMagnetRing; - public static IRecipe recipeTerraPick; - public static IRecipe recipeDivaCharm; - public static IRecipe recipeFlightTiara; - public static List recipesShinyFlowers; - public static IRecipe recipePlatform; - public static IRecipe recipeEnderDagger; - public static IRecipe recipeDarkQuartz; - public static IRecipe recipeBlazeQuartz; - public static List recipesLavenderQuartz; - public static IRecipe recipeRedQuartz; - public static IRecipe recipeSunnyQuartz; - public static IRecipe recipeAlfPortal; - public static IRecipe recipeNaturaPylon; - public static IRecipe recipeWaterRod; - public static IRecipe recipeElementiumHelm; - public static IRecipe recipeElementiumChest; - public static IRecipe recipeElementiumLegs; - public static IRecipe recipeElementiumBoots; - public static IRecipe recipeElementiumPick; - public static IRecipe recipeElementiumShovel; - public static IRecipe recipeElementiumAxe; - public static IRecipe recipeElementiumShears; - public static IRecipe recipeElementiumSword; - public static IRecipe recipeOpenBucket; - public static IRecipe recipeConjurationCatalyst; - public static IRecipe recipeSpawnerMover; - public static IRecipe recipePixieRing; - public static IRecipe recipeSuperTravelBelt; - public static IRecipe recipeRainbowRod; - public static IRecipe recipeSpectralPlatform; - public static List recipesDreamwoodSpreader; - public static IRecipe recipeTornadoRod; - public static IRecipe recipeFireRod; - public static IRecipe recipeVineBall; - public static IRecipe recipeSlingshot; - public static IRecipe recipeLensInfluence; - public static IRecipe recipeLensWeight; - public static IRecipe recipeLensPaint; - public static IRecipe recipeLensWarp; - public static IRecipe recipeLensRedirect; - public static IRecipe recipeLensFirework; - public static IRecipe recipeLensFlare; - public static IRecipe recipeLensMessenger; - public static IRecipe recipeLensTripwire; - public static List recipesMiniIsland; - public static IRecipe recipeGaiaPylon; - public static IRecipe recipeGatherDrum; - public static IRecipe recipeLensFire; - public static IRecipe recipeLensPiston; - public static List recipesLaputaShard; - public static List recipesLaputaShardUpgrade; - public static IRecipe recipeVirusZombie; - public static IRecipe recipeVirusSkeleton; - public static IRecipe recipeReachRing; - public static IRecipe recipeSkyDirtRod; - public static IRecipe recipeSpawnerClaw; - public static IRecipe recipeCraftCrate; - public static IRecipe recipePlaceholder; - public static IRecipe recipeAzulejo; - public static List recipesAzulejoCycling; - public static IRecipe recipeEnderEyeBlock; - public static IRecipe recipeItemFinder; - public static IRecipe recipeSuperLavaPendant; - public static IRecipe recipeEnderHand; - public static IRecipe recipeGlassPick; - public static IRecipe recipeStarfield; - public static List recipesSpark; - public static List recipesSparkUpgrades; - public static IRecipe recipeLeafHorn; - public static IRecipe recipeDiviningRod; - public static List recipesWings; - public static IRecipe recipeRFGenerator; - public static IRecipe recipeGravityRod; - public static IRecipe recipeUltraSpreader; - public static IRecipe recipeHelmetOfRevealing; - public static IRecipe recipeVial; - public static IRecipe recipeFlask; - public static IRecipe recipeBrewery; - public static IRecipe recipeBloodPendant; - public static IRecipe recipeTerraPlate; - public static IRecipe recipeRedString; - public static IRecipe recipeRedStringContainer; - public static IRecipe recipeRedStringDispenser; - public static IRecipe recipeRedStringFertilizer; - public static IRecipe recipeRedStringComparator; - public static IRecipe recipeRedStringRelay; - public static IRecipe recipeRedStringInterceptor; - public static IRecipe recipeMissileRod; - public static IRecipe recipeHolyCloak; - public static IRecipe recipeUnholyCloak; - public static IRecipe recipeBalanceCloak; - public static IRecipe recipeCraftingHalo; - public static List recipesLensFlash; - public static IRecipe recipePrism; - public static IRecipe recipeDreamwoodTwig; - public static IRecipe recipeMonocle; - public static IRecipe recipeClip; - public static IRecipe recipeCobbleRod; - public static IRecipe recipeSmeltRod; - public static IRecipe recipeWorldSeed; - public static IRecipe recipeSpellCloth; - public static IRecipe recipeThornChakram; - public static IRecipe recipeDirtPathSlab; - public static List recipesPatterns; - public static IRecipe recipeGaiaIngot; - public static IRecipe recipeCorporeaSpark; - public static IRecipe recipeMasterCorporeaSpark; - public static IRecipe recipeCorporeaIndex; - public static IRecipe recipeCorporeaFunnel; - public static IRecipe recipeCorporeaInterceptor; - public static IRecipe recipeLivingwoodBow; - public static IRecipe recipeCrystalBow; - public static List recipesCosmeticItems; - public static List recipesMushrooms; - public static IRecipe recipeSwapRing; - public static IRecipe recipeSnowHorn; - public static IRecipe recipeFlowerBag; - public static IRecipe recipePhantomInk; - public static IRecipe recipePoolCart; - public static IRecipe recipePump; - public static List recipesPetalsDouble; - public static IRecipe recipeKeepIvy; - public static IRecipe recipeBlackHoleTalisman; - public static List recipe18StoneChisel; - public static IRecipe recipeBlazeBlock; - public static List recipesAltarMeta; - public static IRecipe recipeCorporeaCrystalCube; - public static IRecipe recipeTemperanceStone; - public static IRecipe recipeIncenseStick; - public static IRecipe recipeIncensePlate; - public static IRecipe recipeTerraAxe; - public static IRecipe recipeHourglass; - public static IRecipe recipeGhostRail; - public static IRecipe recipeCanopyDrum; - public static IRecipe recipeSparkChanger; - public static IRecipe recipeCocoon; - public static IRecipe recipeLuminizer; - public static IRecipe recipeDetectorLuminizer; - public static IRecipe recipeLuminizerLauncher; - public static IRecipe recipeObedienceStick; - public static IRecipe recipeCacophonium; - public static IRecipe recipeManaBomb; - public static IRecipe recipeCobweb; - public static IRecipe recipeSlimeBottle; - public static IRecipe recipeStarSword; - public static IRecipe recipeExchangeRod; - public static IRecipe recipeGreaterMagnetRing; - public static IRecipe recipeFireChakram; - public static IRecipe recipeThunderSword; - public static IRecipe recipeBellows; - public static IRecipe recipeManaweaveCloth; - public static IRecipe recipeManaweaveHelm; - public static IRecipe recipeManaweaveChest; - public static IRecipe recipeManaweaveLegs; - public static IRecipe recipeManaweaveBoots; - public static IRecipe recipeBifrost; - public static IRecipe recipeShimmerrock; - public static IRecipe recipeShimmerwoodPlanks; - public static IRecipe recipeAutocraftingHalo; - public static List recipesPavement; - public static IRecipe recipeCellBlock; - public static IRecipe recipeCorporeaRetainer; - public static IRecipe recipeTeruTeruBozu; - public static IRecipe recipeAvatar; - public static IRecipe recipeSextant; - public static List recipesAltGrassSeeds; - public static IRecipe recipeSpeedUpBelt; - public static IRecipe recipeBaubleCase; - public static IRecipe recipeDodgeRing; - public static IRecipe recipeAnimatedTorch; - public static IRecipe recipeForkLuminizer; - public static IRecipe recipeToggleLuminizer; - public static IRecipe recipeInvisibilityCloak; - public static IRecipe recipeCloudPendant; - public static IRecipe recipeSuperCloudPendant; - public static IRecipe recipeThirdEye; - public static IRecipe recipeAstrolabe; - public static IRecipe recipeGoddessCharm; + public static ResourceLocation recipeLexicon; + public static List recipesPetals; + public static List recipesDyes; + public static List recipesPetalBlocks; + public static List recipesReversePetalBlocks; + public static ResourceLocation recipePestleAndMortar; + public static List recipesTwigWand; + public static List recipesApothecary; + public static List recipesSpreader; + public static List recipesManaLens; + public static ResourceLocation recipePool; + public static ResourceLocation recipePoolDiluted; + public static ResourceLocation recipePoolFabulous; + public static List recipesRuneAltar; + public static ResourceLocation recipeLensVelocity; + public static ResourceLocation recipeLensPotency; + public static ResourceLocation recipeLensResistance; + public static ResourceLocation recipeLensEfficiency; + public static ResourceLocation recipeLensBounce; + public static ResourceLocation recipeLensGravity; + public static ResourceLocation recipeLensBore; + public static ResourceLocation recipeLensDamaging; + public static ResourceLocation recipeLensPhantom; + public static ResourceLocation recipeLensMagnet; + public static ResourceLocation recipeLensExplosive; + public static ResourceLocation recipePylon; + public static ResourceLocation recipeDistributor; + public static ResourceLocation recipeLivingrockDecor1; + public static ResourceLocation recipeLivingrockDecor2; + public static ResourceLocation recipeLivingrockDecor3; + public static ResourceLocation recipeLivingrockDecor4; + public static ResourceLocation recipeLivingwoodDecor1; + public static ResourceLocation recipeLivingwoodDecor2; + public static ResourceLocation recipeLivingwoodDecor3; + public static ResourceLocation recipeLivingwoodDecor4; + public static ResourceLocation recipeLivingwoodDecor5; + public static ResourceLocation recipeManaVoid; + public static List recipesManaTablet; + public static ResourceLocation recipeManaDetector; + public static ResourceLocation recipeManaBlaster; + public static ResourceLocation recipeTurntable; + public static ResourceLocation recipeFertilizerPowder; + public static ResourceLocation recipeFerilizerDye; + public static ResourceLocation recipeLivingwoodTwig; + public static ResourceLocation recipeDirtRod; + public static ResourceLocation recipeTerraformRod; + public static ResourceLocation recipeRedstoneSpreader; + public static ResourceLocation recipeManaMirror; + public static ResourceLocation recipeManasteelHelm; + public static ResourceLocation recipeManasteelChest; + public static ResourceLocation recipeManasteelLegs; + public static ResourceLocation recipeManasteelBoots; + public static ResourceLocation recipeManasteelPick; + public static ResourceLocation recipeManasteelShovel; + public static ResourceLocation recipeManasteelAxe; + public static ResourceLocation recipeManasteelShears; + public static ResourceLocation recipeManasteelSword; + public static ResourceLocation recipeGrassHorn; + public static ResourceLocation recipeTerrasteelHelm; + public static ResourceLocation recipeTerrasteelChest; + public static ResourceLocation recipeTerrasteelLegs; + public static ResourceLocation recipeTerrasteelBoots; + public static ResourceLocation recipeTerraSword; + public static ResourceLocation recipeTinyPlanet; + public static ResourceLocation recipeManaRing; + public static ResourceLocation recipeAuraRing; + public static ResourceLocation recipeGreaterManaRing; + public static ResourceLocation recipeGreaterAuraRing; + public static ResourceLocation recipeTravelBelt; + public static ResourceLocation recipeKnocbackBelt; + public static ResourceLocation recipeIcePendant; + public static ResourceLocation recipeFirePendant; + public static ResourceLocation recipeTinyPlanetBlock; + public static ResourceLocation recipeAlchemyCatalyst; + public static ResourceLocation recipeOpenCrate; + public static ResourceLocation recipeForestEye; + public static ResourceLocation recipeRedstoneRoot; + public static ResourceLocation recipeForestDrum; + public static ResourceLocation recipeWaterRing; + public static ResourceLocation recipeMiningRing; + public static ResourceLocation recipeMagnetRing; + public static ResourceLocation recipeTerraPick; + public static ResourceLocation recipeDivaCharm; + public static ResourceLocation recipeFlightTiara; + public static List recipesShinyFlowers; + public static ResourceLocation recipePlatform; + public static ResourceLocation recipeEnderDagger; + public static ResourceLocation recipeDarkQuartz; + public static ResourceLocation recipeBlazeQuartz; + public static List recipesLavenderQuartz; + public static ResourceLocation recipeRedQuartz; + public static ResourceLocation recipeSunnyQuartz; + public static ResourceLocation recipeAlfPortal; + public static ResourceLocation recipeNaturaPylon; + public static ResourceLocation recipeWaterRod; + public static ResourceLocation recipeElementiumHelm; + public static ResourceLocation recipeElementiumChest; + public static ResourceLocation recipeElementiumLegs; + public static ResourceLocation recipeElementiumBoots; + public static ResourceLocation recipeElementiumPick; + public static ResourceLocation recipeElementiumShovel; + public static ResourceLocation recipeElementiumAxe; + public static ResourceLocation recipeElementiumShears; + public static ResourceLocation recipeElementiumSword; + public static ResourceLocation recipeOpenBucket; + public static ResourceLocation recipeConjurationCatalyst; + public static ResourceLocation recipeSpawnerMover; + public static ResourceLocation recipePixieRing; + public static ResourceLocation recipeSuperTravelBelt; + public static ResourceLocation recipeRainbowRod; + public static ResourceLocation recipeSpectralPlatform; + public static List recipesDreamwoodSpreader; + public static ResourceLocation recipeTornadoRod; + public static ResourceLocation recipeFireRod; + public static ResourceLocation recipeVineBall; + public static ResourceLocation recipeSlingshot; + public static ResourceLocation recipeLensInfluence; + public static ResourceLocation recipeLensWeight; + public static ResourceLocation recipeLensPaint; + public static ResourceLocation recipeLensWarp; + public static ResourceLocation recipeLensRedirect; + public static ResourceLocation recipeLensFirework; + public static ResourceLocation recipeLensFlare; + public static ResourceLocation recipeLensMessenger; + public static ResourceLocation recipeLensTripwire; + public static List recipesMiniIsland; + public static ResourceLocation recipeGaiaPylon; + public static ResourceLocation recipeGatherDrum; + public static ResourceLocation recipeLensFire; + public static ResourceLocation recipeLensPiston; + public static List recipesLaputaShard; + public static List recipesLaputaShardUpgrade; + public static ResourceLocation recipeVirusZombie; + public static ResourceLocation recipeVirusSkeleton; + public static ResourceLocation recipeReachRing; + public static ResourceLocation recipeSkyDirtRod; + public static ResourceLocation recipeSpawnerClaw; + public static ResourceLocation recipeCraftCrate; + public static ResourceLocation recipePlaceholder; + public static ResourceLocation recipeAzulejo; + public static List recipesAzulejoCycling; + public static ResourceLocation recipeEnderEyeBlock; + public static ResourceLocation recipeItemFinder; + public static ResourceLocation recipeSuperLavaPendant; + public static ResourceLocation recipeEnderHand; + public static ResourceLocation recipeGlassPick; + public static ResourceLocation recipeStarfield; + public static List recipesSpark; + public static List recipesSparkUpgrades; + public static ResourceLocation recipeLeafHorn; + public static ResourceLocation recipeDiviningRod; + public static List recipesWings; + public static ResourceLocation recipeRFGenerator; + public static ResourceLocation recipeGravityRod; + public static ResourceLocation recipeUltraSpreader; + public static ResourceLocation recipeHelmetOfRevealing; + public static ResourceLocation recipeVial; + public static ResourceLocation recipeFlask; + public static ResourceLocation recipeBrewery; + public static ResourceLocation recipeBloodPendant; + public static ResourceLocation recipeTerraPlate; + public static ResourceLocation recipeRedString; + public static ResourceLocation recipeRedStringContainer; + public static ResourceLocation recipeRedStringDispenser; + public static ResourceLocation recipeRedStringFertilizer; + public static ResourceLocation recipeRedStringComparator; + public static ResourceLocation recipeRedStringRelay; + public static ResourceLocation recipeRedStringInterceptor; + public static ResourceLocation recipeMissileRod; + public static ResourceLocation recipeHolyCloak; + public static ResourceLocation recipeUnholyCloak; + public static ResourceLocation recipeBalanceCloak; + public static ResourceLocation recipeCraftingHalo; + public static List recipesLensFlash; + public static ResourceLocation recipePrism; + public static ResourceLocation recipeDreamwoodTwig; + public static ResourceLocation recipeMonocle; + public static ResourceLocation recipeClip; + public static ResourceLocation recipeCobbleRod; + public static ResourceLocation recipeSmeltRod; + public static ResourceLocation recipeWorldSeed; + public static ResourceLocation recipeSpellCloth; + public static ResourceLocation recipeThornChakram; + public static ResourceLocation recipeDirtPathSlab; + public static List recipesPatterns; + public static ResourceLocation recipeGaiaIngot; + public static ResourceLocation recipeCorporeaSpark; + public static ResourceLocation recipeMasterCorporeaSpark; + public static ResourceLocation recipeCorporeaIndex; + public static ResourceLocation recipeCorporeaFunnel; + public static ResourceLocation recipeCorporeaInterceptor; + public static ResourceLocation recipeLivingwoodBow; + public static ResourceLocation recipeCrystalBow; + public static List recipesCosmeticItems; + public static List recipesMushrooms; + public static ResourceLocation recipeSwapRing; + public static ResourceLocation recipeSnowHorn; + public static ResourceLocation recipeFlowerBag; + public static ResourceLocation recipePhantomInk; + public static ResourceLocation recipePoolCart; + public static ResourceLocation recipePump; + public static List recipesPetalsDouble; + public static ResourceLocation recipeKeepIvy; + public static ResourceLocation recipeBlackHoleTalisman; + public static List recipe18StoneChisel; + public static ResourceLocation recipeBlazeBlock; + public static List recipesAltarMeta; + public static ResourceLocation recipeCorporeaCrystalCube; + public static ResourceLocation recipeTemperanceStone; + public static ResourceLocation recipeIncenseStick; + public static ResourceLocation recipeIncensePlate; + public static ResourceLocation recipeTerraAxe; + public static ResourceLocation recipeHourglass; + public static ResourceLocation recipeGhostRail; + public static ResourceLocation recipeCanopyDrum; + public static ResourceLocation recipeSparkChanger; + public static ResourceLocation recipeCocoon; + public static ResourceLocation recipeLuminizer; + public static ResourceLocation recipeDetectorLuminizer; + public static ResourceLocation recipeLuminizerLauncher; + public static ResourceLocation recipeObedienceStick; + public static ResourceLocation recipeCacophonium; + public static ResourceLocation recipeManaBomb; + public static ResourceLocation recipeCobweb; + public static ResourceLocation recipeSlimeBottle; + public static ResourceLocation recipeStarSword; + public static ResourceLocation recipeExchangeRod; + public static ResourceLocation recipeGreaterMagnetRing; + public static ResourceLocation recipeFireChakram; + public static ResourceLocation recipeThunderSword; + public static ResourceLocation recipeBellows; + public static ResourceLocation recipeManaweaveCloth; + public static ResourceLocation recipeManaweaveHelm; + public static ResourceLocation recipeManaweaveChest; + public static ResourceLocation recipeManaweaveLegs; + public static ResourceLocation recipeManaweaveBoots; + public static ResourceLocation recipeBifrost; + public static ResourceLocation recipeShimmerrock; + public static ResourceLocation recipeShimmerwoodPlanks; + public static ResourceLocation recipeAutocraftingHalo; + public static List recipesPavement; + public static ResourceLocation recipeCellBlock; + public static ResourceLocation recipeCorporeaRetainer; + public static ResourceLocation recipeTeruTeruBozu; + public static ResourceLocation recipeAvatar; + public static ResourceLocation recipeSextant; + public static List recipesAltGrassSeeds; + public static ResourceLocation recipeSpeedUpBelt; + public static ResourceLocation recipeBaubleCase; + public static ResourceLocation recipeDodgeRing; + public static ResourceLocation recipeAnimatedTorch; + public static ResourceLocation recipeForkLuminizer; + public static ResourceLocation recipeToggleLuminizer; + public static ResourceLocation recipeInvisibilityCloak; + public static ResourceLocation recipeCloudPendant; + public static ResourceLocation recipeSuperCloudPendant; + public static ResourceLocation recipeThirdEye; + public static ResourceLocation recipeAstrolabe; + public static ResourceLocation recipeGoddessCharm; // Garden of Glass - public static IRecipe recipeRootToSapling; - public static IRecipe recipeRootToFertilizer; - public static IRecipe recipePebbleCobblestone; - public static IRecipe recipeMagmaToSlimeball; - public static IRecipe recipeFelPumpkin; - public static IRecipe recipeEndPortal; + public static ResourceLocation recipeRootToSapling; + public static ResourceLocation recipeRootToFertilizer; + public static ResourceLocation recipePebbleCobblestone; + public static ResourceLocation recipeMagmaToSlimeball; + public static ResourceLocation recipeFelPumpkin; + public static ResourceLocation recipeEndPortal; @SubscribeEvent public static void registerRecipes(RegistryEvent.Register evt) { @@ -474,5 +449,28 @@ public final class ModCraftingRecipes { addShapelessRecipe(new ItemStack(ModItems.elementiumHelmRevealing), new ItemStack(ModItems.elementiumHelm), goggles); } */ + + recipeLexicon = path("lexicon"); + recipesPetals = allOfGroup("petal"); + recipesDyes = allOfGroup("dye"); + recipesPetalBlocks = allOfGroup("petalblock"); + recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct"); + } + + private static ResourceLocation path(String path) { + return new ResourceLocation(LibMisc.MOD_ID, path); + } + + private static List allOfGroup(String group) { + String jsonGroup = LibMisc.MOD_ID + ":" + group; + List result = new ArrayList<>(); + + for (Map.Entry e : ForgeRegistries.RECIPES.getEntries()) { + if (jsonGroup.equals(e.getValue().getGroup())) { + result.add(e.getKey()); + } + } + + return result; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index b0d879786..743522f9b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -10,7 +10,48 @@ */ package vazkii.botania.common.lexicon; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.brew.IBrewContainer; +import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModMultiblocks; +import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.SheddingHandler; +import vazkii.botania.common.crafting.ModBrewRecipes; +import vazkii.botania.common.crafting.ModCraftingRecipes; +import vazkii.botania.common.crafting.ModElvenTradeRecipes; +import vazkii.botania.common.crafting.ModManaAlchemyRecipes; +import vazkii.botania.common.crafting.ModManaConjurationRecipes; +import vazkii.botania.common.crafting.ModManaInfusionRecipes; +import vazkii.botania.common.crafting.ModPetalRecipes; +import vazkii.botania.common.crafting.ModRuneRecipes; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lexicon.page.PageBrew; +import vazkii.botania.common.lexicon.page.PageCraftingRecipe; +import vazkii.botania.common.lexicon.page.PageElvenRecipe; +import vazkii.botania.common.lexicon.page.PageImage; +import vazkii.botania.common.lexicon.page.PageLoreText; +import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; +import vazkii.botania.common.lexicon.page.PageMultiblock; +import vazkii.botania.common.lexicon.page.PagePetalRecipe; +import vazkii.botania.common.lexicon.page.PageRuneRecipe; +import vazkii.botania.common.lexicon.page.PageTerrasteel; +import vazkii.botania.common.lexicon.page.PageText; +import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibLexicon; + +import java.util.ArrayList; +import java.util.List; public final class LexiconData { @@ -252,7 +293,6 @@ public final class LexiconData { public static LexiconEntry bcIntegration; public static LexiconEntry banners; - /* public static void init() { BotaniaAPI.addCategory(BotaniaAPI.categoryBasics = new BLexiconCategory(LibLexicon.CATEGORY_BASICS, 9)); BotaniaAPI.addCategory(BotaniaAPI.categoryMana = new BLexiconCategory(LibLexicon.CATEGORY_MANA, 5)); @@ -286,7 +326,7 @@ public final class LexiconData { new PageCraftingRecipe("3", ModCraftingRecipes.recipesPetals), new PageCraftingRecipe("4", ModCraftingRecipes.recipePestleAndMortar), new PageCraftingRecipe("5", ModCraftingRecipes.recipesDyes), - new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), + // todo 1.12 new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipeFertilizerPowder), new PageCraftingRecipe("8", ModCraftingRecipes.recipeFerilizerDye), new PageText("10"), @@ -1262,7 +1302,7 @@ public final class LexiconData { relicInfo = new RelicLexiconEntry(LibLexicon.ALF_RELIC_INFO, categoryAlfhomancy, null); relicInfo.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.dice)); - infiniteFruit = new RelicLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, + /*infiniteFruit = new RelicLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, ModAchievements.relicInfiniteFruit); infiniteFruit.setLexiconPages(new PageText("0")); @@ -1280,7 +1320,7 @@ public final class LexiconData { lokiRing.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")); odinRing = new RelicLexiconEntry(LibLexicon.ALF_ODIN_RING, categoryAlfhomancy, ModAchievements.relicOdinRing); - odinRing.setLexiconPages(new PageText("0")); + odinRing.setLexiconPages(new PageText("0")); todo 1.12 */ } decorativeBlocks = new BasicLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); @@ -1400,5 +1440,4 @@ public final class LexiconData { .setIcon(new ItemStack(ModItems.manaInkwell)); } } - */ } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 462ebf641..8855f145b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -36,6 +36,7 @@ import vazkii.botania.client.lib.LibResources; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; public class PageCraftingRecipe extends PageRecipe { @@ -170,8 +171,8 @@ public class PageCraftingRecipe extends PageRecipe { for(int x = 0; x < 3; x++) { int index = y * 3 + x; - /*if(index >= shapeless.getRecipeSize()) todo 1.12 - break drawGrid;*/ + if(index >= shapeless.getIngredients().size()) + break drawGrid; Ingredient input = shapeless.getIngredients().get(index); if(input != Ingredient.EMPTY) @@ -190,6 +191,7 @@ public class PageCraftingRecipe extends PageRecipe { public List getDisplayedRecipes() { return recipes.stream() .map(ForgeRegistries.RECIPES::getValue) + .filter(Objects::nonNull) .map(IRecipe::getRecipeOutput) .filter(s -> !s.isEmpty()) .collect(Collectors.toList()); diff --git a/src/main/resources/assets/botania/recipes/dye_0.json b/src/main/resources/assets/botania/recipes/dye_0.json index 98d361ee2..a0bed054e 100644 --- a/src/main/resources/assets/botania/recipes/dye_0.json +++ b/src/main/resources/assets/botania/recipes/dye_0.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 0 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALWHITE" diff --git a/src/main/resources/assets/botania/recipes/dye_1.json b/src/main/resources/assets/botania/recipes/dye_1.json index e117e4add..725718d16 100644 --- a/src/main/resources/assets/botania/recipes/dye_1.json +++ b/src/main/resources/assets/botania/recipes/dye_1.json @@ -3,10 +3,17 @@ "item": "botania:dye", "data": 1 }, + "group": "botania:dye", "ingredients": [ - { - "item": "#PETALORANGE" - }, + [ + { + "item": "minecraft:red_flower", + "data": 5 + }, + { + "item": "#PETALORANGE" + } + ], { "item": "#PESTLEANDMORTAR" } diff --git a/src/main/resources/assets/botania/recipes/dye_10.json b/src/main/resources/assets/botania/recipes/dye_10.json index a7c5fe8e4..c782a2ee3 100644 --- a/src/main/resources/assets/botania/recipes/dye_10.json +++ b/src/main/resources/assets/botania/recipes/dye_10.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 10 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALPURPLE" diff --git a/src/main/resources/assets/botania/recipes/dye_11.json b/src/main/resources/assets/botania/recipes/dye_11.json index 165a21e0d..2ae177f78 100644 --- a/src/main/resources/assets/botania/recipes/dye_11.json +++ b/src/main/resources/assets/botania/recipes/dye_11.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 11 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALBLUE" diff --git a/src/main/resources/assets/botania/recipes/dye_12.json b/src/main/resources/assets/botania/recipes/dye_12.json index fcf3f05c3..cfdb1d708 100644 --- a/src/main/resources/assets/botania/recipes/dye_12.json +++ b/src/main/resources/assets/botania/recipes/dye_12.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 12 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALBROWN" diff --git a/src/main/resources/assets/botania/recipes/dye_13.json b/src/main/resources/assets/botania/recipes/dye_13.json index 479b6c1bf..b7815e8bc 100644 --- a/src/main/resources/assets/botania/recipes/dye_13.json +++ b/src/main/resources/assets/botania/recipes/dye_13.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 13 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALGREEN" diff --git a/src/main/resources/assets/botania/recipes/dye_14.json b/src/main/resources/assets/botania/recipes/dye_14.json index a3bf2bbbe..2071932c4 100644 --- a/src/main/resources/assets/botania/recipes/dye_14.json +++ b/src/main/resources/assets/botania/recipes/dye_14.json @@ -3,10 +3,21 @@ "item": "botania:dye", "data": 14 }, + "group": "botania:dye", "ingredients": [ - { - "item": "#PETALRED" - }, + [ + { + "item": "minecraft:red_flower", + "data": 0 + }, + { + "item": "minecraft:red_flower", + "data": 4 + }, + { + "item": "#PETALRED" + } + ], { "item": "#PESTLEANDMORTAR" } diff --git a/src/main/resources/assets/botania/recipes/dye_14_alt.json b/src/main/resources/assets/botania/recipes/dye_14_alt.json deleted file mode 100644 index bfdc93cba..000000000 --- a/src/main/resources/assets/botania/recipes/dye_14_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 14 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 0 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_14_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_14_alt_alt.json deleted file mode 100644 index 58becbc0d..000000000 --- a/src/main/resources/assets/botania/recipes/dye_14_alt_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 14 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 4 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_14_alt_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_14_double.json similarity index 65% rename from src/main/resources/assets/botania/recipes/dye_14_alt_alt_alt.json rename to src/main/resources/assets/botania/recipes/dye_14_double.json index a30679e40..c40ec71ec 100644 --- a/src/main/resources/assets/botania/recipes/dye_14_alt_alt_alt.json +++ b/src/main/resources/assets/botania/recipes/dye_14_double.json @@ -4,14 +4,15 @@ "data": 14, "count": 2 }, + "group": "botania:dye_double", "ingredients": [ - { - "item": "botania:pestleandmortar" - }, { "item": "minecraft:double_plant", "data": 4 + }, + { + "item": "#PESTLEANDMORTAR" } ], - "type": "minecraft:crafting_shapeless" + "type": "forge:ore_shapeless" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_15.json b/src/main/resources/assets/botania/recipes/dye_15.json index b1c661580..52d819514 100644 --- a/src/main/resources/assets/botania/recipes/dye_15.json +++ b/src/main/resources/assets/botania/recipes/dye_15.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 15 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALBLACK" diff --git a/src/main/resources/assets/botania/recipes/dye_1_alt.json b/src/main/resources/assets/botania/recipes/dye_1_alt.json deleted file mode 100644 index c4001d437..000000000 --- a/src/main/resources/assets/botania/recipes/dye_1_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 1 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 5 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_2.json b/src/main/resources/assets/botania/recipes/dye_2.json index 094caa4f7..3351109c7 100644 --- a/src/main/resources/assets/botania/recipes/dye_2.json +++ b/src/main/resources/assets/botania/recipes/dye_2.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 2 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALMAGENTA" diff --git a/src/main/resources/assets/botania/recipes/dye_2_alt.json b/src/main/resources/assets/botania/recipes/dye_2_alt.json deleted file mode 100644 index d7ac74f1f..000000000 --- a/src/main/resources/assets/botania/recipes/dye_2_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 2 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 2 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_2_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_2_double.json similarity index 65% rename from src/main/resources/assets/botania/recipes/dye_2_alt_alt.json rename to src/main/resources/assets/botania/recipes/dye_2_double.json index 98fa68187..6927ed168 100644 --- a/src/main/resources/assets/botania/recipes/dye_2_alt_alt.json +++ b/src/main/resources/assets/botania/recipes/dye_2_double.json @@ -4,14 +4,15 @@ "data": 2, "count": 2 }, + "group": "botania:dye_double", "ingredients": [ - { - "item": "botania:pestleandmortar" - }, { "item": "minecraft:double_plant", "data": 1 + }, + { + "item": "#PESTLEANDMORTAR" } ], - "type": "minecraft:crafting_shapeless" + "type": "forge:ore_shapeless" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_3.json b/src/main/resources/assets/botania/recipes/dye_3.json index 15a390395..e081abf77 100644 --- a/src/main/resources/assets/botania/recipes/dye_3.json +++ b/src/main/resources/assets/botania/recipes/dye_3.json @@ -3,10 +3,17 @@ "item": "botania:dye", "data": 3 }, + "group": "botania:dye", "ingredients": [ - { - "item": "#PETALLIGHTBLUE" - }, + [ + { + "item": "minecraft:red_flower", + "data": 1 + }, + { + "item": "#PETALLIGHTBLUE" + } + ], { "item": "#PESTLEANDMORTAR" } diff --git a/src/main/resources/assets/botania/recipes/dye_3_alt.json b/src/main/resources/assets/botania/recipes/dye_3_alt.json deleted file mode 100644 index 05f75b770..000000000 --- a/src/main/resources/assets/botania/recipes/dye_3_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 3 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 1 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_4.json b/src/main/resources/assets/botania/recipes/dye_4.json index cf47bedc0..2d31636cb 100644 --- a/src/main/resources/assets/botania/recipes/dye_4.json +++ b/src/main/resources/assets/botania/recipes/dye_4.json @@ -3,10 +3,17 @@ "item": "botania:dye", "data": 4 }, + "group": "botania:dye", "ingredients": [ - { - "item": "#PETALYELLOW" - }, + [ + { + "item": "minecraft:yellow_flower", + "data": 0 + }, + { + "item": "#PETALYELLOW" + } + ], { "item": "#PESTLEANDMORTAR" } diff --git a/src/main/resources/assets/botania/recipes/dye_4_alt.json b/src/main/resources/assets/botania/recipes/dye_4_alt.json deleted file mode 100644 index 388de6ec1..000000000 --- a/src/main/resources/assets/botania/recipes/dye_4_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 4 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:yellow_flower", - "data": 0 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_4_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_4_double.json similarity index 65% rename from src/main/resources/assets/botania/recipes/dye_4_alt_alt.json rename to src/main/resources/assets/botania/recipes/dye_4_double.json index 0c20e6529..290dc92e5 100644 --- a/src/main/resources/assets/botania/recipes/dye_4_alt_alt.json +++ b/src/main/resources/assets/botania/recipes/dye_4_double.json @@ -4,14 +4,15 @@ "data": 4, "count": 2 }, + "group": "botania:dye_double", "ingredients": [ - { - "item": "botania:pestleandmortar" - }, { "item": "minecraft:double_plant", "data": 0 + }, + { + "item": "#PESTLEANDMORTAR" } ], - "type": "minecraft:crafting_shapeless" + "type": "forge:ore_shapeless" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_5.json b/src/main/resources/assets/botania/recipes/dye_5.json index 8a8fa7ab8..16eb850e1 100644 --- a/src/main/resources/assets/botania/recipes/dye_5.json +++ b/src/main/resources/assets/botania/recipes/dye_5.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 5 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALLIME" diff --git a/src/main/resources/assets/botania/recipes/dye_6.json b/src/main/resources/assets/botania/recipes/dye_6.json index a7a2ee1b3..0f3d82110 100644 --- a/src/main/resources/assets/botania/recipes/dye_6.json +++ b/src/main/resources/assets/botania/recipes/dye_6.json @@ -3,10 +3,17 @@ "item": "botania:dye", "data": 6 }, + "group": "botania:dye", "ingredients": [ - { - "item": "#PETALPINK" - }, + [ + { + "item": "minecraft:red_flower", + "data": 7 + }, + { + "item": "#PETALPINK" + } + ], { "item": "#PESTLEANDMORTAR" } diff --git a/src/main/resources/assets/botania/recipes/dye_6_alt.json b/src/main/resources/assets/botania/recipes/dye_6_alt.json deleted file mode 100644 index fb42034f6..000000000 --- a/src/main/resources/assets/botania/recipes/dye_6_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 6 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 7 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_6_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_6_double.json similarity index 65% rename from src/main/resources/assets/botania/recipes/dye_6_alt_alt.json rename to src/main/resources/assets/botania/recipes/dye_6_double.json index bdf81c9d4..0f6b799ed 100644 --- a/src/main/resources/assets/botania/recipes/dye_6_alt_alt.json +++ b/src/main/resources/assets/botania/recipes/dye_6_double.json @@ -4,14 +4,15 @@ "data": 6, "count": 2 }, + "group": "botania:dye_double", "ingredients": [ - { - "item": "botania:pestleandmortar" - }, { "item": "minecraft:double_plant", "data": 5 + }, + { + "item": "#PESTLEANDMORTAR" } ], - "type": "minecraft:crafting_shapeless" + "type": "forge:ore_shapeless" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_7.json b/src/main/resources/assets/botania/recipes/dye_7.json index 5e9cc45a6..390c1c258 100644 --- a/src/main/resources/assets/botania/recipes/dye_7.json +++ b/src/main/resources/assets/botania/recipes/dye_7.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 7 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALGRAY" diff --git a/src/main/resources/assets/botania/recipes/dye_8.json b/src/main/resources/assets/botania/recipes/dye_8.json index 75d639843..322c30b8c 100644 --- a/src/main/resources/assets/botania/recipes/dye_8.json +++ b/src/main/resources/assets/botania/recipes/dye_8.json @@ -3,10 +3,25 @@ "item": "botania:dye", "data": 8 }, + "group": "botania:dye", "ingredients": [ - { - "item": "#PETALLIGHTGRAY" - }, + [ + { + "item": "minecraft:red_flower", + "data": 3 + }, + { + "item": "minecraft:red_flower", + "data": 6 + }, + { + "item": "minecraft:red_flower", + "data": 8 + }, + { + "item": "#PETALLIGHTGRAY" + } + ], { "item": "#PESTLEANDMORTAR" } diff --git a/src/main/resources/assets/botania/recipes/dye_8_alt.json b/src/main/resources/assets/botania/recipes/dye_8_alt.json deleted file mode 100644 index 415243dff..000000000 --- a/src/main/resources/assets/botania/recipes/dye_8_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 8 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 3 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_8_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_8_alt_alt.json deleted file mode 100644 index 47ff91dfc..000000000 --- a/src/main/resources/assets/botania/recipes/dye_8_alt_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 8 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 6 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_8_alt_alt_alt.json b/src/main/resources/assets/botania/recipes/dye_8_alt_alt_alt.json deleted file mode 100644 index 788297018..000000000 --- a/src/main/resources/assets/botania/recipes/dye_8_alt_alt_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:dye", - "data": 8 - }, - "ingredients": [ - { - "item": "botania:pestleandmortar" - }, - { - "item": "minecraft:red_flower", - "data": 8 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/dye_9.json b/src/main/resources/assets/botania/recipes/dye_9.json index 79ffcb0cd..461218ffe 100644 --- a/src/main/resources/assets/botania/recipes/dye_9.json +++ b/src/main/resources/assets/botania/recipes/dye_9.json @@ -3,6 +3,7 @@ "item": "botania:dye", "data": 9 }, + "group": "botania:dye", "ingredients": [ { "item": "#PETALCYAN" diff --git a/src/main/resources/assets/botania/recipes/petal_0.json b/src/main/resources/assets/botania/recipes/petal_0.json index e215a7d77..3fe8e825d 100644 --- a/src/main/resources/assets/botania/recipes/petal_0.json +++ b/src/main/resources/assets/botania/recipes/petal_0.json @@ -4,6 +4,7 @@ "data": 0, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERWHITE" diff --git a/src/main/resources/assets/botania/recipes/petal_0_double.json b/src/main/resources/assets/botania/recipes/petal_0_double.json index b06839013..cf2b4f1af 100644 --- a/src/main/resources/assets/botania/recipes/petal_0_double.json +++ b/src/main/resources/assets/botania/recipes/petal_0_double.json @@ -4,6 +4,7 @@ "data": 0, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERWHITEDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_1.json b/src/main/resources/assets/botania/recipes/petal_1.json index 57b3edf6a..f7198d468 100644 --- a/src/main/resources/assets/botania/recipes/petal_1.json +++ b/src/main/resources/assets/botania/recipes/petal_1.json @@ -4,6 +4,7 @@ "data": 1, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERORANGE" diff --git a/src/main/resources/assets/botania/recipes/petal_10.json b/src/main/resources/assets/botania/recipes/petal_10.json index 7d7a54b8f..51463eb32 100644 --- a/src/main/resources/assets/botania/recipes/petal_10.json +++ b/src/main/resources/assets/botania/recipes/petal_10.json @@ -4,6 +4,7 @@ "data": 10, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERPURPLE" diff --git a/src/main/resources/assets/botania/recipes/petal_10_double.json b/src/main/resources/assets/botania/recipes/petal_10_double.json index eb552f198..5dfc40d3b 100644 --- a/src/main/resources/assets/botania/recipes/petal_10_double.json +++ b/src/main/resources/assets/botania/recipes/petal_10_double.json @@ -4,6 +4,7 @@ "data": 10, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERPURPLEDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_11.json b/src/main/resources/assets/botania/recipes/petal_11.json index badb58c69..953b8f3d8 100644 --- a/src/main/resources/assets/botania/recipes/petal_11.json +++ b/src/main/resources/assets/botania/recipes/petal_11.json @@ -4,6 +4,7 @@ "data": 11, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERBLUE" diff --git a/src/main/resources/assets/botania/recipes/petal_11_double.json b/src/main/resources/assets/botania/recipes/petal_11_double.json index 46118beb1..d4ad09084 100644 --- a/src/main/resources/assets/botania/recipes/petal_11_double.json +++ b/src/main/resources/assets/botania/recipes/petal_11_double.json @@ -4,6 +4,7 @@ "data": 11, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERBLUEDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_12.json b/src/main/resources/assets/botania/recipes/petal_12.json index 3f43cfd28..d2899ebea 100644 --- a/src/main/resources/assets/botania/recipes/petal_12.json +++ b/src/main/resources/assets/botania/recipes/petal_12.json @@ -4,6 +4,7 @@ "data": 12, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERBROWN" diff --git a/src/main/resources/assets/botania/recipes/petal_12_double.json b/src/main/resources/assets/botania/recipes/petal_12_double.json index 5792a1de1..36aa77d9b 100644 --- a/src/main/resources/assets/botania/recipes/petal_12_double.json +++ b/src/main/resources/assets/botania/recipes/petal_12_double.json @@ -4,6 +4,7 @@ "data": 12, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERBROWNDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_13.json b/src/main/resources/assets/botania/recipes/petal_13.json index fd77c47d0..c4865bf13 100644 --- a/src/main/resources/assets/botania/recipes/petal_13.json +++ b/src/main/resources/assets/botania/recipes/petal_13.json @@ -4,6 +4,7 @@ "data": 13, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERGREEN" diff --git a/src/main/resources/assets/botania/recipes/petal_13_double.json b/src/main/resources/assets/botania/recipes/petal_13_double.json index 0609744fc..03b7c3b36 100644 --- a/src/main/resources/assets/botania/recipes/petal_13_double.json +++ b/src/main/resources/assets/botania/recipes/petal_13_double.json @@ -4,6 +4,7 @@ "data": 13, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERGREENDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_14.json b/src/main/resources/assets/botania/recipes/petal_14.json index 9365545c8..cb78dfe20 100644 --- a/src/main/resources/assets/botania/recipes/petal_14.json +++ b/src/main/resources/assets/botania/recipes/petal_14.json @@ -4,6 +4,7 @@ "data": 14, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERRED" diff --git a/src/main/resources/assets/botania/recipes/petal_14_double.json b/src/main/resources/assets/botania/recipes/petal_14_double.json index a2104b1f6..01037c46d 100644 --- a/src/main/resources/assets/botania/recipes/petal_14_double.json +++ b/src/main/resources/assets/botania/recipes/petal_14_double.json @@ -4,6 +4,7 @@ "data": 14, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERREDDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_15.json b/src/main/resources/assets/botania/recipes/petal_15.json index 64a298acf..2f3b4d7bd 100644 --- a/src/main/resources/assets/botania/recipes/petal_15.json +++ b/src/main/resources/assets/botania/recipes/petal_15.json @@ -4,6 +4,7 @@ "data": 15, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERBLACK" diff --git a/src/main/resources/assets/botania/recipes/petal_15_double.json b/src/main/resources/assets/botania/recipes/petal_15_double.json index 4b04732cc..a5da7c8a1 100644 --- a/src/main/resources/assets/botania/recipes/petal_15_double.json +++ b/src/main/resources/assets/botania/recipes/petal_15_double.json @@ -4,6 +4,7 @@ "data": 15, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERBLACKDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_1_double.json b/src/main/resources/assets/botania/recipes/petal_1_double.json index a0d8dc510..4b6d7ec78 100644 --- a/src/main/resources/assets/botania/recipes/petal_1_double.json +++ b/src/main/resources/assets/botania/recipes/petal_1_double.json @@ -4,6 +4,7 @@ "data": 1, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERORANGEDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_2.json b/src/main/resources/assets/botania/recipes/petal_2.json index c82f1a6d9..dc5db7c9a 100644 --- a/src/main/resources/assets/botania/recipes/petal_2.json +++ b/src/main/resources/assets/botania/recipes/petal_2.json @@ -4,6 +4,7 @@ "data": 2, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERMAGENTA" diff --git a/src/main/resources/assets/botania/recipes/petal_2_double.json b/src/main/resources/assets/botania/recipes/petal_2_double.json index 59287fed9..c7623565c 100644 --- a/src/main/resources/assets/botania/recipes/petal_2_double.json +++ b/src/main/resources/assets/botania/recipes/petal_2_double.json @@ -4,6 +4,7 @@ "data": 2, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERMAGENTADOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_3.json b/src/main/resources/assets/botania/recipes/petal_3.json index 8b0a3a1b6..f915c50a6 100644 --- a/src/main/resources/assets/botania/recipes/petal_3.json +++ b/src/main/resources/assets/botania/recipes/petal_3.json @@ -4,6 +4,7 @@ "data": 3, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERLIGHTBLUE" diff --git a/src/main/resources/assets/botania/recipes/petal_3_double.json b/src/main/resources/assets/botania/recipes/petal_3_double.json index 27cfafbaf..a0320ddf5 100644 --- a/src/main/resources/assets/botania/recipes/petal_3_double.json +++ b/src/main/resources/assets/botania/recipes/petal_3_double.json @@ -4,6 +4,7 @@ "data": 3, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERLIGHTBLUEDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_4.json b/src/main/resources/assets/botania/recipes/petal_4.json index b5d0c6fd4..276643a50 100644 --- a/src/main/resources/assets/botania/recipes/petal_4.json +++ b/src/main/resources/assets/botania/recipes/petal_4.json @@ -4,6 +4,7 @@ "data": 4, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERYELLOW" diff --git a/src/main/resources/assets/botania/recipes/petal_4_double.json b/src/main/resources/assets/botania/recipes/petal_4_double.json index 37cbd5e64..b4250069d 100644 --- a/src/main/resources/assets/botania/recipes/petal_4_double.json +++ b/src/main/resources/assets/botania/recipes/petal_4_double.json @@ -4,6 +4,7 @@ "data": 4, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERYELLOWDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_5.json b/src/main/resources/assets/botania/recipes/petal_5.json index 0a0fc15a4..02a972678 100644 --- a/src/main/resources/assets/botania/recipes/petal_5.json +++ b/src/main/resources/assets/botania/recipes/petal_5.json @@ -4,6 +4,7 @@ "data": 5, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERLIME" diff --git a/src/main/resources/assets/botania/recipes/petal_5_double.json b/src/main/resources/assets/botania/recipes/petal_5_double.json index 21d788c70..a7da5160a 100644 --- a/src/main/resources/assets/botania/recipes/petal_5_double.json +++ b/src/main/resources/assets/botania/recipes/petal_5_double.json @@ -4,6 +4,7 @@ "data": 5, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERLIMEDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_6.json b/src/main/resources/assets/botania/recipes/petal_6.json index 1f03225ca..c165be0da 100644 --- a/src/main/resources/assets/botania/recipes/petal_6.json +++ b/src/main/resources/assets/botania/recipes/petal_6.json @@ -4,6 +4,7 @@ "data": 6, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERPINK" diff --git a/src/main/resources/assets/botania/recipes/petal_6_double.json b/src/main/resources/assets/botania/recipes/petal_6_double.json index 4e11f9d69..27e86f482 100644 --- a/src/main/resources/assets/botania/recipes/petal_6_double.json +++ b/src/main/resources/assets/botania/recipes/petal_6_double.json @@ -4,6 +4,7 @@ "data": 6, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERPINKDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_7.json b/src/main/resources/assets/botania/recipes/petal_7.json index badb244b5..ec4ae8dbb 100644 --- a/src/main/resources/assets/botania/recipes/petal_7.json +++ b/src/main/resources/assets/botania/recipes/petal_7.json @@ -4,6 +4,7 @@ "data": 7, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERGRAY" diff --git a/src/main/resources/assets/botania/recipes/petal_7_double.json b/src/main/resources/assets/botania/recipes/petal_7_double.json index 8452e3bf9..e1572d501 100644 --- a/src/main/resources/assets/botania/recipes/petal_7_double.json +++ b/src/main/resources/assets/botania/recipes/petal_7_double.json @@ -4,6 +4,7 @@ "data": 7, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERGRAYDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_8.json b/src/main/resources/assets/botania/recipes/petal_8.json index 056425820..eedf15370 100644 --- a/src/main/resources/assets/botania/recipes/petal_8.json +++ b/src/main/resources/assets/botania/recipes/petal_8.json @@ -4,6 +4,7 @@ "data": 8, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERLIGHTGRAY" diff --git a/src/main/resources/assets/botania/recipes/petal_8_double.json b/src/main/resources/assets/botania/recipes/petal_8_double.json index bdad35ab4..6a5a9f38a 100644 --- a/src/main/resources/assets/botania/recipes/petal_8_double.json +++ b/src/main/resources/assets/botania/recipes/petal_8_double.json @@ -4,6 +4,7 @@ "data": 8, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERLIGHTGRAYDOUBLE" diff --git a/src/main/resources/assets/botania/recipes/petal_9.json b/src/main/resources/assets/botania/recipes/petal_9.json index 7d2125d8e..b9f68ccfc 100644 --- a/src/main/resources/assets/botania/recipes/petal_9.json +++ b/src/main/resources/assets/botania/recipes/petal_9.json @@ -4,6 +4,7 @@ "data": 9, "count": 2 }, + "group": "botania:petal", "ingredients": [ { "item": "#MYSTICFLOWERCYAN" diff --git a/src/main/resources/assets/botania/recipes/petal_9_double.json b/src/main/resources/assets/botania/recipes/petal_9_double.json index 839c1b173..dae775cce 100644 --- a/src/main/resources/assets/botania/recipes/petal_9_double.json +++ b/src/main/resources/assets/botania/recipes/petal_9_double.json @@ -4,6 +4,7 @@ "data": 9, "count": 4 }, + "group": "botania:petal_double", "ingredients": [ { "item": "#MYSTICFLOWERCYANDOUBLE"