Quick and dirty update to 1.20.5

build.gradle.kts

@@ -1,13 +1,3 @@
-plugins {
-  id("roundalib") version "0.4.0"
-}
-
-repositories {
-  maven("https://jitpack.io")
-}
-
-dependencies {
-  implementation("com.github.LlamaLad7:MixinExtras:0.1.1")
-  annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1")
-  include("com.github.LlamaLad7:MixinExtras:0.1.1")
-}
+plugins {
+  id("roundalib") version "0.7.0-SNAPSHOT"
+}

gradle.properties

@@ -1,13 +1,16 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx4G -XX:ActiveProcessorCount=4
+org.gradle.jvmargs=-Xmx8G -XX:ActiveProcessorCount=4
 org.gradle.parallel=true
 
 # RoundaLib Properties
 group_id=me.roundaround
 mod_id=armorstands
-mod_version=1.4.0
-minecraft_version=1.20.3
+mod_version=1.5.0
+minecraft_version=1.20.5
 yarn_mappings=build.1
-loader_version=0.15.3
-fabric_version=0.91.1
-mod_menu_version=9.0.0
+loader_version=0.15.11
+fabric_version=0.97.8
+roundalib_version=2.0.0
+roundalib_snapshot=true
+mod_menu_version=10.0.0-beta.1
+dev_login_version=3.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-networkTimeout=10000
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,7 +1,7 @@
-pluginManagement {
-  repositories {
-    gradlePluginPortal()
-    maven("https://maven.fabricmc.net/")
-    maven("https://maven.rnda.dev/releases/")
-  }
-}
+pluginManagement {
+  repositories {
+    gradlePluginPortal()
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.rnda.dev/snapshots/")
+  }
+}

src/main/java/me/roundaround/armorstands/ArmorStandsMod.java

@@ -1,9 +1,10 @@
 package me.roundaround.armorstands;
 
-import me.roundaround.armorstands.network.packet.c2s.*;
+import me.roundaround.armorstands.network.Networking;
 import me.roundaround.armorstands.screen.ArmorStandScreenHandler;
 import me.roundaround.armorstands.server.ArmorStandUsers;
 import me.roundaround.armorstands.server.command.ArmorStandsCommand;
+import me.roundaround.armorstands.server.network.ServerNetworking;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
@@ -16,20 +17,19 @@ public final class ArmorStandsMod implements ModInitializer {
   public static final String MOD_ID = "armorstands";
   public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
 
-  public static final ExtendedScreenHandlerType<ArmorStandScreenHandler>
-      ARMOR_STAND_SCREEN_HANDLER_TYPE = new ExtendedScreenHandlerType<ArmorStandScreenHandler>(
-      ArmorStandScreenHandler::new);
+  public static final ExtendedScreenHandlerType<ArmorStandScreenHandler, ArmorStandScreenHandler.Data> ARMOR_STAND_SCREEN_HANDLER_TYPE = new ExtendedScreenHandlerType<>(
+      ArmorStandScreenHandler::new, ArmorStandScreenHandler.Data.PACKET_CODEC);
 
   static {
-    Registry.register(
-        Registries.SCREEN_HANDLER,
-        "armorstands:armor_stand",
-        ARMOR_STAND_SCREEN_HANDLER_TYPE);
+    Registry.register(Registries.SCREEN_HANDLER, "armorstands:armor_stand", ARMOR_STAND_SCREEN_HANDLER_TYPE);
   }
 
   @Override
   public void onInitialize() {
-    registerReceivers();
+    Networking.registerS2CPayloads();
+    Networking.registerC2SPayloads();
+
+    ServerNetworking.registerReceivers();
 
     CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
       if (environment.dedicated) {
@@ -43,18 +43,4 @@ public void onInitialize() {
       }
     });
   }
-
-  private static void registerReceivers() {
-    RequestScreenPacket.registerServerReceiver();
-    AdjustYawPacket.registerServerReceiver();
-    SetYawPacket.registerServerReceiver();
-    AdjustPosPacket.registerServerReceiver();
-    UtilityActionPacket.registerServerReceiver();
-    SetFlagPacket.registerServerReceiver();
-    SetPosePacket.registerServerReceiver();
-    SetPosePresetPacket.registerServerReceiver();
-    AdjustPosePacket.registerServerReceiver();
-    UndoPacket.registerServerReceiver();
-    PingPacket.registerServerReceiver();
-  }
 }

src/main/java/me/roundaround/armorstands/client/ArmorStandsClientMod.java

