Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_fil.properties

@@ -1200,19 +1200,19 @@ tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 wav
 tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
 tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese obtained resources can then be used to research new technology.\n\n[accent]Press the launch button.
 
-item.copper.description = The most basic structural material. Used extensively in all types of blocks.
+item.copper.description = Ang pinaka basic na struktural materyal. Malawakang ginagamit sa lahat ng types ng blocks.
-item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
+item.lead.description = Ang panimulang at basic na materyal. Malawakang ginagamit sa electronika at sa transportasyon ng likido gamit ng blocks.
-item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
+item.metaglass.description = Ito ay matigas na glass compound. Malawakang ginagamit sa distribution ng likido at pag imbakan.
-item.graphite.description = Mineralized carbon, used for ammunition and electrical components.
+item.graphite.description = Mineralized carbon, Malawakang ginagamit sa ammunisyon at sa mga bahagi ng electrisidad.
-item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
+item.sand.description = Ang karaniwang  materyal na malawakang ginagamit sa smelting, pareho sa alloying at bilang flux
-item.coal.description = Fossilized plant matter, formed long before the seeding event. Used extensively for fuel and resource production.
+item.coal.description =Ang karaniwang  materyal na malawakang ginagamit sa smelting, pareho sa alloying at bilang flux
-item.titanium.description = A rare super-light metal used extensively in liquid transportation, drills and aircraft.
+item.titanium.description = Ang bihira hanapin at magaan na metal. Malawaking ginagamit sa transportasyon ng likido, mga drills at aircraft.
-item.thorium.description = A dense, radioactive metal used as structural support and nuclear fuel.
+item.thorium.description = Ito ay malagong, radioactive metal ginagamit para sa supporta sa istraktura at nuklear fuel.
-item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
+item.scrap.description = Galing sa mga matatanda at natirang struktura  at units. Naglalaman ng ibat ibang metals.
-item.silicon.description = An extremely useful semiconductor. Applications in solar panels, complex electronics and homing turret ammunition.
+item.silicon.description = Ang nakakatulong na semiconductor. Aplikasyon sa solar panels, Komplikadong electronika at homing turret ammunisyon.
-item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
+item.plastanium.description = Ito ay magaan, malagkit na materyal ginamit sa advanced aircraft at fragmentation ammunisyon.
-item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
+item.phase-fabric.description = Ito ay malapit na mawalan ng timbang na substansya ginamit sa advanced  na electronika at self-repairing na technolohiya.
-item.surge-alloy.description = An advanced alloy with unique electrical properties.
+item.surge-alloy.description = Ang advanced na pinag halung metal na may kakaibang electrical properties.
 item.spore-pod.description = A pod of synthetic spores, synthesized from atmospheric concentrations for industrial purposes. Used for conversion into oil, explosives and fuel.
 item.blast-compound.description = An unstable compound used in bombs and explosives. Synthesized from spore pods and other volatile substances. Use as fuel is not advised.
 item.pyratite.description = An extremely flammable substance used in incendiary weapons.

core/assets/bundles/bundle_pl.properties

@@ -904,7 +904,7 @@ category.view.name = Wyświetl
 category.multiplayer.name = Wielu graczy
 category.blocks.name = Wybierz Blok
 command.attack = Atakuj
