From 55920e6242073afd1c96a2d546fb9b77ce722f44 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 17 Jul 2021 11:09:38 -0400
Subject: [PATCH] Cleanup

---
 core/src/mindustry/core/World.java                  | 5 ++---
 core/src/mindustry/editor/MapGenerateDialog.java    | 4 ++--
 core/src/mindustry/entities/comp/BoundedComp.java   | 2 +-
 core/src/mindustry/maps/filters/GenerateFilter.java | 7 ++-----
 gradle.properties                                   | 2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java
index 8627230a0f..e1363a281f 100644
--- a/core/src/mindustry/core/World.java
+++ b/core/src/mindustry/core/World.java
@@ -525,8 +525,7 @@ public class World{
 
     private class Context implements WorldContext{
 
-        Context(){
-        }
+        Context(){}
 
         @Override
         public Tile tile(int index){
@@ -579,7 +578,7 @@ public class World{
 
                 for(GenerateFilter filter : filters){
                     filter.randomize();
-                    input.begin(filter, width(), height(), (x, y) -> tiles.getn(x, y));
+                    input.begin(width(), height(), (x, y) -> tiles.getn(x, y));
                     filter.apply(tiles, input);
                 }
             }
diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java
index 31af738182..8124e1c459 100644
--- a/core/src/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/mindustry/editor/MapGenerateDialog.java
@@ -158,7 +158,7 @@ public class MapGenerateDialog extends BaseDialog{
         long[] writeTiles = new long[editor.width() * editor.height()];
 
         for(GenerateFilter filter : filters){
-            input.begin(filter, editor.width(), editor.height(), editor::tile);
+            input.begin(editor.width(), editor.height(), editor::tile);
 
             //write to buffer
             for(int x = 0; x < editor.width(); x++){
@@ -414,7 +414,7 @@ public class MapGenerateDialog extends BaseDialog{
                 }
 
                 for(var filter : copy){
-                    input.begin(filter, editor.width(), editor.height(), (x, y) -> unpack(buffer1[Mathf.clamp(x / scaling, 0, pixmap.width -1) + w* Mathf.clamp(y / scaling, 0, pixmap.height -1)]));
+                    input.begin(editor.width(), editor.height(), (x, y) -> unpack(buffer1[Mathf.clamp(x / scaling, 0, pixmap.width -1) + w* Mathf.clamp(y / scaling, 0, pixmap.height -1)]));
 
                     //read from buffer1 and write to buffer2
                     pixmap.each((px, py) -> {
diff --git a/core/src/mindustry/entities/comp/BoundedComp.java b/core/src/mindustry/entities/comp/BoundedComp.java
index 7b09f23f69..fa7d860db2 100644
--- a/core/src/mindustry/entities/comp/BoundedComp.java
+++ b/core/src/mindustry/entities/comp/BoundedComp.java
@@ -9,7 +9,7 @@ import static mindustry.Vars.*;
 
 @Component
 abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{
-    static final float warpDst = 40f;
+    static final float warpDst = 30f;
 
     @Import float x, y;
 
diff --git a/core/src/mindustry/maps/filters/GenerateFilter.java b/core/src/mindustry/maps/filters/GenerateFilter.java
index f6fde18102..fea59ed405 100644
--- a/core/src/mindustry/maps/filters/GenerateFilter.java
+++ b/core/src/mindustry/maps/filters/GenerateFilter.java
@@ -75,8 +75,7 @@ public abstract class GenerateFilter{
 
     /** localized display name */
     public String name(){
-        var s = simpleName();
-        return Core.bundle.get("filter." + s);
+        return Core.bundle.get("filter." + simpleName());
     }
 
     public char icon(){
@@ -100,8 +99,6 @@ public abstract class GenerateFilter{
 
     //utility generation functions
 
-    //TODO would be nice if these functions used the seed and ditched "in" completely; simplex should be stateless
-
     protected float noise(GenerateInput in, float scl, float mag){
         return Simplex.noise2d(seed, 1f, 0f, 1f / scl, in.x, in.y) * mag;
     }
@@ -141,7 +138,7 @@ public abstract class GenerateFilter{
             this.y = y;
         }
 
-        public void begin(GenerateFilter filter, int width, int height, TileProvider buffer){
+        public void begin(int width, int height, TileProvider buffer){
             this.buffer = buffer;
             this.width = width;
             this.height = height;
diff --git a/gradle.properties b/gradle.properties
index 680c4b703a..7a6d80a68e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=3fe3fc594d041fa0a7e096e50ce1a032ffe3dae0
+archash=2eaaa8e46b18b2a4a5af3e012ce1814b05ab7955