diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 3dcaa94a2..d0b5b6d0c 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -149,7 +149,7 @@ - + diff --git a/src/main/java/dan200/computercraft/client/ClientRegistry.java b/src/main/java/dan200/computercraft/client/ClientRegistry.java index d32af07ff..d8cd382a6 100644 --- a/src/main/java/dan200/computercraft/client/ClientRegistry.java +++ b/src/main/java/dan200/computercraft/client/ClientRegistry.java @@ -12,12 +12,10 @@ import dan200.computercraft.shared.common.IColouredItem; import dan200.computercraft.shared.media.items.ItemDisk; import dan200.computercraft.shared.pocket.items.ItemPocketComputer; import dan200.computercraft.shared.util.Colour; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.IUnbakedModel; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.resources.IResourceManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ColorHandlerEvent; @@ -79,11 +77,13 @@ public final class ClientRegistry @SubscribeEvent public static void onTextureStitchEvent( TextureStitchEvent.Pre event ) { + /* IResourceManager manager = Minecraft.getInstance().getResourceManager(); for( String extra : EXTRA_TEXTURES ) { // TODO: event.getMap().registerSprite( manager, new ResourceLocation( ComputerCraft.MOD_ID, extra ) ); } + */ } @SubscribeEvent diff --git a/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java b/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java index 4c6fe4de6..72ba67090 100644 --- a/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java +++ b/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java @@ -94,8 +94,8 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer GameRenderer.drawNameplate( getFontRenderer(), label, (float) posX + 0.5F, (float) posY + 1.2F, (float) posZ + 0.5F, 0, - rendererDispatcher.field_217666_g.func_216778_f(), rendererDispatcher.field_217666_g.func_216777_e(), false // yaw, pitch + rendererDispatcher.field_217666_g.func_216778_f(), rendererDispatcher.field_217666_g.func_216777_e(), false ); setLightmapDisabled( false ); } diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java index 53fc60e7b..247eb75e0 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java @@ -333,7 +333,7 @@ public class TileCable extends TileGeneric implements IPeripheralTile for( Direction facing : DirectionUtil.FACINGS ) { BlockPos offset = current.offset( facing ); - if( !world.isBlockLoaded( offset ) ) continue; + if( !world.isAreaLoaded( offset, 0 ) ) continue; LazyOptional element = ComputerCraftAPI.getWiredElementAt( world, offset, facing.getOpposite() ); if( !element.isPresent() ) continue; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java index d7199e837..13b68cb18 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java @@ -286,7 +286,7 @@ public class TileWiredModemFull extends TileGeneric implements IPeripheralTile for( Direction facing : DirectionUtil.FACINGS ) { BlockPos offset = current.offset( facing ); - if( !world.isBlockLoaded( offset ) ) continue; + if( !world.isAreaLoaded( offset, 0 ) ) continue; LazyOptional element = ComputerCraftAPI.getWiredElementAt( world, offset, facing.getOpposite() ); if( !element.isPresent() ) continue; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java index f461fb7a1..923fb0c0e 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java @@ -362,7 +362,7 @@ public class TileMonitor extends TileGeneric implements IPeripheralTile int y = pos.getY(); World world = getWorld(); - if( world == null || !world.isBlockLoaded( pos ) ) return null; + if( world == null || !world.isAreaLoaded( pos, 0 ) ) return null; TileEntity tile = world.getTileEntity( pos ); if( !(tile instanceof TileMonitor) ) return null; diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java index 0920f28b5..5612b5884 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java @@ -306,7 +306,7 @@ public class TurtleBrain implements ITurtleAccess } // Ensure the chunk is loaded - if( !world.isBlockLoaded( pos ) ) return false; + if( !world.isAreaLoaded( pos, 0 ) ) return false; // Ensure we're inside the world border if( !world.getWorldBorder().contains( pos ) ) return false; diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java index d6d639523..da10a199f 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java @@ -146,7 +146,7 @@ public class TurtleMoveCommand implements ITurtleCommand return TurtleCommandResult.failure( "Cannot enter protected area" ); } - if( !world.isBlockLoaded( position ) ) return TurtleCommandResult.failure( "Cannot leave loaded world" ); + if( !world.isAreaLoaded( position, 0 ) ) return TurtleCommandResult.failure( "Cannot leave loaded world" ); if( !world.getWorldBorder().contains( position ) ) { return TurtleCommandResult.failure( "Cannot pass the world border" ); diff --git a/src/main/java/dan200/computercraft/shared/util/TickScheduler.java b/src/main/java/dan200/computercraft/shared/util/TickScheduler.java index 6a367da98..50a3bcad6 100644 --- a/src/main/java/dan200/computercraft/shared/util/TickScheduler.java +++ b/src/main/java/dan200/computercraft/shared/util/TickScheduler.java @@ -59,7 +59,7 @@ public final class TickScheduler World world = tile.getWorld(); BlockPos pos = tile.getPos(); - if( world != null && pos != null && world.isBlockLoaded( pos ) && world.getTileEntity( pos ) == tile ) + if( world != null && pos != null && world.isAreaLoaded( pos, 0 ) && world.getTileEntity( pos ) == tile ) { world.getPendingBlockTicks().scheduleTick( pos, tile.getBlockState().getBlock(), 0 ); } diff --git a/src/test/java/dan200/computercraft/core/filesystem/FileSystemTest.java b/src/test/java/dan200/computercraft/core/filesystem/FileSystemTest.java index abff129e8..95c3cf66c 100644 --- a/src/test/java/dan200/computercraft/core/filesystem/FileSystemTest.java +++ b/src/test/java/dan200/computercraft/core/filesystem/FileSystemTest.java @@ -40,7 +40,7 @@ public class FileSystemTest wrapper.call( "close" ); } - assertEquals( "This is a long line", Files.toString( new File( ROOT, "out.txt" ), StandardCharsets.UTF_8 ) ); + assertEquals( "This is a long line", Files.asCharSource( new File( ROOT, "out.txt" ), StandardCharsets.UTF_8 ).read() ); { FileSystemWrapper writer = fs.openForWrite( "out.txt", false, EncodedWritableHandle::openUtf8 ); @@ -49,6 +49,6 @@ public class FileSystemTest wrapper.call( "close" ); } - assertEquals( "Tiny line", Files.toString( new File( ROOT, "out.txt" ), StandardCharsets.UTF_8 ) ); + assertEquals( "Tiny line", Files.asCharSource( new File( ROOT, "out.txt" ), StandardCharsets.UTF_8 ).read() ); } } diff --git a/src/test/java/dan200/computercraft/core/filesystem/ResourceMountTest.java b/src/test/java/dan200/computercraft/core/filesystem/ResourceMountTest.java index f4f074f52..00ea5fa2f 100644 --- a/src/test/java/dan200/computercraft/core/filesystem/ResourceMountTest.java +++ b/src/test/java/dan200/computercraft/core/filesystem/ResourceMountTest.java @@ -28,7 +28,7 @@ public class ResourceMountTest @BeforeEach public void before() { - SimpleReloadableResourceManager manager = new SimpleReloadableResourceManager( ResourcePackType.SERVER_DATA ); + SimpleReloadableResourceManager manager = new SimpleReloadableResourceManager( ResourcePackType.SERVER_DATA, null ); manager.addResourcePack( new FolderPack( new File( "src/main/resources" ) ) ); mount = new ResourceMount( "computercraft", "lua/rom", manager );