From 4091c7e4fbabc25483714e4a5042864034ae4654 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 25 Jun 2017 16:44:08 -0500 Subject: [PATCH] Fix some todos, modernize JEI, other housekeeping --- .../java/vazkii/botania/api/BotaniaAPI.java | 3 +- .../vazkii/botania/api/BotaniaAPIClient.java | 6 +- .../TooltipAdditionDisplayHandler.java | 3 +- .../integration/jei/JEIBotaniaPlugin.java | 85 +++++++++---------- .../jei/brewery/BreweryRecipeHandler.java | 42 --------- .../elventrade/ElvenTradeRecipeHandler.java | 42 --------- .../jei/manapool/ManaPoolRecipeHandler.java | 42 --------- .../PetalApothecaryRecipeHandler.java | 42 --------- .../jei/puredaisy/PureDaisyRecipeHandler.java | 42 --------- .../runicaltar/RunicAltarRecipeHandler.java | 42 --------- .../common/crafting/ModBrewRecipes.java | 2 +- .../common/crafting/ModMigrationRecipes.java | 15 ---- .../common/crafting/ModRuneRecipes.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 2 - .../item/material/ItemManaResource.java | 5 +- .../botania/common/lib/LibItemNames.java | 2 +- .../vazkii/botania/common/lib/LibOreDict.java | 1 - .../resources/assets/botania/lang/en_us.lang | 1 - .../resources/assets/botania/lang/es_es.lang | 1 - .../resources/assets/botania/lang/fr_fr.lang | 1 - .../resources/assets/botania/lang/ja_jp.lang | 1 - .../resources/assets/botania/lang/ko_kr.lang | 1 - .../resources/assets/botania/lang/nl_nl.lang | 1 - .../resources/assets/botania/lang/pt_br.lang | 1 - .../resources/assets/botania/lang/ru_ru.lang | 1 - .../resources/assets/botania/lang/zh_cn.lang | 1 - .../resources/assets/botania/lang/zh_tw.lang | 1 - .../assets/botania/recipes/_constants.json | 14 +-- .../assets/botania/recipes/bloodpendant.json | 2 +- .../assets/botania/recipes/laputashard_0.json | 2 +- .../assets/botania/recipes/lens_12.json | 2 +- .../assets/botania/recipes/lens_13.json | 2 +- .../assets/botania/recipes/prism.json | 2 +- 33 files changed, 65 insertions(+), 347 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java delete mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java delete mode 100644 src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 16b20db8c..f2d6f67ba 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -520,10 +520,9 @@ public final class BotaniaAPI { /** * Registers a SubTileEntity, a new special flower. Look in the subtile package of the API. - * Call this in preInit, and don't forget to register a model in BotaniaAPIClient. + * Call this during {@code RegistryEvent.Register}, and don't forget to register a model in BotaniaAPIClient. */ public static void registerSubTile(String key, Class subtileClass) { - // todo 1.12 Preconditions.checkArgument(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); subTiles.put(key, subtileClass); subTileMods.put(key, Loader.instance().activeModContainer().getModId()); } diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 499ab347b..8ac7492ce 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -33,7 +33,7 @@ public final class BotaniaAPIClient { /** * Register your model for the given subtile class here. - * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Call this during {@code ModelRegistryEvent}. Calling it anytime after blockModels have already baked does not guarantee that your model will work. * Your model json must specify key "tintindex" in all the faces it wants tint applied. * Tint is applied whenever a player recolors the flower using floral dye * @@ -42,7 +42,6 @@ public final class BotaniaAPIClient { * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form */ public static void registerSubtileModel(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { - // todo 1.12 Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); subtileBlockModels.put(subTileName, model); subtileItemModels.put(subTileName, itemModel); } @@ -85,13 +84,12 @@ public final class BotaniaAPIClient { /** * Registers your model for island type islandType here. - * Call this DURING PREINIT. + * Call this during {@code ModelRegistryEvent}. * * @param islandType The islandtype to register * @param model The variant within a blockstate json to use as the islandtype's model */ public static void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ModelResourceLocation model) { - // todo 1.12 Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); islandTypeModels.put(islandType, model); } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 8672a4372..c60da126d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -43,8 +43,7 @@ public final class TooltipAdditionDisplayHandler { @SubscribeEvent public static void onToolTipRender(RenderTooltipEvent.PostText evt) { - // todo this null check is still needed. remove when Forge#3590 is pulled. - if(evt.getStack() == null || evt.getStack().isEmpty()) + if(evt.getStack().isEmpty()) return; ItemStack stack = evt.getStack(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 4ede5c927..b27c44c0d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.integration.jei; -import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; @@ -20,21 +19,27 @@ import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.api.recipe.RecipeElvenTrade; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.recipe.RecipePureDaisy; +import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; -import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.brewery.BreweryRecipeWrapper; import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory; -import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeHandler; +import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeWrapper; import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeCategory; -import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeHandler; +import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeWrapper; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; -import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; +import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeWrapper; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; -import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; +import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeWrapper; import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory; -import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; +import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeWrapper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -47,7 +52,7 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void registerItemSubtypes(@Nonnull ISubtypeRegistry subtypeRegistry) { subtypeRegistry.registerSubtypeInterpreter(Item.getItemFromBlock(ModBlocks.specialFlower), ItemBlockSpecialFlower::getType); - subtypeRegistry.registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); + subtypeRegistry.registerSubtypeInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); } @Override @@ -55,57 +60,51 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void registerCategories(IRecipeCategoryRegistration registry) { - // todo 1.12 + registry.addRecipeCategories( + new BreweryRecipeCategory(registry.getJeiHelpers().getGuiHelper()), + new PureDaisyRecipeCategory(registry.getJeiHelpers().getGuiHelper()), + new RunicAltarRecipeCategory(registry.getJeiHelpers().getGuiHelper()), // Runic must come before petals. See williewillus/Botania#172 + new PetalApothecaryRecipeCategory(registry.getJeiHelpers().getGuiHelper()), + new ElvenTradeRecipeCategory(registry.getJeiHelpers().getGuiHelper()), + new ManaPoolRecipeCategory(registry.getJeiHelpers().getGuiHelper()) + ); } @Override public void register(@Nonnull IModRegistry registry) { - IJeiHelpers jeiHelpers = registry.getJeiHelpers(); + registry.handleRecipes(RecipeBrew.class, BreweryRecipeWrapper::new, BreweryRecipeCategory.UID); + registry.handleRecipes(RecipePureDaisy.class, PureDaisyRecipeWrapper::new, PureDaisyRecipeCategory.UID); + registry.handleRecipes(RecipeRuneAltar.class, RunicAltarRecipeWrapper::new, RunicAltarRecipeCategory.UID); // Runic must come before petals. See williewillus/Botania#172 + registry.handleRecipes(RecipePetals.class, PetalApothecaryRecipeWrapper::new, PetalApothecaryRecipeCategory.UID); + registry.handleRecipes(RecipeElvenTrade.class, ElvenTradeRecipeWrapper::new, ElvenTradeRecipeCategory.UID); + registry.handleRecipes(RecipeManaInfusion.class, ManaPoolRecipeWrapper::new, ManaPoolRecipeCategory.UID); - registry.addRecipeCategories( - new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), - new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), - new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), // Runic must come before petals. See williewillus/Botania#172 - new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), - new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), - new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) - ); + registry.addRecipes(BotaniaAPI.brewRecipes, BreweryRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.pureDaisyRecipes, PureDaisyRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.petalRecipes, PetalApothecaryRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.elvenTradeRecipes, ElvenTradeRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.runeAltarRecipes, RunicAltarRecipeCategory.UID); + registry.addRecipes(BotaniaAPI.manaInfusionRecipes, ManaPoolRecipeCategory.UID); - registry.addRecipeHandlers( - new BreweryRecipeHandler(), - new PureDaisyRecipeHandler(), - new RunicAltarRecipeHandler(), // Runic must come before petals. See williewillus/Botania#172 - new PetalApothecaryRecipeHandler(), - new ElvenTradeRecipeHandler(), - new ManaPoolRecipeHandler() - ); - - registry.addRecipes(BotaniaAPI.brewRecipes); - registry.addRecipes(BotaniaAPI.pureDaisyRecipes); - registry.addRecipes(BotaniaAPI.petalRecipes); - registry.addRecipes(BotaniaAPI.elvenTradeRecipes); - registry.addRecipes(BotaniaAPI.runeAltarRecipes); - registry.addRecipes(BotaniaAPI.manaInfusionRecipes); - - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.brewery), BreweryRecipeCategory.UID); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alfPortal), ElvenTradeRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.brewery), BreweryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.alfPortal), ElvenTradeRecipeCategory.UID); for(PoolVariant v : PoolVariant.values()) { - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.pool, 1, v.ordinal()), ManaPoolRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.pool, 1, v.ordinal()), ManaPoolRecipeCategory.UID); } for(AltarVariant v : AltarVariant.values()) { if(v == AltarVariant.MOSSY) continue; - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.altar, 1, v.ordinal()), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.altar, 1, v.ordinal()), PetalApothecaryRecipeCategory.UID); } - registry.addRecipeCategoryCraftingItem(ItemBlockSpecialFlower.ofType("puredaisy"), PureDaisyRecipeCategory.UID); - registry.addRecipeCategoryCraftingItem(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), "puredaisy"), PureDaisyRecipeCategory.UID); + registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType("puredaisy"), PureDaisyRecipeCategory.UID); + registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), "puredaisy"), PureDaisyRecipeCategory.UID); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.runeAltar), RunicAltarRecipeCategory.UID); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.autocraftingHalo), VanillaRecipeCategoryUid.CRAFTING); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.craftingHalo), VanillaRecipeCategoryUid.CRAFTING); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.runeAltar), RunicAltarRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModItems.autocraftingHalo), VanillaRecipeCategoryUid.CRAFTING); + registry.addRecipeCatalyst(new ItemStack(ModItems.craftingHalo), VanillaRecipeCategoryUid.CRAFTING); registry.getRecipeTransferRegistry().addRecipeTransferHandler(ContainerCraftingHalo.class, VanillaRecipeCategoryUid.CRAFTING, 1, 9, 10, 36); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java deleted file mode 100644 index 01241fa27..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.integration.jei.brewery; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import vazkii.botania.api.recipe.RecipeBrew; - -import javax.annotation.Nonnull; - -public class BreweryRecipeHandler implements IRecipeHandler { - - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeBrew.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(@Nonnull RecipeBrew recipe) { // o is erased type param - return "botania.brewery"; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { - return new BreweryRecipeWrapper(recipe); - } - - @Override - public boolean isRecipeValid(@Nonnull RecipeBrew recipe) { - return recipe.getInputs().size() <= 6; - } - -} diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java deleted file mode 100644 index 247654d6e..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.integration.jei.elventrade; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import vazkii.botania.api.recipe.RecipeElvenTrade; - -import javax.annotation.Nonnull; - -public class ElvenTradeRecipeHandler implements IRecipeHandler { - - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeElvenTrade.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(@Nonnull RecipeElvenTrade recipe) { // o is erased type param - return "botania.elvenTrade"; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { - return new ElvenTradeRecipeWrapper(recipe); - } - - @Override - public boolean isRecipeValid(@Nonnull RecipeElvenTrade recipe) { - return true; - } - -} diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java deleted file mode 100644 index 3a157ecda..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.integration.jei.manapool; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import vazkii.botania.api.recipe.RecipeManaInfusion; - -import javax.annotation.Nonnull; - -public class ManaPoolRecipeHandler implements IRecipeHandler { - - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeManaInfusion.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(@Nonnull RecipeManaInfusion recipe) { // o is erased type param - return "botania.manaPool"; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { - return new ManaPoolRecipeWrapper(recipe); - } - - @Override - public boolean isRecipeValid(@Nonnull RecipeManaInfusion recipe) { - return recipe.getManaToConsume() <= 100000; - } - -} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java deleted file mode 100644 index 6dadf0e7b..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.integration.jei.petalapothecary; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import vazkii.botania.api.recipe.RecipePetals; - -import javax.annotation.Nonnull; - -public class PetalApothecaryRecipeHandler implements IRecipeHandler { - - @Nonnull - @Override - public Class getRecipeClass() { - return RecipePetals.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(@Nonnull RecipePetals recipe) { // o is erased type param - return "botania.petals"; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePetals recipe) { - return new PetalApothecaryRecipeWrapper(recipe); - } - - @Override - public boolean isRecipeValid(@Nonnull RecipePetals recipe) { - return recipe.getInputs().size() <= 16; - } - -} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java deleted file mode 100644 index e636e2456..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.integration.jei.puredaisy; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import vazkii.botania.api.recipe.RecipePureDaisy; - -import javax.annotation.Nonnull; - -public class PureDaisyRecipeHandler implements IRecipeHandler { - - @Nonnull - @Override - public Class getRecipeClass() { - return RecipePureDaisy.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(@Nonnull RecipePureDaisy recipe) { // o is erased type param - return "botania.pureDaisy"; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { - return new PureDaisyRecipeWrapper(recipe); - } - - @Override - public boolean isRecipeValid(@Nonnull RecipePureDaisy recipe) { - return true; - } - -} diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java deleted file mode 100644 index 9978ab08a..000000000 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.integration.jei.runicaltar; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import vazkii.botania.api.recipe.RecipeRuneAltar; - -import javax.annotation.Nonnull; - -public class RunicAltarRecipeHandler implements IRecipeHandler { - - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeRuneAltar.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid(@Nonnull RecipeRuneAltar recipe) { // o is erased type param - return "botania.runicAltar"; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) { - return new RunicAltarRecipeWrapper(recipe); - } - - @Override - public boolean isRecipeValid(@Nonnull RecipeRuneAltar recipe) { - return recipe.getInputs().size() <= 16; - } - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index e7e817659..5e612c422 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -57,7 +57,7 @@ public class ModBrewRecipes { weakRegenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regenWeak, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GHAST_TEAR), new ItemStack(Items.REDSTONE)); resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, new ItemStack(Items.NETHER_WART), new ItemStack(Items.IRON_INGOT), new ItemStack(Items.LEATHER)); fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, new ItemStack(Items.NETHER_WART), new ItemStack(Items.MAGMA_CREAM), new ItemStack(Blocks.NETHERRACK)); - waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.NETHER_WART), LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.GLOWSTONE_DUST)); + waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.NETHER_WART), "gemPrismarine", new ItemStack(Items.GLOWSTONE_DUST)); invisibilityBrew = BotaniaAPI.registerBrewRecipe(ModBrews.invisibility, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SNOWBALL), new ItemStack(Items.GLOWSTONE_DUST)); nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SPIDER_EYE), new ItemStack(Items.GOLDEN_CARROT)); absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GOLDEN_APPLE), new ItemStack(Items.POTATO)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java deleted file mode 100644 index 3664f5c09..000000000 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ /dev/null @@ -1,15 +0,0 @@ -package vazkii.botania.common.crafting; - -/** - * Migration recipes for things that will be removed in the future - */ -public final class ModMigrationRecipes { - - public static void init() { - // Prismarine -> vanilla - // todo 1.12 json GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); - } - - private ModMigrationRecipes() {} - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index b67c2ffae..7d6538a46 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -77,7 +77,7 @@ public final class ModRuneRecipes { recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 14), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]); recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 15), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]); - recipeHead = new HeadRecipe(new ItemStack(Items.SKULL, 1, 3), 22500, new ItemStack(Items.SKULL), LibOreDict.PIXIE_DUST, LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.NAME_TAG), new ItemStack(Items.GOLDEN_APPLE)); + recipeHead = new HeadRecipe(new ItemStack(Items.SKULL, 1, 3), 22500, new ItemStack(Items.SKULL), LibOreDict.PIXIE_DUST, "gemPrismarine", new ItemStack(Items.NAME_TAG), new ItemStack(Items.GOLDEN_APPLE)); BotaniaAPI.runeAltarRecipes.add(recipeHead); } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index e945cd13b..a60a64f0b 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -432,7 +432,6 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.ELEMENTIUM, new ItemStack(manaResource, 1, 7)); OreDictionary.registerOre(LibOreDict.PIXIE_DUST, new ItemStack(manaResource, 1, 8)); OreDictionary.registerOre(LibOreDict.DRAGONSTONE, new ItemStack(manaResource, 1, 9)); - OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(manaResource, 1, 10)); OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(manaResource, 1, 11)); OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(manaResource, 1, 12)); OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(manaResource, 1, 13)); @@ -460,6 +459,5 @@ public final class ModItems { OreDictionary.registerOre("rodBlaze", Items.BLAZE_ROD); OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER); - OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.PRISMARINE_SHARD)); } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index c73f5d9d8..6fc3255c8 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -117,9 +117,12 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { if(isInCreativeTab(tab)) { - for(int i = 0; i < types; i++) + for(int i = 0; i < types; i++) { + if("UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i])) + continue; if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) stacks.add(new ItemStack(this, 1, i)); + } } } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index ec0c1431f..08217dc8d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -205,7 +205,7 @@ public final class LibItemNames { "elementium", "pixieDust", "dragonstone", - "prismarineShard", + "UNUSED", "placeholder", "redString", "dreamwoodTwig", diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 9ad76f414..0003909eb 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -28,7 +28,6 @@ public final class LibOreDict { public static final String ELEMENTIUM = "ingotElvenElementium"; public static final String PIXIE_DUST = "elvenPixieDust"; public static final String DRAGONSTONE = "elvenDragonstone"; - public static final String PRISMARINE_SHARD = "shardPrismarine"; public static final String PLACEHOLDER = "bPlaceholder"; public static final String RED_STRING = "bRedString"; public static final String DREAMWOOD_TWIG = "dreamwoodTwig"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index bd114ad13..4ecd51f4d 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1454,7 +1454,6 @@ item.botania:fireRod.name=Rod of the Hells item.botania:vineBall.name=Vine Ball item.botania:slingshot.name=Livingwood Slingshot item.botania:manaBottle.name=Mana in a Bottle -item.botania:prismarineShard.name=Prismarine Shard item.botania:laputaShard.name=Shard of Laputa item.botania:virus0.name=Necrodermal Virus item.botania:virus1.name=Nullodermal Virus diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index a713a0e99..33466ecaa 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1211,7 +1211,6 @@ item.botania:fireRod.name=Vara de los infiernos item.botania:vineBall.name=Bola de enredadera item.botania:slingshot.name=Tirachinas de madera viviente item.botania:manaBottle.name=Maná en una botella -item.botania:prismarineShard.name=Fragmento de prismarina item.botania:laputaShard.name=Lasca de Laputa item.botania:virus0.name=Virus necrodermal item.botania:virus1.name=virus nullodermal diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 77c6a3759..23a653f99 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1071,7 +1071,6 @@ item.botania:fireRod.name=Bâton de l'enfer item.botania:vineBall.name=Boule de vigne item.botania:slingshot.name=Lance-pierre en vifbois item.botania:manaBottle.name=Mana en bouteille -item.botania:prismarineShard.name=Éclat de prismarin item.botania:laputaShard.name=Éclat de Laputa item.botania:virus0.name=Virus nécrodermal item.botania:virus1.name=Virus nullodermal diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index e0064db77..fb6ffefd1 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1236,7 +1236,6 @@ item.botania:fireRod.name=地獄の杖 item.botania:vineBall.name=ツタ玉 item.botania:slingshot.name=リビングウッドのパチンコ item.botania:manaBottle.name=マナ入り瓶 -item.botania:prismarineShard.name=プリズマリンの欠片 item.botania:laputaShard.name=ラピュタの破片 item.botania:virus0.name=表皮を腐らせるウィルス item.botania:virus1.name=表皮を溶かすウィルス diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 416107ea7..8bc856f44 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1172,7 +1172,6 @@ item.botania:fireRod.name=지옥의 막대 item.botania:vineBall.name=덩굴 공 item.botania:slingshot.name=생명의나무 개총 item.botania:manaBottle.name=마나가 들어있는 병 -item.botania:prismarineShard.name=프리스마린 샤드 item.botania:laputaShard.name=라퓨타의 조각 item.botania:virus0.name=Necrodermal 바이러스 item.botania:virus1.name=Nullodermal 바이러스 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index b7817b9ff..755fc7c37 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1304,7 +1304,6 @@ item.botania:fireRod.name=Staf der Hellevuur item.botania:vineBall.name=Lianenbol item.botania:slingshot.name=Levenshouten Katapult item.botania:manaBottle.name=Flesje Mana -item.botania:prismarineShard.name=Prismarine Scherf item.botania:laputaShard.name=Scherf van Laputa item.botania:virus0.name=Necrodermaal Virus item.botania:virus1.name=Nullodermaal Virus diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 7a4cc0b73..970c28334 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1454,7 +1454,6 @@ item.botania:fireRod.name=Cajado dos Infernos item.botania:vineBall.name=Bola de Vinhas item.botania:slingshot.name=Estilingue de Madeira-viva item.botania:manaBottle.name=Mana Engarrafada -item.botania:prismarineShard.name=Fragmento de Prismarinho item.botania:laputaShard.name=Fragmento de Laputa item.botania:virus0.name=Vírus Necrodermal item.botania:virus1.name=Vírus Nullodermal diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 0c5085bd4..8d4eaeacf 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -696,7 +696,6 @@ item.botania:fireRod.name=Жезл Ада item.botania:vineBall.name=Шар лозы item.botania:slingshot.name=Рогатка из жизнедерева item.botania:manaBottle.name=Мана в бутылке -item.botania:prismarineShard.name=Осколок призмарина item.botania:laputaShard.name=Осколок острова Лапута item.botania:virus0.name=Некродермальный вирус item.botania:virus1.name=Наллодермальный вирус diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 8f61dc2ec..9acf9e538 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1454,7 +1454,6 @@ item.botania:fireRod.name=地狱法杖 item.botania:vineBall.name=藤蔓球 item.botania:slingshot.name=活木弹弓 item.botania:manaBottle.name=瓶装魔力 -item.botania:prismarineShard.name=海晶石碎片 item.botania:laputaShard.name=拉普达碎片 item.botania:virus0.name=僵尸病毒 item.botania:virus1.name=骷髅病毒 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index a9434c9d2..cb2ee91ac 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1417,7 +1417,6 @@ item.botania:fireRod.name=地獄法杖 item.botania:vineBall.name=籐蔓球 item.botania:slingshot.name=活木彈弓 item.botania:manaBottle.name=瓶裝瑪那 -item.botania:prismarineShard.name=海晶石碎片 item.botania:laputaShard.name=拉普達碎片 item.botania:virus0.name=殭屍病毒 item.botania:virus1.name=骷髏病毒 diff --git a/src/main/resources/assets/botania/recipes/_constants.json b/src/main/resources/assets/botania/recipes/_constants.json index f52ad7d7d..61fa7b60e 100644 --- a/src/main/resources/assets/botania/recipes/_constants.json +++ b/src/main/resources/assets/botania/recipes/_constants.json @@ -160,6 +160,13 @@ }, "name": "GEMLAPIS" }, + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "gemPrismarine" + }, + "name": "GEMPRISMARINE" + }, { "ingredient": { "type": "forge:ore_dict", @@ -825,13 +832,6 @@ }, "name": "RUNEWRATHB" }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "shardPrismarine" - }, - "name": "SHARDPRISMARINE" - }, { "ingredient": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/botania/recipes/bloodpendant.json b/src/main/resources/assets/botania/recipes/bloodpendant.json index 7cbd1e810..bd725a579 100644 --- a/src/main/resources/assets/botania/recipes/bloodpendant.json +++ b/src/main/resources/assets/botania/recipes/bloodpendant.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#SHARDPRISMARINE" + "item": "#GEMPRISMARINE" }, "D": { "item": "#MANADIAMOND" diff --git a/src/main/resources/assets/botania/recipes/laputashard_0.json b/src/main/resources/assets/botania/recipes/laputashard_0.json index 604d1aaca..7f3f00ada 100644 --- a/src/main/resources/assets/botania/recipes/laputashard_0.json +++ b/src/main/resources/assets/botania/recipes/laputashard_0.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#SHARDPRISMARINE" + "item": "#GEMPRISMARINE" }, "A": { "item": "#RUNEAIRB" diff --git a/src/main/resources/assets/botania/recipes/lens_12.json b/src/main/resources/assets/botania/recipes/lens_12.json index bdae6d338..1cac74fdf 100644 --- a/src/main/resources/assets/botania/recipes/lens_12.json +++ b/src/main/resources/assets/botania/recipes/lens_12.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#SHARDPRISMARINE" + "item": "#GEMPRISMARINE" }, "R": { "item": "#RUNEAIRB" diff --git a/src/main/resources/assets/botania/recipes/lens_13.json b/src/main/resources/assets/botania/recipes/lens_13.json index eecac77c7..0b4cc13f2 100644 --- a/src/main/resources/assets/botania/recipes/lens_13.json +++ b/src/main/resources/assets/botania/recipes/lens_13.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#SHARDPRISMARINE" + "item": "#GEMPRISMARINE" }, "R": { "item": "#RUNEWATERB" diff --git a/src/main/resources/assets/botania/recipes/prism.json b/src/main/resources/assets/botania/recipes/prism.json index 445bf0a67..bd748e6fc 100644 --- a/src/main/resources/assets/botania/recipes/prism.json +++ b/src/main/resources/assets/botania/recipes/prism.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#SHARDPRISMARINE" + "item": "#GEMPRISMARINE" }, "S": { "item": "botania:platform",