Consolidate item selectors. NewItemPickupEvent is now entirely

client-side.

6 files changed, 125 insertions, 42 deletions

diff --git a/gradle.properties b/gradle.properties
index 6139b1a..ae93acc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,6 @@ org.gradle.daemon=false
 name=${rootProject.name}
 group=com.anthonyhilyard.${name.toLowerCase()}
 author=anthonyhilyard
-version=1.0.16
+version=1.0.24
 mcVersion=1.17.1
 forgeVersion=37.0.90
diff --git a/src/main/java/com/anthonyhilyard/iceberg/Loader.java b/src/main/java/com/anthonyhilyard/iceberg/Loader.java
index 49e9d9c..7b7911b 100644
--- a/src/main/java/com/anthonyhilyard/iceberg/Loader.java
+++ b/src/main/java/com/anthonyhilyard/iceberg/Loader.java
@@ -1,7 +1,5 @@
 package com.anthonyhilyard.iceberg;
 
-import com.anthonyhilyard.iceberg.network.IcebergNetworkProtocol;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -32,9 +30,6 @@ public class Loader
 			new IcebergServer();
 		}
 
-		// Register the network protocol.
-		IcebergNetworkProtocol.register();
-
 		ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "ANY", (remote, isServer) -> true));
 	}
 
@@ -68,4 +63,4 @@ public class Loader
 	// 	}
 	// }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/anthonyhilyard/iceberg/mixin/ClientPacketListenerMixin.java b/src/main/java/com/anthonyhilyard/iceberg/mixin/ClientPacketListenerMixin.java
new file mode 100644
index 0000000..bef0407
--- /dev/null
+++ b/src/main/java/com/anthonyhilyard/iceberg/mixin/ClientPacketListenerMixin.java
@@ -0,0 +1,33 @@
+package com.anthonyhilyard.iceberg.mixin;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraftforge.common.MinecraftForge;
+
+import com.anthonyhilyard.iceberg.events.NewItemPickupEvent;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ClientPacketListener.class)
+public class ClientPacketListenerMixin
+{
+	@Inject(method = "handleTakeItemEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;shrink(I)V"),
+			locals = LocalCapture.CAPTURE_FAILEXCEPTION)
+	private void handleTakeItemEntity(ClientboundTakeItemEntityPacket packet, CallbackInfo info, Entity entity, LivingEntity livingEntity, ItemEntity itemEntity, ItemStack itemStack)
+	{
+		if (livingEntity instanceof Player)
+		{
+			MinecraftForge.EVENT_BUS.post(new NewItemPickupEvent(livingEntity.getUUID(), itemStack));
+		}
+	}
+}
diff --git a/src/main/java/com/anthonyhilyard/iceberg/mixin/ForgeEventFactoryMixin.java b/src/main/java/com/anthonyhilyard/iceberg/mixin/ForgeEventFactoryMixin.java
deleted file mode 100644
index 2dbc247..0000000
--- a/src/main/java/com/anthonyhilyard/iceberg/mixin/ForgeEventFactoryMixin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.anthonyhilyard.iceberg.mixin;
-
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.event.ForgeEventFactory;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fmllegacy.network.PacketDistributor;
-
-import com.anthonyhilyard.iceberg.network.IcebergNetworkProtocol;
-import com.anthonyhilyard.iceberg.network.NewItemPickupEventPacket;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(ForgeEventFactory.class)
-public class ForgeEventFactoryMixin
-{
-	@Inject(method = { "onItemPickup(Lnet/minecraft/world/entity/item/ItemEntity;Lnet/minecraft/world/entity/player/Player;)I" },
-			at = { @At("HEAD") }, remap = false)
-	private static void onItemPickup(ItemEntity entityItem, Player player, CallbackInfoReturnable<Integer> info)
-	{
-		if (player instanceof ServerPlayer && FMLEnvironment.dist.isDedicatedServer())
-		{
-			IcebergNetworkProtocol.CHANNEL.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer)player), new NewItemPickupEventPacket(player.getUUID(), entityItem.getItem()));
-		}
-	}
-}
diff --git a/src/main/java/com/anthonyhilyard/iceberg/util/Selectors.java b/src/main/java/com/anthonyhilyard/iceberg/util/Selectors.java
new file mode 100644
index 0000000..65a2ebd
--- /dev/null
+++ b/src/main/java/com/anthonyhilyard/iceberg/util/Selectors.java
@@ -0,0 +1,88 @@
+package com.anthonyhilyard.iceberg.util;
+
+import net.minecraft.world.item.ItemStack;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextColor;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.world.item.Rarity;
+import net.minecraft.world.item.TooltipFlag;
+
+public class Selectors
+{
+	private static Map<String, Rarity> rarities = new HashMap<String, Rarity>() {{
+		put("common", Rarity.COMMON);
+		put("uncommon", Rarity.UNCOMMON);
+		put("rare", Rarity.RARE);
+		put("epic", Rarity.EPIC);
+	}};
+
+	public static boolean itemMatches(ItemStack item, String selector)
+	{
+		String itemResourceLocation = item.getItem().getRegistryName().toString();
+		if (selector.equals(itemResourceLocation) || selector.equals(itemResourceLocation.replace("minecraft:", "")))
+		{
+			return true;
+		}
+		else if (selector.startsWith("#"))
+		{
+			TextColor entryColor = TextColor.parseColor(selector);
+			if (entryColor != null && entryColor.equals(ItemColor.getColorForItem(item, TextColor.fromRgb(0xFFFFFF))))
+			{
+				return true;
+			}
+		}
+		else if (selector.startsWith("!"))
+		{
+			if (item.getRarity() == rarities.get(selector.substring(1)))
+			{
+				return true;
+			}
+		}
+		else if (selector.startsWith("@"))
+		{
+			if (itemResourceLocation.startsWith(selector.substring(1) + ":"))
+			{
+				return true;
+			}
+		}
+		else if (selector.startsWith("$"))
+		{
+			if (ItemTags.getAllTags().getTagOrEmpty(new ResourceLocation(selector.substring(1))).getValues().contains(item.getItem()))
+			{
+				return true;
+			}
+		}
+		else if (selector.startsWith("%"))
+		{
+			if (item.getDisplayName().getString().contains(selector.substring(1)))
+			{
+				return true;
+			}
+		}
+		else if (selector.startsWith("^"))
+		{
+			Minecraft mc = Minecraft.getInstance();
+			List<Component> lines = item.getTooltipLines(mc.player, TooltipFlag.Default.ADVANCED);
+			String tooltipText = "";
+
+			// Skip title line.
+			for (int n = 1; n < lines.size(); n++)
+			{
+				tooltipText += lines.get(n).getString() + '\n';
+			}
+			if (tooltipText.contains(selector.substring(1)))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/iceberg.mixins.json b/src/main/resources/iceberg.mixins.json
index d81f759..927fd30 100644
--- a/src/main/resources/iceberg.mixins.json
+++ b/src/main/resources/iceberg.mixins.json
@@ -7,11 +7,9 @@
 		"EntityMixin",
 		"PlayerAdvancementsMixin"
 	],
-	"server": [
-		"ForgeEventFactoryMixin"
-	],
 	"client": [
-		"ScreenMixin"
+		"ScreenMixin",
+		"ClientPacketListenerMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1