Merge pull request #31 from SammyForReal/1.21

Usage of Item Components instead of raw NBT data in ShardCreatorGuiDescription

build.gradle

@@ -32,6 +32,10 @@ dependencies {
 	include libs.fpapi
 }
 
+loom {
+	accessWidenerPath = file("src/main/resources/${modId}.accesswidener")
+}
+
 processResources {
 	final Map<String, String> meta = [
 		version       : version,

src/main/java/net/modfest/scatteredshards/client/screen/ShardCreatorGuiDescription.java

@@ -1,8 +1,10 @@
 package net.modfest.scatteredshards.client.screen;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.DataResult;
 import com.mojang.serialization.JsonOps;
 import io.github.cottonmc.cotton.gui.client.BackgroundPainter;
 import io.github.cottonmc.cotton.gui.client.CottonClientScreen;
@@ -14,12 +16,18 @@
 import io.github.cottonmc.cotton.gui.widget.data.Axis;
 import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment;
 import io.github.cottonmc.cotton.gui.widget.data.Insets;
+import it.unimi.dsi.fastutil.objects.ReferenceArraySet;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.command.argument.ItemStringReader;
 import net.minecraft.component.ComponentChanges;
 import net.minecraft.component.ComponentMap;
+import net.minecraft.component.ComponentType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.registry.Registries;
 import net.minecraft.resource.Resource;
 import net.minecraft.text.Text;
@@ -37,6 +45,7 @@
 
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 public class ShardCreatorGuiDescription extends LightweightGuiDescription {
 	public static final Text TITLE_TEXT = Text.translatable("gui.scattered_shards.creator.title");
@@ -47,12 +56,10 @@ public class ShardCreatorGuiDescription extends LightweightGuiDescription {
 	public static final Text ICON_TEXTURE_TEXT = Text.translatable("gui.scattered_shards.creator.icon.texture");
 	public static final Text ICON_ITEM_TEXT = Text.translatable("gui.scattered_shards.creator.icon.item");
 	public static final Text ITEM_TEXT = Text.translatable("gui.scattered_shards.creator.field.item.id");
-	public static final Text NBT_TEXT = Text.translatable("gui.scattered_shards.creator.field.item.nbt");
+	public static final Text COMPONENT_TEXT = Text.translatable("gui.scattered_shards.creator.field.item.component");
 	public static final Text USE_MOD_ICON_TEXT = Text.translatable("gui.scattered_shards.creator.toggle.mod_icon");
 	public static final Text SAVE_TEXT = Text.translatable("gui.scattered_shards.creator.button.save");
 
-	private static final Gson GSON = new Gson();
-
 	private Identifier shardId;
 	private Shard shard;
 	private Identifier modIcon;
@@ -118,18 +125,15 @@ public static Identifier parseTexture(String path) {
 			updateItemIcon();
 		});
 
-	public WProtectableField nbtField = new WProtectableField(NBT_TEXT)
+	public WProtectableField componentField = new WProtectableField(COMPONENT_TEXT)
 		.setChangedListener((it) -> {
 			try {
-				this.itemComponents = ComponentMap.EMPTY;
-				JsonElement json = GSON.fromJson(it, JsonElement.class);
-				this.itemComponents = ComponentMap.CODEC.decode(JsonOps.INSTANCE, json).getOrThrow().getFirst();
+				updateComponents(new StringReader(it));
 			} catch (Exception ignored) {
 			}
 			updateItemIcon();
 		});
 
-
 	public WButton saveButton = new WButton(SAVE_TEXT)
 		.setOnClick(() -> ClientPlayNetworking.send(new C2SModifyShard(shardId, shard)));
 
@@ -138,6 +142,74 @@ public static Identifier parseTexture(String path) {
 	private Identifier iconPath = null;
 
 
+	private <T> void updateComponents(StringReader reader) throws CommandSyntaxException {
+		ComponentChanges.Builder changesBuilder = ComponentChanges.builder();
+		Set<ComponentType<?>> known = new ReferenceArraySet<>();
+
+		// Begin of component list
+		reader.expect('[');
+		reader.skipWhitespace();
+
+		// Body of component list
+		while (reader.canRead() && reader.peek() != ']') {
+			boolean negation = false;
+
+			if (reader.peek() == '!') {
+				// Negate incoming block
+				reader.skip();
+				negation = true;
+			}
+
+			// Component Type
+			@SuppressWarnings("unchecked") // We could avoid this with a separate method for getting the values but eh
+			ComponentType<T> componentType = (ComponentType<T>) ItemStringReader.Reader.readComponentType(reader);
+			reader.skipWhitespace();
+			if (!known.add(componentType))
+				throw new SimpleCommandExceptionType(Text.literal("Same component cannot appear twice")).create();
+
+			if (negation)
+				changesBuilder.remove(componentType);
+			else {
+				reader.expect('=');
+				reader.skipWhitespace();
+
+				// Component Value
+
+				int index = reader.getCursor();
+
+				NbtElement nbtElement = new StringNbtReader(reader).parseElement();
+				DataResult<T> dataResult = componentType.getCodecOrThrow().parse(NbtOps.INSTANCE, nbtElement);
+
+				changesBuilder.add(componentType, dataResult.getOrThrow(error -> {
+					reader.setCursor(index);
+					return new SimpleCommandExceptionType(Text.literal("Component is malformed")).create();
+				}));
+
+				reader.skipWhitespace();
+			}
+
+			// List separation
+
+			if (!reader.canRead() || reader.peek() != ',')
+				break;
+
+			reader.skip();
+			reader.skipWhitespace();
+			if (!reader.canRead())
+				throw new SimpleCommandExceptionType(Text.literal("Expected component")).create();
+		}
+
+		// End of components list
+		reader.expect(']');
+
+		ComponentChanges componentChanges = changesBuilder.build();
+
+		ComponentMap.Builder mapBuilder = ComponentMap.builder();
+		mapBuilder.addAll(componentChanges.toAddedRemovedPair().added());
+
+		this.itemComponents = mapBuilder.build();
+	}
+
 	private void updateItemIcon() {
 		if (item == null) {
 			shard.setIcon(Shard.MISSING_ICON);
@@ -190,7 +262,7 @@ public ShardCreatorGuiDescription(Identifier shardId, Shard shard, String modId)
 			this.itemField.setText(Registries.ITEM.getId(a.getItem()).toString());
 			String nbt = componentJson.toString();
 			if ("{}".equals(nbt)) nbt = "";
-			this.nbtField.setText(nbt);
+			this.componentField.setText(nbt);
 		}));
 
 		shardPanel.setShard(shard);
@@ -226,7 +298,7 @@ public ShardCreatorGuiDescription(Identifier shardId) {
 		textureIconPanel.add(textureToggle);
 
 		itemIconPanel.add(itemField);
-		itemIconPanel.add(nbtField);
+		itemIconPanel.add(componentField);
 
 		editorPanel.add(saveButton);
 

src/main/resources/assets/scattered_shards/lang/en_us.json

@@ -40,7 +40,7 @@
 	"gui.scattered_shards.creator.icon.texture": "Texture Icon",
 	"gui.scattered_shards.creator.icon.item": "Item Icon",
 	"gui.scattered_shards.creator.field.item.id": "Item ID...",
-	"gui.scattered_shards.creator.field.item.nbt": "Item NBT...",
+	"gui.scattered_shards.creator.field.item.component": "Item Components...",
 	"gui.scattered_shards.creator.field.texture": "Texture path...",
 	"gui.scattered_shards.creator.toggle.mod_icon": "Use mod icon",
 	"gui.scattered_shards.creator.button.save": "Save",

src/main/resources/fabric.mod.json

@@ -27,6 +27,7 @@
 		"libgui": ">=${libgui}",
 		"fabric-permissions-api-v0": ">=${fpapi}"
 	},
+	"accessWidener": "${modId}.accesswidener",
 	"entrypoints": {
 		"main": [
 			"net.modfest.scatteredshards.ScatteredShards"

src/main/resources/scattered_shards.accesswidener

@@ -0,0 +1,3 @@
+accessWidener v2 named
+
+accessible class net/minecraft/command/argument/ItemStringReader$Reader