Dangerous Clipboards

IThundxr · IThundxr · commit 20721aac711e · 2025-11-02T22:14:49.000-05:00
- Fix old clipboard schematics causing issues #9462 - Update NBTProcessors - Update Ponder
diff --git a/gradle.properties b/gradle.properties
@@ -30,7 +30,7 @@ registrate_version = MC1.21-1.3.0+67
 
 # Ponder
 # https://maven.createmod.net/net/createmod/ponder/
-ponder_version = 1.0.64
+ponder_version = 1.0.66
 
 # Flywheel & Vanillin
 # https://maven.createmod.net/dev/engine-room/flywheel/
diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java
@@ -1,7 +1,6 @@
 package com.simibubi.create.content.equipment.potatoCannon;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -56,6 +55,9 @@
 import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
 
 public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmPoseItem {
+	private static final Predicate<ItemStack> AMMO_PREDICATE = s ->
+		PotatoCannonProjectileType.getTypeForItem(GlobalRegistryAccess.getOrThrow(), s.getItem()).isPresent();
+
 	public PotatoCannonItem(Properties properties) {
 		super(properties);
 	}
@@ -67,19 +69,18 @@ public static Ammo getAmmo(Player player, ItemStack heldStack) {
 			return null;
 		}
 
-		Optional<Holder.Reference<PotatoCannonProjectileType>> optionalType = PotatoCannonProjectileType.getTypeForItem(player.level().registryAccess(), ammoStack.getItem());
-		if (optionalType.isEmpty()) {
-			return null;
-		}
-
-		return new Ammo(ammoStack, optionalType.get().value());
+		return PotatoCannonProjectileType.getTypeForItem(player.level().registryAccess(), ammoStack.getItem())
+			.map(r -> new Ammo(ammoStack, r.value()))
+			.orElse(null);
 	}
 
 	@Override
-	protected void shootProjectile(LivingEntity shooter, Projectile projectile, int index, float velocity, float inaccuracy, float angle, @Nullable LivingEntity target) {}
+	protected void shootProjectile(LivingEntity shooter, Projectile projectile, int index, float velocity, float inaccuracy, float angle, @Nullable LivingEntity target) {
+	}
 
 	@Override
