From 4ed9f10c1bb2e791d4eb763dfcd584e46e8fc1c5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 4 Jul 2021 09:51:39 -0400
Subject: [PATCH] Cleanup

---
 core/src/mindustry/maps/Maps.java      | 4 ++--
 core/src/mindustry/mod/Scripts.java    | 7 +++----
 gradle.properties                      | 2 +-
 ios/src/mindustry/ios/IOSLauncher.java | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java
index 72fcc09aa1..46b74799d9 100644
--- a/core/src/mindustry/maps/Maps.java
+++ b/core/src/mindustry/maps/Maps.java
@@ -422,7 +422,7 @@ public class Maps{
     }
 
     private void writeCache(Map map) throws IOException{
-        try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.DEFAULT_BUFFER_SIZE))){
+        try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.defaultBufferSize))){
             stream.write(0);
             stream.writeInt(map.spawns);
             stream.write(map.teams.size);
@@ -434,7 +434,7 @@ public class Maps{
     }
 
     private void readCache(Map map) throws IOException{
-        try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.DEFAULT_BUFFER_SIZE))){
+        try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.defaultBufferSize))){
             stream.read(); //version
             map.spawns = stream.readInt();
             int teamsize = stream.readByte();
diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java
index 1aa69b9ab7..8dd10759bc 100644
--- a/core/src/mindustry/mod/Scripts.java
+++ b/core/src/mindustry/mod/Scripts.java
@@ -7,9 +7,9 @@ import arc.assets.loaders.SoundLoader.*;
 import arc.audio.*;
 import arc.files.*;
 import arc.func.*;
-import arc.struct.*;
 import arc.util.*;
 import arc.util.Log.*;
+import arc.util.io.*;
 import mindustry.*;
 import mindustry.mod.Mods.*;
 import rhino.*;
@@ -18,7 +18,6 @@ import rhino.module.provider.*;
 
 import java.io.*;
 import java.net.*;
-import java.util.*;
 import java.util.regex.*;
 
 public class Scripts implements Disposable{
@@ -131,7 +130,7 @@ public class Scripts implements Disposable{
 
     /** writeFile but for a byte[] */
     public void writeBinFile(String purpose, String ext, byte[] contents){
-        if(contents == null) contents = new byte[0];
+        if(contents == null) contents = Streams.emptyBytes;
         final byte[] fContents = contents;
         selectFile(false, purpose, ext, fi -> fi.writeBytes(fContents));
     }
@@ -183,7 +182,7 @@ public class Scripts implements Disposable{
     }
 
     private class ScriptModuleProvider extends UrlModuleSourceProvider{
-        private Pattern directory = Pattern.compile("^(.+?)/(.+)");
+        private final Pattern directory = Pattern.compile("^(.+?)/(.+)");
 
         public ScriptModuleProvider(){
             super(null, null);
diff --git a/gradle.properties b/gradle.properties
index cd18c70c04..5aa6936a7b 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=b5d3986d159cc42f2b38da24682ad0cc19c6c656
+archash=ca296ad37aeca186fcef3290bb8a6e9143bdd245
diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java
index 4171862d2b..efb0874504 100644
--- a/ios/src/mindustry/ios/IOSLauncher.java
+++ b/ios/src/mindustry/ios/IOSLauncher.java
@@ -219,7 +219,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
 
                 if(SaveIO.isSaveValid(file)){
                     try{
-                        SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.DEFAULT_BUFFER_SIZE))));
+                        SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.defaultBufferSize))));
                         if(meta.tags.containsKey("name")){
                             //is map
                             if(!ui.editor.isShown()){