Upstream/ShopChest-Updated
1
0
Fork 0
mirror of https://github.com/Flowsqy/ShopChest.git synced 2024-11-10 22:49:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add 1.21 support

Browse Source
This commit is contained in:
Flowsqy 2024-06-13 22:36:51 +02:00
parent b91e443e09
commit d81aee9068
10 changed files with 359 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms/all/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shopchest-nms-all</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<packaging>pom</packaging>
@ -72,6 +72,10 @@
<groupId>de.epiceric</groupId>
<artifactId>shopchest-nms-v1_20_R4</artifactId>
</dependency>
<dependency>
<groupId>de.epiceric</groupId>
<artifactId>shopchest-nms-v1_21_R1</artifactId>
</dependency>
</dependencies>
<build>

7
nms/pom.xml
View File

@ -27,6 +27,7 @@
<module>v1_20_R2</module>
<module>v1_20_R3</module>
<module>v1_20_R4</module>
<module>v1_21_R1</module>
<module>all</module>
</modules>
@ -118,6 +119,12 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.epiceric</groupId>
<artifactId>shopchest-nms-v1_21_R1</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

41
nms/v1_21_R1/pom.xml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shopchest-nms</artifactId>
<groupId>de.epiceric</groupId>
<version>1.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shopchest-nms-v1_21_R1</artifactId>
<version>1.0.0</version>
<properties>
<spigot.version>1.21-R0.1-SNAPSHOT</spigot.version>
</properties>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<classifier>remapped-mojang</classifier>
</dependency>
<dependency>
<groupId>de.epiceric</groupId>
<artifactId>shopchest-nms-interface</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>net.md-5</groupId>
<artifactId>specialsource-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

94
nms/v1_21_R1/src/main/java/de/epiceric/shopchest/nms/v1_21_R1/FakeArmorStandImpl.java Normal file
View File