-command.rally = Zbierz
+command.rally = Zbiórka
 command.retreat = Wycofaj
 command.idle = Nieaktywny
 placement.blockselectkeys = \n[lightgray]Klawisz: [{0},

core/assets/scripts/global.js

@@ -191,6 +191,7 @@ const PlayEvent = Packages.mindustry.game.EventType.PlayEvent
 const DisposeEvent = Packages.mindustry.game.EventType.DisposeEvent
 const ServerLoadEvent = Packages.mindustry.game.EventType.ServerLoadEvent
 const ClientCreateEvent = Packages.mindustry.game.EventType.ClientCreateEvent
+const SaveWriteEvent = Packages.mindustry.game.EventType.SaveWriteEvent
 const SaveLoadEvent = Packages.mindustry.game.EventType.SaveLoadEvent
 const MapPublishEvent = Packages.mindustry.game.EventType.MapPublishEvent
 const MapMakeEvent = Packages.mindustry.game.EventType.MapMakeEvent

core/src/mindustry/Vars.java

@@ -199,6 +199,8 @@ public class Vars implements Loadable{
     public static final String saveExtension = "msav";
     /** schematic file extension */
     public static final String schematicExtension = "msch";
+    /** path to the java executable */
+    public static String javaPath;
 
     /** list of all locales that can be switched to */
     public static Locale[] locales;
@@ -293,6 +295,10 @@ public class Vars implements Loadable{
         pathfinder = new Pathfinder();
         bases = new BaseRegistry();
         constants = new GlobalConstants();
+        javaPath =
+            new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() :
+            Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() :
+            "java";
 
         state = new GameState();
 

core/src/mindustry/core/Renderer.java

@@ -299,6 +299,7 @@ public class Renderer implements ApplicationListener{
         Draw.draw(Layer.overlayUI, overlays::drawTop);
         Draw.draw(Layer.space, this::drawLanding);
 
+        Events.fire(Trigger.drawOver);
         blocks.drawBlocks();
 
         Groups.draw.draw(Drawc::draw);

core/src/mindustry/game/EventType.java

@@ -33,6 +33,7 @@ public class EventType{
         socketConfigChanged,
         update,
         draw,
+        drawOver,
         preDraw,
         postDraw,
         uiDrawBegin,
@@ -50,6 +51,7 @@ public class EventType{
     public static class ResizeEvent{}
     public static class MapMakeEvent{}
     public static class MapPublishEvent{}
+    public static class SaveWriteEvent{}
     public static class SaveLoadEvent{}
     public static class ClientCreateEvent{}
     public static class ServerLoadEvent{}
@@ -503,7 +505,7 @@ public class EventType{
             this.player = player;
         }
     }
-    
+
     public static class PlayerBanEvent{
         @Nullable
         public final Player player;
@@ -514,7 +516,7 @@ public class EventType{
             this.uuid = uuid;
         }
     }
-    
+
     public static class PlayerUnbanEvent{
         @Nullable
         public final Player player;
@@ -525,7 +527,7 @@ public class EventType{
             this.uuid = uuid;
         }
     }
-    
+
     public static class PlayerIpBanEvent{
         public final String ip;
 
@@ -533,7 +535,7 @@ public class EventType{
             this.ip = ip;
         }
     }
-    
+
     public static class PlayerIpUnbanEvent{
         public final String ip;
 
@@ -541,6 +543,5 @@ public class EventType{
             this.ip = ip;
         }
     }
-    
-}
 
+}

core/src/mindustry/io/SaveIO.java

@@ -113,13 +113,17 @@ public class SaveIO{
 
     public static void write(OutputStream os, StringMap tags){
         try(DataOutputStream stream = new DataOutputStream(os)){
+            SaveVersion ver = getVersion();
+
             stream.write(header);
-            stream.writeInt(getVersion().version);
+            stream.writeInt(ver.version);
             if(tags == null){
-                getVersion().write(stream);
+                ver.write(stream);
             }else{
-                getVersion().write(stream, tags);
+                ver.write(stream, tags);
             }
+
+            Events.fire(new SaveWriteEvent());
         }catch(Throwable e){
             throw new RuntimeException(e);
         }

core/src/mindustry/net/BeControl.java

@@ -107,8 +107,8 @@ public class BeControl{
                     download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
                         try{
                             Runtime.getRuntime().exec(OS.isMac ?
-                                new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()} :
+                                new String[]{javaPath, "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()} :
-                                new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()}
+                                new String[]{javaPath, "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()}
                             );
                             System.exit(0);
                         }catch(IOException e){

servers_v6.json

@@ -117,6 +117,6 @@
   },
   {
     "name": "MindustryBR",
-    "address": ["mindustryptbr.ddns.net", "mindustryptbr.myddns.me", "mindustryptbr.myddns.me:6566"]
+    "address": ["mindustryptbr.ddns.net", "mindustryptbr.myddns.me"]
   }
 ]