From 60bde768c09033e928fe970d8df7139fe3f1efcc Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sat, 23 Nov 2019 15:35:20 +0100 Subject: [PATCH] Delete unused classes and refactor util-classes for a consistent naming --- .../bluecolored/bluemap/core/model/Face.java | 4 +- .../core/render/hires/HiresModelManager.java | 4 +- .../core/render/hires/HiresModelRenderer.java | 8 +-- .../hires/blockmodel/BlockStateModel.java | 4 +- .../blockmodel/ResourceModelBuilder.java | 4 +- .../core/render/lowres/LowresModel.java | 8 +-- .../render/lowres/LowresModelManager.java | 4 +- .../BlockModelElementFaceResource.java | 4 +- .../BlockModelElementResource.java | 8 +-- .../core/resourcepack/ResourcePack.java | 12 ++--- .../core/resourcepack/TextureProvider.java | 14 ++--- .../{ConfigUtil.java => ConfigUtils.java} | 4 +- .../util/{FileUtil.java => FileUtils.java} | 4 +- .../util/{MathUtil.java => MathUtils.java} | 4 +- .../bluemap/core/util/UpdateDeamon.java | 54 ------------------- .../bluemap/core/util/Updateable.java | 31 ----------- 16 files changed, 42 insertions(+), 129 deletions(-) rename BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/{ConfigUtil.java => ConfigUtils.java} (98%) rename BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/{FileUtil.java => FileUtils.java} (98%) rename BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/{MathUtil.java => MathUtils.java} (98%) delete mode 100644 BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/UpdateDeamon.java delete mode 100644 BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/Updateable.java diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/model/Face.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/model/Face.java index d3b771c9..3506ae93 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/model/Face.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/model/Face.java @@ -29,7 +29,7 @@ import com.flowpowered.math.vector.Vector2f; import com.flowpowered.math.vector.Vector3f; -import de.bluecolored.bluemap.core.util.MathUtil; +import de.bluecolored.bluemap.core.util.MathUtils; public class Face { @@ -202,7 +202,7 @@ public void setMaterialIndex(int materialIndex) { } public Vector3f getFaceNormal(){ - return MathUtil.getSurfaceNormal(p1, p2, p3); + return MathUtils.getSurfaceNormal(p1, p2, p3); } private void normlizeNormals(){ diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelManager.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelManager.java index 4c1938bc..81b1bee1 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelManager.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelManager.java @@ -43,7 +43,7 @@ import de.bluecolored.bluemap.core.render.WorldTile; import de.bluecolored.bluemap.core.resourcepack.ResourcePack; import de.bluecolored.bluemap.core.util.AABB; -import de.bluecolored.bluemap.core.util.FileUtil; +import de.bluecolored.bluemap.core.util.FileUtils; import de.bluecolored.bluemap.core.world.ChunkNotGeneratedException; public class HiresModelManager { @@ -162,7 +162,7 @@ public Vector2i posToTile(Vector3d pos){ * Returns the file for a tile */ public File getFile(Vector2i tilePos){ - return FileUtil.coordsToFile(fileRoot, tilePos, "json.gz"); + return FileUtils.coordsToFile(fileRoot, tilePos, "json.gz"); } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelRenderer.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelRenderer.java index bff2d4f2..d9c47f84 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelRenderer.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/HiresModelRenderer.java @@ -39,7 +39,7 @@ import de.bluecolored.bluemap.core.resourcepack.NoSuchTextureException; import de.bluecolored.bluemap.core.resourcepack.ResourcePack; import de.bluecolored.bluemap.core.util.AABB; -import de.bluecolored.bluemap.core.util.MathUtil; +import de.bluecolored.bluemap.core.util.MathUtils; import de.bluecolored.bluemap.core.world.Block; import de.bluecolored.bluemap.core.world.ChunkNotGeneratedException; import de.bluecolored.bluemap.core.world.WorldChunk; @@ -91,12 +91,12 @@ public HiresModel render(WorldTile tile, AABB region, RenderSettings renderSetti blockModel.translate(new Vector3f(x, y, z).sub(min.toFloat())); - color = MathUtil.overlayColors(blockModel.getMapColor(), color); + color = MathUtils.overlayColors(blockModel.getMapColor(), color); //TODO: quick hack to random offset grass if (block.getBlock().getId().equals("grass")){ - float dx = (MathUtil.hashToFloat(x, y, z, 123984) - 0.5f) * 0.75f; - float dz = (MathUtil.hashToFloat(x, y, z, 345542) - 0.5f) * 0.75f; + float dx = (MathUtils.hashToFloat(x, y, z, 123984) - 0.5f) * 0.75f; + float dz = (MathUtils.hashToFloat(x, y, z, 345542) - 0.5f) * 0.75f; blockModel.translate(new Vector3f(dx, 0, dz)); } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/BlockStateModel.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/BlockStateModel.java index f3f2e1b8..b7cd36c9 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/BlockStateModel.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/BlockStateModel.java @@ -27,7 +27,7 @@ import com.flowpowered.math.vector.Vector4f; import de.bluecolored.bluemap.core.model.Model; -import de.bluecolored.bluemap.core.util.MathUtil; +import de.bluecolored.bluemap.core.util.MathUtils; /** * A model with some extra information about the BlockState it represents @@ -62,7 +62,7 @@ public void setMapColor(Vector4f mapColor) { } public void mergeMapColor(Vector4f mapColor) { - this.mapColor = MathUtil.blendColors(this.mapColor, mapColor); + this.mapColor = MathUtils.blendColors(this.mapColor, mapColor); } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/ResourceModelBuilder.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/ResourceModelBuilder.java index 317efa2a..6580b576 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/ResourceModelBuilder.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/hires/blockmodel/ResourceModelBuilder.java @@ -45,7 +45,7 @@ import de.bluecolored.bluemap.core.resourcepack.ResourcePack; import de.bluecolored.bluemap.core.resourcepack.TextureProvider.Texture; import de.bluecolored.bluemap.core.util.Direction; -import de.bluecolored.bluemap.core.util.MathUtil; +import de.bluecolored.bluemap.core.util.MathUtils; import de.bluecolored.bluemap.core.util.WeighedArrayList; import de.bluecolored.bluemap.core.world.Block; @@ -74,7 +74,7 @@ public BlockStateModel build() throws NoSuchTextureException { BlockStateModel model = new BlockStateModel(); for (WeighedArrayList bmrList : resource.getModelResources()){ - BlockModelResource bmr = bmrList.get((int) Math.floor(MathUtil.hashToFloat(context.getPosition(), 23489756) * bmrList.size())); + BlockModelResource bmr = bmrList.get((int) Math.floor(MathUtils.hashToFloat(context.getPosition(), 23489756) * bmrList.size())); model.merge(fromModelResource(bmr)); } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModel.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModel.java index b0f3c534..a1b73144 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModel.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModel.java @@ -42,8 +42,8 @@ import com.flowpowered.math.vector.Vector3f; import de.bluecolored.bluemap.core.threejs.BufferGeometry; -import de.bluecolored.bluemap.core.util.FileUtil; -import de.bluecolored.bluemap.core.util.MathUtil; +import de.bluecolored.bluemap.core.util.FileUtils; +import de.bluecolored.bluemap.core.util.MathUtils; import de.bluecolored.bluemap.core.util.ModelUtils; public class LowresModel { @@ -113,7 +113,7 @@ public void save(File file, boolean force) throws IOException { } try { - FileUtil.waitForFile(file, 10, TimeUnit.SECONDS); + FileUtils.waitForFile(file, 10, TimeUnit.SECONDS); } catch (InterruptedException e) { throw new IOException("Failed to get write-access to file: " + file, e); } @@ -163,7 +163,7 @@ public void flush(){ Vector3f p2 = new Vector3f(model.position[f + 3], model.position[f + 4], model.position[f + 5]); Vector3f p3 = new Vector3f(model.position[f + 6], model.position[f + 7], model.position[f + 8]); - Vector3f n = MathUtil.getSurfaceNormal(p1, p2, p3); + Vector3f n = MathUtils.getSurfaceNormal(p1, p2, p3); model.normal[f + 0] = n.getX(); model.normal[f + 1] = n.getY(); model.normal[f + 2] = n.getZ(); model.normal[f + 3] = n.getX(); model.normal[f + 4] = n.getY(); model.normal[f + 5] = n.getZ(); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModelManager.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModelManager.java index 6d6dbead..d09d71c2 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModelManager.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/render/lowres/LowresModelManager.java @@ -48,7 +48,7 @@ import de.bluecolored.bluemap.core.logger.Logger; import de.bluecolored.bluemap.core.render.hires.HiresModel; import de.bluecolored.bluemap.core.threejs.BufferGeometry; -import de.bluecolored.bluemap.core.util.FileUtil; +import de.bluecolored.bluemap.core.util.FileUtils; public class LowresModelManager { @@ -167,7 +167,7 @@ public void update(UUID world, Vector2i point, float height, Vector3f color) thr * Returns the file for a tile */ public File getFile(Vector2i tile){ - return FileUtil.coordsToFile(fileRoot, tile, "json.gz"); + return FileUtils.coordsToFile(fileRoot, tile, "json.gz"); } private LowresModel getModel(UUID world, Vector2i tile) throws IOException { diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementFaceResource.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementFaceResource.java index e5c0522d..13b323a1 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementFaceResource.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementFaceResource.java @@ -27,7 +27,7 @@ import com.flowpowered.math.vector.Vector3f; import com.flowpowered.math.vector.Vector4f; -import de.bluecolored.bluemap.core.util.ConfigUtil; +import de.bluecolored.bluemap.core.util.ConfigUtils; import de.bluecolored.bluemap.core.util.Direction; import ninja.leaping.configurate.ConfigurationNode; @@ -49,7 +49,7 @@ protected BlockModelElementFaceResource(BlockModelElementResource element, Confi this.uv = getDefaultUV(declaration.getKey().toString(), element.getFrom(), element.getTo()); ConfigurationNode uv = declaration.getNode("uv"); - if (!uv.isVirtual()) this.uv = ConfigUtil.readVector4f(declaration.getNode("uv")); + if (!uv.isVirtual()) this.uv = ConfigUtils.readVector4f(declaration.getNode("uv")); this.texture = declaration.getNode("texture").getString(); this.resolvedTexture = null; diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementResource.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementResource.java index 00faf907..baf6281c 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementResource.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/BlockModelElementResource.java @@ -27,7 +27,7 @@ import com.flowpowered.math.vector.Vector3f; import de.bluecolored.bluemap.core.util.Axis; -import de.bluecolored.bluemap.core.util.ConfigUtil; +import de.bluecolored.bluemap.core.util.ConfigUtils; import ninja.leaping.configurate.ConfigurationNode; public class BlockModelElementResource { @@ -49,13 +49,13 @@ protected BlockModelElementResource(BlockModelResource model, ConfigurationNode this.model = model; try { - this.from = ConfigUtil.readVector3f(declaration.getNode("from")); - this.to = ConfigUtil.readVector3f(declaration.getNode("to")); + this.from = ConfigUtils.readVector3f(declaration.getNode("from")); + this.to = ConfigUtils.readVector3f(declaration.getNode("to")); this.rotAngle = 0f; ConfigurationNode rotation = declaration.getNode("rotation"); if (!rotation.isVirtual()){ - this.rotOrigin = ConfigUtil.readVector3f(rotation.getNode("origin")); + this.rotOrigin = ConfigUtils.readVector3f(rotation.getNode("origin")); this.rotAxis = Axis.fromString(rotation.getNode("axis").getString()); this.rotAngle = rotation.getNode("angle").getFloat(); this.rotRescale = rotation.getNode("rescale").getBoolean(false); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java index cd3e873d..488174dc 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java @@ -41,13 +41,11 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.commons.io.FileUtils; - import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import de.bluecolored.bluemap.core.logger.Logger; -import de.bluecolored.bluemap.core.util.FileUtil; +import de.bluecolored.bluemap.core.util.FileUtils; import de.bluecolored.bluemap.core.world.BlockState; public class ResourcePack { @@ -142,9 +140,9 @@ private boolean isActualResourcePath(Path path) { String[] texturesPattern = {"assets", ".*", "textures", "block|colormap", "*"}; return - FileUtil.matchPath(path, blockstatesPattern) || - FileUtil.matchPath(path, modelsPattern) || - FileUtil.matchPath(path, texturesPattern); + FileUtils.matchPath(path, blockstatesPattern) || + FileUtils.matchPath(path, modelsPattern) || + FileUtils.matchPath(path, texturesPattern); } public BlockStateResource getBlockStateResource(BlockState block) throws NoSuchResourceException, InvalidResourceDeclarationException { @@ -193,7 +191,7 @@ public InputStream getStream(){ public static void downloadDefaultResource(File file) throws IOException { if (file.exists()) file.delete(); file.getParentFile().mkdirs(); - FileUtils.copyURLToFile(new URL(MINECRAFT_CLIENT_URL), file, 10000, 10000); + org.apache.commons.io.FileUtils.copyURLToFile(new URL(MINECRAFT_CLIENT_URL), file, 10000, 10000); } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/TextureProvider.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/TextureProvider.java index 3ab6bbec..36e65e84 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/TextureProvider.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/TextureProvider.java @@ -42,9 +42,9 @@ import com.flowpowered.math.vector.Vector4f; import de.bluecolored.bluemap.core.resourcepack.ResourcePack.Resource; -import de.bluecolored.bluemap.core.util.ConfigUtil; -import de.bluecolored.bluemap.core.util.FileUtil; -import de.bluecolored.bluemap.core.util.MathUtil; +import de.bluecolored.bluemap.core.util.ConfigUtils; +import de.bluecolored.bluemap.core.util.FileUtils; +import de.bluecolored.bluemap.core.util.MathUtils; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.gson.GsonConfigurationLoader; @@ -81,7 +81,7 @@ public void generate(ResourcePack resources) throws IOException { for (Entry entry : resources.getAllResources().entrySet()){ Path key = entry.getKey(); - if (FileUtil.matchPath(key, texturesPathPattern) && key.toString().endsWith(".png")){ + if (FileUtils.matchPath(key, texturesPathPattern) && key.toString().endsWith(".png")){ String path = key.subpath(3, key.getNameCount()).normalize().toString(); String id = path .substring(0, path.length() - ".png".length()) @@ -117,7 +117,7 @@ public void load(File file) throws IOException { n.getNode("id").getString(), n.getNode("texture").getString(), n.getNode("transparent").getBoolean(false), - ConfigUtil.readVector4f(n.getNode("color")) + ConfigUtils.readVector4f(n.getNode("color")) ); textures.add(t); @@ -140,7 +140,7 @@ public void save(File file) throws IOException { n.getNode("id").setValue(t.getId()); n.getNode("texture").setValue(t.getBase64()); n.getNode("transparent").setValue(t.isHalfTransparent()); - ConfigUtil.writeVector4f(n.getNode("color"), t.getColor()); + ConfigUtils.writeVector4f(n.getNode("color"), t.getColor()); } loader.save(node); @@ -194,7 +194,7 @@ private Vector4f calculateColor(BufferedImage image){ double green = (double)((pixel >> 8) & 0xff) / (double) 0xff; double blue = (double)((pixel >> 0) & 0xff) / (double) 0xff; - color = MathUtil.blendColors(new Vector4f(red, green, blue, alpha), color); + color = MathUtils.blendColors(new Vector4f(red, green, blue, alpha), color); } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/ConfigUtil.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/ConfigUtils.java similarity index 98% rename from BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/ConfigUtil.java rename to BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/ConfigUtils.java index 3e143c55..82a12213 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/ConfigUtil.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/ConfigUtils.java @@ -34,9 +34,9 @@ import ninja.leaping.configurate.ConfigurationNode; -public class ConfigUtil { +public class ConfigUtils { - private ConfigUtil(){} + private ConfigUtils(){} public static Vector2i readVector2i(ConfigurationNode vectorNode){ if (vectorNode.hasListChildren()){ diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/FileUtil.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/FileUtils.java similarity index 98% rename from BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/FileUtil.java rename to BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/FileUtils.java index ddbb48da..8f48ccbd 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/FileUtil.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/FileUtils.java @@ -33,9 +33,9 @@ import com.flowpowered.math.vector.Vector2i; -public class FileUtil { +public class FileUtils { - private FileUtil(){} + private FileUtils(){} public static File coordsToFile(Path root, Vector2i coords, String fileType){ String path = "x" + coords.getX() + "z" + coords.getY(); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/MathUtil.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/MathUtils.java similarity index 98% rename from BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/MathUtil.java rename to BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/MathUtils.java index 2d6eab19..447c2422 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/MathUtil.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/MathUtils.java @@ -29,9 +29,9 @@ import com.flowpowered.math.vector.Vector3i; import com.flowpowered.math.vector.Vector4f; -public class MathUtil { +public class MathUtils { - private MathUtil() {} + private MathUtils() {} public static Vector3d getSurfaceNormal(Vector3d p1, Vector3d p2, Vector3d p3){ Vector3d u = p2.sub(p1); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/UpdateDeamon.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/UpdateDeamon.java deleted file mode 100644 index 29a83089..00000000 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/UpdateDeamon.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.core.util; - -import java.lang.ref.WeakReference; - -public class UpdateDeamon extends Thread { - - public WeakReference subject; - public long frequency; - - public UpdateDeamon(Runnable subject, long frequency) { - this((Updateable) (()->subject.run()), frequency); - } - - public UpdateDeamon(Updateable subject, long frequency) { - this.subject = new WeakReference(subject); - this.frequency = frequency; - this.setDaemon(true); - } - - @Override - public void run() { - try { - while (true) { - Thread.sleep(frequency); - subject.get().update(); - } - } catch (NullPointerException | InterruptedException ex) {} - } - -} diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/Updateable.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/Updateable.java deleted file mode 100644 index a8a66cfc..00000000 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/util/Updateable.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.core.util; - -public interface Updateable { - - public void update(); - -}