2021-12-01 13:32:36 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
|
|
Date: Tue, 3 Aug 2021 17:28:27 +0200
|
|
|
|
Subject: [PATCH] Hide unnecessary itemmeta from clients
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
2024-01-18 22:00:40 +01:00
|
|
|
index 945a0317e9e49a159a1f42882a0a267a2141e86d..e9fd9590e90e58fd4c31985a704a4511b2663096 100644
|
2021-12-01 13:32:36 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
2023-09-22 16:58:35 +02:00
|
|
|
@@ -337,7 +337,7 @@ public class ServerEntity {
|
2021-12-01 13:32:36 +01:00
|
|
|
if (!itemstack.isEmpty()) {
|
|
|
|
// Paper start - prevent oversized data
|
|
|
|
final ItemStack sanitized = LivingEntity.sanitizeItemStack(itemstack.copy(), false);
|
|
|
|
- list.add(Pair.of(enumitemslot, sanitized));
|
2024-01-18 22:00:40 +01:00
|
|
|
+ list.add(Pair.of(enumitemslot, ((LivingEntity) this.entity).stripMeta(sanitized, false))); // Paper - Hide unnecessary item meta
|
|
|
|
// Paper end - prevent oversized data
|
2021-12-01 13:32:36 +01:00
|
|
|
}
|
|
|
|
}
|
2022-08-14 10:03:13 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2024-01-20 12:50:16 +01:00
|
|
|
index f93d3a933fb980c3fdc1f136c79807ce8517a235..643b98097bf77c55961cf1722faad6fb63504abd 100644
|
2022-08-14 10:03:13 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2024-01-20 12:50:16 +01:00
|
|
|
@@ -2561,8 +2561,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
2022-12-07 22:35:34 +01:00
|
|
|
// Refresh the current entity metadata
|
2023-10-27 01:34:58 +02:00
|
|
|
entity.getEntityData().refresh(ServerGamePacketListenerImpl.this.player);
|
2022-12-07 22:35:34 +01:00
|
|
|
// SPIGOT-7136 - Allays
|
|
|
|
- if (entity instanceof Allay) {
|
2023-10-27 01:34:58 +02:00
|
|
|
- ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList())));
|
2024-01-18 22:00:40 +01:00
|
|
|
+ if (entity instanceof Allay allay) { // Paper - Hide unnecessary item meta
|
|
|
|
+ ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, allay.stripMeta(allay.getItemBySlot(slot), true))).collect(Collectors.toList()))); // Paper - Hide unnecessary item meta
|
2023-10-27 01:34:58 +02:00
|
|
|
ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote();
|
2022-12-07 22:35:34 +01:00
|
|
|
}
|
2022-08-14 10:03:13 +02:00
|
|
|
}
|
2021-12-01 13:32:36 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2024-01-20 12:50:16 +01:00
|
|
|
index e7d72a7495d07c793ce3f5110d476f1cc3ed4469..551100c72bd20d7ff224acf3750fe3dc9d73a483 100644
|
2021-12-01 13:32:36 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2023-12-06 16:17:00 +01:00
|
|
|
@@ -3190,7 +3190,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2021-12-01 13:32:36 +01:00
|
|
|
|
|
|
|
// Paper start - prevent oversized data
|
|
|
|
ItemStack toSend = sanitizeItemStack(itemstack1, true);
|
|
|
|
- list.add(Pair.of(enumitemslot, toSend));
|
2024-01-18 22:00:40 +01:00
|
|
|
+ list.add(Pair.of(enumitemslot, stripMeta(toSend, toSend == itemstack1))); // Paper - Hide unnecessary item meta
|
|
|
|
// Paper end - prevent oversized data
|
2021-12-01 13:32:36 +01:00
|
|
|
switch (enumitemslot.getType()) {
|
|
|
|
case HAND:
|
2023-12-06 16:17:00 +01:00
|
|
|
@@ -3204,6 +3204,77 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2023-06-08 09:20:03 +02:00
|
|
|
((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
|
2021-12-01 13:32:36 +01:00
|
|
|
}
|
|
|
|
|
2024-01-18 22:00:40 +01:00
|
|
|
+ // Paper start - Hide unnecessary item meta
|
2021-12-01 13:32:36 +01:00
|
|
|
+ public ItemStack stripMeta(final ItemStack itemStack, final boolean copyItemStack) {
|
|
|
|
+ if (itemStack.isEmpty() || (!itemStack.hasTag() && itemStack.getCount() < 2)) {
|
|
|
|
+ return itemStack;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ final ItemStack copy = copyItemStack ? itemStack.copy() : itemStack;
|
2023-06-08 21:00:58 +02:00
|
|
|
+ if (this.level().paperConfig().anticheat.obfuscation.items.hideDurability) {
|
2021-12-01 13:32:36 +01:00
|
|
|
+ // Only show damage values for elytra's, since they show a different texture when broken.
|
|
|
|
+ if (!copy.is(Items.ELYTRA) || copy.getDamageValue() < copy.getMaxDamage() - 1) {
|
|
|
|
+ copy.setDamageValue(0);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2022-11-19 22:41:09 +01:00
|
|
|
+ final CompoundTag tag = copy.getTag();
|
2023-06-08 21:00:58 +02:00
|
|
|
+ if (this.level().paperConfig().anticheat.obfuscation.items.hideItemmeta) {
|
2021-12-01 13:32:36 +01:00
|
|
|
+ // Some resource packs show different textures when there is more than one item. Since this shouldn't provide a big advantage,
|
|
|
|
+ // we'll tell the client if there's one or (more than) two items.
|
|
|
|
+ copy.setCount(copy.getCount() > 1 ? 2 : 1);
|
|
|
|
+ // We can't just strip out display, leather helmets still use the display.color tag.
|
|
|
|
+ if (tag != null) {
|
|
|
|
+ if (tag.get("display") instanceof CompoundTag displayTag) {
|
|
|
|
+ displayTag.remove("Lore");
|
|
|
|
+ displayTag.remove("Name");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (tag.get("Enchantments") instanceof ListTag enchantmentsTag && !enchantmentsTag.isEmpty()) {
|
|
|
|
+ // The client still renders items with the enchantment glow if the enchantments tag contains at least one (empty) child.
|
|
|
|
+ ListTag enchantments = new ListTag();
|
2022-01-02 00:26:53 +01:00
|
|
|
+ CompoundTag fakeEnchantment = new CompoundTag();
|
|
|
|
+ // Soul speed boots generate client side particles.
|
|
|
|
+ if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SOUL_SPEED, itemStack) > 0) {
|
|
|
|
+ fakeEnchantment.putString("id", org.bukkit.enchantments.Enchantment.SOUL_SPEED.getKey().asString());
|
|
|
|
+ fakeEnchantment.putInt("lvl", 1);
|
|
|
|
+ }
|
|
|
|
+ enchantments.add(fakeEnchantment);
|
2021-12-01 13:32:36 +01:00
|
|
|
+ tag.put("Enchantments", enchantments);
|
|
|
|
+ }
|
|
|
|
+ tag.remove("AttributeModifiers");
|
2023-10-14 23:41:15 +02:00
|
|
|
+ tag.remove("Unbreakable");
|
|
|
|
+ tag.remove("PublicBukkitValues"); // Persistent data container1
|
2022-04-18 12:23:37 +02:00
|
|
|
+
|
|
|
|
+ // Books
|
|
|
|
+ tag.remove("author");
|
|
|
|
+ tag.remove("filtered_title");
|
|
|
|
+ tag.remove("pages");
|
|
|
|
+ tag.remove("filtered_pages");
|
|
|
|
+ tag.remove("title");
|
|
|
|
+ tag.remove("generation");
|
2023-10-14 23:41:15 +02:00
|
|
|
+
|
|
|
|
+ // Filled maps
|
|
|
|
+ tag.remove("map");
|
|
|
|
+ tag.remove("map_scale_direction");
|
|
|
|
+ tag.remove("map_to_lock");
|
2021-12-01 13:32:36 +01:00
|
|
|
+ }
|
|
|
|
+ }
|
2022-11-19 22:41:09 +01:00
|
|
|
+
|
2023-06-08 21:00:58 +02:00
|
|
|
+ if (this.level().paperConfig().anticheat.obfuscation.items.hideItemmetaWithVisualEffects && tag != null) {
|
2022-11-19 22:41:09 +01:00
|
|
|
+ // Lodestone compasses
|
|
|
|
+ tag.remove("LodestonePos");
|
|
|
|
+ if (tag.contains("LodestoneDimension")) {
|
|
|
|
+ // The client shows the glint if either the position or the dimension is present, so we just wipe
|
|
|
|
+ // the position and fake the dimension
|
|
|
|
+ tag.putString("LodestoneDimension", "paper:paper");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2021-12-01 13:32:36 +01:00
|
|
|
+ return copy;
|
|
|
|
+ }
|
2024-01-18 22:00:40 +01:00
|
|
|
+ // Paper end - Hide unnecessary item meta
|
2021-12-01 13:32:36 +01:00
|
|
|
+
|
2022-01-02 00:26:53 +01:00
|
|
|
// Paper start - prevent oversized data
|
2021-12-01 13:32:36 +01:00
|
|
|
public static ItemStack sanitizeItemStack(final ItemStack itemStack, final boolean copyItemStack) {
|
|
|
|
if (itemStack.isEmpty() || !itemStack.hasTag()) {
|