minecraft-mods/totem_of_reviving
Private
Public Access
1
0
Fork 0
Code Issues 1 Projects Releases 3 Wiki Activity

WIP: Temporarily disabling old networking code.

Browse Source
This commit is contained in:
micle
2026-01-11 00:40:15 +01:00
parent 1c45352037
commit 8abbf5384e
5 changed files with 155 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/dev/micle/totemofreviving/network/NetworkManager.java
View File

@ -4,41 +4,39 @@ import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.network.client.ChangeTargetPacket; import dev.micle.totemofreviving.network.client.ChangeTargetPacket;
import dev.micle.totemofreviving.network.client.ChargeTotemPacket; import dev.micle.totemofreviving.network.client.ChargeTotemPacket;
import dev.micle.totemofreviving.network.client.ReviveTargetPacket; import dev.micle.totemofreviving.network.client.ReviveTargetPacket;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
public class NetworkManager { public class NetworkManager {
// Initialize variables // // Initialize variables
private static SimpleChannel channel; // private static SimpleChannel channel;
//
public static void init() { // public static void init() {
// Create channel // // Create channel
channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network")) // channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network"))
.clientAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion())) // .clientAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion()))
.serverAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion())) // .serverAcceptedVersions(v -> v.equals(TotemOfReviving.getVersion()))
.networkProtocolVersion(TotemOfReviving::getVersion) // .networkProtocolVersion(TotemOfReviving::getVersion)
.simpleChannel(); // .simpleChannel();
//
// Register packets // // Register packets
int id = 0; // int id = 0;
channel.messageBuilder(ChangeTargetPacket.class, id++) // channel.messageBuilder(ChangeTargetPacket.class, id++)
.encoder(ChangeTargetPacket::encode) // .encoder(ChangeTargetPacket::encode)
.decoder(ChangeTargetPacket::decode) // .decoder(ChangeTargetPacket::decode)
.consumerNetworkThread(ChangeTargetPacket::handle) // .consumerNetworkThread(ChangeTargetPacket::handle)
.add(); // .add();
channel.messageBuilder(ChargeTotemPacket.class, id++) // channel.messageBuilder(ChargeTotemPacket.class, id++)
.encoder(ChargeTotemPacket::encode) // .encoder(ChargeTotemPacket::encode)
.decoder(ChargeTotemPacket::decode) // .decoder(ChargeTotemPacket::decode)
.consumerNetworkThread(ChargeTotemPacket::handle) // .consumerNetworkThread(ChargeTotemPacket::handle)
.add(); // .add();
channel.messageBuilder(ReviveTargetPacket.class, id++) // channel.messageBuilder(ReviveTargetPacket.class, id++)
.encoder(ReviveTargetPacket::encode) // .encoder(ReviveTargetPacket::encode)
.decoder(ReviveTargetPacket::decode) // .decoder(ReviveTargetPacket::decode)
.consumerNetworkThread(ReviveTargetPacket::handle) // .consumerNetworkThread(ReviveTargetPacket::handle)
.add(); // .add();
} // }
//
public static SimpleChannel getChannel() { // public static SimpleChannel getChannel() {
return channel; // return channel;
} // }
} }

73
src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java
View File

