From c04c4d9ddda05f74bd01d4f9045930bebef4ea8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lindstr=C3=B6m?= Date: Wed, 22 May 2024 23:38:18 +0200 Subject: [PATCH] Fix wildcard imports --- src/main/java/org/dynmap/DynmapCore.java | 2 +- .../java/org/dynmap/DynmapMapCommands.java | 8 +++- .../dynmap/InternalClientUpdateComponent.java | 9 ++--- .../dynmap/JsonFileClientUpdateComponent.java | 14 +++---- .../java/org/dynmap/forge/DynmapPlugin.java | 11 ++++- .../integration/ForgeChunkLoaderMarkers.java | 5 ++- .../java/org/dynmap/hdmap/TexturePack.java | 40 ++++++++++--------- .../ArchitectureCraftShapeRenderer.java | 7 +++- .../renderer/CarpentersBlocksRenderer.java | 7 +++- .../renderer/CarpentersFenceRenderer.java | 6 ++- .../renderer/ChiselCTMBlockRenderer.java | 7 +++- .../renderer/EnderIOConduitRenderer.java | 7 +++- .../renderer/EnderStorageChestRenderer.java | 6 ++- .../renderer/ForestryLeavesRenderer.java | 6 ++- .../renderer/GregTechMachineRenderer.java | 16 +++++--- .../hdmap/renderer/IC2CropsRenderer.java | 6 ++- .../hdmap/renderer/MECableRenderer.java | 7 +++- .../hdmap/renderer/MultipartRenderer.java | 8 +++- .../OpenComputers3DPrintedModelRenderer.java | 8 +++- .../TinkersClearGlassBlockRenderer.java | 6 ++- .../hdmap/renderer/WardedBlockRenderer.java | 7 +++- .../java/org/dynmap/servlet/LoginServlet.java | 2 +- src/main/java/org/dynmap/web/BanIPFilter.java | 7 +++- .../org/dynmap/web/CustomHeaderFilter.java | 7 +++- .../java/org/dynmap/web/FilterHandler.java | 6 ++- 25 files changed, 155 insertions(+), 60 deletions(-) diff --git a/src/main/java/org/dynmap/DynmapCore.java b/src/main/java/org/dynmap/DynmapCore.java index d684e3678..51c081cd8 100644 --- a/src/main/java/org/dynmap/DynmapCore.java +++ b/src/main/java/org/dynmap/DynmapCore.java @@ -74,7 +74,7 @@ import org.eclipse.jetty.util.resource.FileResource; import org.eclipse.jetty.util.thread.ExecutorThreadPool; -import javax.servlet.*; +import javax.servlet.Filter; import javax.servlet.http.HttpServlet; public class DynmapCore implements DynmapCommonAPI { diff --git a/src/main/java/org/dynmap/DynmapMapCommands.java b/src/main/java/org/dynmap/DynmapMapCommands.java index c23fe069f..bafe5729f 100644 --- a/src/main/java/org/dynmap/DynmapMapCommands.java +++ b/src/main/java/org/dynmap/DynmapMapCommands.java @@ -1,6 +1,12 @@ package org.dynmap; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; diff --git a/src/main/java/org/dynmap/InternalClientUpdateComponent.java b/src/main/java/org/dynmap/InternalClientUpdateComponent.java index 7bd85c288..79da782e7 100644 --- a/src/main/java/org/dynmap/InternalClientUpdateComponent.java +++ b/src/main/java/org/dynmap/InternalClientUpdateComponent.java @@ -6,7 +6,6 @@ import org.dynmap.servlet.ClientUpdateServlet; import org.dynmap.servlet.SendMessageServlet; import org.json.simple.JSONObject; -import static org.dynmap.JSONUtils.*; public class InternalClientUpdateComponent extends ClientUpdateComponent { protected long jsonInterval; @@ -39,10 +38,10 @@ public InternalClientUpdateComponent(final DynmapCore dcore, final Configuration dcore.events.addListener("buildclientconfiguration", new Event.Listener() { @Override public void triggered(JSONObject t) { - s(t, "allowwebchat", allowwebchat); - s(t, "webchat-interval", webchatInterval); - s(t, "webchat-requires-login", req_login); - s(t, "chatlengthlimit", length_limit); + JSONUtils.s(t, "allowwebchat", allowwebchat); + JSONUtils.s(t, "webchat-interval", webchatInterval); + JSONUtils.s(t, "webchat-requires-login", req_login); + JSONUtils.s(t, "chatlengthlimit", length_limit); } }); diff --git a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java index ea250c6db..ba64e5264 100644 --- a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java +++ b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java @@ -24,8 +24,6 @@ import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import static org.dynmap.JSONUtils.*; - import java.nio.charset.Charset; public class JsonFileClientUpdateComponent extends ClientUpdateComponent { @@ -160,13 +158,13 @@ public void run() { core.events.addListener("buildclientconfiguration", new Event.Listener() { @Override public void triggered(JSONObject t) { - s(t, "jsonfile", true); - s(t, "allowwebchat", allowwebchat); - s(t, "webchat-requires-login", req_login); - s(t, "loginrequired", core.isLoginRequired()); + JSONUtils.s(t, "jsonfile", true); + JSONUtils.s(t, "allowwebchat", allowwebchat); + JSONUtils.s(t, "webchat-requires-login", req_login); + JSONUtils.s(t, "loginrequired", core.isLoginRequired()); // For 'sendmessage.php' - s(t, "webchat-interval", configuration.getFloat("webchat-interval", 5.0f)); - s(t, "chatlengthlimit", lengthlimit); + JSONUtils.s(t, "webchat-interval", configuration.getFloat("webchat-interval", 5.0f)); + JSONUtils.s(t, "chatlengthlimit", lengthlimit); } }); core.events.addListener("initialized", new Event.Listener() { diff --git a/src/main/java/org/dynmap/forge/DynmapPlugin.java b/src/main/java/org/dynmap/forge/DynmapPlugin.java index 8903e1c19..74deb196a 100644 --- a/src/main/java/org/dynmap/forge/DynmapPlugin.java +++ b/src/main/java/org/dynmap/forge/DynmapPlugin.java @@ -65,7 +65,16 @@ import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.dynmap.*; +import org.dynmap.ConfigurationNode; +import org.dynmap.DynmapChunk; +import org.dynmap.DynmapCommonAPIListener; +import org.dynmap.DynmapCore; +import org.dynmap.DynmapLocation; +import org.dynmap.DynmapWorld; +import org.dynmap.Log; +import org.dynmap.MapManager; +import org.dynmap.PlayerList; +import org.dynmap.Tags; import org.dynmap.forge.DmapCommand; import org.dynmap.forge.DmarkerCommand; import org.dynmap.forge.DynmapCommand; diff --git a/src/main/java/org/dynmap/forge/integration/ForgeChunkLoaderMarkers.java b/src/main/java/org/dynmap/forge/integration/ForgeChunkLoaderMarkers.java index c0bd42259..97c778d0a 100644 --- a/src/main/java/org/dynmap/forge/integration/ForgeChunkLoaderMarkers.java +++ b/src/main/java/org/dynmap/forge/integration/ForgeChunkLoaderMarkers.java @@ -14,7 +14,10 @@ import org.dynmap.DynmapCommonAPI; import org.dynmap.DynmapCommonAPIListener; import org.dynmap.DynmapCore; -import org.dynmap.forge.*; +import org.dynmap.forge.ForgeWorld; +import org.dynmap.forge.GwmCommand; +import org.dynmap.forge.GwmConfig; +import org.dynmap.forge.GwmSubCommand; import org.dynmap.markers.AreaMarker; import org.dynmap.markers.MarkerAPI; import org.dynmap.markers.MarkerSet; diff --git a/src/main/java/org/dynmap/hdmap/TexturePack.java b/src/main/java/org/dynmap/hdmap/TexturePack.java index 4eb5c4dd7..12b4131c3 100644 --- a/src/main/java/org/dynmap/hdmap/TexturePack.java +++ b/src/main/java/org/dynmap/hdmap/TexturePack.java @@ -1,5 +1,26 @@ package org.dynmap.hdmap; +import org.dynmap.Color; +import org.dynmap.ConfigurationNode; +import org.dynmap.DynmapCore; +import org.dynmap.Log; +import org.dynmap.MapManager; +import org.dynmap.common.BiomeMap; +import org.dynmap.exporter.OBJExport; +import org.dynmap.hdmap.textureprocessor.CustomTextureProcessor; +import org.dynmap.modsupport.GWM_Util; +import org.dynmap.renderer.CustomColorMultiplier; +import org.dynmap.renderer.CustomModSupportLoader; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.utils.BlockStep; +import org.dynmap.utils.BufferOutputStream; +import org.dynmap.utils.DynIntHashMap; +import org.dynmap.utils.DynmapBufferedImage; +import org.dynmap.utils.ForgeConfigFile; +import org.dynmap.utils.MapIterator; + +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.FileInputStream; @@ -25,25 +46,6 @@ import java.util.zip.ZipException; import java.util.zip.ZipFile; -import javax.imageio.ImageIO; - -import org.dynmap.Color; -import org.dynmap.ConfigurationNode; -import org.dynmap.DynmapCore; -import org.dynmap.Log; -import org.dynmap.MapManager; -import org.dynmap.common.BiomeMap; -import org.dynmap.exporter.OBJExport; -import org.dynmap.hdmap.textureprocessor.CustomTextureProcessor; -import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; -import org.dynmap.utils.BlockStep; -import org.dynmap.utils.BufferOutputStream; -import org.dynmap.utils.DynIntHashMap; -import org.dynmap.utils.DynmapBufferedImage; -import org.dynmap.utils.ForgeConfigFile; -import org.dynmap.utils.MapIterator; - /** * Loader and processor class for minecraft texture packs * Texture packs are found in dynmap/texturepacks directory, and either are either ZIP files diff --git a/src/main/java/org/dynmap/hdmap/renderer/ArchitectureCraftShapeRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/ArchitectureCraftShapeRenderer.java index f4a4ac99f..9a9459d4d 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/ArchitectureCraftShapeRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/ArchitectureCraftShapeRenderer.java @@ -3,7 +3,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/org/dynmap/hdmap/renderer/CarpentersBlocksRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/CarpentersBlocksRenderer.java index 5d9d719b5..c189c53ee 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/CarpentersBlocksRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/CarpentersBlocksRenderer.java @@ -2,7 +2,12 @@ import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dynmap/hdmap/renderer/CarpentersFenceRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/CarpentersFenceRenderer.java index 17df1dde2..1478ee032 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/CarpentersFenceRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/CarpentersFenceRenderer.java @@ -2,10 +2,12 @@ import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; -import java.util.BitSet; import java.util.Map; public class CarpentersFenceRenderer extends FenceGateBase { diff --git a/src/main/java/org/dynmap/hdmap/renderer/ChiselCTMBlockRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/ChiselCTMBlockRenderer.java index 212862a51..aff17a472 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/ChiselCTMBlockRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/ChiselCTMBlockRenderer.java @@ -2,7 +2,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.dynmap.hdmap.TexturePack; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/org/dynmap/hdmap/renderer/EnderIOConduitRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/EnderIOConduitRenderer.java index eb1065287..76c2dec0a 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/EnderIOConduitRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/EnderIOConduitRenderer.java @@ -3,7 +3,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dynmap/hdmap/renderer/EnderStorageChestRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/EnderStorageChestRenderer.java index 950f649bf..ecc65e16c 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/EnderStorageChestRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/EnderStorageChestRenderer.java @@ -2,7 +2,11 @@ import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/org/dynmap/hdmap/renderer/ForestryLeavesRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/ForestryLeavesRenderer.java index 17d223094..50e133364 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/ForestryLeavesRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/ForestryLeavesRenderer.java @@ -1,7 +1,11 @@ package org.dynmap.hdmap.renderer; import org.dynmap.modsupport.forestry.ForestrySupport; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dynmap/hdmap/renderer/GregTechMachineRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/GregTechMachineRenderer.java index c52be078b..16c748366 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/GregTechMachineRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/GregTechMachineRenderer.java @@ -1,17 +1,23 @@ package org.dynmap.hdmap.renderer; +import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PrimitiveBlastFurnace; import net.minecraftforge.common.util.ForgeDirection; -import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; import org.dynmap.modsupport.gregtech.GregTechSupport; -import org.dynmap.renderer.*; - -import gregtech.api.GregTech_API; +import org.dynmap.renderer.CustomColorMultiplier; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/org/dynmap/hdmap/renderer/IC2CropsRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/IC2CropsRenderer.java index f99fdb4c3..71eac6543 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/IC2CropsRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/IC2CropsRenderer.java @@ -2,7 +2,11 @@ import org.dynmap.modsupport.GWM_Util; import org.dynmap.modsupport.ic2.CropsSupport; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.Map; diff --git a/src/main/java/org/dynmap/hdmap/renderer/MECableRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/MECableRenderer.java index 3ac35c290..023213377 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/MECableRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/MECableRenderer.java @@ -4,7 +4,12 @@ import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; import org.dynmap.modsupport.appliedenergistics2.AE2Support; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dynmap/hdmap/renderer/MultipartRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/MultipartRenderer.java index dc94982c4..062078f63 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/MultipartRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/MultipartRenderer.java @@ -3,7 +3,13 @@ import net.minecraftforge.common.util.ForgeDirection; import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomColorMultiplier; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dynmap/hdmap/renderer/OpenComputers3DPrintedModelRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/OpenComputers3DPrintedModelRenderer.java index 494095f39..27b4a6d44 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/OpenComputers3DPrintedModelRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/OpenComputers3DPrintedModelRenderer.java @@ -2,7 +2,13 @@ import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomColorMultiplier; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dynmap/hdmap/renderer/TinkersClearGlassBlockRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/TinkersClearGlassBlockRenderer.java index 281a6398f..ab0adf733 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/TinkersClearGlassBlockRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/TinkersClearGlassBlockRenderer.java @@ -1,8 +1,10 @@ package org.dynmap.hdmap.renderer; import net.minecraftforge.common.util.ForgeDirection; -import org.dynmap.hdmap.TexturePack; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/org/dynmap/hdmap/renderer/WardedBlockRenderer.java b/src/main/java/org/dynmap/hdmap/renderer/WardedBlockRenderer.java index 9c9d01770..d0ace1b08 100644 --- a/src/main/java/org/dynmap/hdmap/renderer/WardedBlockRenderer.java +++ b/src/main/java/org/dynmap/hdmap/renderer/WardedBlockRenderer.java @@ -2,7 +2,12 @@ import org.dynmap.hdmap.TexturePack; import org.dynmap.modsupport.GWM_Util; -import org.dynmap.renderer.*; +import org.dynmap.renderer.CustomRenderer; +import org.dynmap.renderer.CustomRendererData; +import org.dynmap.renderer.CustomTextureMapper; +import org.dynmap.renderer.MapDataContext; +import org.dynmap.renderer.RenderPatch; +import org.dynmap.renderer.RenderPatchFactory; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/org/dynmap/servlet/LoginServlet.java b/src/main/java/org/dynmap/servlet/LoginServlet.java index 70b1381ab..7213e3ad8 100644 --- a/src/main/java/org/dynmap/servlet/LoginServlet.java +++ b/src/main/java/org/dynmap/servlet/LoginServlet.java @@ -5,7 +5,7 @@ import org.dynmap.DynmapCore; import org.json.simple.JSONObject; -import javax.servlet.*; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/org/dynmap/web/BanIPFilter.java b/src/main/java/org/dynmap/web/BanIPFilter.java index f53aa4868..a257b0ce4 100644 --- a/src/main/java/org/dynmap/web/BanIPFilter.java +++ b/src/main/java/org/dynmap/web/BanIPFilter.java @@ -3,7 +3,12 @@ import org.dynmap.DynmapCore; import org.dynmap.Log; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/src/main/java/org/dynmap/web/CustomHeaderFilter.java b/src/main/java/org/dynmap/web/CustomHeaderFilter.java index 8ea318938..9f1340cdf 100644 --- a/src/main/java/org/dynmap/web/CustomHeaderFilter.java +++ b/src/main/java/org/dynmap/web/CustomHeaderFilter.java @@ -2,7 +2,12 @@ import org.dynmap.ConfigurationNode; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/src/main/java/org/dynmap/web/FilterHandler.java b/src/main/java/org/dynmap/web/FilterHandler.java index ed35d0918..0c28259ed 100644 --- a/src/main/java/org/dynmap/web/FilterHandler.java +++ b/src/main/java/org/dynmap/web/FilterHandler.java @@ -5,7 +5,11 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.servlet.FilterHolder; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException;