From 925f244cc02afe46e31286e60fd91c4c20a5854c Mon Sep 17 00:00:00 2001 From: micle Date: Mon, 12 Jan 2026 04:37:21 +0100 Subject: [PATCH] Removed old networking code. --- .../network/NetworkManager.java | 37 ------------ .../network/client/ChangeTargetPacket.java | 40 ------------- .../network/client/ChargeTotemPacket.java | 34 ----------- .../network/client/ReviveTargetPacket.java | 59 ------------------- .../micle/totem_of_reviving/proxy/Proxy.java | 1 - 5 files changed, 171 deletions(-) delete mode 100644 src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java delete mode 100644 src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java delete mode 100644 src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java delete mode 100644 src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java diff --git a/src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java b/src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java deleted file mode 100644 index bd3b80c..0000000 --- a/src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java +++ /dev/null @@ -1,37 +0,0 @@ -package dev.micle.totem_of_reviving.network; - -public class NetworkManager { -// // Initialize variables -// private static SimpleChannel channel; -// -// public static void init() { -// // Create channel -// channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network")) -// .clientAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion())) -// .serverAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion())) -// .networkProtocolVersion(TotemOfReviving::getVersion) -// .simpleChannel(); -// -// // Register packets -// int id = 0; -// channel.messageBuilder(ChangeTargetPacket.class, id++) -// .encoder(ChangeTargetPacket::encode) -// .decoder(ChangeTargetPacket::decode) -// .consumerNetworkThread(ChangeTargetPacket::handle) -// .add(); -// channel.messageBuilder(ChargeTotemPacket.class, id++) -// .encoder(ChargeTotemPacket::encode) -// .decoder(ChargeTotemPacket::decode) -// .consumerNetworkThread(ChargeTotemPacket::handle) -// .add(); -// channel.messageBuilder(ReviveTargetPacket.class, id++) -// .encoder(ReviveTargetPacket::encode) -// .decoder(ReviveTargetPacket::decode) -// .consumerNetworkThread(ReviveTargetPacket::handle) -// .add(); -// } -// -// public static SimpleChannel getChannel() { -// return channel; -// } -} diff --git a/src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java b/src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java deleted file mode 100644 index 873d8cb..0000000 --- a/src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java +++ /dev/null @@ -1,40 +0,0 @@ -package dev.micle.totem_of_reviving.network.client; - -public class ChangeTargetPacket { -// private final InteractionHand hand; -// -// public ChangeTargetPacket(final InteractionHand hand) { -// this.hand = hand; -// } -// -// public static void encode(final ChangeTargetPacket packet, final FriendlyByteBuf buffer) { -// buffer.writeEnum(packet.hand); -// } -// -// public static ChangeTargetPacket decode(final FriendlyByteBuf buffer) { -// return new ChangeTargetPacket(buffer.readEnum(InteractionHand.class)); -// } -// -// public static void handle(final ChangeTargetPacket packet, final Supplier contextSupplier) { -// final NetworkEvent.Context context = contextSupplier.get(); -// context.enqueueWork(() -> { -// ServerPlayer sender = context.getSender(); -// if (sender == null) { return; } -// -// ItemStack totemStack = sender.getItemInHand(packet.hand); -// PlayerList playerList = TotemOfReviving.getProxy().getServer().getPlayerList(); -// int targetIndex = TotemItem.getTargetIndex(totemStack) + 1; -// -// if (targetIndex > playerList.getPlayerCount()-1) { targetIndex = 0; } -// ServerPlayer target = playerList.getPlayers().get(targetIndex); -// -// TotemItem.setTargetIndex(totemStack, targetIndex); -// TotemItem.setTargetUUID(totemStack, target.getUUID()); -// TotemItem.setTargetName(totemStack, target.getDisplayName().getString()); -// TotemItem.setTargetDeaths(totemStack, target); -// -// sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + target.getDisplayName().getString() + ".")); -// }); -// context.setPacketHandled(true); -// } -} diff --git a/src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java b/src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java deleted file mode 100644 index c2199e8..0000000 --- a/src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java +++ /dev/null @@ -1,34 +0,0 @@ -package dev.micle.totem_of_reviving.network.client; - -public class ChargeTotemPacket { -// private final InteractionHand hand; -// -// public ChargeTotemPacket(final InteractionHand hand) { -// this.hand = hand; -// } -// -// public static void encode(final ChargeTotemPacket packet, final FriendlyByteBuf buffer) { -// buffer.writeEnum(packet.hand); -// } -// -// public static ChargeTotemPacket decode(final FriendlyByteBuf buffer) { -// return new ChargeTotemPacket(buffer.readEnum(InteractionHand.class)); -// } -// -// public static void handle(final ChargeTotemPacket packet, final Supplier contextSupplier) { -// final NetworkEvent.Context context = contextSupplier.get(); -// context.enqueueWork(() -> { -// ServerPlayer sender = context.getSender(); -// if (sender == null) { return; } -// -// ItemStack totemStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getMainHandItem() : sender.getOffhandItem(); -// ItemStack chargeStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getOffhandItem() : sender.getMainHandItem(); -// -// if (TotemItem.isTotemFull(totemStack)) { return; } -// -// TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) + 1); -// chargeStack.setCount(chargeStack.getCount() - 1); -// }); -// context.setPacketHandled(true); -// } -} diff --git a/src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java b/src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java deleted file mode 100644 index d526777..0000000 --- a/src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java +++ /dev/null @@ -1,59 +0,0 @@ -package dev.micle.totem_of_reviving.network.client; - -public class ReviveTargetPacket { -// private final InteractionHand hand; -// -// public ReviveTargetPacket(final InteractionHand hand) { -// this.hand = hand; -// } -// -// public static void encode(final ReviveTargetPacket packet, final FriendlyByteBuf buffer) { -// buffer.writeEnum(packet.hand); -// } -// -// public static ReviveTargetPacket decode(final FriendlyByteBuf buffer) { -// return new ReviveTargetPacket(buffer.readEnum(InteractionHand.class)); -// } -// -// public static void handle(final ReviveTargetPacket packet, final Supplier contextSupplier) { -// final NetworkEvent.Context context = contextSupplier.get(); -// context.enqueueWork(() -> { -// ServerPlayer sender = context.getSender(); -// if (sender == null) { return; } -// -// ItemStack totemStack = sender.getItemInHand(packet.hand); -// ServerPlayer target; -// -// try { -// target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack)); -// if (target == null) { throw new NullPointerException("Target is null!"); } -// } catch (NullPointerException exception) { -// sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Unable to find player!")); -// return; -// } -// -// if (!target.isSpectator()) { -// sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is not dead!")); -// return; -// } -// -// if (!target.serverLevel().equals(sender.serverLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { -// sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!")); -// return; -// } -// -// TotemItem.setTargetDeaths(totemStack, target); -// if (!TotemItem.canTotemAffordTarget(totemStack)) { -// sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Not enough charge!")); -// return; -// } -// -// target.teleportTo(sender.serverLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot()); -// target.setGameMode(sender.serverLevel().getServer().getDefaultGameType()); -// TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); -// totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); -// sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!")); -// }); -// context.setPacketHandled(true); -// } -} diff --git a/src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java b/src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java index 0dc55c5..28741aa 100644 --- a/src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java +++ b/src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java @@ -25,7 +25,6 @@ public class Proxy implements IProxy { // Initialize setup Registration.register(modEventBus); Config.init(modContainer); - //NetworkManager.init(); // Register mod event bus listeners modEventBus.addListener(Proxy::setup);