diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index c0f436861..20a93392c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -38,8 +38,8 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase { } @Override - public void randomTick(BlockState state, World world, BlockPos pos, Random rand) { - world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false), 1 | 2); + public void tick(BlockState state, World world, BlockPos pos, Random rand) { + world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false)); } @Override 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 71a18a51b..d55e7c050 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -42,9 +42,9 @@ public class BlockCorporeaRetainer extends BlockMod { if(power && !powered) { ((TileCorporeaRetainer) world.getTileEntity(pos)).fulfilRequest(); - world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, true), 4); + world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, true)); } else if(!power && powered) - world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false), 4); + world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index ae806ee45..59103af30 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -50,8 +50,8 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor missing -= stack_.getCount(); if(missing > 0 && !world.getBlockState(getPos()).get(BotaniaStateProps.POWERED)) { - world.setBlockState(getPos(), world.getBlockState(getPos()).with(BotaniaStateProps.POWERED, true), 1 | 2); - world.getPendingBlockTicks().scheduleTick(getPos(), getBlockState().getBlock(), 2); + world.setBlockState(getPos(), world.getBlockState(getPos()).with(BotaniaStateProps.POWERED, true)); + world.getPendingBlockTicks().scheduleTick(getPos(), getBlockState().getBlock(), getBlockState().getBlock().tickRate(world)); TileEntity requestor = source.getSparkInventory().world.getTileEntity(source.getSparkInventory().pos); for(Direction dir : Direction.values()) { @@ -66,7 +66,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } - public List getFilter() { + private List getFilter() { List filter = new ArrayList<>(); for(Direction dir : Direction.values()) { 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 a0e052588..633063f84 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 @@ -25,6 +25,7 @@ import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; import java.util.function.Function; @@ -34,19 +35,17 @@ import static vazkii.botania.api.corporea.CorporeaRequestDefaultMatchers.*; public class TileCorporeaRetainer extends TileMod { @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.CORPOREA_RETAINER) public static TileEntityType TYPE; - private static final String TAG_PENDING_REQUEST = "pendingRequest"; private static final String TAG_REQUEST_X = "requestX"; private static final String TAG_REQUEST_Y = "requestY"; private static final String TAG_REQUEST_Z = "requestZ"; - private static final String TAG_REQUEST_TYPE = "requestType_"; - private static final String TAG_REQUEST_CONTENTS = "requestContents"; + private static final String TAG_REQUEST_TYPE = "requestType"; private static final String TAG_REQUEST_COUNT = "requestCount"; public static final Map> corporeaMatcherDeserializers = new HashMap<>(); public static final Map, String> corporeaMatcherSerializers = new HashMap<>(); - private boolean pendingRequest = false; private BlockPos requestPos = BlockPos.ZERO; + @Nullable private ICorporeaRequestMatcher request; private int requestCount; private int compValue; @@ -61,14 +60,13 @@ public class TileCorporeaRetainer extends TileMod { } public void setPendingRequest(BlockPos pos, ICorporeaRequestMatcher request, int requestCount) { - if(pendingRequest) + if(hasPendingRequest()) return; - requestPos = pos; + this.requestPos = pos; this.request = request; this.requestCount = requestCount; - pendingRequest = true; - + compValue = CorporeaHelper.signalStrengthForRequestSize(requestCount); world.updateComparatorOutputLevel(getPos(), world.getBlockState(getPos()).getBlock()); } @@ -78,7 +76,7 @@ public class TileCorporeaRetainer extends TileMod { } public boolean hasPendingRequest() { - return pendingRequest; + return request != null; } public void fulfilRequest() { @@ -91,8 +89,9 @@ public class TileCorporeaRetainer extends TileMod { if(inv != null && inv.world.getTileEntity(inv.pos) instanceof ICorporeaRequestor) { ICorporeaRequestor requestor = (ICorporeaRequestor) inv.world.getTileEntity(inv.pos); requestor.doCorporeaRequest(request, requestCount, spark); - pendingRequest = false; - + + request = null; + requestCount = 0; compValue = 0; world.updateComparatorOutputLevel(getPos(), world.getBlockState(getPos()).getBlock()); } @@ -103,7 +102,6 @@ public class TileCorporeaRetainer extends TileMod { public void writePacketNBT(CompoundNBT cmp) { super.writePacketNBT(cmp); - cmp.putBoolean(TAG_PENDING_REQUEST, pendingRequest); cmp.putInt(TAG_REQUEST_X, requestPos.getX()); cmp.putInt(TAG_REQUEST_Y, requestPos.getY()); cmp.putInt(TAG_REQUEST_Z, requestPos.getZ()); @@ -121,7 +119,6 @@ public class TileCorporeaRetainer extends TileMod { public void readPacketNBT(CompoundNBT cmp) { super.readPacketNBT(cmp); - pendingRequest = cmp.getBoolean(TAG_PENDING_REQUEST); int x = cmp.getInt(TAG_REQUEST_X); int y = cmp.getInt(TAG_REQUEST_Y); int z = cmp.getInt(TAG_REQUEST_Z);