@ -0,0 +1,94 @@
package de.epiceric.shopchest.nms.v1_21_R1;
import de.epiceric.shopchest.nms.FakeArmorStand;
import io.netty.buffer.Unpooled;
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.craftbukkit.v1_21_R1.util.CraftChatMessage;
import org.bukkit.entity.Player;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Optional;
public class FakeArmorStandImpl extends FakeEntityImpl<String> implements FakeArmorStand {
private final static byte INVISIBLE_FLAG = 0b100000;
private final static byte MARKER_FLAG = 0b10000;
private final static EntityDataAccessor<Byte> DATA_SHARED_FLAGS_ID;
private final static EntityDataAccessor<Optional<Component>> DATA_CUSTOM_NAME;
private final static EntityDataAccessor<Boolean> DATA_CUSTOM_NAME_VISIBLE;
private final static float MARKER_ARMOR_STAND_OFFSET = 1.975f;
static {
try {
final Field dataSharedFlagsId = Entity.class.getDeclaredField(ObfuscatedFieldNames.DATA_SHARED_FLAGS_ID);
dataSharedFlagsId.setAccessible(true);
DATA_SHARED_FLAGS_ID = forceCast(dataSharedFlagsId.get(null));
final Field dataCustomNameField = Entity.class.getDeclaredField(ObfuscatedFieldNames.DATA_CUSTOM_NAME);
dataCustomNameField.setAccessible(true);
DATA_CUSTOM_NAME = forceCast(dataCustomNameField.get(null));
final Field dataCustomNameVisibleField = Entity.class.getDeclaredField(ObfuscatedFieldNames.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<Player> 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<SynchedEntityData.DataValue<?>> packedItems, String name) {
packedItems.add(SynchedEntityData.DataValue.create(DATA_SHARED_FLAGS_ID, INVISIBLE_FLAG));
packedItems.add(SynchedEntityData.DataValue.create(DATA_CUSTOM_NAME, Optional.ofNullable(
CraftChatMessage.fromStringOrNull(name)
)));
packedItems.add(SynchedEntityData.DataValue.create(DATA_CUSTOM_NAME_VISIBLE, true));
packedItems.add(SynchedEntityData.DataValue.create(ArmorStand.DATA_CLIENT_FLAGS, MARKER_FLAG));
}
@Override
public void setLocation(Location location, Iterable<Player> 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 = ClientboundTeleportEntityPacket.STREAM_CODEC.decode(buffer);
sendPacket(positionPacket, receivers);
}
}

115
nms/v1_21_R1/src/main/java/de/epiceric/shopchest/nms/v1_21_R1/FakeEntityImpl.java Normal file
View File

@ -0,0 +1,115 @@
package de.epiceric.shopchest.nms.v1_21_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_21_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import java.lang.reflect.Field;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
public abstract class FakeEntityImpl<T> implements FakeEntity {
private final static AtomicInteger ENTITY_COUNTER;
private final static EntityDataAccessor<Boolean> DATA_NO_GRAVITY;
private final static EntityDataAccessor<Boolean> DATA_SILENT;
static {
try {
final Field entityCounterField = Entity.class.getDeclaredField(ObfuscatedFieldNames.ENTITY_COUNTER);
entityCounterField.setAccessible(true);
ENTITY_COUNTER = (AtomicInteger) entityCounterField.get(null);
final Field dataNoGravityField = Entity.class.getDeclaredField(ObfuscatedFieldNames.DATA_NO_GRAVITY);
dataNoGravityField.setAccessible(true);
DATA_NO_GRAVITY = forceCast(dataNoGravityField.get(null));
final Field dataSilentField = Entity.class.getDeclaredField(ObfuscatedFieldNames.DATA_SILENT);
dataSilentField.setAccessible(true);
DATA_SILENT = forceCast(dataSilentField.get(null));
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}
protected final int entityId;
public FakeEntityImpl() {
entityId = ENTITY_COUNTER.incrementAndGet();
}
@SuppressWarnings("unchecked")
protected static <T> T forceCast(Object o) {
return (T) o;
}
@Override
public int getEntityId() {
return entityId;
}
protected void sendPacket(Packet<?> packet, Iterable<Player> receivers) {
for (Player receiver : receivers) {
((CraftPlayer) receiver).getHandle().connection.send(packet);
}
}
@Override
public void spawn(UUID uuid, Location location, Iterable<Player> receivers) {
final ClientboundAddEntityPacket spawnPacket = new ClientboundAddEntityPacket(
entityId,
uuid,
location.getX(),
location.getY() + getSpawnOffSet(),
location.getZ(),
0f,
0f,
getEntityType(),
0,
Vec3.ZERO,
0d
);
sendPacket(spawnPacket, receivers);
}
@Override
public void remove(Iterable<Player> receivers) {
final ClientboundRemoveEntitiesPacket removePacket = new ClientboundRemoveEntitiesPacket(entityId);
sendPacket(removePacket, receivers);
}
protected void sendData(Iterable<Player> receivers, T data) {
// Create packet
final List<SynchedEntityData.DataValue<?>> packedItems = new LinkedList<>();
final ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(entityId, packedItems);
// Setup data
packedItems.add(SynchedEntityData.DataValue.create(DATA_NO_GRAVITY, true));
packedItems.add(SynchedEntityData.DataValue.create(DATA_SILENT, true));
addSpecificData(packedItems, data);
// Send packet
sendPacket(dataPacket, receivers);
}
protected abstract EntityType<?> getEntityType();
protected float getSpawnOffSet() {
return 0f;
}
protected abstract int getDataItemCount();
protected abstract void addSpecificData(List<SynchedEntityData.DataValue<?>> packedItems, T data);
}

60
nms/v1_21_R1/src/main/java/de/epiceric/shopchest/nms/v1_21_R1/FakeItemImpl.java Normal file
View File

@ -0,0 +1,60 @@
package de.epiceric.shopchest.nms.v1_21_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_21_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<ItemStack> implements FakeItem {
private final static EntityDataAccessor<net.minecraft.world.item.ItemStack> DATA_ITEM;
static {
try {
final Field dataItemField = ItemEntity.class.getDeclaredField(ObfuscatedFieldNames.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<Player> receivers) {
sendData(receivers, item);
}
@Override
public void resetVelocity(Iterable<Player> 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<SynchedEntityData.DataValue<?>> packedItems, ItemStack data) {
packedItems.add(SynchedEntityData.DataValue.create(DATA_ITEM, CraftItemStack.asNMSCopy(data)));
}
}

15
nms/v1_21_R1/src/main/java/de/epiceric/shopchest/nms/v1_21_R1/ObfuscatedFieldNames.java Normal file
View File

@ -0,0 +1,15 @@
package de.epiceric.shopchest.nms.v1_21_R1;
public class ObfuscatedFieldNames {
// Entity
public static final String ENTITY_COUNTER = "c";
public static final String DATA_NO_GRAVITY = "aT";
public static final String DATA_SILENT = "aS";
public static final String DATA_SHARED_FLAGS_ID = "ap";
public static final String DATA_CUSTOM_NAME = "aQ";
public static final String DATA_CUSTOM_NAME_VISIBLE = "aR";
// ItemEntity
public static final String DATA_ITEM = "d";
}

19
nms/v1_21_R1/src/main/java/de/epiceric/shopchest/nms/v1_21_R1/PlatformImpl.java Normal file
View File

@ -0,0 +1,19 @@
package de.epiceric.shopchest.nms.v1_21_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();
}
}

2
plugin/src/main/java/de/epiceric/shopchest/nms/PlatformLoader.java
View File

@ -100,6 +100,8 @@ public class PlatformLoader {
case "ad1a88fd7eaf2277f2507bf34d7b994c": // 1.20.5 (Replaced by 1.20.6)
case "ee13f98a43b9c5abffdcc0bb24154460": // 1.20.6 (v1_20_R4)
return new de.epiceric.shopchest.nms.v1_20_R4.PlatformImpl();
case "229d7afc75b70a6c388337687ac4da1f": // 1.21 (v1_21_R1)
return new de.epiceric.shopchest.nms.v1_21_R1.PlatformImpl();
default:
return null;
}

2
pom.xml
View File

@ -317,7 +317,7 @@
<dependency>
<groupId>de.epiceric</groupId>
<artifactId>shopchest-nms-all</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<classifier>${nms-classifier}</classifier>
</dependency>
<dependency>