@@ -1,66 +1,57 @@
-package me.roundaround.armorstands.client;
-
-import me.roundaround.armorstands.ArmorStandsMod;
-import me.roundaround.armorstands.client.gui.screen.*;
-import me.roundaround.armorstands.network.packet.s2c.ClientUpdatePacket;
-import me.roundaround.armorstands.network.packet.s2c.MessagePacket;
-import me.roundaround.armorstands.network.packet.s2c.PongPacket;
-import me.roundaround.armorstands.screen.ArmorStandScreenHandler;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.gui.screen.ingame.HandledScreens;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-
-public class ArmorStandsClientMod implements ClientModInitializer {
-  public static KeyBinding highlightArmorStandKeyBinding;
-
-  @Override
-  public void onInitializeClient() {
-    registerReceivers();
-
-    highlightArmorStandKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-        "armorstands.key.highlight_armor_stand",
-        InputUtil.Type.KEYSYM,
-        InputUtil.UNKNOWN_KEY.getCode(),
-        KeyBinding.MISC_CATEGORY));
-
-    FabricLoader.getInstance().getModContainer(ArmorStandsMod.MOD_ID).ifPresent((container) -> {
-      ResourceManagerHelper.registerBuiltinResourcePack(
-          new Identifier(ArmorStandsMod.MOD_ID, "armorstands-dark-ui"),
-          container,
-          Text.literal("Armor Stands Dark UI"),
-          ResourcePackActivationType.NORMAL);
-    });
-
-    HandledScreens.register(ArmorStandsMod.ARMOR_STAND_SCREEN_HANDLER_TYPE,
-        new HandledScreens.Provider<ArmorStandScreenHandler, AbstractArmorStandScreen>() {
-          @Override
-          public AbstractArmorStandScreen create(
-              ArmorStandScreenHandler handler,
-              PlayerInventory playerInventory,
-              Text title) {
-            return switch (handler.getScreenType()) {
-              case UTILITIES -> new ArmorStandUtilitiesScreen(handler);
-              case MOVE -> new ArmorStandMoveScreen(handler);
-              case ROTATE -> new ArmorStandRotateScreen(handler);
-              case POSE -> new ArmorStandPoseScreen(handler);
-              case PRESETS -> new ArmorStandPresetsScreen(handler);
-              case INVENTORY -> new ArmorStandInventoryScreen(handler);
-            };
-          }
-        });
-  }
-
-  private static void registerReceivers() {
-    ClientUpdatePacket.registerClientReceiver();
-    MessagePacket.registerClientReceiver();
-    PongPacket.registerClientReceiver();
-  }
-}
+package me.roundaround.armorstands.client;
+
+import me.roundaround.armorstands.ArmorStandsMod;
+import me.roundaround.armorstands.client.gui.screen.*;
+import me.roundaround.armorstands.client.network.ClientNetworking;
+import me.roundaround.armorstands.screen.ArmorStandScreenHandler;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.gui.screen.ingame.HandledScreens;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+public class ArmorStandsClientMod implements ClientModInitializer {
+  public static KeyBinding highlightArmorStandKeyBinding;
+
+  @Override
+  public void onInitializeClient() {
+    ClientNetworking.registerReceivers();
+
+    highlightArmorStandKeyBinding = KeyBindingHelper.registerKeyBinding(
+        new KeyBinding("armorstands.key.highlight_armor_stand", InputUtil.Type.KEYSYM, InputUtil.UNKNOWN_KEY.getCode(),
+            KeyBinding.MISC_CATEGORY
+        ));
+
+    FabricLoader.getInstance()
+        .getModContainer(ArmorStandsMod.MOD_ID)
+        .ifPresent((container) -> ResourceManagerHelper.registerBuiltinResourcePack(
+            new Identifier(ArmorStandsMod.MOD_ID, "armorstands-dark-ui"), container,
+            Text.literal("Armor Stands Dark UI"), ResourcePackActivationType.NORMAL
+        ));
+
+    HandledScreens.register(ArmorStandsMod.ARMOR_STAND_SCREEN_HANDLER_TYPE, new HandledScreenProvider());
+  }
+
+  private static class HandledScreenProvider implements HandledScreens.Provider<ArmorStandScreenHandler,
+      AbstractArmorStandScreen> {
+    @Override
+    public AbstractArmorStandScreen create(
+        ArmorStandScreenHandler handler, PlayerInventory playerInventory, Text title
+    ) {
+      return switch (handler.getScreenType()) {
+        case UTILITIES -> new ArmorStandUtilitiesScreen(handler);
+        case MOVE -> new ArmorStandMoveScreen(handler);
+        case ROTATE -> new ArmorStandRotateScreen(handler);
+        case POSE -> new ArmorStandPoseScreen(handler);
+        case PRESETS -> new ArmorStandPresetsScreen(handler);
+        case INVENTORY -> new ArmorStandInventoryScreen(handler);
+      };
+    }
+  }
+}