Only download the the textures once and cache them.

leMaik · Aug 30, 2020 · 9438da4 · 9438da4
1 parent bb6e26a
commit 9438da4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.lemaik.chunkymap</groupId>
     <artifactId>ChunkyMap</artifactId>
-    <version>2.4.1</version>
+    <version>2.4.2</version>
 
     <licenses>
         <license>

diff --git a/src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMap.java b/src/main/java/de/lemaik/chunkymap/dynmap/ChunkyMap.java
@@ -31,7 +31,7 @@
  * A map that uses the RenderService for rendering the tiles.
  */
 public class ChunkyMap extends HDMap {
-    private static final String DEFAULT_TEXTUREPACK_VERSION = "1.16.1";
+    private static final String DEFAULT_TEXTUREPACK_VERSION = "1.16.2";
     public final DynmapCameraAdapter cameraAdapter;
     private final Renderer renderer;
     private File defaultTexturepackPath;
@@ -52,17 +52,19 @@ public ChunkyMap(DynmapCore dynmap, ConfigurationNode config) {
         chunkPadding = config.getInteger("chunkPadding", 0);
 
         String texturepackVersion = config.getString("texturepackVersion", DEFAULT_TEXTUREPACK_VERSION);
-        ChunkyMapPlugin.getPlugin(ChunkyMapPlugin.class).getLogger()
-            .info("Downloading additional textures for Minecraft " + texturepackVersion);
-        try (Response response = MinecraftDownloader.downloadMinecraft(texturepackVersion).get()) {
-          File tempFile = File.createTempFile("minecraft", ".jar");
-          try (BufferedSink sink = Okio.buffer(Okio.sink(tempFile))) {
-            sink.writeAll(response.body().source());
-          }
-          defaultTexturepackPath = tempFile;
-        } catch (IOException | ExecutionException | InterruptedException e) {
-          ChunkyMapPlugin.getPlugin(ChunkyMapPlugin.class).getLogger()
-              .log(Level.SEVERE, "Downloading the textures failed, your Chunky dynmap might look bad!", e);
+        File texturepackPath = new File(ChunkyMapPlugin.getPlugin(ChunkyMapPlugin.class).getDataFolder(), texturepackVersion + ".jar");
+        if (!texturepackPath.exists()) {
+            ChunkyMapPlugin.getPlugin(ChunkyMapPlugin.class).getLogger()
+                .info("Downloading additional textures for Minecraft " + texturepackVersion);
+            try (Response response = MinecraftDownloader.downloadMinecraft(texturepackVersion).get()) {
+                try (BufferedSink sink = Okio.buffer(Okio.sink(texturepackPath))) {
+                    sink.writeAll(response.body().source());
+                }
+                defaultTexturepackPath = texturepackPath;
+            } catch (IOException | ExecutionException | InterruptedException e) {
+                ChunkyMapPlugin.getPlugin(ChunkyMapPlugin.class).getLogger()
+                    .log(Level.SEVERE, "Downloading the textures failed, your Chunky dynmap might look bad!", e);
+            }
         }
 
         if (config.containsKey("texturepack")) {