diff --git a/build.gradle b/build.gradle index 8f07d44ba..9888692b1 100644 --- a/build.gradle +++ b/build.gradle @@ -237,13 +237,7 @@ task licenseFormatAPI(type: LicenseFormat) publishing { publications { mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } + from components.java } } diff --git a/src/main/java/dan200/computercraft/shared/Registry.java b/src/main/java/dan200/computercraft/shared/Registry.java index 92c04d2c8..a74862c24 100644 --- a/src/main/java/dan200/computercraft/shared/Registry.java +++ b/src/main/java/dan200/computercraft/shared/Registry.java @@ -45,11 +45,13 @@ import dan200.computercraft.shared.turtle.blocks.TileTurtle; import dan200.computercraft.shared.turtle.core.TurtlePlayer; import dan200.computercraft.shared.turtle.inventory.ContainerTurtle; import dan200.computercraft.shared.turtle.items.ItemTurtle; -import dan200.computercraft.shared.turtle.upgrades.*; +import dan200.computercraft.shared.turtle.upgrades.TurtleCraftingTable; +import dan200.computercraft.shared.turtle.upgrades.TurtleModem; +import dan200.computercraft.shared.turtle.upgrades.TurtleSpeaker; +import dan200.computercraft.shared.turtle.upgrades.TurtleTool; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; -import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.core.BlockPos; import net.minecraft.core.cauldron.CauldronInteraction; import net.minecraft.resources.ResourceLocation; @@ -107,14 +109,14 @@ public final class Registry public static final BlockMonitor MONITOR_ADVANCED = register( "monitor_advanced", new BlockMonitor( properties(), () -> ModBlockEntities.MONITOR_ADVANCED ) ); - public static final BlockComputer COMPUTER_NORMAL = - register( "computer_normal", new BlockComputer( properties(), ComputerFamily.NORMAL, () -> ModBlockEntities.COMPUTER_NORMAL ) ); + public static final BlockComputer COMPUTER_NORMAL = + register( "computer_normal", new BlockComputer<>( properties(), ComputerFamily.NORMAL, () -> ModBlockEntities.COMPUTER_NORMAL ) ); - public static final BlockComputer COMPUTER_ADVANCED = - register( "computer_advanced", new BlockComputer( properties(), ComputerFamily.ADVANCED, () -> ModBlockEntities.COMPUTER_ADVANCED ) ); + public static final BlockComputer COMPUTER_ADVANCED = + register( "computer_advanced", new BlockComputer<>( properties(), ComputerFamily.ADVANCED, () -> ModBlockEntities.COMPUTER_ADVANCED ) ); - public static final BlockComputer COMPUTER_COMMAND = - register( "computer_command", new BlockComputer( FabricBlockSettings.copyOf( Blocks.STONE ).strength( -1, 6000000.0F ), ComputerFamily.COMMAND, () -> ModBlockEntities.COMPUTER_COMMAND ) ); + public static final BlockComputer COMPUTER_COMMAND = + register( "computer_command", new BlockComputer<>( FabricBlockSettings.copyOf( Blocks.STONE ).strength( -1, 6000000.0F ), ComputerFamily.COMMAND, () -> ModBlockEntities.COMPUTER_COMMAND ) ); public static final BlockTurtle TURTLE_NORMAL = register( "turtle_normal", new BlockTurtle( turtleProperties(), ComputerFamily.NORMAL, () -> ModBlockEntities.TURTLE_NORMAL ) ); @@ -155,7 +157,7 @@ public final class Registry private static BlockBehaviour.Properties modemProperties() { - return FabricBlockSettings.copyOf( Blocks.STONE ).breakByHand( true ).breakByTool( FabricToolTags.PICKAXES ).strength( 1.5f ); + return FabricBlockSettings.copyOf( Blocks.STONE ).breakByHand( true ).strength( 1.5f ); } } @@ -301,7 +303,7 @@ public final class Registry { public static final EntityType TURTLE_PLAYER = net.minecraft.core.Registry.register( net.minecraft.core.Registry.ENTITY_TYPE, new ResourceLocation( MOD_ID, "turtle_player" ), - EntityType.Builder.createNothing( MobCategory.MISC ).noSave().noSummon().sized( 0, 0 ).build( ComputerCraft.MOD_ID + ":turtle_player" ) ); + EntityType.Builder.createNothing( MobCategory.MISC ).noSave().noSummon().sized( 0, 0 ).build( ComputerCraft.MOD_ID + ":turtle_player" ) ); } public static class ModContainers diff --git a/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java b/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java index 2627144b7..0d806dd39 100644 --- a/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java @@ -340,7 +340,7 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput @Override public String getHostString() { - return String.format( "ComputerCraft %s (Minecraft %s)", ComputerCraftAPI.getInstalledVersion(), SharedConstants.VERSION_STRING ); + return String.format( "ComputerCraft %s (Minecraft %s)", ComputerCraftAPI.getInstalledVersion(), SharedConstants.getCurrentVersion().getName() ); } @Nonnull diff --git a/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java b/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java index 63b8fd672..c065bd680 100644 --- a/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java +++ b/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java @@ -15,11 +15,12 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import me.shedaniel.cloth.api.utils.v1.GameInstanceUtils; import net.fabricmc.api.EnvType; -import net.fabricmc.fabric.api.network.ClientSidePacketRegistry; -import net.fabricmc.fabric.api.network.PacketContext; -import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.networking.v1.PacketSender; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket; @@ -27,6 +28,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerChunkCache; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.LevelChunk; @@ -50,12 +52,8 @@ public final class NetworkHandler public static void setup() { - ServerSidePacketRegistry.INSTANCE.register( ID, NetworkHandler::receive ); - if( FabricLoader.getInstance() - .getEnvironmentType() == EnvType.CLIENT ) - { - ClientSidePacketRegistry.INSTANCE.register( ID, NetworkHandler::receive ); - } + ServerPlayNetworking.registerGlobalReceiver( ID, NetworkHandler::receive ); + if( FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT ) ClientHandler.setup(); // Server messages registerMainThread( 0, ComputerActionServerMessage.class, ComputerActionServerMessage::new ); @@ -79,18 +77,16 @@ public final class NetworkHandler registerMainThread( 19, UploadResultMessage.class, UploadResultMessage::new ); } - private static void receive( PacketContext context, FriendlyByteBuf buffer ) + private static void receive( MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buffer, PacketSender sender ) { int type = buffer.readByte(); - packetReaders.get( type ) - .accept( context, buffer ); + packetReaders.get( type ).accept( new PacketContext( player, server ), buffer ); } @SuppressWarnings( "unchecked" ) private static Class getType( Supplier supplier ) { - return (Class) supplier.get() - .getClass(); + return (Class) supplier.get().getClass(); } private static FriendlyByteBuf encode( NetworkMessage message ) @@ -125,23 +121,37 @@ public final class NetworkHandler public static void sendToAllTracking( NetworkMessage packet, LevelChunk chunk ) { Consumer sender = p -> p.connection.send( new ClientboundCustomPayloadPacket( ID, encode( packet ) ) ); - ((ServerChunkCache)chunk.getLevel().getChunkSource()).chunkMap.getPlayers( chunk.getPos(), false ).forEach( sender ); + ((ServerChunkCache) chunk.getLevel().getChunkSource()).chunkMap.getPlayers( chunk.getPos(), false ).forEach( sender ); } /** * Register packet, and a thread-unsafe handler for it. * - * @param The type of the packet to send. - * @param type The class of the type of packet to send. - * @param id The identifier for this packet type. - * @param decoder The factory for this type of packet. + * @param The type of the packet to send. + * @param type The class of the type of packet to send. + * @param id The identifier for this packet type. + * @param decoder The factory for this type of packet. */ private static void registerMainThread( int id, Class type, Function decoder ) { packetIds.put( type, id ); packetReaders.put( id, ( context, buf ) -> { T result = decoder.apply( buf ); - context.getTaskQueue().execute( () -> result.handle( context ) ); + context.executor().execute( () -> result.handle( context ) ); } ); } + + private static class ClientHandler + { + static void setup() + { + ClientPlayNetworking.registerGlobalReceiver( ID, ClientHandler::receive ); + } + + static void receive( Minecraft client, ClientPacketListener handler, FriendlyByteBuf buffer, PacketSender responseSender ) + { + int type = buffer.readByte(); + packetReaders.get( type ).accept( new PacketContext( client.player, client ), buffer ); + } + } } diff --git a/src/main/java/dan200/computercraft/shared/network/NetworkMessage.java b/src/main/java/dan200/computercraft/shared/network/NetworkMessage.java index 545e7dc15..c9bc5e0d8 100644 --- a/src/main/java/dan200/computercraft/shared/network/NetworkMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/NetworkMessage.java @@ -5,7 +5,6 @@ */ package dan200.computercraft.shared.network; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/PacketContext.java b/src/main/java/dan200/computercraft/shared/network/PacketContext.java new file mode 100644 index 000000000..f9392a7e0 --- /dev/null +++ b/src/main/java/dan200/computercraft/shared/network/PacketContext.java @@ -0,0 +1,18 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ +package dan200.computercraft.shared.network; + +import net.minecraft.world.entity.player.Player; + +import java.util.concurrent.Executor; + +public record PacketContext(Player player, Executor executor) +{ + public Player getPlayer() + { + return player(); + } +} diff --git a/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java index 5ac6bcad6..453a5396d 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java @@ -8,7 +8,7 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.client.ClientTableFormatter; import dan200.computercraft.shared.command.text.TableBuilder; import dan200.computercraft.shared.network.NetworkMessage; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java index f42103494..023909b25 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java @@ -7,7 +7,7 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.shared.computer.core.ComputerState; import dan200.computercraft.shared.computer.core.ServerComputer; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java index 0c3d3cf60..1aea7f341 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java @@ -6,7 +6,7 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.ComputerCraft; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; public class ComputerDeletedClientMessage extends ComputerClientMessage diff --git a/src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java index f0da6ded4..c6ba85dad 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java @@ -5,7 +5,8 @@ */ package dan200.computercraft.shared.network.client; -import net.fabricmc.fabric.api.network.PacketContext; + +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java index 9cf5676cb..2a137a2a3 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java @@ -6,8 +6,8 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.shared.network.NetworkMessage; +import dan200.computercraft.shared.network.PacketContext; import dan200.computercraft.shared.peripheral.monitor.TileMonitor; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; diff --git a/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java index 6800dc304..de4c1f576 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java @@ -6,9 +6,9 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.shared.network.NetworkMessage; +import dan200.computercraft.shared.network.PacketContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; diff --git a/src/main/java/dan200/computercraft/shared/network/client/SpeakerMoveClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/SpeakerMoveClientMessage.java index f00c35d33..4bf55648e 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerMoveClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerMoveClientMessage.java @@ -7,9 +7,9 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.client.SoundManager; import dan200.computercraft.shared.network.NetworkMessage; +import dan200.computercraft.shared.network.PacketContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java index f0c8f7ecc..4d4674910 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java @@ -7,9 +7,9 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.client.SoundManager; import dan200.computercraft.shared.network.NetworkMessage; +import dan200.computercraft.shared.network.PacketContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/dan200/computercraft/shared/network/client/SpeakerStopClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/SpeakerStopClientMessage.java index ab7d5c57e..527a6f8ae 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerStopClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerStopClientMessage.java @@ -7,9 +7,9 @@ package dan200.computercraft.shared.network.client; import dan200.computercraft.client.SoundManager; import dan200.computercraft.shared.network.NetworkMessage; +import dan200.computercraft.shared.network.PacketContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/client/UploadResultMessage.java b/src/main/java/dan200/computercraft/shared/network/client/UploadResultMessage.java index 8d8283665..a083e63d8 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/UploadResultMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/UploadResultMessage.java @@ -9,7 +9,7 @@ import dan200.computercraft.client.gui.ComputerScreenBase; import dan200.computercraft.client.gui.OptionScreen; import dan200.computercraft.shared.computer.upload.UploadResult; import dan200.computercraft.shared.network.NetworkMessage; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java b/src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java index 3726b3dc3..8a269855d 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java @@ -7,7 +7,7 @@ package dan200.computercraft.shared.network.server; import dan200.computercraft.shared.computer.core.IContainerComputer; import dan200.computercraft.shared.computer.core.ServerComputer; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java b/src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java index defde0b5f..fea76996d 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java @@ -9,7 +9,7 @@ import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.computer.core.IContainerComputer; import dan200.computercraft.shared.computer.core.ServerComputer; import dan200.computercraft.shared.network.NetworkMessage; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java b/src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java index bc1e0847a..e6c22a1d0 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java @@ -7,7 +7,7 @@ package dan200.computercraft.shared.network.server; import dan200.computercraft.shared.computer.core.IContainerComputer; import dan200.computercraft.shared.computer.core.ServerComputer; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java b/src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java index 76e84c66e..ecd45cee3 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java @@ -8,7 +8,7 @@ package dan200.computercraft.shared.network.server; import dan200.computercraft.shared.computer.core.IContainerComputer; import dan200.computercraft.shared.computer.core.InputState; import dan200.computercraft.shared.computer.core.ServerComputer; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java b/src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java index e151c5146..ad9bc8a53 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java @@ -8,7 +8,7 @@ package dan200.computercraft.shared.network.server; import dan200.computercraft.shared.computer.core.IContainerComputer; import dan200.computercraft.shared.computer.core.InputState; import dan200.computercraft.shared.computer.core.ServerComputer; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java b/src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java index 6a4b485d0..b512092b5 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java @@ -7,8 +7,8 @@ package dan200.computercraft.shared.network.server; import dan200.computercraft.shared.computer.core.IContainerComputer; import dan200.computercraft.shared.computer.core.ServerComputer; +import dan200.computercraft.shared.network.PacketContext; import dan200.computercraft.shared.util.NBTUtil; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java b/src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java index f2c62fc13..8b161126d 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java @@ -8,7 +8,7 @@ package dan200.computercraft.shared.network.server; import dan200.computercraft.ComputerCraft; import dan200.computercraft.shared.computer.core.ServerComputer; import dan200.computercraft.shared.network.NetworkMessage; -import net.fabricmc.fabric.api.network.PacketContext; +import dan200.computercraft.shared.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import javax.annotation.Nonnull; diff --git a/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java b/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java index bf2ccc9d8..dda6dfcd6 100644 --- a/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java @@ -11,8 +11,8 @@ import dan200.computercraft.shared.computer.core.ServerComputer; import dan200.computercraft.shared.computer.upload.FileSlice; import dan200.computercraft.shared.computer.upload.FileUpload; import dan200.computercraft.shared.network.NetworkHandler; +import dan200.computercraft.shared.network.PacketContext; import io.netty.handler.codec.DecoderException; -import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; 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 f51913ca7..b9ed73c31 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 @@ -316,7 +316,7 @@ public class TileCable extends TileGeneric implements IPeripheralTile for( Direction facing : DirectionUtil.FACINGS ) { BlockPos offset = current.relative( facing ); - if( !world.hasChunkAt( offset ) ) + if( !world.isLoaded( offset ) ) { continue; } diff --git a/src/main/java/dan200/computercraft/shared/util/Config.java b/src/main/java/dan200/computercraft/shared/util/Config.java index 15000129b..dcc7c2cce 100644 --- a/src/main/java/dan200/computercraft/shared/util/Config.java +++ b/src/main/java/dan200/computercraft/shared/util/Config.java @@ -17,7 +17,7 @@ import dan200.computercraft.core.apis.http.options.Action; import dan200.computercraft.core.apis.http.options.AddressRuleConfig; import dan200.computercraft.fabric.mixin.LevelResourceAccess; import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer; -import net.fabricmc.loader.FabricLoader; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; import net.minecraft.world.level.storage.LevelResource; @@ -47,7 +47,7 @@ public final class Config private static final String serverFileName = "computercraft-server.toml"; private static Path serverPath = null; - private static final Path clientPath = FabricLoader.INSTANCE.getConfigDir().resolve( "computercraft-client.toml" ); + private static final Path clientPath = FabricLoader.getInstance().getConfigDir().resolve( "computercraft-client.toml" ); private Config() {