diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index b31c947f4..be05608c6 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -78,17 +78,12 @@ public class RecipeManaInfusion { return mana; } - - /** * @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead */ @Deprecated public void setAlchemy(boolean alchemy) { - if (alchemy) - catalystState = alchemyState; - else - catalystState = null; + catalystState = alchemy ? alchemyState : null; } /** @@ -96,7 +91,7 @@ public class RecipeManaInfusion { */ @Deprecated public boolean isAlchemy() { - return catalystState != null && catalystState.equals(alchemyState); + return catalystState == alchemyState; } /** @@ -104,10 +99,7 @@ public class RecipeManaInfusion { */ @Deprecated public void setConjuration(boolean conjuration) { - if (conjuration) - catalystState = conjurationState; - else - catalystState = null; + catalystState = conjuration ? conjurationState : null; } /** @@ -115,7 +107,7 @@ public class RecipeManaInfusion { */ @Deprecated public boolean isConjuration() { - return catalystState != null && catalystState.equals(conjurationState); + return catalystState == conjurationState; } } 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 c54159528..622018b04 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.getCatalyst() == null || tile.getWorld().getBlockState(tile.getPos().down()).equals(recipe.getCatalyst())) { + if(recipe.getCatalyst() == tile.getWorld().getBlockState(tile.getPos().down())) { int x = res.getScaledWidth() / 2 - 11; int y = res.getScaledHeight() / 2 + 10; 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 1bbdf303e..f0d5c3f97 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 @@ -161,7 +161,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()).equals(recipe.getCatalyst()))) { + if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()) == recipe.getCatalyst())) { int mana = recipe.getManaToConsume(); if(getCurrentMana() >= mana) { recieveMana(-mana);