From 1f11359b233845330a7ecafd53c4044d97c3bf43 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 6 Apr 2016 18:14:07 -0400 Subject: [PATCH 1/2] Fix munchdew not working Closes #220 --- .../common/block/subtile/generating/SubTileMunchdew.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index bb870b563..65b44e0cc 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -62,7 +62,7 @@ public class SubTileMunchdew extends SubTileGenerating { for(int j = 0; j < RANGE_Y; j++) for(int k = -RANGE; k < RANGE + 1; k++) { BlockPos pos_ = pos.add(i, j, k); - if(supertile.getWorld().getBlockState(pos).getMaterial()== Material.leaves) { + if(supertile.getWorld().getBlockState(pos_).getMaterial() == Material.leaves) { boolean exposed = false; for(EnumFacing dir : EnumFacing.VALUES) { IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); From fa8c12d6fc218063f6ae42379a15595f73e0dfbc Mon Sep 17 00:00:00 2001 From: yrsegal Date: Thu, 7 Apr 2016 21:50:28 -0400 Subject: [PATCH 2/2] Catalysts can accept any catalyst BlockState. This constitutes a major, but not breaking, API update. All catalyst methods previously in RecipeManaInfusion have been deprecated. --- .../java/vazkii/botania/api/BotaniaAPI.java | 6 +- .../java/vazkii/botania/api/package-info.java | 2 +- .../api/recipe/RecipeManaInfusion.java | 64 +++++++++++++++---- .../botania/api/recipe/RecipeMiniFlower.java | 2 +- .../client/core/handler/HUDHandler.java | 2 +- .../core/handler/MiscellaneousIcons.java | 2 + .../jei/manapool/ManaPoolRecipeWrapper.java | 13 ++-- .../botania/common/block/ModBlocks.java | 4 ++ .../block/mana/BlockConjurationCatalyst.java | 10 +++ .../common/block/tile/mana/TilePool.java | 11 +--- .../lexicon/page/PageManaInfusionRecipe.java | 11 ++-- 11 files changed, 89 insertions(+), 38 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 93e756cd0..294dbba87 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -473,7 +473,7 @@ public final class BotaniaAPI { */ public static RecipeManaInfusion registerManaAlchemyRecipe(ItemStack output, Object input, int mana) { RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana); - recipe.setAlchemy(true); + recipe.setCatalyst(RecipeManaInfusion.alchemyState); return recipe; } @@ -484,7 +484,7 @@ public final class BotaniaAPI { */ public static RecipeManaInfusion registerManaConjurationRecipe(ItemStack output, Object input, int mana) { RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana); - recipe.setConjuration(true); + recipe.setCatalyst(RecipeManaInfusion.conjurationState); return recipe; } @@ -503,7 +503,7 @@ public final class BotaniaAPI { /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. - * @inputs The items used in the recipe, no more than 6. + * @param inputs The items used in the recipe, no more than 6. */ public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) { Preconditions.checkArgument(inputs.length <= 6); diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index f82edd722..de410da59 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "77", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "78", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 0f659de48..b31c947f4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -10,9 +10,11 @@ */ package vazkii.botania.api.recipe; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; import java.util.List; public class RecipeManaInfusion { @@ -20,8 +22,10 @@ public class RecipeManaInfusion { private final ItemStack output; private final Object input; private final int mana; - boolean isAlchemy = false; - boolean isConjuration = false; + private @Nullable IBlockState catalystState; + + public static IBlockState alchemyState; + public static IBlockState conjurationState; public RecipeManaInfusion(ItemStack output, Object input, int mana) { this.output = output; @@ -54,20 +58,12 @@ public class RecipeManaInfusion { return false; } - public void setAlchemy(boolean alchemy) { - isAlchemy = alchemy; + public IBlockState getCatalyst() { + return catalystState; } - public boolean isAlchemy() { - return isAlchemy; - } - - public void setConjuration(boolean conjuration) { - isConjuration = conjuration; - } - - public boolean isConjuration() { - return isConjuration; + public void setCatalyst(IBlockState catalyst) { + catalystState = catalyst; } public Object getInput() { @@ -81,5 +77,45 @@ public class RecipeManaInfusion { public int getManaToConsume() { return mana; } + + + + /** + * @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead + */ + @Deprecated + public void setAlchemy(boolean alchemy) { + if (alchemy) + catalystState = alchemyState; + else + catalystState = null; + } + + /** + * @deprecated Use {@link RecipeManaInfusion#getCatalyst()} instead + */ + @Deprecated + public boolean isAlchemy() { + return catalystState != null && catalystState.equals(alchemyState); + } + + /** + * @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead + */ + @Deprecated + public void setConjuration(boolean conjuration) { + if (conjuration) + catalystState = conjurationState; + else + catalystState = null; + } + + /** + * @deprecated Use {@link RecipeManaInfusion#getCatalyst()} instead + */ + @Deprecated + public boolean isConjuration() { + return catalystState != null && catalystState.equals(conjurationState); + } } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index e4f165ae4..351b9639a 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -17,7 +17,7 @@ public class RecipeMiniFlower extends RecipeManaInfusion { public RecipeMiniFlower(String flower, String mini, int mana) { super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), BotaniaAPI.internalHandler.getSubTileAsStack(mini), mana); - setAlchemy(true); + setCatalyst(RecipeManaInfusion.alchemyState); } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 53c73042e..c54159528 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -278,7 +278,7 @@ public final class HUDHandler { profiler.startSection("poolRecipe"); for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { if(recipe.matches(stack)) { - if((!recipe.isAlchemy() || tile.alchemy) && (!recipe.isConjuration() || tile.conjuration)) { + if(recipe.getCatalyst() == null || tile.getWorld().getBlockState(tile.getPos().down()).equals(recipe.getCatalyst())) { int x = res.getScaledWidth() / 2 - 11; int y = res.getScaledHeight() / 2 + 10; diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 6bb019a71..68c47d51a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -50,6 +50,7 @@ public class MiscellaneousIcons { lightRelayWorldIcon, lightRelayWorldIconRed, alchemyCatalystOverlay, + conjurationCatalystOverlay, enchanterOverlay, manaVoidOverlay, manaWater, @@ -105,6 +106,7 @@ public class MiscellaneousIcons { lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); + conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjurationCatalyst3", "blocks"); enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); manaVoidOverlay = IconHelper.forName(evt.getMap(), "manaVoid1", "blocks"); manaWater = IconHelper.forName(evt.getMap(), "manaWater", "blocks"); diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index 63c33004d..bbf50d856 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -10,8 +10,10 @@ package vazkii.botania.client.integration.jei.manapool; import com.google.common.collect.ImmutableList; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -31,7 +33,7 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { private final int mana; public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder builder = ImmutableList.builder(); if(recipe.getInput() instanceof ItemStack) { builder.add(recipe.getInput()); @@ -39,10 +41,11 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { builder.add(OreDictionary.getOres(((String) recipe.getInput()))); } - if(recipe.isAlchemy()) { - builder.add(new ItemStack(ModBlocks.alchemyCatalyst)); - } else if(recipe.isConjuration()) { - builder.add(new ItemStack(ModBlocks.conjurationCatalyst)); + if(recipe.getCatalyst() != null) { + Block block = recipe.getCatalyst().getBlock(); + if (Item.getItemFromBlock(block) != null) { + builder.add(new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst()))); + } } input = builder.build(); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index b0aed942b..14879b9da 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.client.lib.LibResources; @@ -409,6 +410,9 @@ public final class ModBlocks { BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); + RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); + RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); + initTileEntities(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 7e6942961..d5f030960 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -10,11 +10,15 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -28,4 +32,10 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.conjurationCatalyst; } + + @Override + @SideOnly(Side.CLIENT) + public TextureAtlasSprite getIcon(World world, BlockPos pos) { + return MiscellaneousIcons.INSTANCE.conjurationCatalystOverlay; + } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 0c75f7291..1bbdf303e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -84,9 +84,6 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc private static final String TAG_OUTPUT_KEY = "outputKey"; boolean outputting = false; - public boolean alchemy = false; - public boolean conjuration = false; - boolean catalystsRegistered = false; public EnumDyeColor color = EnumDyeColor.WHITE; int mana; @@ -160,11 +157,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc age = ((int) MethodHandles.itemAge_getter.invokeExact(item)); } catch (Throwable throwable) { return false; } - if(age > 100 && age < 130 || !catalystsRegistered) + if(age > 100 && age < 130) return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration)) { + if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()).equals(recipe.getCatalyst()))) { int mana = recipe.getManaToConsume(); if(getCurrentMana() >= mana) { recieveMana(-mana); @@ -232,10 +229,6 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc sendPacket = false; } - alchemy = worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.alchemyCatalyst; - conjuration = worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.conjurationCatalyst; - catalystsRegistered = true; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); for(EntityItem item : items) { if(item.isDead) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b71f71168..1ca856100 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -83,10 +84,12 @@ public class PageManaInfusionRecipe extends PageRecipe { renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); - if(recipe.isAlchemy()) - renderItemAtGridPos(gui, 1, 2, new ItemStack(ModBlocks.alchemyCatalyst), false); - else if(recipe.isConjuration()) - renderItemAtGridPos(gui, 1, 2, new ItemStack(ModBlocks.conjurationCatalyst), false); + if(recipe.getCatalyst() != null) { + Block block = recipe.getCatalyst().getBlock(); + if (Item.getItemFromBlock(block) != null) { + renderItemAtGridPos(gui, 1, 2, new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst())), false); + } + } GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);