Remove SERVER_TICK block property (GregTechCEu#3135)

Co-authored-by: screret <[email protected]>

Author: krossgg

src/main/java/com/gregtechceu/gtceu/api/block/BlockProperties.java

@@ -60,14 +60,13 @@ default BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
     default <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state,
                                                                    BlockEntityType<T> blockEntityType) {
         if (blockEntityType == getDefinition().getBlockEntityType()) {
-            if (state.getValue(BlockProperties.SERVER_TICK) && !level.isClientSide) {
+            if (!level.isClientSide) {
                 return (pLevel, pPos, pState, pTile) -> {
                     if (pTile instanceof IMachineBlockEntity metaMachine) {
                         metaMachine.getMetaMachine().serverTick();
                     }
                 };
-            }
-            if (level.isClientSide) {
+            } else {
                 return (pLevel, pPos, pState, pTile) -> {
                     if (pTile instanceof IMachineBlockEntity metaMachine) {
                         metaMachine.getMetaMachine().clientTick();

src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java

@@ -82,7 +82,6 @@ public MetaMachineBlock(Properties properties, MachineDefinition definition) {
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) {
-        pBuilder.add(BlockProperties.SERVER_TICK);
         RotationState rotationState = RotationState.get();
         if (rotationState != RotationState.NONE) {
             pBuilder.add(rotationState.property);

src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java

@@ -86,13 +86,12 @@ public abstract class PipeBlock<PipeType extends Enum<PipeType> & IPipeType<Node
     public PipeBlock(Properties properties, PipeType pipeType) {
         super(properties);
         this.pipeType = pipeType;
-        registerDefaultState(defaultBlockState().setValue(BlockProperties.SERVER_TICK, false)
-                .setValue(BlockStateProperties.WATERLOGGED, false));
+        registerDefaultState(defaultBlockState().setValue(BlockStateProperties.WATERLOGGED, false));
     }
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        super.createBlockStateDefinition(builder.add(BlockProperties.SERVER_TICK, BlockStateProperties.WATERLOGGED));
+        super.createBlockStateDefinition(builder.add(BlockStateProperties.WATERLOGGED));
     }
 
     @Override
@@ -439,7 +438,7 @@ public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos,
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state,
                                                                   BlockEntityType<T> blockEntityType) {
         if (blockEntityType == getBlockEntityType()) {
-            if (!level.isClientSide && state.getValue(BlockProperties.SERVER_TICK)) {
+            if (!level.isClientSide) {
                 return (pLevel, pPos, pState, pTile) -> {
                     if (pTile instanceof IPipeNode<?, ?> pipeNode) {
                         pipeNode.serverTick();

src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java

@@ -1,7 +1,6 @@
 package com.gregtechceu.gtceu.api.blockentity;
 
 import com.gregtechceu.gtceu.api.GTValues;
-import com.gregtechceu.gtceu.api.block.BlockProperties;
 import com.gregtechceu.gtceu.api.block.MaterialPipeBlock;
 import com.gregtechceu.gtceu.api.capability.ICoverable;
 import com.gregtechceu.gtceu.api.capability.IToolable;
@@ -34,7 +33,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -197,15 +195,6 @@ public TickableSubscription subscribeServerTick(Runnable runnable) {
         if (!isRemote()) {
             var subscription = new TickableSubscription(runnable);
             waitingToAdd.add(subscription);
-            var blockState = getBlockState();
-            if (!blockState.getValue(BlockProperties.SERVER_TICK)) {
-                if (getLevel() instanceof ServerLevel serverLevel) {
-                    blockState = blockState.setValue(BlockProperties.SERVER_TICK, true);
-                    setBlockState(blockState);
-                    serverLevel.getServer().tell(new TickTask(0, () -> serverLevel.setBlockAndUpdate(getBlockPos(),
-                            getBlockState().setValue(BlockProperties.SERVER_TICK, true))));
-                }
-            }
             return subscription;
         }
         return null;
@@ -222,8 +211,7 @@ public final void serverTick() {
             serverTicks.addAll(waitingToAdd);
             waitingToAdd.clear();
         }
-        var iter = serverTicks.iterator();
-        while (iter.hasNext()) {
+        for (var iter = serverTicks.iterator(); iter.hasNext();) {
             var tickable = iter.next();
             if (tickable.isStillSubscribed()) {
                 tickable.run();
@@ -232,9 +220,6 @@ public final void serverTick() {
                 iter.remove();
             }
         }
-        if (serverTicks.isEmpty() && waitingToAdd.isEmpty() && !this.isRemoved()) {
-            getLevel().setBlockAndUpdate(getBlockPos(), getBlockState().setValue(BlockProperties.SERVER_TICK, false));
-        }
     }
 
     //////////////////////////////////////

src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java

@@ -1,7 +1,6 @@
 package com.gregtechceu.gtceu.api.machine;
 
 import com.gregtechceu.gtceu.GTCEu;
-import com.gregtechceu.gtceu.api.block.BlockProperties;
 import com.gregtechceu.gtceu.api.block.IAppearance;
 import com.gregtechceu.gtceu.api.block.IMachineBlock;
 import com.gregtechceu.gtceu.api.block.MetaMachineBlock;
@@ -47,8 +46,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.TickTask;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -242,19 +239,6 @@ public TickableSubscription subscribeServerTick(Runnable runnable) {
         if (!isRemote()) {
             var subscription = new TickableSubscription(runnable);
             waitingToAdd.add(subscription);
-            var blockState = getBlockState();
-            if (!blockState.getValue(BlockProperties.SERVER_TICK)) {
-                if (getLevel() instanceof ServerLevel serverLevel) {
-                    blockState = blockState.setValue(BlockProperties.SERVER_TICK, true);
-                    holder.getSelf().setBlockState(blockState);
-                    serverLevel.getServer().tell(new TickTask(0, () -> {
-                        if (!isInValid()) {
-                            serverLevel.setBlockAndUpdate(getPos(),
-                                    getBlockState().setValue(BlockProperties.SERVER_TICK, true));
-                        }
-                    }));
-                }
-            }
             return subscription;
         } else if (getLevel() instanceof DummyWorld) {
             var subscription = new TickableSubscription(runnable);
@@ -272,9 +256,6 @@ public void unsubscribe(@Nullable TickableSubscription current) {
 
     public final void serverTick() {
         executeTick();
-        if (serverTicks.isEmpty() && waitingToAdd.isEmpty() && !isInValid()) {
-            getLevel().setBlockAndUpdate(getPos(), getBlockState().setValue(BlockProperties.SERVER_TICK, false));
-        }
     }
 
     public boolean isFirstDummyWorldTick = true;
@@ -295,8 +276,8 @@ private void executeTick() {
             serverTicks.addAll(waitingToAdd);
             waitingToAdd.clear();
         }
-        var iter = serverTicks.iterator();
-        while (iter.hasNext()) {
+
+        for (var iter = serverTicks.iterator(); iter.hasNext();) {
             var tickable = iter.next();
             if (tickable.isStillSubscribed()) {
                 tickable.run();