@ -9,45 +9,44 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.players.PlayerList; import net.minecraft.server.players.PlayerList;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraftforge.network.NetworkEvent;
import java.util.function.Supplier; import java.util.function.Supplier;
public class ChangeTargetPacket { public class ChangeTargetPacket {
private final InteractionHand hand; // private final InteractionHand hand;
//
public ChangeTargetPacket(final InteractionHand hand) { // public ChangeTargetPacket(final InteractionHand hand) {
this.hand = hand; // this.hand = hand;
} // }
//
public static void encode(final ChangeTargetPacket packet, final FriendlyByteBuf buffer) { // public static void encode(final ChangeTargetPacket packet, final FriendlyByteBuf buffer) {
buffer.writeEnum(packet.hand); // buffer.writeEnum(packet.hand);
} // }
//
public static ChangeTargetPacket decode(final FriendlyByteBuf buffer) { // public static ChangeTargetPacket decode(final FriendlyByteBuf buffer) {
return new ChangeTargetPacket(buffer.readEnum(InteractionHand.class)); // return new ChangeTargetPacket(buffer.readEnum(InteractionHand.class));
} // }
//
public static void handle(final ChangeTargetPacket packet, final Supplier<NetworkEvent.Context> contextSupplier) { // public static void handle(final ChangeTargetPacket packet, final Supplier<NetworkEvent.Context> contextSupplier) {
final NetworkEvent.Context context = contextSupplier.get(); // final NetworkEvent.Context context = contextSupplier.get();
context.enqueueWork(() -> { // context.enqueueWork(() -> {
ServerPlayer sender = context.getSender(); // ServerPlayer sender = context.getSender();
if (sender == null) { return; } // if (sender == null) { return; }
//
ItemStack totemStack = sender.getItemInHand(packet.hand); // ItemStack totemStack = sender.getItemInHand(packet.hand);
PlayerList playerList = TotemOfReviving.getProxy().getServer().getPlayerList(); // PlayerList playerList = TotemOfReviving.getProxy().getServer().getPlayerList();
int targetIndex = TotemItem.getTargetIndex(totemStack) + 1; // int targetIndex = TotemItem.getTargetIndex(totemStack) + 1;
//
if (targetIndex > playerList.getPlayerCount()-1) { targetIndex = 0; } // if (targetIndex > playerList.getPlayerCount()-1) { targetIndex = 0; }
ServerPlayer target = playerList.getPlayers().get(targetIndex); // ServerPlayer target = playerList.getPlayers().get(targetIndex);
//
TotemItem.setTargetIndex(totemStack, targetIndex); // TotemItem.setTargetIndex(totemStack, targetIndex);
TotemItem.setTargetUUID(totemStack, target.getUUID()); // TotemItem.setTargetUUID(totemStack, target.getUUID());
TotemItem.setTargetName(totemStack, target.getDisplayName().getString()); // TotemItem.setTargetName(totemStack, target.getDisplayName().getString());
TotemItem.setTargetDeaths(totemStack, target); // TotemItem.setTargetDeaths(totemStack, target);
//
sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + target.getDisplayName().getString() + ".")); // sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + target.getDisplayName().getString() + "."));
}); // });
context.setPacketHandled(true); // context.setPacketHandled(true);
} // }
} }

61
src/main/java/dev/micle/totemofreviving/network/client/ChargeTotemPacket.java
View File

@ -5,39 +5,38 @@ import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraftforge.network.NetworkEvent;
import java.util.function.Supplier; import java.util.function.Supplier;
public class ChargeTotemPacket { public class ChargeTotemPacket {
private final InteractionHand hand; // private final InteractionHand hand;
//
public ChargeTotemPacket(final InteractionHand hand) { // public ChargeTotemPacket(final InteractionHand hand) {
this.hand = hand; // this.hand = hand;
} // }
//
public static void encode(final ChargeTotemPacket packet, final FriendlyByteBuf buffer) { // public static void encode(final ChargeTotemPacket packet, final FriendlyByteBuf buffer) {
buffer.writeEnum(packet.hand); // buffer.writeEnum(packet.hand);
} // }
//
public static ChargeTotemPacket decode(final FriendlyByteBuf buffer) { // public static ChargeTotemPacket decode(final FriendlyByteBuf buffer) {
return new ChargeTotemPacket(buffer.readEnum(InteractionHand.class)); // return new ChargeTotemPacket(buffer.readEnum(InteractionHand.class));
} // }
//
public static void handle(final ChargeTotemPacket packet, final Supplier<NetworkEvent.Context> contextSupplier) { // public static void handle(final ChargeTotemPacket packet, final Supplier<NetworkEvent.Context> contextSupplier) {
final NetworkEvent.Context context = contextSupplier.get(); // final NetworkEvent.Context context = contextSupplier.get();
context.enqueueWork(() -> { // context.enqueueWork(() -> {
ServerPlayer sender = context.getSender(); // ServerPlayer sender = context.getSender();
if (sender == null) { return; } // if (sender == null) { return; }
//
ItemStack totemStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getMainHandItem() : sender.getOffhandItem(); // ItemStack totemStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getMainHandItem() : sender.getOffhandItem();
ItemStack chargeStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getOffhandItem() : sender.getMainHandItem(); // ItemStack chargeStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getOffhandItem() : sender.getMainHandItem();
//
if (TotemItem.isTotemFull(totemStack)) { return; } // if (TotemItem.isTotemFull(totemStack)) { return; }
//
TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) + 1); // TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) + 1);
chargeStack.setCount(chargeStack.getCount() - 1); // chargeStack.setCount(chargeStack.getCount() - 1);
}); // });
context.setPacketHandled(true); // context.setPacketHandled(true);
} // }
} }

