Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

General warning cleanup in DynmapCore

This commit is contained in:
Mike Primm 2022-02-05 15:16:08 -06:00
parent d6b1383825
commit 9d89e56586
28 changed files with 77 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DynmapCore/src/main/java/org/dynmap/Client.java
View File

@ -4,8 +4,6 @@ import java.io.IOException;
import java.io.Writer;
import java.util.Random;
import javax.sound.sampled.AudioFormat.Encoding;
import org.json.simple.JSONAware;
import org.json.simple.JSONStreamAware;
import org.owasp.html.HtmlPolicyBuilder;

1
DynmapCore/src/main/java/org/dynmap/ColorScheme.java
View File

@ -105,7 +105,6 @@ public class ColorScheme {
continue;
}
Integer id = null;
Integer dat = null;
boolean isbiome = false;
boolean istemp = false;
boolean israin = false;

19
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View File

@ -75,7 +75,6 @@ import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.session.DefaultSessionIdManager;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.resource.FileResource;
import org.eclipse.jetty.util.thread.ExecutorThreadPool;
import org.yaml.snakeyaml.Yaml;
@ -913,12 +912,13 @@ public class DynmapCore implements DynmapCommonAPI {
return config_hashcode;
}
private FileResource createFileResource(String path) {
@SuppressWarnings("deprecation")
private org.eclipse.jetty.util.resource.FileResource createFileResource(String path) {
try {
File f = new File(path);
URI uri = f.toURI();
URL url = uri.toURL();
return new FileResource(url);
return new org.eclipse.jetty.util.resource.FileResource(url);
} catch(Exception e) {
Log.info("Could not create file resource");
return null;
@ -1970,11 +1970,11 @@ public class DynmapCore implements DynmapCommonAPI {
if(args.length == 2) { // /dynmap radiusrender *<world>* <x> <z> <radius> <map>
return getWorldSuggestions(args[1]);
} if(args.length == 3 && player != null) { // /dynmap radiusrender <radius> *<mapname>*
Scanner sc = new Scanner(args[1]);
if(sc.hasNextInt(10)) { //Only show map suggestions if a number was entered before
return getMapSuggestions(player.getLocation().world, args[2], false);
}
try (Scanner sc = new Scanner(args[1])) {
if(sc.hasNextInt(10)) { //Only show map suggestions if a number was entered before
return getMapSuggestions(player.getLocation().world, args[2], false);
}
}
} else if(args.length == 6) { // /dynmap radiusrender <world> <x> <z> <radius> *<map>*
return getMapSuggestions(args[1], args[5], false);
}
@ -2644,7 +2644,6 @@ public class DynmapCore implements DynmapCommonAPI {
int off = 0;
int firsthit = -1;
boolean done = false;
String orig = msg;
while (!done) {
int idx = msg.indexOf("${", off); // Look for next ${
if (idx >= 0) { // Hit
@ -2790,7 +2789,7 @@ public class DynmapCore implements DynmapCommonAPI {
return platformVersion;
}
private static boolean deleteDirectory(File dir) {
public static boolean deleteDirectory(File dir) {
File[] files = dir.listFiles();
if (files != null) {
for (File f : files) {

1
DynmapCore/src/main/java/org/dynmap/PlayerFaces.java
View File

@ -174,7 +174,6 @@ public class PlayerFaces {
// Copy face and overlay to icon
copyLayersToTarget(img, 8*scale, 8*scale, 40*scale, 8*scale, 8*scale, 8*scale, faceOriginal, 0, 8*scale);
int[] faceaccessory = new int[64]; /* 8x8 of face accessory */
/* Get buffered image for face at 8x8 */
DynmapBufferedImage face8x8 = DynmapBufferedImage.allocateBufferedImage(8, 8);
Image face8x8_image = faceOriginal.getScaledInstance(8,8,BufferedImage.SCALE_SMOOTH);

1
DynmapCore/src/main/java/org/dynmap/common/BiomeMap.java
View File

@ -4,7 +4,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.dynmap.Log;
import org.dynmap.hdmap.HDBlockModels;
/* Generic biome mapping */

1
DynmapCore/src/main/java/org/dynmap/common/chunk/GenericChunk.java
View File

@ -3,7 +3,6 @@ package org.dynmap.common.chunk;
import java.util.Arrays;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.Log;
import org.dynmap.common.BiomeMap;
// Generic chunk representation

2
DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java
View File

@ -7,7 +7,6 @@ import java.util.ListIterator;
import org.dynmap.DynmapChunk;
import org.dynmap.DynmapCore;
import org.dynmap.DynmapWorld;
import org.dynmap.Log;
import org.dynmap.common.BiomeMap;
import org.dynmap.common.chunk.GenericChunkCache.ChunkCacheRec;
import org.dynmap.hdmap.HDBlockModels;
@ -24,7 +23,6 @@ import org.dynmap.utils.VisibilityLimit;
* Abstract container for handling map cache and map iterator, using DynmapChunks
*/
public abstract class GenericMapChunkCache extends MapChunkCache {
private static boolean init = false;
protected DynmapWorld dw;
private int nsect;
private int sectoff; // Offset for sake of negative section indexes

2
DynmapCore/src/main/java/org/dynmap/common/chunk/GenericNBTList.java
View File

@ -1,7 +1,5 @@
package org.dynmap.common.chunk;
import java.util.Set;
// Generic interface for accessing an NBT Composite object
public interface GenericNBTList {
public int size();

6
DynmapCore/src/main/java/org/dynmap/exporter/OBJExport.java
View File

@ -523,6 +523,12 @@ public class OBJExport {
case TOP:
f.faceLine = String.format("f %d/%d %d/%d %d/%d %d/%d\n", v[0], uv[0], v[1], uv[1], v[2], uv[2], v[3], uv[3]);
break;
case TOPFLIP:
f.faceLine += String.format("f %d/%d %d/%d %d/%d %d/%d\n", v[3], uv[2], v[2], uv[3], v[1], uv[0], v[0], uv[1]);
break;
case TOPFLIPV:
f.faceLine = String.format("f %d/%d %d/%d %d/%d %d/%d\n", v[0], uv[0], v[1], uv[1], v[2], uv[2], v[3], uv[3]);
break;
case BOTTOM:
f.faceLine = String.format("f %d/%d %d/%d %d/%d %d/%d\n", v[3], uv[3], v[2], uv[2], v[1], uv[1], v[0], uv[0]);
break;

30
DynmapCore/src/main/java/org/dynmap/hdmap/ChunkStatusHDShader.java
View File

@ -33,21 +33,21 @@ public class ChunkStatusHDShader implements HDShader {
};
private static HashMap<String, ChunkStatusMap> statusmap = new HashMap<String, ChunkStatusMap>();
private static ChunkStatusMap[] statusvals = {
new ChunkStatusMap("empty", 0xFF0000),
new ChunkStatusMap("structure_starts", 0xFF1493),
new ChunkStatusMap("structure_references", 0xFF7F50),
new ChunkStatusMap("biomes", 0xFFA500),
new ChunkStatusMap("noise", 0xFFD700),
new ChunkStatusMap("surface", 0xFFFF00),
new ChunkStatusMap("carvers", 0xFFEFD5),
new ChunkStatusMap("liquid_carvers", 0xF0E68C),
new ChunkStatusMap("features", 0xBDB76B),
new ChunkStatusMap("light", 0xDDA0DD),
new ChunkStatusMap("spawn", 0xFF00FF),
new ChunkStatusMap("heightmaps", 0x9370DB),
new ChunkStatusMap("full", 0x32CD32),
};
static {
new ChunkStatusMap("empty", 0xFF0000);
new ChunkStatusMap("structure_starts", 0xFF1493);
new ChunkStatusMap("structure_references", 0xFF7F50);
new ChunkStatusMap("biomes", 0xFFA500);
new ChunkStatusMap("noise", 0xFFD700);
new ChunkStatusMap("surface", 0xFFFF00);
new ChunkStatusMap("carvers", 0xFFEFD5);
new ChunkStatusMap("liquid_carvers", 0xF0E68C);
new ChunkStatusMap("features", 0xBDB76B);
new ChunkStatusMap("light", 0xDDA0DD);
new ChunkStatusMap("spawn", 0xFF00FF);
new ChunkStatusMap("heightmaps", 0x9370DB);
new ChunkStatusMap("full", 0x32CD32);
}
final static Color unknown_color = new Color(255, 255, 255);

6
DynmapCore/src/main/java/org/dynmap/hdmap/ChunkVersionHDShader.java
View File

@ -4,8 +4,6 @@ import static org.dynmap.JSONUtils.s;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.TreeSet;
import org.dynmap.Color;
import org.dynmap.ConfigurationNode;
@ -27,11 +25,11 @@ public class ChunkVersionHDShader implements HDShader {
private static class DataVersionMap {
int dataVersion;
String version;
//String version;
Color defcolor;
DataVersionMap(int dv, String v, int c) {
dataVersion = dv;
version = v;
//version = v;
defcolor = new Color((c>>16)&0xFF, (c>>8)&0xFF, c&0xFF);
}

3
DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java
View File

@ -2,12 +2,9 @@ package org.dynmap.hdmap;
import java.util.Arrays;
import java.util.BitSet;
import java.util.List;
import java.util.Map;
import org.dynmap.hdmap.TexturePack;
import org.dynmap.Log;
import org.dynmap.hdmap.HDBlockModels;
import org.dynmap.hdmap.TexturePack.BlockTransparency;
import org.dynmap.hdmap.TexturePack.ColorizingData;
import org.dynmap.renderer.CustomColorMultiplier;

3
DynmapCore/src/main/java/org/dynmap/hdmap/LightLevelHDLighting.java
View File

@ -4,10 +4,7 @@ import org.dynmap.Color;
import org.dynmap.ConfigurationNode;
import org.dynmap.DynmapCore;
import org.dynmap.DynmapWorld;
import org.dynmap.Log;
import org.dynmap.MapManager;
import org.dynmap.utils.LightLevels;
import org.dynmap.utils.BlockStep;
public class LightLevelHDLighting extends DefaultHDLighting {
private final Color[] lightlevelcolors = new Color[16];

1
DynmapCore/src/main/java/org/dynmap/hdmap/ShadowHDLighting.java
View File

@ -4,7 +4,6 @@ import org.dynmap.Color;
import org.dynmap.ConfigurationNode;
import org.dynmap.DynmapCore;
import org.dynmap.DynmapWorld;
import org.dynmap.Log;
import org.dynmap.MapManager;
import org.dynmap.utils.LightLevels;
import org.dynmap.utils.BlockStep;

7
DynmapCore/src/main/java/org/dynmap/hdmap/renderer/ChestStateRenderer.java
View File

@ -1,14 +1,7 @@
package org.dynmap.hdmap.renderer;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Map;
import org.dynmap.renderer.CustomRenderer;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.renderer.MapDataContext;
import org.dynmap.renderer.RenderPatch;
import org.dynmap.renderer.RenderPatchFactory;
/**
* Simple renderer for handling single and double chests (1.13+)

1
DynmapCore/src/main/java/org/dynmap/hdmap/renderer/FenceWallBlockStateRenderer.java
View File

@ -5,7 +5,6 @@ import java.util.BitSet;
import java.util.List;
import java.util.Map;
import org.dynmap.Log;
import org.dynmap.renderer.CustomRenderer;
import org.dynmap.renderer.MapDataContext;
import org.dynmap.renderer.RenderPatch;

1
DynmapCore/src/main/java/org/dynmap/markers/impl/AreaMarkerImpl.java
View File

@ -9,7 +9,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.dynmap.Client;
import org.dynmap.ConfigurationNode;
import org.dynmap.DynmapWorld;
import org.dynmap.Log;
import org.dynmap.MapManager;
import org.dynmap.hdmap.HDPerspective;
import org.dynmap.markers.AreaMarker;

1
DynmapCore/src/main/java/org/dynmap/markers/impl/CircleMarkerImpl.java
View File

@ -11,7 +11,6 @@ import org.dynmap.hdmap.HDPerspective;
import org.dynmap.markers.CircleMarker;
import org.dynmap.markers.EnterExitMarker;
import org.dynmap.markers.MarkerSet;
import org.dynmap.markers.EnterExitMarker.EnterExitText;
import org.dynmap.markers.impl.MarkerAPIImpl.MarkerUpdate;
import org.dynmap.utils.Vector3D;

1
DynmapCore/src/main/java/org/dynmap/modsupport/impl/CopyBlockTextureRecordImpl.java
View File

@ -2,7 +2,6 @@ package org.dynmap.modsupport.impl;
import java.util.Arrays;
import org.dynmap.DynmapCore;
import org.dynmap.modsupport.CopyBlockTextureRecord;
import org.dynmap.modsupport.TransparencyMode;

6
DynmapCore/src/main/java/org/dynmap/modsupport/impl/ModModelDefinitionImpl.java
View File

@ -287,6 +287,12 @@ public class ModModelDefinitionImpl implements ModModelDefinition {
case TOP:
line += ",visibility=top";
break;
case TOPFLIP:
line += ",visibility=topflip";
break;
case TOPFLIPV:
line += ",visibility=topflipv";
break;
case FLIP:
line += ",visibility=flip";
break;

1
DynmapCore/src/main/java/org/dynmap/modsupport/impl/ModelBlockModelImpl.java
View File

@ -6,7 +6,6 @@ import java.util.HashMap;
import org.dynmap.modsupport.BlockSide;
import org.dynmap.modsupport.ModelBlockModel;
import org.dynmap.modsupport.ModelBlockModel.SideRotation;
public class ModelBlockModelImpl extends BlockModelImpl implements ModelBlockModel {

3
DynmapCore/src/main/java/org/dynmap/servlet/FileResourceHandler.java
View File

@ -9,9 +9,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.lang.reflect.Method;
import java.lang.reflect.Field;
import java.lang.Class;

1
DynmapCore/src/main/java/org/dynmap/servlet/MapStorageResourceHandler.java
View File

@ -2,7 +2,6 @@ package org.dynmap.servlet;
import org.dynmap.DynmapCore;
import org.dynmap.DynmapWorld;
import org.dynmap.MapType.ImageEncoding;
import org.dynmap.PlayerFaces;
import org.dynmap.storage.MapStorage;
import org.dynmap.storage.MapStorageTile;

2
DynmapCore/src/main/java/org/dynmap/storage/MapStorageTileSearchEndCB.java
View File

@ -1,7 +1,5 @@
package org.dynmap.storage;
import org.dynmap.MapType.ImageEncoding;
public interface MapStorageTileSearchEndCB {
/**
* Callback for end of tile enumeration calls

1
DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java
View File

@ -27,7 +27,6 @@ import org.dynmap.storage.MapStorageBaseTileEnumCB;
import org.dynmap.storage.MapStorageTile;
import org.dynmap.storage.MapStorageTileEnumCB;
import org.dynmap.storage.MapStorageTileSearchEndCB;
import org.dynmap.storage.mysql.MySQLMapStorage.StorageTile;
import org.dynmap.utils.BufferInputStream;
import org.dynmap.utils.BufferOutputStream;

2
DynmapCore/src/main/java/org/dynmap/utils/DataBitsPacked.java
View File

@ -6,7 +6,7 @@ public class DataBitsPacked {
private final long[] values;
private final int bitsperrec;
private final long valuemask;
private final int length;
public final int length;
public static int calcLongCount(int i, int j) {
if (j == 0) {

41
DynmapCore/src/main/java/org/dynmap/utils/PatchDefinitionFactory.java
View File

@ -8,8 +8,6 @@ import org.dynmap.modsupport.BlockSide;
import org.dynmap.modsupport.ModelBlockModel;
import org.dynmap.renderer.RenderPatch;
import org.dynmap.renderer.RenderPatchFactory;
import org.dynmap.renderer.RenderPatchFactory.SideVisible;
import org.dynmap.Log;
public class PatchDefinitionFactory implements RenderPatchFactory {
private HashMap<PatchDefinition,PatchDefinition> patches = new HashMap<PatchDefinition,PatchDefinition>();
@ -198,24 +196,23 @@ public class PatchDefinitionFactory implements RenderPatchFactory {
return TexturePack.getTextureMapLength(id);
}
public static void main(String[] args) {
PatchDefinitionFactory fact = new PatchDefinitionFactory();
PatchDefinition pd;
BlockSide[] faces = { BlockSide.NORTH, BlockSide.EAST, BlockSide.SOUTH, BlockSide.WEST, BlockSide.TOP, BlockSide.BOTTOM };
// campfire log:box=1/0/0:5/4/16:n/0/0/4/4/8:e/0/0/1/16/5:s/0/0/4/4/8:w/0/16/0/0/4:u90/0/0/0/16/4:d90/0/0/0/16/4
double[][] uvs = { { 0, 4, 4, 8 }, { 0, 1, 16, 5 }, { 0, 4, 4, 8 }, { 16, 0, 0, 4 }, { 0, 0, 16, 4 }, { 0, 0, 16, 4 } };
ModelBlockModel.SideRotation[] rots = { ModelBlockModel.SideRotation.DEG0, ModelBlockModel.SideRotation.DEG0, ModelBlockModel.SideRotation.DEG0,
ModelBlockModel.SideRotation.DEG0, ModelBlockModel.SideRotation.DEG90, ModelBlockModel.SideRotation.DEG90 };
double[] from = { 1, 0, 0 };
double[] to = { 5, 4, 16 };
// Do normal faces, default limits
pd = new PatchDefinition();
for (int i = 0; i < faces.length; i++) {
pd.updateModelFace(from, to, faces[i], uvs[i], rots[i], 0);
System.out.println("Log " + faces[i] + ": " + pd);
}
// public static void main(String[] args) {
// PatchDefinition pd;
// BlockSide[] faces = { BlockSide.NORTH, BlockSide.EAST, BlockSide.SOUTH, BlockSide.WEST, BlockSide.TOP, BlockSide.BOTTOM };
// // campfire log:box=1/0/0:5/4/16:n/0/0/4/4/8:e/0/0/1/16/5:s/0/0/4/4/8:w/0/16/0/0/4:u90/0/0/0/16/4:d90/0/0/0/16/4
// double[][] uvs = { { 0, 4, 4, 8 }, { 0, 1, 16, 5 }, { 0, 4, 4, 8 }, { 16, 0, 0, 4 }, { 0, 0, 16, 4 }, { 0, 0, 16, 4 } };
// ModelBlockModel.SideRotation[] rots = { ModelBlockModel.SideRotation.DEG0, ModelBlockModel.SideRotation.DEG0, ModelBlockModel.SideRotation.DEG0,
// ModelBlockModel.SideRotation.DEG0, ModelBlockModel.SideRotation.DEG90, ModelBlockModel.SideRotation.DEG90 };
// double[] from = { 1, 0, 0 };
// double[] to = { 5, 4, 16 };
//
// // Do normal faces, default limits
// pd = new PatchDefinition();
// for (int i = 0; i < faces.length; i++) {
// pd.updateModelFace(from, to, faces[i], uvs[i], rots[i], 0);
// System.out.println("Log " + faces[i] + ": " + pd);
// }
//
// // Do normal faces, default limits
// pd = new PatchDefinition();
// for (BlockSide face : faces) {
@ -234,6 +231,6 @@ public class PatchDefinitionFactory implements RenderPatchFactory {
// pd.updateModelFace(from, toquarter, face, new double[] { 4, 4, 12, 12 }, 0);
// System.out.println("Full cube, middle half of texture " + face + ": " + pd);
// }
}
//
// }
}

30
DynmapCore/src/main/java/org/dynmap/web/HandlerRouter.java
View File

@ -11,18 +11,27 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@SuppressWarnings("deprecation")
public class HandlerRouter extends AbstractHandler {
PathMap pathMap = new PathMap();
PathMap<HandlerOrServlet> pathMap = new PathMap<HandlerOrServlet>();
private static class HandlerOrServlet {
Servlet servlet;
Handler handler;
HandlerOrServlet(Servlet s) { servlet = s; handler = null; }
HandlerOrServlet(Handler h) { servlet = null; handler = h; }
};
public HandlerRouter() {
}
public void addHandler(String path, Handler handler) {
pathMap.put(path, handler);
pathMap.put(path, new HandlerOrServlet(handler));
}
public void addServlet(String path, Servlet servlet) {
pathMap.put(path, servlet);
pathMap.put(path, new HandlerOrServlet(servlet));
}
public void clear() {
@ -32,7 +41,7 @@ public class HandlerRouter extends AbstractHandler {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
String pathInfo = request.getPathInfo();
PathMap.MappedEntry e = pathMap.getMatch(pathInfo);
PathMap.MappedEntry<HandlerOrServlet> e = pathMap.getMatch(pathInfo);
String mappedPath = e.getMapped();
String childPathInfo = pathInfo;
@ -45,13 +54,12 @@ public class HandlerRouter extends AbstractHandler {
org.eclipse.jetty.server.Request r = (org.eclipse.jetty.server.Request)request;
r.setPathInfo(childPathInfo);
Object o = e.getValue();
if (o instanceof Handler) {
Handler h = (Handler)o;
h.handle(target, baseRequest, request, response);
} else if (o instanceof Servlet) {
Servlet s = (Servlet)o;
s.service(request, response);
HandlerOrServlet o = e.getValue();
if (o.handler != null) {
o.handler.handle(target, baseRequest, request, response);
}
else if (o.servlet != null) {
o.servlet.service(request, response);
}
r.setPathInfo(pathInfo);