Merge pull request #3 from Anuken/master

a

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -18,6 +18,7 @@
 import io.anuke.arc.util.serialization.*;
 import io.anuke.mindustry.game.Saves.*;
 import io.anuke.mindustry.io.*;
+import io.anuke.mindustry.mod.*;
 import io.anuke.mindustry.ui.dialogs.*;
 
 import java.io.*;
@@ -134,14 +135,11 @@ public void endForceLandscape(){
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
             }
 
-            @Override
-            public boolean canDonate(){
-                return true;
-            }
         }, new AndroidApplicationConfiguration(){{
             useImmersiveMode = true;
             depth = 0;
             hideStatusBar = true;
+            errorHandler = ModCrashHandler::handle;
         }});
         checkFiles(getIntent());
     }

annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java

@@ -35,8 +35,8 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
         try{
             path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no")
-                        .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length()))
-                        .getParent().getParent().getParent().getParent().getParent().getParent().toString();
+            .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length()))
+            .getParent().getParent().getParent().getParent().getParent().getParent().toString();
             path = path.replace("%20", " ");
 
             processSounds("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound");

build.gradle

@@ -5,12 +5,13 @@ buildscript{
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
+        maven{ url 'https://jitpack.io' }
     }
 
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8-SNAPSHOT'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
-        classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
+        classpath "com.github.anuken:packr:-SNAPSHOT"
     }
 }
 
