From c25e6b586b83bcd351efe6ab7ad5f8b9292994e9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Aug 2021 21:57:18 -0400 Subject: [PATCH] Allow empty maps in FileMapGenerator --- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 1 - .../mindustry/maps/generators/FileMapGenerator.java | 10 ++++++++++ gradle.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index c7938cd11e..4113603a7c 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -234,7 +234,6 @@ public class PlanetRenderer implements Disposable{ Tmp.c1.set(from).lerp(to, (f+ Time.globalTime /timeScale)%1f); batch.color(Tmp.c1); batch.vertex(Tmp.bz3.valueAt(Tmp.v32, f)); - } batch.flush(Gl.lineStrip); } diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java index ebebd03877..f2e38e8d6b 100644 --- a/core/src/mindustry/maps/generators/FileMapGenerator.java +++ b/core/src/mindustry/maps/generators/FileMapGenerator.java @@ -21,6 +21,16 @@ public class FileMapGenerator implements WorldGenerator{ this.preset = preset; } + public FileMapGenerator(Map map, SectorPreset preset){ + this.map = map; + this.preset = preset; + } + + /** If you use this constructor, make sure to override generate()! */ + public FileMapGenerator(SectorPreset preset){ + this(emptyMap, preset); + } + @Override public void generate(Tiles tiles){ if(map == null) throw new RuntimeException("Generator has null map, cannot be used."); diff --git a/gradle.properties b/gradle.properties index b3ec89f9e1..76539672ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=7e96b986053ce489aae161aa6bcbb5d921c609d4 +archash=6534b0e34bfcb24d02d99cb9534d087ea76b5601