abstract peripheral ticker

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java

@@ -485,6 +485,7 @@ public final MethodResult sendToastToPlayer(@NotNull IArguments arguments) throw
  });
  }
 
+ @Override
  public void update() {
  lastConsumedMessage = Events.traverseChatMessages(lastConsumedMessage, message -> {
  for (IComputerAccess computer : getConnectedComputers()) {

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/DistanceDetectorPeripheral.java

@@ -71,6 +71,10 @@ public float getConfiguredMaxRange() {
  return APConfig.PERIPHERALS_CONFIG.distanceDetectorRange.get().floatValue();
  }
 
+ public int getUpdateRate() {
+ return APConfig.PERIPHERALS_CONFIG.distanceDetectorUpdateRate.get();
+ }
+
  public float getMaxRange() {
  return Float.intBitsToFloat(this.maxRange.get());
  }
@@ -168,7 +172,7 @@ public final boolean getLaserVisibility() {
  return this.getShowLaser();
  }
 
- @LuaFunction(value = {"setIgnoreTransparency"})
+ @LuaFunction(value = "setIgnoreTransparency")
  public final void setIgnoreTransparencyLua(boolean enable) {
  this.setIgnoreTransparent(enable);
  }
@@ -231,17 +235,17 @@ public final boolean shouldCalculatePeriodically() {
  return this.getCalculatePeriodically();
  }
 
- @LuaFunction(value = {"setCalculatePeriodically"})
+ @LuaFunction(value = "setCalculatePeriodically")
  public final void setCalculatePeriodicallyLua(boolean shouldCalculatePeriodically) {
  this.setCalculatePeriodically(shouldCalculatePeriodically);
  }
 
- @LuaFunction(value = {"setMaxRange"})
+ @LuaFunction(value = "setMaxRange")
  public final void setMaxRangeLua(double maxDistance) {
  this.setMaxRange((float) maxDistance);
  }
 
- @LuaFunction(value = {"getMaxRange"})
+ @LuaFunction(value = "getMaxRange")
  public final double getMaxRangeLua() {
  return this.getMaxRange();
  }
@@ -273,6 +277,17 @@ public double calculateAndUpdateDistance() {
  return distance;
  }
 
+ @Override
+ public void update() {
+ if (this.getCalculatePeriodically() && this.getLevel().getGameTime() % this.getUpdateRate() == 0) {
+ // We calculate the distance every 2 ticks, so we do not have to run the getDistance function of the peripheral
+ // on the main thread which prevents the 1 tick yield time of the function.
+ // The calculateDistance function is not thread safe, so we have to run it on the main thread.
+ // It should be okay to run that function every 2 ticks, calculating it does not take too much time.
+ this.calculateAndUpdateDistance();
+ }
+ }
+
  protected HitResult getHitResult(Vec3 from, Vec3 to) {
  Level level = this.getLevel();
  ClipContext.ShapeGetter shapeGetter = this.ignoreTransparent ? HitResultUtil.IgnoreNoOccludedContext.INSTANCE : ClipContext.Block.COLLIDER;

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java

@@ -14,6 +14,7 @@
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.TurtlePeripheralOwner;
 import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
+import de.srendi.advancedperipherals.common.events.Events;
 import de.srendi.advancedperipherals.common.util.CoordUtil;
 import de.srendi.advancedperipherals.common.util.LuaConverter;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
@@ -33,6 +34,7 @@ public class PlayerDetectorPeripheral extends BasePeripheral<IPeripheralOwner> {
 
  public static final String PERIPHERAL_TYPE = "player_detector";
  private static final int MAX_RANGE = APConfig.PERIPHERALS_CONFIG.playerDetMaxRange.get();
+ private long lastConsumedMessage = Events.getLastPlayerMessageID() - 1;
 
  public PlayerDetectorPeripheral(PeripheralBlockEntity<?> tileEntity) {
  super(PERIPHERAL_TYPE, new BlockEntityPeripheralOwner<>(tileEntity));
@@ -265,4 +267,13 @@ private List<ServerPlayer> getPlayers() {
  private ServerPlayer getPlayer(String name) {
  return ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayerByName(name);
  }
+
+ @Override
+ public void update() {
+ lastConsumedMessage = Events.traversePlayerMessages(lastConsumedMessage, message -> getConnectedComputers().forEach(computer -> {
+ if(message.eventName().equals("playerChangedDimension")) {
+ computer.queueEvent(message.eventName(), message.playerName(), message.fromDimension(), message.toDimension());
+ } else computer.queueEvent(message.eventName(), message.playerName(), message.fromDimension());
+ }));
+ }
 }

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/turtles/TurtleChatBoxUpgrade.java

@@ -29,15 +29,4 @@ public ModelResourceLocation getRightModel() {
  protected ChatBoxPeripheral buildPeripheral(@NotNull ITurtleAccess turtle, @NotNull TurtleSide side) {
  return new ChatBoxPeripheral(turtle, side);
  }
-
- @Override
- public void update(@NotNull ITurtleAccess turtle, @NotNull TurtleSide side) {
- super.update(turtle, side);
- if (turtle.getLevel().isClientSide)
- return;
-
- if (turtle.getPeripheral(side) instanceof ChatBoxPeripheral chatBox) {
- chatBox.update();
- }
- }
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/base/BaseDetectorEntity.java

@@ -136,7 +136,8 @@ public void load(@NotNull CompoundTag nbt) {
 
  @Override
  public <T extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<T> type) {
- if (!level.isClientSide) {
+ super.handleTick(level, state, type);
+ if (!level.isClientSide()) {
  this.transferRate = this.proxy.getAndResetTransfered();
  }
  }

src/main/java/de/srendi/advancedperipherals/common/blocks/base/PeripheralBlockEntity.java

@@ -22,6 +22,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
@@ -243,4 +244,9 @@ public ComputerSide getComputerSide(Direction direction) {
  FrontAndTop orientation = getBlockState().getValue(BaseBlock.ORIENTATION);
  return CoordUtil.getComputerSide(orientation, direction);
  }
+
+ @Override
+ public <U extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<U> type) {
+ this.getLazyPeripheral().ifPresent(BasePeripheral<?>::update);
+ }
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/ChatBoxEntity.java

@@ -4,9 +4,6 @@
 import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
 import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 
@@ -21,9 +18,4 @@ public ChatBoxEntity(BlockPos pos, BlockState state) {
  protected ChatBoxPeripheral createPeripheral() {
  return new ChatBoxPeripheral(this);
  }
-
- @Override
- public <T extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<T> type) {
- this.getLazyPeripheral().ifPresent(ChatBoxPeripheral::update);
- }
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/DistanceDetectorEntity.java

@@ -9,9 +9,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
@@ -84,22 +81,6 @@ public void setDetectionType(DistanceDetectorPeripheral.DetectionType detectionT
  this.detectionType = detectionType;
  }
 
- @Override
- public <T extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<T> type) {
- DistanceDetectorPeripheral peripheral = this.getPeripheral();
- if (peripheral == null) {
- return;
- }
-
- if (level.getGameTime() % APConfig.PERIPHERALS_CONFIG.distanceDetectorUpdateRate.get() == 0 && this.getCalculatePeriodically()) {
- // We calculate the distance every 2 ticks, so we do not have to run the getDistance function of the peripheral
- // on the main thread which prevents the 1 tick yield time of the function.
- // The calculateDistance function is not thread safe, so we have to run it on the main thread.
- // It should be okay to run that function every 2 ticks, calculating it does not take too much time.
- peripheral.calculateAndUpdateDistance();
- }
- }
-
  @Override
  public AABB getRenderBoundingBox() {
  float currentDistance = this.getCurrentDistance();

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/MeBridgeEntity.java

@@ -54,7 +54,8 @@ protected MeBridgePeripheral createPeripheral() {
 
  @Override
  public <T extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<T> type) {
- if (!this.level.isClientSide) {
+ super.handleTick(level, state, type);
+ if (!this.level.isClientSide()) {
  if (!initialized) {
  MeBridgePeripheral peripheral = this.getPeripheral();
  if (peripheral == null) {

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/PlayerDetectorEntity.java

@@ -2,35 +2,19 @@
 
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.PlayerDetectorPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
-import de.srendi.advancedperipherals.common.events.Events;
 import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 
 public class PlayerDetectorEntity extends PeripheralBlockEntity<PlayerDetectorPeripheral> {
- private Long lastConsumedMessage;
-
  public PlayerDetectorEntity(BlockPos pos, BlockState state) {
  super(APBlockEntityTypes.PLAYER_DETECTOR.get(), pos, state);
- lastConsumedMessage = Events.getLastPlayerMessageID() - 1;
  }
 
  @NotNull
  @Override
  protected PlayerDetectorPeripheral createPeripheral() {
  return new PlayerDetectorPeripheral(this);
  }
-
- @Override
- public <T extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<T> type) {
- lastConsumedMessage = Events.traversePlayerMessages(lastConsumedMessage, message -> getConnectedComputers().forEach(computer -> {
- if(message.eventName().equals("playerChangedDimension")) {
- computer.queueEvent(message.eventName(), message.playerName(), message.fromDimension(), message.toDimension());
- } else computer.queueEvent(message.eventName(), message.playerName(), message.fromDimension());
- }));
- }
 }