refactor: moving trackers and other code into the common library

sekwah41 · Aug 6, 2023 · 39fd496 · 39fd496
1 parent 3c7d18f
commit 39fd496
Show file tree

Hide file tree

Showing 25 changed files with 60 additions and 41 deletions.
diff --git a/...wah/sekclib/capabilitysync/SyncEntry.java → ...clib/common/capabilitysync/SyncEntry.java b/...wah/sekclib/capabilitysync/SyncEntry.java → ...clib/common/capabilitysync/SyncEntry.java
@@ -1,6 +1,7 @@
-package com.sekwah.sekclib.capabilitysync;
+package com.sekwah.sekclib.common.capabilitysync;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

diff --git a/common/src/main/java/com/sekwah/sekclib/common/capabilitysync/tracker/ISyncTrackerData.java b/common/src/main/java/com/sekwah/sekclib/common/capabilitysync/tracker/ISyncTrackerData.java
@@ -0,0 +1,8 @@
+package com.sekwah.sekclib.common.capabilitysync.tracker;
+
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
+
+public interface ISyncTrackerData {
+    SyncEntry getSyncEntry();
+    Object getSendValue();
+}
diff --git a/...c/capabilitysync/tracker/SyncTracker.java → ...n/capabilitysync/tracker/SyncTracker.java b/...c/capabilitysync/tracker/SyncTracker.java → ...n/capabilitysync/tracker/SyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker;
+package com.sekwah.sekclib.common.capabilitysync.tracker;
 
-import com.sekwah.sekclib.capabilitysync.SyncEntry;
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
 
 import java.util.Objects;
 

