diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index ecc60d956..8683fd4fe 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -209,11 +209,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { TilePool pool = (TilePool) world.getTileEntity(pos); - int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0); - if(pool.getCurrentMana() > 0) - val = Math.max(val, 1); - - return val; + return TilePool.calculateComparatorLevel(pool.getCurrentMana(), pool.manaCap); } @Override 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 2b15ee055..2dfb361a8 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 @@ -140,6 +140,13 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt ManaNetworkEvent.removePool(this); } + public static int calculateComparatorLevel(int mana, int max) { + int val = (int) ((double) mana / (double) max * 15.0); + if(mana > 0) + val = Math.max(val, 1); + return val; + } + public static RecipeManaInfusion getMatchingRecipe(@Nonnull ItemStack stack, @Nonnull IBlockState state) { List matchingNonCatRecipes = new ArrayList<>(); List matchingCatRecipes = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 539ed2124..742245b5c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -179,7 +179,7 @@ public class EntityPoolMinecart extends EntityMinecart { if(can) { pump.hasCartOnTop = true; - pump.comparator = (int) ((double) getMana() / (double) TilePool.MAX_MANA * 15); + pump.comparator = (int) ((double) getMana() / (double) TilePool.MAX_MANA * 15); // different from TilePool.calculateComparatorLevel, kept for compatibility } } @@ -199,6 +199,11 @@ public class EntityPoolMinecart extends EntityMinecart { setMana(cmp.getInteger(TAG_MANA)); } + @Override + public int getComparatorLevel() { + return TilePool.calculateComparatorLevel(getMana(), TilePool.MAX_MANA); + } + public int getMana() { return dataManager.get(MANA); }