@@ -20,12 +21,12 @@ allprojects{
     group = 'com.github.Anuken'
 
     ext{
-        versionNumber = '4'
+        versionNumber = '5'
         if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.10'
-        roboVMVersion = '2.3.7'
+        roboVMVersion = '2.3.8-SNAPSHOT'
         steamworksVersion = '1.8.0'
         arcHash = null
 
@@ -166,13 +167,14 @@ project(":ios"){
         def props = new Properties()
         if(vfile.exists()){
             props.load(new FileInputStream(vfile))
+        }else{
+            props['app.id'] = 'io.anuke.mindustry'
+            props['app.version'] = '5.0'
+            props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
+            props['app.executable'] = 'IOSLauncher'
+            props['app.name'] = 'Mindustry'
         }
-
-        props['app.id'] = 'io.anuke.mindustry'
-        props['app.version'] = '4.2.1'
-        props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
-        props['app.executable'] = 'IOSLauncher'
-        props['app.name'] = 'Mindustry'
+
         props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
         props.store(vfile.newWriter(), null)
     }
@@ -194,7 +196,7 @@ project(":core"){
     apply plugin: "java"
 
     task preGen{
-        outputs.upToDateWhen{ false } 
+        outputs.upToDateWhen{ false }
         generateLocales()
         writeVersion()
     }

core/assets/bundles/bundle.properties

@@ -3,6 +3,7 @@ credits = Credits
 contributors = Translators and Contributors
 discord = Join the Mindustry Discord!
 link.discord.description = The official Mindustry Discord chatroom
+link.reddit.description = The Mindustry subreddit
 link.github.description = Game source code
 link.changelog.description = List of update changes
 link.dev-builds.description = Unstable development builds
@@ -16,6 +17,7 @@ screenshot.invalid = Map too large, potentially not enough memory for screenshot
 gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
+copied = Copied.
 
 load.sound = Sounds
 load.map = Maps
@@ -24,6 +26,23 @@ load.content = Content
 load.system = System
 load.mod = Mods
 
+schematic = Schematic
+schematic.add = Save Schematic...
+schematics = Schematics
+schematic.replace = A schematic by that name already exists. Replace it?
+schematic.import = Import Schematic...
+schematic.exportfile = Export File
+schematic.importfile = Import File
+schematic.browseworkshop = Browse Workshop
+schematic.copy = Copy to Clipboard
+schematic.copy.import = Import from Clipboard
+schematic.shareworkshop = Share on Workshop
+schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic
+schematic.saved = Schematic saved.
+schematic.delete.confirm = This schematic will be utterly eradicated.
+schematic.rename = Rename Schematic
+schematic.info = {0}x{1}, {2} blocks
+
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
 stat.built = Buildings Built:[accent] {0}
@@ -49,6 +68,7 @@ customgame = Custom Game
 newgame = New Game
 none = <none>
 minimap = Minimap
+position = Position
 close = Close
 website = Website
 quit = Quit
@@ -82,6 +102,8 @@ mod.import.github = Import Github Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
+mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again.
+mod.folder.missing = Only mods in folder form can be published on the workshop.\nTo convert any mod into a folder, simply unzip its file into a folder and delete the old zip, then restart your game or reload your mods.
 
 about.button = About
 name = Name:
@@ -217,6 +239,7 @@ loading = [accent]Loading...
 reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
 cancelbuilding = [accent][[{0}][] to clear plan
+selectschematic = [accent][[{0}][] to select+copy
 pausebuilding = [accent][[{0}][] to pause building
 resumebuilding = [scarlet][[{0}][] to resume building
 wave = [accent]Wave {0}
@@ -237,16 +260,18 @@ map.nospawn = This map does not have any cores for the player to spawn in! Add a
 map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
 map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
 map.invalid = Error loading map: corrupted or invalid map file.
-map.publish.error = Error publishing map: {0}
-map.update = Update Map
-map.load.error = Error fetching workshop details: {0}
-map.missing = This map has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked from the map.
+workshop.update = Update Item
+workshop.error = Error fetching workshop details: {0}
 map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
-map.menu = Select what you would like to do with this map.
-map.changelog = Changelog (optional):
+workshop.menu = Select what you would like to do with this item.
+workshop.info = Item Info
+changelog = Changelog (optional):
 eula = Steam EULA
-map.publish = Map published.
-map.publishing = [accent]Publishing map...
+missing = This item has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked.
+publishing = [accent]Publishing...
+publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your items will not show up!
+publish.error = Error publishing item: {0}
+
 editor.brush = Brush
 editor.openin = Open In Editor
 editor.oregen = Ore Generation
@@ -386,7 +411,6 @@ tutorial = Tutorial
 tutorial.retake = Re-Take Tutorial
 editor = Editor
 mapeditor = Map Editor
-donate = Donate
 
 abandon = Abandon
 abandon.text = This zone and all its resources will be lost to the enemy.
@@ -593,6 +617,7 @@ setting.fps.name = Show FPS
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate[lightgray] (disables animations)
 setting.minimap.name = Show Minimap
+setting.position.name = Show Player Position
 setting.musicvol.name = Music Volume
 setting.ambientvol.name = Ambient Volume
 setting.mutemusic.name = Mute Music
@@ -617,14 +642,16 @@ category.multiplayer.name = Multiplayer
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
-keybind.gridMode.name = Block Select
-keybind.gridModeShift.name = Category Select
 keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
 keybind.move_x.name = Move x
 keybind.move_y.name = Move y
+keybind.schematic_select.name = Select Region
+keybind.schematic_menu.name = Schematic Menu
+keybind.schematic_flip_x.name = Flip Schematic X
+keybind.schematic_flip_y.name = Flip Schematic Y
 keybind.fullscreen.name = Toggle Fullscreen
 keybind.select.name = Select/Shoot
 keybind.diagonal_placement.name = Diagonal Placement
@@ -1067,7 +1094,7 @@ block.junction.description = Acts as a bridge for two crossing conveyor belts. U
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
 block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
-block.inverted-sorter.descriptions = Processes items like a standard sorter, but outputs selected items to the sides instead.
+block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
 block.router.description = Accepts items, then outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.\n\n[scarlet]Never use next to production inputs, as they will get clogged by output.[]
 block.distributor.description = An advanced router. Splits items to up to 7 other directions equally.
 block.overflow-gate.description = A combination splitter and router. Only outputs to the left and right if the front path is blocked.