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

Refactored the network package.

Browse Source
This commit is contained in:
Micle
2022-11-03 18:54:23 +00:00
parent 7e66d964c6
commit 8169a1a344
7 changed files with 61 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java
View File

@ -2,10 +2,10 @@ package dev.micle.totemofreviving.item.totem;
import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.setup.Config;
import dev.micle.totemofreviving.network.ChangeTargetPacket;
import dev.micle.totemofreviving.network.ChargeTotemPacket;
import dev.micle.totemofreviving.network.Network;
import dev.micle.totemofreviving.network.ReviveTargetPacket;
import dev.micle.totemofreviving.network.client.ChangeTargetPacket;
import dev.micle.totemofreviving.network.client.ChargeTotemPacket;
import dev.micle.totemofreviving.network.NetworkManager;
import dev.micle.totemofreviving.network.client.ReviveTargetPacket;
import dev.micle.totemofreviving.setup.ModKeyMappings;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
@ -214,12 +214,12 @@ public abstract class TotemItem extends Item {
ItemStack chargeItem = (hand.equals(InteractionHand.MAIN_HAND)) ? player.getOffhandItem() : player.getMainHandItem();
if (player.isCrouching()) {
Network.channel.sendToServer(new ChangeTargetPacket(hand));
NetworkManager.getChannel().sendToServer(new ChangeTargetPacket(hand));
} else {
if (isCharge(chargeItem)) {
Network.channel.sendToServer(new ChargeTotemPacket(hand));
NetworkManager.getChannel().sendToServer(new ChargeTotemPacket(hand));
} else {
Network.channel.sendToServer(new ReviveTargetPacket(hand));
NetworkManager.getChannel().sendToServer(new ReviveTargetPacket(hand));
}
}
return super.use(world, player, hand);

83
src/main/java/dev/micle/totemofreviving/network/Network.java
View File

@ -1,83 +0,0 @@
package dev.micle.totemofreviving.network;
import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.util.MismatchedVersionException;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
import java.util.Objects;
import java.util.regex.Pattern;
public class Network {
public static final String VERSION = TotemOfReviving.MOD_ID + "-net-1";
private static final Pattern NET_VERSION_PATTERN = Pattern.compile(TotemOfReviving.MOD_ID + "-net-\\d+$");
private static final Pattern MOD_VERSION_PATTERN = Pattern.compile("Forge-\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+\\.\\d+$");
public static SimpleChannel channel;
public static void init() {
channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network"))
.clientAcceptedVersions(s -> Objects.equals(s, VERSION))
.serverAcceptedVersions(s -> Objects.equals(s, VERSION))
.networkProtocolVersion(() -> VERSION)
.simpleChannel();
int id = 0;
channel.messageBuilder(ChangeTargetPacket.class, id++)
.encoder(ChangeTargetPacket::encode)
.decoder(ChangeTargetPacket::decode)
.consumer(ChangeTargetPacket::handle)
.add();
channel.messageBuilder(ChargeTotemPacket.class, id++)
.encoder(ChargeTotemPacket::encode)
.decoder(ChargeTotemPacket::decode)
.consumer(ChargeTotemPacket::handle)
.add();
channel.messageBuilder(ReviveTargetPacket.class, id++)
.encoder(ReviveTargetPacket::encode)
.decoder(ReviveTargetPacket::decode)
.consumer(ReviveTargetPacket::handle)
.add();
}
public static void writeVersionInfo(FriendlyByteBuf buffer, boolean senderIsServer) {
buffer.writeBoolean(senderIsServer);
buffer.writeUtf(VERSION);
buffer.writeUtf(TotemOfReviving.getVersion());
}
public static void checkVersion(FriendlyByteBuf buffer) {
boolean senderIsServer = buffer.readBoolean();
String serverNetVersion = (senderIsServer) ? readNetVersion(buffer) : VERSION;
String serverModVersion = (senderIsServer) ? readModVersion(buffer) : TotemOfReviving.getVersion();
String clientNetVersion = (senderIsServer) ? VERSION : readNetVersion(buffer);
String clientModVersion = (senderIsServer) ? TotemOfReviving.getVersion() : readModVersion(buffer);
if (!serverNetVersion.equals(clientNetVersion)) {
throw new MismatchedVersionException(
String.format("The server and client are running different versions of [Micle's Totem of Reviving]. " +
"Try updating this mod on either the client and or the server. " +
"Client version is %s (%s). Server version is %s (%s)",
clientModVersion, clientNetVersion,
serverModVersion, serverNetVersion)
);
}
}
public static String readNetVersion(FriendlyByteBuf buffer) {
String netVersion = buffer.readUtf();
if (!NET_VERSION_PATTERN.matcher(netVersion).matches()) {
return "UNKNOWN (" + netVersion + ")";
}
return netVersion;
}
public static String readModVersion(FriendlyByteBuf buffer) {
String modVersion = buffer.readUtf();
if (!modVersion.equals("NONE") && !MOD_VERSION_PATTERN.matcher(modVersion).matches()) {
return "UNKNOWN (" + modVersion + ")";
}
return modVersion;
}
}

44
src/main/java/dev/micle/totemofreviving/network/NetworkManager.java Normal file
View File

@ -0,0 +1,44 @@
package dev.micle.totemofreviving.network;
import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.network.client.ChangeTargetPacket;
import dev.micle.totemofreviving.network.client.ChargeTotemPacket;
import dev.micle.totemofreviving.network.client.ReviveTargetPacket;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
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)
.consumer(ChangeTargetPacket::handle)
.add();
channel.messageBuilder(ChargeTotemPacket.class, id++)
.encoder(ChargeTotemPacket::encode)
.decoder(ChargeTotemPacket::decode)
.consumer(ChargeTotemPacket::handle)
.add();
channel.messageBuilder(ReviveTargetPacket.class, id++)
.encoder(ReviveTargetPacket::encode)
.decoder(ReviveTargetPacket::decode)
.consumer(ReviveTargetPacket::handle)
.add();
}
public static SimpleChannel getChannel() {
return channel;
}
}

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

