Small tidy-ups

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/logger/LogFormatter.java

@@ -48,6 +48,7 @@ public LogFormatter(String format) {
      * @param record the log record to be formatted.
      * @return the formatted log
      */
+    @Override
     public String format(LogRecord record) {
         ZonedDateTime zdt = ZonedDateTime.ofInstant(
                 record.getInstant(), ZoneId.systemDefault());

core/src/main/java/de/bluecolored/bluemap/core/map/TextureGallery.java

@@ -34,6 +34,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -99,7 +100,7 @@ public void writeTexturesFile(OutputStream out) throws IOException {
             textures[ordinal] = texture;
         });
 
-        try (Writer writer = new OutputStreamWriter(out)) {
+        try (Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
             GSON.toJson(textures, Texture[].class, writer);
         } catch (JsonIOException ex) {
             throw new IOException(ex);
@@ -108,7 +109,7 @@ public void writeTexturesFile(OutputStream out) throws IOException {
 
     public static TextureGallery readTexturesFile(InputStream in) throws IOException {
         TextureGallery gallery = new TextureGallery();
-        try (Reader reader = new InputStreamReader(in)) {
+        try (Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
             Texture[] textures = GSON.fromJson(reader, Texture[].class);
             if (textures == null) throw new IOException("Texture data is empty!");
             gallery.nextId = textures.length;

core/src/main/java/de/bluecolored/bluemap/core/map/hires/ArrayTileModel.java

@@ -186,6 +186,7 @@ public ArrayTileModel setMaterialIndex(int face, int m) {
         return this;
     }
 
+    @Override
     public ArrayTileModel invertOrientation(int face) {
         int index;
         float x, y, z;

core/src/main/java/de/bluecolored/bluemap/core/map/hires/block/LiquidModelRenderer.java

@@ -97,6 +97,7 @@ public LiquidModelRenderer(ResourcePack resourcePack, TextureGallery textureGall
         for (int i = 0; i < uvs.length; i++) uvs[i] = new VectorM2f(0, 0);
     }
 
+    @Override
     public void render(BlockNeighborhood block, Variant variant, TileModelView blockModel, Color color) {
         this.block = block;
         this.blockState = block.getBlockState();

core/src/main/java/de/bluecolored/bluemap/core/map/hires/block/ResourceModelRenderer.java

@@ -51,7 +51,6 @@
 import de.bluecolored.bluemap.core.world.block.ExtendedBlock;
 import lombok.Getter;
 
-import java.util.EnumMap;
 import java.util.function.Function;
 
 /**
@@ -72,7 +71,6 @@ public class ResourceModelRenderer implements BlockRenderer {
     private final VectorM2f[] uvs = new VectorM2f[4];
     private final Color tintColor = new Color();
     private final Color mapColor = new Color();
-    private final EnumMap<Direction, Float> uvLockRotationCache = new EnumMap<>(Direction.class);
 
     private BlockNeighborhood block;
     private Variant variant;
@@ -92,6 +90,7 @@ public ResourceModelRenderer(ResourcePack resourcePack, TextureGallery textureGa
         for (int i = 0; i < rawUvs.length; i++) rawUvs[i] = new VectorM2f(0, 0);
     }
 
+    @Override
     public void render(BlockNeighborhood block, Variant variant, TileModelView blockModel, Color color) {
         this.block = block;
         this.blockModel = blockModel;

core/src/main/java/de/bluecolored/bluemap/core/resources/BlockColorCalculatorFactory.java

@@ -31,7 +31,6 @@
 import de.bluecolored.bluemap.core.BlueMap;
 import de.bluecolored.bluemap.core.util.Key;
 import de.bluecolored.bluemap.core.util.math.Color;
-import de.bluecolored.bluemap.core.world.BlockProperties;
 import de.bluecolored.bluemap.core.world.BlockState;
 import de.bluecolored.bluemap.core.world.biome.Biome;
 import de.bluecolored.bluemap.core.world.block.BlockAccess;
@@ -42,7 +41,10 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
@@ -89,32 +91,22 @@ public void load(Path configFile) throws IOException {
 
                 ColorFunction colorFunction;
                 switch (value) {
-                    case "@foliage":
-                        colorFunction = BlockColorCalculator::getBlendedFoliageColor;
-                        break;
-                    case "@dry_foliage":
-                        colorFunction = BlockColorCalculator::getBlendedDryFoliageColor;
-                        break;
-                    case "@grass":
-                        colorFunction = BlockColorCalculator::getBlendedGrassColor;
-                        break;
-                    case "@water":
-                        colorFunction = BlockColorCalculator::getBlendedWaterColor;
-                        break;
-                    case "@redstone":
-                        colorFunction = BlockColorCalculator::getRedstoneColor;
-                        break;
-                    default:
+                    case "@foliage" -> colorFunction = BlockColorCalculator::getBlendedFoliageColor;
+                    case "@dry_foliage" -> colorFunction = BlockColorCalculator::getBlendedDryFoliageColor;
+                    case "@grass" -> colorFunction = BlockColorCalculator::getBlendedGrassColor;
+                    case "@water" -> colorFunction = BlockColorCalculator::getBlendedWaterColor;
+                    case "@redstone" -> colorFunction = BlockColorCalculator::getRedstoneColor;
+                    default -> {
                         final Color color = new Color();
                         color.parse(value).premultiplied();
                         colorFunction = (calculator, block, target) -> target.set(color);
-                        break;
+                    }
                 }
 
                 BlockStateMapping<ColorFunction> mapping = new BlockStateMapping<>(key, colorFunction);
 
                 // don't overwrite already present values, higher priority resources are loaded first
-                mappings.computeIfAbsent(key.getId(), k -> new LinkedList<>()).add(mapping);
+                mappings.computeIfAbsent(key.getId(), k -> new ArrayList<>(1)).add(mapping);
             }
 
             json.endObject();

core/src/main/java/de/bluecolored/bluemap/core/resources/BlockPropertiesConfig.java

@@ -33,8 +33,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -61,20 +61,20 @@ public void load(Path configFile) throws IOException {
                 json.beginObject();
                 while (json.hasNext()) {
                     switch (json.nextName()) {
-                        case "culling": bsValueBuilder.culling(json.nextBoolean()); break;
-                        case "occluding": bsValueBuilder.occluding(json.nextBoolean()); break;
-                        case "alwaysWaterlogged": bsValueBuilder.alwaysWaterlogged(json.nextBoolean()); break;
-                        case "randomOffset": bsValueBuilder.randomOffset(json.nextBoolean()); break;
-                        case "cullingIdentical": bsValueBuilder.cullingIdentical(json.nextBoolean()); break;
-                        default: break;
+                        case "culling" -> bsValueBuilder.culling(json.nextBoolean());
+                        case "occluding" -> bsValueBuilder.occluding(json.nextBoolean());
+                        case "alwaysWaterlogged" -> bsValueBuilder.alwaysWaterlogged(json.nextBoolean());
+                        case "randomOffset" -> bsValueBuilder.randomOffset(json.nextBoolean());
+                        case "cullingIdentical" -> bsValueBuilder.cullingIdentical(json.nextBoolean());
+                        default -> {}
                     }
                 }
                 json.endObject();
 
                 BlockStateMapping<BlockProperties> mapping = new BlockStateMapping<>(bsKey, bsValueBuilder.build());
 
                 // don't overwrite already present values, higher priority resources are loaded first
-                mappings.computeIfAbsent(bsKey.getId(), k -> new LinkedList<>()).add(mapping);
+                mappings.computeIfAbsent(bsKey.getId(), k -> new ArrayList<>(1)).add(mapping);
             }
             json.endObject();
         }

core/src/main/java/de/bluecolored/bluemap/core/resources/adapter/AbstractTypeAdapterFactory.java

@@ -49,6 +49,7 @@ public void write(JsonWriter out, T value, Gson gson) throws IOException {
     public abstract T read(JsonReader in, Gson gson) throws IOException;
 
     @SuppressWarnings("unchecked")
+    @Override
     public <U> TypeAdapter<U> create(Gson gson, TypeToken<U> type) {
         if (!type.getRawType().isAssignableFrom(this.type)) return null;
         return (TypeAdapter<U>) new Adapter(gson);

core/src/main/java/de/bluecolored/bluemap/core/resources/adapter/ColorAdapter.java

@@ -50,7 +50,7 @@ public Color read(JsonReader in) throws IOException {
         Color value = new Color();
         JsonToken token = in.peek();
         switch (token) {
-            case BEGIN_ARRAY:
+            case BEGIN_ARRAY -> {
                 in.beginArray();
                 value.set(
                         (float) in.nextDouble(),
@@ -60,8 +60,8 @@ public Color read(JsonReader in) throws IOException {
                         false
                 );
                 in.endArray();
-                break;
-            case BEGIN_OBJECT:
+            }
+            case BEGIN_OBJECT -> {
                 value.a = 1f;
                 in.beginObject();
                 while (in.hasNext()) {
@@ -76,18 +76,15 @@ public Color read(JsonReader in) throws IOException {
                     }
                 }
                 in.endObject();
-                break;
-            case STRING:
-                value.parse(in.nextString());
-                break;
-            case NUMBER:
+            }
+            case STRING -> value.parse(in.nextString());
+            case NUMBER -> {
                 int color = in.nextInt();
                 if ((color & 0xFF000000) == 0) color = color | 0xFF000000; // assume full alpha if not specified
                 value.set(color);
-                break;
-            case NULL:
-                break;
-            default: throw new IOException("Unexpected token while parsing Color:" + token);
+            }
+            case NULL -> {}
+            default -> throw new IOException("Unexpected token while parsing Color:" + token);
         }
         return value;
     }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/ResourcePack.java

@@ -115,6 +115,7 @@ public ResourcePack(PackVersion packVersion) {
             extensions.put(extensionType, extensionType.create(this));
     }
 
+    @Override
     public synchronized void loadResources(Iterable<Path> roots) throws IOException, InterruptedException {
         Logger.global.logInfo("Loading resources...");
 
@@ -284,7 +285,7 @@ private void loadResources(Path root) throws IOException {
 
         } catch (RuntimeException ex) {
             Throwable cause = ex.getCause();
-            if (cause instanceof IOException) throw (IOException) cause;
+            if (cause instanceof IOException ioEx) throw ioEx;
             if (cause != null) throw new IOException(cause);
             throw new IOException(ex);
         }