Merge branch 'master' into mc1.20

Author: TBlueF

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Suggestion or Question
+    url: https://bluecolo.red/map-discord
+    about: You have a suggestion, a question or a problem that is not a bug? Please use our discord-server for this! :)

.github/workflows/translation-checker.yml

@@ -3,7 +3,7 @@ name: Check translations
 on:
   push:
     paths:
-      - "BlueMapCommon/webapp/public/lang/**"
+      - "common/webapp/public/lang/**"
       - ".github/translation-checker/**"
 
 permissions:

api

@@ -1,5 +1,5 @@
 import com.matthewprenger.cursegradle.CurseProject
-import gradle.kotlin.dsl.accessors._0d85c8abe599c3884bce56e72c18751a.curseforge
+import gradle.kotlin.dsl.accessors._30aa10cce2eda716151152e22de91a4c.curseforge
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.closureOf
@@ -14,4 +14,4 @@ fun Project.curseforgeBlueMap (configuration: Action<CurseProject>) {
 
         configuration.execute(this)
     })
-}
+}

buildSrc/src/main/kotlin/curseforge.kt

@@ -24,18 +24,11 @@
  */
 package de.bluecolored.bluemap.common;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
-import de.bluecolored.bluemap.api.gson.MarkerGson;
-import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.common.config.ConfigurationException;
 import de.bluecolored.bluemap.common.config.MapConfig;
 import de.bluecolored.bluemap.common.config.storage.StorageConfig;
-import de.bluecolored.bluemap.common.plugin.Plugin;
 import de.bluecolored.bluemap.common.debug.StateDumper;
+import de.bluecolored.bluemap.common.plugin.Plugin;
 import de.bluecolored.bluemap.core.logger.Logger;
 import de.bluecolored.bluemap.core.map.BmMap;
 import de.bluecolored.bluemap.core.resources.MinecraftVersion;
@@ -48,14 +41,9 @@
 import de.bluecolored.bluemap.core.world.World;
 import de.bluecolored.bluemap.core.world.mca.MCAWorld;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.configurate.ConfigurateException;
-import org.spongepowered.configurate.ConfigurationNode;
-import org.spongepowered.configurate.gson.GsonConfigurationLoader;
-import org.spongepowered.configurate.loader.HeaderMode;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -249,27 +237,9 @@ private synchronized void loadMap(String id, MapConfig mapConfig) throws Configu
             );
             maps.put(id, map);
 
-            // load marker-config by converting it first from hocon to json and then loading it with MarkerGson
-            ConfigurationNode markerSetNode = mapConfig.getMarkerSets();
-            if (markerSetNode != null && !markerSetNode.empty()) {
-                String markerJson = GsonConfigurationLoader.builder()
-                        .headerMode(HeaderMode.NONE)
-                        .lenient(false)
-                        .indent(0)
-                        .buildAndSaveString(markerSetNode);
-                Gson gson = MarkerGson.addAdapters(new GsonBuilder())
-                        .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
-                        .create();
-                Type markerSetType = new TypeToken<Map<String, MarkerSet>>() {}.getType();
-                Map<String, MarkerSet> markerSets = gson.fromJson(markerJson, markerSetType);
-                map.getMarkerSets().putAll(markerSets);
-            }
+            // load markers
+            map.getMarkerSets().putAll(mapConfig.parseMarkerSets());
 
-        } catch (ConfigurateException | JsonParseException ex) {
-            throw new ConfigurationException(
-                    "Failed to create the markers for map '" + id + "'!\n" +
-                    "Make sure your marker-configuration for this map is valid.",
-                    ex);
         } catch (IOException | ConfigurationException ex) {
             throw new ConfigurationException("Failed to load map '" + id + "'!", ex);
         }

common/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java

@@ -27,10 +27,12 @@
 import de.bluecolored.bluemap.api.AssetStorage;
 import de.bluecolored.bluemap.core.storage.MapStorage;
 import de.bluecolored.bluemap.core.storage.compression.CompressedInputStream;
