Update to 5.0.1

Author: Moulberry

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.moulberry.axiom"
-version = "4.0.5+1.20.4"
+version = "5.0.1+1.20.4"
 description = "Serverside component for Axiom on Paper"
 
 java {
@@ -22,8 +22,8 @@ repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     maven("https://jitpack.io")
     maven("https://repo.papermc.io/repository/maven-public/")
-    maven("https://maven.enginehub.org/repo/")
-    maven("https://maven.playpro.com")
+    maven("https://maven.enginehub.org/repo/") // WorldGuard
+    maven("https://maven.playpro.com") // CoreProtect
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 # Dependencies
 bom-newest = "1.37"
-cloud-paper = "2.0.0-20240516.054251-69"
+cloud-paper = "2.0.0-beta.11"
 coreprotect = "22.4"
 paper = "1.20.4-R0.1-SNAPSHOT"
 plotsquared = "7.3.8"
-reflection-remapper = "0.1.2-20240315.033304-2"
-viaversion-api = "5.0.1"
+reflection-remapper = "0.1.2"
+viaversion-api = "5.4.2-SNAPSHOT"
 worldguard-bukkit = "7.0.9-SNAPSHOT"
 zstd-jni = "1.5.5-4"
 

src/main/java/com/moulberry/axiom/AxiomConstants.java

@@ -12,6 +12,6 @@ public class AxiomConstants {
         }
     }
 
-    public static final int API_VERSION = 8;
+    public static final int API_VERSION = 9;
 
 }

src/main/java/com/moulberry/axiom/AxiomPaper.java

