fix: cad data shared across all cads

Fixes #858

Author: Kamefrede

src/main/java/vazkii/psi/common/core/handler/capability/CADData.java

@@ -39,6 +39,7 @@
 import vazkii.psi.common.item.base.ModDataComponents;
 import vazkii.psi.common.item.component.ItemCADSocket;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -51,7 +52,14 @@ public class CADData implements ICapabilityProvider<ItemCapability<?, Void>, Voi
 	public CADData(ItemStack cad) {
 		this.cad = cad;
 		this.cadHandler = (ComponentItemHandler) cad.getCapability(Capabilities.ItemHandler.ITEM);
-		this.data = cad.get(ModDataComponents.CAD_DATA.get());
+		Data cadData = cad.get(ModDataComponents.CAD_DATA);
+
+		if(cadData == null) {
+			cadData = new Data(0, 0, new ArrayList<>());
+			cad.set(ModDataComponents.CAD_DATA, cadData);
+		}
+
+		this.data = cadData;
 	}
 
 	@Nullable
@@ -230,9 +238,9 @@ public boolean shouldShow(IPlayerData data) {
 	public static class Data {
 		public static final Codec<Data> CODEC = RecordCodecBuilder.create(
 				builder -> builder.group(
-						Codec.INT.fieldOf("time").forGetter(data -> data.time),
-						Codec.INT.fieldOf("battery").forGetter(data -> data.battery),
-						Codec.list(Vector3.CODEC).fieldOf("vectors").forGetter(data -> data.vectors)
+						Codec.INT.fieldOf("Time").forGetter(data -> data.time),
+						Codec.INT.fieldOf("Battery").forGetter(data -> data.battery),
+						Codec.list(Vector3.CODEC).fieldOf("Memory").forGetter(data -> data.vectors)
 				).apply(builder, Data::new));
 		public static final StreamCodec<RegistryFriendlyByteBuf, Data> STREAM_CODEC = StreamCodec.composite(
 				ByteBufCodecs.INT, data -> data.time,

src/main/java/vazkii/psi/common/item/ItemCAD.java

@@ -8,8 +8,6 @@
  */
 package vazkii.psi.common.item;
 
-import com.google.common.collect.Lists;
-
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -95,7 +93,7 @@ public class ItemCAD extends Item implements ICAD {
 
 	public ItemCAD(Item.Properties properties) {
 		super(properties
-				.stacksTo(1).rarity(Rarity.RARE).component(ModDataComponents.BULLETS.get(), ItemContainerContents.EMPTY).component(ModDataComponents.CAD_DATA, new CADData.Data(0, 0, Lists.newArrayList()))
+				.stacksTo(1).rarity(Rarity.RARE).component(ModDataComponents.BULLETS.get(), ItemContainerContents.EMPTY)
 		);
 	}
 

src/main/java/vazkii/psi/common/item/base/ModDataComponents.java

@@ -28,7 +28,7 @@ public class ModDataComponents {
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> TIMES_CAST = DATA_COMPONENT_TYPES.registerComponentType("times_cast", builder -> builder.persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT));
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> SELECTED_CONTROL_SLOT = DATA_COMPONENT_TYPES.registerComponentType("selected_control_slot", builder -> builder.persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT));
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<String>> CONTRIBUTOR = DATA_COMPONENT_TYPES.registerComponentType("psi_contributor_name", builder -> builder.persistent(Codec.STRING).networkSynchronized(ByteBufCodecs.STRING_UTF8));
-	public static final DeferredHolder<DataComponentType<?>, DataComponentType<CADData.Data>> CAD_DATA = DATA_COMPONENT_TYPES.registerComponentType("cad_data", builder -> builder.persistent(CADData.Data.CODEC).networkSynchronized(CADData.Data.STREAM_CODEC));
+	public static final DeferredHolder<DataComponentType<?>, DataComponentType<CADData.Data>> CAD_DATA = DATA_COMPONENT_TYPES.registerComponentType("cad_data", builder -> builder.persistent(CADData.Data.CODEC).networkSynchronized(CADData.Data.STREAM_CODEC).cacheEncoding());
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<ItemContainerContents>> BULLETS = DATA_COMPONENT_TYPES.registerComponentType("bullets", builder -> builder.persistent(ItemContainerContents.CODEC).networkSynchronized(ItemContainerContents.STREAM_CODEC).cacheEncoding());
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> SELECTED_SLOT = DATA_COMPONENT_TYPES.registerComponentType("selected_slot", builder -> builder.persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT));
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> REGEN_TIME = DATA_COMPONENT_TYPES.registerComponentType("regen_time", builder -> builder.persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT));