add has_shard selector

Author: HamaIndustries

src/main/java/net/modfest/scatteredshards/mixin/EntitySelectorOptionsMixin.java

@@ -0,0 +1,69 @@
+package net.modfest.scatteredshards.mixin;
+
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import net.minecraft.command.CommandSource;
+import net.minecraft.command.EntitySelectorOptions;
+import net.minecraft.command.EntitySelectorReader;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import net.modfest.scatteredshards.api.ScatteredShardsAPI;
+import net.modfest.scatteredshards.api.shard.Shard;
+import net.modfest.scatteredshards.mixinsupport.ShardArgument;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+@Mixin(EntitySelectorOptions.class)
+public class EntitySelectorOptionsMixin {
+
+	@Unique
+	private static final DynamicCommandExceptionType scards$UNKNOWN_ID = new DynamicCommandExceptionType(
+		shardId -> Text.stringifiedTranslatable("argument.scattered_shards.entity.options.has_shard.invalid", shardId)
+	);
+
+	// stolen with permission from fireblanket
+	@Shadow
+	private static void putOption(String id, EntitySelectorOptions.SelectorHandler handler, Predicate<EntitySelectorReader> condition, Text description) {
+		throw new IllegalStateException("Unimplemented mixin");
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Shadow
+	@Final
+	private static Map OPTIONS;
+
+	@Inject(method = "register", at = @At("TAIL"))
+	private static void injectShard(CallbackInfo info) {
+		if (!OPTIONS.containsKey("has_shard")) {
+			putOption("has_shard", reader -> {
+				reader.setSuggestionProvider((builder, consumer) -> {
+					CommandSource.suggestIdentifiers(ScatteredShardsAPI.getServerLibrary().shards().streamKeys(), builder);
+					return builder.buildFuture();
+				});
+
+				int i = reader.getReader().getCursor();
+				reader.setLocalWorldOnly();
+				Identifier id = Identifier.fromCommandInput(reader.getReader());
+				Optional<Shard> shard = ScatteredShardsAPI.getServerLibrary().shards().get(id);
+				if (shard.isEmpty()) {
+					reader.getReader().setCursor(i);
+					throw scards$UNKNOWN_ID.create(id);
+				}
+
+				((ShardArgument) reader).setHasShard(true);
+				reader.addPredicate(
+					entity -> entity instanceof ServerPlayerEntity player && ScatteredShardsAPI.getServerCollection(player).contains(id)
+				);
+			}, reader -> !((ShardArgument) reader).selectsByShard(), Text.translatable("argument.scattered_shards.entity.options.has_shard.description"));
+		}
+	}
+}

src/main/java/net/modfest/scatteredshards/mixin/EntitySelectorReaderMixin.java

@@ -0,0 +1,23 @@
+package net.modfest.scatteredshards.mixin;
+
+import net.minecraft.command.EntitySelectorReader;
+import net.modfest.scatteredshards.mixinsupport.ShardArgument;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(EntitySelectorReader.class)
+public class EntitySelectorReaderMixin implements ShardArgument {
+
+	@Unique
+	private boolean scards$hasShard = false;
+
+	@Override
+	public void setHasShard(boolean value) {
+		scards$hasShard = value;
+	}
+
+	@Override
+	public boolean selectsByShard() {
+		return scards$hasShard;
+	}
+}

src/main/java/net/modfest/scatteredshards/mixinsupport/ShardArgument.java

@@ -0,0 +1,6 @@
+package net.modfest.scatteredshards.mixinsupport;
+
+public interface ShardArgument {
+	void setHasShard(boolean value);
+	boolean selectsByShard();
+}

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

@@ -53,5 +53,8 @@
 	"gui.scattered_shards.tablet.click_on_a_shard": "Click on a Shard to the left",
 	"gui.scattered_shards.tablet.tooltip.global_collection": "%s of players have this shard",
 	"gui.scattered_shards.tablet.label.progress.started": "%s Started",
-	"gui.scattered_shards.tablet.label.progress.total": "%s Total"
+	"gui.scattered_shards.tablet.label.progress.total": "%s Total",
+
+	"argument.scattered_shards.entity.options.has_shard.description": "Shard Identifier",
+	"argument.scattered_shards.entity.options.has_shard.invalid": "Unknown shard identifier '%s'"
 }

src/main/resources/scattered_shards.mixins.json

@@ -8,5 +8,9 @@
 	],
 	"injectors": {
 		"defaultRequire": 1
-	}
+	},
+	"mixins": [
+		"EntitySelectorOptionsMixin",
+		"EntitySelectorReaderMixin"
+	]
 }