mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-19 14:45:12 +00:00
Code Issues Releases Wiki Activity

Update to MC 1.18

Browse Source 
- Build fails right now due to module issues, so this won't be pushed
   to GitHub.
 - Monitors render transparently when loaded into the world. I don't
   think this is a 1.17 bug, so not sure what's going on here!
This commit is contained in:
Jonathan Coates
2021-11-30 22:48:37 +00:00
parent 92fd93c0e0
commit 179da1d8cf
64 changed files with 124 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dan200/computercraft/shared/util/TickScheduler.java
View File

@@ -10,7 +10,8 @@ import dan200.computercraft.ComputerCraft;
import dan200.computercraft.shared.common.TileGeneric;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.TickList;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -21,7 +22,7 @@ import java.util.Iterator;
import java.util.Set;
/**
* A thread-safe version of {@link TickList#scheduleTick(BlockPos, Object, int)}.
* A thread-safe version of {@link LevelAccessor#scheduleTick(BlockPos, Block, int)}.
*
* We use this when modems and other peripherals change a block in a different thread.
*/
@@ -58,9 +59,9 @@ public final class TickScheduler
Level world = tile.getLevel();
BlockPos pos = tile.getBlockPos();
if( world != null && pos != null && world.isAreaLoaded( pos, 0 ) && world.getBlockEntity( pos ) == tile )
if( world != null && pos != null && world.isLoaded( pos ) && world.getBlockEntity( pos ) == tile )
{
world.getBlockTicks().scheduleTick( pos, tile.getBlockState().getBlock(), 0 );
world.scheduleTick( pos, tile.getBlockState().getBlock(), 0 );
}
}
}