fix: a few bugfixes and cleanups

Author: cerus

src/main/java/dev/cerus/minecraftplace/MinecraftPlacePlugin.java

@@ -6,8 +6,6 @@
 import dev.cerus.maps.plugin.map.MapScreenRegistry;
 import dev.cerus.minecraftplace.map.JoinListener;
 import dev.cerus.minecraftplace.map.MapUpdateTask;
-import dev.cerus.minecraftplace.map.TimelapseAggregatorTask;
-import dev.cerus.minecraftplace.map.TimelapseImageController;
 import dev.cerus.minecraftplace.reddit.auth.RedditAuthenticator;
 import dev.cerus.minecraftplace.reddit.canvas.Canvas;
 import dev.cerus.minecraftplace.reddit.canvas.Palette;
@@ -38,9 +36,6 @@ public void onEnable() {
         this.canvasUpdateWorker.start();
 
         this.initNormal();
-        if (this.getConfig().getBoolean("timelapse.enable")) {
-            this.initTimelapse();
-        }
 
         // Register listener
         final PluginManager pluginManager = this.getServer().getPluginManager();
@@ -55,22 +50,6 @@ public void onEnable() {
         Bukkit.getScheduler().runTaskTimerAsynchronously(this, new MapUpdateTask(this), 10 * 20, 20);
     }
 
-    private void initTimelapse() {
-        // Load timelapse images
-        final TimelapseImageController timelapseImageController = new TimelapseImageController();
-        try {
-            timelapseImageController.loadFromRPlaceDotSpace();
-        } catch (final IOException ignored) {
-            this.getLogger().severe("Failed to load timelapse images");
-            return;
-        }
-
-        // Run update task
-        final int delay = Math.max(this.getConfig().getInt("timelapse.delay-in-seconds", 1), 1) * 20;
-        this.getServer().getScheduler().runTaskTimerAsynchronously(this,
-                new TimelapseAggregatorTask(this, timelapseImageController, this.canvasUpdateWorker), 11 * 20, delay);
-    }
-
     private void initNormal() {
         // Attempt to authenticate ourselves
         final RedditAuthenticator.Token token;

src/main/java/dev/cerus/minecraftplace/map/MapUpdateTask.java

@@ -20,10 +20,12 @@
  */
 public class MapUpdateTask implements Runnable {
 
-    private static final double MAX_DIST = Math.pow(32, 2);
+    private static final double MAX_DIST = Math.pow(48, 2);
 
     private final Map<Integer, Set<UUID>> screenViewerMap = new HashMap<>();
     private final MinecraftPlacePlugin plugin;
+    private int offsetX;
+    private int offsetY;
 
     public MapUpdateTask(final MinecraftPlacePlugin plugin) {
         this.plugin = plugin;
@@ -42,11 +44,26 @@ public void run() {
 
         final Collection<Canvas> canvases = this.plugin.getCanvasMap().values();
 
+        if (this.offsetX == 0) {
+            final int width = this.plugin.getScreenWidth() * 128;
+            final int canvasWidth = canvases.stream()
+                    .mapToInt(c -> c.getX() + c.getWidth())
+                    .max().orElse(0);
+            this.offsetX = (width - canvasWidth) / 2;
+        }
+        if (this.offsetY == 0) {
+            final int height = this.plugin.getScreenHeight() * 128;
+            final int canvasHeight = canvases.stream()
+                    .mapToInt(c -> c.getY() + c.getHeight())
+                    .max().orElse(0);
+            this.offsetY = (height - canvasHeight) / 2;
+        }
+
         // Update screens
         for (final MapScreen screen : screens) {
             for (final Canvas canvas : canvases) {
                 final MapGraphics<?, ?> graphics = screen.getGraphics();
-                graphics.place(canvas.getData(), canvas.getX(), canvas.getY());
+                graphics.place(canvas.getData(), this.offsetY + canvas.getX(), this.offsetY + canvas.getY());
             }
 
             final Collection<Player> receivers = new HashSet<>();

src/main/java/dev/cerus/minecraftplace/map/TimelapseAggregatorTask.java

@@ -2,14 +2,4 @@ reddit:
   username: "my_username"
   password: "my_password"
   clientid: "abcdef01234"
-  clientsecret: "abcdef01234"
-
-timelapse:
-  enable: false # True if a timelapse of r/place should be displayed
-  delay-in-seconds: 1 # Turn this up if you experience lags
-  skip: 8 # The amount of images that should be skipped (1 if zero should be skipped)
-  show-time: true # True if the image timestamp should be drawn in the middle of the screen
-
-world:
-  enable: false
-  name: "place"
+  clientsecret: "abcdef01234"