.github/workflows/gibberish.txt

@@ -59,4 +59,3 @@ ForgeGradle
 Kosma
 Kosma's
 DEV
-Modrinth

DynmapCore/build.gradle

@@ -19,13 +19,11 @@ dependencies {
     implementation 'org.yaml:snakeyaml:1.23'	// DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
     implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
     implementation 'org.postgresql:postgresql:42.2.18'
-    implementation 'io.github.linktosriram.s3lite:core:0.0.2-SNAPSHOT'
-    implementation 'io.github.linktosriram.s3lite:api:0.0.2-SNAPSHOT'
-    implementation 'io.github.linktosriram.s3lite:http-client-url-connection:0.0.2-SNAPSHOT'
-    implementation 'io.github.linktosriram.s3lite:http-client-spi:0.0.2-SNAPSHOT'
-    implementation 'io.github.linktosriram.s3lite:util:0.0.2-SNAPSHOT'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
-    implementation 'com.sun.xml.bind:jaxb-impl:3.0.0'
+    implementation 'io.github.linktosriram:s3-lite-core:0.2.0'
+    implementation 'io.github.linktosriram:s3-lite-api:0.2.0'
+    implementation 'io.github.linktosriram:s3-lite-http-client-url-connection:0.2.0'
+    implementation 'io.github.linktosriram:s3-lite-http-client-spi:0.2.0'
+    implementation 'io.github.linktosriram:s3-lite-util:0.2.0'
 }
 
 processResources {
@@ -48,7 +46,7 @@ processResources {
 }
 
 jar {
-   archiveClassifier = 'unshaded'
+   classifier = 'unshaded'
 }
 
 shadowJar {
@@ -60,13 +58,11 @@ shadowJar {
         include(dependency('org.eclipse.jetty::'))
         include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
         include(dependency('org.postgresql:postgresql:'))
-        include(dependency('io.github.linktosriram.s3lite:core:'))
-        include(dependency('io.github.linktosriram.s3lite:api:'))
-        include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:'))
-        include(dependency('io.github.linktosriram.s3lite:http-client-spi:'))
-        include(dependency('io.github.linktosriram.s3lite:util:'))
-        include(dependency('jakarta.xml.bind::'))
-        include(dependency('com.sun.xml.bind::'))
+        include(dependency('io.github.linktosriram:s3-lite-core:'))
+        include(dependency('io.github.linktosriram:s3-lite-api:'))
+        include(dependency('io.github.linktosriram:s3-lite-http-client-url-connection:'))
+        include(dependency('io.github.linktosriram:s3-lite-http-client-spi:'))
+	    include(dependency('io.github.linktosriram:s3-lite-util:'))
         include(dependency(':DynmapCoreAPI'))
         exclude("META-INF/maven/**")
         exclude("META-INF/services/**")
@@ -79,8 +75,8 @@ shadowJar {
 	relocate('org.postgresql', 'org.dynmap.org.postgresql')
 	relocate('io.github.linktosriram.s3lite', 'org.dynmap.s3lite')    
 	
-    destinationDirectory = file '../target'
-    archiveClassifier = ''
+    destinationDir = file '../target'
+    classifier = ''
 }
 
 artifacts {

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

@@ -12,7 +12,6 @@ public class ClientUpdateComponent extends Component {
     private int hideifshadow;
     private int hideifunder;
     private boolean hideifsneaking;
-    private boolean hideifspectator;
     private boolean hideifinvisiblepotion;
     private boolean is_protected;
     public static boolean usePlayerColors;
@@ -25,7 +24,6 @@ public class ClientUpdateComponent extends Component {
         hideifshadow = configuration.getInteger("hideifshadow", 15);
         hideifunder = configuration.getInteger("hideifundercover", 15);
         hideifsneaking = configuration.getBoolean("hideifsneaking", false);
-        hideifspectator = configuration.getBoolean("hideifspectator", false);
         hideifinvisiblepotion = configuration.getBoolean("hide-if-invisiblity-potion", true);
         is_protected = configuration.getBoolean("protected-player-info", false);
         usePlayerColors = configuration.getBoolean("use-name-colors", false);
@@ -102,9 +100,6 @@ public class ClientUpdateComponent extends Component {
             if((!hide) && hideifsneaking && p.isSneaking()) {
                 hide = true;
             }
-            if((!hide) && hideifspectator && p.isSpectator()) {
-                hide = true;
-            }
             if((!hide) && is_protected && (!see_all)) {
                 if(e.user != null) {
                     hide = !core.testIfPlayerVisibleToPlayer(e.user, p.getName());

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

@@ -164,7 +164,6 @@ public class DynmapCore implements DynmapCommonAPI {
     private File dataDirectory;
     private File tilesDirectory;
     private File exportDirectory;
-    private File importDirectory;
     private String plugin_ver;
     private MapStorage defaultStorage;
     
@@ -225,9 +224,6 @@ public class DynmapCore implements DynmapCommonAPI {
     public final File getExportFolder() {
         return exportDirectory;
     }
-    public final File getImportFolder() {
-        return importDirectory;
-    }
     public void setMinecraftVersion(String mcver) {
         this.platformVersion = mcver;
     }
@@ -432,11 +428,6 @@ public class DynmapCore implements DynmapCommonAPI {
         if (!exportDirectory.isDirectory() && !exportDirectory.mkdirs()) {
             Log.warning("Could not create directory for exports ('" + exportDirectory + "').");
         }
-        // Prime the imports directory
-        importDirectory = getFile(configuration.getString("importpath", "import"));
-        if (!importDirectory.isDirectory() && !importDirectory.mkdirs()) {
-            Log.warning("Could not create directory for imports ('" + importDirectory + "').");
-        }
         // Create default storage handler
         String storetype = configuration.getString("storage/type", "filetree");
         if (storetype.equals("filetree")) {

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

@@ -31,7 +31,6 @@ public class MarkersComponent extends ClientComponent {
     private MarkerSet spawnbedset;
     private MarkerIcon spawnbedicon;
     private String spawnbedformat;
-    private boolean removebedonplayerleave;
     private long maxofflineage;
     private boolean showSpawn;
     private boolean showBorder;
@@ -181,7 +180,7 @@ public class MarkersComponent extends ClientComponent {
             
             spawnbedicon = api.getMarkerIcon(configuration.getString("spawnbedicon", "bed"));
             spawnbedformat = configuration.getString("spawnbedformat", "%name%'s bed");
-            removebedonplayerleave = configuration.getBoolean("spawnbedremoveonplayerleave", true);
+            
             /* Add listener for players coming and going */
             core.listenerManager.addListener(EventType.PLAYER_JOIN, new PlayerEventListener() {
                 @Override
@@ -189,17 +188,15 @@ public class MarkersComponent extends ClientComponent {
                     updatePlayer(p);
                 }
             });
-            if (removebedonplayerleave) {
-                core.listenerManager.addListener(EventType.PLAYER_QUIT, new PlayerEventListener() {
-                    @Override
-                    public void playerEvent(DynmapPlayer p) {
-                        Marker m = spawnbedset.findMarker(p.getName() + "_bed");
-                        if (m != null) {
-                            m.deleteMarker();
-                        }
+            core.listenerManager.addListener(EventType.PLAYER_QUIT, new PlayerEventListener() {
+                @Override
+                public void playerEvent(DynmapPlayer p) {                    
+                    Marker m = spawnbedset.findMarker(p.getName()+"_bed");
+                    if(m != null) {
+                        m.deleteMarker();
                     }
-                });
-            }
+                }
+            });
             core.listenerManager.addListener(EventType.PLAYER_BED_LEAVE, new PlayerEventListener() {
                 @Override
                 public void playerEvent(final DynmapPlayer p) {                    

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

@@ -7,11 +7,11 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Properties;
+import java.util.Random;
 import java.util.Set;
 
 import org.dynmap.common.DynmapCommandSender;
@@ -26,7 +26,7 @@ public class WebAuthManager {
     public static final String WEBAUTHFILE = "webauth.txt";
     private static final String HASHSALT = "$HASH_SALT$";
     private static final String PWDHASH_PREFIX = "hash.";
-    private SecureRandom rnd = new SecureRandom();
+    private Random rnd = new Random();
     private DynmapCore core;
     private String publicRegistrationURL;
     

DynmapCore/src/main/java/org/dynmap/common/DynmapPlayer.java

@@ -44,12 +44,6 @@ public interface DynmapPlayer extends DynmapCommandSender {
      * @return true if sneaking
      */
     public boolean isSneaking();
-
-    /**
-     * get spectator gamemode
-     * @return true if gamemode spectator
-     */
-    public boolean isSpectator();
     /**
      * Get health
      * @return health points

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

@@ -34,7 +34,7 @@ public class ChunkVersionHDShader implements HDShader {
 
     	}
     };
-    // Mapping from https://minecraft.wiki/w/Data_version
+    // Mapping from https://minecraft.fandom.com/wiki/Data_version
     final static DataVersionMap[] versionmap = {
     	new DataVersionMap(0, "unknown", 0x202020),
     	new DataVersionMap(1519, "1.13.0", 0xF9E79F),

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

@@ -48,9 +48,9 @@ public class HDBlockModels {
     private static HashSet<String> loadedmods = new HashSet<String>();
     private static HashMap<Integer, HDScaledBlockModels> scaled_models_by_scale = new HashMap<Integer, HDScaledBlockModels>();
 
-    public static final int getMaxPatchCount() { return max_patches; }
+    public static final int getMaxPatchCount() { return max_patches; }  
     public static final PatchDefinitionFactory getPatchDefinitionFactory() { return pdf; }
-
+    
     /* Reset model if defined by different block set */
     public static boolean resetIfNotBlockSet(DynmapBlockState blk, String blockset) {
         HDBlockModel bm = models_by_id_data.get(blk.globalStateIndex);
@@ -69,11 +69,11 @@ public class HDBlockModels {
         }
         return 6;
     }
-
+    
     public static final boolean isChangeIgnoredBlock(DynmapBlockState blk) {
         return changeIgnoredBlocks.get(blk.globalStateIndex);
     }
-
+    
 
     /* Process any block aliases */
     public static void handleBlockAlias() {
@@ -85,7 +85,7 @@ public class HDBlockModels {
             }
         }
     }
-
+    
     private static void remapModel(String bn, String newbn) {
         DynmapBlockState frombs = DynmapBlockState.getBaseStateByName(bn);
         DynmapBlockState tobs = DynmapBlockState.getBaseStateByName(bn);
@@ -103,8 +103,8 @@ public class HDBlockModels {
             customModelsRequestingTileData.set(tb.globalStateIndex, customModelsRequestingTileData.get(fs.globalStateIndex));
             changeIgnoredBlocks.set(tb.globalStateIndex, changeIgnoredBlocks.get(fs.globalStateIndex));
         }
-    }
-
+    }        
+    
     /**
      * Get list of tile entity fields needed for custom renderer at given ID and data value, if any
      * @param blk - block state
@@ -133,7 +133,7 @@ public class HDBlockModels {
         }
         return model;
     }
-
+    
     private static void addFiles(ArrayList<String> files, File dir, String path) {
         File[] listfiles = dir.listFiles();
         if(listfiles == null) return;
@@ -173,7 +173,7 @@ public class HDBlockModels {
         changeIgnoredBlocks.clear();
         /* Reset model list */
         loadedmods.clear();
-
+        
         /* Load block models */
         int i = 0;
         boolean done = false;
@@ -232,7 +232,7 @@ public class HDBlockModels {
                 } catch (IOException iox) {
                     Log.severe("Error loading " + custom.getPath());
                 } finally {
-                    if(in != null) {
+                    if(in != null) { 
                         try { in.close(); } catch (IOException iox) {}
                         in = null;
                     }
@@ -268,7 +268,7 @@ public class HDBlockModels {
             }
         }
     }
-
+    
     private static Integer getIntValue(Map<String,Integer> vars, String val) throws NumberFormatException {
         char c = val.charAt(0);
         if(Character.isLetter(c) || (c == '%') || (c == '&')) {
@@ -305,37 +305,37 @@ public class HDBlockModels {
         int yrot = 0;
         int[] patches = new int[6]; // Default all to patch0
     }
-
+    
     private static class ModelBoxSide {
-        BlockSide side;
-        int textureid;
-        double[] uv;
-        ModelBlockModel.SideRotation rot;
+    	BlockSide side;
+    	int textureid;
+    	double[] uv;
+    	ModelBlockModel.SideRotation rot;
     };
-
+    
     private static class ModelBox {
-        double[] from = new double[3];
-        double[] to = new double[3];
-        double xrot = 0, yrot = 0, zrot = 0;
-        double xrotorig = 8, yrotorig = 8, zrotorig = 8;
-        int modrotx = 0, modroty = 0, modrotz = 0;	// Model level rotation
-        boolean shade = true;
-        ArrayList<ModelBoxSide> sides = new ArrayList<ModelBoxSide>();
+    	double[] from = new double[3];
+    	double[] to = new double[3];
+    	double xrot = 0, yrot = 0, zrot = 0;
+    	double xrotorig = 8, yrotorig = 8, zrotorig = 8;
+    	int modrotx = 0, modroty = 0, modrotz = 0;	// Model level rotation
+    	boolean shade = true;
+    	ArrayList<ModelBoxSide> sides = new ArrayList<ModelBoxSide>();
     };
-
+    
     private static HashMap<String, BlockSide> toBlockSide = new HashMap<String, BlockSide>();
     static {
-        toBlockSide.put("u", BlockSide.TOP);
-        toBlockSide.put("d", BlockSide.BOTTOM);
-        toBlockSide.put("n", BlockSide.NORTH);
-        toBlockSide.put("s", BlockSide.SOUTH);
-        toBlockSide.put("w", BlockSide.WEST);
-        toBlockSide.put("e", BlockSide.EAST);
+    	toBlockSide.put("u", BlockSide.TOP);
+    	toBlockSide.put("d", BlockSide.BOTTOM);
+    	toBlockSide.put("n", BlockSide.NORTH);
+    	toBlockSide.put("s", BlockSide.SOUTH);
+    	toBlockSide.put("w", BlockSide.WEST);
+    	toBlockSide.put("e", BlockSide.EAST);
     };
-
+    
     /**
      * Load models from file
-     * @param core
+     * @param core 
      */
     private static void loadModelFile(InputStream in, String fname, ConfigurationNode config, DynmapCore core, String blockset) {
         LineNumberReader rdr = null;
@@ -364,7 +364,7 @@ public class HDBlockModels {
                 if ((line.length() > 0) && (line.charAt(0) == '[')) {    // If version constrained like
                     int end = line.indexOf(']');    // Find end
                     if (end < 0) {
-                        Log.severe("Format error - line " + lineNum + ": bad version limit of file: " + fname);
+                        Log.severe("Format error - line " + lineNum + " of " + fname + ": bad version limit");
                         return;
                     }
                     String vertst = line.substring(1, end);
@@ -380,7 +380,7 @@ public class HDBlockModels {
                 }
                 // Comment line
                 if(line.startsWith("#") || line.startsWith(";")) {
-                    skip = true;
+                	skip = true;
                 }
                 // If we're skipping due to version restriction
                 if (skip) continue;
@@ -388,12 +388,12 @@ public class HDBlockModels {
                 int typeend = line.indexOf(':');
                 String typeid = "";
                 if (typeend >= 0) {
-                    typeid = line.substring(0, typeend);
-                    line = line.substring(typeend+1).trim();
+                	typeid = line.substring(0, typeend);
+                	line = line.substring(typeend+1).trim();
                 }
                 if (typeid.equals("block")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
 
                     scale = 0;
                     String[] args = line.split(",");
@@ -414,12 +414,12 @@ public class HDBlockModels {
                                 cnt++;
                             }
                             else {
-                                Log.severe("Invalid model block name " + bblk.blockName + " at line " + lineNum + " of file: " + fname);
+                            	Log.severe("Invalid model block name " + bblk.blockName + " at line " + lineNum);
                             }
                         }
                     }
                     else {
-                        Log.severe("Block model missing required parameters = line " + lineNum + " of file: " + fname);
+                        Log.severe("Block model missing required parameters = line " + lineNum + " of " + fname);
                     }
                     layerbits = 0;
                 }
@@ -432,9 +432,9 @@ public class HDBlockModels {
                     }
                 }
                 else if (typeid.equals("rotate")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
-
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
+                	
                     String args[] = line.split(",");
                     int rot = -1;
                     for(String a : args) {
@@ -444,18 +444,18 @@ public class HDBlockModels {
                     }
                     bsprslt = bsp.getMatchingStates();
                     if (bsprslt.size() != 1) {
-                        Log.severe("Missing rotate source on line " + lineNum + " of file: " + fname);
-                        continue;
+                    	Log.severe("Missing rotate source on line " + lineNum);                    	
+                    	continue;
                     }
-                    DynmapBlockState basebs = bsprslt.keySet().iterator().next();
-                    BitSet bits = bsprslt.get(basebs);
-                    /* get old model to be rotated */
-                    DynmapBlockState bs = basebs.getState(bits.nextSetBit(0));
-                    if (bs.isAir()) {
-                        Log.severe("Invalid rotate ID: " + bs + " on line " + lineNum + " of file: " + fname);
-                        continue;
-                    }
-                    HDBlockModel mod = models_by_id_data.get(bs.globalStateIndex);
+                	DynmapBlockState basebs = bsprslt.keySet().iterator().next();
+                	BitSet bits = bsprslt.get(basebs);
+                	/* get old model to be rotated */
+                	DynmapBlockState bs = basebs.getState(bits.nextSetBit(0));
+                	if (bs.isAir()) {
+                		Log.severe("Invalid rotate ID: " + bs + " on line " + lineNum);
+                		continue;
+                	}
+                	HDBlockModel mod = models_by_id_data.get(bs.globalStateIndex);
                     if (modlist.isEmpty()) {
                     }
                     else if ((mod != null) && ((rot%90) == 0) && (mod instanceof HDBlockVolumetricModel)) {
@@ -491,14 +491,14 @@ public class HDBlockModels {
                         }
                     }
                     else {
-                        Log.severe("Invalid rotate error - line " + lineNum + " of file:  " + fname);
+                        Log.severe("Invalid rotate error - line " + lineNum + " of " + fname);
                         continue;
                     }
                 }
                 else if (typeid.equals("patchrotate")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
-
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
+                	
                     String args[] = line.split(",");
                     int rotx = 0;
                     int roty = 0;
@@ -513,17 +513,17 @@ public class HDBlockModels {
                     }
                     bsprslt = bsp.getMatchingStates();
                     if (bsprslt.size() != 1) {
-                        Log.severe("Missing rotate source on line " + lineNum + " of file: " + fname);
-                        continue;
-                    }
-                    DynmapBlockState basebs = bsprslt.keySet().iterator().next();
-                    BitSet bits = bsprslt.get(basebs);
-                    /* get old model to be rotated */
-                    DynmapBlockState bs = basebs.getState(bits.nextSetBit(0));
-                    if (bs.isAir()) {
-                        Log.severe("Invalid patchrotate ID: " + bs + " on line " + lineNum + "of file: " + fname);
-                        continue;
+                    	Log.severe("Missing rotate source on line " + lineNum);                    	
+                    	continue;
                     }
+                	DynmapBlockState basebs = bsprslt.keySet().iterator().next();
+                	BitSet bits = bsprslt.get(basebs);
+                	/* get old model to be rotated */
+                	DynmapBlockState bs = basebs.getState(bits.nextSetBit(0));
+                	if (bs.isAir()) {
+                		Log.severe("Invalid patchrotate ID: " + bs + " on line " + lineNum);
+                		continue;
+                	}
                     HDBlockModel mod = models_by_id_data.get(bs.globalStateIndex);
                     if (pmodlist.isEmpty()) {
                     }
@@ -541,27 +541,27 @@ public class HDBlockModels {
                         }
                     }
                     else {
-                        Log.severe("Invalid rotate error - line " + lineNum + " of file: " + fname);
+                        Log.severe("Invalid rotate error - line " + lineNum + " of " + fname);
                         return;
                     }
                 }
                 else if (typeid.equals("ignore-updates")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
 
                     bsprslt = bsp.getMatchingStates();
 
                     for (DynmapBlockState bbs : bsprslt.keySet()) {
-                        if (bbs.isNotAir()) {
-                            BitSet bits = bsprslt.get(bbs);
-                            for (int i = bits.nextSetBit(0); i >= 0; i = bits.nextSetBit(i+1)) {
-                                DynmapBlockState bs = bbs.getState(i);
-                                changeIgnoredBlocks.set(bs.globalStateIndex);
-                            }
-                        }
-                        else {
-                            Log.severe("Invalid update ignore block name " + bbs + " at line " + lineNum + " of file: " + fname);
-                        }
+                    	if (bbs.isNotAir()) {
+                    		BitSet bits = bsprslt.get(bbs);
+                    		for (int i = bits.nextSetBit(0); i >= 0; i = bits.nextSetBit(i+1)) {
+                    			DynmapBlockState bs = bbs.getState(i);
+                				changeIgnoredBlocks.set(bs.globalStateIndex);
+                    		}
+                    	}
+                    	else {
+                        	Log.severe("Invalid update ignore block name " + bbs + " at line " + lineNum);
+                    	}
                     }
                 }
                 else if (typeid.equals("enabled")) {  /* Test if texture file is enabled */
@@ -584,7 +584,7 @@ public class HDBlockModels {
                     for(int i = 0; i < args.length; i++) {
                         String[] v = args[i].split("=");
                         if(v.length < 2) {
-                            Log.severe("Format error - line " + lineNum + " of file: " + fname);
+                            Log.severe("Format error - line " + lineNum + " of " + fname);
                             return;
                         }
                         try {
@@ -592,7 +592,7 @@ public class HDBlockModels {
                             int parmval = config.getInteger(v[0], val); /* Read value, with applied default */
                             varvals.put(v[0], parmval); /* And save value */
                         } catch (NumberFormatException nfx) {
-                            Log.severe("Format error - line " + lineNum + " of file: " + fname);
+                            Log.severe("Format error - line " + lineNum + " of " + fname);
                             return;
                         }
                     }
@@ -621,7 +621,7 @@ public class HDBlockModels {
                     double p_vminatumax = -1.0;
                     double p_uplusvmax = -1.0;
                     SideVisible p_sidevis = SideVisible.BOTH;
-
+                    
                     for(String a : args) {
                         String[] av = a.split("=");
                         if(av.length < 2) continue;
@@ -668,7 +668,7 @@ public class HDBlockModels {
                             p_vmax = Double.parseDouble(av[1]);
                         }
                         else if(av[0].equals("UplusVmax")) {
-                            Log.warning("UplusVmax deprecated - use VmaxAtUMax - line " + lineNum + " of file: " + fname);
+                            Log.warning("UplusVmax deprecated - use VmaxAtUMax - line " + lineNum + " of " + fname);
                             p_uplusvmax = Double.parseDouble(av[1]);
                         }
                         else if(av[0].equals("VmaxAtUMax")) {
@@ -717,8 +717,8 @@ public class HDBlockModels {
                     }
                 }
                 else if (typeid.equals("patchblock")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
 
                     String[] args = line.split(",");
                     ArrayList<PatchDefinition> patches = new ArrayList<PatchDefinition>();
@@ -737,11 +737,11 @@ public class HDBlockModels {
                                 patchnum1 = Integer.parseInt(ids2[1]);
                             }
                             if (patchnum0 < 0) {
-                                Log.severe("Invalid patch index " + patchnum0 + " - line " + lineNum + " of file: " + fname);
+                                Log.severe("Invalid patch index " + patchnum0 + " - line " + lineNum + " of " + fname);
                                 return;
                             }
                             if (patchnum1 < patchnum0) {
-                                Log.severe("Invalid patch index " + patchnum1 + " - line " + lineNum + " of file: " + fname);
+                                Log.severe("Invalid patch index " + patchnum1 + " - line " + lineNum + " of " + fname);
                                 return;
                             }
                             String patchid = av[1];
@@ -749,7 +749,7 @@ public class HDBlockModels {
                             for (int i = patchnum0; i <= patchnum1; i++) {
                                 PatchDefinition pd = pdf.getPatchByName(patchid, i);
                                 if (pd == null) {
-                                    Log.severe("Invalid patch ID " + patchid + " - line " + lineNum + " of file: " + fname);
+                                    Log.severe("Invalid patch ID " + patchid + " - line " + lineNum + " of " + fname);
                                     return;
                                 }
                                 patches.add(i,  pd);
@@ -769,20 +769,20 @@ public class HDBlockModels {
                                 cnt++;
                             }
                             else {
-                                Log.severe("Invalid patchmodel block name " + bs + " at line " + lineNum + " of file: " + fname);
+                            	Log.severe("Invalid patchmodel block name " + bs + " at line " + lineNum);
                             }
                         }
                     }
                     else {
-                        Log.severe("Patch block model missing required parameters = line " + lineNum + " of file: " + fname);
+                        Log.severe("Patch block model missing required parameters = line " + lineNum + " of " + fname);
                     }
                 }
                 // Shortcut for defining a patchblock that is a simple rectangular prism, with sidex corresponding to full block sides
                 else if (typeid.equals("boxblock")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
 
-                    String[] args = line.split(",");
+                	String[] args = line.split(",");
                     double xmin = 0.0, xmax = 1.0, ymin = 0.0, ymax = 1.0, zmin = 0.0, zmax = 1.0;
                     int[] patchlist = boxPatchList;
                     for(String a : args) {
@@ -807,11 +807,11 @@ public class HDBlockModels {
                             zmax = Double.parseDouble(av[1]);
                         }
                         else if(av[0].equals("patches")) {
-                            String[] v = av[1].split("/");
-                            patchlist = new int[6];
-                            for (int vidx = 0; (vidx < v.length) && (vidx < patchlist.length); vidx++) {
-                                patchlist[vidx] = getIntValue(varvals, v[vidx]);
-                            }
+                        	String[] v = av[1].split("/");
+                        	patchlist = new int[6];
+                        	for (int vidx = 0; (vidx < v.length) && (vidx < patchlist.length); vidx++) {
+                        		patchlist[vidx] = getIntValue(varvals, v[vidx]);
+                        	}
                         }
                     }
                     /* If we have everything, build block */
@@ -832,49 +832,49 @@ public class HDBlockModels {
                                 cnt++;
                             }
                             else {
-                                Log.severe("Invalid boxmodel block name " + bs + " at line " + lineNum + " of file: " + fname);
+                            	Log.severe("Invalid boxmodel block name " + bs + " at line " + lineNum);
                             }
                         }
                     }
                     else {
-                        Log.severe("Box block model missing required parameters = line " + lineNum + " of file: " + fname);
+                        Log.severe("Box block model missing required parameters = line " + lineNum + " of " + fname);
                     }
                 }
                 // Shortcut for defining a patchblock that is a simple rectangular prism, with sidex corresponding to full block sides
                 else if (typeid.equals("boxlist")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
-
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
+                	
                     String[] args = line.split(",");
                     ArrayList<BoxLimits> boxes = new ArrayList<BoxLimits>();
                     for (String a : args) {
                         String[] av = a.split("=");
                         if(av.length < 2) continue;
                         if (av[0].equals("box")) {
-                            String[] prms = av[1].split(":");
-                            BoxLimits box = new BoxLimits();
-                            if (prms.length > 0)
-                                box.xmin = Double.parseDouble(prms[0]);
-                            if (prms.length > 1)
-                                box.xmax = Double.parseDouble(prms[1]);
-                            if (prms.length > 2)
-                                box.ymin = Double.parseDouble(prms[2]);
-                            if (prms.length > 3)
-                                box.ymax = Double.parseDouble(prms[3]);
-                            if (prms.length > 4)
-                                box.zmin = Double.parseDouble(prms[4]);
-                            if (prms.length > 5)
-                                box.zmax = Double.parseDouble(prms[5]);
-                            if (prms.length > 6) {
-                                String[] pl = prms[6].split("/");
-                                for (int p = 0; (p < 6) && (p < pl.length); p++) {
-                                    box.patches[p] = Integer.parseInt(pl[p]);
-                                }
-                            }
-                            if (prms.length > 7) {
-                                box.yrot = Integer.parseInt(prms[7]);
-                            }
-                            boxes.add(box);
+                        	String[] prms = av[1].split(":");
+                        	BoxLimits box = new BoxLimits();
+                        	if (prms.length > 0)
+                        		box.xmin = Double.parseDouble(prms[0]);
+                        	if (prms.length > 1)
+                        		box.xmax = Double.parseDouble(prms[1]);
+                        	if (prms.length > 2)
+                        		box.ymin = Double.parseDouble(prms[2]);
+                        	if (prms.length > 3)
+                        		box.ymax = Double.parseDouble(prms[3]);
+                        	if (prms.length > 4)
+                        		box.zmin = Double.parseDouble(prms[4]);
+                        	if (prms.length > 5)
+                        		box.zmax = Double.parseDouble(prms[5]);
+                        	if (prms.length > 6) {
+                        		String[] pl = prms[6].split("/");
+                        		for (int p = 0; (p < 6) && (p < pl.length); p++) {
+                        			box.patches[p] = Integer.parseInt(pl[p]);
+                        		}
+                        	}
+                        	if (prms.length > 7) {
+                        		box.yrot = Integer.parseInt(prms[7]);
+                        	}
+                        	boxes.add(box);
                         }
                     }
                     /* If we have everything, build block */
@@ -882,9 +882,9 @@ public class HDBlockModels {
                     pmodlist.clear();
                     if (bsprslt.size() > 0) {
                         ArrayList<RenderPatch> pd = new ArrayList<RenderPatch>();
-
+                        
                         for (BoxLimits bl : boxes) {
-                            CustomRenderer.addBox(pdf, pd, bl.xmin, bl.xmax, bl.ymin, bl.ymax, bl.zmin, bl.zmax, bl.patches, bl.yrot);
+                    		CustomRenderer.addBox(pdf, pd, bl.xmin, bl.xmax, bl.ymin, bl.ymax, bl.zmin, bl.zmax, bl.patches, bl.yrot);
                         }
                         PatchDefinition[] patcharray = new PatchDefinition[pd.size()];
                         for (int i = 0; i < patcharray.length; i++) {
@@ -898,18 +898,18 @@ public class HDBlockModels {
                                 cnt++;
                             }
                             else {
-                                Log.severe("Invalid boxlist block name " + bs + " at line " + lineNum + " of file: " + fname);
+                            	Log.severe("Invalid boxlist block name " + bs + " at line " + lineNum);
                             }
                         }
                     }
                     else {
-                        Log.severe("Box list block model missing required parameters = line " + lineNum  + " of file: " + fname);
+                        Log.severe("Box list block model missing required parameters = line " + lineNum + " of " + fname);
                     }
                 }
-                // Shortcur for building JSON model style
+                // Shortcur for building JSON model style 
                 else if (typeid.equals("modellist")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
 
                     String[] args = line.split(",");
                     ArrayList<ModelBox> boxes = new ArrayList<ModelBox>();
@@ -917,98 +917,98 @@ public class HDBlockModels {
                         String[] av = a.split("=");
                         if(av.length < 2) continue;
                         if (av[0].equals("box")) {
-                            // box=from-x/y/z:to-x/y/z/rotx/roty/rotz:<side - upnsew>/<txtidx>/umin/vmin/umax/vmax>:...
-                            String[] prms = av[1].split(":");
-
-                            ModelBox box = new ModelBox();
-                            if (prms.length > 0) {	// Handle from (from-x/y/z or from-x/y/z/shadow)
-                                String[] xyz = prms[0].split("/");
-                                if ((xyz.length == 3) || (xyz.length == 4)) {
-                                    box.from[0] = Double.parseDouble(xyz[0]);
-                                    box.from[1] = Double.parseDouble(xyz[1]);
-                                    box.from[2] = Double.parseDouble(xyz[2]);
-                                    if ((xyz.length >= 4) && (xyz[3].equals("false"))) {
-                                        box.shade = false;
-                                    }
-                                }
-                                else {
-                                    Log.severe("Invalid modellist FROM value (" + prms[0] + " at line " + lineNum + " of file: " + fname);
-                                }
-                            }
-                            if (prms.length > 1) {	// Handle to (to-x/y/z or to-x/y/z/rotx/roty/rotz) or to-x/y/z/rotx/roty/rotz/rorigx/rorigy/rorigz
-                                String[] xyz = prms[1].split("/");
-                                if (xyz.length >= 3) {
-                                    box.to[0] = Double.parseDouble(xyz[0]);
-                                    box.to[1] = Double.parseDouble(xyz[1]);
-                                    box.to[2] = Double.parseDouble(xyz[2]);
-                                    if (xyz.length >= 6) {	// If 6, second set are rotations (xrot/yrot/zrot)
-                                        box.xrot = Double.parseDouble(xyz[3]);
-                                        box.yrot = Double.parseDouble(xyz[4]);
-                                        box.zrot = Double.parseDouble(xyz[5]);
-                                    }
-                                    if (xyz.length >= 9) {	// If 9, third set is rotation origin (xrot/yrot/zrot)
-                                        box.xrotorig = Double.parseDouble(xyz[6]);
-                                        box.yrotorig = Double.parseDouble(xyz[7]);
-                                        box.zrotorig = Double.parseDouble(xyz[8]);
-                                    }
-                                }
-                                else {
-                                    Log.severe("Invalid modellist TO value (" + prms[1] + " at line " + lineNum + " of file: " + fname);
-                                }
-                            }
-                            // Rest are faces (<side - upnsew>/<txtidx>/umin/vmin/umax/vmax> or <<side - upnsew>/<txtidx>)
-                            // OR R/mrx/mry/mrz for model rotation
-                            for (int faceidx = 2; faceidx < prms.length; faceidx++) {
-                                String v = prms[faceidx];
-                                String[] flds = v.split("/");
-                                // If rotation
-                                if (flds[0].equals("R") && (flds.length == 4)) {
-                                    box.modrotx = Integer.parseInt(flds[1]);
-                                    box.modroty = Integer.parseInt(flds[2]);
-                                    box.modrotz = Integer.parseInt(flds[3]);
-                                    continue;
-                                }
-                                ModelBoxSide side = new ModelBoxSide();
-                                side.rot = null;
-                                if ((flds.length != 2) && (flds.length != 6)) {
-                                    Log.severe("Invalid modellist face '" + v + "' at line " + lineNum + " of file: " + fname);
-                                    continue;
-                                }
-                                if (flds.length > 0) {
-                                    String face = flds[0];
-                                    side.side = toBlockSide.get(face.substring(0, 1));
-                                    if (side.side == null) {
-                                        Log.severe("Invalid modellist side value (" + face + ") in '" + v + "' at line " + lineNum + " of file: " + fname);
-                                        continue;
-                                    }
-                                    if (flds[0].length() > 1) {
-                                        String r = flds[0].substring(1);
-                                        switch (r) {
-                                            case "90":
-                                                side.rot = ModelBlockModel.SideRotation.DEG90;
-                                                break;
-                                            case "180":
-                                                side.rot = ModelBlockModel.SideRotation.DEG180;
-                                                break;
-                                            case "270":
-                                                side.rot = ModelBlockModel.SideRotation.DEG270;
-                                                break;
-                                        }
-                                    }
-                                }
-                                if (flds.length > 1) {
-                                    side.textureid = getIntValue(varvals, flds[1]);
-                                }
-                                if (flds.length >= 6) {
-                                    side.uv = new double[4];
-                                    side.uv[0] = Double.parseDouble(flds[2]);
-                                    side.uv[1] = Double.parseDouble(flds[3]);
-                                    side.uv[2] = Double.parseDouble(flds[4]);
-                                    side.uv[3] = Double.parseDouble(flds[5]);
-                                }
-                                box.sides.add(side);
-                            }
-                            boxes.add(box);
+                        	// box=from-x/y/z:to-x/y/z/rotx/roty/rotz:<side - upnsew>/<txtidx>/umin/vmin/umax/vmax>:...
+                        	String[] prms = av[1].split(":");
+                        	
+                        	ModelBox box = new ModelBox();
+                        	if (prms.length > 0) {	// Handle from (from-x/y/z or from-x/y/z/shadow)
+                        		String[] xyz = prms[0].split("/");
+                        		if ((xyz.length == 3) || (xyz.length == 4)) {
+                        			box.from[0] = Double.parseDouble(xyz[0]);
+                        			box.from[1] = Double.parseDouble(xyz[1]);
+                        			box.from[2] = Double.parseDouble(xyz[2]);
+                            		if ((xyz.length >= 4) && (xyz[3].equals("false"))) {
+                        				box.shade = false;
+                            		}
+                        		}
+                        		else {
+                                	Log.severe("Invalid modellist FROM value (" + prms[0] + " at line " + lineNum);                        			
+                        		}
+                        	}
+                        	if (prms.length > 1) {	// Handle to (to-x/y/z or to-x/y/z/rotx/roty/rotz) or to-x/y/z/rotx/roty/rotz/rorigx/rorigy/rorigz
+                        		String[] xyz = prms[1].split("/");
+                        		if (xyz.length >= 3) {
+                        			box.to[0] = Double.parseDouble(xyz[0]);
+                        			box.to[1] = Double.parseDouble(xyz[1]);
+                        			box.to[2] = Double.parseDouble(xyz[2]);
+                        			if (xyz.length >= 6) {	// If 6, second set are rotations (xrot/yrot/zrot)
+                            			box.xrot = Double.parseDouble(xyz[3]);
+                            			box.yrot = Double.parseDouble(xyz[4]);
+                            			box.zrot = Double.parseDouble(xyz[5]);
+                        			}
+                        			if (xyz.length >= 9) {	// If 9, third set is rotation origin (xrot/yrot/zrot)
+                            			box.xrotorig = Double.parseDouble(xyz[6]);
+                            			box.yrotorig = Double.parseDouble(xyz[7]);
+                            			box.zrotorig = Double.parseDouble(xyz[8]);
+                        			}
+                        		}
+                        		else {
+                                	Log.severe("Invalid modellist TO value (" + prms[1] + " at line " + lineNum);                        			
+                        		}
+                        	}
+                        	// Rest are faces (<side - upnsew>/<txtidx>/umin/vmin/umax/vmax> or <<side - upnsew>/<txtidx>)
+                        	// OR R/mrx/mry/mrz for model rotation
+                        	for (int faceidx = 2; faceidx < prms.length; faceidx++) {
+                        		String v = prms[faceidx];	
+                        		String[] flds = v.split("/");
+                        		// If rotation
+                        		if (flds[0].equals("R") && (flds.length == 4)) {
+                        			box.modrotx = Integer.parseInt(flds[1]);
+                        			box.modroty = Integer.parseInt(flds[2]);
+                        			box.modrotz = Integer.parseInt(flds[3]);
+                        			continue;
+                        		}
+                        		ModelBoxSide side = new ModelBoxSide();
+                        		side.rot = null;
+                        		if ((flds.length != 2) && (flds.length != 6)) {
+                                	Log.severe("Invalid modellist face '" + v + "' at line " + lineNum);                        			                        				
+                                	continue;
+                        		}
+                        		if (flds.length > 0) {
+                        			String face = flds[0];
+                        			side.side = toBlockSide.get(face.substring(0, 1));
+                        			if (side.side == null) {
+                                    	Log.severe("Invalid modellist side value (" + face + ") in '" + v + "' at line " + lineNum);                        			                        				
+                                    	continue;
+                        			}
+                        			if (flds[0].length() > 1) {
+                        				String r = flds[0].substring(1);
+                        				switch (r) {
+	                        				case "90":
+	                        					side.rot = ModelBlockModel.SideRotation.DEG90;
+	                        					break;
+	                        				case "180":
+	                        					side.rot = ModelBlockModel.SideRotation.DEG180;
+	                        					break;
+	                        				case "270":
+	                        					side.rot = ModelBlockModel.SideRotation.DEG270;
+	                        					break;
+                        				}
+                        			}
+                        		}
+                        		if (flds.length > 1) {
+                        			side.textureid = getIntValue(varvals, flds[1]);
+                        		}
+                        		if (flds.length >= 6) {
+                        			side.uv = new double[4];
+                        			side.uv[0] = Double.parseDouble(flds[2]);
+                        			side.uv[1] = Double.parseDouble(flds[3]);
+                        			side.uv[2] = Double.parseDouble(flds[4]);
+                        			side.uv[3] = Double.parseDouble(flds[5]);
+                        		}
+                        		box.sides.add(side);
+                        	}
+                        	boxes.add(box);
                         }
                     }
                     /* If we have everything, build block */
@@ -1016,35 +1016,35 @@ public class HDBlockModels {
                     pmodlist.clear();
                     if (bsprslt.size() > 0) {
                         ArrayList<PatchDefinition> pd = new ArrayList<PatchDefinition>();
-
-                        for (ModelBox bl : boxes) {
-                            // Loop through faces
-                            for (ModelBoxSide side : bl.sides) {
-                                PatchDefinition patch = pdf.getModelFace(bl.from, bl.to, side.side, side.uv, side.rot, bl.shade, side.textureid);
-                                if (patch != null) {
-                                    // If any rotations, apply them here
-                                    if ((bl.xrot != 0) || (bl.yrot != 0) || (bl.zrot != 0)) {
-                                        patch = pdf.getPatch(patch, -bl.xrot, -bl.yrot, -bl.zrot,
-                                                new Vector3D(bl.xrotorig / 16, bl.yrotorig / 16, bl.zrotorig / 16),
-                                                patch.textureindex);
-                                        if (patch == null) continue;
-                                    }
-                                    // If model rotation, apply too
-                                    if ((bl.modrotx != 0) || (bl.modroty != 0) || (bl.modrotz != 0)) {
-                                        patch = pdf.getPatch(patch, bl.modrotx, bl.modroty, bl.modrotz, patch.textureindex);
-                                        if (patch == null) continue;
-                                    }
-                                    pd.add(patch);
-                                }
-                                else {
-                                    Log.severe(String.format("Invalid modellist patch for box %.02f/%.02f/%.02f:%.02f/%.02f/%.02f side %s at line %d of file: %s", bl.from[0], bl.from[1], bl.from[2], bl.to[0], bl.to[1], bl.to[2], side.side, lineNum, fname));
-                                    Log.verboseinfo(String.format("line = %s:%s", typeid, line));
-                                }
-                            }
+                        
+						for (ModelBox bl : boxes) {
+							// Loop through faces
+							for (ModelBoxSide side : bl.sides) {
+								PatchDefinition patch = pdf.getModelFace(bl.from, bl.to, side.side, side.uv, side.rot, bl.shade, side.textureid);
+								if (patch != null) {
+									// If any rotations, apply them here
+									if ((bl.xrot != 0) || (bl.yrot != 0) || (bl.zrot != 0)) {
+										patch = pdf.getPatch(patch, -bl.xrot, -bl.yrot, -bl.zrot, 
+											new Vector3D(bl.xrotorig / 16, bl.yrotorig / 16, bl.zrotorig / 16),
+											patch.textureindex);
+										if (patch == null) continue;
+									}
+									// If model rotation, apply too
+		                            if ((bl.modrotx != 0) || (bl.modroty != 0) || (bl.modrotz != 0)) {
+		                            	patch = pdf.getPatch(patch, bl.modrotx, bl.modroty, bl.modrotz, patch.textureindex);
+										if (patch == null) continue;
+		                            }									
+									pd.add(patch);
+								}
+								else {
+	                            	Log.severe(String.format("Invalid modellist patch for box %.02f/%.02f/%.02f:%.02f/%.02f/%.02f side %s at line %d", bl.from[0], bl.from[1], bl.from[2], bl.to[0], bl.to[1], bl.to[2], side.side, lineNum));
+	                            	Log.verboseinfo(String.format("line = %s:%s", typeid, line));
+								}
+							}
                         }
                         PatchDefinition[] patcharray = new PatchDefinition[pd.size()];
                         for (int i = 0; i < patcharray.length; i++) {
-                            patcharray[i] = pd.get(i);
+                        	patcharray[i] = pd.get(i);                            	
                         }
                         if (patcharray.length > max_patches)
                             max_patches = patcharray.length;
@@ -1054,26 +1054,26 @@ public class HDBlockModels {
                                 cnt++;
                             }
                             else {
-                                Log.severe("Invalid modellist block name " + bs + " at line " + lineNum + " of file: " + fname);
+                            	Log.severe("Invalid modellist block name " + bs + " at line " + lineNum);
                             }
                         }
                     }
                     else {
-                        Log.severe("Model list block model missing required parameters = line " + lineNum + " of file: " + fname);
+                        Log.severe("Model list block model missing required parameters = line " + lineNum + " of " + fname);
                     }
                 }
                 else if (typeid.equals("customblock")) {
-                    // Parse block states
-                    bsp.processLine(modname, line, lineNum, varvals);
+                	// Parse block states
+                	bsp.processLine(modname, line, lineNum, varvals);
 
-                    HashMap<String,String> custargs = new HashMap<String,String>();
+                	HashMap<String,String> custargs = new HashMap<String,String>();
                     String[] args = line.split(",");
                     String cls = null;
                     for (String a : args) {
                         String[] av = a.split("=");
                         if (av.length < 2) continue;
                         if (av[0].equals("id") || av[0].equals("data") || av[0].equals("state")) {
-                            // Skip block state args - should not be bassed to custom block handler
+                        	// Skip block state args - should not be bassed to custom block handler
                         }
                         else if (av[0].equals("class")) {
                             cls = av[1];
@@ -1094,7 +1094,7 @@ public class HDBlockModels {
                             if (bs.isNotAir()) {
                                 CustomBlockModel cbm = new CustomBlockModel(bs, bsprslt.get(bs), cls, custargs, blockset);
                                 if(cbm.render == null) {
-                                    Log.severe("Custom block model failed to initialize = line " + lineNum + " of file: " + fname);
+                                    Log.severe("Custom block model failed to initialize = line " + lineNum + " of " + fname);
                                 }
                                 else {
                                     /* Update maximum texture count */
@@ -1106,12 +1106,12 @@ public class HDBlockModels {
                                 cnt++;
                             }
                             else {
-                                Log.severe("Invalid custommodel block name " + bs + " at line " + lineNum + " of file: " + fname);
+                            	Log.severe("Invalid custommodel block name " + bs + " at line " + lineNum);
                             }
                         }
                     }
                     else {
-                        Log.severe("Custom block model missing required parameters = line " + lineNum + " of file: " + fname);
+                        Log.severe("Custom block model missing required parameters = line " + lineNum + " of " + fname);
                     }
                 }
                 else if (typeid.equals("modname")) {
@@ -1177,7 +1177,7 @@ public class HDBlockModels {
         } catch (IOException iox) {
             Log.severe("Error reading models.txt - " + iox.toString());
         } catch (NumberFormatException nfx) {
-            Log.severe("Format error - line " + rdr.getLineNumber() + " of file: " + fname + ": " + nfx.getMessage());
+            Log.severe("Format error - line " + rdr.getLineNumber() + " of " + fname + ": " + nfx.getMessage());
         } finally {
             if(rdr != null) {
                 try {
@@ -1209,13 +1209,13 @@ public class HDBlockModels {
         }
         return v2.toString();
     }
-
+    
     private static long parseVersion(String v, boolean up) {
         v = normalizeVersion(v);
         String[] vv = v.split("\\.");
         long ver = 0;
         for (int i = 0; i < vscale.length; i++) {
-            if (i < vv.length){
+            if (i < vv.length){ 
                 try {
                     ver += vscale[i] * Integer.parseInt(vv[i]);
                 } catch (NumberFormatException nfx) {
@@ -1234,10 +1234,10 @@ public class HDBlockModels {
         String[] rng = range.split("-", -1);
         String low;
         String high;
-
+        
         long v = parseVersion(ver, false);
         if (v == 0) return false;
-
+        
         if (rng.length == 1) {
             low = rng[0];
             high = rng[0];

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

@@ -1273,17 +1273,7 @@ public class TexturePack {
             imgs[idx].width = img.getWidth();
             imgs[idx].height = img.getHeight();
             imgs[idx].argb = new int[imgs[idx].width * imgs[idx].height];
-            if (img.getType() == BufferedImage.TYPE_BYTE_GRAY) {	// We don't want alpha correction, apparently
-            	float[] buffer = new float[imgs[idx].width * imgs[idx].height];
-    			img.getData().getPixels(0, 0, imgs[idx].width, imgs[idx].height, buffer);
-            	for (int i = 0; i < imgs[idx].argb.length; i++) {
-            		int v = (int) buffer[i];
-            		imgs[idx].argb[i] = 0xFF000000 | (v << 16) | (v << 8) | v;
-            	}
-            }
-            else {
-            	img.getRGB(0, 0, imgs[idx].width, imgs[idx].height, imgs[idx].argb, 0, imgs[idx].width);
-            }
+            img.getRGB(0, 0, imgs[idx].width, imgs[idx].height, imgs[idx].argb, 0, imgs[idx].width);
             img.flush();
             imgs[idx].isLoaded = true;
         }

DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java

@@ -2176,10 +2176,6 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
                 sender.sendMessage("file:\"filename\" required");
                 return true;
             }
-            if (!validateImportFile(file)) {
-                sender.sendMessage("Error: '" + ARG_FILE + "' cannot include directory separators - must be just filename in " + plugin.getImportFolder().getAbsolutePath() + " directory");
-                return true;
-            }
             if(label == null)
                 label = id;
             MarkerIcon ico = MarkerAPIImpl.getMarkerIconImpl(id);
@@ -2188,9 +2184,10 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
                 return true;
             }
             /* Open stream to filename */
+            File iconf = new File(file);
             FileInputStream fis = null;
             try {
-                fis = new FileInputStream(new File(plugin.getImportFolder(), file));
+                fis = new FileInputStream(iconf);
                 /* Create new icon */
                 MarkerIcon mi = api.createMarkerIcon(id, label, fis);
                 if(mi == null) {
@@ -3204,12 +3201,6 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
         }
         return true;
     }
-    private static boolean validateImportFile(String fname) {
-        if ((fname.indexOf('/') >= 0) || (fname.indexOf('\\') >= 0)) {
-        	return false;
-        }
-        return true;
-    }
     /** Process importdesc for given item */
     private static boolean processImportDesc(DynmapCore plugin, DynmapCommandSender sender, String cmd, String commandLabel, String[] args) {
         if(args.length > 1) {
@@ -3223,17 +3214,13 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
             }
             String f = parms.get(ARG_FILE);
             if (f == null) {
-                sender.sendMessage("file:\"filename\" required");
-                return true;
-            }
-            if (!validateImportFile(f)) {
-                sender.sendMessage("Error: '" + ARG_FILE + "' cannot include directory separators - must be just filename in " + plugin.getImportFolder().getAbsolutePath() + " directory");
+                sender.sendMessage("Error: no '" + ARG_FILE + "' parameter");
                 return true;
             }
             FileReader fr = null;
             String val = null;
             try {
-                fr = new FileReader(new File(plugin.getImportFolder(), f));
+                fr = new FileReader(f);
                 StringBuilder sb = new StringBuilder();
                 char[] buf = new char[512];
                 int len;
@@ -3274,17 +3261,13 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
             }
             String f = parms.get(ARG_FILE);
             if (f == null) {
-                sender.sendMessage("file:\"filename\" required");
-                return true;
-            }
-            if (!validateImportFile(f)) {
-                sender.sendMessage("Error: '" + ARG_FILE + "' cannot include directory separators - must be just filename in " + plugin.getImportFolder().getAbsolutePath() + " directory");
+                sender.sendMessage("Error: no '" + ARG_FILE + "' parameter");
                 return true;
             }
             FileReader fr = null;
             String val = null;
             try {
-                fr = new FileReader(new File(plugin.getImportFolder(), f));
+                fr = new FileReader(f);
                 StringBuilder sb = new StringBuilder();
                 char[] buf = new char[512];
                 int len;

DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java

@@ -1,7 +1,6 @@
 package org.dynmap.storage.aws_s3;
 
 import java.io.IOException;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -140,7 +139,7 @@ public class AWSS3MapStorage extends MapStorage {
         		else {
         			PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(map.getImageFormat().getEncoding().getContentType())
         					.addMetadata("x-dynmap-hash", Long.toHexString(hash)).addMetadata("x-dynmap-ts", Long.toString(timestamp)).build();
-        			s3.putObject(req, RequestBody.fromBytes(encImage.buf));
+        			s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
         		}
     			done = true;
             } catch (S3Exception x) {
@@ -222,7 +221,7 @@ public class AWSS3MapStorage extends MapStorage {
     }
     
     private String bucketname;
-    private Region region;
+    private String region;
     private String access_key_id;
     private String secret_access_key;
     private String prefix;
@@ -249,20 +248,10 @@ public class AWSS3MapStorage extends MapStorage {
         }
         // Get our settings
         bucketname = core.configuration.getString("storage/bucketname", "dynmap");
+        region = core.configuration.getString("storage/region", "us-east-1");
         access_key_id = core.configuration.getString("storage/aws_access_key_id", System.getenv("AWS_ACCESS_KEY_ID"));
         secret_access_key = core.configuration.getString("storage/aws_secret_access_key", System.getenv("AWS_SECRET_ACCESS_KEY"));
         prefix = core.configuration.getString("storage/prefix", "");
-
-        // Either use a custom region, or one of the default AWS regions
-        String region_name = core.configuration.getString("storage/region", "us-east-1");
-        String region_endpoint = core.configuration.getString("storage/override_endpoint", "");
-
-        if (region_endpoint.length() > 0) {
-            region = Region.of(region_name, URI.create(region_endpoint));
-        } else {
-            region = Region.fromString(region_name);
-        }
-
         if ((prefix.length() > 0) && (prefix.charAt(prefix.length()-1) != '/')) {
         	prefix += '/';
         }
@@ -529,7 +518,7 @@ public class AWSS3MapStorage extends MapStorage {
     		}
     		else {
     			PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType("image/png").build();
-    			s3.putObject(req, RequestBody.fromBytes(encImage.buf));
+    			s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
     		}
 			done = true;
         } catch (S3Exception x) {
@@ -582,7 +571,7 @@ public class AWSS3MapStorage extends MapStorage {
     		}
     		else {
        			PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType("image/png").build();
-    			s3.putObject(req, RequestBody.fromBytes(encImage.buf));
+    			s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
     		}
 			done = true;
         } catch (S3Exception x) {
@@ -745,7 +734,7 @@ public class AWSS3MapStorage extends MapStorage {
     				ct = "application/x-javascript";
     			}
        			PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(ct).build();
-    			s3.putObject(req, RequestBody.fromBytes(content.buf));
+    			s3.putObject(req, RequestBody.fromBytes(content.buf, content.len));
         		standalone_cache.put(fileid, digest);
     		}
 			done = true;
@@ -774,7 +763,7 @@ public class AWSS3MapStorage extends MapStorage {
                     if (cpoolCount < POOLSIZE) {  // Still more we can have
                         c = new DefaultS3ClientBuilder()
                         	    .credentialsProvider(() -> AwsBasicCredentials.create(access_key_id, secret_access_key))
-                        	    .region(region)
+                        	    .region(Region.fromString(region))
                         	    .httpClient(URLConnectionSdkHttpClient.create())
                         	    .build();
                         if (c == null) {

DynmapCore/src/main/java/org/dynmap/storage/sqllte/SQLiteMapStorage.java

@@ -533,7 +533,6 @@ public class SQLiteMapStorage extends MapStorage {
     
     private static Connection configureConnection(Connection conn) throws SQLException {
         final Statement statement = conn.createStatement();
-        statement.execute("PRAGMA auto_vacuum = FULL;");
         statement.execute("PRAGMA journal_mode = WAL;");
         statement.close();
         return conn;

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

@@ -570,14 +570,6 @@
    transition: all 0.6s ease-in-out 0s;
 }
 
-/* do not animate player movements when zooming */
-.dynmap .leaflet-zoom-anim .leaflet-zoom-animated.playerMarker {
-    -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-    -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-    -o-transition: transform 0.25s cubic-bezier(0,0,0.25,1);
-    transition: transform 0.25s cubic-bezier(0,0,0.25,1);
-}
-
 .dynmap .playerIcon {
 	margin-top: -16px;
 	margin-left: -16px;

DynmapCore/src/main/resources/models_1.txt

@@ -856,13 +856,7 @@ modellist:id=%iron_bars,state=west:false/east:false/south:false/north:false,box=
 # Fern
 # Dead shrub
 # Tall grass
-patchblock:id=fern,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
-[-1.20.2]patchblock:id=grass,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
-[1.20.3-]patchblock:id=short_grass,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
-patchblock:id=cobweb,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
-patchblock:id=tall_grass,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
-patchblock:id=dead_bush,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
-patchblock:id=sugar_cane,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
+patchblock:id=fern,id=grass,id=cobweb,id=tall_grass,id=dead_bush,id=sugar_cane,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
 
 # Seagrass
 # Tall seagrass
@@ -3441,25 +3435,3 @@ modellist:id=%dropper,state=facing:down,box=0.000000/0.000000/0.000000:16.000000
 [1.20-]modellist:id=%calibrated_sculk_sensor,state=facing:east/sculk_sensor_phase:inactive,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/2/0.000000/8.000000/16.000000/16.000000:w/2/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:d/1/0.000000/0.000000/16.000000/16.000000:e/2/0.000000/8.000000/16.000000/16.000000:u/3/0.000000/0.000000/16.000000/16.000000:R/0/90/0,box=-1.000000/8.000000/3.000000:7.000000/16.000000/3.000000/0.000000/45.000000/0.000000/3.000000/12.000000/3.000000:n/4/4.000000/8.000000/12.000000/16.000000:s/4/12.000000/8.000000/4.000000/16.000000:R/0/90/0,box=9.000000/8.000000/3.000000:17.000000/16.000000/3.000000/0.000000/-45.000000/0.000000/13.000000/12.000000/3.000000:n/4/12.000000/8.000000/4.000000/16.000000:s/4/4.000000/8.000000/12.000000/16.000000:R/0/90/0,box=9.000000/8.000000/13.000000:17.000000/16.000000/13.000000/0.000000/45.000000/0.000000/13.000000/12.000000/13.000000:n/4/12.000000/8.000000/4.000000/16.000000:s/4/4.000000/8.000000/12.000000/16.000000:R/0/90/0,box=-1.000000/8.000000/13.000000:7.000000/16.000000/13.000000/0.000000/-45.000000/0.000000/3.000000/12.000000/13.000000:n/4/4.000000/8.000000/12.000000/16.000000:s/4/12.000000/8.000000/4.000000/16.000000:R/0/90/0,box=8.000000/8.000000/0.000000/false:8.000000/20.000000/16.000000/0.000000/45.000000/0.000000/8.000000/9.000000/8.000000:w/5/0.000000/4.000000/16.000000/16.000000:e/5/0.000000/4.000000/16.000000/16.000000:R/0/90/0,box=0.000000/8.000000/8.000000/false:16.000000/20.000000/8.000000/0.000000/45.000000/0.000000/8.000000/9.000000/8.000000:n/5/0.000000/4.000000/16.000000/16.000000:s/5/0.000000/4.000000/16.000000/16.000000:R/0/90/0
 [1.20-]modellist:id=%calibrated_sculk_sensor,state=facing:east/sculk_sensor_phase:active,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/2/0.000000/8.000000/16.000000/16.000000:w/2/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:d/1/0.000000/0.000000/16.000000/16.000000:e/2/0.000000/8.000000/16.000000/16.000000:u/3/0.000000/0.000000/16.000000/16.000000:R/0/90/0,box=-1.000000/8.000000/3.000000:7.000000/16.000000/3.000000/0.000000/45.000000/0.000000/3.000000/12.000000/3.000000:n/4/4.000000/8.000000/12.000000/16.000000:s/4/12.000000/8.000000/4.000000/16.000000:R/0/90/0,box=9.000000/8.000000/3.000000:17.000000/16.000000/3.000000/0.000000/-45.000000/0.000000/13.000000/12.000000/3.000000:n/4/12.000000/8.000000/4.000000/16.000000:s/4/4.000000/8.000000/12.000000/16.000000:R/0/90/0,box=9.000000/8.000000/13.000000:17.000000/16.000000/13.000000/0.000000/45.000000/0.000000/13.000000/12.000000/13.000000:n/4/12.000000/8.000000/4.000000/16.000000:s/4/4.000000/8.000000/12.000000/16.000000:R/0/90/0,box=-1.000000/8.000000/13.000000:7.000000/16.000000/13.000000/0.000000/-45.000000/0.000000/3.000000/12.000000/13.000000:n/4/4.000000/8.000000/12.000000/16.000000:s/4/12.000000/8.000000/4.000000/16.000000:R/0/90/0,box=8.000000/8.000000/0.000000/false:8.000000/20.000000/16.000000/0.000000/45.000000/0.000000/8.000000/9.000000/8.000000:w/5/0.000000/4.000000/16.000000/16.000000:e/5/0.000000/4.000000/16.000000/16.000000:R/0/90/0,box=0.000000/8.000000/8.000000/false:16.000000/20.000000/8.000000/0.000000/45.000000/0.000000/8.000000/9.000000/8.000000:n/5/0.000000/4.000000/16.000000/16.000000:s/5/0.000000/4.000000/16.000000/16.000000:R/0/90/0
 [1.20-]modellist:id=%calibrated_sculk_sensor,state=facing:east/sculk_sensor_phase:cooldown,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/2/0.000000/8.000000/16.000000/16.000000:w/2/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:d/1/0.000000/0.000000/16.000000/16.000000:e/2/0.000000/8.000000/16.000000/16.000000:u/3/0.000000/0.000000/16.000000/16.000000:R/0/90/0,box=-1.000000/8.000000/3.000000:7.000000/16.000000/3.000000/0.000000/45.000000/0.000000/3.000000/12.000000/3.000000:n/4/4.000000/8.000000/12.000000/16.000000:s/4/12.000000/8.000000/4.000000/16.000000:R/0/90/0,box=9.000000/8.000000/3.000000:17.000000/16.000000/3.000000/0.000000/-45.000000/0.000000/13.000000/12.000000/3.000000:n/4/12.000000/8.000000/4.000000/16.000000:s/4/4.000000/8.000000/12.000000/16.000000:R/0/90/0,box=9.000000/8.000000/13.000000:17.000000/16.000000/13.000000/0.000000/45.000000/0.000000/13.000000/12.000000/13.000000:n/4/12.000000/8.000000/4.000000/16.000000:s/4/4.000000/8.000000/12.000000/16.000000:R/0/90/0,box=-1.000000/8.000000/13.000000:7.000000/16.000000/13.000000/0.000000/-45.000000/0.000000/3.000000/12.000000/13.000000:n/4/4.000000/8.000000/12.000000/16.000000:s/4/12.000000/8.000000/4.000000/16.000000:R/0/90/0,box=8.000000/8.000000/0.000000/false:8.000000/20.000000/16.000000/0.000000/45.000000/0.000000/8.000000/9.000000/8.000000:w/5/0.000000/4.000000/16.000000/16.000000:e/5/0.000000/4.000000/16.000000/16.000000:R/0/90/0,box=0.000000/8.000000/8.000000/false:16.000000/20.000000/8.000000/0.000000/45.000000/0.000000/8.000000/9.000000/8.000000:n/5/0.000000/4.000000/16.000000/16.000000:s/5/0.000000/4.000000/16.000000/16.000000:R/0/90/0
-
-# 1.20.3
-[1.20.3-]modellist:id=%tuff_slab,state=type:top,box=0.000000/8.000000/0.000000:16.000000/16.000000/16.000000:n/0/0.000000/0.000000/16.000000/8.000000:w/0/0.000000/0.000000/16.000000/8.000000:e/0/0.000000/0.000000/16.000000/8.000000:s/0/0.000000/0.000000/16.000000/8.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
-[1.20.3-]modellist:id=%tuff_slab,state=type:bottom,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/0/0.000000/8.000000/16.000000/16.000000:w/0/0.000000/8.000000/16.000000/16.000000:e/0/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
-[1.20.3-]customblock:id=%tuff_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
-[1.20.3-]customblock:id=%tuff_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
-[1.20.3-]modellist:id=%polished_tuff_slab,state=type:top,box=0.000000/8.000000/0.000000:16.000000/16.000000/16.000000:n/0/0.000000/0.000000/16.000000/8.000000:w/0/0.000000/0.000000/16.000000/8.000000:e/0/0.000000/0.000000/16.000000/8.000000:s/0/0.000000/0.000000/16.000000/8.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
-[1.20.3-]modellist:id=%polished_tuff_slab,state=type:bottom,box=0.000000/0.000000/0.000000:16.000000/8.000000/16.000000:n/0/0.000000/8.000000/16.000000/16.000000:w/0/0.000000/8.000000/16.000000/16.000000:e/0/0.000000/8.000000/16.000000/16.000000:s/0/0.000000/8.000000/16.000000/16.000000:u/0/0.000000/0.000000/16.000000/16.000000:d/0/0.000000/0.000000/16.000000/16.000000
-[1.20.3-]customblock:id=%polished_tuff_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
-[1.20.3-]customblock:id=%polished_tuff_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
-[1.20.3-]customblock:id=%polished_tuff_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
-[1.20.3-]customblock:id=%polished_tuff_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
-[1.20.3-]customblock:id=%copper_door,id=%exposed_copper_door,id=%oxidized_copper_door,id=%weathered_copper_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer
-[1.20.3-]customblock:id=%waxed_copper_door,id=%waxed_exposed_copper_door,id=%waxed_oxidized_copper_door,id=%waxed_weathered_copper_door,class=org.dynmap.hdmap.renderer.DoorStateRenderer
-
-[1.20.3-]boxblock:id=%copper_trapdoor,id=%waxed_copper_trapdoor,id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,data=12-15,data=28-31,data=44-47,data=60-63,ymax=0.1875
-[1.20.3-]boxblock:id=%copper_trapdoor,id=%waxed_copper_trapdoor,id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,data=32-35,data=40-44,xmin=0.8125
-[1.20.3-]boxblock:id=%copper_trapdoor,id=%waxed_copper_trapdoor,id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,data=48-51,data=56-59,xmax=0.1875
-[1.20.3-]boxblock:id=%copper_trapdoor,id=%waxed_copper_trapdoor,id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,data=16-19,data=24-27,zmax=0.1875
-[1.20.3-]boxblock:id=%copper_trapdoor,id=%waxed_copper_trapdoor,id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,data=0-3,data=8-11,zmin=0.8125
-[1.20.3-]boxblock:id=%copper_trapdoor,id=%waxed_copper_trapdoor,id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,data=4-7,data=20-23,data=36-39,data=52-55,ymin=0.8125
-

DynmapCore/src/main/resources/texture_1.txt

@@ -814,8 +814,7 @@ block:id=detector_rail,state=powered:false,patch0=0:detector_rail,transparency=T
 # Web
 block:id=cobweb,patch0-1=0:cobweb,transparency=TRANSPARENT
 # Grass
-[-1.20.2]block:id=grass,patch0-1=1000:grass,transparency=TRANSPARENT
-[1.20.3-]block:id=short_grass,patch0-1=1000:grass,transparency=TRANSPARENT
+block:id=grass,patch0-1=1000:grass,transparency=TRANSPARENT
 # Fern
 block:id=fern,patch0-1=1000:fern,transparency=TRANSPARENT
 # Dead shrub
@@ -4514,88 +4513,3 @@ block:id=%melon_stem,patch0=0:melon_stem,blockcolor=foliagebiome,transparency=TR
 [1.20-]block:id=%calibrated_sculk_sensor,state=facing:east/sculk_sensor_phase:inactive,patch0=0:calibrated_sculk_sensor_input_side,patch1=0:sculk_sensor_bottom,patch2=0:sculk_sensor_side,patch3=0:calibrated_sculk_sensor_top,patch4=0:sculk_sensor_tendril_inactive,patch5=0:calibrated_sculk_sensor_amethyst,transparency=SEMITRANSPARENT,stdrot=true
 [1.20-]block:id=%calibrated_sculk_sensor,state=facing:east/sculk_sensor_phase:active,patch0=0:calibrated_sculk_sensor_input_side,patch1=0:sculk_sensor_bottom,patch2=0:sculk_sensor_side,patch3=0:calibrated_sculk_sensor_top,patch4=0:sculk_sensor_tendril_active,patch5=0:calibrated_sculk_sensor_amethyst,transparency=SEMITRANSPARENT,stdrot=true
 [1.20-]block:id=%calibrated_sculk_sensor,state=facing:east/sculk_sensor_phase:cooldown,patch0=0:calibrated_sculk_sensor_input_side,patch1=0:sculk_sensor_bottom,patch2=0:sculk_sensor_side,patch3=0:calibrated_sculk_sensor_top,patch4=0:sculk_sensor_tendril_active,patch5=0:calibrated_sculk_sensor_amethyst,transparency=SEMITRANSPARENT,stdrot=true
-
-# 1.20.3
-[1.20.3-]texture:id=suspicious_gravel_0,filename=assets/minecraft/textures/block/suspicious_gravel_0.png,xcount=1,ycount=1
-[1.20.3-]texture:id=suspicious_gravel_1,filename=assets/minecraft/textures/block/suspicious_gravel_1.png,xcount=1,ycount=1
-[1.20.3-]texture:id=suspicious_gravel_2,filename=assets/minecraft/textures/block/suspicious_gravel_2.png,xcount=1,ycount=1
-[1.20.3-]texture:id=suspicious_gravel_3,filename=assets/minecraft/textures/block/suspicious_gravel_3.png,xcount=1,ycount=1
-[1.20.3-]texture:id=tuff,filename=assets/minecraft/textures/block/tuff.png,xcount=1,ycount=1
-[1.20.3-]texture:id=polished_tuff,filename=assets/minecraft/textures/block/polished_tuff.png,xcount=1,ycount=1
-[1.20.3-]texture:id=chiseled_tuff,filename=assets/minecraft/textures/block/chiseled_tuff.png,xcount=1,ycount=1
-[1.20.3-]texture:id=chiseled_tuff_top,filename=assets/minecraft/textures/block/chiseled_tuff_top.png,xcount=1,ycount=1
-[1.20.3-]texture:id=tuff_bricks,filename=assets/minecraft/textures/block/tuff_bricks.png,xcount=1,ycount=1
-[1.20.3-]texture:id=chiseled_tuff_bricks,filename=assets/minecraft/textures/block/chiseled_tuff_bricks.png,xcount=1,ycount=1
-[1.20.3-]texture:id=chiseled_tuff_bricks_top,filename=assets/minecraft/textures/block/chiseled_tuff_bricks_top.png,xcount=1,ycount=1
-[1.20.3-]texture:id=oxidized_chiseled_copper,filename=assets/minecraft/textures/block/oxidized_chiseled_copper.png,xcount=1,ycount=1
-[1.20.3-]texture:id=weathered_chiseled_copper,filename=assets/minecraft/textures/block/weathered_chiseled_copper.png,xcount=1,ycount=1
-[1.20.3-]texture:id=exposed_chiseled_copper,filename=assets/minecraft/textures/block/exposed_chiseled_copper.png,xcount=1,ycount=1
-[1.20.3-]texture:id=chiseled_copper,filename=assets/minecraft/textures/block/chiseled_copper.png,xcount=1,ycount=1
-[1.20.3-]texture:id=copper_door_top,filename=assets/minecraft/textures/block/copper_door_top.png,xcount=1,ycount=1
-[1.20.3-]texture:id=copper_door_bottom,filename=assets/minecraft/textures/block/copper_door_bottom.png,xcount=1,ycount=1
-[1.20.3-]texture:id=exposed_copper_door_top,filename=assets/minecraft/textures/block/exposed_copper_door_top.png,xcount=1,ycount=1
-[1.20.3-]texture:id=exposed_copper_door_bottom,filename=assets/minecraft/textures/block/exposed_copper_door_bottom.png,xcount=1,ycount=1
-[1.20.3-]texture:id=oxidized_copper_door_top,filename=assets/minecraft/textures/block/oxidized_copper_door_top.png,xcount=1,ycount=1
-[1.20.3-]texture:id=oxidized_copper_door_bottom,filename=assets/minecraft/textures/block/oxidized_copper_door_bottom.png,xcount=1,ycount=1
-[1.20.3-]texture:id=weathered_copper_door_top,filename=assets/minecraft/textures/block/weathered_copper_door_top.png,xcount=1,ycount=1
-[1.20.3-]texture:id=weathered_copper_door_bottom,filename=assets/minecraft/textures/block/weathered_copper_door_bottom.png,xcount=1,ycount=1
-[1.20.3-]texture:id=copper_trapdoor,filename=assets/minecraft/textures/block/copper_trapdoor.png,xcount=1,ycount=1
-[1.20.3-]texture:id=exposed_copper_trapdoor,filename=assets/minecraft/textures/block/exposed_copper_trapdoor.png,xcount=1,ycount=1
-[1.20.3-]texture:id=oxidized_copper_trapdoor,filename=assets/minecraft/textures/block/oxidized_copper_trapdoor.png,xcount=1,ycount=1
-[1.20.3-]texture:id=weathered_copper_trapdoor,filename=assets/minecraft/textures/block/weathered_copper_trapdoor.png,xcount=1,ycount=1
-[1.20.3-]texture:id=copper_grate,filename=assets/minecraft/textures/block/copper_grate.png,xcount=1,ycount=1
-[1.20.3-]texture:id=exposed_copper_grate,filename=assets/minecraft/textures/block/exposed_copper_grate.png,xcount=1,ycount=1
-[1.20.3-]texture:id=weathered_copper_grate,filename=assets/minecraft/textures/block/weathered_copper_grate.png,xcount=1,ycount=1
-[1.20.3-]texture:id=oxidized_copper_grate,filename=assets/minecraft/textures/block/oxidized_copper_grate.png,xcount=1,ycount=1
-[1.20.3-]block:id=%suspicious_gravel,state=dusted:0,patch0=0:suspicious_gravel_0,patch1=0:suspicious_gravel_0,patch2=0:suspicious_gravel_0,patch3=0:suspicious_gravel_0,patch4=0:suspicious_gravel_0,patch5=0:suspicious_gravel_0,stdrot=true
-[1.20.3-]block:id=%suspicious_gravel,state=dusted:1,patch0=0:suspicious_gravel_1,patch1=0:suspicious_gravel_1,patch2=0:suspicious_gravel_1,patch3=0:suspicious_gravel_1,patch4=0:suspicious_gravel_1,patch5=0:suspicious_gravel_1,stdrot=true
-[1.20.3-]block:id=%suspicious_gravel,state=dusted:2,patch0=0:suspicious_gravel_2,patch1=0:suspicious_gravel_2,patch2=0:suspicious_gravel_2,patch3=0:suspicious_gravel_2,patch4=0:suspicious_gravel_2,patch5=0:suspicious_gravel_2,stdrot=true
-[1.20.3-]block:id=%suspicious_gravel,state=dusted:3,patch0=0:suspicious_gravel_3,patch1=0:suspicious_gravel_3,patch2=0:suspicious_gravel_3,patch3=0:suspicious_gravel_3,patch4=0:suspicious_gravel_3,patch5=0:suspicious_gravel_3,stdrot=true
-[1.20.3-]block:id=%tuff,patch0-5=0:tuff,stdrot=true
-[1.20.3-]block:id=%tuff_slab,state=type:top,patch0=0:tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_slab,state=type:bottom,patch0=0:tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_slab,state=type:double,patch0-5=0:tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_stairs,patch0-2=0:tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_wall,patch0-2=0:tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%polished_tuff,patch0-5=0:polished_tuff,stdrot=true
-[1.20.3-]block:id=%polished_tuff_slab,state=type:top,patch0=0:polished_tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%polished_tuff_slab,state=type:bottom,patch0=0:polished_tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%polished_tuff_slab,state=type:double,patch0-5=0:polished_tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%polished_tuff_stairs,patch0-2=0:polished_tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%polished_tuff_wall,patch0-2=0:polished_tuff,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%chiseled_tuff,patch0=0:chiseled_tuff,patch1=0:chiseled_tuff_top,patch2=0:chiseled_tuff,patch3=0:chiseled_tuff,patch4=0:chiseled_tuff_top,patch5=0:chiseled_tuff,stdrot=true
-[1.20.3-]block:id=%tuff_bricks,patch0-5=0:tuff_bricks,stdrot=true
-[1.20.3-]block:id=%tuff_brick_slab,state=type:top,patch0=0:tuff_bricks,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_brick_slab,state=type:bottom,patch0=0:tuff_bricks,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_brick_slab,state=type:double,patch0-5=0:tuff_bricks,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_brick_stairs,patch0-2=0:tuff_bricks,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%tuff_brick_wall,patch0-2=0:tuff_bricks,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.3-]block:id=%chiseled_tuff_bricks,patch0-5=0:chiseled_tuff_bricks,stdrot=true
-[1.20.3-]block:id=%oxidized_chiseled_copper,patch0-5=0:oxidized_chiseled_copper,stdrot=true
-[1.20.3-]block:id=%weathered_chiseled_copper,patch0-5=0:weathered_chiseled_copper,stdrot=true
-[1.20.3-]block:id=%exposed_chiseled_copper,patch0-5=0:exposed_chiseled_copper,stdrot=true
-[1.20.3-]block:id=%chiseled_copper,patch0-5=0:chiseled_copper,stdrot=true
-[1.20.3-]block:id=%waxed_oxidized_chiseled_copper,patch0-5=0:oxidized_chiseled_copper,stdrot=true
-[1.20.3-]block:id=%waxed_weathered_chiseled_copper,patch0-5=0:weathered_chiseled_copper,stdrot=true
-[1.20.3-]block:id=%waxed_exposed_chiseled_copper,patch0-5=0:exposed_chiseled_copper,stdrot=true
-[1.20.3-]block:id=%waxed_chiseled_copper,patch0-5=0:chiseled_copper,stdrot=true
-[1.20.3-]block:id=%copper_door,data=*,patch0=0:copper_door_top,patch1=0:copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%exposed_copper_door,data=*,patch0=0:exposed_copper_door_top,patch1=0:exposed_copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%oxidized_copper_door,data=*,patch0=0:oxidized_copper_door_top,patch1=0:oxidized_copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%weathered_copper_door,data=*,patch0=0:weathered_copper_door_top,patch1=0:weathered_copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%waxed_copper_door,data=*,patch0=0:copper_door_top,patch1=0:copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%waxed_exposed_copper_door,data=*,patch0=0:exposed_copper_door_top,patch1=0:exposed_copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%waxed_oxidized_copper_door,data=*,patch0=0:oxidized_copper_door_top,patch1=0:oxidized_copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%waxed_weathered_copper_door,data=*,patch0=0:weathered_copper_door_top,patch1=0:weathered_copper_door_bottom,transparency=TRANSPARENT
-[1.20.3-]block:id=%copper_trapdoor,id=%waxed_copper_trapdoor,allfaces=0:copper_trapdoor,stdrot=true,transparency=TRANSPARENT
-[1.20.3-]block:id=%exposed_copper_trapdoor,id=%waxed_exposed_copper_trapdoor,allfaces=0:exposed_copper_trapdoor,stdrot=true,transparency=TRANSPARENT
-[1.20.3-]block:id=%oxidized_copper_trapdoor,id=%waxed_oxidized_copper_trapdoor,allfaces=0:oxidized_copper_trapdoor,stdrot=true,transparency=TRANSPARENT
-[1.20.3-]block:id=%weathered_copper_trapdoor,id=%waxed_weathered_copper_trapdoor,allfaces=0:weathered_copper_trapdoor,stdrot=true,transparency=TRANSPARENT
-[1.20.3-]block:id=%copper_grate,patch0-5=0:copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%exposed_copper_grate,patch0-5=0:exposed_copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%weathered_copper_grate,patch0-5=0:weathered_copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%oxidized_copper_grate,patch0-5=0:oxidized_copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%waxed_copper_grate,patch0-5=0:copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%waxed_exposed_copper_grate,patch0-5=0:exposed_copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%waxed_weathered_copper_grate,patch0-5=0:weathered_copper_grate,transparency=TRANSPARENT,stdrot=true
-[1.20.3-]block:id=%waxed_oxidized_copper_grate,patch0-5=0:oxidized_copper_grate,transparency=TRANSPARENT,stdrot=true