+import lombok.NonNull;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Objects;
 import java.util.Optional;
 
 public class AssetStorageImpl implements AssetStorage {
@@ -44,29 +46,29 @@ public AssetStorageImpl(MapStorage storage, String mapId) {
     }
 
     @Override
-    public OutputStream writeAsset(String name) throws IOException {
+    public OutputStream writeAsset(@NonNull String name) throws IOException {
         return storage.asset(name).write();
     }
 
     @Override
-    public Optional<InputStream> readAsset(String name) throws IOException {
+    public Optional<InputStream> readAsset(@NonNull String name) throws IOException {
         CompressedInputStream in = storage.asset(name).read();
         if (in == null) return Optional.empty();
         return Optional.of(in.decompress());
     }
 
     @Override
-    public boolean assetExists(String name) throws IOException {
+    public boolean assetExists(@NonNull String name) throws IOException {
         return storage.asset(name).exists();
     }
 
     @Override
-    public String getAssetUrl(String name) {
+    public String getAssetUrl(@NonNull String name) {
         return "maps/" + mapId + "/assets/" + MapStorage.escapeAssetName(name);
     }
 
     @Override
-    public void deleteAsset(String name) throws IOException {
+    public void deleteAsset(@NonNull String name) throws IOException {
         storage.asset(name).delete();
     }
 

common/src/main/java/de/bluecolored/bluemap/common/api/AssetStorageImpl.java

@@ -36,6 +36,7 @@
 import de.bluecolored.bluemap.core.logger.Logger;
 import de.bluecolored.bluemap.core.map.BmMap;
 import de.bluecolored.bluemap.core.world.World;
+import lombok.NonNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
@@ -98,7 +99,7 @@ public Collection<BlueMapWorld> getWorlds() {
     }
 
     @Override
-    public Optional<BlueMapWorld> getWorld(Object world) {
+    public Optional<BlueMapWorld> getWorld(@NonNull Object world) {
         return worldCache.get(world);
     }
 
@@ -126,7 +127,7 @@ public Optional<BlueMapWorld> getWorldUncached(Object world) {
     }
 
     @Override
-    public Optional<BlueMapMap> getMap(String id) {
+    public Optional<BlueMapMap> getMap(@NonNull String id) {
         return mapCache.get(id);
     }
 

common/src/main/java/de/bluecolored/bluemap/common/api/BlueMapAPIImpl.java

@@ -34,6 +34,7 @@
 import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
 import de.bluecolored.bluemap.common.rendermanager.WorldRegionRenderTask;
 import de.bluecolored.bluemap.core.map.BmMap;
+import lombok.NonNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.ref.WeakReference;
@@ -91,11 +92,15 @@ public Vector2i getTileOffset() {
     }
 
     @Override
-    public void setTileFilter(Predicate<Vector2i> filter) {
+    @SuppressWarnings("removal")
+    @Deprecated(forRemoval = true)
+    public void setTileFilter(@NonNull Predicate<Vector2i> filter) {
         unpack(map).setTileFilter(filter);
     }
 
     @Override
+    @SuppressWarnings("removal")
+    @Deprecated(forRemoval = true)
     public Predicate<Vector2i> getTileFilter() {
         return unpack(map).getTileFilter();
     }

common/src/main/java/de/bluecolored/bluemap/common/api/BlueMapMapImpl.java

@@ -28,6 +28,7 @@
 import de.bluecolored.bluemap.api.plugin.PlayerIconFactory;
 import de.bluecolored.bluemap.api.plugin.SkinProvider;
 import de.bluecolored.bluemap.common.plugin.Plugin;
+import lombok.NonNull;
 
 public class PluginImpl implements de.bluecolored.bluemap.api.plugin.Plugin {
 
@@ -43,7 +44,7 @@ public SkinProvider getSkinProvider() {
     }
 
     @Override
-    public void setSkinProvider(SkinProvider skinProvider) {
+    public void setSkinProvider(@NonNull SkinProvider skinProvider) {
         plugin.getSkinUpdater().setSkinProvider(skinProvider);
     }
 

common/src/main/java/de/bluecolored/bluemap/common/api/PluginImpl.java

@@ -32,6 +32,7 @@
 import de.bluecolored.bluemap.common.rendermanager.MapUpdatePreparationTask;
 import de.bluecolored.bluemap.common.rendermanager.MapUpdateTask;
 import de.bluecolored.bluemap.common.rendermanager.TileUpdateStrategy;
+import lombok.NonNull;
 
 import java.util.Collection;
 
@@ -48,20 +49,20 @@ public RenderManagerImpl(BlueMapAPIImpl api, Plugin plugin) {
     }
 
     @Override
-    public boolean scheduleMapUpdateTask(BlueMapMap map, boolean force) {
+    public boolean scheduleMapUpdateTask(@NonNull BlueMapMap map, boolean force) {
         BlueMapMapImpl cmap = castMap(map);
         return renderManager.scheduleRenderTask(MapUpdatePreparationTask
                 .updateMap(cmap.map(), TileUpdateStrategy.fixed(force), renderManager));
     }
 
     @Override
-    public boolean scheduleMapUpdateTask(BlueMapMap map, Collection<Vector2i> regions, boolean force) {
+    public boolean scheduleMapUpdateTask(@NonNull BlueMapMap map, Collection<Vector2i> regions, boolean force) {
         BlueMapMapImpl cmap = castMap(map);
         return renderManager.scheduleRenderTask(new MapUpdateTask(cmap.map(), regions, TileUpdateStrategy.fixed(force)));
     }
 
     @Override
-    public boolean scheduleMapPurgeTask(BlueMapMap map) {
+    public boolean scheduleMapPurgeTask(@NonNull BlueMapMap map) {
         BlueMapMapImpl cmap = castMap(map);
         return renderManager.scheduleRenderTask(new MapPurgeTask(cmap.map()));
     }
@@ -84,7 +85,7 @@ public boolean isRunning() {
     @Override
     public void start() {
         if (!isRunning()){
-            renderManager.start(plugin.getBlueMap().getConfig().getCoreConfig().getRenderThreadCount());
+            renderManager.start(plugin.getBlueMap().getConfig().getCoreConfig().resolveRenderThreadCount());
         }
         plugin.getPluginState().setRenderThreadsEnabled(true);
     }