diff --git a/nms/v1_17_1_R1/pom.xml b/nms/v1_17_1_R1/pom.xml new file mode 100644 index 0000000..91a9155 --- /dev/null +++ b/nms/v1_17_1_R1/pom.xml @@ -0,0 +1,42 @@ + + + + ShopChest-parent + de.epiceric + 1.14.0-SNAPSHOT + ../../pom.xml + + 4.0.0 + + shopchest-nms-v1_17_1_R1 + 1.0.0 + + + 1.17.1-R0.1-SNAPSHOT + + + + + org.spigotmc + spigot + remapped-mojang + + + de.epiceric + shopchest-nms-interface + provided + + + + + + + net.md-5 + specialsource-maven-plugin + + + + + \ No newline at end of file diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeArmorStandImpl.java b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeArmorStandImpl.java new file mode 100644 index 0000000..4eebd1c --- /dev/null +++ b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeArmorStandImpl.java @@ -0,0 +1,99 @@ +package de.epiceric.shopchest.nms.v1_17_1_R1; + +import de.epiceric.shopchest.nms.FakeArmorStand; +import io.netty.buffer.Unpooled; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.chat.ComponentSerializer; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.decoration.ArmorStand; +import org.bukkit.Location; +import org.bukkit.entity.Player; + +import java.lang.reflect.Field; +import java.util.List; +import java.util.Optional; + +public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand { + + private final static byte INVISIBLE_FLAG = 0b100000; + private final static byte MARKER_FLAG = 0b10000; + private final static EntityDataAccessor DATA_SHARED_FLAGS_ID; + private final static EntityDataAccessor> DATA_CUSTOM_NAME; + private final static EntityDataAccessor DATA_CUSTOM_NAME_VISIBLE; + private final static float MARKER_ARMOR_STAND_OFFSET = 1.975f; + + static { + try { + final Field dataSharedFlagsId = Entity.class.getDeclaredField("Z"); // DATA_SHARED_FLAGS_ID + dataSharedFlagsId.setAccessible(true); + DATA_SHARED_FLAGS_ID = forceCast(dataSharedFlagsId.get(null)); + final Field dataCustomNameField = Entity.class.getDeclaredField("aJ"); // DATA_CUSTOM_NAME + dataCustomNameField.setAccessible(true); + DATA_CUSTOM_NAME = forceCast(dataCustomNameField.get(null)); + final Field dataCustomNameVisibleField = Entity.class.getDeclaredField("aK"); // DATA_CUSTOM_NAME_VISIBLE + dataCustomNameVisibleField.setAccessible(true); + DATA_CUSTOM_NAME_VISIBLE = forceCast(dataCustomNameVisibleField.get(null)); + } catch (ReflectiveOperationException e){ + throw new RuntimeException(e); + } + } + + public FakeArmorStandImpl() { + super(); + } + + @Override + public void sendData(String name, Iterable receivers) { + sendData(receivers, name); + } + + @Override + protected EntityType getEntityType() { + return EntityType.ARMOR_STAND; + } + + @Override + protected float getSpawnOffSet() { + return MARKER_ARMOR_STAND_OFFSET; + } + + @Override + protected int getDataItemCount() { + return 4; + } + + @Override + protected void addSpecificData(List> packedItems, String name) { + packedItems.add(new SynchedEntityData.DataItem<>(DATA_SHARED_FLAGS_ID, INVISIBLE_FLAG)); + packedItems.add(new SynchedEntityData.DataItem<>(DATA_CUSTOM_NAME, Optional.ofNullable( + Component.Serializer.fromJson( + ComponentSerializer.toString( + TextComponent.fromLegacyText(name) + ) + ) + ))); + packedItems.add(new SynchedEntityData.DataItem<>(DATA_CUSTOM_NAME_VISIBLE, true)); + packedItems.add(new SynchedEntityData.DataItem<>(ArmorStand.DATA_CLIENT_FLAGS, MARKER_FLAG)); + } + + @Override + public void setLocation(Location location, Iterable receivers) { + final FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer()); + buffer.writeVarInt(entityId); + buffer.writeDouble(location.getX()); + buffer.writeDouble(location.getY() + MARKER_ARMOR_STAND_OFFSET); + buffer.writeDouble(location.getZ()); + buffer.writeByte(0); + buffer.writeByte(0); + buffer.writeBoolean(false); + final ClientboundTeleportEntityPacket positionPacket = new ClientboundTeleportEntityPacket(buffer); + sendPacket(positionPacket, receivers); + } + +} diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeEntityImpl.java b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeEntityImpl.java new file mode 100644 index 0000000..f0a280f --- /dev/null +++ b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeEntityImpl.java @@ -0,0 +1,124 @@ +package de.epiceric.shopchest.nms.v1_17_1_R1; + +import de.epiceric.shopchest.nms.FakeEntity; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; +import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket; +import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.phys.Vec3; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; + +public abstract class FakeEntityImpl implements FakeEntity { + + private final static AtomicInteger ENTITY_COUNTER; + private final static EntityDataAccessor DATA_NO_GRAVITY; + private final static EntityDataAccessor DATA_SILENT; + private final static Field packedItemField; + + static { + try { + final Field entityCounterField = Entity.class.getDeclaredField("b"); // ENTITY_COUNTER + entityCounterField.setAccessible(true); + ENTITY_COUNTER = (AtomicInteger) entityCounterField.get(null); + final Field dataNoGravityField = Entity.class.getDeclaredField("aM"); // DATA_NO_GRAVITY + dataNoGravityField.setAccessible(true); + DATA_NO_GRAVITY = forceCast(dataNoGravityField.get(null)); + final Field dataSilentField = Entity.class.getDeclaredField("aL"); // DATA_SILENT + dataSilentField.setAccessible(true); + DATA_SILENT = forceCast(dataSilentField.get(null)); + packedItemField = ClientboundSetEntityDataPacket.class.getDeclaredField("b"); // packedItems + packedItemField.setAccessible(true); + }catch (ReflectiveOperationException e){ + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + protected static T forceCast(Object o){ + return (T) o; + } + + protected final int entityId; + + public FakeEntityImpl() { + entityId = ENTITY_COUNTER.incrementAndGet(); + } + + @Override + public int getEntityId() { + return entityId; + } + + protected void sendPacket(Packet packet, Iterable receivers){ + for(Player receiver : receivers){ + ((CraftPlayer)receiver).getHandle().connection.send(packet); + } + } + + @Override + public void spawn(UUID uuid, Location location, Iterable receivers) { + final ClientboundAddEntityPacket spawnPacket = new ClientboundAddEntityPacket( + entityId, + uuid, + location.getX(), + location.getY() + getSpawnOffSet(), + location.getZ(), + 0f, + 0f, + getEntityType(), + 0, + Vec3.ZERO + ); + sendPacket(spawnPacket, receivers); + } + + @Override + public void remove(Iterable receivers) { + final ClientboundRemoveEntitiesPacket removePacket = new ClientboundRemoveEntitiesPacket(entityId); + sendPacket(removePacket, receivers); + } + + protected void sendData(Iterable receivers, T data){ + // Create packet + final SynchedEntityData entityData = new SynchedEntityData(null); + final ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(entityId, entityData, false); + final List> packedItems = new ArrayList<>(2 + getDataItemCount()); + + // Setup data + packedItems.add(new SynchedEntityData.DataItem<>(DATA_NO_GRAVITY, true)); + packedItems.add(new SynchedEntityData.DataItem<>(DATA_SILENT, true)); + addSpecificData(packedItems, data); + + try { + packedItemField.set(dataPacket, packedItems); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + + // Send packet + sendPacket(dataPacket, receivers); + } + + protected abstract EntityType getEntityType(); + + protected float getSpawnOffSet(){ + return 0f; + } + + protected abstract int getDataItemCount(); + + protected abstract void addSpecificData(List> packedItems, T data); + +} diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeItemImpl.java b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeItemImpl.java new file mode 100644 index 0000000..6807965 --- /dev/null +++ b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeItemImpl.java @@ -0,0 +1,60 @@ +package de.epiceric.shopchest.nms.v1_17_1_R1; + +import de.epiceric.shopchest.nms.FakeItem; +import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.phys.Vec3; +import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import java.lang.reflect.Field; +import java.util.List; + +public class FakeItemImpl extends FakeEntityImpl implements FakeItem { + + private final static EntityDataAccessor DATA_ITEM; + + static { + try{ + final Field dataItemField = ItemEntity.class.getDeclaredField("c"); // DATA_ITEM + dataItemField.setAccessible(true); + DATA_ITEM = forceCast(dataItemField.get(null)); + }catch (ReflectiveOperationException e){ + throw new RuntimeException(e); + } + } + + public FakeItemImpl() { + super(); + } + + @Override + public void sendData(ItemStack item, Iterable receivers) { + sendData(receivers, item); + } + + @Override + public void resetVelocity(Iterable receivers) { + final ClientboundSetEntityMotionPacket velocityPacket = new ClientboundSetEntityMotionPacket(entityId, Vec3.ZERO); + sendPacket(velocityPacket, receivers); + } + + @Override + protected EntityType getEntityType() { + return EntityType.ITEM; + } + + @Override + protected int getDataItemCount() { + return 1; + } + + @Override + protected void addSpecificData(List> packedItems, ItemStack data) { + packedItems.add(new SynchedEntityData.DataItem<>(DATA_ITEM, CraftItemStack.asNMSCopy(data))); + } +} diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/PlatformImpl.java b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/PlatformImpl.java new file mode 100644 index 0000000..bccf090 --- /dev/null +++ b/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/PlatformImpl.java @@ -0,0 +1,19 @@ +package de.epiceric.shopchest.nms.v1_17_1_R1; + +import de.epiceric.shopchest.nms.FakeArmorStand; +import de.epiceric.shopchest.nms.FakeItem; +import de.epiceric.shopchest.nms.Platform; + +public class PlatformImpl implements Platform { + + @Override + public FakeArmorStand createFakeArmorStand() { + return new FakeArmorStandImpl(); + } + + @Override + public FakeItem createFakeItem() { + return new FakeItemImpl(); + } + +} diff --git a/plugin/pom.xml b/plugin/pom.xml index 56cfc60..a030eb3 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -96,6 +96,10 @@ de.epiceric shopchest-nms-v1_17_R1 + + de.epiceric + shopchest-nms-v1_17_1_R1 + diff --git a/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java b/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java index bdd3bc2..cfb42c1 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java +++ b/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java @@ -195,7 +195,13 @@ public class ShopChest extends JavaPlugin { platform = new PlatformImpl(new ShopChestDebug(getLogger(), this::debug, this::debug)); break; case "v1_17_R1": - platform = new de.epiceric.shopchest.nms.v1_17_R1.PlatformImpl(); + // Need to have an implementation for 1.17.1 and 1.17 -> Change in the name of EntityDestroyPacket + if(Bukkit.getBukkitVersion().equals("1.17.1-R0.1-SNAPSHOT")){ + platform = new de.epiceric.shopchest.nms.v1_17_1_R1.PlatformImpl(); + } + else { + platform = new de.epiceric.shopchest.nms.v1_17_R1.PlatformImpl(); + } break; default: debug("Server version not officially supported: " + Utils.getServerVersion() + "!"); diff --git a/pom.xml b/pom.xml index a136935..72cfcfc 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ nms/interface nms/reflection nms/v1_17_R1 + nms/v1_17_1_R1 ShopChest @@ -310,6 +311,11 @@ shopchest-nms-v1_17_R1 1.0.0 + + de.epiceric + shopchest-nms-v1_17_1_R1 + 1.0.0 +