-	protected void shoot(ServerLevel level, LivingEntity shooter, InteractionHand hand, ItemStack weapon, List<ItemStack> projectileItems, float velocity, float inaccuracy, boolean isCrit, @Nullable LivingEntity target) {}
+	protected void shoot(ServerLevel level, LivingEntity shooter, InteractionHand hand, ItemStack weapon, List<ItemStack> projectileItems, float velocity, float inaccuracy, boolean isCrit, @Nullable LivingEntity target) {
+	}
 
 	@Override
 	public InteractionResult useOn(UseOnContext context) {
@@ -233,8 +234,7 @@ public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStac
 
 	@Override
 	public Predicate<ItemStack> getAllSupportedProjectiles() {
-		return stack -> PotatoCannonProjectileType.getTypeForItem(GlobalRegistryAccess.getOrThrow(), stack.getItem())
-			.isPresent();
+		return AMMO_PREDICATE;
 	}
 
 	@Override
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemAttribute.java
@@ -36,7 +36,7 @@ static CompoundTag saveStatic(ItemAttribute attribute, HolderLookup.Provider reg
 
 	@Nullable
 	static ItemAttribute loadStatic(CompoundTag nbt, HolderLookup.Provider registries) {
-		return CatnipCodecUtils.decode(CODEC, registries, nbt.get("attribute")).orElse(null);
+		return CatnipCodecUtils.decodeOrNull(CODEC, registries, nbt.get("attribute"));
 	}
 
 	static List<ItemAttribute> getAllAttributes(ItemStack stack, Level level) {
diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ItemNameAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ItemNameAttribute.java
@@ -13,7 +13,6 @@
 import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttributeType;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
@@ -30,12 +29,13 @@ public record ItemNameAttribute(String itemName) implements ItemAttribute {
 	public static final StreamCodec<ByteBuf, ItemNameAttribute> STREAM_CODEC = ByteBufCodecs.STRING_UTF8
 		.map(ItemNameAttribute::new, ItemNameAttribute::itemName);
 
-	private static String extractCustomName(ItemStack stack) {
+	private static String extractCustomName(ItemStack stack, Level level) {
 		if (stack.has(DataComponents.CUSTOM_NAME)) {
 			try {
-				Component itextcomponent = Component.Serializer.fromJson(stack.getOrDefault(DataComponents.CUSTOM_NAME, Component.empty()).getString(), RegistryAccess.EMPTY);
-				if (itextcomponent != null) {
-					return itextcomponent.getString();
+				String customName = stack.getOrDefault(DataComponents.CUSTOM_NAME, Component.empty()).getString();
+				Component component = Component.Serializer.fromJson(customName, level.registryAccess());
+				if (component != null) {
+					return component.getString();
 				}
 			} catch (JsonParseException ignored) {
 			}
@@ -45,7 +45,7 @@ private static String extractCustomName(ItemStack stack) {
 
 	@Override
 	public boolean appliesTo(ItemStack itemStack, Level level) {
-		return extractCustomName(itemStack).equals(itemName);
+		return extractCustomName(itemStack, level).equals(itemName);
 	}
 
 	@Override
@@ -73,7 +73,7 @@ public static class Type implements ItemAttributeType {
 		public List<ItemAttribute> getAllAttributes(ItemStack stack, Level level) {
 			List<ItemAttribute> list = new ArrayList<>();
 
-			String name = extractCustomName(stack);
+			String name = extractCustomName(stack, level);
 			if (!name.isEmpty()) {
 				list.add(new ItemNameAttribute(name));
 			}
diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortBlockEntity.java
@@ -94,7 +94,7 @@ protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean c
 		super.read(tag, registries, clientPacket);
 		inventory.deserializeNBT(registries, tag.getCompound("Inventory"));
 		PackagePortTarget prevTarget = target;
-		target = CatnipCodecUtils.decode(PackagePortTarget.CODEC, registries, tag.getCompound("Target")).orElse(null);
+		target = CatnipCodecUtils.decodeOrNull(PackagePortTarget.CODEC, registries, tag.getCompound("Target"));
 		addressFilter = tag.getString("AddressFilter");
 		acceptsPackages = tag.getBoolean("AcceptsPackages");
 		if (clientPacket && prevTarget != target)
diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java
@@ -590,8 +590,7 @@ protected void read(CompoundTag compound, HolderLookup.Provider registries, bool
 			c -> CatnipCodecUtils.decode(BigItemStack.CODEC, registries, c)
 				.orElseThrow());
 		if (compound.contains("LastSummary"))
-			availableItems = CatnipCodecUtils.decode(InventorySummary.CODEC, registries, compound.getCompound("LastSummary"))
-				.orElse(null);
+			availableItems = CatnipCodecUtils.decodeOrNull(InventorySummary.CODEC, registries, compound.getCompound("LastSummary"));
 	}
 
 	@Override
diff --git a/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java b/src/main/java/com/simibubi/create/content/redstone/nixieTube/NixieTubeBlockEntity.java
@@ -23,7 +23,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -80,7 +79,7 @@ public byte[] encode() {
 	}
 
 	private static final Couple<String> EMPTY = Couple.create("", "");
-	private static final String EMPTY_COMPONENT_JSON = Component.Serializer.toJson(Component.literal(""), RegistryAccess.EMPTY);
+	private static final String EMPTY_COMPONENT_JSON = "\"\""; // Same as Component.literal("")
 
 	private int redstoneStrength;
 	private Optional<DynamicComponent> customText;
diff --git a/src/main/java/com/simibubi/create/content/schematics/SchematicProcessor.java b/src/main/java/com/simibubi/create/content/schematics/SchematicProcessor.java
@@ -4,7 +4,6 @@
 
 import org.jetbrains.annotations.Nullable;
 
-import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import com.simibubi.create.AllStructureProcessorTypes;
 
@@ -23,10 +22,12 @@
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 
 public class SchematicProcessor extends StructureProcessor {
-
 	public static final SchematicProcessor INSTANCE = new SchematicProcessor();
 	public static final MapCodec<SchematicProcessor> CODEC = MapCodec.unit(() -> INSTANCE);
 
+	private SchematicProcessor() {
+	}
+
 	@Nullable
 	@Override
 	public StructureTemplate.StructureBlockInfo process(LevelReader world, BlockPos pos, BlockPos anotherPos, StructureTemplate.StructureBlockInfo rawInfo,
@@ -61,5 +62,4 @@ public StructureTemplate.StructureEntityInfo processEntity(LevelReader world, Bl
 	protected StructureProcessorType<?> getType() {
 		return AllStructureProcessorTypes.SCHEMATIC.get();
 	}
-
 }
diff --git a/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlockEntity.java
@@ -251,7 +251,7 @@ protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean c
 		List<FlapDisplayLayout> lines = getLines();
 		for (int i = 0; i < lines.size(); i++)
 			lines.get(i)
-				.read(tag.getCompound("Display" + i));
+				.read(tag.getCompound("Display" + i), registries);
 	}
 
 	public int getLineIndexAt(double yCoord) {
diff --git a/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayLayout.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplayLayout.java
@@ -41,19 +41,19 @@ public CompoundTag write(HolderLookup.Provider registries) {
 		return tag;
 	}
 
-	public void read(CompoundTag tag) {
+	public void read(CompoundTag tag, HolderLookup.Provider registries) {
 		String prevKey = layoutKey;
 		layoutKey = tag.getString("Key");
 		ListTag sectionsTag = tag.getList("Sections", Tag.TAG_COMPOUND);
 
 		if (!prevKey.equals(layoutKey)) {
-			sections = NBTHelper.readCompoundList(sectionsTag, FlapDisplaySection::load);
+			sections = NBTHelper.readCompoundList(sectionsTag, i -> FlapDisplaySection.load(i, registries));
 			return;
 		}
 
 		MutableInt index = new MutableInt(0);
 		NBTHelper.iterateCompoundList(sectionsTag, nbt -> sections.get(index.getAndIncrement())
-			.update(nbt));
+			.update(nbt, registries));
 	}
 
 	public List<FlapDisplaySection> getSections() {
diff --git a/src/main/java/com/simibubi/create/content/trains/display/FlapDisplaySection.java b/src/main/java/com/simibubi/create/content/trains/display/FlapDisplaySection.java
@@ -9,7 +9,6 @@
 
 import net.createmod.catnip.nbt.NBTHelper;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
@@ -140,7 +139,7 @@ public CompoundTag write(HolderLookup.Provider registries) {
 		return tag;
 	}
 
-	public static FlapDisplaySection load(CompoundTag tag) {
+	public static FlapDisplaySection load(CompoundTag tag, HolderLookup.Provider registries) {
 		float width = tag.getFloat("Width");
 		String cycle = tag.getString("Cycle");
 		boolean singleFlap = tag.contains("SingleFlap");
@@ -154,15 +153,15 @@ public static FlapDisplaySection load(CompoundTag tag) {
 		if (!tag.contains("Text"))
 			return section;
 
-		section.component = Component.Serializer.fromJson(tag.getString("Text"), RegistryAccess.EMPTY);
+		section.component = Component.Serializer.fromJson(tag.getString("Text"), registries);
 		section.refresh(tag.getBoolean("Transition"));
 		return section;
 	}
 
-	public void update(CompoundTag tag) {
+	public void update(CompoundTag tag, HolderLookup.Provider registries) {
 		String text = tag.getString("Text");
 		if (!text.isEmpty())
-			component = Component.Serializer.fromJson(text, RegistryAccess.EMPTY);
+			component = Component.Serializer.fromJson(text, registries);
 		if (cyclingOptions == null)
 			cyclingOptions = getFlapCycle(cycle);
 		refresh(tag.getBoolean("Transition"));
diff --git a/src/main/java/com/simibubi/create/foundation/CreateNBTProcessors.java b/src/main/java/com/simibubi/create/foundation/CreateNBTProcessors.java
@@ -1,14 +1,23 @@
 package com.simibubi.create.foundation;
 
+import java.util.List;
+
 import com.simibubi.create.AllBlockEntityTypes;
+import com.simibubi.create.AllDataComponents;
+import com.simibubi.create.content.equipment.clipboard.ClipboardContent;
+import com.simibubi.create.content.equipment.clipboard.ClipboardEntry;
 
+import net.createmod.catnip.codecs.CatnipCodecUtils;
 import net.createmod.catnip.nbt.NBTProcessors;
+import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.network.Filterable;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.component.WrittenBookContent;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public class CreateNBTProcessors {
@@ -23,18 +32,15 @@ public static void register() {
 			if (writableBookResource != BuiltInRegistries.ITEM.getDefaultKey() && book.getString("id").equals(writableBookResource.toString()))
 				return data;
 
-			if (!book.contains("tag", Tag.TAG_COMPOUND))
-				return data;
-			CompoundTag tag = book.getCompound("tag");
-
-			if (!tag.contains("pages", Tag.TAG_LIST))
+			WrittenBookContent bookContent = CatnipCodecUtils.decodeOrNull(WrittenBookContent.CODEC, book);
+			if (bookContent == null)
 				return data;
-			ListTag pages = tag.getList("pages", Tag.TAG_STRING);
 
-			for (Tag inbt : pages) {
-				if (NBTProcessors.textComponentHasClickEvent(inbt.getAsString()))
+			for (Filterable<Component> page : bookContent.pages()) {
+				if (NBTProcessors.textComponentHasClickEvent(page.get(false)))
 					return null;
 			}
+
 			return data;
 		});
 
@@ -44,26 +50,17 @@ public static void register() {
 	}
 
 	public static CompoundTag clipboardProcessor(CompoundTag data) {
-		if (!data.contains("Item", Tag.TAG_COMPOUND))
+		DataComponentMap components = CatnipCodecUtils.decodeOrNull(DataComponentMap.CODEC, data.getCompound("components"));
+		if (components == null)
 			return data;
-		CompoundTag item = data.getCompound("Item");
 
-		if (!item.contains("components", Tag.TAG_COMPOUND))
+		ClipboardContent content = components.get(AllDataComponents.CLIPBOARD_CONTENT);
+		if (content == null)
 			return data;
-		CompoundTag itemComponents = item.getCompound("components");
-
-		if (!itemComponents.contains("create:clipboard_pages", Tag.TAG_LIST))
-			return data;
-		ListTag pages = itemComponents.getList("create:clipboard_pages", Tag.TAG_LIST);
-
-		for (Tag page : pages) {
-			if (!(page instanceof ListTag entries))
-				return data;
-
-			for (int i = 0; i < entries.size(); i++) {
-				CompoundTag entry = entries.getCompound(i);
 
-				if (NBTProcessors.textComponentHasClickEvent(entry.getCompound("text").getAsString()))
+		for (List<ClipboardEntry> entries : content.pages()) {
+			for (ClipboardEntry entry : entries) {
+				if (NBTProcessors.textComponentHasClickEvent(entry.text))
 					return null;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static CompoundTag saveStatic(ItemAttribute attribute, HolderLookup.Provider reg`
`36`	`36`
`37`	`37`	`@Nullable`
`38`	`38`	`static ItemAttribute loadStatic(CompoundTag nbt, HolderLookup.Provider registries) {`
`39`		`- return CatnipCodecUtils.decode(CODEC, registries, nbt.get("attribute")).orElse(null);`
	`39`	`+ return CatnipCodecUtils.decodeOrNull(CODEC, registries, nbt.get("attribute"));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`static List<ItemAttribute> getAllAttributes(ItemStack stack, Level level) {`
Original file line number	Diff line number	Diff line change
`@@ -590,8 +590,7 @@ protected void read(CompoundTag compound, HolderLookup.Provider registries, bool`
`590`	`590`	`c -> CatnipCodecUtils.decode(BigItemStack.CODEC, registries, c)`
`591`	`591`	`.orElseThrow());`
`592`	`592`	`if (compound.contains("LastSummary"))`
`593`		`- availableItems = CatnipCodecUtils.decode(InventorySummary.CODEC, registries, compound.getCompound("LastSummary"))`
`594`		`- .orElse(null);`
	`593`	`+ availableItems = CatnipCodecUtils.decodeOrNull(InventorySummary.CODEC, registries, compound.getCompound("LastSummary"));`
`595`	`594`	`}`
`596`	`595`
`597`	`596`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean c`
`251`	`251`	`List<FlapDisplayLayout> lines = getLines();`
`252`	`252`	`for (int i = 0; i < lines.size(); i++)`
`253`	`253`	`lines.get(i)`
`254`		`- .read(tag.getCompound("Display" + i));`
	`254`	`+ .read(tag.getCompound("Display" + i), registries);`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`public int getLineIndexAt(double yCoord) {`
Original file line number	Diff line number	Diff line change
`@@ -41,19 +41,19 @@ public CompoundTag write(HolderLookup.Provider registries) {`
`41`	`41`	`return tag;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public void read(CompoundTag tag) {`
	`44`	`+ public void read(CompoundTag tag, HolderLookup.Provider registries) {`
`45`	`45`	`String prevKey = layoutKey;`
`46`	`46`	`layoutKey = tag.getString("Key");`
`47`	`47`	`ListTag sectionsTag = tag.getList("Sections", Tag.TAG_COMPOUND);`
`48`	`48`
`49`	`49`	`if (!prevKey.equals(layoutKey)) {`
`50`		`- sections = NBTHelper.readCompoundList(sectionsTag, FlapDisplaySection::load);`
	`50`	`+ sections = NBTHelper.readCompoundList(sectionsTag, i -> FlapDisplaySection.load(i, registries));`
`51`	`51`	`return;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`MutableInt index = new MutableInt(0);`
`55`	`55`	`NBTHelper.iterateCompoundList(sectionsTag, nbt -> sections.get(index.getAndIncrement())`
`56`		`- .update(nbt));`
	`56`	`+ .update(nbt, registries));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public List<FlapDisplaySection> getSections() {`