diff --git a/common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java b/common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java index 49e6998dd..ca8692686 100644 --- a/common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java +++ b/common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java @@ -19,6 +19,7 @@ package com.seibel.lod.common.networking; +/* #if MC_1_16_5 import me.shedaniel.architectury.networking.NetworkManager; #else @@ -26,6 +27,7 @@ import dev.architectury.networking.NetworkManager; #endif import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; +*/ /** * @author Ran @@ -33,6 +35,7 @@ import net.minecraft.network.FriendlyByteBuf; // Comment: What does the 'server' side mean? Dedicated server? Or does it include the internal server? // (I removed the hookup that calls the register method, since I'm not sure what it is doing yet) public class NetworkReceiver { + /* public void register_Client() { NetworkManager.registerReceiver(NetworkManager.serverToClient(), Networking.RESOURCE_LOCATION, new ClientReceiver()); } @@ -54,4 +57,5 @@ public class NetworkReceiver { com.seibel.lod.common.networking.NetworkHandler.receivePacketClient(Minecraft.getInstance(), buf, context.getPlayer()); } } + */ } diff --git a/common/src/main/java/com/seibel/lod/common/networking/Networking.java b/common/src/main/java/com/seibel/lod/common/networking/Networking.java index b046bf84d..51c87b1a4 100644 --- a/common/src/main/java/com/seibel/lod/common/networking/Networking.java +++ b/common/src/main/java/com/seibel/lod/common/networking/Networking.java @@ -20,11 +20,11 @@ package com.seibel.lod.common.networking; import com.seibel.lod.core.ModInfo; -#if MC_1_16_5 -import me.shedaniel.architectury.networking.NetworkManager; -#else -import dev.architectury.networking.NetworkManager; -#endif +//#if MC_1_16_5 +//import me.shedaniel.architectury.networking.NetworkManager; +//#else +//import dev.architectury.networking.NetworkManager; +//#endif import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; @@ -57,7 +57,7 @@ public class Networking { * @param buf the payload of the packet. */ public static void send(ServerPlayer player, FriendlyByteBuf buf) { - NetworkManager.sendToPlayer(player, RESOURCE_LOCATION, buf); +// NetworkManager.sendToPlayer(player, RESOURCE_LOCATION, buf); } /** @@ -67,7 +67,7 @@ public class Networking { * @throws IllegalStateException if the client is not connected to a server */ public static void send(FriendlyByteBuf buf) throws IllegalStateException { - NetworkManager.sendToServer(RESOURCE_LOCATION, buf); +// NetworkManager.sendToServer(RESOURCE_LOCATION, buf); } } diff --git a/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java b/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java index 3012cb5e9..39309071d 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java @@ -104,7 +104,7 @@ public class FabricServerProxy { } // This just exists here for testing purposes, it'll be removed in the future - public void tester(MinecraftServer server) { + public void tester(MinecraftServer server) { // I disabled the Networking functions for now so this will not work atm - coolGi for (ServerPlayer player : server.getPlayerList().getPlayers()) { FriendlyByteBuf payload = Networking.createNew(); payload.writeInt(1);