Progress

Author: Azzyypaaras

src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/PastelNetwork.java

@@ -88,6 +88,7 @@ public boolean equals(Object other) {
         return false;
     }
 
+	//TODO: make this into a CODEC after the 1.21.1 port is done.
 	public NbtCompound graphToNbt() {
 		var vertices = new ArrayList<>(graph.vertexSet());
 		var graphStorage = new NbtCompound();

src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/ServerPastelNetwork.java

@@ -165,16 +165,8 @@ protected void addNode(PastelNodeBlockEntity node) {
 	 * Note: this does not check if the nodes can connect, that should be done before calling this method.
 	 */
 	protected void addNodeAndConnect(PastelNodeBlockEntity newNode, PastelNodeBlockEntity existing) {
-		if (addLoadedNode(newNode))
-			return;
-		
-		this.graph.addVertex(newNode.getPos());
+		addNode(newNode);
 		getGraph().addEdge(newNode.getPos(), existing.getPos());
-		
-		// check for priority
-		addPriorityNode(newNode);
-		
-		newNode.setNetworkUUID(this.getUUID());
 		PastelNetworkEdgeSyncPayload.send(this, newNode.getPos());
 	}
 

src/main/java/de/dafuqs/spectrum/blocks/pastel_network/network/ServerPastelNetworkManager.java

@@ -75,7 +75,7 @@ else if(childNetwork.get() != parentNetwork.get()) {
 	private static void addAndSync(PastelNodeBlockEntity newNode, PastelNodeBlockEntity reference) {
 		assert reference.getServerNetwork().isPresent();
 		var parentNetwork = reference.getServerNetwork().get();
-		parentNetwork.addNode(newNode);
+		parentNetwork.addNodeAndConnect(newNode, reference);
 		parentNetwork.markDirty(reference.getPos());
 	}
 
@@ -96,7 +96,13 @@ public Optional<ServerPastelNetwork> getNetwork(UUID uuid) {
 	public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
 		NbtList networkList = new NbtList();
 		for (ServerPastelNetwork network : this.networks) {
-			CodecHelper.toNbt(ServerPastelNetwork.CODEC, network, networkList::add);
+			var opt = ServerPastelNetwork.CODEC.encodeStart(NbtOps.INSTANCE, network).result();
+			if (opt.isPresent()) {
+				var wrapper = new NbtCompound();
+				wrapper.put("network", opt.get());
+				wrapper.put("graph", network.graphToNbt());
+				networkList.add(wrapper);
+			}
 		}
 		nbt.put("Networks", networkList);
 		return nbt;
@@ -105,8 +111,13 @@ public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup regis
 	public static ServerPastelNetworkManager fromNbt(NbtCompound nbt) {
 		ServerPastelNetworkManager manager = new ServerPastelNetworkManager();
 		for (NbtElement element : nbt.getList("Networks", NbtElement.COMPOUND_TYPE)) {
-			Optional<ServerPastelNetwork> network = CodecHelper.fromNbt(ServerPastelNetwork.CODEC, element);
+			var comp = (NbtCompound) element;
+			var netNbt = comp.get("network");
+			var graphNbt = comp.get("graph");
+			
+			Optional<ServerPastelNetwork> network = CodecHelper.fromNbt(ServerPastelNetwork.CODEC, netNbt);
 			if (network.isPresent()) {
+				network.get().setGraph(PastelNetwork.graphFromNbt((NbtCompound) graphNbt));
 				manager.networks.add(network.get());
 			}
 		}