111
src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java
View File

@ -8,64 +8,63 @@ import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraftforge.network.NetworkEvent;
import java.util.function.Supplier; import java.util.function.Supplier;
public class ReviveTargetPacket { public class ReviveTargetPacket {
private final InteractionHand hand; // private final InteractionHand hand;
//
public ReviveTargetPacket(final InteractionHand hand) { // public ReviveTargetPacket(final InteractionHand hand) {
this.hand = hand; // this.hand = hand;
} // }
//
public static void encode(final ReviveTargetPacket packet, final FriendlyByteBuf buffer) { // public static void encode(final ReviveTargetPacket packet, final FriendlyByteBuf buffer) {
buffer.writeEnum(packet.hand); // buffer.writeEnum(packet.hand);
} // }
//
public static ReviveTargetPacket decode(final FriendlyByteBuf buffer) { // public static ReviveTargetPacket decode(final FriendlyByteBuf buffer) {
return new ReviveTargetPacket(buffer.readEnum(InteractionHand.class)); // return new ReviveTargetPacket(buffer.readEnum(InteractionHand.class));
} // }
//
public static void handle(final ReviveTargetPacket packet, final Supplier<NetworkEvent.Context> contextSupplier) { // public static void handle(final ReviveTargetPacket packet, final Supplier<NetworkEvent.Context> contextSupplier) {
final NetworkEvent.Context context = contextSupplier.get(); // final NetworkEvent.Context context = contextSupplier.get();
context.enqueueWork(() -> { // context.enqueueWork(() -> {
ServerPlayer sender = context.getSender(); // ServerPlayer sender = context.getSender();
if (sender == null) { return; } // if (sender == null) { return; }
//
ItemStack totemStack = sender.getItemInHand(packet.hand); // ItemStack totemStack = sender.getItemInHand(packet.hand);
ServerPlayer target; // ServerPlayer target;
//
try { // try {
target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack)); // target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack));
if (target == null) { throw new NullPointerException("Target is null!"); } // if (target == null) { throw new NullPointerException("Target is null!"); }
} catch (NullPointerException exception) { // } catch (NullPointerException exception) {
sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Unable to find player!")); // sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Unable to find player!"));
return; // return;
} // }
//
if (!target.isSpectator()) { // if (!target.isSpectator()) {
sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is not dead!")); // sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is not dead!"));
return; // return;
} // }
//
if (!target.serverLevel().equals(sender.serverLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { // 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!")); // sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!"));
return; // return;
} // }
//
TotemItem.setTargetDeaths(totemStack, target); // TotemItem.setTargetDeaths(totemStack, target);
if (!TotemItem.canTotemAffordTarget(totemStack)) { // if (!TotemItem.canTotemAffordTarget(totemStack)) {
sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Not enough charge!")); // sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Not enough charge!"));
return; // return;
} // }
//
target.teleportTo(sender.serverLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot()); // target.teleportTo(sender.serverLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot());
target.setGameMode(sender.serverLevel().getServer().getDefaultGameType()); // target.setGameMode(sender.serverLevel().getServer().getDefaultGameType());
TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); // TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack));
totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); // totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand));
sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!")); // sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!"));
}); // });
context.setPacketHandled(true); // context.setPacketHandled(true);
} // }
} }

2
src/main/java/dev/micle/totemofreviving/proxy/Proxy.java
View File

@ -26,7 +26,7 @@ public class Proxy implements IProxy {
// Initialize setup // Initialize setup
Registration.register(modEventBus); Registration.register(modEventBus);
Config.init(modContainer); Config.init(modContainer);
NetworkManager.init(); //NetworkManager.init();
// Register mod event bus listeners // Register mod event bus listeners
modEventBus.addListener(Proxy::setup); modEventBus.addListener(Proxy::setup);