From be158c66ed81b8d4c3349b14cab007e41ffb5233 Mon Sep 17 00:00:00 2001
From: Oth3r <oth3rone@outlook.com>
Date: Mon, 29 Apr 2024 12:38:32 -0500
Subject: [PATCH] Revert "updated packet system"

This reverts commit 2e02d67c8e0409c4a63494065fdc5c4e858d1f9d.
---
 src/main/java/one/oth3r/sit/Sit.java          | 30 +++++++++++++------
 src/main/java/one/oth3r/sit/SitClient.java    |  4 +--
 .../one/oth3r/sit/packet/CustomPayloads.java  | 27 -----------------
 3 files changed, 22 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/java/one/oth3r/sit/packet/CustomPayloads.java

diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java
index 268dfb1..7ba996d 100644
--- a/src/main/java/one/oth3r/sit/Sit.java
+++ b/src/main/java/one/oth3r/sit/Sit.java
@@ -7,13 +7,17 @@ import net.fabricmc.api.ModInitializer;
 
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.network.RegistryByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.codec.PacketCodecs;
+import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import one.oth3r.sit.file.Config;
-import one.oth3r.sit.packet.CustomPayloads;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,15 +41,23 @@ public class Sit implements ModInitializer {
 		Config.load();
 		Events.register();
 		//PACKETS
-		PayloadTypeRegistry.playC2S().register(CustomPayloads.SettingsPayload.ID, CustomPayloads.SettingsPayload.CODEC);
-		ServerPlayNetworking.registerGlobalReceiver(CustomPayloads.SettingsPayload.ID,((payload, context) -> server.execute(() -> {
-            Type hashMapToken = new TypeToken<HashMap<String, Object>>() {}.getType();
-            Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-
-            playerSettings.put(context.player(),gson.fromJson(payload.value(),hashMapToken));
-        })));
+		PayloadTypeRegistry.playC2S().register(SettingsPayload.ID, SettingsPayload.CODEC);
+		ServerPlayNetworking.registerGlobalReceiver(SettingsPayload.ID,((payload, context) -> {
+			server.execute(() -> {
+				Type hashMapToken = new TypeToken<HashMap<String, Object>>() {}.getType();
+				Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+				playerSettings.put(context.player(),gson.fromJson(payload.value,hashMapToken));
+			});
+		}));
+	}
+	public record SettingsPayload(String value) implements CustomPayload {
+		public static final CustomPayload.Id<SettingsPayload> ID = new CustomPayload.Id<>(new Identifier(MOD_ID,"settings_v1.1"));
+		public static final PacketCodec<RegistryByteBuf, SettingsPayload> CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast();
+		@Override
+		public Id<SettingsPayload> getId() {
+			return ID;
+		}
 	}
-
 	public static MutableText lang(String key, Object... args) {
 		if (isClient) return Text.translatable(key, args);
 		else return LangReader.of(key, args).getTxT();
diff --git a/src/main/java/one/oth3r/sit/SitClient.java b/src/main/java/one/oth3r/sit/SitClient.java
index fe6dbb3..555bd09 100644
--- a/src/main/java/one/oth3r/sit/SitClient.java
+++ b/src/main/java/one/oth3r/sit/SitClient.java
@@ -6,7 +6,6 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.network.packet.CustomPayload;
-import one.oth3r.sit.packet.CustomPayloads;
 
 public class SitClient implements ClientModInitializer {
     public static boolean inGame = false;
@@ -21,9 +20,8 @@ public class SitClient implements ClientModInitializer {
         // reset inGame
         ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> inGame = false);
     }
-
     public static CustomPayload sendPackets() {
         Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-        return new CustomPayloads.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings()));
+        return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings()));
     }
 }
diff --git a/src/main/java/one/oth3r/sit/packet/CustomPayloads.java b/src/main/java/one/oth3r/sit/packet/CustomPayloads.java
deleted file mode 100644
index 9d6a57d..0000000
--- a/src/main/java/one/oth3r/sit/packet/CustomPayloads.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package one.oth3r.sit.packet;
-
-import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.network.codec.PacketCodecs;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.util.Identifier;
-import one.oth3r.sit.Sit;
-
-public class CustomPayloads {
-    public record SettingsPayload(String value) implements CustomPayload {
-
-        public static final Id<SettingsPayload> ID = new Id<>(new Identifier(Sit.MOD_ID,"settings_v1.1"));
-
-        public static final PacketCodec<RegistryByteBuf, SettingsPayload> CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast();
-
-        @Override
-        public Id<SettingsPayload> getId() {
-            return ID;
-        }
-
-        @Override
-        public String value() {
-            return value;
-        }
-    }
-}