diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 608c8f5f9..4134749d0 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -297,4 +297,12 @@ public final class CorporeaHelper { public static String stripControlCodes(String str) { return patternControlCode.matcher(str).replaceAll(""); } + + /** + * Returns the comparator strength for a corporea request that corporea crystal cubes and retainers use, following the usual "each step up requires double the items" formula. + */ + private static final double LOG_2 = Math.log(2); + public static int signalStrengthForRequestSize(int requestSize) { + return requestSize == 0 ? 0 : Math.min(15, (int) Math.floor(Math.log(requestSize) / LOG_2) + 1); + } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 8b0e0cd8e..a15c163c8 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -128,7 +128,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @Override public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { - return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; + return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).getComparatorValue(); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index e0c69b4d1..52f9324eb 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -75,7 +75,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { @Override public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { - return ((TileCorporeaRetainer) world.getTileEntity(pos)).hasPendingRequest() ? 15 : 0; + return ((TileCorporeaRetainer) world.getTileEntity(pos)).getComparatorValue(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 7d4d4fa0f..899473972 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -41,7 +41,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor ItemStack requestTarget = ItemStack.EMPTY; int itemCount = 0; int ticks = 0; - public int compValue = 0; + int compValue = 0; private final IAnimationStateMachine asm; @@ -111,7 +111,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } private void onUpdateCount() { - compValue = getComparatorValue(); + compValue = CorporeaHelper.signalStrengthForRequestSize(itemCount); world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } @@ -134,9 +134,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } public int getComparatorValue() { - if(itemCount == 0) - return 0; - return Math.min(15, (int) Math.floor(Math.log(itemCount) / LOG_2) + 1); + return compValue; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 2d4998e1f..a1a251160 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -38,6 +38,7 @@ public class TileCorporeaRetainer extends TileMod { BlockPos requestPos = BlockPos.ORIGIN; Object request; int requestCount; + int compValue; public void setPendingRequest(BlockPos pos, Object request, int requestCount) { if(pendingRequest) @@ -47,9 +48,15 @@ public class TileCorporeaRetainer extends TileMod { this.request = request; this.requestCount = requestCount; pendingRequest = true; + + compValue = CorporeaHelper.signalStrengthForRequestSize(requestCount); world.updateComparatorOutputLevel(getPos(), world.getBlockState(getPos()).getBlock()); } - + + public int getComparatorValue() { + return compValue; + } + public boolean hasPendingRequest() { return pendingRequest; }