chore(1.21.10): Add 1.21.10 support

Author: Jsinco

Insights-Core/src/main/java/dev/frankheijden/insights/commands/CommandInsights.java

@@ -24,7 +24,7 @@ private void showBase(CommandSender sender) {
         sender.sendMessage(ColorUtils.colorize(
                 "&8&l&m---------------=&r&8[ &b&lInsights&8 ]&l&m=----------------",
                 "&b Plugin version: &a" + plugin.getDescription().getVersion(),
-                "&b Plugin author: &7FrankHeijden#0099",
+                "&b Plugin author(s): &7" + String.join(", ", plugin.getDescription().getAuthors()),
                 "&b Plugin link: &7https://www.spigotmc.org/resources/56489/",
                 "&b Wiki: &7https://github.com/InsightsPlugin/Insights/wiki",
                 "&8&m-------------------------------------------------"

Insights-NMS/Current/build.gradle.kts

@@ -1,3 +1,3 @@
 dependencies {
-    paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
 }

Insights-NMS/Current/src/main/java/dev/frankheijden/insights/nms/impl/InsightsNMSImpl.java

@@ -19,10 +19,9 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.PalettedContainer;
+import net.minecraft.world.level.chunk.Strategy;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 import net.minecraft.world.level.chunk.storage.SerializableChunkData;
-import net.minecraft.world.level.storage.TagValueInput;
-import net.minecraft.world.level.storage.ValueInput;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -90,8 +89,9 @@ public void getUnloadedChunkSections(World world, int chunkX, int chunkZ, Consum
             if (sectionIndex < 0 || sectionIndex >= sectionsCount) continue;
 
             PalettedContainer<BlockState> blockStateContainer;
+            Strategy<BlockState> strategy = serverLevel.palettedContainerFactory().blockStatesStrategy();
             if (sectionTag.contains("block_states")) {
-                Codec<PalettedContainer<BlockState>> blockStateCodec = SerializableChunkData.BLOCK_STATE_CODEC;
+                Codec<PalettedContainer<BlockState>> blockStateCodec = PalettedContainer.codecRW(BlockState.CODEC, strategy, Blocks.AIR.defaultBlockState(), new BlockState[0]);
                 dataResult = blockStateCodec.parse(NbtOps.INSTANCE, sectionTag.getCompound("block_states").orElseThrow())
                         .promotePartial(message -> logger.severe(String.format(
                         CHUNK_ERROR,
@@ -108,12 +108,13 @@ public void getUnloadedChunkSections(World world, int chunkX, int chunkZ, Consum
                     throw ex;
                 }
             } else {
-                blockStateContainer = new PalettedContainer<>(
-                        Block.BLOCK_STATE_REGISTRY,
-                        Blocks.AIR.defaultBlockState(),
-                        PalettedContainer.Strategy.SECTION_STATES,
-                        null
-                );
+                blockStateContainer = new PalettedContainer<>(Blocks.AIR.defaultBlockState(), strategy, new BlockState[0]);
+//                blockStateContainer = new PalettedContainer<BlockState>(
+//                        Block.BLOCK_STATE_REGISTRY,
+//                        Blocks.AIR.defaultBlockState(),
+//                        Strategy.SECTION_STATES,
+//                        null
+//                );
             }
 
             LevelChunkSection chunkSection = new LevelChunkSection(blockStateContainer, null);

build.gradle.kts

@@ -7,12 +7,13 @@ plugins {
     `maven-publish`
     alias(libs.plugins.shadow)
     alias(libs.plugins.userdev) apply false
+    alias(libs.plugins.runPaper)
 }
 
 val name = "Insights"
 group = "dev.frankheijden.insights"
 val dependencyDir = "$group.dependencies"
-version = "6.19.7"
+version = "6.19.8"
 
 subprojects {
     apply(plugin = "java")
@@ -162,6 +163,9 @@ tasks {
         rename("(.+)Parent(.+)-all(.+)", "$1$2$3")
     }
 
+    runServer {
+        minecraftVersion("1.21.10")
+    }
 }
 
 buildscript {

gradle/libs.versions.toml

@@ -14,10 +14,11 @@ placeholderapi = "2.11.6"
 commodore = "2.2"
 cloudPaper = "2.0.0-beta.9"
 cloud = "2.0.0-rc.2"
+runPaper = "2.3.1"
 
 # plugins
 shadow = "9.0.0-beta2"
-userdev = "2.0.0-beta.17"
+userdev = "2.0.0-beta.19"
 pluginYml = "0.6.0"
 
 [libraries]
@@ -43,3 +44,4 @@ cloudAnnotations = { group = "org.incendo", name = "cloud-annotations", version.
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 userdev = { id = "io.papermc.paperweight.userdev", version.ref = "userdev" }
 pluginYml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginYml" }
+runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper"}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell