Merge pull request #4018 from webbukkit/v3.0

v3.7-beta-1

DynmapCore/build.gradle

@@ -8,6 +8,8 @@ eclipse {
     }
 }
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
     implementation project(':DynmapCoreAPI')
     implementation 'javax.servlet:javax.servlet-api:3.1'

DynmapCore/src/main/java/org/dynmap/ConfigurationNode.java

@@ -1,11 +1,15 @@
 package org.dynmap;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.Reader;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -82,13 +86,13 @@ public class ConfigurationNode implements Map<String, Object> {
         initparse();
         // If no file to read, just return false
         if (!f.canRead()) { return false; }
-        FileInputStream fis = null;
+        Reader fr = null;
         try {
-            fis = new FileInputStream(f);
-            Object o = yaml.load(new UnicodeReader(fis));
+            fr = new UnicodeReader(new BufferedInputStream(new FileInputStream(f)));
+            Object o = yaml.load(fr);
             if((o != null) && (o instanceof Map))
                 entries = (Map<String, Object>)o;
-            fis.close();
+            fr.close();
         }
         catch (YAMLException e) {
             Log.severe("Error parsing " + f.getPath() + ". Use http://yamllint.com to debug the YAML syntax." );
@@ -97,8 +101,8 @@ public class ConfigurationNode implements Map<String, Object> {
             Log.severe("Error reading " + f.getPath());
             return false;
         } finally {
-            if(fis != null) {
-                try { fis.close(); } catch (IOException x) {}
+            if(fr != null) {
+                try { fr.close(); } catch (IOException x) {}
             }
         }
         return (entries != null);
@@ -111,7 +115,7 @@ public class ConfigurationNode implements Map<String, Object> {
     public boolean save(File file) {
         initparse();
 
-        FileOutputStream stream = null;
+        OutputStream stream = null;
 
         File parent = file.getParentFile();
 
@@ -120,7 +124,7 @@ public class ConfigurationNode implements Map<String, Object> {
         }
 
         try {
-            stream = new FileOutputStream(file);
+            stream = new BufferedOutputStream(new FileOutputStream(file));
             OutputStreamWriter writer = new OutputStreamWriter(stream, "UTF-8");
             yaml.dump(entries, writer);
             return true;

DynmapCore/src/main/java/org/dynmap/DynmapMapCommands.java

@@ -92,6 +92,7 @@ public class DynmapMapCommands {
 		mapSetArgs.put("boostzoom", emptySupplier);
 		mapSetArgs.put("tilescale", emptySupplier);
 		mapSetArgs.put("tileupdatedelay", emptySupplier);
+		mapSetArgs.put("readonly", booleanSupplier);
 
 		tabCompletions = new HashMap<>();
 		tabCompletions.put("worldaddlimit", worldAddLimitArgs);
@@ -696,7 +697,7 @@ public class DynmapMapCommands {
                 sb.append(", lighting=").append(hdmt.getLighting().getName()).append(", mapzoomin=").append(hdmt.getMapZoomIn()).append(", mapzoomout=").append(hdmt.getMapZoomOutLevels());
                 sb.append(", img-format=").append(hdmt.getImageFormatSetting()).append(", icon=").append(hdmt.getIcon());
                 sb.append(", append-to-world=").append(hdmt.getAppendToWorld()).append(", boostzoom=").append(hdmt.getBoostZoom());
-                sb.append(", protected=").append(hdmt.isProtected()).append(", tilescale=").append(hdmt.getTileScale());
+                sb.append(", protected=").append(hdmt.isProtected()).append(", tilescale=").append(hdmt.getTileScale()).append(", readonly=").append(hdmt.isReadOnly());
                 if(hdmt.tileupdatedelay > 0) {
                     sb.append(", tileupdatedelay=").append(hdmt.tileupdatedelay);
                 }
@@ -996,6 +997,9 @@ public class DynmapMapCommands {
             else if(tok[0].equalsIgnoreCase("protected")) {
                 did_update |= mt.setProtected(Boolean.parseBoolean(tok[1]));
             }
+            else if(tok[0].equalsIgnoreCase("readonly")) {
+                did_update |= mt.setReadOnly(Boolean.parseBoolean(tok[1]));
+            }
         }
         if(did_update) {
             if(core.updateWorldConfig(w)) {

DynmapCore/src/main/java/org/dynmap/MapManager.java

@@ -629,10 +629,12 @@ public class MapManager {
                     renderedmaps.addAll(map.getMapsSharingRender(world));
 
                     /* Now, prime the render queue */
-                    for (MapTile mt : map.getTiles(world, (int)loc.x, (int)loc.y, (int)loc.z)) {
-                        if (!found.getFlag(mt.tileOrdinalX(), mt.tileOrdinalY())) {
-                            found.setFlag(mt.tileOrdinalX(), mt.tileOrdinalY(), true);
-                            renderQueue.add(mt);
+                    if (map.isReadOnly() == false) {
+                        for (MapTile mt : map.getTiles(world, (int)loc.x, (int)loc.y, (int)loc.z)) {
+                            if (!found.getFlag(mt.tileOrdinalX(), mt.tileOrdinalY())) {
+                                found.setFlag(mt.tileOrdinalX(), mt.tileOrdinalY(), true);
+                                renderQueue.add(mt);
+                            }
                         }
                     }
                     if(!updaterender) { /* Only add other seed points for fullrender */
@@ -1072,6 +1074,10 @@ public class MapManager {
             tiles.clear();
             for(DynmapWorld w : worlds) {
                 for(MapTypeState mts : w.mapstate) {
+                    if (mts.type.isReadOnly()) {
+                        continue;
+                    }
+
                     if(mts.getNextInvalidTileCoord(coord)) {
                         mts.type.addMapTiles(tiles, w, coord.x, coord.y);
                         mts.validateTile(coord.x, coord.y);
@@ -1903,6 +1909,10 @@ public class MapManager {
                 }
                 if(world == null) continue;
                 for (MapTypeState mts : world.mapstate) {
+                    if (mts.type.isReadOnly()) {
+                        continue;
+                    }
+
                     List<TileFlags.TileCoord> tiles = mts.type.getTileCoords(world, evt.x, evt.y, evt.z);
                     invalidates += mts.invalidateTiles(tiles);
                 }
@@ -1935,6 +1945,10 @@ public class MapManager {
                 if(world == null) continue;
                 int invalidates = 0;
                 for (MapTypeState mts : world.mapstate) {
+                    if (mts.type.isReadOnly()) {
+                        continue;
+                    }
+
                     List<TileFlags.TileCoord> tiles = mts.type.getTileCoords(world, evt.xmin, evt.ymin, evt.zmin, evt.xmax, evt.ymax, evt.zmax);
                     invalidates += mts.invalidateTiles(tiles);
                 }

DynmapCore/src/main/java/org/dynmap/MapType.java

@@ -10,6 +10,10 @@ import org.json.simple.JSONObject;
 
 public abstract class MapType {
     private boolean is_protected;
+    /**
+     * Is the map type read-only? (i.e. should not be updated by renderer)
+     */
+    private boolean is_readonly;
     protected int tileupdatedelay;
     
     public enum ImageVariant {
@@ -207,6 +211,26 @@ public abstract class MapType {
         }
         return false;
     }
+    /**
+     * Is the map type read-only? (i.e. should not be updated by renderer)
+     * @return true if read-only
+     */
+    public boolean isReadOnly() {
+        return is_readonly;
+    }
+
+    /**
+     * Set read-only state of map type
+     * @param r - true if read-only
+     * @return true if state changed
+     */
+    public boolean setReadOnly(boolean r) {
+        if(is_readonly != r) {
+            is_readonly = r;
+            return true;
+        }
+        return false;
+    }
     public abstract String getPrefix();
     
     public int getTileUpdateDelay(DynmapWorld w) {

DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java

@@ -1,5 +1,6 @@
 package org.dynmap.hdmap;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -356,7 +357,7 @@ public class HDBlockModels {
             int layerbits = 0;
             int rownum = 0;
             int scale = 0;
-            rdr = new LineNumberReader(new InputStreamReader(in));
+            rdr = new LineNumberReader(new BufferedReader(new InputStreamReader(in)));
             while ((line = rdr.readLine()) != null) {
                 boolean skip = false;
                 int lineNum = rdr.getLineNumber();

DynmapCore/src/main/java/org/dynmap/hdmap/HDMap.java

@@ -153,6 +153,7 @@ public class HDMap extends MapType {
         this.append_to_world = configuration.getString("append_to_world", "");
         setProtected(configuration.getBoolean("protected", false));
         setTileUpdateDelay(configuration.getInteger("tileupdatedelay", -1));
+        setReadOnly(configuration.getBoolean("readonly", false));
     }
 
     public ConfigurationNode saveConfiguration() {
@@ -180,6 +181,7 @@ public class HDMap extends MapType {
             cn.put("backgroundnight", bg_night_cfg);
         cn.put("append_to_world", append_to_world);
         cn.put("protected", isProtected());
+        cn.put("readonly", isReadOnly());
         if(this.tileupdatedelay > 0) {
             cn.put("tileupdatedelay", this.tileupdatedelay);
         }

DynmapCore/src/main/java/org/dynmap/hdmap/HDMapManager.java

@@ -131,6 +131,12 @@ public class HDMapManager {
                     /* If limited to one map, and this isn't it, skip */
                     if((mapname != null) && (!hdmap.getName().equals(mapname)))
                         continue;
+
+                    // Maps can be set to read-only, which means they don't get re-rendered
+                    if (map.isReadOnly()) {
+                        continue;
+                    }
+
                     shaders.add(hdmap.getShader().getStateInstance(hdmap, cache, mapiter, scale));
                 }
             }

DynmapCore/src/main/java/org/dynmap/hdmap/IsoHDPerspective.java

@@ -1268,7 +1268,7 @@ public class IsoHDPerspective implements HDPerspective {
         // Mark the tiles we're going to render as validated
         for (int i = 0; i < numshaders; i++) {
             MapTypeState mts = world.getMapState(shaderstate[i].getMap());
-            if (mts != null) {
+            if (mts != null && mts.type.isReadOnly() == false) {
                 mts.validateTile(tile.tx, tile.ty);
             }
         }

DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java

@@ -1,6 +1,7 @@
 package org.dynmap.hdmap;
 
 import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -1823,7 +1824,7 @@ public class TexturePack {
         
         try {
             String line;
-            rdr = new LineNumberReader(new InputStreamReader(txtfile));
+            rdr = new LineNumberReader(new BufferedReader(new InputStreamReader(txtfile)));
             while((line = rdr.readLine()) != null) {
                 if(line.startsWith("#")) {
                 }
@@ -1922,7 +1923,7 @@ public class TexturePack {
         Map<DynmapBlockState, BitSet> bsprslt;
         try {
             String line;
-            rdr = new LineNumberReader(new InputStreamReader(txtfile));
+            rdr = new LineNumberReader(new BufferedReader(new InputStreamReader(txtfile)));
             while((line = rdr.readLine()) != null) {
                 boolean skip = false;
                 int lineNum = rdr.getLineNumber();

DynmapCore/src/main/java/org/dynmap/hdmap/TexturePackLoader.java

@@ -1,5 +1,6 @@
 package org.dynmap.hdmap;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -61,13 +62,13 @@ public class TexturePackLoader {
             if (zf != null) {
                 ZipEntry ze = zf.getEntry(rname);
                 if ((ze != null) && (!ze.isDirectory())) {
-                    return zf.getInputStream(ze);
+                    return new BufferedInputStream(zf.getInputStream(ze));
                 }
             }
             else if (tpdir != null) {
                 File f = new File(tpdir, rname);
                 if (f.isFile() && f.canRead()) {
-                    return new FileInputStream(f);
+                    return new BufferedInputStream(new FileInputStream(f));
                 }
             }
         } catch (IOException iox) {
@@ -75,7 +76,7 @@ public class TexturePackLoader {
         // Fall through - load as resource from mod, if possible, or from jar
         InputStream is = dsi.openResource(modname, rname);
         if (is != null) { 
-            return is;
+            return new BufferedInputStream(is);
         }
         if (modname != null) {
             ModSource ms = src_by_mod.get(modname);
@@ -118,7 +119,7 @@ public class TexturePackLoader {
             Log.warning("Resource " + rname + " for mod " + modname + " not found");
         }
         
-        return is;
+        return (is != null) ? new BufferedInputStream(is) : null;
     }
     public void close() {
         if(zf != null) {

DynmapCore/src/main/java/org/dynmap/modsupport/impl/ModModelDefinitionImpl.java

@@ -1,8 +1,10 @@
 package org.dynmap.modsupport.impl;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Locale;
@@ -274,9 +276,9 @@ public class ModModelDefinitionImpl implements ModModelDefinition {
             return;
         }
         File f = new File(destdir, this.txtDef.getModID() + "-models.txt");
-        FileWriter fw = null;
+        Writer fw = null;
         try {
-            fw = new FileWriter(f);
+            fw = new BufferedWriter(new FileWriter(f));
             // Write modname line
             String s = "modname:" + this.txtDef.getModID();
             fw.write(s + "\n\n");

DynmapCore/src/main/java/org/dynmap/modsupport/impl/ModTextureDefinitionImpl.java

@@ -1,8 +1,10 @@
 package org.dynmap.modsupport.impl;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -278,9 +280,9 @@ public class ModTextureDefinitionImpl implements ModTextureDefinition {
     
     public void writeToFile(File destdir) throws IOException {
         File f = new File(destdir, this.modid + "-texture.txt");
-        FileWriter fw = null;
+        Writer fw = null;
         try {
-            fw = new FileWriter(f);
+            fw = new BufferedWriter(new FileWriter(f));
             // Write modname line
             String s = "modname:" + this.modid;
             fw.write(s + "\n\n");

DynmapCore/src/main/java/org/dynmap/servlet/SendMessageServlet.java

@@ -22,7 +22,6 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Logger;

DynmapCore/src/main/java/org/dynmap/storage/mysql/MySQLMapStorage.java

@@ -809,29 +809,21 @@ public class MySQLMapStorage extends MapStorage {
         }
         try {
             c = getConnection();
-            boolean done = false;
-            int limit = 100;
-            int offset = 0;
-            while (!done) {
-	            // Query tiles for given mapkey
-	            Statement stmt = c.createStatement();
-	            ResultSet rs = stmt.executeQuery(String.format("SELECT x,y,zoom,Format FROM %s WHERE MapID=%d LIMIT %d OFFSET %d;", tableTiles, mapkey, limit, offset));
-	            int cnt = 0;
-	            while (rs.next()) {
-	                StorageTile st = new StorageTile(world, map, rs.getInt("x"), rs.getInt("y"), rs.getInt("zoom"), var);
-	                final MapType.ImageEncoding encoding = MapType.ImageEncoding.fromOrd(rs.getInt("Format"));
-	                if(cb != null)
-	                    cb.tileFound(st, encoding);
-	                if(cbBase != null && st.zoom == 0)
-	                    cbBase.tileFound(st, encoding);
-	                st.cleanup();
-	                cnt++;
-	            }
-	            rs.close();
-	            stmt.close();
-	            if (cnt < limit) done = true;
-	            offset += cnt;
+            Statement stmt = c.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, //we want to stream our resultset one row at a time, we are not interessted in going back
+                    java.sql.ResultSet.CONCUR_READ_ONLY); //since we do not handle the entire resultset in memory -> tell the statement that we are going to work read only
+            stmt.setFetchSize(100); //we can change the jdbc "retrieval chunk size". Basicly we limit how much rows are kept in memory. Bigger value = less network calls to DB, but more memory consumption
+            ResultSet rs = stmt.executeQuery(String.format("SELECT x,y,zoom,Format FROM %s WHERE MapID=%d;", tableTiles, mapkey)); //we do the query, but do not set any limit / offset. Since data is not kept in memory, just streamed from DB this should not be a problem, only the rows from setFetchSize are kept in memory.
+            while (rs.next()) {
+                StorageTile st = new StorageTile(world, map, rs.getInt("x"), rs.getInt("y"), rs.getInt("zoom"), var);
+                final MapType.ImageEncoding encoding = MapType.ImageEncoding.fromOrd(rs.getInt("Format"));
+                if(cb != null)
+                    cb.tileFound(st, encoding);
+                if(cbBase != null && st.zoom == 0)
+                    cbBase.tileFound(st, encoding);
+                st.cleanup();
             }
+            rs.close();
+            stmt.close();
             if(cbEnd != null)
                 cbEnd.searchEnded();
         } catch (SQLException x) {

DynmapCore/src/main/java/org/dynmap/utils/ImageIOManager.java

@@ -107,68 +107,126 @@ public class ImageIOManager {
     }
 
     public static BufferOutputStream imageIOEncode(BufferedImage img, ImageFormat fmt) {
-        BufferOutputStream bos = new BufferOutputStream();
-
+        if(isRequiredJDKVersion(17,-1,-1)){
+            return imageIOEncodeUnsafe(img, fmt); //we can skip Thread safety for more performance
+        }
         synchronized(imageioLock) {
-            try {
-                ImageIO.setUseCache(false); /* Don't use file cache - too small to be worth it */
-                
-                fmt = validateFormat(fmt);
-                
-                if(fmt.getEncoding() == ImageEncoding.JPG) {
-                    WritableRaster raster = img.getRaster();
-                    WritableRaster newRaster = raster.createWritableChild(0, 0, img.getWidth(),
-                            img.getHeight(), 0, 0, new int[] {0, 1, 2});
-                    DirectColorModel cm = (DirectColorModel)img.getColorModel();
-                    DirectColorModel newCM = new DirectColorModel(cm.getPixelSize(),
-                            cm.getRedMask(), cm.getGreenMask(), cm.getBlueMask());
-                    // now create the new buffer that is used ot write the image:
-                    BufferedImage rgbBuffer = new BufferedImage(newCM, newRaster, false, null);
+            return imageIOEncodeUnsafe(img, fmt);
+        }
+    }
+    private static BufferOutputStream imageIOEncodeUnsafe(BufferedImage img, ImageFormat fmt) {
+        BufferOutputStream bos = new BufferOutputStream();
+        try {
+            ImageIO.setUseCache(false); /* Don't use file cache - too small to be worth it */
 
-                    // Find a jpeg writer
-                    ImageWriter writer = null;
-                    Iterator<ImageWriter> iter = ImageIO.getImageWritersByFormatName("jpg");
-                    if (iter.hasNext()) {
-                        writer = iter.next();
-                    }
-                    if(writer == null) {
-                        Log.severe("No JPEG ENCODER - Java VM does not support JPEG encoding");
-                        return null;
-                    }
-                    ImageWriteParam iwp = writer.getDefaultWriteParam();
-                    iwp.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-                    iwp.setCompressionQuality(fmt.getQuality());
+            fmt = validateFormat(fmt);
 
-                    ImageOutputStream ios;
-                    ios = ImageIO.createImageOutputStream(bos);
-                    writer.setOutput(ios);
+            if(fmt.getEncoding() == ImageEncoding.JPG) {
+                WritableRaster raster = img.getRaster();
+                WritableRaster newRaster = raster.createWritableChild(0, 0, img.getWidth(),
+                        img.getHeight(), 0, 0, new int[] {0, 1, 2});
+                DirectColorModel cm = (DirectColorModel)img.getColorModel();
+                DirectColorModel newCM = new DirectColorModel(cm.getPixelSize(),
+                        cm.getRedMask(), cm.getGreenMask(), cm.getBlueMask());
+                // now create the new buffer that is used ot write the image:
+                BufferedImage rgbBuffer = new BufferedImage(newCM, newRaster, false, null);
 
-                    writer.write(null, new IIOImage(rgbBuffer, null, null), iwp);
-                    writer.dispose();
-
-                    rgbBuffer.flush();
+                // Find a jpeg writer
+                ImageWriter writer = null;
+                Iterator<ImageWriter> iter = ImageIO.getImageWritersByFormatName("jpg");
+                if (iter.hasNext()) {
+                    writer = iter.next();
                 }
-                else if (fmt.getEncoding() == ImageEncoding.WEBP) {
-                	doWEBPEncode(img, fmt, bos);                	
+                if(writer == null) {
+                    Log.severe("No JPEG ENCODER - Java VM does not support JPEG encoding");
+                    return null;
                 }
-                else {
-                    ImageIO.write(img, fmt.getFileExt(), bos); /* Write to byte array stream - prevent bogus I/O errors */
-                }
-            } catch (IOException iox) {
-                Log.info("Error encoding image - " + iox.getMessage());
-                return null;
+                ImageWriteParam iwp = writer.getDefaultWriteParam();
+                iwp.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+                iwp.setCompressionQuality(fmt.getQuality());
+
+                ImageOutputStream ios;
+                ios = ImageIO.createImageOutputStream(bos);
+                writer.setOutput(ios);
+
+                writer.write(null, new IIOImage(rgbBuffer, null, null), iwp);
+                writer.dispose();
+
+                rgbBuffer.flush();
             }
+            else if (fmt.getEncoding() == ImageEncoding.WEBP) {
+            	doWEBPEncode(img, fmt, bos);
+            }
+            else {
+                ImageIO.write(img, fmt.getFileExt(), bos); /* Write to byte array stream - prevent bogus I/O errors */
+            }
+        } catch (IOException iox) {
+            Log.info("Error encoding image - " + iox.getMessage());
+            return null;
         }
         return bos;
     }
-    
+
     public static BufferedImage imageIODecode(MapStorageTile.TileRead tr) throws IOException {
+        if(isRequiredJDKVersion(17,-1,-1)){
+            return imageIODecodeUnsafe(tr); //we can skip Thread safety for more performance
+        }
         synchronized(imageioLock) {
-            ImageIO.setUseCache(false); /* Don't use file cache - too small to be worth it */
-            if (tr.format == ImageEncoding.WEBP) {
-                return doWEBPDecode(tr.image);
-            }
-            return ImageIO.read(tr.image);
+            return imageIODecodeUnsafe(tr);
         }
     }
+
+    private static BufferedImage imageIODecodeUnsafe(MapStorageTile.TileRead tr) throws IOException {
+        ImageIO.setUseCache(false); /* Don't use file cache - too small to be worth it */
+        if (tr.format == ImageEncoding.WEBP) {
+            return doWEBPDecode(tr.image);
+        }
+        return ImageIO.read(tr.image);
+    }
+
+    /**
+     * Checks if the current JDK is running at least a specific version
+     * targetMinor and targetBuild can be set to -1, if the java.version only provides a Major release this will then only check for the major release
+     * @param targetMajor the required minimum major version
+     * @param targetMinor the required minimum minor version
+     * @param targetBuild the required minimum build version
+     * @return true if the current JDK version is the required minimum version
+     */
+    private static boolean isRequiredJDKVersion(int targetMajor, int targetMinor, int targetBuild){
+        String javaVersion = System.getProperty("java.version");
+        String[] versionParts = javaVersion.split("\\.");
+        if(versionParts.length < 3){
+            if(versionParts.length == 1
+                    && targetMinor == -1
+                    && targetBuild == -1
+                    && parseInt(versionParts[0], -1) >= targetMajor){
+                return true;//we only have a major version and thats ok
+            }
+            return false; //can not evaluate
+        }
+        int major = parseInt(versionParts[0], -1);
+        int minor = parseInt(versionParts[1], -1);
+        int build = parseInt(versionParts[2], -1);
+        if(major != -1 && major >= targetMajor &&
+                minor != -1 && minor >= targetMinor &&
+                build != -1 && build >= targetBuild
+        ){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Parses a string to int, with a dynamic fallback value if not parsable
+     * @param input the String to parse
+     * @param fallback the Fallback value to use
+     * @return the parsed integer or the fallback value if unparsable
+     */
+    private static int parseInt(String input, int fallback){
+        int output = fallback;
+        try{
+            output = Integer.parseInt(input);
+        } catch (NumberFormatException e) {}
+        return output;
+    }
 }

DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css

@@ -411,7 +411,7 @@
 
 .dynmap .sublist .item > a {
     display: block;
-
+    
     text-indent: -99999px;
     outline: none;
 }
@@ -806,10 +806,10 @@
 }
 
 .chatinput {
-
+    position: absolute;
 	width: 608px;
 	height: 16px;
-
+    bottom: 8px;
 	outline: none;
 	color: #fff;
 	background-color: #000000;
@@ -829,6 +829,9 @@
 }
 
 .loginbutton {
+    position: absolute;
+	bottom: 0px;
+	right: 4px;
 	color: #000;
 	font-family: sans-serif;
 	font-size: 11px;

DynmapCore/src/main/resources/extracted/web/js/map.js

@@ -592,9 +592,6 @@ DynMap.prototype = {
 			me.selectWorldAndPan(location.world, location, function() {
 				if(completed) completed();
 			});
-		} else {
-			var latlng = me.maptype.getProjection().fromLocationToLatLng(location);
-			me.panToLatLng(latlng, completed);
 		}
 	},
 	panToLayerPoint: function(point, completed) {
@@ -779,8 +776,7 @@ DynMap.prototype = {
 				if (me.followingPlayer !== player) {
 					me.followPlayer(null);
 				}
-				if(player.location.world)
-					me.panToLocation(player.location);
+				me.panToLocation(player.location);
 			});
 		player.menuname.data('sort', player.sort);
 		// Inject into playerlist alphabetically

DynmapCore/src/main/resources/worlds.txt

@@ -90,6 +90,8 @@ worlds:
   #      shader: cave
   #      lighting: default
   #      mapzoomin: 3
+  #      # maps can be set to `readonly: false` to prevent updates
+  #      readonly: false 
   #
   # To just label world, and inherit rest from template, just provide name and title
   #- name: world2

DynmapCoreAPI/build.gradle

@@ -6,6 +6,7 @@ eclipse {
         name = "Dynmap(DynmapCoreAPI)"
     }
 }
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 description = "DynmapCoreAPI"
 

README.md

@@ -45,8 +45,8 @@ The following target platforms are supported, and you can find them at the links
 
 | Server type  | Version | Dynmap JAR | Where? |
 | ------------ | ------- | ---------- | ------ |
-| Spigot/PaperMC | ≤1.20.1  | `Dynmap-<version>-spigot.jar` | [SpigotMC](https://www.spigotmc.org/resources/dynmap.274/) |
-| Spigot/PaperMC | ≤1.20.1 | `Dynmap-<version>-spigot.jar` | [Bukkit](https://dev.bukkit.org/projects/dynmap) |
+| Spigot/PaperMC | ≤1.20.2  | `Dynmap-<version>-spigot.jar` | [SpigotMC](https://www.spigotmc.org/resources/dynmap.274/) |
+| Spigot/PaperMC | ≤1.20.2 | `Dynmap-<version>-spigot.jar` | [Bukkit](https://dev.bukkit.org/projects/dynmap) |
 | Forge | 1.12.2 | `Dynmap-<version>-forge-1.12.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge)|
 | Forge | 1.14.4 | `Dynmap-<version>-forge-1.14.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge)|
 | Forge | 1.15.2 | `Dynmap-<version>-forge-1.15.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge)|
@@ -57,6 +57,7 @@ The following target platforms are supported, and you can find them at the links
 | Forge | 1.19.2 | `Dynmap-<version>-forge-1.19.2.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Forge | 1.19.3, 1.19.4 | `Dynmap-<version>-forge-1.19.3.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Forge | 1.20, 1.20.1 | `Dynmap-<version>-forge-1.20.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
+| Forge | 1.20.2 | `Dynmap-<version>-forge-1.20.2.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Fabric | 1.15.2 | `Dynmap-<version>-fabric-1.15.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Fabric | 1.16.4, 1.16.5 | `Dynmap-<version>-fabric-1.16.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Fabric | 1.17.1 | `Dynmap-<version>-fabric-1.17.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
@@ -66,6 +67,7 @@ The following target platforms are supported, and you can find them at the links
 | Fabric | 1.19.3 | `Dynmap-<version>-fabric-1.19.3.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Fabric | 1.19.4 | `Dynmap-<version>-fabric-1.19.4.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
 | Fabric | 1.20, 1.20.1 | `Dynmap-<version>-fabric-1.20.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
+| Fabric | 1.20.2 | `Dynmap-<version>-fabric-1.20.2.jar`   | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) |
     
 # Data Storage
 Dynmap supports the following storage backends:

build.gradle

@@ -39,7 +39,7 @@ allprojects  {
   apply plugin: 'java'
   
   group = 'us.dynmap'
-  version = '3.6'
+  version = '3.7-beta-1'
 
 }
 

bukkit-helper-113-2/build.gradle

@@ -8,6 +8,8 @@ eclipse {
 
 description = 'bukkit-helper-1.13.2'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-114-1/build.gradle

@@ -6,6 +6,8 @@ eclipse {
 
 description = 'bukkit-helper-1.14.1'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-115/build.gradle

@@ -6,6 +6,8 @@ eclipse {
 
 description = 'bukkit-helper-1.15'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-116-2/build.gradle

@@ -6,6 +6,8 @@ eclipse {
 
 description = 'bukkit-helper-1.16.2'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-116-3/build.gradle

@@ -6,6 +6,8 @@ eclipse {
 
 description = 'bukkit-helper-1.16.3'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-116-4/build.gradle

@@ -6,6 +6,8 @@ eclipse {
 
 description = 'bukkit-helper-1.16.4'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-116/build.gradle

@@ -6,6 +6,8 @@ eclipse {
 
 description = 'bukkit-helper-1.16'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')

bukkit-helper-120-2/.gitignore

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

bukkit-helper-120-2/bin/.gitignore

@@ -0,0 +1,2 @@
+/org/
+/main/

bukkit-helper-120-2/build.gradle

@@ -0,0 +1,17 @@
+eclipse {
+    project {
+        name = "Dynmap(Spigot-1.20.2)"
+    }
+}
+
+description = 'bukkit-helper-1.20.2'
+
+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.20.2-R0.1-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.2-R0.1-SNAPSHOT'
+}

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

@@ -0,0 +1,130 @@
+package org.dynmap.bukkit.helper.v120_2;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.WorldServer;
+import net.minecraft.world.level.chunk.Chunk;
+import net.minecraft.world.level.chunk.IChunkAccess;
+import net.minecraft.world.level.chunk.storage.ChunkRegionLoader;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.dynmap.MapManager;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+/**
+ * The provider used to work with paper libs
+ * Because paper libs need java 17 we can't interact with them directly
+ */
+@SuppressWarnings({"JavaReflectionMemberAccess"}) //java don't know about paper
+public class AsyncChunkProvider120_2 {
+    private final Method getChunk;
+    private final Method getAsyncSaveData;
+    private final Method save;
+    private final Enum<?> data;
+    private final Enum<?> priority;
+    private int currTick = MinecraftServer.currentTick;
+    private int currChunks = 0;
+
+    AsyncChunkProvider120_2() {
+        try {
+            Method getChunk1 = null;
+            Method getAsyncSaveData1 = null;
+            Method save1 = null;
+            Enum<?> priority1 = null;
+            Enum<?> data1 = null;
+            try {
+                Class<?> threadClass = Class.forName("io.papermc.paper.chunk.system.io.RegionFileIOThread");
+
+                Class<?> dataclass = Arrays.stream(threadClass.getDeclaredClasses())
+                        .filter(c -> c.getSimpleName().equals("RegionFileType"))
+                        .findAny()
+                        .orElseThrow(NullPointerException::new);
+                data1 = Enum.valueOf(cast(dataclass), "CHUNK_DATA");
+
+                Class<?> priorityClass = Arrays.stream(Class.forName("ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor").getClasses())
+                        .filter(c -> c.getSimpleName().equals("Priority"))
+                        .findAny()
+                        .orElseThrow(NullPointerException::new);
+                //Almost lowest priority, but not quite so low as to be considered idle
+                //COMPLETING->BLOCKING->HIGHEST->HIGHER->HIGH->NORMAL->LOW->LOWER->LOWEST->IDLE
+                priority1 = Enum.valueOf(cast(priorityClass), "LOWEST");
+
+                getAsyncSaveData1 = ChunkRegionLoader.class.getMethod("getAsyncSaveData", WorldServer.class, IChunkAccess.class);
+                save1 = ChunkRegionLoader.class.getMethod("saveChunk", WorldServer.class, IChunkAccess.class, getAsyncSaveData1.getReturnType());
+                getChunk1 = threadClass.getMethod("loadDataAsync", WorldServer.class, int.class, int.class, data1.getClass(), BiConsumer.class, boolean.class, priority1.getClass());
+            } catch (ClassNotFoundException | NoSuchMethodException e) {
+                e.printStackTrace();
+            }
+            getAsyncSaveData = Objects.requireNonNull(getAsyncSaveData1);
+            save = Objects.requireNonNull(save1);
+            getChunk = Objects.requireNonNull(getChunk1);
+            data = Objects.requireNonNull(data1);
+            priority = Objects.requireNonNull(priority1);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T cast(Object o) {
+        return (T) o;
+    }
+    public CompletableFuture<NBTTagCompound> getChunk(WorldServer world, int x, int y) throws InvocationTargetException, IllegalAccessException {
+        CompletableFuture<NBTTagCompound> future = new CompletableFuture<>();
+        getChunk.invoke(null, world, x, y, data, (BiConsumer<NBTTagCompound, Throwable>) (nbt, exception) -> future.complete(nbt), true, priority);
+        return future;
+    }
+
+    public synchronized Supplier<NBTTagCompound> getLoadedChunk(CraftWorld world, int x, int z) {
+        if (!world.isChunkLoaded(x, z)) return () -> null;
+        Chunk c = world.getHandle().getChunkIfLoaded(x, z); //already safe async on vanilla
+        if ((c == null) || !c.q) return () -> null;    // c.loaded
+        if (currTick != MinecraftServer.currentTick) {
+            currTick = MinecraftServer.currentTick;
+            currChunks = 0;
+        }
+        //prepare data synchronously
+        CompletableFuture<?> future = CompletableFuture.supplyAsync(() -> {
+            //Null will mean that we save with spigot methods, which may be risky on async
+            //Since we're not in main thread, it now refuses new tasks because of shutdown, the risk is lower
+            if (!Bukkit.isPrimaryThread()) return null;
+            try {
+                return getAsyncSaveData.invoke(null, world.getHandle(), c);
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
+        }, ((CraftServer) Bukkit.getServer()).getServer());
+        //we shouldn't stress main thread
+        if (++currChunks > MapManager.mapman.getMaxChunkLoadsPerTick()) {
+            try {
+                Thread.sleep(25); //hold the lock so other threads also won't stress main thread
+            } catch (InterruptedException ignored) {}
+        }
+        //save data asynchronously
+        return () -> {
+            Object o = null;
+            try {
+                o = future.get();
+                return (NBTTagCompound) save.invoke(null, world.getHandle(), c, o);
+            } catch (InterruptedException e) {
+                return null;
+            } catch (InvocationTargetException e) {
+                //We tried to use simple spigot methods at shutdown and failed, hopes for reading from disk
+                if (o == null) return null;
+                throw new RuntimeException(e);
+            } catch (ReflectiveOperationException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,464 @@
+package org.dynmap.bukkit.helper.v120_2;
+
+import org.bukkit.*;
+import org.bukkit.craftbukkit.v1_20_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.dynmap.DynmapChunk;
+import org.dynmap.Log;
+import org.dynmap.bukkit.helper.BukkitMaterial;
+import org.dynmap.bukkit.helper.BukkitVersionHelper;
+import org.dynmap.bukkit.helper.BukkitWorld;
+import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric.TexturesPayload;
+import org.dynmap.renderer.DynmapBlockState;
+import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.Polygon;
+
+import com.google.common.collect.Iterables;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+
+import net.minecraft.core.RegistryBlockID;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.core.BlockPosition;
+import net.minecraft.core.IRegistry;
+import net.minecraft.nbt.NBTTagByteArray;
+import net.minecraft.nbt.NBTTagByte;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagDouble;
+import net.minecraft.nbt.NBTTagFloat;
+import net.minecraft.nbt.NBTTagIntArray;
+import net.minecraft.nbt.NBTTagInt;
+import net.minecraft.nbt.NBTTagLong;
+import net.minecraft.nbt.NBTTagShort;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.resources.MinecraftKey;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tags.TagsBlock;
+import net.minecraft.world.level.BlockAccessAir;
+import net.minecraft.world.level.biome.BiomeBase;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.BlockFluids;
+import net.minecraft.world.level.block.entity.TileEntity;
+import net.minecraft.world.level.block.state.IBlockData;
+import net.minecraft.world.level.chunk.ChunkStatus;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public class BukkitVersionHelperSpigot120_2 extends BukkitVersionHelper { 
+    private final boolean unsafeAsync;
+
+    public BukkitVersionHelperSpigot120_2() {
+        boolean unsafeAsync1;
+        try {
+            Class.forName("io.papermc.paper.chunk.system.io.RegionFileIOThread");
+            unsafeAsync1 = false;
+        } catch (ClassNotFoundException e) {
+            unsafeAsync1 = true;
+        }
+        this.unsafeAsync = unsafeAsync1;
+    }
+
+    @Override
+    public boolean isUnsafeAsync() {
+        return unsafeAsync;
+    }
+
+     /**
+     * Get block short name list
+     */
+    @Override
+    public String[] getBlockNames() {
+    	RegistryBlockID<IBlockData> bsids = Block.o;
+        Block baseb = null;
+    	Iterator<IBlockData> iter = bsids.iterator();
+    	ArrayList<String> names = new ArrayList<String>();
+		while (iter.hasNext()) {
+			IBlockData bs = iter.next();
+            Block b = bs.b();
+    		// If this is new block vs last, it's the base block state
+    		if (b != baseb) {
+                baseb = b;
+                continue;
+    		}
+        	MinecraftKey id = BuiltInRegistries.f.b(b);
+    		String bn = id.toString();
+            if (bn != null) {
+            	names.add(bn);
+            	Log.info("block=" + bn);
+            }
+		}
+        return names.toArray(new String[0]);
+    }
+
+    private static IRegistry<BiomeBase> reg = null;
+
+    private static IRegistry<BiomeBase> getBiomeReg() {
+    	if (reg == null) {
+    		reg = MinecraftServer.getServer().aU().d(Registries.ap);
+    	}
+    	return reg;
+    }
+
+    private Object[] biomelist;
+    /**
+     * Get list of defined biomebase objects
+     */
+    @Override
+    public Object[] getBiomeBaseList() {
+    	if (biomelist == null) {
+        	biomelist = new BiomeBase[256];
+        	Iterator<BiomeBase> iter = getBiomeReg().iterator();
+        	while (iter.hasNext()) {
+                BiomeBase b = iter.next();
+                int bidx = getBiomeReg().a(b);
+        		if (bidx >= biomelist.length) {
+        			biomelist = Arrays.copyOf(biomelist, bidx + biomelist.length);
+        		}
+        		biomelist[bidx] = b;
+        	}
+        }
+        return biomelist;
+    }
+
+    /** Get ID from biomebase */
+    @Override
+    public int getBiomeBaseID(Object bb) {
+    	return getBiomeReg().a((BiomeBase)bb);
+    }
+    
+    public static IdentityHashMap<IBlockData, DynmapBlockState> dataToState;
+    
+    /**
+     * Initialize block states (org.dynmap.blockstate.DynmapBlockState)
+     */
+    @Override
+    public void initializeBlockStates() {
+    	dataToState = new IdentityHashMap<IBlockData, DynmapBlockState>();
+    	HashMap<String, DynmapBlockState> lastBlockState = new HashMap<String, DynmapBlockState>();
+    	RegistryBlockID<IBlockData> bsids = Block.o;
+        Block baseb = null;
+    	Iterator<IBlockData> iter = bsids.iterator();
+    	ArrayList<String> names = new ArrayList<String>();
+    	
+    	// Loop through block data states
+    	DynmapBlockState.Builder bld = new DynmapBlockState.Builder();
+		while (iter.hasNext()) {
+    		IBlockData bd = iter.next();
+    		Block b = bd.b();
+        	MinecraftKey id = BuiltInRegistries.f.b(b);
+    		String bname = id.toString();
+    		DynmapBlockState lastbs = lastBlockState.get(bname);	// See if we have seen this one
+    		int idx = 0;
+    		if (lastbs != null) {	// Yes
+    			idx = lastbs.getStateCount();	// Get number of states so far, since this is next
+    		}
+    		// Build state name
+    		String sb = "";
+    		String fname = bd.toString();
+    		int off1 = fname.indexOf('[');
+    		if (off1 >= 0) {
+    			int off2 = fname.indexOf(']');
+    			sb = fname.substring(off1+1, off2);
+    		}
+            int lightAtten = b.g(bd, BlockAccessAir.a, BlockPosition.b);	// getLightBlock
+            //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(); }
+            if (bd.a(TagsBlock.O)) { bld.setLeaves(); }
+            if ((!bd.u().c()) && ((bd.b() instanceof BlockFluids) == false)) {	// Test if fluid type for block is not empty
+				bld.setWaterlogged();
+				//Log.info("statename=" + bname + "[" + sb + "] = waterlogged");
+			}
+            DynmapBlockState dbs = bld.build(); // Build state
+            
+    		dataToState.put(bd,  dbs);
+    		lastBlockState.put(bname, (lastbs == null) ? dbs : lastbs);
+    		Log.verboseinfo("blk=" + bname + ", idx=" + idx + ", state=" + sb + ", waterlogged=" + dbs.isWaterlogged());
+    	}
+    }
+    /**
+     * Create chunk cache for given chunks of given world
+     * @param dw - world
+     * @param chunks - chunk list
+     * @return cache
+     */
+    @Override
+    public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
+        MapChunkCache120_2 c = new MapChunkCache120_2(gencache);
+        c.setChunks(dw, chunks);
+        return c;
+    }
+    
+	/**
+	 * Get biome base water multiplier
+	 */
+    @Override
+	public int getBiomeBaseWaterMult(Object bb) {
+    	BiomeBase biome = (BiomeBase) bb;
+    	return biome.i();	// waterColor
+	}
+
+    /** Get temperature from biomebase */
+    @Override
+    public float getBiomeBaseTemperature(Object bb) {
+    	return ((BiomeBase)bb).g();
+    }
+
+    /** Get humidity from biomebase */
+    @Override
+    public float getBiomeBaseHumidity(Object bb) {
+    	String vals = ((BiomeBase)bb).i.toString();	// Sleazy
+    	float humidity = 0.5F;
+    	int idx = vals.indexOf("downfall=");
+    	if (idx >= 0) {
+        	humidity = Float.parseFloat(vals.substring(idx+9, vals.indexOf(']', idx)));
+    	}
+    	return humidity;
+    }
+    
+    @Override
+    public Polygon getWorldBorder(World world) {
+        Polygon p = null;
+        WorldBorder wb = world.getWorldBorder();
+        if (wb != null) {
+        	Location c = wb.getCenter();
+        	double size = wb.getSize();
+        	if ((size > 1) && (size < 1E7)) {
+        	    size = size / 2;
+        		p = new Polygon();
+        		p.addVertex(c.getX()-size, c.getZ()-size);
+        		p.addVertex(c.getX()+size, c.getZ()-size);
+        		p.addVertex(c.getX()+size, c.getZ()+size);
+        		p.addVertex(c.getX()-size, c.getZ()+size);
+        	}
+        }
+        return p;
+    }
+	// Send title/subtitle to user
+    public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
+    	if (p != null) {
+    		p.sendTitle(title, subtitle, fadeInTicks, stayTicks, fadeOutTIcks);
+    	}
+    }
+    
+    /**
+     * Get material map by block ID
+     */
+    @Override
+    public BukkitMaterial[] getMaterialList() {
+    	return new BukkitMaterial[4096];	// Not used
+    }
+
+	@Override
+	public void unloadChunkNoSave(World w, org.bukkit.Chunk c, int cx, int cz) {
+		Log.severe("unloadChunkNoSave not implemented");
+	}
+
+	private String[] biomenames;
+	@Override
+	public String[] getBiomeNames() {
+    	if (biomenames == null) {
+        	biomenames = new String[256];
+        	Iterator<BiomeBase> iter = getBiomeReg().iterator();
+        	while (iter.hasNext()) {
+                BiomeBase b = iter.next();
+                int bidx = getBiomeReg().a(b);
+        		if (bidx >= biomenames.length) {
+        			biomenames = Arrays.copyOf(biomenames, bidx + biomenames.length);
+        		}
+        		biomenames[bidx] = b.toString();
+        	}
+        }
+        return biomenames;
+	}
+
+	@Override
+	public String getStateStringByCombinedId(int blkid, int meta) {
+        Log.severe("getStateStringByCombinedId not implemented");		
+		return null;
+	}
+	@Override
+    /** Get ID string from biomebase */
+    public String getBiomeBaseIDString(Object bb) {
+		return getBiomeReg().b((BiomeBase)bb).a();
+    }
+	@Override
+    public String getBiomeBaseResourceLocsation(Object bb) {
+        return getBiomeReg().b((BiomeBase)bb).toString();
+	}
+
+	@Override
+	public Object getUnloadQueue(World world) {
+		Log.warning("getUnloadQueue not implemented yet");
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isInUnloadQueue(Object unloadqueue, int x, int z) {
+		Log.warning("isInUnloadQueue not implemented yet");
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public Object[] getBiomeBaseFromSnapshot(ChunkSnapshot css) {
+		Log.warning("getBiomeBaseFromSnapshot not implemented yet");
+		// TODO Auto-generated method stub
+		return new Object[256];
+	}
+
+	@Override
+	public long getInhabitedTicks(Chunk c) {
+		return ((CraftChunk)c).getHandle(ChunkStatus.n).u();
+	}
+
+	@Override
+	public Map<?, ?> getTileEntitiesForChunk(Chunk c) {
+		return ((CraftChunk)c).getHandle(ChunkStatus.n).k;
+	}
+
+	@Override
+	public int getTileEntityX(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		return tileent.p().u();
+	}
+
+	@Override
+	public int getTileEntityY(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		return tileent.p().v();
+	}
+
+	@Override
+	public int getTileEntityZ(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		return tileent.p().w();
+	}
+
+	@Override
+	public Object readTileEntityNBT(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		NBTTagCompound nbt = tileent.n();
+        return nbt;
+	}
+
+	@Override
+	public Object getFieldValue(Object nbt, String field) {
+		NBTTagCompound rec = (NBTTagCompound) nbt;
+		NBTBase val = rec.c(field);
+        if(val == null) return null;
+        if(val instanceof NBTTagByte) {
+            return ((NBTTagByte)val).h();
+        }
+        else if(val instanceof NBTTagShort) {
+            return ((NBTTagShort)val).g();
+        }
+        else if(val instanceof NBTTagInt) {
+            return ((NBTTagInt)val).f();
+        }
+        else if(val instanceof NBTTagLong) {
+            return ((NBTTagLong)val).e();
+        }
+        else if(val instanceof NBTTagFloat) {
+            return ((NBTTagFloat)val).j();
+        }
+        else if(val instanceof NBTTagDouble) {
+            return ((NBTTagDouble)val).i();
+        }
+        else if(val instanceof NBTTagByteArray) {
+            return ((NBTTagByteArray)val).d();
+        }
+        else if(val instanceof NBTTagString) {
+            return ((NBTTagString)val).r_();
+        }
+        else if(val instanceof NBTTagIntArray) {
+            return ((NBTTagIntArray)val).f();
+        }
+        return null;
+	}
+
+	@Override
+	public Player[] getOnlinePlayers() {
+        Collection<? extends Player> p = Bukkit.getServer().getOnlinePlayers();
+        return p.toArray(new Player[0]);
+	}
+
+	@Override
+	public double getHealth(Player p) {
+		return p.getHealth();
+	}
+	
+    private static final Gson gson = new GsonBuilder().create();
+
+    /**
+     * Get skin URL for player
+     * @param player
+     */
+	@Override
+    public String getSkinURL(Player player) {
+    	String url = null;
+    	CraftPlayer cp = (CraftPlayer)player;
+    	GameProfile profile = cp.getProfile();
+    	if (profile != null) {
+    		PropertyMap pm = profile.getProperties();
+    		if (pm != null) {
+    			Collection<Property> txt = pm.get("textures");
+    	        Property textureProperty = Iterables.getFirst(pm.get("textures"), null);
+    	        if (textureProperty != null) {
+    				String val = textureProperty.value();
+    				if (val != null) {
+    					TexturesPayload result = null;
+    					try {
+                            String json = new String(Base64.getDecoder().decode(val), StandardCharsets.UTF_8);
+    						result = gson.fromJson(json, TexturesPayload.class);
+    					} catch (JsonParseException e) {
+    					} catch (IllegalArgumentException x) {
+    						Log.warning("Malformed response from skin URL check: " + val);
+    					}
+    					if ((result != null) && (result.textures != null) && (result.textures.containsKey("SKIN"))) {
+    						url = result.textures.get("SKIN").url;
+    					}
+    				}
+    			}
+    		}
+    	}    	
+    	return url;
+    }
+	// Get minY for world
+	@Override
+	public int getWorldMinY(World w) {
+		CraftWorld cw = (CraftWorld) w;
+		return cw.getMinHeight();
+	}
+	@Override
+    public boolean useGenericCache() {
+    	return true;
+    }
+
+}

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

@@ -0,0 +1,114 @@
+package org.dynmap.bukkit.helper.v120_2;
+
+import net.minecraft.world.level.biome.BiomeBase;
+import net.minecraft.world.level.biome.BiomeFog;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.dynmap.DynmapChunk;
+import org.dynmap.bukkit.helper.BukkitVersionHelper;
+import org.dynmap.bukkit.helper.BukkitWorld;
+import org.dynmap.bukkit.helper.v120_2.AsyncChunkProvider120_2;
+import org.dynmap.bukkit.helper.v120_2.NBT;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.common.chunk.GenericChunk;
+import org.dynmap.common.chunk.GenericChunkCache;
+import org.dynmap.common.chunk.GenericMapChunkCache;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.level.ChunkCoordIntPair;
+import net.minecraft.world.level.chunk.storage.ChunkRegionLoader;
+import net.minecraft.world.level.chunk.Chunk;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
+
+/**
+ * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
+ */
+public class MapChunkCache120_2 extends GenericMapChunkCache {
+    private static final AsyncChunkProvider120_2 provider = BukkitVersionHelper.helper.isUnsafeAsync() ? null : new AsyncChunkProvider120_2();
+    private World w;
+    /**
+     * Construct empty cache
+     */
+    public MapChunkCache120_2(GenericChunkCache cc) {
+        super(cc);
+    }
+
+    // Load generic chunk from existing and already loaded chunk
+    @Override
+    protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
+        Supplier<NBTTagCompound> supplier = provider.getLoadedChunk((CraftWorld) w, chunk.x, chunk.z);
+        return () -> {
+            NBTTagCompound nbt = supplier.get();
+            return nbt != null ? parseChunkFromNBT(new NBT.NBTCompound(nbt)) : null;
+        };
+    }
+    protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
+        CraftWorld cw = (CraftWorld) w;
+        if (!cw.isChunkLoaded(chunk.x, chunk.z)) return null;
+        Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
+        if (c == null || !c.q) return null;    // c.loaded
+        NBTTagCompound nbt = ChunkRegionLoader.a(cw.getHandle(), c);
+        return nbt != null ? parseChunkFromNBT(new NBT.NBTCompound(nbt)) : null;
+    }
+
+    // Load generic chunk from unloaded chunk
+    @Override
+    protected Supplier<GenericChunk> loadChunkAsync(DynmapChunk chunk){
+        try {
+            CompletableFuture<NBTTagCompound> nbt = provider.getChunk(((CraftWorld) w).getHandle(), chunk.x, chunk.z);
+            return () -> {
+                NBTTagCompound compound;
+                try {
+                    compound = nbt.get();
+                } catch (InterruptedException e) {
+                    return null;
+                } catch (ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
+                return compound == null ? null : parseChunkFromNBT(new NBT.NBTCompound(compound));
+            };
+        } catch (InvocationTargetException | IllegalAccessException ignored) {
+            return () -> null;
+        }
+    }
+
+    protected GenericChunk loadChunk(DynmapChunk chunk) {
+        CraftWorld cw = (CraftWorld) w;
+        NBTTagCompound nbt = null;
+        ChunkCoordIntPair cc = new ChunkCoordIntPair(chunk.x, chunk.z);
+        GenericChunk gc = null;
+        try {	// BUGBUG - convert this all to asyn properly, since now native async
+            nbt = cw.getHandle().k().a.e(cc).join().get();	// playerChunkMap
+        } catch (CancellationException cx) {
+        } catch (NoSuchElementException snex) {
+        }
+        if (nbt != null) {
+            gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
+        }
+        return gc;
+    }
+
+    public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) {
+        this.w = dw.getWorld();
+        super.setChunks(dw, chunks);
+    }
+
+    @Override
+    public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
+		return bm.<BiomeBase>getBiomeObject().map(BiomeBase::h).flatMap(BiomeFog::e).orElse(colormap[bm.biomeLookup()]);
+    }
+
+    @Override
+    public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
+        BiomeFog fog = bm.<BiomeBase>getBiomeObject().map(BiomeBase::h).orElse(null);
+        if (fog == null) return colormap[bm.biomeLookup()];
+        return fog.g().a(x, z, fog.f().orElse(colormap[bm.biomeLookup()]));
+    }
+}

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

@@ -0,0 +1,126 @@
+package org.dynmap.bukkit.helper.v120_2;
+
+import org.dynmap.common.chunk.GenericBitStorage;
+import org.dynmap.common.chunk.GenericNBTCompound;
+import org.dynmap.common.chunk.GenericNBTList;
+
+import java.util.Set;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.SimpleBitStorage;
+
+public class NBT {
+
+	public static class NBTCompound implements GenericNBTCompound {
+		private final NBTTagCompound obj;
+		public NBTCompound(NBTTagCompound t) {
+			this.obj = t;
+		}
+		@Override
+		public Set<String> getAllKeys() {
+			return obj.e();
+		}
+		@Override
+		public boolean contains(String s) {
+			return obj.e(s);
+		}
+		@Override
+		public boolean contains(String s, int i) {
+			return obj.b(s, i);
+		}
+		@Override
+		public byte getByte(String s) {
+			return obj.f(s);
+		}
+		@Override
+		public short getShort(String s) {
+			return obj.g(s);
+		}
+		@Override
+		public int getInt(String s) {
+			return obj.h(s);
+		}
+		@Override
+		public long getLong(String s) {
+			return obj.i(s);
+		}
+		@Override
+		public float getFloat(String s) {
+			return obj.j(s);
+		}
+		@Override
+		public double getDouble(String s) {
+			return obj.k(s);
+		}
+		@Override
+		public String getString(String s) {
+			return obj.l(s);
+		}
+		@Override
+		public byte[] getByteArray(String s) {
+			return obj.m(s);
+		}
+		@Override
+		public int[] getIntArray(String s) {
+			return obj.n(s);
+		}
+		@Override
+		public long[] getLongArray(String s) {
+			return obj.o(s);
+		}
+		@Override
+		public GenericNBTCompound getCompound(String s) {
+			return new NBTCompound(obj.p(s));
+		}
+		@Override
+		public GenericNBTList getList(String s, int i) {
+			return new NBTList(obj.c(s, i));
+		}
+		@Override
+		public boolean getBoolean(String s) {
+			return obj.q(s);
+		}
+		@Override
+		public String getAsString(String s) {
+			return obj.c(s).r_();
+		}
+		@Override
+		public GenericBitStorage makeBitStorage(int bits, int count, long[] data) {
+			return new OurBitStorage(bits, count, data);
+		}
+		public String toString() {
+			return obj.toString();
+		}
+	}
+	public static class NBTList implements GenericNBTList {
+		private final NBTTagList obj;
+		public NBTList(NBTTagList t) {
+			obj = t;
+		}
+		@Override
+		public int size() {
+			return obj.size();
+		}
+		@Override
+		public String getString(int idx) {
+			return obj.j(idx);
+		}
+		@Override
+		public GenericNBTCompound getCompound(int idx) {
+			return new NBTCompound(obj.a(idx));
+		}
+		public String toString() {
+			return obj.toString();
+		}
+	}
+	public static class OurBitStorage implements GenericBitStorage {
+		private final SimpleBitStorage bs;
+		public OurBitStorage(int bits, int count, long[] data) {
+			bs = new SimpleBitStorage(bits, count, data);
+		}
+		@Override
+		public int get(int idx) {
+			return bs.a(idx);
+		}
+	}
+}

bukkit-helper/.settings/org.eclipse.buildship.core.prefs

@@ -2,7 +2,7 @@ arguments=
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
-connection.project.dir=..
+connection.project.dir=../bukkit-helper-120-2
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home

bukkit-helper/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,5 @@
 #
-#Tue Jun 20 20:08:06 CDT 2023
+#Sat Sep 23 12:37:23 CDT 2023
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 eclipse.preferences.version=1

bukkit-helper/build.gradle

@@ -8,6 +8,8 @@ eclipse {
 
 description = 'bukkit-helper'
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
   implementation project(':dynmap-api')
   implementation project(path: ':DynmapCore', configuration: 'shadow')

dynmap-api/build.gradle

@@ -8,6 +8,8 @@ eclipse {
 
 description = "dynmap-api"
 
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+
 dependencies {
     compileOnly group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
     compileOnly project(":DynmapCoreAPI")

fabric-1.20.2/.gitignore

@@ -0,0 +1,32 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# fabric
+
+run/
+
+# other
+*.log

fabric-1.20.2/build.gradle

@@ -0,0 +1,73 @@
+plugins {
+	id 'fabric-loom' version '1.1.10'
+}
+
+archivesBaseName = "Dynmap"
+version = parent.version
+group = parent.group
+
+eclipse {
+    project {
+        name = "Dynmap(Fabric-1.20.2)"
+    }
+}
+
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+
+configurations {
+    shadow
+    implementation.extendsFrom(shadow)
+}
+
+repositories {
+    mavenCentral()
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
+
+    shadow project(path: ':DynmapCore', configuration: 'shadow')
+
+    modCompileOnly "me.lucko:fabric-permissions-api:0.1-SNAPSHOT"
+    compileOnly 'net.luckperms:api:5.4'
+}
+
+loom {
+    accessWidenerPath = file("src/main/resources/dynmap.accesswidener")
+}
+
+processResources {
+    filesMatching('fabric.mod.json') {
+        expand "version": project.version
+    }
+}
+
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
+}
+
+jar {
+    from "LICENSE"
+    from {
+        configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
+remapJar {
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
+}
+
+remapJar.doLast {
+    task ->
+        ant.checksum file: task.archivePath
+}

fabric-1.20.2/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.1
+loader_version=0.14.21
+fabric_version=0.89.2+1.20.2

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/DynmapMod.java

@@ -0,0 +1,50 @@
+package org.dynmap.fabric_1_20_2;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import org.dynmap.DynmapCore;
+import org.dynmap.Log;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class DynmapMod implements ModInitializer {
+    private static final String MODID = "dynmap";
+    private static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer(MODID)
+            .orElseThrow(() -> new RuntimeException("Failed to get mod container: " + MODID));
+    // The instance of your mod that Fabric uses.
+    public static DynmapMod instance;
+
+    public static DynmapPlugin plugin;
+    public static File jarfile;
+    public static String ver;
+    public static boolean useforcedchunks;
+
+    @Override
+    public void onInitialize() {
+        instance = this;
+
+        Path path = MOD_CONTAINER.getRootPath();
+        try {
+            jarfile = new File(DynmapCore.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+        } catch (URISyntaxException e) {
+            Log.severe("Unable to get DynmapCore jar path", e);
+        }
+
+        if (path.getFileSystem().provider().getScheme().equals("jar")) {
+            path = Paths.get(path.getFileSystem().toString());
+            jarfile = path.toFile();
+        }
+
+        ver = MOD_CONTAINER.getMetadata().getVersion().getFriendlyString();
+
+        Log.setLogger(new FabricLogger());
+        org.dynmap.modsupport.ModSupportImpl.init();
+
+        // Initialize the plugin, we will enable it fully when the server starts.
+        plugin = new DynmapPlugin();
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/DynmapPlugin.java

@@ -0,0 +1,796 @@
+package org.dynmap.fabric_1_20_2;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FluidBlock;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.IdList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.EmptyBlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkSection;
+import org.dynmap.*;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.common.DynmapCommandSender;
+import org.dynmap.common.DynmapListenerManager;
+import org.dynmap.common.DynmapPlayer;
+import org.dynmap.common.chunk.GenericChunkCache;
+import org.dynmap.fabric_1_20_2.command.DmapCommand;
+import org.dynmap.fabric_1_20_2.command.DmarkerCommand;
+import org.dynmap.fabric_1_20_2.command.DynmapCommand;
+import org.dynmap.fabric_1_20_2.command.DynmapExpCommand;
+import org.dynmap.fabric_1_20_2.event.BlockEvents;
+import org.dynmap.fabric_1_20_2.event.CustomServerChunkEvents;
+import org.dynmap.fabric_1_20_2.event.CustomServerLifecycleEvents;
+import org.dynmap.fabric_1_20_2.event.PlayerEvents;
+import org.dynmap.fabric_1_20_2.mixin.BiomeEffectsAccessor;
+import org.dynmap.fabric_1_20_2.permissions.*;
+import org.dynmap.permissions.PermissionsHandler;
+import org.dynmap.renderer.DynmapBlockState;
+
+import java.io.File;
+import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.regex.Pattern;
+
+
+public class DynmapPlugin {
+    // FIXME: Fix package-private fields after splitting is done
+    DynmapCore core;
+    private PermissionProvider permissions;
+    private boolean core_enabled;
+    public GenericChunkCache sscache;
+    public PlayerList playerList;
+    MapManager mapManager;
+    /**
+     * Server is set when running and unset at shutdown.
+     */
+    private net.minecraft.server.MinecraftServer server;
+    public static DynmapPlugin plugin;
+    ChatHandler chathandler;
+    private HashMap<String, Integer> sortWeights = new HashMap<String, Integer>();
+    private HashMap<String, FabricWorld> worlds = new HashMap<String, FabricWorld>();
+    private WorldAccess last_world;
+    private FabricWorld last_fworld;
+    private Map<String, FabricPlayer> players = new HashMap<String, FabricPlayer>();
+    private FabricServer fserver;
+    private boolean tickregistered = false;
+    // TPS calculator
+    double tps;
+    long lasttick;
+    long avgticklen;
+    // Per tick limit, in nsec
+    long perTickLimit = (50000000); // 50 ms
+    private boolean useSaveFolder = true;
+
+    private static final String[] TRIGGER_DEFAULTS = {"blockupdate", "chunkpopulate", "chunkgenerate"};
+
+    static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]");
+
+    DynmapPlugin() {
+        plugin = this;
+        // Fabric events persist between server instances
+        ServerLifecycleEvents.SERVER_STARTING.register(this::serverStart);
+        CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> registerCommands(dispatcher));
+        CustomServerLifecycleEvents.SERVER_STARTED_PRE_WORLD_LOAD.register(this::serverStarted);
+        ServerLifecycleEvents.SERVER_STOPPING.register(this::serverStop);
+    }
+
+    int getSortWeight(String name) {
+        return sortWeights.getOrDefault(name, 0);
+    }
+
+    void setSortWeight(String name, int wt) {
+        sortWeights.put(name, wt);
+    }
+
+    void dropSortWeight(String name) {
+        sortWeights.remove(name);
+    }
+
+    public static class BlockUpdateRec {
+        WorldAccess w;
+        String wid;
+        int x, y, z;
+    }
+
+    ConcurrentLinkedQueue<BlockUpdateRec> blockupdatequeue = new ConcurrentLinkedQueue<BlockUpdateRec>();
+
+    public static DynmapBlockState[] stateByID;
+
+    /**
+     * Initialize block states (org.dynmap.blockstate.DynmapBlockState)
+     */
+    public void initializeBlockStates() {
+        stateByID = new DynmapBlockState[512 * 32];    // Simple map - scale as needed
+        Arrays.fill(stateByID, DynmapBlockState.AIR); // Default to air
+
+        IdList<BlockState> bsids = Block.STATE_IDS;
+
+        DynmapBlockState basebs = null;
+        Block baseb = null;
+        int baseidx = 0;
+
+        Iterator<BlockState> iter = bsids.iterator();
+    	DynmapBlockState.Builder bld = new DynmapBlockState.Builder();
+        while (iter.hasNext()) {
+            BlockState bs = iter.next();
+            int idx = bsids.getRawId(bs);
+            if (idx >= stateByID.length) {
+                int plen = stateByID.length;
+    			stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%    			
+                Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
+            }
+            Block b = bs.getBlock();
+            // If this is new block vs last, it's the base block state
+            if (b != baseb) {
+                basebs = null;
+                baseidx = idx;
+                baseb = b;
+            }
+
+            Identifier ui = Registries.BLOCK.getId(b);
+            if (ui == null) {
+                continue;
+            }
+            String bn = ui.getNamespace() + ":" + ui.getPath();
+            // Only do defined names, and not "air"
+            if (!bn.equals(DynmapBlockState.AIR_BLOCK)) {
+                String statename = "";
+                for (net.minecraft.state.property.Property<?> p : bs.getProperties()) {
+                    if (statename.length() > 0) {
+                        statename += ",";
+                    }
+                    statename += p.getName() + "=" + bs.get(p).toString();
+                }
+                int lightAtten = bs.isOpaqueFullCube(EmptyBlockView.INSTANCE, BlockPos.ORIGIN) ? 15 : (bs.isTransparent(EmptyBlockView.INSTANCE, BlockPos.ORIGIN) ? 0 : 1);
+                //Log.info("statename=" + bn + "[" + statename + "], lightAtten=" + lightAtten);
+                // Fill in base attributes
+                bld.setBaseState(basebs).setStateIndex(idx - baseidx).setBlockName(bn).setStateName(statename).setLegacyBlockID(idx).setAttenuatesLight(lightAtten);
+                if (bs.getSoundGroup() != null) { bld.setMaterial(bs.getSoundGroup().toString()); }
+				if (bs.isSolid()) { bld.setSolid(); }
+				if (bs.isAir()) { bld.setAir(); }
+				if (bs.isIn(BlockTags.LOGS)) { bld.setLog(); }
+				if (bs.isIn(BlockTags.LEAVES)) { bld.setLeaves(); }
+				if ((!bs.getFluidState().isEmpty()) && !(bs.getBlock() instanceof FluidBlock)) {
+					bld.setWaterlogged();
+				}
+                DynmapBlockState dbs = bld.build(); // Build state
+                stateByID[idx] = dbs;
+                if (basebs == null) { basebs = dbs; }
+            }
+        }
+//        for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) {
+//            DynmapBlockState bs = DynmapBlockState.getStateByGlobalIndex(gidx);
+//            Log.info(gidx + ":" + bs.toString() + ", gidx=" + bs.globalStateIndex + ", sidx=" + bs.stateIndex);
+//        }
+    }
+
+    public static final Item getItemByID(int id) {
+        return Item.byRawId(id);
+    }
+
+    FabricPlayer getOrAddPlayer(ServerPlayerEntity player) {
+        String name = player.getName().getString();
+        FabricPlayer fp = players.get(name);
+        if (fp != null) {
+            fp.player = player;
+        } else {
+            fp = new FabricPlayer(this, player);
+            players.put(name, fp);
+        }
+        return fp;
+    }
+
+    static class ChatMessage {
+        String message;
+        ServerPlayerEntity sender;
+    }
+
+    ConcurrentLinkedQueue<ChatMessage> msgqueue = new ConcurrentLinkedQueue<ChatMessage>();
+
+    public static class ChatHandler {
+        private final DynmapPlugin plugin;
+
+        ChatHandler(DynmapPlugin plugin) {
+            this.plugin = plugin;
+        }
+
+        public void handleChat(ServerPlayerEntity player, String message) {
+            if (!message.startsWith("/")) {
+                ChatMessage cm = new ChatMessage();
+                cm.message = message;
+                cm.sender = player;
+                plugin.msgqueue.add(cm);
+            }
+        }
+    }
+
+    public FabricServer getFabricServer() {
+        return fserver;
+    }
+
+    private void serverStart(MinecraftServer server) {
+        // Set the server so we don't NPE during setup
+        this.server = server;
+        this.fserver = new FabricServer(this, server);
+        this.onEnable();
+    }
+
+    private void serverStarted(MinecraftServer server) {
+        this.onStart();
+        if (core != null) {
+            core.serverStarted();
+        }
+    }
+
+    private void serverStop(MinecraftServer server) {
+        this.onDisable();
+        this.server = null;
+    }
+
+    public boolean isOp(String player) {
+        String[] ops = server.getPlayerManager().getOpList().getNames();
+
+        for (String op : ops) {
+            if (op.equalsIgnoreCase(player)) {
+                return true;
+            }
+        }
+
+        // TODO: Consider whether cheats are enabled for integrated server
+        return server.isSingleplayer() && server.isHost(server.getPlayerManager().getPlayer(player).getGameProfile());
+    }
+
+    boolean hasPerm(PlayerEntity psender, String permission) {
+        PermissionsHandler ph = PermissionsHandler.getHandler();
+        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+            return true;
+        }
+        return permissions.has(psender, permission);
+    }
+
+    boolean hasPermNode(PlayerEntity psender, String permission) {
+        PermissionsHandler ph = PermissionsHandler.getHandler();
+        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
+            return true;
+        }
+        return permissions.hasPermissionNode(psender, permission);
+    }
+
+    Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        Set<String> rslt = null;
+        PermissionsHandler ph = PermissionsHandler.getHandler();
+        if (ph != null) {
+            rslt = ph.hasOfflinePermissions(player, perms);
+        }
+        Set<String> rslt2 = hasOfflinePermissions(player, perms);
+        if ((rslt != null) && (rslt2 != null)) {
+            Set<String> newrslt = new HashSet<String>(rslt);
+            newrslt.addAll(rslt2);
+            rslt = newrslt;
+        } else if (rslt2 != null) {
+            rslt = rslt2;
+        }
+        return rslt;
+    }
+
+    boolean hasOfflinePermission(String player, String perm) {
+        PermissionsHandler ph = PermissionsHandler.getHandler();
+        if (ph != null) {
+            if (ph.hasOfflinePermission(player, perm)) {
+                return true;
+            }
+        }
+        return permissions.hasOfflinePermission(player, perm);
+    }
+
+    void setChatHandler(ChatHandler chatHandler) {
+        plugin.chathandler = chatHandler;
+    }
+
+    public class TexturesPayload {
+        public long timestamp;
+        public String profileId;
+        public String profileName;
+        public boolean isPublic;
+        public Map<String, ProfileTexture> textures;
+
+    }
+
+    public class ProfileTexture {
+        public String url;
+    }
+
+    public void loadExtraBiomes(String mcver) {
+        int cnt = 0;
+        BiomeMap.loadWellKnownByVersion(mcver);
+
+        Registry<Biome> biomeRegistry = getFabricServer().getBiomeRegistry();
+        Biome[] list = getFabricServer().getBiomeList(biomeRegistry);
+
+        for (int i = 0; i < list.length; i++) {
+            Biome bb = list[i];
+            if (bb != null) {
+                String id = biomeRegistry.getId(bb).getPath();
+                String rl = biomeRegistry.getId(bb).toString();
+                float tmp = bb.getTemperature(), hum = bb.weather.downfall();
+                int watermult = ((BiomeEffectsAccessor) bb.getEffects()).getWaterColor();
+                Log.verboseinfo("biome[" + i + "]: hum=" + hum + ", tmp=" + tmp + ", mult=" + Integer.toHexString(watermult));
+
+                BiomeMap bmap = BiomeMap.NULL;
+                if (rl != null) {	// If resource location, lookup by this
+                	bmap = BiomeMap.byBiomeResourceLocation(rl);
+                }
+                else {
+                	bmap = BiomeMap.byBiomeID(i);
+                }
+                if (bmap.isDefault() || (bmap == BiomeMap.NULL)) {
+                    bmap = new BiomeMap((rl != null) ? BiomeMap.NO_INDEX : i, id, tmp, hum, rl);
+                    Log.verboseinfo("Add custom biome [" + bmap.toString() + "] (" + i + ")");
+                    cnt++;
+                }
+                else {
+                    bmap.setTemperature(tmp);
+                    bmap.setRainfall(hum);
+                }
+                if (watermult != -1) {
+                    bmap.setWaterColorMultiplier(watermult);
+                    Log.verboseinfo("Set watercolormult for " + bmap.toString() + " (" + i + ") to " + Integer.toHexString(watermult));
+                }
+                bmap.setBiomeObject(bb);
+            }
+        }
+        if (cnt > 0)
+            Log.info("Added " + cnt + " custom biome mappings");
+    }
+
+    private String[] getBiomeNames() {
+        Registry<Biome> biomeRegistry = getFabricServer().getBiomeRegistry();
+        Biome[] list = getFabricServer().getBiomeList(biomeRegistry);
+        String[] lst = new String[list.length];
+        for (int i = 0; i < list.length; i++) {
+            Biome bb = list[i];
+            if (bb != null) {
+                lst[i] = biomeRegistry.getId(bb).getPath();
+            }
+        }
+        return lst;
+    }
+
+    public void onEnable() {
+        /* Get MC version */
+        String mcver = server.getVersion();
+
+        /* Load extra biomes */
+        loadExtraBiomes(mcver);
+        /* Set up player login/quit event handler */
+        registerPlayerLoginListener();
+
+        /* Initialize permissions handler */
+        if (FabricLoader.getInstance().isModLoaded("luckperms")) {
+            Log.info("Using luckperms for access control");
+            permissions = new LuckPermissions();
+        }
+        else if (FabricLoader.getInstance().isModLoaded("fabric-permissions-api-v0")) {
+            Log.info("Using fabric-permissions-api for access control");
+            permissions = new FabricPermissions();
+        } else {
+            /* Initialize permissions handler */
+            permissions = FilePermissions.create();
+            if (permissions == null) {
+                permissions = new OpPermissions(new String[]{"webchat", "marker.icons", "marker.list", "webregister", "stats", "hide.self", "show.self"});
+            }
+        }
+        /* Get and initialize data folder */
+        File dataDirectory = new File("dynmap");
+
+        if (!dataDirectory.exists()) {
+            dataDirectory.mkdirs();
+        }
+
+        /* Instantiate core */
+        if (core == null) {
+            core = new DynmapCore();
+        }
+
+        /* Inject dependencies */
+        core.setPluginJarFile(DynmapMod.jarfile);
+        core.setPluginVersion(DynmapMod.ver);
+        core.setMinecraftVersion(mcver);
+        core.setDataFolder(dataDirectory);
+        core.setServer(fserver);
+        core.setTriggerDefault(TRIGGER_DEFAULTS);
+        core.setBiomeNames(getBiomeNames());
+
+        if (!core.initConfiguration(null)) {
+            return;
+        }
+        // Extract default permission example, if needed
+        File filepermexample = new File(core.getDataFolder(), "permissions.yml.example");
+        core.createDefaultFileFromResource("/permissions.yml.example", filepermexample);
+
+        DynmapCommonAPIListener.apiInitialized(core);
+    }
+
+    private DynmapCommand dynmapCmd;
+    private DmapCommand dmapCmd;
+    private DmarkerCommand dmarkerCmd;
+    private DynmapExpCommand dynmapexpCmd;
+
+    public void registerCommands(CommandDispatcher<ServerCommandSource> cd) {
+        dynmapCmd = new DynmapCommand(this);
+        dmapCmd = new DmapCommand(this);
+        dmarkerCmd = new DmarkerCommand(this);
+        dynmapexpCmd = new DynmapExpCommand(this);
+        dynmapCmd.register(cd);
+        dmapCmd.register(cd);
+        dmarkerCmd.register(cd);
+        dynmapexpCmd.register(cd);
+
+        Log.info("Register commands");
+    }
+
+    public void onStart() {
+        initializeBlockStates();
+        /* Enable core */
+        if (!core.enableCore(null)) {
+            return;
+        }
+        core_enabled = true;
+        VersionCheck.runCheck(core);
+        // Get per tick time limit
+        perTickLimit = core.getMaxTickUseMS() * 1000000;
+        // Prep TPS
+        lasttick = System.nanoTime();
+        tps = 20.0;
+
+        /* Register tick handler */
+        if (!tickregistered) {
+            ServerTickEvents.END_SERVER_TICK.register(server -> fserver.tickEvent(server));
+            tickregistered = true;
+        }
+
+        playerList = core.playerList;
+        sscache = new GenericChunkCache(core.getSnapShotCacheSize(), core.useSoftRefInSnapShotCache());
+        /* Get map manager from core */
+        mapManager = core.getMapManager();
+
+        /* Load saved world definitions */
+        loadWorlds();
+
+        for (FabricWorld w : worlds.values()) {
+            if (core.processWorldLoad(w)) {   /* Have core process load first - fire event listeners if good load after */
+                if (w.isLoaded()) {
+                    core.listenerManager.processWorldEvent(DynmapListenerManager.EventType.WORLD_LOAD, w);
+                }
+            }
+        }
+        core.updateConfigHashcode();
+
+        /* Register our update trigger events */
+        registerEvents();
+        Log.info("Register events");
+
+        //DynmapCommonAPIListener.apiInitialized(core);
+
+        Log.info("Enabled");
+    }
+
+    public void onDisable() {
+        DynmapCommonAPIListener.apiTerminated();
+
+        //if (metrics != null) {
+        //	metrics.stop();
+        //	metrics = null;
+        //}
+        /* Save worlds */
+        saveWorlds();
+
+        /* Purge tick queue */
+        fserver.clearTaskQueue();
+
+        /* Disable core */
+        core.disableCore();
+        core_enabled = false;
+
+        if (sscache != null) {
+            sscache.cleanup();
+            sscache = null;
+        }
+
+        Log.info("Disabled");
+    }
+
+    // TODO: Clean a bit
+    public void handleCommand(ServerCommandSource commandSource, String cmd, String[] args) throws CommandSyntaxException {
+        DynmapCommandSender dsender;
+        ServerPlayerEntity psender = null;
+
+        // getPlayer throws a CommandSyntaxException, so getEntity and instanceof for safety
+        if (commandSource.getEntity() instanceof ServerPlayerEntity) {
+            psender = commandSource.getPlayerOrThrow();
+        }
+
+        if (psender != null) {
+            // FIXME: New Player? Why not query the current player list.
+            dsender = new FabricPlayer(this, psender);
+        } else {
+            dsender = new FabricCommandSender(commandSource);
+        }
+
+        core.processCommand(dsender, cmd, cmd, args);
+    }
+
+    public class PlayerTracker {
+        public void onPlayerLogin(ServerPlayerEntity player) {
+            if (!core_enabled) return;
+            final DynmapPlayer dp = getOrAddPlayer(player);
+            /* This event can be called from off server thread, so push processing there */
+            core.getServer().scheduleServerTask(new Runnable() {
+                public void run() {
+                    core.listenerManager.processPlayerEvent(DynmapListenerManager.EventType.PLAYER_JOIN, dp);
+                }
+            }, 2);
+        }
+
+        public void onPlayerLogout(ServerPlayerEntity player) {
+            if (!core_enabled) return;
+            final DynmapPlayer dp = getOrAddPlayer(player);
+            final String name = player.getName().getString();
+            /* This event can be called from off server thread, so push processing there */
+            core.getServer().scheduleServerTask(new Runnable() {
+                public void run() {
+                    core.listenerManager.processPlayerEvent(DynmapListenerManager.EventType.PLAYER_QUIT, dp);
+                    players.remove(name);
+                }
+            }, 0);
+        }
+
+        public void onPlayerChangedDimension(ServerPlayerEntity player) {
+            if (!core_enabled) return;
+            getOrAddPlayer(player);    // Freshen player object reference
+        }
+
+        public void onPlayerRespawn(ServerPlayerEntity player) {
+            if (!core_enabled) return;
+            getOrAddPlayer(player);    // Freshen player object reference
+        }
+    }
+
+    private PlayerTracker playerTracker = null;
+
+    private void registerPlayerLoginListener() {
+        if (playerTracker == null) {
+            playerTracker = new PlayerTracker();
+            PlayerEvents.PLAYER_LOGGED_IN.register(player -> playerTracker.onPlayerLogin(player));
+            PlayerEvents.PLAYER_LOGGED_OUT.register(player -> playerTracker.onPlayerLogout(player));
+            PlayerEvents.PLAYER_CHANGED_DIMENSION.register(player -> playerTracker.onPlayerChangedDimension(player));
+            PlayerEvents.PLAYER_RESPAWN.register(player -> playerTracker.onPlayerRespawn(player));
+        }
+    }
+
+    public class WorldTracker {
+        public void handleWorldLoad(MinecraftServer server, ServerWorld world) {
+            if (!core_enabled) return;
+
+            final FabricWorld fw = getWorld(world);
+            // This event can be called from off server thread, so push processing there
+            core.getServer().scheduleServerTask(new Runnable() {
+                public void run() {
+                    if (core.processWorldLoad(fw))    // Have core process load first - fire event listeners if good load after
+                        core.listenerManager.processWorldEvent(DynmapListenerManager.EventType.WORLD_LOAD, fw);
+                }
+            }, 0);
+        }
+
+        public void handleWorldUnload(MinecraftServer server, ServerWorld world) {
+            if (!core_enabled) return;
+
+            final FabricWorld fw = getWorld(world);
+            if (fw != null) {
+                // This event can be called from off server thread, so push processing there
+                core.getServer().scheduleServerTask(new Runnable() {
+                    public void run() {
+                        core.listenerManager.processWorldEvent(DynmapListenerManager.EventType.WORLD_UNLOAD, fw);
+                        core.processWorldUnload(fw);
+                    }
+                }, 0);
+                // Set world unloaded (needs to be immediate, since it may be invalid after event)
+                fw.setWorldUnloaded();
+                // Clean up tracker
+                //WorldUpdateTracker wut = updateTrackers.remove(fw.getName());
+                //if(wut != null) wut.world = null;
+            }
+        }
+
+        public void handleChunkGenerate(ServerWorld world, Chunk chunk) {
+            if (!onchunkgenerate) return;
+
+            FabricWorld fw = getWorld(world, false);
+            ChunkPos chunkPos = chunk.getPos();
+
+			int ymax = Integer.MIN_VALUE;
+			int ymin = Integer.MAX_VALUE;
+            ChunkSection[] sections = chunk.getSectionArray();
+            for (int i = 0; i < sections.length; i++) {
+                if ((sections[i] != null) && (!sections[i].isEmpty())) {
+					int sy = chunk.getBottomY() + i * ChunkSection.field_31407 /* Mojmap: SECTION_HEIGHT */;
+					if (sy < ymin) ymin = sy;
+					if ((sy+16) > ymax) ymax = sy + 16;
+                }
+            }
+            if (ymax != Integer.MIN_VALUE) {
+                mapManager.touchVolume(fw.getName(),
+                        chunkPos.getStartX(), ymin, chunkPos.getStartZ(),
+                        chunkPos.getEndX(), ymax, chunkPos.getEndZ(),
+                        "chunkgenerate");
+                //Log.info("New generated chunk detected at %s[%s]".formatted(fw.getName(), chunkPos.getStartPos()));
+            }
+        }
+
+        public void handleBlockEvent(World world, BlockPos pos) {
+            if (!core_enabled) return;
+            if (!onblockchange) return;
+            if (!(world instanceof ServerWorld)) return;
+
+            BlockUpdateRec r = new BlockUpdateRec();
+            r.w = world;
+            FabricWorld fw = getWorld(world, false);
+            if (fw == null) return;
+            r.wid = fw.getName();
+            r.x = pos.getX();
+            r.y = pos.getY();
+            r.z = pos.getZ();
+            blockupdatequeue.add(r);
+        }
+    }
+
+    private WorldTracker worldTracker = null;
+    private boolean onblockchange = false;
+    private boolean onchunkpopulate = false;
+    private boolean onchunkgenerate = false;
+    boolean onblockchange_with_id = false;
+
+    private void registerEvents() {
+        // To trigger rendering.
+        onblockchange = core.isTrigger("blockupdate");
+        onchunkpopulate = core.isTrigger("chunkpopulate");
+        onchunkgenerate = core.isTrigger("chunkgenerate");
+        onblockchange_with_id = core.isTrigger("blockupdate-with-id");
+        if (onblockchange_with_id)
+            onblockchange = true;
+        if (worldTracker == null)
+            worldTracker = new WorldTracker();
+        if (onchunkpopulate || onchunkgenerate) {
+            CustomServerChunkEvents.CHUNK_GENERATE.register((world, chunk) -> worldTracker.handleChunkGenerate(world, chunk));
+        }
+        if (onblockchange) {
+            BlockEvents.BLOCK_EVENT.register((world, pos) -> worldTracker.handleBlockEvent(world, pos));
+        }
+
+        ServerWorldEvents.LOAD.register((server, world) -> worldTracker.handleWorldLoad(server, world));
+        ServerWorldEvents.UNLOAD.register((server, world) -> worldTracker.handleWorldUnload(server, world));
+    }
+
+    FabricWorld getWorldByName(String name) {
+        return worlds.get(name);
+    }
+
+    FabricWorld getWorld(World w) {
+        return getWorld(w, true);
+    }
+
+    private FabricWorld getWorld(World w, boolean add_if_not_found) {
+        if (last_world == w) {
+            return last_fworld;
+        }
+        String wname = FabricWorld.getWorldName(this, w);
+
+        for (FabricWorld fw : worlds.values()) {
+            if (fw.getRawName().equals(wname)) {
+                last_world = w;
+                last_fworld = fw;
+                if (!fw.isLoaded()) {
+                    fw.setWorldLoaded(w);
+                }
+                fw.updateWorld(w);
+                return fw;
+            }
+        }
+        FabricWorld fw = null;
+        if (add_if_not_found) {
+            /* Add to list if not found */
+            fw = new FabricWorld(this, w);
+            worlds.put(fw.getName(), fw);
+        }
+        last_world = w;
+        last_fworld = fw;
+        return fw;
+    }
+
+    private void saveWorlds() {
+        File f = new File(core.getDataFolder(), FabricWorld.SAVED_WORLDS_FILE);
+        ConfigurationNode cn = new ConfigurationNode(f);
+        ArrayList<HashMap<String, Object>> lst = new ArrayList<HashMap<String, Object>>();
+        for (DynmapWorld fw : core.mapManager.getWorlds()) {
+            HashMap<String, Object> vals = new HashMap<String, Object>();
+            vals.put("name", fw.getRawName());
+            vals.put("height", fw.worldheight);
+            vals.put("miny", fw.minY);
+            vals.put("sealevel", fw.sealevel);
+            vals.put("nether", fw.isNether());
+            vals.put("the_end", ((FabricWorld) fw).isTheEnd());
+            vals.put("title", fw.getTitle());
+            lst.add(vals);
+        }
+        cn.put("worlds", lst);
+        cn.put("useSaveFolderAsName", useSaveFolder);
+        cn.put("maxWorldHeight", FabricWorld.getMaxWorldHeight());
+
+        cn.save();
+    }
+
+    private void loadWorlds() {
+        File f = new File(core.getDataFolder(), FabricWorld.SAVED_WORLDS_FILE);
+        if (f.canRead() == false) {
+            useSaveFolder = true;
+            return;
+        }
+        ConfigurationNode cn = new ConfigurationNode(f);
+        cn.load();
+        // If defined, use maxWorldHeight
+        FabricWorld.setMaxWorldHeight(cn.getInteger("maxWorldHeight", 256));
+
+        // If setting defined, use it
+        if (cn.containsKey("useSaveFolderAsName")) {
+            useSaveFolder = cn.getBoolean("useSaveFolderAsName", useSaveFolder);
+        }
+        List<Map<String, Object>> lst = cn.getMapList("worlds");
+        if (lst == null) {
+            Log.warning(String.format("Discarding bad %s", FabricWorld.SAVED_WORLDS_FILE));
+            return;
+        }
+
+        for (Map<String, Object> world : lst) {
+            try {
+                String name = (String) world.get("name");
+                int height = (Integer) world.get("height");
+                Integer miny = (Integer) world.get("miny");
+                int sealevel = (Integer) world.get("sealevel");
+                boolean nether = (Boolean) world.get("nether");
+                boolean theend = (Boolean) world.get("the_end");
+                String title = (String) world.get("title");
+                if (name != null) {
+                    FabricWorld fw = new FabricWorld(this, name, height, sealevel, nether, theend, title, (miny != null) ? miny : 0);
+                    fw.setWorldUnloaded();
+                    core.processWorldLoad(fw);
+                    worlds.put(fw.getName(), fw);
+                }
+            } catch (Exception x) {
+                Log.warning(String.format("Unable to load saved worlds from %s", FabricWorld.SAVED_WORLDS_FILE));
+                return;
+            }
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricAdapter.java

@@ -0,0 +1,13 @@
+package org.dynmap.fabric_1_20_2;
+
+import net.minecraft.server.world.ServerWorld;
+import org.dynmap.DynmapLocation;
+
+public final class FabricAdapter {
+    public static DynmapLocation toDynmapLocation(DynmapPlugin plugin, ServerWorld world, double x, double y, double z) {
+        return new DynmapLocation(plugin.getWorld(world).getName(), x, y, z);
+    }
+
+    private FabricAdapter() {
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricCommandSender.java

@@ -0,0 +1,46 @@
+package org.dynmap.fabric_1_20_2;
+
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.LiteralTextContent;
+import net.minecraft.text.Text;
+import org.dynmap.common.DynmapCommandSender;
+
+/* Handler for generic console command sender */
+public class FabricCommandSender implements DynmapCommandSender {
+    private ServerCommandSource sender;
+
+    protected FabricCommandSender() {
+        sender = null;
+    }
+
+    public FabricCommandSender(ServerCommandSource send) {
+        sender = send;
+    }
+
+    @Override
+    public boolean hasPrivilege(String privid) {
+        return true;
+    }
+
+    @Override
+    public void sendMessage(String msg) {
+        if (sender != null) {
+            sender.sendFeedback(() -> Text.literal(msg), false);
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        return false;
+    }
+
+    @Override
+    public boolean isOp() {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermissionNode(String node) {
+        return true;
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricLogger.java

@@ -0,0 +1,49 @@
+package org.dynmap.fabric_1_20_2;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dynmap.utils.DynmapLogger;
+
+public class FabricLogger implements DynmapLogger {
+    Logger log;
+    public static final String DM = "[Dynmap] ";
+
+    FabricLogger() {
+        log = LogManager.getLogger("Dynmap");
+    }
+
+    @Override
+    public void info(String s) {
+        log.info(DM + s);
+    }
+
+    @Override
+    public void severe(Throwable t) {
+        log.fatal(t);
+    }
+
+    @Override
+    public void severe(String s) {
+        log.fatal(DM + s);
+    }
+
+    @Override
+    public void severe(String s, Throwable t) {
+        log.fatal(DM + s, t);
+    }
+
+    @Override
+    public void verboseinfo(String s) {
+        log.info(DM + s);
+    }
+
+    @Override
+    public void warning(String s) {
+        log.warn(DM + s);
+    }
+
+    @Override
+    public void warning(String s, Throwable t) {
+        log.warn(DM + s, t);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricMapChunkCache.java

@@ -0,0 +1,116 @@
+package org.dynmap.fabric_1_20_2;
+
+import net.minecraft.nbt.*;
+import net.minecraft.server.world.ServerChunkManager;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import net.minecraft.util.collection.PackedIntegerArray;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.WordPackedArray;
+import net.minecraft.world.ChunkSerializer;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.BiomeEffects;
+import net.minecraft.world.chunk.ChunkManager;
+import net.minecraft.world.chunk.ChunkStatus;
+
+import org.dynmap.DynmapChunk;
+import org.dynmap.DynmapCore;
+import org.dynmap.DynmapWorld;
+import org.dynmap.Log;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.common.chunk.GenericChunk;
+import org.dynmap.common.chunk.GenericChunkSection;
+import org.dynmap.common.chunk.GenericMapChunkCache;
+import org.dynmap.hdmap.HDBlockModels;
+import org.dynmap.renderer.DynmapBlockState;
+import org.dynmap.renderer.RenderPatchFactory;
+import org.dynmap.utils.*;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
+ */
+public class FabricMapChunkCache extends GenericMapChunkCache {
+    private World w;
+    private ServerChunkManager cps;
+
+    /**
+     * Construct empty cache
+     */
+    public FabricMapChunkCache(DynmapPlugin plugin) {
+    	super(plugin.sscache);
+    }
+
+    public void setChunks(FabricWorld dw, List<DynmapChunk> chunks) {
+        this.w = dw.getWorld();
+        if (dw.isLoaded()) {
+            /* Check if world's provider is ServerChunkManager */
+            ChunkManager cp = this.w.getChunkManager();
+
+            if (cp instanceof ServerChunkManager) {
+                cps = (ServerChunkManager) cp;
+            } else {
+                Log.severe("Error: world " + dw.getName() + " has unsupported chunk provider");
+            }
+        } 
+        super.setChunks(dw, chunks);
+    }
+
+	// Load generic chunk from existing and already loaded chunk
+	protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
+		GenericChunk gc = null;
+        if (cps.isChunkLoaded(chunk.x, chunk.z)) {
+            NbtCompound nbt = null;
+            try {
+                nbt = ChunkSerializer.serialize((ServerWorld) w, cps.getWorldChunk(chunk.x, chunk.z, false));
+            } catch (NullPointerException e) {
+                // TODO: find out why this is happening and why it only seems to happen since 1.16.2
+                Log.severe("ChunkSerializer.serialize threw a NullPointerException", e);
+            }
+            if (nbt != null) {
+            	gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
+            }
+		}
+		return gc;
+	}
+
+    private NbtCompound readChunk(int x, int z) {
+        try {
+            ThreadedAnvilChunkStorage acl = cps.threadedAnvilChunkStorage;
+
+            ChunkPos coord = new ChunkPos(x, z);
+            // Async chunk reading is synchronized here. Perhaps we can do async and improve performance?
+            return acl.getNbt(coord).join().orElse(null);
+        } catch (Exception exc) {
+            Log.severe(String.format("Error reading chunk: %s,%d,%d", dw.getName(), x, z), exc);
+            return null;
+        }
+    }
+
+	// Load generic chunk from unloaded chunk
+	protected GenericChunk loadChunk(DynmapChunk chunk) {
+		GenericChunk gc = null;
+        NbtCompound nbt = readChunk(chunk.x, chunk.z);
+		// If read was good
+		if (nbt != null) {
+			gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
+		}
+		return gc;
+	}
+
+    @Override
+    public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
+        return bm.<Biome>getBiomeObject().map(Biome::getEffects).flatMap(BiomeEffects::getFoliageColor).orElse(colormap[bm.biomeLookup()]);
+    }
+
+    @Override
+    public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
+        BiomeEffects effects = bm.<Biome>getBiomeObject().map(Biome::getEffects).orElse(null);
+        if (effects == null) return colormap[bm.biomeLookup()];
+        return effects.getGrassColorModifier().getModifiedGrassColor(x, z, effects.getGrassColor().orElse(colormap[bm.biomeLookup()]));
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricPlayer.java

@@ -0,0 +1,254 @@
+package org.dynmap.fabric_1_20_2;
+
+import com.google.common.collect.Iterables;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+
+import net.minecraft.network.packet.s2c.play.SubtitleS2CPacket;
+import net.minecraft.network.packet.s2c.play.TitleFadeS2CPacket;
+import net.minecraft.network.packet.s2c.play.TitleS2CPacket;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.LiteralTextContent;
+import net.minecraft.text.Text;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import org.dynmap.DynmapLocation;
+import org.dynmap.common.DynmapPlayer;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.UUID;
+
+/**
+ * Player access abstraction class
+ */
+public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
+    private static final Gson GSON = new GsonBuilder().create();
+    private final DynmapPlugin plugin;
+    // FIXME: Proper setter
+    ServerPlayerEntity player;
+    private final String skinurl;
+    private final UUID uuid;
+
+    public FabricPlayer(DynmapPlugin plugin, ServerPlayerEntity player) {
+        this.plugin = plugin;
+        this.player = player;
+        String url = null;
+        if (this.player != null) {
+            uuid = this.player.getUuid();
+            GameProfile prof = this.player.getGameProfile();
+            if (prof != null) {
+                Property textureProperty = Iterables.getFirst(prof.getProperties().get("textures"), null);
+
+                if (textureProperty != null) {
+                    DynmapPlugin.TexturesPayload result = null;
+                    try {
+                        String json = new String(Base64.getDecoder().decode(textureProperty.value()), StandardCharsets.UTF_8);
+                        result = GSON.fromJson(json, DynmapPlugin.TexturesPayload.class);
+                    } catch (JsonParseException e) {
+                    }
+                    if ((result != null) && (result.textures != null) && (result.textures.containsKey("SKIN"))) {
+                        url = result.textures.get("SKIN").url;
+                    }
+                }
+            }
+        } else {
+            uuid = null;
+        }
+        skinurl = url;
+    }
+
+    @Override
+    public boolean isConnected() {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        if (player != null) {
+            String n = player.getName().getString();
+            ;
+            return n;
+        } else
+            return "[Server]";
+    }
+
+    @Override
+    public String getDisplayName() {
+        if (player != null) {
+            String n = player.getDisplayName().getString();
+            return n;
+        } else
+            return "[Server]";
+    }
+
+    @Override
+    public boolean isOnline() {
+        return true;
+    }
+
+    @Override
+    public DynmapLocation getLocation() {
+        if (player == null) {
+            return null;
+        }
+
+        Vec3d pos = player.getPos();
+        return FabricAdapter.toDynmapLocation(plugin, player.getServerWorld(), pos.getX(), pos.getY(), pos.getZ());
+    }
+
+    @Override
+    public String getWorld() {
+        if (player == null) {
+            return null;
+        }
+
+        World world = player.getWorld();
+        if (world != null) {
+            return plugin.getWorld(world).getName();
+        }
+
+        return null;
+    }
+
+    @Override
+    public InetSocketAddress getAddress() {
+        if (player != null) {
+            ServerPlayNetworkHandler networkHandler = player.networkHandler;
+            if (networkHandler != null) {
+                SocketAddress sa = networkHandler.getConnectionAddress();
+                if (sa instanceof InetSocketAddress) {
+                    return (InetSocketAddress) sa;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isSneaking() {
+        if (player != null) {
+            return player.isSneaking();
+        }
+
+        return false;
+    }
+
+    @Override
+    public double getHealth() {
+        if (player != null) {
+            double h = player.getHealth();
+            if (h > 20) h = 20;
+            return h;  // Scale to 20 range
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int getArmorPoints() {
+        if (player != null) {
+            return player.getArmor();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public DynmapLocation getBedSpawnLocation() {
+        return null;
+    }
+
+    @Override
+    public long getLastLoginTime() {
+        return 0;
+    }
+
+    @Override
+    public long getFirstLoginTime() {
+        return 0;
+    }
+
+    @Override
+    public boolean hasPrivilege(String privid) {
+        if (player != null)
+            return plugin.hasPerm(player, privid);
+        return false;
+    }
+
+    @Override
+    public boolean isOp() {
+        return plugin.isOp(player.getName().getString());
+    }
+
+    @Override
+    public void sendMessage(String msg) {
+        Text ichatcomponent = Text.literal(msg);
+        player.sendMessage(ichatcomponent);
+    }
+
+    @Override
+    public boolean isInvisible() {
+        if (player != null) {
+            return player.isInvisible();
+        }
+        return false;
+    }
+
+    @Override
+    public int getSortWeight() {
+        return plugin.getSortWeight(getName());
+    }
+
+    @Override
+    public void setSortWeight(int wt) {
+        if (wt == 0) {
+            plugin.dropSortWeight(getName());
+        } else {
+            plugin.setSortWeight(getName(), wt);
+        }
+    }
+
+    @Override
+    public boolean hasPermissionNode(String node) {
+        return player != null && plugin.hasPermNode(player, node);
+    }
+
+    @Override
+    public String getSkinURL() {
+        return skinurl;
+    }
+
+    @Override
+    public UUID getUUID() {
+        return uuid;
+    }
+
+    /**
+     * Send title and subtitle text (called from server thread)
+     */
+    @Override
+    public void sendTitleText(String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
+        if (player != null) {
+            ServerPlayerEntity player = this.player;
+            TitleFadeS2CPacket times = new TitleFadeS2CPacket(fadeInTicks, stayTicks, fadeOutTicks);
+            player.networkHandler.sendPacket(times);
+            if (title != null) {
+                TitleS2CPacket titlepkt = new TitleS2CPacket(Text.literal(title));
+                player.networkHandler.sendPacket(titlepkt);
+            }
+
+            if (subtitle != null) {
+            	SubtitleS2CPacket subtitlepkt = new SubtitleS2CPacket(Text.literal(subtitle));
+                player.networkHandler.sendPacket(subtitlepkt);
+            }
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricServer.java

@@ -0,0 +1,610 @@
+package org.dynmap.fabric_1_20_2;
+
+import com.mojang.authlib.GameProfile;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.minecraft.block.AbstractSignBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.network.message.MessageType;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.server.BannedIpList;
+import net.minecraft.server.BannedPlayerList;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.LiteralTextContent;
+import net.minecraft.text.Text;
+import net.minecraft.util.UserCache;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import org.dynmap.DynmapChunk;
+import org.dynmap.DynmapWorld;
+import org.dynmap.Log;
+import org.dynmap.DynmapCommonAPIListener;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.common.DynmapListenerManager;
+import org.dynmap.common.DynmapPlayer;
+import org.dynmap.common.DynmapServerInterface;
+import org.dynmap.fabric_1_20_2.event.BlockEvents;
+import org.dynmap.fabric_1_20_2.event.ServerChatEvents;
+import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.VisibilityLimit;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * Server access abstraction class
+ */
+public class FabricServer extends DynmapServerInterface {
+    /* Server thread scheduler */
+    private final Object schedlock = new Object();
+    private final DynmapPlugin plugin;
+    private final MinecraftServer server;
+    private final Registry<Biome> biomeRegistry;
+    private long cur_tick;
+    private long next_id;
+    private long cur_tick_starttime;
+    private PriorityQueue<TaskRecord> runqueue = new PriorityQueue<TaskRecord>();
+
+    public FabricServer(DynmapPlugin plugin, MinecraftServer server) {
+        this.plugin = plugin;
+        this.server = server;
+        this.biomeRegistry = server.getRegistryManager().get(RegistryKeys.BIOME);
+    }
+
+    private Optional<GameProfile> getProfileByName(String player) {
+        UserCache cache = server.getUserCache();
+        return cache.findByName(player);
+    }
+
+    public final Registry<Biome> getBiomeRegistry() {
+        return biomeRegistry;
+    }
+
+    private Biome[] biomelist = null;
+
+    public final Biome[] getBiomeList(Registry<Biome> biomeRegistry) {
+        if (biomelist == null) {
+            biomelist = new Biome[256];
+            Iterator<Biome> iter = biomeRegistry.iterator();
+            while (iter.hasNext()) {
+                Biome b = iter.next();
+                int bidx = biomeRegistry.getRawId(b);
+                if (bidx >= biomelist.length) {
+                    biomelist = Arrays.copyOf(biomelist, bidx + biomelist.length);
+                }
+                biomelist[bidx] = b;
+            }
+        }
+        return biomelist;
+    }
+
+    @Override
+    public int getBlockIDAt(String wname, int x, int y, int z) {
+        return -1;
+    }
+
+    @SuppressWarnings("deprecation") /* Not much I can do... fix this if it breaks. */
+	@Override
+    public int isSignAt(String wname, int x, int y, int z) {
+        World world = plugin.getWorldByName(wname).getWorld();
+
+        BlockPos pos = new BlockPos(x, y, z);
+        if (!world.isChunkLoaded(pos))
+            return -1;
+
+        Block block = world.getBlockState(pos).getBlock();
+        return (block instanceof AbstractSignBlock ? 1 : 0);
+    }
+
+    @Override
+    public void scheduleServerTask(Runnable run, long delay) {
+        /* Add task record to queue */
+        synchronized (schedlock) {
+            TaskRecord tr = new TaskRecord(cur_tick + delay, next_id++, new FutureTask<Object>(run, null));
+            runqueue.add(tr);
+        }
+    }
+
+    @Override
+    public DynmapPlayer[] getOnlinePlayers() {
+        if (server.getPlayerManager() == null) return new DynmapPlayer[0];
+
+        List<ServerPlayerEntity> players = server.getPlayerManager().getPlayerList();
+        int playerCount = players.size();
+        DynmapPlayer[] dplay = new DynmapPlayer[players.size()];
+
+        for (int i = 0; i < playerCount; i++) {
+            ServerPlayerEntity player = players.get(i);
+            dplay[i] = plugin.getOrAddPlayer(player);
+        }
+
+        return dplay;
+    }
+
+    @Override
+    public void reload() {
+        plugin.onDisable();
+        plugin.onEnable();
+        plugin.onStart();
+    }
+
+    @Override
+    public DynmapPlayer getPlayer(String name) {
+        List<ServerPlayerEntity> players = server.getPlayerManager().getPlayerList();
+
+        for (ServerPlayerEntity player : players) {
+
+            if (player.getName().getString().equalsIgnoreCase(name)) {
+                return plugin.getOrAddPlayer(player);
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public Set<String> getIPBans() {
+        BannedIpList bl = server.getPlayerManager().getIpBanList();
+        Set<String> ips = new HashSet<String>();
+
+        for (String s : bl.getNames()) {
+            ips.add(s);
+        }
+
+        return ips;
+    }
+
+    @Override
+    public <T> Future<T> callSyncMethod(Callable<T> task) {
+        return callSyncMethod(task, 0);
+    }
+
+    public <T> Future<T> callSyncMethod(Callable<T> task, long delay) {
+        FutureTask<T> ft = new FutureTask<T>(task);
+
+        /* Add task record to queue */
+        synchronized (schedlock) {
+            TaskRecord tr = new TaskRecord(cur_tick + delay, next_id++, ft);
+            runqueue.add(tr);
+        }
+
+        return ft;
+    }
+
+    void clearTaskQueue() {
+        this.runqueue.clear();
+    }
+
+    @Override
+    public String getServerName() {
+        String sn;
+        if (server.isSingleplayer())
+            sn = "Integrated";
+        else
+            sn = server.getServerIp();
+        if (sn == null) sn = "Unknown Server";
+        return sn;
+    }
+
+    @Override
+    public boolean isPlayerBanned(String pid) {
+        PlayerManager scm = server.getPlayerManager();
+        BannedPlayerList bl = scm.getUserBanList();
+        try {
+            return bl.contains(getProfileByName(pid).get());
+        } catch (NoSuchElementException e) {
+            /* If this profile doesn't exist, default to "banned" for good measure. */
+            return true;
+        }
+    }
+
+    @Override
+    public String stripChatColor(String s) {
+        return DynmapPlugin.patternControlCode.matcher(s).replaceAll("");
+    }
+
+    private Set<DynmapListenerManager.EventType> registered = new HashSet<DynmapListenerManager.EventType>();
+
+    @Override
+    public boolean requestEventNotification(DynmapListenerManager.EventType type) {
+        if (registered.contains(type)) {
+            return true;
+        }
+
+        switch (type) {
+            case WORLD_LOAD:
+            case WORLD_UNLOAD:
+                /* Already called for normal world activation/deactivation */
+                break;
+
+            case WORLD_SPAWN_CHANGE:
+                /*TODO
+                pm.registerEvents(new Listener() {
+                    @EventHandler(priority=EventPriority.MONITOR)
+                    public void onSpawnChange(SpawnChangeEvent evt) {
+                        DynmapWorld w = new BukkitWorld(evt.getWorld());
+                        core.listenerManager.processWorldEvent(EventType.WORLD_SPAWN_CHANGE, w);
+                    }
+                }, DynmapPlugin.this);
+                */
+                break;
+
+            case PLAYER_JOIN:
+            case PLAYER_QUIT:
+                /* Already handled */
+                break;
+
+            case PLAYER_BED_LEAVE:
+                /*TODO
+                pm.registerEvents(new Listener() {
+                    @EventHandler(priority=EventPriority.MONITOR)
+                    public void onPlayerBedLeave(PlayerBedLeaveEvent evt) {
+                        DynmapPlayer p = new BukkitPlayer(evt.getPlayer());
+                        core.listenerManager.processPlayerEvent(EventType.PLAYER_BED_LEAVE, p);
+                    }
+                }, DynmapPlugin.this);
+                */
+                break;
+
+            case PLAYER_CHAT:
+                if (plugin.chathandler == null) {
+                    plugin.setChatHandler(new DynmapPlugin.ChatHandler(plugin));
+                    ServerChatEvents.EVENT.register((player, message) -> plugin.chathandler.handleChat(player, message));
+                }
+                break;
+
+            case BLOCK_BREAK:
+                /* Already handled by BlockEvents logic */
+                break;
+
+            case SIGN_CHANGE:
+                BlockEvents.SIGN_CHANGE_EVENT.register((world, pos, lines, player, front) -> {
+                    plugin.core.processSignChange("fabric", FabricWorld.getWorldName(plugin, world),
+                            pos.getX(), pos.getY(), pos.getZ(), lines, player.getName().getString());
+                });
+                break;
+
+            default:
+                Log.severe("Unhandled event type: " + type);
+                return false;
+        }
+
+        registered.add(type);
+        return true;
+    }
+
+    @Override
+    public boolean sendWebChatEvent(String source, String name, String msg) {
+        return DynmapCommonAPIListener.fireWebChatEvent(source, name, msg);
+    }
+
+    @Override
+    public void broadcastMessage(String msg) {
+        Text component = Text.literal(msg);
+        server.getPlayerManager().broadcast(component, false);
+        Log.info(stripChatColor(msg));
+    }
+
+    @Override
+    public String[] getBiomeIDs() {
+        BiomeMap[] b = BiomeMap.values();
+        String[] bname = new String[b.length];
+
+        for (int i = 0; i < bname.length; i++) {
+            bname[i] = b[i].toString();
+        }
+
+        return bname;
+    }
+
+    @Override
+    public double getCacheHitRate() {
+        if (plugin.sscache != null)
+            return plugin.sscache.getHitRate();
+        return 0.0;
+    }
+
+    @Override
+    public void resetCacheStats() {
+        if (plugin.sscache != null)
+            plugin.sscache.resetStats();
+    }
+
+    @Override
+    public DynmapWorld getWorldByName(String wname) {
+        return plugin.getWorldByName(wname);
+    }
+
+    @Override
+    public DynmapPlayer getOfflinePlayer(String name) {
+        /*
+        OfflinePlayer op = getServer().getOfflinePlayer(name);
+        if(op != null) {
+            return new BukkitPlayer(op);
+        }
+        */
+        return null;
+    }
+
+    @Override
+    public Set<String> checkPlayerPermissions(String player, Set<String> perms) {
+        if (isPlayerBanned(player)) {
+            return Collections.emptySet();
+        }
+        Set<String> rslt = plugin.hasOfflinePermissions(player, perms);
+        if (rslt == null) {
+            rslt = new HashSet<String>();
+            if (plugin.isOp(player)) {
+                rslt.addAll(perms);
+            }
+        }
+        return rslt;
+    }
+
+    @Override
+    public boolean checkPlayerPermission(String player, String perm) {
+        if (isPlayerBanned(player)) {
+            return false;
+        }
+        return plugin.hasOfflinePermission(player, perm);
+    }
+
+    /**
+     * Render processor helper - used by code running on render threads to request chunk snapshot cache from server/sync thread
+     */
+    @Override
+    public MapChunkCache createMapChunkCache(DynmapWorld w, List<DynmapChunk> chunks,
+                                             boolean blockdata, boolean highesty, boolean biome, boolean rawbiome) {
+        FabricMapChunkCache c = (FabricMapChunkCache) w.getChunkCache(chunks);
+        if (c == null) {
+            return null;
+        }
+        if (w.visibility_limits != null) {
+            for (VisibilityLimit limit : w.visibility_limits) {
+                c.setVisibleRange(limit);
+            }
+
+            c.setHiddenFillStyle(w.hiddenchunkstyle);
+        }
+
+        if (w.hidden_limits != null) {
+            for (VisibilityLimit limit : w.hidden_limits) {
+                c.setHiddenRange(limit);
+            }
+
+            c.setHiddenFillStyle(w.hiddenchunkstyle);
+        }
+
+        if (!c.setChunkDataTypes(blockdata, biome, highesty, rawbiome)) {
+            Log.severe("CraftBukkit build does not support biome APIs");
+        }
+
+        if (chunks.size() == 0)     /* No chunks to get? */ {
+            c.loadChunks(0);
+            return c;
+        }
+
+        //Now handle any chunks in server thread that are already loaded (on server thread)
+        final FabricMapChunkCache cc = c;
+        Future<Boolean> f = this.callSyncMethod(new Callable<Boolean>() {
+            public Boolean call() throws Exception {
+                // Update busy state on world
+                //FabricWorld fw = (FabricWorld) cc.getWorld();
+                //TODO
+                //setBusy(fw.getWorld());
+                cc.getLoadedChunks();
+                return true;
+            }
+        }, 0);
+        try {
+            f.get();
+        } catch (CancellationException cx) {
+            return null;
+        } catch (InterruptedException cx) {
+            return null;
+        } catch (ExecutionException xx) {
+            Log.severe("Exception while loading chunks", xx.getCause());
+            return null;
+        } catch (Exception ix) {
+            Log.severe(ix);
+            return null;
+        }
+        if (!w.isLoaded()) {
+            return null;
+        }
+        // Now, do rest of chunk reading from calling thread
+        c.readChunks(chunks.size());
+
+        return c;
+    }
+
+    @Override
+    public int getMaxPlayers() {
+        return server.getMaxPlayerCount();
+    }
+
+    @Override
+    public int getCurrentPlayers() {
+        return server.getPlayerManager().getCurrentPlayerCount();
+    }
+
+    public void tickEvent(MinecraftServer server) {
+        cur_tick_starttime = System.nanoTime();
+        long elapsed = cur_tick_starttime - plugin.lasttick;
+        plugin.lasttick = cur_tick_starttime;
+        plugin.avgticklen = ((plugin.avgticklen * 99) / 100) + (elapsed / 100);
+        plugin.tps = (double) 1E9 / (double) plugin.avgticklen;
+        // Tick core
+        if (plugin.core != null) {
+            plugin.core.serverTick(plugin.tps);
+        }
+
+        boolean done = false;
+        TaskRecord tr = null;
+
+        while (!plugin.blockupdatequeue.isEmpty()) {
+            DynmapPlugin.BlockUpdateRec r = plugin.blockupdatequeue.remove();
+            BlockState bs = r.w.getBlockState(new BlockPos(r.x, r.y, r.z));
+            int idx = Block.STATE_IDS.getRawId(bs);
+            if (!org.dynmap.hdmap.HDBlockModels.isChangeIgnoredBlock(DynmapPlugin.stateByID[idx])) {
+                if (plugin.onblockchange_with_id)
+                    plugin.mapManager.touch(r.wid, r.x, r.y, r.z, "blockchange[" + idx + "]");
+                else
+                    plugin.mapManager.touch(r.wid, r.x, r.y, r.z, "blockchange");
+            }
+        }
+
+        long now;
+
+        synchronized (schedlock) {
+            cur_tick++;
+            now = System.nanoTime();
+            tr = runqueue.peek();
+            /* Nothing due to run */
+            if ((tr == null) || (tr.getTickToRun() > cur_tick) || ((now - cur_tick_starttime) > plugin.perTickLimit)) {
+                done = true;
+            } else {
+                tr = runqueue.poll();
+            }
+        }
+        while (!done) {
+            tr.run();
+
+            synchronized (schedlock) {
+                tr = runqueue.peek();
+                now = System.nanoTime();
+                /* Nothing due to run */
+                if ((tr == null) || (tr.getTickToRun() > cur_tick) || ((now - cur_tick_starttime) > plugin.perTickLimit)) {
+                    done = true;
+                } else {
+                    tr = runqueue.poll();
+                }
+            }
+        }
+        while (!plugin.msgqueue.isEmpty()) {
+            DynmapPlugin.ChatMessage cm = plugin.msgqueue.poll();
+            DynmapPlayer dp = null;
+            if (cm.sender != null)
+                dp = plugin.getOrAddPlayer(cm.sender);
+            else
+                dp = new FabricPlayer(plugin, null);
+
+            plugin.core.listenerManager.processChatEvent(DynmapListenerManager.EventType.PLAYER_CHAT, dp, cm.message);
+        }
+        // Check for generated chunks
+        if ((cur_tick % 20) == 0) {
+        }
+    }
+
+    private Optional<ModContainer> getModContainerById(String id) {
+        return FabricLoader.getInstance().getModContainer(id);
+    }
+
+    @Override
+    public boolean isModLoaded(String name) {
+        return FabricLoader.getInstance().getModContainer(name).isPresent();
+    }
+
+    @Override
+    public String getModVersion(String name) {
+        Optional<ModContainer> mod = getModContainerById(name);    // Try case sensitive lookup
+        return mod.map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString()).orElse(null);
+    }
+
+    @Override
+    public double getServerTPS() {
+        return plugin.tps;
+    }
+
+    @Override
+    public String getServerIP() {
+        if (server.isSingleplayer())
+            return "0.0.0.0";
+        else
+            return server.getServerIp();
+    }
+
+    @Override
+    public File getModContainerFile(String name) {
+        Optional<ModContainer> container = getModContainerById(name);    // Try case sensitive lookup
+        if (container.isPresent()) {
+            Path path = container.get().getRootPath();
+            if (path.getFileSystem().provider().getScheme().equals("jar")) {
+                path = Paths.get(path.getFileSystem().toString());
+            }
+            return path.toFile();
+        }
+        return null;
+    }
+
+    @Override
+    public List<String> getModList() {
+        return FabricLoader.getInstance()
+                .getAllMods()
+                .stream()
+                .map(container -> container.getMetadata().getId())
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public Map<Integer, String> getBlockIDMap() {
+        Map<Integer, String> map = new HashMap<Integer, String>();
+        return map;
+    }
+
+    @Override
+    public InputStream openResource(String modid, String rname) {
+        if (modid == null) modid = "minecraft";
+
+        if ("minecraft".equals(modid)) {
+            return MinecraftServer.class.getClassLoader().getResourceAsStream(rname);
+        } else {
+            if (rname.startsWith("/") || rname.startsWith("\\")) {
+                rname = rname.substring(1);
+            }
+
+            final String finalModid = modid;
+            final String finalRname = rname;
+            return getModContainerById(modid).map(container -> {
+                try {
+                    return Files.newInputStream(container.getPath(finalRname));
+                } catch (IOException e) {
+                    Log.severe("Failed to load resource of mod :" + finalModid, e);
+                    return null;
+                }
+            }).orElse(null);
+        }
+    }
+
+    /**
+     * Get block unique ID map (module:blockid)
+     */
+    @Override
+    public Map<String, Integer> getBlockUniqueIDMap() {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        return map;
+    }
+
+    /**
+     * Get item unique ID map (module:itemid)
+     */
+    @Override
+    public Map<String, Integer> getItemUniqueIDMap() {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        return map;
+    }
+
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricWorld.java

@@ -0,0 +1,236 @@
+package org.dynmap.fabric_1_20_2;
+
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.Heightmap;
+import net.minecraft.world.LightType;
+import net.minecraft.world.World;
+import net.minecraft.world.border.WorldBorder;
+import org.dynmap.DynmapChunk;
+import org.dynmap.DynmapLocation;
+import org.dynmap.DynmapWorld;
+import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.Polygon;
+
+import java.util.List;
+
+public class FabricWorld extends DynmapWorld {
+    // TODO: Store this relative to World saves for integrated server
+    public static final String SAVED_WORLDS_FILE = "fabricworlds.yml";
+
+    private final DynmapPlugin plugin;
+    private World world;
+    private final boolean skylight;
+    private final boolean isnether;
+    private final boolean istheend;
+    private final String env;
+    private DynmapLocation spawnloc = new DynmapLocation();
+    private static int maxWorldHeight = 320;    // Maximum allows world height
+
+    public static int getMaxWorldHeight() {
+        return maxWorldHeight;
+    }
+
+    public static void setMaxWorldHeight(int h) {
+        maxWorldHeight = h;
+    }
+
+    public static String getWorldName(DynmapPlugin plugin, World w) {
+        RegistryKey<World> rk = w.getRegistryKey();
+        if (rk == World.OVERWORLD) {    // Overworld?
+            return w.getServer().getSaveProperties().getLevelName();
+        } else if (rk == World.END) {
+            return "DIM1";
+        } else if (rk == World.NETHER) {
+            return "DIM-1";
+        } else {
+            return rk.getValue().getNamespace() + "_" + rk.getValue().getPath();
+        }
+    }
+    
+    public void updateWorld(World w) {
+    	this.updateWorldHeights(w.getHeight(), w.getBottomY(), w.getSeaLevel());
+    }
+
+    public FabricWorld(DynmapPlugin plugin, World w) {
+        this(plugin, getWorldName(plugin, w), w.getHeight(),
+                w.getSeaLevel(),
+                w.getRegistryKey() == World.NETHER,
+                w.getRegistryKey() == World.END,
+                w.getRegistryKey().getValue().getPath(),
+                w.getBottomY());
+        setWorldLoaded(w);
+    }
+
+    public FabricWorld(DynmapPlugin plugin, String name, int height, int sealevel, boolean nether, boolean the_end, String deftitle, int miny) {
+        super(name, (height > maxWorldHeight) ? maxWorldHeight : height, sealevel, miny);
+        this.plugin = plugin;
+        world = null;
+        setTitle(deftitle);
+        isnether = nether;
+        istheend = the_end;
+        skylight = !(isnether || istheend);
+
+        if (isnether) {
+            env = "nether";
+        } else if (istheend) {
+            env = "the_end";
+        } else {
+            env = "normal";
+        }
+
+    }
+
+    /* Test if world is nether */
+    @Override
+    public boolean isNether() {
+        return isnether;
+    }
+
+    public boolean isTheEnd() {
+        return istheend;
+    }
+
+    /* Get world spawn location */
+    @Override
+    public DynmapLocation getSpawnLocation() {
+        if (world != null) {
+            spawnloc.x = world.getLevelProperties().getSpawnX();
+            spawnloc.y = world.getLevelProperties().getSpawnY();
+            spawnloc.z = world.getLevelProperties().getSpawnZ();
+            spawnloc.world = this.getName();
+        }
+        return spawnloc;
+    }
+
+    /* Get world time */
+    @Override
+    public long getTime() {
+        if (world != null)
+            return world.getTimeOfDay();
+        else
+            return -1;
+    }
+
+    /* World is storming */
+    @Override
+    public boolean hasStorm() {
+        if (world != null)
+            return world.isRaining();
+        else
+            return false;
+    }
+
+    /* World is thundering */
+    @Override
+    public boolean isThundering() {
+        if (world != null)
+            return world.isThundering();
+        else
+            return false;
+    }
+
+    /* World is loaded */
+    @Override
+    public boolean isLoaded() {
+        return (world != null);
+    }
+
+    /* Set world to unloaded */
+    @Override
+    public void setWorldUnloaded() {
+        getSpawnLocation();
+        world = null;
+    }
+
+    /* Set world to loaded */
+    public void setWorldLoaded(World w) {
+        world = w;
+        this.sealevel = w.getSeaLevel();   // Read actual current sealevel from world
+        // Update lighting table
+        for (int lightLevel = 0; lightLevel < 16; lightLevel++) {
+            // Algorithm based on LightmapTextureManager.getBrightness()
+            // We can't call that method because it's client-only.
+            // This means the code below can stop being correct if Mojang ever
+            // updates the curve; in that case we should reflect the changes.
+            float value = (float) lightLevel / 15.0f;
+            float brightness = value / (4.0f - 3.0f * value);
+            this.setBrightnessTableEntry(lightLevel, MathHelper.lerp(w.getDimension().ambientLight(), brightness, 1.0F));
+        }
+    }
+
+    /* Get light level of block */
+    @Override
+    public int getLightLevel(int x, int y, int z) {
+        if (world != null)
+            return world.getLightLevel(new BlockPos(x, y, z));
+        else
+            return -1;
+    }
+
+    /* Get highest Y coord of given location */
+    @Override
+    public int getHighestBlockYAt(int x, int z) {
+        if (world != null) {
+            return world.getChunk(x >> 4, z >> 4).getHeightmap(Heightmap.Type.MOTION_BLOCKING).get(x & 15, z & 15);
+        } else
+            return -1;
+    }
+
+    /* Test if sky light level is requestable */
+    @Override
+    public boolean canGetSkyLightLevel() {
+        return skylight;
+    }
+
+    /* Return sky light level */
+    @Override
+    public int getSkyLightLevel(int x, int y, int z) {
+        if (world != null) {
+            return world.getLightLevel(LightType.SKY, new BlockPos(x, y, z));
+        } else
+            return -1;
+    }
+
+    /**
+     * Get world environment ID (lower case - normal, the_end, nether)
+     */
+    @Override
+    public String getEnvironment() {
+        return env;
+    }
+
+    /**
+     * Get map chunk cache for world
+     */
+    @Override
+    public MapChunkCache getChunkCache(List<DynmapChunk> chunks) {
+        if (world != null) {
+            FabricMapChunkCache c = new FabricMapChunkCache(plugin);
+            c.setChunks(this, chunks);
+            return c;
+        }
+        return null;
+    }
+
+    public World getWorld() {
+        return world;
+    }
+
+    @Override
+    public Polygon getWorldBorder() {
+        if (world != null) {
+            WorldBorder wb = world.getWorldBorder();
+            if ((wb != null) && (wb.getSize() < 5.9E7)) {
+                Polygon p = new Polygon();
+                p.addVertex(wb.getBoundWest(), wb.getBoundNorth());
+                p.addVertex(wb.getBoundWest(), wb.getBoundSouth());
+                p.addVertex(wb.getBoundEast(), wb.getBoundSouth());
+                p.addVertex(wb.getBoundEast(), wb.getBoundNorth());
+                return p;
+            }
+        }
+        return null;
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/NBT.java

@@ -0,0 +1,126 @@
+package org.dynmap.fabric_1_20_2;
+
+import org.dynmap.common.chunk.GenericBitStorage;
+import org.dynmap.common.chunk.GenericNBTCompound;
+import org.dynmap.common.chunk.GenericNBTList;
+
+import java.util.Set;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.util.collection.PackedIntegerArray;
+
+public class NBT {
+
+	public static class NBTCompound implements GenericNBTCompound {
+		private final NbtCompound obj;
+		public NBTCompound(NbtCompound t) {
+			this.obj = t;
+		}
+		@Override
+		public Set<String> getAllKeys() {
+			return obj.getKeys();
+		}
+		@Override
+		public boolean contains(String s) {
+			return obj.contains(s);
+		}
+		@Override
+		public boolean contains(String s, int i) {
+			return obj.contains(s, i);
+		}
+		@Override
+		public byte getByte(String s) {
+			return obj.getByte(s);
+		}
+		@Override
+		public short getShort(String s) {
+			return obj.getShort(s);
+		}
+		@Override
+		public int getInt(String s) {
+			return obj.getInt(s);
+		}
+		@Override
+		public long getLong(String s) {
+			return obj.getLong(s);
+		}
+		@Override
+		public float getFloat(String s) {
+			return obj.getFloat(s);
+		}
+		@Override
+		public double getDouble(String s) {
+			return obj.getDouble(s);
+		}
+		@Override
+		public String getString(String s) {
+			return obj.getString(s);
+		}
+		@Override
+		public byte[] getByteArray(String s) {
+			return obj.getByteArray(s);
+		}
+		@Override
+		public int[] getIntArray(String s) {
+			return obj.getIntArray(s);
+		}
+		@Override
+		public long[] getLongArray(String s) {
+			return obj.getLongArray(s);
+		}
+		@Override
+		public GenericNBTCompound getCompound(String s) {
+			return new NBTCompound(obj.getCompound(s));
+		}
+		@Override
+		public GenericNBTList getList(String s, int i) {
+			return new NBTList(obj.getList(s, i));
+		}
+		@Override
+		public boolean getBoolean(String s) {
+			return obj.getBoolean(s);
+		}
+		@Override
+		public String getAsString(String s) {
+			return obj.get(s).asString();
+		}
+		@Override
+		public GenericBitStorage makeBitStorage(int bits, int count, long[] data) {
+			return new OurBitStorage(bits, count, data);
+		}		
+		public String toString() {
+			return obj.toString();
+		}
+	}
+	public static class NBTList implements GenericNBTList {
+		private final NbtList obj;
+		public NBTList(NbtList t) {
+			obj = t;
+		}
+		@Override
+		public int size() {
+			return obj.size();
+		}
+		@Override
+		public String getString(int idx) {
+			return obj.getString(idx);
+		}
+		@Override
+		public GenericNBTCompound getCompound(int idx) {
+			return new NBTCompound(obj.getCompound(idx));
+		}
+		public String toString() {
+			return obj.toString();
+		}
+	}
+	public static class OurBitStorage implements GenericBitStorage {
+		private final PackedIntegerArray bs;
+		public OurBitStorage(int bits, int count, long[] data) {
+			bs = new PackedIntegerArray(bits, count, data);
+		}
+		@Override
+		public int get(int idx) {
+			return bs.get(idx);
+		}
+	}
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/TaskRecord.java

@@ -0,0 +1,38 @@
+package org.dynmap.fabric_1_20_2;
+
+import java.util.concurrent.FutureTask;
+
+class TaskRecord implements Comparable<TaskRecord> {
+    TaskRecord(long ticktorun, long id, FutureTask<?> future) {
+        this.ticktorun = ticktorun;
+        this.id = id;
+        this.future = future;
+    }
+
+    private final long ticktorun;
+    private final long id;
+    private final FutureTask<?> future;
+
+    void run() {
+        this.future.run();
+    }
+
+    long getTickToRun() {
+        return this.ticktorun;
+    }
+
+    @Override
+    public int compareTo(TaskRecord o) {
+        if (this.ticktorun < o.ticktorun) {
+            return -1;
+        } else if (this.ticktorun > o.ticktorun) {
+            return 1;
+        } else if (this.id < o.id) {
+            return -1;
+        } else if (this.id > o.id) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/VersionCheck.java

@@ -0,0 +1,98 @@
+package org.dynmap.fabric_1_20_2;
+
+import org.dynmap.DynmapCore;
+import org.dynmap.Log;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class VersionCheck {
+    private static final String VERSION_URL = "http://mikeprimm.com/dynmap/releases.php";
+
+    public static void runCheck(final DynmapCore core) {
+        new Thread(new Runnable() {
+            public void run() {
+                doCheck(core);
+            }
+        }).start();
+    }
+
+    private static int getReleaseVersion(String s) {
+        int index = s.lastIndexOf('-');
+        if (index < 0)
+            index = s.lastIndexOf('.');
+        if (index >= 0)
+            s = s.substring(0, index);
+        String[] split = s.split("\\.");
+        int v = 0;
+        try {
+            for (int i = 0; (i < split.length) && (i < 3); i++) {
+                v += Integer.parseInt(split[i]) << (8 * (2 - i));
+            }
+        } catch (NumberFormatException nfx) {
+        }
+        return v;
+    }
+
+    private static int getBuildNumber(String s) {
+        int index = s.lastIndexOf('-');
+        if (index < 0)
+            index = s.lastIndexOf('.');
+        if (index >= 0)
+            s = s.substring(index + 1);
+        try {
+            return Integer.parseInt(s);
+        } catch (NumberFormatException nfx) {
+            return 99999999;
+        }
+    }
+
+    private static void doCheck(DynmapCore core) {
+        String pluginver = core.getDynmapPluginVersion();
+        String platform = core.getDynmapPluginPlatform();
+        String platver = core.getDynmapPluginPlatformVersion();
+        if ((pluginver == null) || (platform == null) || (platver == null))
+            return;
+        HttpURLConnection conn = null;
+        String loc = VERSION_URL;
+        int cur_ver = getReleaseVersion(pluginver);
+        int cur_bn = getBuildNumber(pluginver);
+        try {
+            while ((loc != null) && (!loc.isEmpty())) {
+                URL url = new URL(loc);
+                conn = (HttpURLConnection) url.openConnection();
+                conn.setRequestProperty("User-Agent", "Dynmap (" + platform + "/" + platver + "/" + pluginver);
+                conn.connect();
+                loc = conn.getHeaderField("Location");
+            }
+            BufferedReader rdr = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String line = null;
+            while ((line = rdr.readLine()) != null) {
+                String[] split = line.split(":");
+                if (split.length < 4) continue;
+                /* If our platform and version, or wildcard platform version */
+                if (split[0].equals(platform) && (split[1].equals("*") || split[1].equals(platver))) {
+                    int recommended_ver = getReleaseVersion(split[2]);
+                    int recommended_bn = getBuildNumber(split[2]);
+                    if ((recommended_ver > cur_ver) || ((recommended_ver == cur_ver) && (recommended_bn > cur_bn))) { /* Newer recommended build */
+                        Log.info("Version obsolete: new recommended version " + split[2] + " is available.");
+                    } else if (cur_ver > recommended_ver) {    /* Running dev or prerelease? */
+                        int prerel_ver = getReleaseVersion(split[3]);
+                        int prerel_bn = getBuildNumber(split[3]);
+                        if ((prerel_ver > cur_ver) || ((prerel_ver == cur_ver) && (prerel_bn > cur_bn))) {
+                            Log.info("Version obsolete: new prerelease version " + split[3] + " is available.");
+                        }
+                    }
+                }
+            }
+        } catch (Exception x) {
+            Log.info("Error checking for latest version");
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+            }
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/access/ProtoChunkAccessor.java

@@ -0,0 +1,5 @@
+package org.dynmap.fabric_1_20_2.access;
+
+public interface ProtoChunkAccessor {
+    boolean getTouchedByWorldGen();
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/command/DmapCommand.java

@@ -0,0 +1,9 @@
+package org.dynmap.fabric_1_20_2.command;
+
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+public class DmapCommand extends DynmapCommandExecutor {
+    public DmapCommand(DynmapPlugin p) {
+        super("dmap", p);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/command/DmarkerCommand.java

@@ -0,0 +1,9 @@
+package org.dynmap.fabric_1_20_2.command;
+
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+public class DmarkerCommand extends DynmapCommandExecutor {
+    public DmarkerCommand(DynmapPlugin p) {
+        super("dmarker", p);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/command/DynmapCommand.java

@@ -0,0 +1,9 @@
+package org.dynmap.fabric_1_20_2.command;
+
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+public class DynmapCommand extends DynmapCommandExecutor {
+    public DynmapCommand(DynmapPlugin p) {
+        super("dynmap", p);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/command/DynmapCommandExecutor.java

@@ -0,0 +1,64 @@
+package org.dynmap.fabric_1_20_2.command;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.tree.ArgumentCommandNode;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.mojang.brigadier.tree.RootCommandNode;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.util.Arrays;
+
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+import static com.mojang.brigadier.arguments.StringArgumentType.greedyString;
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class DynmapCommandExecutor implements Command<ServerCommandSource> {
+    private final String cmd;
+    private final DynmapPlugin plugin;
+
+    DynmapCommandExecutor(String cmd, DynmapPlugin plugin) {
+        this.cmd = cmd;
+        this.plugin = plugin;
+    }
+
+    public void register(CommandDispatcher<ServerCommandSource> dispatcher) {
+        final RootCommandNode<ServerCommandSource> root = dispatcher.getRoot();
+
+        final LiteralCommandNode<ServerCommandSource> command = literal(this.cmd)
+                .executes(this)
+                .build();
+
+        final ArgumentCommandNode<ServerCommandSource, String> args = argument("args", greedyString())
+                .executes(this)
+                .build();
+
+        // So this becomes "cmd" [args]
+        command.addChild(args);
+
+        // Add command to the command dispatcher via root node.
+        root.addChild(command);
+    }
+
+    @Override
+    public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
+        // Commands in brigadier may be proxied in Minecraft via a syntax like `/execute ... ... run dmap [args]`
+        // Dynmap will fail to parse this properly, so we find the starting position of the actual command being parsed after any forks or redirects.
+        // The start position of the range specifies where the actual command dynmap has registered starts
+        int start = context.getRange().getStart();
+        String dynmapInput = context.getInput().substring(start);
+
+        String[] args = dynmapInput.split("\\s+");
+        plugin.handleCommand(context.getSource(), cmd, Arrays.copyOfRange(args, 1, args.length));
+        return 1;
+    }
+
+    //    @Override // TODO: Usage?
+    public String getUsage(ServerCommandSource commandSource) {
+        return "Run /" + cmd + " help for details on using command";
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/command/DynmapExpCommand.java

@@ -0,0 +1,9 @@
+package org.dynmap.fabric_1_20_2.command;
+
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+public class DynmapExpCommand extends DynmapCommandExecutor {
+    public DynmapExpCommand(DynmapPlugin p) {
+        super("dynmapexp", p);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/event/BlockEvents.java

@@ -0,0 +1,39 @@
+package org.dynmap.fabric_1_20_2.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class BlockEvents {
+    private BlockEvents() {
+    }
+
+    public static Event<BlockCallback> BLOCK_EVENT = EventFactory.createArrayBacked(BlockCallback.class,
+            (listeners) -> (world, pos) -> {
+                for (BlockCallback callback : listeners) {
+                    callback.onBlockEvent(world, pos);
+                }
+            }
+    );
+
+    public static Event<SignChangeCallback> SIGN_CHANGE_EVENT = EventFactory.createArrayBacked(SignChangeCallback.class,
+            (listeners) -> (world, pos, lines, player, front) -> {
+                for (SignChangeCallback callback : listeners) {
+                    callback.onSignChange(world, pos, lines, player, front);
+                }
+            }
+    );
+
+    @FunctionalInterface
+    public interface BlockCallback {
+        void onBlockEvent(World world, BlockPos pos);
+    }
+
+    @FunctionalInterface
+    public interface SignChangeCallback {
+        void onSignChange(ServerWorld world, BlockPos pos, String[] lines, ServerPlayerEntity player, boolean front);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/event/CustomServerChunkEvents.java

@@ -0,0 +1,21 @@
+package org.dynmap.fabric_1_20_2.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.chunk.Chunk;
+
+public class CustomServerChunkEvents {
+    public static Event<ChunkGenerate> CHUNK_GENERATE = EventFactory.createArrayBacked(ChunkGenerate.class,
+            (listeners) -> (world, chunk) -> {
+                for (ChunkGenerate callback : listeners) {
+                    callback.onChunkGenerate(world, chunk);
+                }
+            }
+    );
+
+    @FunctionalInterface
+    public interface ChunkGenerate {
+        void onChunkGenerate(ServerWorld world, Chunk chunk);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/event/CustomServerLifecycleEvents.java

@@ -0,0 +1,14 @@
+package org.dynmap.fabric_1_20_2.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+
+public class CustomServerLifecycleEvents {
+    public static final Event<ServerLifecycleEvents.ServerStarted> SERVER_STARTED_PRE_WORLD_LOAD =
+            EventFactory.createArrayBacked(ServerLifecycleEvents.ServerStarted.class, (callbacks) -> (server) -> {
+                for (ServerLifecycleEvents.ServerStarted callback : callbacks) {
+                    callback.onServerStarted(server);
+                }
+            });
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/event/PlayerEvents.java

@@ -0,0 +1,62 @@
+package org.dynmap.fabric_1_20_2.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.server.network.ServerPlayerEntity;
+
+public class PlayerEvents {
+    private PlayerEvents() {
+    }
+
+    public static Event<PlayerLoggedIn> PLAYER_LOGGED_IN = EventFactory.createArrayBacked(PlayerLoggedIn.class,
+            (listeners) -> (player) -> {
+                for (PlayerLoggedIn callback : listeners) {
+                    callback.onPlayerLoggedIn(player);
+                }
+            }
+    );
+
+    public static Event<PlayerLoggedOut> PLAYER_LOGGED_OUT = EventFactory.createArrayBacked(PlayerLoggedOut.class,
+            (listeners) -> (player) -> {
+                for (PlayerLoggedOut callback : listeners) {
+                    callback.onPlayerLoggedOut(player);
+                }
+            }
+    );
+
+    public static Event<PlayerChangedDimension> PLAYER_CHANGED_DIMENSION = EventFactory.createArrayBacked(PlayerChangedDimension.class,
+            (listeners) -> (player) -> {
+                for (PlayerChangedDimension callback : listeners) {
+                    callback.onPlayerChangedDimension(player);
+                }
+            }
+    );
+
+    public static Event<PlayerRespawn> PLAYER_RESPAWN = EventFactory.createArrayBacked(PlayerRespawn.class,
+            (listeners) -> (player) -> {
+                for (PlayerRespawn callback : listeners) {
+                    callback.onPlayerRespawn(player);
+                }
+            }
+    );
+
+    @FunctionalInterface
+    public interface PlayerLoggedIn {
+        void onPlayerLoggedIn(ServerPlayerEntity player);
+    }
+
+    @FunctionalInterface
+    public interface PlayerLoggedOut {
+        void onPlayerLoggedOut(ServerPlayerEntity player);
+    }
+
+    @FunctionalInterface
+    public interface PlayerChangedDimension {
+        void onPlayerChangedDimension(ServerPlayerEntity player);
+    }
+
+    @FunctionalInterface
+    public interface PlayerRespawn {
+        void onPlayerRespawn(ServerPlayerEntity player);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/event/ServerChatEvents.java

@@ -0,0 +1,23 @@
+package org.dynmap.fabric_1_20_2.event;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.server.network.ServerPlayerEntity;
+
+public class ServerChatEvents {
+    private ServerChatEvents() {
+    }
+
+    public static Event<ServerChatCallback> EVENT = EventFactory.createArrayBacked(ServerChatCallback.class,
+            (listeners) -> (player, message) -> {
+                for (ServerChatCallback callback : listeners) {
+                    callback.onChatMessage(player, message);
+                }
+            }
+    );
+
+    @FunctionalInterface
+    public interface ServerChatCallback {
+        void onChatMessage(ServerPlayerEntity player, String message);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/BiomeEffectsAccessor.java

@@ -0,0 +1,11 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.world.biome.BiomeEffects;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(BiomeEffects.class)
+public interface BiomeEffectsAccessor {
+    @Accessor
+    int getWaterColor();
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/MinecraftServerMixin.java

@@ -0,0 +1,17 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.server.MinecraftServer;
+
+import org.dynmap.fabric_1_20_2.event.CustomServerLifecycleEvents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftServer.class)
+public class MinecraftServerMixin {
+    @Inject(method = "loadWorld", at = @At("HEAD"))
+    protected void loadWorld(CallbackInfo info) {
+        CustomServerLifecycleEvents.SERVER_STARTED_PRE_WORLD_LOAD.invoker().onServerStarted((MinecraftServer) (Object) this);
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/PlayerManagerMixin.java

@@ -0,0 +1,31 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayerEntity;
+
+import org.dynmap.fabric_1_20_2.event.PlayerEvents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(PlayerManager.class)
+public class PlayerManagerMixin {
+    @Inject(method = "onPlayerConnect", at = @At("TAIL"))
+    public void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData ccd, CallbackInfo info) {
+        PlayerEvents.PLAYER_LOGGED_IN.invoker().onPlayerLoggedIn(player);
+    }
+
+    @Inject(method = "remove", at = @At("HEAD"))
+    public void remove(ServerPlayerEntity player, CallbackInfo info) {
+        PlayerEvents.PLAYER_LOGGED_OUT.invoker().onPlayerLoggedOut(player);
+    }
+
+    @Inject(method = "respawnPlayer", at = @At("RETURN"))
+    public void respawnPlayer(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> info) {
+        PlayerEvents.PLAYER_RESPAWN.invoker().onPlayerRespawn(info.getReturnValue());
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/ProtoChunkMixin.java

@@ -0,0 +1,31 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.chunk.ProtoChunk;
+
+import org.dynmap.fabric_1_20_2.access.ProtoChunkAccessor;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ProtoChunk.class)
+public class ProtoChunkMixin implements ProtoChunkAccessor {
+    private boolean touchedByWorldGen = false;
+
+    @Inject(
+            method = "setBlockState",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/chunk/ChunkSection;setBlockState(IIILnet/minecraft/block/BlockState;)Lnet/minecraft/block/BlockState;"
+            )
+    )
+    public void setBlockState(BlockPos pos, BlockState state, boolean moved, CallbackInfoReturnable<BlockState> info) {
+        touchedByWorldGen = true;
+    }
+
+    public boolean getTouchedByWorldGen() {
+        return touchedByWorldGen;
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/ServerPlayNetworkHandlerMixin.java

@@ -0,0 +1,75 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.network.message.FilterMask;
+import net.minecraft.network.message.SignedMessage;
+import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
+import net.minecraft.server.filter.FilteredMessage;
+import net.minecraft.server.filter.TextStream;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.LiteralTextContent;
+import net.minecraft.text.Text;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.dynmap.fabric_1_20_2.event.BlockEvents;
+import org.dynmap.fabric_1_20_2.event.ServerChatEvents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Mixin(ServerPlayNetworkHandler.class)
+public abstract class ServerPlayNetworkHandlerMixin {
+    @Shadow
+    public ServerPlayerEntity player;
+
+    @Inject(
+            method = "handleDecoratedMessage",
+            at = @At(
+                    value = "HEAD"
+            )
+    )
+    public void onGameMessage(SignedMessage signedMessage, CallbackInfo ci) {
+        ServerChatEvents.EVENT.invoker().onChatMessage(player, signedMessage.getContent().getString());
+    }
+
+    @Inject(
+            method = "onSignUpdate",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/block/entity/SignBlockEntity;tryChangeText(Lnet/minecraft/entity/player/PlayerEntity;ZLjava/util/List;)V",
+                    shift = At.Shift.BEFORE
+            ),
+            locals = LocalCapture.CAPTURE_FAILHARD,
+            cancellable = true
+    )
+    public void onSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage> signText, CallbackInfo ci,
+                             ServerWorld serverWorld, BlockPos blockPos, BlockEntity blockEntity, SignBlockEntity signBlockEntity)
+    {
+        // Pull the raw text from the input.
+        String[] rawTexts = new String[4];
+        for (int i=0; i<signText.size(); i++)
+            rawTexts[i] = signText.get(i).raw();
+
+        // Fire the event.
+        BlockEvents.SIGN_CHANGE_EVENT.invoker().onSignChange(serverWorld, blockPos, rawTexts, player, packet.isFront());
+
+        // Rebuild the signText list with the new values.
+        List<FilteredMessage> newSignText = Arrays.stream(rawTexts).map((raw) -> new FilteredMessage(raw, FilterMask.PASS_THROUGH)).toList();
+
+        // Execute the setting of the texts with the edited values.
+        signBlockEntity.tryChangeText(this.player, packet.isFront(), newSignText);
+
+        // Cancel the original tryChangeText() since we're calling it ourselves above.
+        ci.cancel();
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/ServerPlayerEntityMixin.java

@@ -0,0 +1,31 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+
+import org.dynmap.fabric_1_20_2.event.PlayerEvents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ServerPlayerEntity.class)
+public class ServerPlayerEntityMixin {
+    @Inject(method = "teleport(Lnet/minecraft/server/world/ServerWorld;DDDFF)V", at = @At("RETURN"))
+    public void teleport(ServerWorld targetWorld, double x, double y, double z, float yaw, float pitch, CallbackInfo info) {
+        ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
+        if (targetWorld != player.getServerWorld()) {
+            PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player);
+        }
+    }
+
+    @Inject(method = "moveToWorld", at = @At("RETURN"))
+    public void moveToWorld(ServerWorld destination, CallbackInfoReturnable<Entity> info) {
+        ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
+        if (player.getRemovalReason() == null) {
+            PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player);
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/ThreadedAnvilChunkStorageMixin.java

@@ -0,0 +1,33 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.server.world.ChunkHolder;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import net.minecraft.world.chunk.Chunk;
+
+import org.dynmap.fabric_1_20_2.access.ProtoChunkAccessor;
+import org.dynmap.fabric_1_20_2.event.CustomServerChunkEvents;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = ThreadedAnvilChunkStorage.class, priority = 666 /* fire before Fabric API CHUNK_LOAD event */)
+public abstract class ThreadedAnvilChunkStorageMixin {
+    @Final
+    @Shadow
+    ServerWorld world;
+
+    @Inject(
+            /* Same place as fabric-lifecycle-events-v1 event CHUNK_LOAD (we will fire before it) */
+            method = "method_17227",
+            at = @At("TAIL")
+    )
+    private void onChunkGenerate(ChunkHolder chunkHolder, Chunk protoChunk, CallbackInfoReturnable<Chunk> callbackInfoReturnable) {
+        if (((ProtoChunkAccessor)protoChunk).getTouchedByWorldGen()) {
+            CustomServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate(this.world, callbackInfoReturnable.getReturnValue());
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/mixin/WorldChunkMixin.java

@@ -0,0 +1,26 @@
+package org.dynmap.fabric_1_20_2.mixin;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.WorldChunk;
+
+import org.dynmap.fabric_1_20_2.event.BlockEvents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(WorldChunk.class)
+public abstract class WorldChunkMixin {
+    @Shadow
+    public abstract World getWorld();
+
+    @Inject(method = "setBlockState", at = @At("RETURN"))
+    public void setBlockState(BlockPos pos, BlockState state, boolean moved, CallbackInfoReturnable<BlockState> info) {
+        if (info.getReturnValue() != null) {
+            BlockEvents.BLOCK_EVENT.invoker().onBlockEvent(this.getWorld(), pos);
+        }
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/permissions/FabricPermissions.java

@@ -0,0 +1,47 @@
+package org.dynmap.fabric_1_20_2.permissions;
+
+import me.lucko.fabric.api.permissions.v0.Permissions;
+import net.minecraft.entity.player.PlayerEntity;
+import org.dynmap.Log;
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+import org.dynmap.json.simple.parser.JSONParser;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class FabricPermissions implements PermissionProvider {
+
+    private String permissionKey(String perm) {
+        return "dynmap." + perm;
+    }
+
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        return perms.stream()
+                .filter(perm -> hasOfflinePermission(player, perm))
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        return DynmapPlugin.plugin.isOp(player.toLowerCase());
+    }
+
+    @Override
+    public boolean has(PlayerEntity player, String permission) {
+        if (player == null) return false;
+        String name = player.getName().getString().toLowerCase();
+        if (DynmapPlugin.plugin.isOp(name)) return true;
+        return Permissions.check(player, permissionKey(permission));
+    }
+
+    @Override
+    public boolean hasPermissionNode(PlayerEntity player, String permission) {
+        if (player != null) {
+            String name = player.getName().getString().toLowerCase();
+            return DynmapPlugin.plugin.isOp(name);
+        }
+        return false;
+    }
+
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/permissions/FilePermissions.java

@@ -0,0 +1,103 @@
+package org.dynmap.fabric_1_20_2.permissions;
+
+import net.minecraft.entity.player.PlayerEntity;
+import org.dynmap.ConfigurationNode;
+import org.dynmap.Log;
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class FilePermissions implements PermissionProvider {
+    private HashMap<String, Set<String>> perms;
+    private Set<String> defperms;
+
+    public static FilePermissions create() {
+        File f = new File("dynmap/permissions.yml");
+        if (!f.exists())
+            return null;
+        ConfigurationNode cfg = new ConfigurationNode(f);
+        cfg.load();
+
+        Log.info("Using permissions.yml for access control");
+
+        return new FilePermissions(cfg);
+    }
+
+    private FilePermissions(ConfigurationNode cfg) {
+        perms = new HashMap<String, Set<String>>();
+        for (String k : cfg.keySet()) {
+            List<String> p = cfg.getStrings(k, null);
+            if (p != null) {
+                k = k.toLowerCase();
+                HashSet<String> pset = new HashSet<String>();
+                for (String perm : p) {
+                    pset.add(perm.toLowerCase());
+                }
+                perms.put(k, pset);
+                if (k.equals("defaultuser")) {
+                    defperms = pset;
+                }
+            }
+        }
+    }
+
+    private boolean hasPerm(String player, String perm) {
+        Set<String> ps = perms.get(player);
+        if ((ps != null) && (ps.contains(perm))) {
+            return true;
+        }
+        if (defperms.contains(perm)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        player = player.toLowerCase();
+        HashSet<String> rslt = new HashSet<String>();
+        if (DynmapPlugin.plugin.isOp(player)) {
+            rslt.addAll(perms);
+        } else {
+            for (String p : perms) {
+                if (hasPerm(player, p)) {
+                    rslt.add(p);
+                }
+            }
+        }
+        return rslt;
+    }
+
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        player = player.toLowerCase();
+        if (DynmapPlugin.plugin.isOp(player)) {
+            return true;
+        } else {
+            return hasPerm(player, perm);
+        }
+    }
+
+    @Override
+    public boolean has(PlayerEntity psender, String permission) {
+        if (psender != null) {
+            String n = psender.getName().getString().toLowerCase();
+            return hasPerm(n, permission);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean hasPermissionNode(PlayerEntity psender, String permission) {
+        if (psender != null) {
+            String player = psender.getName().getString().toLowerCase();
+            return DynmapPlugin.plugin.isOp(player);
+        }
+        return false;
+    }
+
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/permissions/LuckPermissions.java

@@ -0,0 +1,102 @@
+package org.dynmap.fabric_1_20_2.permissions;
+
+import me.lucko.fabric.api.permissions.v0.Permissions;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.cacheddata.CachedPermissionData;
+import net.luckperms.api.model.user.User;
+import net.luckperms.api.util.Tristate;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.MinecraftServer;
+import org.dynmap.Log;
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+import org.dynmap.json.simple.JSONArray;
+import org.dynmap.json.simple.JSONObject;
+import org.dynmap.json.simple.parser.JSONParser;
+import org.dynmap.json.simple.parser.ParseException;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public class LuckPermissions implements PermissionProvider {
+
+    private final JSONParser parser = new JSONParser();
+    private LuckPerms api = null;
+
+    private Optional<LuckPerms> getApi() {
+        if (api != null) return Optional.of(api);
+        try {
+            api = LuckPermsProvider.get();
+            return Optional.of(api);
+        } catch (Exception ex) {
+            Log.warning("Trying to access LuckPerms before it has loaded");
+            return Optional.empty();
+        }
+    }
+
+    private Optional<UUID> cachedUUID(String username) {
+        try {
+            BufferedReader reader = new BufferedReader(new FileReader("usercache.json"));
+            JSONArray cache = (JSONArray) parser.parse(reader);
+            for (Object it : cache) {
+                JSONObject user = (JSONObject) it;
+                if (user.get("name").toString().equalsIgnoreCase(username)) {
+                    String uuid = user.get("uuid").toString();
+                    return Optional.of(UUID.fromString(uuid));
+                }
+            }
+
+            reader.close();
+        } catch (IOException | ParseException ex) {
+            Log.warning("Unable to read usercache.json");
+        }
+
+        return Optional.empty();
+    }
+
+    private String permissionKey(String perm) {
+        return "dynmap." + perm;
+    }
+
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        return perms.stream()
+                .filter(perm -> hasOfflinePermission(player, perm))
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        if (DynmapPlugin.plugin.isOp(player.toLowerCase())) return true;
+        Optional<LuckPerms> api = getApi();
+        Optional<UUID> uuid = cachedUUID(player);
+        if (!uuid.isPresent() || !api.isPresent()) return false;
+        User user = api.get().getUserManager().loadUser(uuid.get()).join();
+        CachedPermissionData permissions = user.getCachedData().getPermissionData();
+        Tristate state = permissions.checkPermission(permissionKey(perm));
+        return state.asBoolean();
+    }
+
+    @Override
+    public boolean has(PlayerEntity player, String permission) {
+        if (player == null) return false;
+        String name = player.getName().getString().toLowerCase();
+        if (DynmapPlugin.plugin.isOp(name)) return true;
+        return Permissions.check(player, permissionKey(permission));
+    }
+
+    @Override
+    public boolean hasPermissionNode(PlayerEntity player, String permission) {
+        if (player != null) {
+            String name = player.getName().getString().toLowerCase();
+            return DynmapPlugin.plugin.isOp(name);
+        }
+        return false;
+    }
+
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/permissions/OpPermissions.java

@@ -0,0 +1,52 @@
+package org.dynmap.fabric_1_20_2.permissions;
+
+import net.minecraft.entity.player.PlayerEntity;
+import org.dynmap.Log;
+import org.dynmap.fabric_1_20_2.DynmapPlugin;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class OpPermissions implements PermissionProvider {
+    public HashSet<String> usrCommands = new HashSet<String>();
+
+    public OpPermissions(String[] usrCommands) {
+        for (String usrCommand : usrCommands) {
+            this.usrCommands.add(usrCommand);
+        }
+        Log.info("Using ops.txt for access control");
+    }
+
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        HashSet<String> rslt = new HashSet<String>();
+        if (DynmapPlugin.plugin.isOp(player)) {
+            rslt.addAll(perms);
+        }
+        return rslt;
+    }
+
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        return DynmapPlugin.plugin.isOp(player);
+    }
+
+    @Override
+    public boolean has(PlayerEntity psender, String permission) {
+        if (psender != null) {
+            if (usrCommands.contains(permission)) {
+                return true;
+            }
+            return DynmapPlugin.plugin.isOp(psender.getName().getString());
+        }
+        return true;
+    }
+
+    @Override
+    public boolean hasPermissionNode(PlayerEntity psender, String permission) {
+        if (psender != null) {
+            return DynmapPlugin.plugin.isOp(psender.getName().getString());
+        }
+        return true;
+    }
+}

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/permissions/PermissionProvider.java

@@ -0,0 +1,16 @@
+package org.dynmap.fabric_1_20_2.permissions;
+
+import net.minecraft.entity.player.PlayerEntity;
+
+import java.util.Set;
+
+public interface PermissionProvider {
+    boolean has(PlayerEntity sender, String permission);
+
+    boolean hasPermissionNode(PlayerEntity sender, String permission);
+
+    Set<String> hasOfflinePermissions(String player, Set<String> perms);
+
+    boolean hasOfflinePermission(String player, String perm);
+
+}

fabric-1.20.2/src/main/resources/configuration.txt

@@ -0,0 +1,492 @@
+# All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/dynmap/
+
+# All map templates are defined in the templates directory
+# To use the HDMap very-low-res (2 ppb) map templates as world defaults, set value to vlowres
+#   The definitions of these templates are in normal-vlowres.txt, nether-vlowres.txt, and the_end-vlowres.txt
+# To use the HDMap low-res (4 ppb) map templates as world defaults, set value to lowres
+#   The definitions of these templates are in normal-lowres.txt, nether-lowres.txt, and the_end-lowres.txt
+# To use the HDMap hi-res (16 ppb) map templates (these can take a VERY long time for initial fullrender), set value to hires
+#   The definitions of these templates are in normal-hires.txt, nether-hires.txt, and the_end-hires.txt
+# To use the HDMap low-res (4 ppb) map templates, with support for boosting resolution selectively to hi-res (16 ppb), set value to low_boost_hi
+#   The definitions of these templates are in normal-low_boost_hi.txt, nether-low_boost_hi.txt, and the_end-low_boost_hi.txt
+# To use the HDMap hi-res (16 ppb) map templates, with support for boosting resolution selectively to vhi-res (32 ppb), set value to hi_boost_vhi
+#   The definitions of these templates are in normal-hi_boost_vhi.txt, nether-hi_boost_vhi.txt, and the_end-hi_boost_vhi.txt
+# To use the HDMap hi-res (16 ppb) map templates, with support for boosting resolution selectively to xhi-res (64 ppb), set value to hi_boost_xhi
+#   The definitions of these templates are in normal-hi_boost_xhi.txt, nether-hi_boost_xhi.txt, and the_end-hi_boost_xhi.txt
+deftemplatesuffix: hires
+
+# Set default tile scale (0 = 128px x 128x, 1 = 256px x 256px, 2 = 512px x 512px, 3 = 1024px x 1024px, 4 = 2048px x 2048px) - 0 is default
+# Note: changing this value will result in all maps that use the default value being required to be fully rendered
+#defaulttilescale: 0
+
+# Map storage scheme: only uncommoent one 'type' value
+#  filetree: classic and default scheme: tree of files, with all map data under the directory indicated by 'tilespath' setting
+#  sqlite: single SQLite database file (this can get VERY BIG), located at 'dbfile' setting (default is file dynmap.db in data directory)
+#  mysql: MySQL database, at hostname:port in database, accessed via userid with password
+#  mariadb: MariaDB database, at hostname:port in database, accessed via userid with password
+#  postgres: PostgreSQL database, at hostname:port in database, accessed via userid with password
+storage:
+  # Filetree storage (standard tree of image files for maps)
+  type: filetree
+  # SQLite db for map storage (uses dbfile as storage location)
+  #type: sqlite
+  #dbfile: dynmap.db
+  # MySQL DB for map storage (at 'hostname':'port' in database 'database' using user 'userid' password 'password' and table prefix 'prefix'
+  #type: mysql
+  #hostname: localhost
+  #port: 3306
+  #database: dynmap
+  #userid: dynmap
+  #password: dynmap
+  #prefix: ""
+  #
+  # AWS S3 backet web site
+  #type: aws_s3
+  #bucketname: "dynmap-bucket-name"
+  #region: us-east-1
+  #aws_access_key_id: "<aws-access-key-id>"
+  #aws_secret_access_key: "<aws-secret-access-key>"  
+  #prefix: ""
+
+components:
+  - class: org.dynmap.ClientConfigurationComponent
+  
+  # Remember to change the following class to org.dynmap.JsonFileClientUpdateComponent when using an external web server.
+  - class: org.dynmap.InternalClientUpdateComponent
+    sendhealth: true
+    sendposition: true
+    allowwebchat: true
+    webchat-interval: 5
+    hidewebchatip: false
+    trustclientname: false
+    includehiddenplayers: false
+    # (optional) if true, color codes in player display names are used
+    use-name-colors: false
+    # (optional) if true, player login IDs will be used for web chat when their IPs match
+    use-player-login-ip: true
+    # (optional) if use-player-login-ip is true, setting this to true will cause chat messages not matching a known player IP to be ignored
+    require-player-login-ip: false
+    # (optional) block player login IDs that are banned from chatting
+    block-banned-player-chat: true
+    # Require login for web-to-server chat (requires login-enabled: true)
+    webchat-requires-login: false
+    # If set to true, users must have dynmap.webchat permission in order to chat
+    webchat-permissions: false
+    # Limit length of single chat messages
+    chatlengthlimit: 256
+  #  # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky)
+  #  hideifshadow: 4
+  #  # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky)
+  #  hideifundercover: 14
+  #  # (Optional) if true, players that are crouching/sneaking will be hidden 
+    hideifsneaking: false
+    # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
+    protected-player-info: false
+    # If true, hide players with invisibility potion effects active
+    hide-if-invisiblity-potion: true
+    # If true, player names are not shown on map, chat, list
+    hidenames: false
+  #- class: org.dynmap.JsonFileClientUpdateComponent
+  #  writeinterval: 1
+  #  sendhealth: true
+  #  sendposition: true
+  #  allowwebchat: true
+  #  webchat-interval: 5
+  #  hidewebchatip: false
+  #  includehiddenplayers: false
+  #  use-name-colors: false
+  #  use-player-login-ip: false
+  #  require-player-login-ip: false
+  #  block-banned-player-chat: true
+  #  hideifshadow: 0
+  #  hideifundercover: 0
+  #  hideifsneaking: false
+  #  # Require login for web-to-server chat (requires login-enabled: true)
+  #  webchat-requires-login: false
+  #  # If set to true, users must have dynmap.webchat permission in order to chat
+  #  webchat-permissions: false
+  #  # Limit length of single chat messages
+  #  chatlengthlimit: 256
+  #  hide-if-invisiblity-potion: true
+  #  hidenames: false
+   
+  - class: org.dynmap.SimpleWebChatComponent
+    allowchat: true
+    # If true, web UI users can supply name for chat using 'playername' URL parameter.  'trustclientname' must also be set true.
+    allowurlname: false
+  
+  # Note: this component is needed for the dmarker commands, and for the Marker API to be available to other plugins
+  - class: org.dynmap.MarkersComponent
+    type: markers
+    showlabel: false
+    enablesigns: false
+    # Default marker set for sign markers
+    default-sign-set: markers
+    # (optional) add spawn point markers to standard marker layer
+    showspawn: true
+    spawnicon: world
+    spawnlabel: "Spawn"
+    # (optional) layer for showing offline player's positions (for 'maxofflinetime' minutes after logoff)
+    showofflineplayers: false
+    offlinelabel: "Offline"
+    offlineicon: offlineuser
+    offlinehidebydefault: true
+    offlineminzoom: 0
+    maxofflinetime: 30
+    # (optional) layer for showing player's spawn beds
+    showspawnbeds: false
+    spawnbedlabel: "Spawn Beds"
+    spawnbedicon: bed
+    spawnbedhidebydefault: true
+    spawnbedminzoom: 0
+    spawnbedformat: "%name%'s bed"
+    # (optional) Show world border (vanilla 1.8+)
+    showworldborder: true
+    worldborderlabel: "Border"
+    
+  - class: org.dynmap.ClientComponent
+    type: chat
+    allowurlname: false
+  - class: org.dynmap.ClientComponent
+    type: chatballoon
+    focuschatballoons: false
+  - class: org.dynmap.ClientComponent
+    type: chatbox
+    showplayerfaces: true
+    messagettl: 5
+    # Optional: set number of lines in scrollable message history: if set, messagettl is not used to age out messages
+    #scrollback: 100
+    # Optional: set maximum number of lines visible for chatbox
+    #visiblelines: 10
+    # Optional: send push button
+    sendbutton: false
+  - class: org.dynmap.ClientComponent
+    type: playermarkers
+    showplayerfaces: true
+    showplayerhealth: true
+    # If true, show player body too (only valid if showplayerfaces=true)
+    showplayerbody: false
+    # Option to make player faces small - don't use with showplayerhealth or largeplayerfaces
+    smallplayerfaces: false
+    # Option to make player faces larger - don't use with showplayerhealth or smallplayerfaces
+    largeplayerfaces: false
+    # Optional - make player faces layer hidden by default
+    hidebydefault: false
+    # Optional - ordering priority in layer menu (low goes before high - default is 0)
+    layerprio: 0
+    # Optional - label for player marker layer (default is 'Players')
+    label: "Players"
+    
+  #- class: org.dynmap.ClientComponent
+  #  type: digitalclock
+  - class: org.dynmap.ClientComponent
+    type: link
+    
+  - class: org.dynmap.ClientComponent
+    type: timeofdayclock
+    showdigitalclock: true
+    #showweather: true
+  # Mouse pointer world coordinate display
+  - class: org.dynmap.ClientComponent
+    type: coord
+    label: "Location"
+    hidey: false
+    show-mcr: false
+    show-chunk: false
+    
+  # Note: more than one logo component can be defined
+  #- class: org.dynmap.ClientComponent
+  #  type: logo
+  #  text: "Dynmap"
+  #  #logourl: "images/block_surface.png"
+  #  linkurl: "http://forums.bukkit.org/threads/dynmap.489/"
+  #  # Valid positions: top-left, top-right, bottom-left, bottom-right
+  #  position: bottom-right
+
+  #- class: org.dynmap.ClientComponent
+  #  type: inactive
+  #  timeout: 1800 # in seconds (1800 seconds = 30 minutes)
+  #  redirecturl: inactive.html
+  #  #showmessage: 'You were inactive for too long.'
+  
+  #- class: org.dynmap.TestComponent
+  #  stuff: "This is some configuration-value"
+
+# Treat hiddenplayers.txt as a whitelist for players to be shown on the map? (Default false)
+display-whitelist: false
+
+# How often a tile gets rendered (in seconds).
+renderinterval: 1
+
+# How many tiles on update queue before accelerate render interval
+renderacceleratethreshold: 60
+
+# How often to render tiles when backlog is above renderacceleratethreshold
+renderaccelerateinterval: 0.2
+
+# How many update tiles to work on at once (if not defined, default is 1/2 the number of cores)
+tiles-rendered-at-once: 2
+
+# If true, use normal priority threads for rendering (versus low priority) - this can keep rendering
+# from starving on busy Windows boxes (Linux JVMs pretty much ignore thread priority), but may result
+# in more competition for CPU resources with other processes
+usenormalthreadpriority: true
+
+# Save and restore pending tile renders - prevents their loss on server shutdown or /reload
+saverestorepending: true
+
+# Save period for pending jobs (in seconds): periodic saving for crash recovery of jobs
+save-pending-period: 900
+
+# Zoom-out tile update period - how often to scan for and process tile updates into zoom-out tiles (in seconds)
+zoomoutperiod: 30
+
+# Control whether zoom out tiles are validated on startup (can be needed if zoomout processing is interrupted, but can be expensive on large maps)
+initial-zoomout-validate: true
+
+# Default delay on processing of updated tiles, in seconds.  This can reduce potentially expensive re-rendering
+# of frequently updated tiles (such as due to machines, pistons, quarries or other automation).  Values can
+# also be set on individual worlds and individual maps.
+tileupdatedelay: 30
+
+# Tile hashing is used to minimize tile file updates when no changes have occurred - set to false to disable
+enabletilehash: true
+
+# Optional - hide ores: render as normal stone (so that they aren't revealed by maps)
+#hideores: true
+
+# Optional - enabled BetterGrass style rendering of grass and snow block sides
+#better-grass: true
+
+# Optional - enable smooth lighting by default on all maps supporting it (can be set per map as lighting option)
+smooth-lighting: true
+
+# Optional - use world provider lighting table (good for custom worlds with custom lighting curves, like nether)
+#   false=classic Dynmap lighting curve
+use-brightness-table: true
+
+# Optional - render specific block names using the textures and models of another block name: can be used to hide/disguise specific
+#  blocks (e.g. make ores look like stone, hide chests) or to provide simple support for rendering unsupported custom blocks
+block-alias:
+#    "minecraft:quartz_ore": "stone"
+#    "diamond_ore": "coal_ore"
+
+# Default image format for HDMaps (png, jpg, jpg-q75, jpg-q80, jpg-q85, jpg-q90, jpg-q95, jpg-q100, webp, webp-q75, webp-q80, webp-q85, webp-q90, webp-q95, webp-q100, webp-l),
+# Note: any webp format requires the presence of the 'webp command line tools' (cwebp, dwebp) (https://developers.google.com/speed/webp/download)
+#
+# Has no effect on maps with explicit format settings
+image-format: jpg-q90
+
+# If cwebp or dwebp are not on the PATH, use these settings to provide their full path.  Do not use these settings if the tools are on the PATH
+# For Windows, include .exe
+#
+#cwebpPath: /usr/bin/cwebp
+#dwebpPath: /usr/bin/dwebp
+
+#  use-generated-textures: if true, use generated textures (same as client); false is static water/lava textures
+#  correct-water-lighting: if true, use corrected water lighting (same as client); false is legacy water (darker)
+#  transparent-leaves: if true, leaves are transparent (lighting-wise): false is needed for some Spout versions that break lighting on leaf blocks
+use-generated-textures: true
+correct-water-lighting: true
+transparent-leaves: true
+
+# ctm-support: if true, Connected Texture Mod (CTM) in texture packs is enabled (default)
+ctm-support: true
+# custom-colors-support: if true, Custom Colors in texture packs is enabled (default)
+custom-colors-support: true
+
+# Control loading of player faces (if set to false, skins are never fetched)
+#fetchskins: false
+
+# Control updating of player faces, once loaded (if faces are being managed by other apps or manually)
+#refreshskins: false
+
+# Customize URL used for fetching player skins (%player% is macro for name, %uuid% for UUID)
+skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png"
+
+# Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south)
+#   default is 'newrose' (preserve pre-1.0 maps, rotate rose)
+#   'newnorth' is used to rotate maps and rose (requires fullrender of any HDMap map - same as 'newrose' for FlatMap or KzedMap)
+compass-mode: newnorth
+
+# Triggers for automatic updates : blockupdate-with-id is debug for breaking down updates by ID:meta
+# To disable, set just 'none' and comment/delete the rest
+render-triggers:
+  - blockupdate
+  #- blockupdate-with-id
+  - chunkgenerate
+  #- none
+
+# Title for the web page - if not specified, defaults to the server's name (unless it is the default of 'Unknown Server')
+#webpage-title: "My Awesome Server Map"
+
+# The path where the tile-files are placed.
+tilespath: web/tiles
+
+# The path where the web-files are located.
+webpath: web
+
+# If set to false, disable extraction of webpath content (good if using custom web UI or 3rd party web UI)
+# Note: web interface is unsupported in this configuration - you're on your own
+update-webpath-files: true
+
+# The path were the /dynmapexp command exports OBJ ZIP files
+exportpath: export
+
+# The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access).
+# If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified)
+#webserver-bindaddress: 0.0.0.0
+
+# The TCP-port the webserver will listen on.
+webserver-port: 8123
+
+# Maximum concurrent session on internal web server - limits resources used in Bukkit server
+max-sessions: 30
+
+# Disables Webserver portion of Dynmap (Advanced users only)
+disable-webserver: false
+
+# Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default))
+allow-symlinks: true
+
+# Enable login support
+login-enabled: false
+# Require login to access website (requires login-enabled: true)
+login-required: false
+
+# Period between tile renders for fullrender, in seconds (non-zero to pace fullrenders, lessen CPU load)
+timesliceinterval: 0.0
+
+# Maximum chunk loads per server tick (1/20th of a second) - reducing this below 90 will impact render performance, but also will reduce server thread load
+maxchunkspertick: 200
+
+# Progress report interval for fullrender/radiusrender, in tiles.  Must be 100 or greater
+progressloginterval: 100
+
+# Parallel fullrender: if defined, number of concurrent threads used for fullrender or radiusrender
+#   Note: setting this will result in much more intensive CPU use, some additional memory use.  Caution should be used when
+#  setting this to equal or exceed the number of physical cores on the system.
+#parallelrendercnt: 4
+
+# Interval the browser should poll for updates.
+updaterate: 2000
+
+# If nonzero, server will pause fullrender/radiusrender processing when 'fullrenderplayerlimit' or more users are logged in
+fullrenderplayerlimit: 0
+# If nonzero, server will pause update render processing when 'updateplayerlimit' or more users are logged in
+updateplayerlimit: 0
+# Target limit on server thread use - msec per tick
+per-tick-time-limit: 50
+# If TPS of server is below this setting, update renders processing is paused
+update-min-tps: 18.0
+# If TPS of server is below this setting, full/radius renders processing is paused
+fullrender-min-tps: 18.0
+# If TPS of server is below this setting, zoom out processing is paused
+zoomout-min-tps: 18.0
+
+showplayerfacesinmenu: true
+
+# Control whether players that are hidden or not on current map are grayed out (true=yes)
+grayplayerswhenhidden: true
+
+# Set sidebaropened: 'true' to pin menu sidebar opened permanently, 'pinned' to default the sidebar to pinned, but allow it to unpin
+#sidebaropened: true
+
+# Customized HTTP response headers - add 'id: value' pairs to all HTTP response headers (internal web server only)
+#http-response-headers:
+#    Access-Control-Allow-Origin: "my-domain.com"
+#    X-Custom-Header-Of-Mine: "MyHeaderValue"
+
+# Trusted proxies for web server - which proxy addresses are trusted to supply valid X-Forwarded-For fields
+#   This now supports both IP address, and subnet ranges (e.g. 192.168.1.0/24 or 202.24.0.0/14 )
+trusted-proxies:
+  - "127.0.0.1"
+  - "0:0:0:0:0:0:0:1"
+  
+joinmessage: "%playername% joined"
+quitmessage: "%playername% quit"
+spammessage: "You may only chat once every %interval% seconds."
+# format for messages from web: %playername% substitutes sender ID (typically IP), %message% includes text
+webmsgformat: "&color;2[WEB] %playername%: &color;f%message%"
+
+# Control whether layer control is presented on the UI (default is true)
+showlayercontrol: true
+
+# Enable checking for banned IPs via banned-ips.txt (internal web server only)
+check-banned-ips: true
+
+# Default selection when map page is loaded
+defaultzoom: 0
+defaultworld: world
+defaultmap: flat
+# (optional) Zoom level and map to switch to when following a player, if possible
+#followzoom: 3
+#followmap: surface
+
+# If true, make persistent record of IP addresses used by player logins, to support web IP to player matching
+persist-ids-by-ip: true
+
+# If true, map text to cyrillic
+cyrillic-support: false
+
+# Messages to customize
+msg:
+    maptypes: "Map Types"
+    players: "Players"
+    chatrequireslogin: "Chat Requires Login"
+    chatnotallowed: "You are not permitted to send chat messages"
+    hiddennamejoin: "Player joined"
+    hiddennamequit: "Player quit"
+
+# URL for client configuration (only need to be tailored for proxies or other non-standard configurations)
+url:
+    # configuration URL
+    #configuration: "up/configuration"
+    # update URL
+    #update: "up/world/{world}/{timestamp}"
+    # sendmessage URL
+    #sendmessage: "up/sendmessage"
+    # login URL
+    #login: "up/login"
+    # register URL
+    #register: "up/register"
+    # tiles base URL
+    #tiles: "tiles/"
+    # markers base URL
+    #markers: "tiles/"
+    # Snapshot cache size, in chunks
+snapshotcachesize: 500
+# Snapshot cache uses soft references (true), else weak references (false)
+soft-ref-cache: true
+
+# Player enter/exit title messages for map markers
+#
+# Processing period - how often to check player positions vs markers - default is 1000ms (1 second)
+#enterexitperiod: 1000
+# Title message fade in time, in ticks (0.05 second intervals) - default is 10 (1/2 second)
+#titleFadeIn: 10
+# Title message stay time, in ticks (0.05 second intervals) - default is 70 (3.5 seconds)
+#titleStay: 70
+# Title message fade out time, in ticks (0.05 seocnd intervals) - default is 20 (1 second)
+#titleFadeOut: 20
+# Enter/exit messages use on screen titles (true - default), if false chat messages are sent instead
+#enterexitUseTitle: true
+# Set true if new enter messages should supercede pending exit messages (vs being queued in order), default false
+#enterReplacesExits: true
+
+# Published public URL for Dynmap server (allows users to use 'dynmap url' command to get public URL usable to access server
+# If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
+#publicURL: http://my.greatserver.com/dynmap
+
+# Set to true to enable verbose startup messages - can help with debugging map configuration problems
+# Set to false for a much quieter startup log
+verbose: false
+
+# Enables debugging.
+#debuggers:
+#  - class: org.dynmap.debug.LogDebugger
+# Debug: dump blocks missing render data
+dump-missing-blocks: false
+
+# Log4J defense: string substituted for attempts to use macros in web chat
+hackAttemptBlurb: "(IaM5uchA1337Haxr-Ban Me!)"

fabric-1.20.2/src/main/resources/dynmap.accesswidener

@@ -0,0 +1,3 @@
+accessWidener	v1	named
+accessible   class   net/minecraft/world/biome/Biome$Weather
+accessible   field   net/minecraft/world/biome/Biome            weather     Lnet/minecraft/world/biome/Biome$Weather;

fabric-1.20.2/src/main/resources/dynmap.mixins.json

@@ -0,0 +1,19 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "org.dynmap.fabric_1_20_2.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+    "BiomeEffectsAccessor",
+    "MinecraftServerMixin",
+    "PlayerManagerMixin",
+    "ProtoChunkMixin",
+    "ServerPlayerEntityMixin",
+    "ServerPlayNetworkHandlerMixin",
+    "ThreadedAnvilChunkStorageMixin",
+    "WorldChunkMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

fabric-1.20.2/src/main/resources/fabric.mod.json

@@ -0,0 +1,34 @@
+{
+  "schemaVersion": 1,
+  "id": "dynmap",
+  "version": "${version}",
+  "name": "Dynmap",
+  "description": "Dynamic, Google-maps style rendered maps for your Minecraft server",
+  "authors": [
+    "mikeprimm",
+    "LolHens",
+    "i509VCB"
+  ],
+  "contact": {
+    "homepage": "https://github.com/webbukkit/dynmap",
+    "sources": "https://github.com/webbukkit/dynmap"
+  },
+  "license": "Apache-2.0",
+  "icon": "assets/dynmap/icon.png",
+  "environment": "*",
+  "entrypoints": {
+    "main": [
+      "org.dynmap.fabric_1_20_2.DynmapMod"
+    ]
+  },
+  "mixins": [
+    "dynmap.mixins.json"
+  ],
+  "accessWidener" : "dynmap.accesswidener",
+
+  "depends": {
+    "fabricloader": ">=0.14.21",
+    "fabric": ">=0.89.0",
+    "minecraft": ["1.20.2"]
+  }
+}

fabric-1.20.2/src/main/resources/permissions.yml.example

@@ -0,0 +1,27 @@
+#
+# Sample permissions.yml for dynmap - trivial, flat-file based permissions for dynmap features
+# To use, copy this file to dynmap/permissions.yml, and edit appropriate.  File is YAML format.
+#
+# All operators have full permissions to all functions.
+# All users receive the permissions under the 'defaultuser' section
+# Specific users can be given more permissions by defining a section with their name containing their permisssions
+#   All permissions correspond to those documented here (https://github.com/webbukkit/dynmap/wiki/Permissions), but
+#  do NOT have the 'dynmap.' prefix when used here (e.g. 'dynmap.fullrender' permission is just 'fullrender' here).
+#
+defaultuser:
+  - render
+  - show.self
+  - hide.self
+  - sendtoweb
+  - stats
+  - marker.list
+  - marker.listsets
+  - marker.icons
+  - webregister
+  - webchat
+  #- marker.sign
+
+#playername1:
+#  - fullrender
+#  - cancelrender
+#  - radiusrender

forge-1.20.2/.gitignore

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

forge-1.20.2/bin/.gitignore

@@ -0,0 +1,2 @@
+/main/
+/test/

forge-1.20.2/build.gradle

@@ -0,0 +1,92 @@
+buildscript {
+    repositories {
+        maven { url = 'https://files.minecraftforge.net/maven' }
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+    }
+}
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'eclipse'
+
+eclipse {
+    project {
+        name = "Dynmap(Forge-1.20.2)"
+    }
+}
+
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+
+ext.buildNumber = System.getenv().BUILD_NUMBER ?: "Dev"
+
+minecraft {
+    mappings channel: 'official', version: '1.20.2'
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    runs {
+        server {
+            workingDirectory project.file('run').canonicalPath
+        }
+    }
+}
+
+project.archivesBaseName = "${project.archivesBaseName}-forge-1.20.2"
+
+dependencies {
+    implementation project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ':DynmapCoreAPI')
+    
+    minecraft 'net.minecraftforge:forge:1.20.2-48.0.1'
+}
+
+processResources
+{
+    filesMatching('META-INF/mods.toml') {
+        // replace version and mcversion
+        expand(
+        	version: project.version + '-' + project.ext.buildNumber,
+        	mcversion: "1.20.2"
+    	)
+    }
+}
+
+shadowJar {
+    dependencies {
+        include(dependency(':DynmapCore'))
+        include(dependency("commons-codec:commons-codec:"))
+        exclude("META-INF/maven/**")
+        exclude("META-INF/services/**")
+    }
+	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_20_2.commons.codec')
+    
+    archiveName = "Dynmap-${parent.version}-forge-1.20.2.jar"
+    destinationDir = file '../target'
+}
+
+shadowJar.doLast {
+    task ->
+        ant.checksum file: task.archivePath
+}
+
+afterEvaluate {
+reobf {
+    shadowJar {
+        mappings = createMcpToSrg.output
+    }
+}
+}
+
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
+
+artifacts {
+    archives deobfJar
+}
+
+build.dependsOn(shadowJar)

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/ClientProxy.java

@@ -0,0 +1,6 @@
+package org.dynmap.forge_1_20_2;
+
+public class ClientProxy extends Proxy {
+	public ClientProxy() {
+	}
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/DynmapMod.java

@@ -0,0 +1,135 @@
+package org.dynmap.forge_1_20_2;
+
+import java.io.File;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.dynmap.DynmapCommonAPI;
+import org.dynmap.DynmapCommonAPIListener;
+import org.dynmap.Log;
+import org.dynmap.forge_1_20_2.DynmapPlugin.OurLog;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.server.ServerAboutToStartEvent;
+import net.minecraftforge.event.server.ServerStartedEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.event.server.ServerStoppingEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.IExtensionPoint;
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.StartupMessageManager;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+
+@Mod("dynmap")
+public class DynmapMod
+{
+    // The instance of your mod that Forge uses.
+    public static DynmapMod instance;
+
+    // Says where the client and server 'proxy' code is loaded.
+    public static Proxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> Proxy::new);
+    
+    public static DynmapPlugin plugin;
+    public static File jarfile;
+    public static String ver;
+    public static boolean useforcedchunks;
+
+    public class APICallback extends DynmapCommonAPIListener {
+        @Override
+        public void apiListenerAdded() {
+            if(plugin == null) {
+                plugin = proxy.startServer(server);
+            }
+        }
+        @Override
+        public void apiEnabled(DynmapCommonAPI api) {
+        }
+    } 
+    
+    //TODO
+    //public class LoadingCallback implements net.minecraftforge.common.ForgeChunkManager.LoadingCallback {
+    //    @Override
+    //    public void ticketsLoaded(List<Ticket> tickets, World world) {
+    //        if(tickets.size() > 0) {
+    //            DynmapPlugin.setBusy(world, tickets.get(0));
+    //            for(int i = 1; i < tickets.size(); i++) {
+    //                ForgeChunkManager.releaseTicket(tickets.get(i));
+    //            }
+    //        }
+    //    }
+    //}
+
+    public DynmapMod() {
+    	instance = this;
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
+
+        MinecraftForge.EVENT_BUS.register(this);
+
+        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, 
+        		()->new IExtensionPoint.DisplayTest(()->IExtensionPoint.DisplayTest.IGNORESERVERONLY, (remote, isServer)-> true));
+
+        Log.setLogger(new OurLog());      
+        org.dynmap.modsupport.ModSupportImpl.init();
+    }
+    
+    public void setup(final FMLCommonSetupEvent event)
+    {
+    	//TOOO
+        jarfile = ModList.get().getModFileById("dynmap").getFile().getFilePath().toFile();
+
+        ver = ModList.get().getModContainerById("dynmap").get().getModInfo().getVersion().toString();
+
+        //// Load configuration file - use suggested (config/WesterosBlocks.cfg)
+        //Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
+        //try {
+        //    cfg.load();
+        //    
+        //    useforcedchunks = cfg.get("Settings",  "UseForcedChunks", true).getBoolean(true);
+        //}
+        //finally
+        //{
+        //    cfg.save();
+        //}
+    }
+
+    public void init(FMLLoadCompleteEvent event)
+    {
+        /* Set up for chunk loading notice from chunk manager */
+    	//TODO
+        //if(useforcedchunks) {
+        //    ForgeChunkManager.setForcedChunkLoadingCallback(DynmapMod.instance, new LoadingCallback());
+        //}
+        //else {
+        //    Log.info("[Dynmap] World loading using forced chunks is disabled");
+        //}
+    }
+
+    private MinecraftServer server;
+    
+    @SubscribeEvent
+    public void onServerStarting(ServerAboutToStartEvent event) {
+        server = event.getServer();
+        if(plugin == null)
+            plugin = proxy.startServer(server);
+		plugin.onStarting(server.getCommands().getDispatcher());
+	}
+    
+    @SubscribeEvent
+    public void onServerStarted(ServerStartedEvent event) {
+        DynmapCommonAPIListener.register(new APICallback()); 
+        plugin.serverStarted();
+    }
+
+    @SubscribeEvent
+    public void serverStopping(ServerStoppingEvent event)
+    {
+    	proxy.stopServer(plugin);
+    	plugin = null;
+    }
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/ForgeMapChunkCache.java

@@ -0,0 +1,109 @@
+package org.dynmap.forge_1_20_2;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSpecialEffects;
+import org.dynmap.DynmapChunk;
+import org.dynmap.Log;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.common.chunk.GenericChunk;
+import org.dynmap.common.chunk.GenericChunkCache;
+import org.dynmap.common.chunk.GenericMapChunkCache;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.chunk.storage.ChunkSerializer;
+
+/**
+ * Container for managing chunks - dependent upon using chunk snapshots, since
+ * rendering is off server thread
+ */
+public class ForgeMapChunkCache extends GenericMapChunkCache {
+	private ServerLevel w;
+	private ServerChunkCache cps;
+	/**
+	 * Construct empty cache
+	 */
+	public ForgeMapChunkCache(GenericChunkCache cc) {
+		super(cc);
+	}
+
+	// Load generic chunk from existing and already loaded chunk
+	protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
+		GenericChunk gc = null;
+		ChunkAccess ch = cps.getChunk(chunk.x, chunk.z, ChunkStatus.FULL, false);
+		if (ch != null) {
+			CompoundTag nbt = ChunkSerializer.write(w, ch);
+			if (nbt != null) {
+				gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
+			}
+		}
+		return gc;
+	}
+	// Load generic chunk from unloaded chunk
+	protected GenericChunk loadChunk(DynmapChunk chunk) {
+		GenericChunk gc = null;
+		CompoundTag nbt = readChunk(chunk.x, chunk.z);
+		// If read was good
+		if (nbt != null) {
+			gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
+		}
+		return gc;
+	}
+
+	public void setChunks(ForgeWorld dw, List<DynmapChunk> chunks) {
+		this.w = dw.getWorld();
+		if (dw.isLoaded()) {
+			/* Check if world's provider is ServerChunkProvider */
+			cps = this.w.getChunkSource();
+		}
+		super.setChunks(dw, chunks);
+	}
+
+	private CompoundTag readChunk(int x, int z) {
+		try {
+			CompoundTag rslt = cps.chunkMap.read(new ChunkPos(x, z)).join().get();
+			if (rslt != null) {
+				CompoundTag lev = rslt;
+				if (lev.contains("Level")) {
+					lev = lev.getCompound("Level");
+				}
+				// Don't load uncooked chunks
+				String stat = lev.getString("Status");
+				ChunkStatus cs = ChunkStatus.byName(stat);
+				if ((stat == null) ||
+				// Needs to be at least lighted
+						(!cs.isOrAfter(ChunkStatus.LIGHT))) {
+					rslt = null;
+				}
+			}
+			// Log.info(String.format("loadChunk(%d,%d)=%s", x, z, (rslt != null) ?
+			// rslt.toString() : "null"));
+			return rslt;
+		} catch (NoSuchElementException nsex) {
+			return null;
+		} catch (Exception exc) {
+			Log.severe(String.format("Error reading chunk: %s,%d,%d", dw.getName(), x, z), exc);
+			return null;
+		}
+	}
+	@Override
+	public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
+		return bm.<Biome>getBiomeObject().map(Biome::getSpecialEffects)
+				.flatMap(BiomeSpecialEffects::getFoliageColorOverride)
+				.orElse(colormap[bm.biomeLookup()]);
+	}
+
+	@Override
+	public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
+		BiomeSpecialEffects effects = bm.<Biome>getBiomeObject().map(Biome::getSpecialEffects).orElse(null);
+		if (effects == null) return colormap[bm.biomeLookup()];
+		return effects.getGrassColorModifier().modifyColor(x, z, effects.getGrassColorOverride().orElse(colormap[bm.biomeLookup()]));
+	}
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/ForgeWorld.java

@@ -0,0 +1,249 @@
+package org.dynmap.forge_1_20_2;
+/**
+ * Forge specific implementation of DynmapWorld
+ */
+import java.util.List;
+
+import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LightLayer;
+
+import org.dynmap.DynmapChunk;
+import org.dynmap.DynmapLocation;
+import org.dynmap.DynmapWorld;
+import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.Polygon;
+
+public class ForgeWorld extends DynmapWorld
+{
+    private ServerLevelAccessor world;
+    private final boolean skylight;
+    private final boolean isnether;
+    private final boolean istheend;
+    private final String env;
+    private DynmapLocation spawnloc = new DynmapLocation();
+    private static int maxWorldHeight = 320;    // Maximum allows world height
+    
+    public static int getMaxWorldHeight() {
+        return maxWorldHeight;
+    }
+    public static void setMaxWorldHeight(int h) {
+        maxWorldHeight = h;
+    }
+
+    public static String getWorldName(ServerLevelAccessor w) {
+        ResourceKey<Level> rk = w.getLevel().dimension();
+    	String id = rk.location().getNamespace() + "_" + rk.location().getPath();
+    	if (id.equals("minecraft_overworld")) {	// Overworld?
+            return w.getLevel().serverLevelData.getLevelName();
+    	}
+    	else if (id.equals("minecraft_the_end")) {
+    		return "DIM1";
+    	}
+    	else if (id.equals("minecraft_the_nether")) {
+    		return "DIM-1";
+    	}
+    	else {
+    		return id;
+    	}
+    }
+
+    public void updateWorld(ServerLevelAccessor w) {
+    	this.updateWorldHeights(w.getLevel().getHeight(), w.getLevel().dimensionType().minY(), w.getLevel().getSeaLevel());
+    }
+
+    public ForgeWorld(ServerLevelAccessor w)
+    {
+        this(getWorldName(w), 
+        	w.getLevel().getHeight(), 
+    		w.getLevel().getSeaLevel(), 
+    		w.getLevel().dimension() == Level.NETHER,
+    		w.getLevel().dimension() == Level.END,
+			getWorldName(w),
+			w.getLevel().dimensionType().minY());
+        setWorldLoaded(w);
+    }
+    public ForgeWorld(String name, int height, int sealevel, boolean nether, boolean the_end, String deftitle, int miny)
+    {
+        super(name, (height > maxWorldHeight)?maxWorldHeight:height, sealevel, miny);
+        world = null;
+        setTitle(deftitle);
+        isnether = nether;
+        istheend = the_end;
+        skylight = !(isnether || istheend);
+
+        if (isnether)
+        {
+            env = "nether";
+        }
+        else if (istheend)
+        {
+            env = "the_end";
+        }
+        else
+        {
+            env = "normal";
+        }
+        //Log.info(getName() + ": skylight=" + skylight + ", height=" + this.worldheight + ", isnether=" + isnether + ", istheend=" + istheend);
+    }
+    /* Test if world is nether */
+    @Override
+    public boolean isNether()
+    {
+        return isnether;
+    }
+    public boolean isTheEnd()
+    {
+        return istheend;
+    }
+    /* Get world spawn location */
+    @Override
+    public DynmapLocation getSpawnLocation()
+    {
+    	if(world != null) {
+    		BlockPos p = world.getLevel().getSharedSpawnPos();
+    		spawnloc.x = p.getX();
+    		spawnloc.y = p.getY();
+    		spawnloc.z = p.getZ();
+    		spawnloc.world = this.getName();
+    	}
+        return spawnloc;
+    }
+    /* Get world time */
+    @Override
+    public long getTime()
+    {
+    	if(world != null)
+    		return world.getLevel().getDayTime();
+    	else
+    		return -1;
+    }
+    /* World is storming */
+    @Override
+    public boolean hasStorm()
+    {
+    	if(world != null)
+    		return world.getLevel().isRaining();
+    	else
+    		return false;
+    }
+    /* World is thundering */
+    @Override
+    public boolean isThundering()
+    {
+    	if(world != null)
+    		return world.getLevel().isThundering();
+    	else
+    		return false;
+    }
+    /* World is loaded */
+    @Override
+    public boolean isLoaded()
+    {
+        return (world != null);
+    }
+    /* Set world to unloaded */
+    @Override
+    public void setWorldUnloaded() 
+    {
+    	getSpawnLocation();
+    	world = null;
+    }
+    /* Set world to loaded */
+    public void setWorldLoaded(ServerLevelAccessor w) {
+    	world = w;
+    	this.sealevel = w.getLevel().getSeaLevel();   // Read actual current sealevel from world
+    	// Update lighting table
+    	for (int i = 0; i < 16; i++) {
+            // Algorithm based on LightmapTextureManager.getBrightness()
+            // We can't call that method because it's client-only.
+            // This means the code below can stop being correct if Mojang ever
+            // updates the curve; in that case we should reflect the changes.
+            float value = (float) i / 15.0f;
+            float brightness = value / (4.0f - 3.0f * value);
+            this.setBrightnessTableEntry(i, brightness);
+    	    //Log.info(getName() + ": light " + i + " = " + light);
+    	}
+    }
+    /* Get light level of block */
+    @Override
+    public int getLightLevel(int x, int y, int z)
+    {
+    	if(world != null)
+    		return world.getLevel().getLightEngine().getRawBrightness(new BlockPos(x,  y,  z), 0);
+    	else
+    		return -1;
+    }
+    /* Get highest Y coord of given location */
+    @Override
+    public int getHighestBlockYAt(int x, int z)
+    {
+    	if(world != null) {
+            return world.getLevel().getChunk(x >> 4, z >> 4).getHeight(Heightmap.Types.MOTION_BLOCKING, x & 15, z & 15);
+    	}
+    	else
+    		return -1;
+    }
+    /* Test if sky light level is requestable */
+    @Override
+    public boolean canGetSkyLightLevel()
+    {
+        return skylight;
+    }
+    /* Return sky light level */
+    @Override
+    public int getSkyLightLevel(int x, int y, int z)
+    {
+    	if(world != null) {
+    		return world.getLevel().getBrightness(LightLayer.SKY, new BlockPos(x, y, z));
+    	}
+    	else
+    		return -1;
+    }
+    /**
+     * Get world environment ID (lower case - normal, the_end, nether)
+     */
+    @Override
+    public String getEnvironment()
+    {
+        return env;
+    }
+    /**
+     * Get map chunk cache for world
+     */
+    @Override
+    public MapChunkCache getChunkCache(List<DynmapChunk> chunks)
+    {
+    	if (world != null) {
+    		ForgeMapChunkCache c = new ForgeMapChunkCache(DynmapPlugin.plugin.sscache);
+    		c.setChunks(this, chunks);
+    		return c;
+    	}
+    	return null;
+    }
+
+    public ServerLevel getWorld()
+    {
+        return world.getLevel();
+    }
+    @Override
+    public Polygon getWorldBorder() {
+        if (world != null) {
+            WorldBorder wb = world.getWorldBorder();
+            if ((wb != null) && (wb.getSize() < 5.9E7)) {
+                Polygon p = new Polygon();
+                p.addVertex(wb.getMinX(), wb.getMinZ());
+                p.addVertex(wb.getMinX(), wb.getMaxZ());
+                p.addVertex(wb.getMaxX(), wb.getMaxZ());
+                p.addVertex(wb.getMaxX(), wb.getMinZ());
+                return p;
+            }
+        }
+        return null;
+    }
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/NBT.java

@@ -0,0 +1,126 @@
+package org.dynmap.forge_1_20_2;
+
+import org.dynmap.common.chunk.GenericBitStorage;
+import org.dynmap.common.chunk.GenericNBTCompound;
+import org.dynmap.common.chunk.GenericNBTList;
+
+import java.util.Set;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.util.SimpleBitStorage;
+
+public class NBT {
+
+	public static class NBTCompound implements GenericNBTCompound {
+		private final CompoundTag obj;
+		public NBTCompound(CompoundTag t) {
+			this.obj = t;
+		}
+		@Override
+		public Set<String> getAllKeys() {
+			return obj.getAllKeys();
+		}
+		@Override
+		public boolean contains(String s) {
+			return obj.contains(s);
+		}
+		@Override
+		public boolean contains(String s, int i) {
+			return obj.contains(s, i);
+		}
+		@Override
+		public byte getByte(String s) {
+			return obj.getByte(s);
+		}
+		@Override
+		public short getShort(String s) {
+			return obj.getShort(s);
+		}
+		@Override
+		public int getInt(String s) {
+			return obj.getInt(s);
+		}
+		@Override
+		public long getLong(String s) {
+			return obj.getLong(s);
+		}
+		@Override
+		public float getFloat(String s) {
+			return obj.getFloat(s);
+		}
+		@Override
+		public double getDouble(String s) {
+			return obj.getDouble(s);
+		}
+		@Override
+		public String getString(String s) {
+			return obj.getString(s);
+		}
+		@Override
+		public byte[] getByteArray(String s) {
+			return obj.getByteArray(s);
+		}
+		@Override
+		public int[] getIntArray(String s) {
+			return obj.getIntArray(s);
+		}
+		@Override
+		public long[] getLongArray(String s) {
+			return obj.getLongArray(s);
+		}
+		@Override
+		public GenericNBTCompound getCompound(String s) {
+			return new NBTCompound(obj.getCompound(s));
+		}
+		@Override
+		public GenericNBTList getList(String s, int i) {
+			return new NBTList(obj.getList(s, i));
+		}
+		@Override
+		public boolean getBoolean(String s) {
+			return obj.getBoolean(s);
+		}
+		@Override
+		public String getAsString(String s) {
+			return obj.get(s).getAsString();
+		}
+		@Override
+		public GenericBitStorage makeBitStorage(int bits, int count, long[] data) {
+			return new OurBitStorage(bits, count, data);
+		}		
+		public String toString() {
+			return obj.toString();
+		}
+	}
+	public static class NBTList implements GenericNBTList {
+		private final ListTag obj;
+		public NBTList(ListTag t) {
+			obj = t;
+		}
+		@Override
+		public int size() {
+			return obj.size();
+		}
+		@Override
+		public String getString(int idx) {
+			return obj.getString(idx);
+		}
+		@Override
+		public GenericNBTCompound getCompound(int idx) {
+			return new NBTCompound(obj.getCompound(idx));
+		}
+		public String toString() {
+			return obj.toString();
+		}
+	}
+	public static class OurBitStorage implements GenericBitStorage {
+		private final SimpleBitStorage bs;
+		public OurBitStorage(int bits, int count, long[] data) {
+			bs = new SimpleBitStorage(bits, count, data);
+		}
+		@Override
+		public int get(int idx) {
+			return bs.get(idx);
+		}
+	}
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/Proxy.java

@@ -0,0 +1,24 @@
+package org.dynmap.forge_1_20_2;
+
+import net.minecraft.server.MinecraftServer;
+
+/**
+ * Server side proxy - methods for creating and cleaning up plugin
+ */
+public class Proxy
+{
+    public Proxy()
+    {
+    }
+	public DynmapPlugin startServer(MinecraftServer srv) {
+	    DynmapPlugin plugin = DynmapPlugin.plugin; 
+	    if (plugin == null) {
+	        plugin = new DynmapPlugin(srv);
+	        plugin.onEnable();
+	    }
+		return plugin;
+	}
+	public void stopServer(DynmapPlugin plugin) {
+		plugin.onDisable();
+	}
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/VersionCheck.java

@@ -0,0 +1,97 @@
+package org.dynmap.forge_1_20_2;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.dynmap.DynmapCore;
+import org.dynmap.Log;
+
+public class VersionCheck {
+    private static final String VERSION_URL = "http://mikeprimm.com/dynmap/releases.php";
+    public static void runCheck(final DynmapCore core) {
+        new Thread(new Runnable() {
+            public void run() {
+                doCheck(core);
+            }
+        }).start();
+    }
+    
+    private static int getReleaseVersion(String s) {
+        int index = s.lastIndexOf('-');
+        if(index < 0)
+            index = s.lastIndexOf('.');
+        if(index >= 0)
+            s = s.substring(0, index);
+        String[] split = s.split("\\.");
+        int v = 0;
+        try {
+            for(int i = 0; (i < split.length) && (i < 3); i++) {
+                v += Integer.parseInt(split[i]) << (8 * (2 - i)); 
+            }
+        } catch (NumberFormatException nfx) {}
+        return v;
+    }
+    
+    private static int getBuildNumber(String s) {
+        int index = s.lastIndexOf('-');
+        if(index < 0)
+            index = s.lastIndexOf('.');
+        if(index >= 0)
+            s = s.substring(index+1);
+        try {
+            return Integer.parseInt(s);
+        } catch (NumberFormatException nfx) {
+            return 99999999;
+        }
+    }
+    
+    private static void doCheck(DynmapCore core) {
+        String pluginver = core.getDynmapPluginVersion();
+        String platform = core.getDynmapPluginPlatform();
+        String platver = core.getDynmapPluginPlatformVersion();
+        if((pluginver == null) || (platform == null) || (platver == null))
+            return;
+        HttpURLConnection conn = null;
+        String loc = VERSION_URL;
+        int cur_ver = getReleaseVersion(pluginver);
+        int cur_bn = getBuildNumber(pluginver);
+        try {
+            while((loc != null) && (!loc.isEmpty())) {
+                URL url = new URL(loc);
+                conn = (HttpURLConnection) url.openConnection();
+                conn.setRequestProperty("User-Agent", "Dynmap (" + platform + "/" + platver + "/" + pluginver);
+                conn.connect();
+                loc = conn.getHeaderField("Location");
+            }
+            BufferedReader rdr = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String line = null;
+            while((line = rdr.readLine()) != null) {
+                String[] split = line.split(":");
+                if(split.length < 4) continue;
+                /* If our platform and version, or wildcard platform version */
+                if(split[0].equals(platform) && (split[1].equals("*") || split[1].equals(platver))) {
+                    int recommended_ver = getReleaseVersion(split[2]);
+                    int recommended_bn = getBuildNumber(split[2]);
+                    if((recommended_ver > cur_ver) || ((recommended_ver == cur_ver) && (recommended_bn > cur_bn)))  { /* Newer recommended build */
+                        Log.info("Version obsolete: new recommended version " + split[2] + " is available.");
+                    }
+                    else if(cur_ver > recommended_ver) {    /* Running dev or prerelease? */
+                        int prerel_ver = getReleaseVersion(split[3]);
+                        int prerel_bn = getBuildNumber(split[3]);
+                        if((prerel_ver > cur_ver) || ((prerel_ver == cur_ver) && (prerel_bn > cur_bn))) {
+                            Log.info("Version obsolete: new prerelease version " + split[3] + " is available.");
+                        }
+                    }
+                }
+            }
+        } catch (Exception x) {
+            Log.info("Error checking for latest version");
+        } finally {
+            if(conn != null) {
+                conn.disconnect();
+            }
+        }
+    }
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/permissions/FilePermissions.java

@@ -0,0 +1,103 @@
+package org.dynmap.forge_1_20_2.permissions;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.dynmap.ConfigurationNode;
+import org.dynmap.Log;
+import org.dynmap.forge_1_20_2.DynmapPlugin;
+
+import net.minecraft.server.level.ServerPlayer;
+
+public class FilePermissions implements PermissionProvider {
+    private HashMap<String, Set<String>> perms;
+    private Set<String> defperms;
+    
+    public static FilePermissions create() {
+        File f = new File("dynmap/permissions.yml");
+        if(!f.exists())
+            return null;
+        ConfigurationNode cfg = new ConfigurationNode(f);
+        cfg.load();
+        
+        Log.info("Using permissions.yml for access control");
+        
+        return new FilePermissions(cfg);
+    }
+    
+    private FilePermissions(ConfigurationNode cfg) {
+        perms = new HashMap<String,Set<String>>();
+        for(String k : cfg.keySet()) {
+            List<String> p = cfg.getStrings(k, null);
+            if(p != null) {
+                k = k.toLowerCase();
+                HashSet<String> pset = new HashSet<String>();
+                for(String perm : p) {
+                    pset.add(perm.toLowerCase());
+                }
+                perms.put(k,  pset);
+                if(k.equals("defaultuser")) {
+                    defperms = pset;
+                }
+            }
+        }
+    }
+
+    private boolean hasPerm(String player, String perm) {
+        Set<String> ps = perms.get(player);
+        if((ps != null) && (ps.contains(perm))) {
+            return true;
+        }
+        if(defperms.contains(perm)) {
+            return true;
+        }
+        return false;
+    }
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        player = player.toLowerCase();
+        HashSet<String> rslt = new HashSet<String>();
+        if(DynmapPlugin.plugin.isOp(player)) {
+            rslt.addAll(perms);
+        }
+        else {
+            for(String p : perms) {
+                if(hasPerm(player, p)) {
+                    rslt.add(p);
+                }
+            }
+        }
+        return rslt;
+    }
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        player = player.toLowerCase();
+        if(DynmapPlugin.plugin.isOp(player)) {
+            return true;
+        }
+        else {
+            return hasPerm(player, perm);
+        }
+    }
+
+    @Override
+    public boolean has(ServerPlayer psender, String permission) {
+        if(psender != null) {
+        	String n = psender.getName().getString().toLowerCase();
+            return hasPerm(n, permission);
+        }
+        return true;
+    }
+    @Override
+    public boolean hasPermissionNode(ServerPlayer psender, String permission) {
+        if(psender != null) {
+            String player = psender.getName().getString().toLowerCase();
+            return DynmapPlugin.plugin.isOp(player);
+        }
+        return false;
+    } 
+
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/permissions/OpPermissions.java

@@ -0,0 +1,51 @@
+package org.dynmap.forge_1_20_2.permissions;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.dynmap.Log;
+import org.dynmap.forge_1_20_2.DynmapPlugin;
+
+import net.minecraft.server.level.ServerPlayer;
+
+public class OpPermissions implements PermissionProvider {
+    public HashSet<String> usrCommands = new HashSet<String>();
+
+    public OpPermissions(String[] usrCommands) {
+        for (String usrCommand : usrCommands) {
+            this.usrCommands.add(usrCommand);
+        }
+        Log.info("Using ops.txt for access control");
+    }
+
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        HashSet<String> rslt = new HashSet<String>();
+        if(DynmapPlugin.plugin.isOp(player)) {
+            rslt.addAll(perms);
+        }
+        return rslt;
+    }
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        return DynmapPlugin.plugin.isOp(player);
+    }
+
+    @Override
+    public boolean has(ServerPlayer psender, String permission) {
+        if(psender != null) {
+            if(usrCommands.contains(permission)) {
+                return true;
+            }
+            return DynmapPlugin.plugin.isOp(psender.getName().getString());
+        }
+        return true;
+    }
+    @Override
+    public boolean hasPermissionNode(ServerPlayer psender, String permission) {
+        if(psender != null) {
+            return DynmapPlugin.plugin.isOp(psender.getName().getString());
+        }
+        return true;
+    } 
+}

forge-1.20.2/src/main/java/org/dynmap/forge_1_20_2/permissions/PermissionProvider.java

@@ -0,0 +1,15 @@
+package org.dynmap.forge_1_20_2.permissions;
+
+import java.util.Set;
+
+import net.minecraft.server.level.ServerPlayer;
+
+public interface PermissionProvider {
+    boolean has(ServerPlayer sender, String permission);
+    boolean hasPermissionNode(ServerPlayer sender, String permission); 
+    
+    Set<String> hasOfflinePermissions(String player, Set<String> perms);
+
+    boolean hasOfflinePermission(String player, String perm);
+
+}

forge-1.20.2/src/main/resources/META-INF/accesstransformer.cfg

@@ -0,0 +1,4 @@
+public net.minecraft.world.level.biome.BiomeSpecialEffects$Builder f_47928_ # waterColor
+public net.minecraft.server.level.ServerLevel f_8549_ # serverLevelData
+public net.minecraft.server.level.ChunkMap f_140130_ # visibleChunkMap
+public net.minecraft.server.level.ChunkMap m_214963_(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture; # readChunk(