cut down size of shareitemmessage significantly

closes #4315
VazkiiMods · Aug 15, 2023 · 8fcfbe7 · 8fcfbe7
1 parent 55b7027
commit 8fcfbe7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/main/java/vazkii/quark/base/network/message/ShareItemMessage.java b/src/main/java/vazkii/quark/base/network/message/ShareItemMessage.java
@@ -1,6 +1,5 @@
 package vazkii.quark.base.network.message;
 
-import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.LastSeenMessages;
 import net.minecraft.network.chat.MessageSignature;
 import net.minecraft.server.level.ServerPlayer;
@@ -19,7 +18,6 @@ public class ShareItemMessage implements IMessage {
 
 	public ItemStack stack;
 	public String message;
-	public Component component;
 	public Instant timeStamp;
 	public long salt;
 	public MessageSignature signature;
@@ -28,10 +26,9 @@ public class ShareItemMessage implements IMessage {
 
 	public ShareItemMessage() { }
 
-	public ShareItemMessage(ItemStack stack, String message, Component component, Instant timeStamp, long salt, MessageSignature signature, boolean signedPreview, LastSeenMessages.Update lastSeenMessages) {
+	public ShareItemMessage(ItemStack stack, String message, Instant timeStamp, long salt, MessageSignature signature, boolean signedPreview, LastSeenMessages.Update lastSeenMessages) {
 		this.stack = stack;
 		this.message = message;
-		this.component = component;
 		this.timeStamp = timeStamp;
 		this.salt = salt;
 		this.signature = signature;
@@ -43,7 +40,7 @@ public ShareItemMessage(ItemStack stack, String message, Component component, In
 	public boolean receive(Context context) {
 		ServerPlayer player = context.getSender();
 		if (player != null && player.server != null)
-			context.enqueueWork(() -> ItemSharingModule.shareItem(player, message, component, stack, timeStamp, salt, signature, signedPreview, lastSeenMessages));
+			context.enqueueWork(() -> ItemSharingModule.shareItem(player, message, stack, timeStamp, salt, signature, signedPreview, lastSeenMessages));
 
 		return true;
 	}

diff --git a/src/main/java/vazkii/quark/content/management/module/ItemSharingModule.java b/src/main/java/vazkii/quark/content/management/module/ItemSharingModule.java
@@ -132,7 +132,7 @@ public boolean clicc() {
 							LastSeenMessages.Update update = mc.player.connection.generateMessageAcknowledgements();
 							MessageSignature signature = accessorLocalPlayer.quark$signMessage(sign, content, update.lastSeen());
 
-							ShareItemMessage message = new ShareItemMessage(stack, content.plain(), content.decorated(), sign.timeStamp(), sign.salt(), signature, content.isDecorated(), update);
+							ShareItemMessage message = new ShareItemMessage(stack, content.plain(), sign.timeStamp(), sign.salt(), signature, content.isDecorated(), update);
 							QuarkNetwork.sendToServer(message);
 
 							return true;
@@ -145,19 +145,15 @@ public boolean clicc() {
 		return false;
 	}
 
-	public static void shareItem(ServerPlayer player, String message, Component component, ItemStack stack, Instant timeStamp, long salt, MessageSignature signature, boolean signedPreview, LastSeenMessages.Update lastSeenMessages) {
+	public static void shareItem(ServerPlayer player, String message, ItemStack stack, Instant timeStamp, long salt, MessageSignature signature, boolean signedPreview, LastSeenMessages.Update lastSeenMessages) {
 		if (!ModuleLoader.INSTANCE.isModuleEnabled(ItemSharingModule.class))
 			return;
 
 		Component itemComp = stack.getDisplayName();
 
-		// This is done to ensure that arbitrary components can't be sent - only the stack's component.
-		// Component is checked on this side to ensure the signing was of the correct component.
-		if (itemComp.equals(component)) {
-			((AccessorServerGamePacketListenerImpl) player.connection).quark$chatPreviewCache().set(message, itemComp);
+		((AccessorServerGamePacketListenerImpl) player.connection).quark$chatPreviewCache().set(message, itemComp);
 
-			player.connection.handleChat(new ServerboundChatPacket(message, timeStamp, salt, signature, signedPreview, lastSeenMessages));
-		}
+		player.connection.handleChat(new ServerboundChatPacket(message, timeStamp, salt, signature, signedPreview, lastSeenMessages));
 	}
 
 	public static MutableComponent createStackComponent(ItemStack stack, MutableComponent component) {