@@ -0,0 +1,34 @@
+package com.moulberry.axiom;
+
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.chunk.LevelChunk;
+import xyz.jpenilla.reflectionremapper.ReflectionRemapper;
+
+import java.lang.reflect.Method;
+
+public class AxiomReflection {
+
+    private static Method updateBlockEntityTicker = null;
+
+    public static void init() {
+        ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar();
+        String methodName = reflectionRemapper.remapMethodName(LevelChunk.class, "updateBlockEntityTicker", BlockEntity.class);
+
+        try {
+            updateBlockEntityTicker = LevelChunk.class.getDeclaredMethod(methodName, BlockEntity.class);
+            updateBlockEntityTicker.setAccessible(true);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void updateBlockEntityTicker(LevelChunk levelChunk, BlockEntity blockEntity) {
+        try {
+            updateBlockEntityTicker.invoke(levelChunk, blockEntity);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

src/main/java/com/moulberry/axiom/AxiomReflection.java

@@ -10,6 +10,8 @@
 import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
+import java.util.List;
+
 public class VersionHelper {
 
     public static void sendCustomPayload(Player player, String id, byte[] data) {
@@ -24,10 +26,20 @@ public static void sendCustomPayload(ServerPlayer serverPlayer, ResourceLocation
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(new CustomByteArrayPayload(id, data)));
     }
 
-    public static void sendCustomPayload(ServerPlayer serverPlayer, ResourceLocation id, FriendlyByteBuf friendlyByteBuf) {
-        byte[] data = new byte[friendlyByteBuf.writerIndex()];
-        friendlyByteBuf.getBytes(friendlyByteBuf.readerIndex(), data);
-        sendCustomPayload(serverPlayer, id, data);
+    public static void sendCustomPayloadToAll(List<ServerPlayer> players, String id, byte[] data) {
+        sendCustomPayloadToAll(players, createResourceLocation(id), data);
+    }
+
+    public static void sendCustomPayloadToAll(List<ServerPlayer> players, ResourceLocation id, byte[] data) {
+        if (players.isEmpty()) {
+            return;
+        }
+
+        var payload = new CustomByteArrayPayload(id, data);
+        var packet = new ClientboundCustomPayloadPacket(payload);
+        for (ServerPlayer player : players) {
+            player.connection.send(packet);
+        }
     }
 
     public static ResourceLocation createResourceLocation(String composed) {

src/main/java/com/moulberry/axiom/Restrictions.java

@@ -2,9 +2,12 @@
 
 import com.moulberry.axiom.annotations.ServerAnnotations;
 import com.moulberry.axiom.marker.MarkerData;
+import com.moulberry.axiom.paperapi.entity.ImplAxiomHiddenEntities;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.longs.*;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
 import net.minecraft.resources.ResourceKey;
@@ -38,7 +41,7 @@ public static void onPlayerJoin(World world, Player player) {
         ServerLevel level = ((CraftWorld)world).getHandle();
         get(level).onPlayerJoin(player);
 
-        if (AxiomPaper.PLUGIN.canUseAxiom(player, "axiom.annotations.view")) {
+        if (AxiomPaper.PLUGIN.canUseAxiom(player)) {
             ServerAnnotations.sendAll(world, ((CraftPlayer)player).getHandle());
         }
     }
@@ -76,6 +79,14 @@ public void onPlayerJoin(Player player) {
             byte[] bytes = ByteBufUtil.getBytes(buf);
             VersionHelper.sendCustomPayload(player, "axiom:marker_data", bytes);
         }
+
+        try {
+            ServerPlayer serverPlayer = ((CraftPlayer)player).getHandle();
+            if (this.level.chunkPacketBlockController.shouldModify(serverPlayer, this.level.getChunkIfLoaded(serverPlayer.blockPosition()))) {
+                Component text = Component.text("Axiom: Warning, anti-xray is enabled. This will cause issues when copying blocks. Please turn anti-xray off");
+                player.sendMessage(text.color(NamedTextColor.RED));
+            }
+        } catch (Throwable ignored) {}
     }
 
     public void tick(boolean sendMarkers, int maxChunkRelightsPerTick, int maxChunkSendsPerTick) {
@@ -92,6 +103,10 @@ private void tickMarkers() {
 
         for (Entity entity : this.level.getEntities().getAll()) {
             if (entity instanceof Marker marker) {
+                if (ImplAxiomHiddenEntities.isMarkerHidden((org.bukkit.entity.Marker) marker.getBukkitEntity())) {
+                    continue;
+                }
+
                 MarkerData currentData = MarkerData.createFrom(marker);
 
                 MarkerData previousData = this.previousMarkerData.get(marker.getUUID());
@@ -104,21 +119,25 @@ private void tickMarkers() {
             }
         }
 
-        Set<UUID> oldUuids = new HashSet<>(this.previousMarkerData.keySet());
-        oldUuids.removeAll(allMarkers);
-        this.previousMarkerData.keySet().removeAll(oldUuids);
+        Set<UUID> missingUuids = new HashSet<>(this.previousMarkerData.keySet());
+        missingUuids.removeAll(allMarkers);
+        this.previousMarkerData.keySet().removeAll(missingUuids);
 
-        if (!changedData.isEmpty() || !oldUuids.isEmpty()) {
+        if (!changedData.isEmpty() || !missingUuids.isEmpty()) {
             FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
             buf.writeCollection(changedData, MarkerData::write);
-            buf.writeCollection(oldUuids, (buffer, uuid) -> buffer.writeUUID(uuid));
+            buf.writeCollection(missingUuids, (buffer, uuid) -> buffer.writeUUID(uuid));
             byte[] bytes = ByteBufUtil.getBytes(buf);
 
+            List<ServerPlayer> players = new ArrayList<>();
+
             for (ServerPlayer player : this.level.players()) {
-                if (AxiomPaper.PLUGIN.activeAxiomPlayers.contains(player.getUUID())) {
-                    VersionHelper.sendCustomPayload(player, "axiom:marker_data", bytes);
+                if (AxiomPaper.PLUGIN.canUseAxiom(player.getBukkitEntity())) {
+                    players.add(player);
                 }
             }
+
+            VersionHelper.sendCustomPayloadToAll(players, "axiom:marker_data", bytes);
         }
     }
 
@@ -131,10 +150,17 @@ private void tickChunkRelight(int maxChunkRelightsPerTick, int maxChunkSendsPerT
         LongIterator longIterator = this.pendingChunksToSend.longIterator();
         while (longIterator.hasNext()) {
             ChunkPos chunkPos = new ChunkPos(longIterator.nextLong());
+
+            LevelChunk chunk = this.level.getChunkIfLoaded(chunkPos.x, chunkPos.z);
+            if (chunk == null) {
+                continue;
+            }
+
             List<ServerPlayer> players = chunkMap.getPlayers(chunkPos, false);
-            if (players.isEmpty()) continue;
+            if (players.isEmpty()) {
+                continue;
+            }
 
-            LevelChunk chunk = this.level.getChunk(chunkPos.x, chunkPos.z);
             var packet = new ClientboundLevelChunkWithLightPacket(chunk, this.level.getLightEngine(), null, null, false);
             for (ServerPlayer player : players) {
                 player.connection.send(packet);

src/main/java/com/moulberry/axiom/VersionHelper.java

@@ -3,6 +3,7 @@
 import com.moulberry.axiom.AxiomPaper;
 import com.moulberry.axiom.VersionHelper;
 import com.moulberry.axiom.annotations.data.AnnotationData;
+import com.moulberry.axiom.restrictions.AxiomPermission;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import net.minecraft.nbt.CompoundTag;
@@ -123,7 +124,7 @@ public static void handleUpdates(World world, List<AnnotationUpdateAction> actio
         List<ServerPlayer> playersWithAxiom = new ArrayList<>();
 
         for (ServerPlayer player : ((CraftWorld)world).getHandle().players()) {
-            if (AxiomPaper.PLUGIN.canUseAxiom(player.getBukkitEntity(), "axiom.annotations.view")) {
+            if (AxiomPaper.PLUGIN.canUseAxiom(player.getBukkitEntity())) {
                 playersWithAxiom.add(player);
             }
         }

src/main/java/com/moulberry/axiom/WorldExtension.java

@@ -5,15 +5,26 @@
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public record BlueprintHeader(String name, String author, List<String> tags, float thumbnailYaw, float thumbnailPitch, boolean lockedThumbnail, int blockCount, boolean containsAir) {
+public record BlueprintHeader(int version, String name, String author, List<String> tags, float thumbnailYaw, float thumbnailPitch, boolean lockedThumbnail, int blockCount, boolean containsAir) {
 
-    private static final int CURRENT_VERSION = 1;
+    public static final int CURRENT_VERSION = 2;
+
+    public BlockState emptyBlockState() {
+        if (this.version <= 1) {
+            return Blocks.STRUCTURE_VOID.defaultBlockState();
+        } else {
+            return Blocks.VOID_AIR.defaultBlockState();
+        }
+    }
 
     public void write(FriendlyByteBuf friendlyByteBuf) {
+        friendlyByteBuf.writeVarInt(CURRENT_VERSION);
         friendlyByteBuf.writeUtf(this.name);
         friendlyByteBuf.writeUtf(this.author);
         friendlyByteBuf.writeCollection(this.tags, FriendlyByteBuf::writeUtf);
@@ -22,16 +33,17 @@ public void write(FriendlyByteBuf friendlyByteBuf) {
     }
 
     public static BlueprintHeader read(FriendlyByteBuf friendlyByteBuf) {
+        int version = friendlyByteBuf.readVarInt();
         String name = friendlyByteBuf.readUtf();
         String author = friendlyByteBuf.readUtf();
         List<String> tags = friendlyByteBuf.readList(FriendlyByteBuf::readUtf);
         int blockCount = friendlyByteBuf.readInt();
         boolean containsAir = friendlyByteBuf.readBoolean();
-        return new BlueprintHeader(name, author, tags, 0, 0, true, blockCount, containsAir);
+        return new BlueprintHeader(version, name, author, tags, 0, 0, true, blockCount, containsAir);
     }
 
     public static BlueprintHeader load(CompoundTag tag) {
-        long version = tag.getLong("Version");
+        int version = tag.getInt("Version");
         String name = tag.getString("Name");
         String author = tag.getString("Author");
         float thumbnailYaw = tag.contains("ThumbnailYaw", Tag.TAG_FLOAT) ? tag.getFloat("ThumbnailYaw") : 135;
@@ -45,7 +57,7 @@ public static BlueprintHeader load(CompoundTag tag) {
             tags.add(string.getAsString());
         }
 
-        return new BlueprintHeader(name, author, tags, thumbnailYaw, thumbnailPitch, lockedThumbnail, blockCount, containsAir);
+        return new BlueprintHeader(version, name, author, tags, thumbnailYaw, thumbnailPitch, lockedThumbnail, blockCount, containsAir);
     }
 
     public CompoundTag save(CompoundTag tag) {
@@ -54,7 +66,7 @@ public CompoundTag save(CompoundTag tag) {
             listTag.add(StringTag.valueOf(string));
         }
 
-        tag.putLong("Version", CURRENT_VERSION);
+        tag.putInt("Version", CURRENT_VERSION);
         tag.putString("Name", this.name);
         tag.putString("Author", this.author);
         tag.put("Tags", listTag);