Merge branch 'v3.0' into 1.21.1-fabric-port

Author: mikeprimm

.gitignore

@@ -37,3 +37,4 @@
 /fabric-1.16.1_server.launch
 /fabric-1.16.2_client.launch
 /fabric-1.16.2_server.launch
+

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

@@ -182,36 +182,36 @@ public boolean processWebRegisterCommand(DynmapCore core, DynmapCommandSender se
         boolean other = false;
         if(args.length > 1) {
             if(!core.checkPlayerPermission(sender, "webregister.other")) {
-                sender.sendMessage("Not authorized to set web login information for other players");
+                sender.sendMessage("You're not authorised to access web registration info for other players");
                 return true;
             }
             uid = args[1];
             other = true;
         }
         else if (player == null) {   /* Console? */
-            sender.sendMessage("Must provide user ID to register web login");
+            sender.sendMessage("Must provide username to access web registration info");
             return true;
         }
         else {
             uid = player.getName();
         }
         if (checkUserName(uid) == false) {
-            sender.sendMessage("Invalid user ID");
+            sender.sendMessage("Invalid username. Did you type it correctly?");
             return true;
         }
         String regkey = String.format("%04d-%04d", rnd.nextInt(10000), rnd.nextInt(10000));
         pending_registrations.put(uid.toLowerCase(), regkey.toLowerCase());
-        sender.sendMessage("Registration pending for user ID: " + uid);
+        sender.sendMessage("Registration pending for username: " + uid);
         sender.sendMessage("Registration code: " + regkey);
         publicRegistrationURL = core.configuration.getString("publicURL", "index.html");
-        sender.sendMessage("Enter ID and code on registration web page (" + publicRegistrationURL.toString() + ") to complete registration");
+        sender.sendMessage("Enter username and registration code when prompted on web page (" + publicRegistrationURL.toString() + ") to complete registration");
         if(other) {
             DynmapPlayer p = core.getServer().getPlayer(uid);
-            if(p != null) {
+            if(p != null && sender != p) {
                 p.sendMessage("The registration of your account for web access has been started.");
                 p.sendMessage("To complete the process, access the Login page on the Dynmap map");
                 p.sendMessage("Registration code: " + regkey);
-                p.sendMessage("The user ID must match your account ID, but the password should NOT be the same.");
+                p.sendMessage("Enter your username and registration code when prompted on web page (" + publicRegistrationURL.toString() + ") to complete registration");
             }
         }
         core.events.trigger("loginupdated", null);

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

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

DynmapCore/src/main/resources/extracted/web/login.html

@@ -62,11 +62,11 @@ <h2>Minecraft Dynamic Map - Login/Register</h2>
 <tr><td class='login'>
 <FORM METHOD=POST name=login ACTION="up/login">
 <p>
-Enter user ID and password:
+Enter username and password:
 <BR>
 <BR>
 <table>
-<tr><td>User ID</td><td><input type="text" size="20" name="j_username"></td></tr>
+<tr><td>Username</td><td><input type="text" size="20" name="j_username"></td></tr>
 <tr><td>Password</td><td><input type="password" size="20" name="j_password"></td></tr>
 </table>
 <BR>
@@ -80,11 +80,11 @@ <h2>Minecraft Dynamic Map - Login/Register</h2>
 <td class='register'>
 <FORM METHOD=POST name=register ACTION="up/register">
 <p>
-Run '/dynmap webregister' and enter returned registration code, along with userid and password:
+Run '/dynmap webregister' and enter your username and registration code, and create a password:
 <BR>
 <BR>
 <table>
-<tr><td>User ID</td><td><input type="text" size="20" name="j_username"></td></tr>
+<tr><td>Username</td><td><input type="text" size="20" name="j_username"></td></tr>
 <tr><td>Password</td><td><input type="password" size="20" name="j_password"></td></tr>
 <tr><td>Verify Password</td><td><input type="password" size="20" name="j_verify_password"></td></tr>
 <tr><td>Registration Code</td><td><input type="text" size="20" name="j_passcode"></td></tr>

DynmapCore/src/main/resources/models_1.txt

@@ -3451,8 +3451,10 @@ modellist:id=%dropper,state=facing:down,box=0.000000/0.000000/0.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=%tuff_brick_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
+[1.20.3-]modellist:id=%tuff_brick_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_brick_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_brick_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
 

build.gradle

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

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

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

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

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

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

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

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

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