Cleanup

core/src/mindustry/content/TechTree.java

@@ -583,8 +583,6 @@ public class TechTree implements ContentList{
         public float time;
         /** Nodes that depend on this node. */
         public final Seq<TechNode> children = new Seq<>();
-        /** Research progress, in seconds. */
-        public float progress;
 
         TechNode(@Nullable TechNode ccontext, UnlockableContent content, ItemStack[] requirements, Runnable children){
             if(ccontext != null){
@@ -595,7 +593,6 @@ public class TechTree implements ContentList{
             this.content = content;
             this.requirements = requirements;
             this.depth = parent == null ? 0 : parent.depth + 1;
-            this.progress = Core.settings == null ? 0 : Core.settings.getFloat("research-" + content.name, 0f);
             this.time = Seq.with(requirements).mapFloat(i -> i.item.cost * i.amount).sum() * 10;
             this.finishedRequirements = new ItemStack[requirements.length];
 
@@ -620,7 +617,6 @@ public class TechTree implements ContentList{
 
         /** Flushes research progress to settings. */
         public void save(){
-            Core.settings.put("research-" + content.name, progress);
 
             //save finished requirements by item type
             for(ItemStack stack : finishedRequirements){

core/src/mindustry/content/UnitTypes.java

@@ -582,7 +582,7 @@ public class UnitTypes implements ContentList{
             armor = 9f;
             engineOffset = 21;
             engineSize = 5.3f;
-            hitsize = 58f;
+            hitsize = 56f;
 
             BulletType missiles = new MissileBulletType(2.7f, 10){{
                 width = 8f;

core/src/mindustry/input/DesktopInput.java

@@ -42,6 +42,8 @@ public class DesktopInput extends InputHandler{
     public @Nullable BuildPlan sreq;
     /** Whether player is currently deleting removal requests. */
     public boolean deleting = false, shouldShoot = false, panning = false;
+    /** Mouse pan speed. */
+    public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 9f;
 
     @Override
     public void buildUI(Group group){
@@ -179,7 +181,7 @@ public class DesktopInput extends InputHandler{
         }
 
         boolean panCam = false;
-        float camSpeed = !Core.input.keyDown(Binding.boost) ? 3f : 8f;
+        float camSpeed = !Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed;
 
         if(input.keyDown(Binding.pan)){
             panCam = true;
@@ -203,8 +205,8 @@ public class DesktopInput extends InputHandler{
         }
 
         if(panCam){
-            Core.camera.position.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * 0.005f, -1, 1) * camSpeed;
+            Core.camera.position.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * panScale, -1, 1) * camSpeed;
-            Core.camera.position.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * 0.005f, -1, 1) * camSpeed;
+            Core.camera.position.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * panScale, -1, 1) * camSpeed;
         }
 
         shouldShoot = !scene.hasMouse();

core/src/mindustry/net/BeControl.java

@@ -89,34 +89,38 @@ public class BeControl{
         if(!headless){
             checkUpdates = false;
             ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "@be.update.confirm", "@ok", "@be.ignore", () -> {
-                boolean[] cancel = {false};
+                try{
-                float[] progress = {0};
+                    boolean[] cancel = {false};
-                int[] length = {0};
+                    float[] progress = {0};
-                Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar");
+                    int[] length = {0};
+                    Fi file = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
 
-                BaseDialog dialog = new BaseDialog("@be.updating");
+                    BaseDialog dialog = new BaseDialog("@be.updating");
-                download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
+                    download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
-                    try{
+                        try{
-                        Runtime.getRuntime().exec(OS.isMac ?
+                            Runtime.getRuntime().exec(OS.isMac ?
-                            new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} :
+                                new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} :
-                            new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}
+                                new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}
-                        );
+                            );
-                        System.exit(0);
+                            System.exit(0);
-                    }catch(IOException e){
+                        }catch(IOException e){
+                            ui.showException(e);
+                        }
+                    }, e -> {
+                        dialog.hide();
                         ui.showException(e);
-                    }
+                    });
-                }, e -> {
-                    dialog.hide();
-                    ui.showException(e);
-                });
 
-                dialog.cont.add(new Bar(() -> length[0] == 0 ? Core.bundle.get("be.updating") : (int)(progress[0] * length[0]) / 1024/ 1024 + "/" + length[0]/1024/1024 + " MB", () -> Pal.accent, () -> progress[0])).width(400f).height(70f);
+                    dialog.cont.add(new Bar(() -> length[0] == 0 ? Core.bundle.get("be.updating") : (int)(progress[0] * length[0]) / 1024/ 1024 + "/" + length[0]/1024/1024 + " MB", () -> Pal.accent, () -> progress[0])).width(400f).height(70f);
-                dialog.buttons.button("@cancel", Icon.cancel, () -> {
+                    dialog.buttons.button("@cancel", Icon.cancel, () -> {
-                    cancel[0] = true;
+                        cancel[0] = true;
-                    dialog.hide();
+                        dialog.hide();
-                }).size(210f, 64f);
+                    }).size(210f, 64f);
-                dialog.setFillParent(false);
+                    dialog.setFillParent(false);
-                dialog.show();
+                    dialog.show();
+                }catch(Exception e){
+                    ui.showException(e);
+                }
             }, () -> checkUpdates = false);
         }else{
             Log.info("&lcA new update is available: &lyBleeding Edge build @", updateBuild);

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=98b2693ae19feedb72d577ef9bdae5cfa4315c68
+archash=a72f08a6812107fdf4462b7c6955efc19a67715b