Merge pull request #4164 from jacob1/v3.0

Support Spigot/Paper 1.21.3 and 1.21.4

Author: mikeprimm

DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java

@@ -618,8 +618,8 @@ public GenericMapChunkCache(GenericChunkCache c) {
 
 	public void setChunks(DynmapWorld dw, List<DynmapChunk> chunks) {
 		this.dw = dw;
-		nsect = (dw.worldheight - dw.minY) >> 4;
-		sectoff = (-dw.minY) >> 4;
+		nsect = (int)Math.ceil((dw.worldheight - dw.minY) / 16.0);
+		sectoff = (int)(Math.ceil((-dw.minY) / 16.0));
 		this.chunks = chunks;
 
 		/* Compute range */

bukkit-helper-119-3/src/main/java/org/dynmap/bukkit/helper/v119_3/BukkitVersionHelperSpigot119_3.java

@@ -368,7 +368,7 @@ public Object getFieldValue(Object nbt, String field) {
 		NBTBase val = rec.c(field);
         if(val == null) return null;
         if(val instanceof NBTTagByte) {
-            return ((NBTTagByte)val).h();
+            return ((NBTTagByte)val).i();
         }
         else if(val instanceof NBTTagShort) {
             return ((NBTTagShort)val).g();

bukkit-helper-119-4/src/main/java/org/dynmap/bukkit/helper/v119_4/BukkitVersionHelperSpigot119_4.java

@@ -376,7 +376,7 @@ public Object getFieldValue(Object nbt, String field) {
 		NBTBase val = rec.c(field);
         if(val == null) return null;
         if(val instanceof NBTTagByte) {
-            return ((NBTTagByte)val).h();
+            return ((NBTTagByte)val).i();
         }
         else if(val instanceof NBTTagShort) {
             return ((NBTTagShort)val).g();

bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java

@@ -185,7 +185,6 @@ public void initializeBlockStates() {
             //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten);
             // Fill in base attributes
             bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten);
-            if (bd.w() != null) { bld.setMaterial(bd.w().toString()); }
     		if (bd.e()) { bld.setSolid(); }
             if (bd.i()) { bld.setAir(); }
             if (bd.a(TagsBlock.t)) { bld.setLog(); }
@@ -374,7 +373,7 @@ public Object getFieldValue(Object nbt, String field) {
 		NBTBase val = rec.c(field);
         if(val == null) return null;
         if(val instanceof NBTTagByte) {
-            return ((NBTTagByte)val).h();
+            return ((NBTTagByte)val).i();
         }
         else if(val instanceof NBTTagShort) {
             return ((NBTTagShort)val).g();

bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java

@@ -185,7 +185,6 @@ public void initializeBlockStates() {
             //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten);
             // Fill in base attributes
             bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten);
-            if (bd.w() != null) { bld.setMaterial(bd.w().toString()); }
     		if (bd.e()) { bld.setSolid(); }
             if (bd.i()) { bld.setAir(); }
             if (bd.a(TagsBlock.t)) { bld.setLog(); }
@@ -374,7 +373,7 @@ public Object getFieldValue(Object nbt, String field) {
 		NBTBase val = rec.c(field);
         if(val == null) return null;
         if(val instanceof NBTTagByte) {
-            return ((NBTTagByte)val).h();
+            return ((NBTTagByte)val).i();
         }
         else if(val instanceof NBTTagShort) {
             return ((NBTTagShort)val).g();

bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java

@@ -185,7 +185,6 @@ public void initializeBlockStates() {
             //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten);
             // Fill in base attributes
             bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten);
-            if (bd.w() != null) { bld.setMaterial(bd.w().toString()); }
     		if (bd.e()) { bld.setSolid(); }
             if (bd.i()) { bld.setAir(); }
             if (bd.a(TagsBlock.t)) { bld.setLog(); }
@@ -376,7 +375,7 @@ public Object getFieldValue(Object nbt, String field) {
 		NBTBase val = rec.c(field);
         if(val == null) return null;
         if(val instanceof NBTTagByte) {
-            return ((NBTTagByte)val).h();
+            return ((NBTTagByte)val).i();
         }
         else if(val instanceof NBTTagShort) {
             return ((NBTTagShort)val).g();

bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java

@@ -185,7 +185,6 @@ public void initializeBlockStates() {
             //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten);
             // Fill in base attributes
             bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten);
-            if (bd.w() != null) { bld.setMaterial(bd.w().toString()); }
     		if (bd.e()) { bld.setSolid(); }
             if (bd.i()) { bld.setAir(); }
             if (bd.a(TagsBlock.t)) { bld.setLog(); }
@@ -374,7 +373,7 @@ public Object getFieldValue(Object nbt, String field) {
 		NBTBase val = rec.c(field);
         if(val == null) return null;
         if(val instanceof NBTTagByte) {
-            return ((NBTTagByte)val).h();
+            return ((NBTTagByte)val).i();
         }
         else if(val instanceof NBTTagShort) {
             return ((NBTTagShort)val).g();

bukkit-helper-121-3/.gitignore

@@ -0,0 +1 @@
+/build/

bukkit-helper-121-3/build.gradle

@@ -0,0 +1,17 @@
+eclipse {
+    project {
+        name = "Dynmap(Spigot-1.21.3)"
+    }
+}
+
+description = 'bukkit-helper-1.21.3'
+
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+
+dependencies {
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.21.3-R0.1-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.21.3-R0.1-SNAPSHOT'
+}