diff --git a/...abilitysync/tracker/SyncTrackerClone.java → ...abilitysync/tracker/SyncTrackerClone.java b/...abilitysync/tracker/SyncTrackerClone.java → ...abilitysync/tracker/SyncTrackerClone.java
@@ -1,4 +1,4 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker;
+package com.sekwah.sekclib.common.capabilitysync.tracker;
 
 /**
  * If this is not implemented for the tracker it will just straight up replace the value.

diff --git a/...pabilitysync/tracker/SyncTrackerData.java → ...pabilitysync/tracker/SyncTrackerData.java b/...pabilitysync/tracker/SyncTrackerData.java → ...pabilitysync/tracker/SyncTrackerData.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker;
+package com.sekwah.sekclib.common.capabilitysync.tracker;
 
-import com.sekwah.sekclib.capabilitysync.SyncEntry;
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
 
 public class SyncTrackerData implements ISyncTrackerData {
 

diff --git a/...tysync/tracker/SyncTrackerSerializer.java → ...tysync/tracker/SyncTrackerSerializer.java b/...tysync/tracker/SyncTrackerSerializer.java → ...tysync/tracker/SyncTrackerSerializer.java
@@ -1,4 +1,4 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker;
+package com.sekwah.sekclib.common.capabilitysync.tracker;
 
 import net.minecraft.network.FriendlyByteBuf;
 

diff --git a/...on/src/main/java/com/sekwah/sekclib/common/capabilitysync/tracker/SyncTrackerUpdater.java b/...on/src/main/java/com/sekwah/sekclib/common/capabilitysync/tracker/SyncTrackerUpdater.java
@@ -0,0 +1,8 @@
+package com.sekwah.sekclib.common.capabilitysync.tracker;
+
+/**
+ * If this is not implemented for the tracker it will just straight up replace the value.
+ */
+public interface SyncTrackerUpdater<T> {
+    T updateTracker(T newData, T oldData);
+}
diff --git a/.../tracker/implemented/BoolSyncTracker.java → .../tracker/implemented/BoolSyncTracker.java b/.../tracker/implemented/BoolSyncTracker.java → .../tracker/implemented/BoolSyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 
 public class BoolSyncTracker implements SyncTrackerSerializer<Boolean> {

diff --git a/.../tracker/implemented/ByteSyncTracker.java → .../tracker/implemented/ByteSyncTracker.java b/.../tracker/implemented/ByteSyncTracker.java → .../tracker/implemented/ByteSyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 
 public class ByteSyncTracker implements SyncTrackerSerializer<Byte> {

diff --git a/...tracker/implemented/FloatSyncTracker.java → ...tracker/implemented/FloatSyncTracker.java b/...tracker/implemented/FloatSyncTracker.java → ...tracker/implemented/FloatSyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 
 public class FloatSyncTracker implements SyncTrackerSerializer<Float> {

diff --git a/...c/tracker/implemented/IntSyncTracker.java → ...c/tracker/implemented/IntSyncTracker.java b/...c/tracker/implemented/IntSyncTracker.java → ...c/tracker/implemented/IntSyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 
 public class IntSyncTracker implements SyncTrackerSerializer<Integer> {

diff --git a/...lemented/ResourceLocationSyncTracker.java → ...lemented/ResourceLocationSyncTracker.java b/...lemented/ResourceLocationSyncTracker.java → ...lemented/ResourceLocationSyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 

diff --git a/...racker/implemented/StringSyncTracker.java → ...racker/implemented/StringSyncTracker.java b/...racker/implemented/StringSyncTracker.java → ...racker/implemented/StringSyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 
 public class StringSyncTracker implements SyncTrackerSerializer<String> {

diff --git a/.../tracker/implemented/Vec3SyncTracker.java → .../tracker/implemented/Vec3SyncTracker.java b/.../tracker/implemented/Vec3SyncTracker.java → .../tracker/implemented/Vec3SyncTracker.java
@@ -1,6 +1,6 @@
-package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.implemented;
+package com.sekwah.sekclib.common.capabilitysync.tracker.implemented;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 

diff --git a/neoforge-testmod/build.gradle b/neoforge-testmod/build.gradle
@@ -113,6 +113,10 @@ minecraft {
                 "${modid}" {
                     source sourceSets.main
                 }
+                "sekclib" {
+                    source project(':neoforge').sourceSets.main
+                    source project(':common').sourceSets.main
+                }
             }
         }
 
@@ -132,6 +136,10 @@ minecraft {
                 "${modid}" {
                     source sourceSets.main
                 }
+                "sekclib" {
+                    source project(':neoforge').sourceSets.main
+                    source project(':common').sourceSets.main
+                }
             }
         }
 
@@ -161,7 +169,6 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    implementation project(path: ':neoforge')
 
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.

diff --git a/neoforge/src/main/java/com/sekwah/sekclib/capabilitysync/CapabilityEntry.java b/neoforge/src/main/java/com/sekwah/sekclib/capabilitysync/CapabilityEntry.java
@@ -1,5 +1,6 @@
 package com.sekwah.sekclib.capabilitysync;
 
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.capabilities.Capability;
 

diff --git a/...src/main/java/com/sekwah/sekclib/capabilitysync/capability/SyncDataCapabilityHandler.java b/...src/main/java/com/sekwah/sekclib/capabilitysync/capability/SyncDataCapabilityHandler.java
@@ -2,11 +2,11 @@
 
 import com.sekwah.sekclib.SekCLibForge;
 import com.sekwah.sekclib.capabilitysync.CapabilityEntry;
-import com.sekwah.sekclib.capabilitysync.SyncEntry;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.CapabilitySyncRegistry;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.broadcaster.CapabilityBroadcaster;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.CapabilityTracker;
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTracker;
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTracker;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;

diff --git a/...rc/main/java/com/sekwah/sekclib/capabilitysync/capabilitysync/CapabilitySyncRegistry.java b/...rc/main/java/com/sekwah/sekclib/capabilitysync/capabilitysync/CapabilitySyncRegistry.java
@@ -2,9 +2,9 @@
 
 import com.sekwah.sekclib.SekCLibForge;
 import com.sekwah.sekclib.capabilitysync.CapabilityEntry;
-import com.sekwah.sekclib.capabilitysync.SyncEntry;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.annotation.Sync;
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import com.sekwah.sekclib.registries.SekCLibRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.capabilities.Capability;

diff --git a/...n/java/com/sekwah/sekclib/capabilitysync/capabilitysync/RegisterSyncTrackerTypeEvent.java b/...n/java/com/sekwah/sekclib/capabilitysync/capabilitysync/RegisterSyncTrackerTypeEvent.java
@@ -1,6 +1,6 @@
 package com.sekwah.sekclib.capabilitysync.capabilitysync;
 
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerSerializer;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerSerializer;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.event.IModBusEvent;
 

diff --git a/...a/com/sekwah/sekclib/capabilitysync/capabilitysync/broadcaster/CapabilityBroadcaster.java b/...a/com/sekwah/sekclib/capabilitysync/capabilitysync/broadcaster/CapabilityBroadcaster.java
@@ -4,7 +4,7 @@
 import com.sekwah.sekclib.capabilitysync.CapabilityEntry;
 import com.sekwah.sekclib.capabilitysync.capability.SyncDataCapabilityHandler;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.CapabilityTracker;
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTracker;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTracker;
 import com.sekwah.sekclib.network.SekCPacketHandler;
 import com.sekwah.sekclib.network.s2c.ClientCapabilitySyncPacket;
 import com.sekwah.sekclib.registries.SekCLibRegistries;

diff --git a/...ain/java/com/sekwah/sekclib/capabilitysync/capabilitysync/broadcaster/CapabilityInfo.java b/...ain/java/com/sekwah/sekclib/capabilitysync/capabilitysync/broadcaster/CapabilityInfo.java
@@ -1,7 +1,7 @@
 package com.sekwah.sekclib.capabilitysync.capabilitysync.broadcaster;
 
 import com.sekwah.sekclib.capabilitysync.CapabilityEntry;
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.ISyncTrackerData;
+import com.sekwah.sekclib.common.capabilitysync.tracker.ISyncTrackerData;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...main/java/com/sekwah/sekclib/capabilitysync/capabilitysync/tracker/CapabilityTracker.java b/...main/java/com/sekwah/sekclib/capabilitysync/capabilitysync/tracker/CapabilityTracker.java
@@ -1,6 +1,7 @@
 package com.sekwah.sekclib.capabilitysync.capabilitysync.tracker;
 
 import com.sekwah.sekclib.capabilitysync.CapabilityEntry;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTracker;
 import net.minecraftforge.common.capabilities.Capability;
 
 import java.util.ArrayList;

diff --git a/.../main/java/com/sekwah/sekclib/capabilitysync/capabilitysync/tracker/ISyncTrackerData.java b/.../main/java/com/sekwah/sekclib/capabilitysync/capabilitysync/tracker/ISyncTrackerData.java
diff --git a/...om/sekwah/sekclib/capabilitysync/capabilitysync/tracker/implemented/BaseSyncTrackers.java b/...om/sekwah/sekclib/capabilitysync/capabilitysync/tracker/implemented/BaseSyncTrackers.java
@@ -2,6 +2,7 @@
 
 import com.sekwah.sekclib.SekCLibForge;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.RegisterSyncTrackerTypeEvent;
+import com.sekwah.sekclib.common.capabilitysync.tracker.implemented.*;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.eventbus.api.SubscribeEvent;

diff --git a/neoforge/src/main/java/com/sekwah/sekclib/network/s2c/ClientCapabilitySyncPacket.java b/neoforge/src/main/java/com/sekwah/sekclib/network/s2c/ClientCapabilitySyncPacket.java
@@ -2,11 +2,11 @@
 
 import com.sekwah.sekclib.SekCLibForge;
 import com.sekwah.sekclib.capabilitysync.CapabilityEntry;
-import com.sekwah.sekclib.capabilitysync.SyncEntry;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.broadcaster.CapabilityInfo;
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.ISyncTrackerData;
-import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerData;
 import com.sekwah.sekclib.capabilitysync.capabilitysync.tracker.SyncTrackerUpdater;
+import com.sekwah.sekclib.common.capabilitysync.SyncEntry;
+import com.sekwah.sekclib.common.capabilitysync.tracker.ISyncTrackerData;
+import com.sekwah.sekclib.common.capabilitysync.tracker.SyncTrackerData;
 import com.sekwah.sekclib.registries.SekCLibRegistries;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;