@ -1,7 +1,8 @@
package dev.micle.totemofreviving.network;
package dev.micle.totemofreviving.network.client;
import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.item.totem.TotemItem;
import dev.micle.totemofreviving.network.NetworkManager;
import net.minecraft.ChatFormatting;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent;
@ -21,12 +22,10 @@ public class ChangeTargetPacket {
}
public static void encode(final ChangeTargetPacket packet, final FriendlyByteBuf buffer) {
Network.writeVersionInfo(buffer, false);
buffer.writeEnum(packet.hand);
}
public static ChangeTargetPacket decode(final FriendlyByteBuf buffer) {
Network.checkVersion(buffer);
return new ChangeTargetPacket(buffer.readEnum(InteractionHand.class));
}
@ -37,7 +36,7 @@ public class ChangeTargetPacket {
if (sender == null) { return; }
ItemStack totemStack = sender.getItemInHand(packet.hand);
PlayerList playerList = TotemOfReviving.PROXY.getServer().getPlayerList();
PlayerList playerList = TotemOfReviving.getProxy().getServer().getPlayerList();
int targetIndex = TotemItem.getTargetIndex(totemStack) + 1;
if (targetIndex > playerList.getPlayerCount()-1) { targetIndex = 0; }

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

@ -1,6 +1,7 @@
package dev.micle.totemofreviving.network;
package dev.micle.totemofreviving.network.client;
import dev.micle.totemofreviving.item.totem.TotemItem;
import dev.micle.totemofreviving.network.NetworkManager;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
@ -17,12 +18,10 @@ public class ChargeTotemPacket {
}
public static void encode(final ChargeTotemPacket packet, final FriendlyByteBuf buffer) {
Network.writeVersionInfo(buffer, false);
buffer.writeEnum(packet.hand);
}
public static ChargeTotemPacket decode(final FriendlyByteBuf buffer) {
Network.checkVersion(buffer);
return new ChargeTotemPacket(buffer.readEnum(InteractionHand.class));
}

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

@ -1,7 +1,8 @@
package dev.micle.totemofreviving.network;
package dev.micle.totemofreviving.network.client;
import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.item.totem.TotemItem;
import dev.micle.totemofreviving.network.NetworkManager;
import net.minecraft.ChatFormatting;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent;
@ -20,12 +21,10 @@ public class ReviveTargetPacket {
}
public static void encode(final ReviveTargetPacket packet, final FriendlyByteBuf buffer) {
Network.writeVersionInfo(buffer, false);
buffer.writeEnum(packet.hand);
}
public static ReviveTargetPacket decode(final FriendlyByteBuf buffer) {
Network.checkVersion(buffer);
return new ReviveTargetPacket(buffer.readEnum(InteractionHand.class));
}
@ -39,7 +38,7 @@ public class ReviveTargetPacket {
ServerPlayer target;
try {
target = TotemOfReviving.PROXY.getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack));
target = TotemOfReviving.getProxy().getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack));
if (target == null) { throw new NullPointerException("Target is null!"); }
} catch (NullPointerException exception) {
sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Unable to find player!"), sender.getUUID());

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

@ -2,7 +2,7 @@ package dev.micle.totemofreviving.proxy;
import dev.micle.totemofreviving.setup.Config;
import dev.micle.totemofreviving.data.DataGenerators;
import dev.micle.totemofreviving.network.Network;
import dev.micle.totemofreviving.network.NetworkManager;
import dev.micle.totemofreviving.setup.Registration;
import net.minecraft.client.Minecraft;
import net.minecraft.server.MinecraftServer;
@ -27,7 +27,7 @@ public class Proxy implements IProxy {
// Initialize setup
Registration.register();
Config.init();
Network.init();
NetworkManager.init();
// Register mod event bus listeners
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();