Update for 1.21.3

Author: Camotoy

.gitignore

@@ -270,3 +270,5 @@ gradle-app.setting
 *.hprof
 
 # End of https://www.toptal.com/developers/gitignore/api/git,java,maven,eclipse,netbeans,jetbrains+all,visualstudiocode,gradle
+.paper-nms
+*.iml

build.gradle.kts

@@ -1,6 +1,6 @@
 
 allprojects {
     group = "org.geysermc.geyser.adapters"
-    version = "1.13-SNAPSHOT"
+    version = "1.14-SNAPSHOT"
     description = "Adapters for Geyser"
 }

paper/all/build.gradle.kts

@@ -9,6 +9,7 @@ val shadowOnly: Configuration by configurations.creating
 dependencies {
     api(projects.paper.base)
     shadowOnly(projects.paper.v766)
+    shadowOnly(projects.paper.v768)
 }
 
 tasks {

paper/all/src/main/java/org/geysermc/geyser/adapters/paper/PaperAdapters.java

@@ -30,7 +30,7 @@
 public final class PaperAdapters {
     private static PaperWorldAdapter worldAdapter;
 
-    private static final int[] protocols = new int[] {766};
+    private static final int[] protocols = new int[] {766, 768};
 
     public static void registerClosestWorldAdapter(int version) throws Exception {
         if (version < protocols[0]) {

paper/base/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(projects.common)
-    compileOnly("io.papermc.paper", "paper-api", "1.20.5-R0.1-SNAPSHOT") {
+    compileOnly("io.papermc.paper", "paper-api", "1.20.6-R0.1-SNAPSHOT") {
         attributes {
             attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
         }

paper/v766/build.gradle.kts

@@ -13,5 +13,5 @@ java {
 
 dependencies {
     implementation(projects.paper.base)
-    paperweight.paperDevBundle("1.20.5-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT")
 }

paper/v768/build.gradle.kts

@@ -0,0 +1,17 @@
+
+plugins {
+    id("adapters.paper.paperweight-conventions")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+dependencies {
+    implementation(projects.paper.base)
+    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
+}

paper/v768/src/main/java/org/geysermc/geyser/adapters/paper/v768/WorldAdapter_v768.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.adapters.paper.v768;
+
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.LevelChunkSection;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.geysermc.geyser.adapters.paper.PaperWorldAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class WorldAdapter_v768 extends PaperWorldAdapter {
+    @Override
+    public int getBlockAt(World world, int x, int y, int z) {
+        if (y < world.getMinHeight()) {
+            return 0;
+        }
+
+        LevelChunk chunk = ((CraftWorld) world).getHandle().getChunkIfLoaded(x >> 4, z >> 4);
+        if (chunk == null) { // should never happen but just to be on the safe side
+            return 0;
+        }
+        int worldOffset = world.getMinHeight() >> 4;
+        int chunkOffset = (y >> 4) - worldOffset;
+        if (chunkOffset < chunk.getSections().length) {
+            LevelChunkSection section = chunk.getSections()[chunkOffset];
+            if (section != null && !section.hasOnlyAir()) {
+                return Block.getId(section.getBlockState(x & 15, y & 15, z & 15));
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public IntList getAllBlockStates() {
+        IntList blockStates = new IntArrayList();
+        for (BlockState block : Block.BLOCK_STATE_REGISTRY) {
+            blockStates.add(Block.getId(block));
+        }
+        return blockStates;
+    }
+
+    @Override
+    public String[] getBiomeSuggestions(boolean tags) {
+        Registry<Biome> registry = MinecraftServer.getServer()
+                .registryAccess()
+                .lookupOrThrow(Registries.BIOME);
+        if (!tags) {
+            return getBiomes(registry).toArray(String[]::new);
+        }
+
+        List<String> keys = new ArrayList<>(registry.getTags().map(tag -> "#" + tag.key().location()).toList());
+        keys.addAll(getBiomes(registry).toList());
+        return keys.toArray(new String[0]);
+    }
+
+    private Stream<String> getBiomes(Registry<Biome> registry) {
+        return registry.keySet().stream().map(ResourceLocation::toString);
+    }
+}

settings.gradle.kts

@@ -18,8 +18,10 @@ include(":spigot:v1_20_R2")
 include(":spigot:v1_20_R3")
 include(":spigot:v1_20_R4")
 include(":spigot:v1_21_R1")
+include(":spigot:v1_21_R2")
 
 include(":paper")
 include(":paper:all")
 include(":paper:base")
 include(":paper:v766")
+include(":paper:v768")

spigot/all/build.gradle.kts

@@ -23,6 +23,7 @@ dependencies {
     adapter("1_20_R3")
     adapter("1_20_R4")
     adapter("1_21_R1")
+    adapter("1_21_R2")
 }
 
 tasks {