heck

android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.anuke.mindustry"
-    android:versionCode="38"
-    android:versionName="3.1.2" >
+    android:versionCode="39"
+    android:versionName="3.2b" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
     <uses-permission android:name="com.android.vending.BILLING" />

android/build.gradle

@@ -13,7 +13,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion "25.0.0"
+    buildToolsVersion '26.0.2'
     compileSdkVersion 25
     sourceSets {
         main {
@@ -35,10 +35,6 @@ android {
         applicationId "io.anuke.mindustry"
         minSdkVersion 9
         targetSdkVersion 25
-
-        jackOptions {
-            enabled true
-        }
     }
 
     compileOptions {
@@ -46,6 +42,8 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    flavorDimensions "google"
+
     productFlavors {
         google {
             buildConfigField "boolean", "DONATIONS_GOOGLE", "true"

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         //classpath 'org.akhikhl.gretty:gretty:+'
     }
 }

core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java

@@ -2,6 +2,7 @@ package io.anuke.mindustry.mapeditor;
 
 import java.util.Arrays;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
@@ -67,6 +68,7 @@ public class MapEditorDialog extends Dialog{
 			Vars.ui.showLoading();
 			Timers.run(3f, () -> {
 				try{
+					Gdx.app.error("MINDUSTRYAAAAAAAAAA", "Saving to file: " + result.toString() + " " + result.type());
 					Pixmaps.write(editor.pixmap(), result);
 				}catch (Exception e){
 					Vars.ui.showError("Error saving image file!");
@@ -150,7 +152,7 @@ public class MapEditorDialog extends Dialog{
 	public void build(){
 		
 		new table(){{
-			float isize = Unit.dp.inPixels(14*3f);
+			float isize = Unit.dp.inPixels(16*2f);
 			aleft();
 			
 			new table(){{
@@ -163,37 +165,37 @@ public class MapEditorDialog extends Dialog{
 				
 				row();
 				
-				new imagebutton("icon-cursor", 10f*3f, () -> {
+				new imagebutton("icon-resize", isize, () -> {
 					resizeDialog.show();
 				}).text("resize").padTop(4f);
 				
 				row();
 				
-				new imagebutton("icon-load", isize, () -> {
+				new imagebutton("icon-load-map", isize, () -> {
 					loadDialog.show();
 				}).text("load map");
 				
 				row();
 				
-				new imagebutton("icon-save", isize, ()->{
+				new imagebutton("icon-save-map", isize, ()->{
 					saveDialog.show();
 				}).text("save map");
 				
 				row();
 				
-				new imagebutton("icon-load", isize, () -> {
+				new imagebutton("icon-load-image", isize, () -> {
 					openFile.show();
 				}).text("load image");
 				
 				row();
 				
-				new imagebutton("icon-save", isize, () -> {
+				new imagebutton("icon-save-image", isize, () -> {
 					saveFile.show();
 				}).text("save image");
 				
 				row();
 				
-				new imagebutton("icon-arrow-left", isize, () -> {
+				new imagebutton("icon-back", isize, () -> {
 					if(!saved){
 						Vars.ui.showConfirm("Confirm Exit", "[scarlet]You have unsaved changes![]\nAre you sure you want to exit?", () -> hide());
 					}else{

core/src/io/anuke/mindustry/ui/FileChooser.java

@@ -24,7 +24,7 @@ import io.anuke.ucore.scene.ui.layout.Unit;
 public class FileChooser extends FloatingDialog{
 	
 	private Table files;
-	private FileHandle homeDirectory = Gdx.files.local(Gdx.files.getExternalStoragePath());
+	private FileHandle homeDirectory = Gdx.files.absolute(Gdx.files.getExternalStoragePath());
 	private FileHandle directory = homeDirectory;
 	private ScrollPane pane;
 	private TextField navigation, filefield;

core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java

@@ -65,7 +65,7 @@ public class MenuFragment implements Fragment{
 					
 					row();
 					
-					new imagebutton("icon-terrain", isize, () -> ui.showEditor()).text("Editor").padTop(4f);
+					new imagebutton("icon-editor", isize, () -> ui.showEditor()).text("Editor").padTop(4f);
 	
 					new imagebutton("icon-tools", isize, () -> ui.showPrefs()).text("Settings").padTop(4f);
 					

core/src/io/anuke/ucore/function/ActionProvider.java

@@ -1,7 +0,0 @@
-package io.anuke.ucore.function;
-
-import io.anuke.ucore.scene.Action;
-
-public interface ActionProvider{
-	public Action get();
-}

core/src/io/anuke/ucore/function/BiConsumer.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface BiConsumer<T, N>{
-	public void accept(T t, N n);
-}

core/src/io/anuke/ucore/function/BoundingBoxProvider.java

@@ -1,7 +0,0 @@
-package io.anuke.ucore.function;
-
-import com.badlogic.gdx.math.Rectangle;
-
-public interface BoundingBoxProvider<T>{
-	public void getBoundingBox(T type, Rectangle out);
-}

core/src/io/anuke/ucore/function/ButtonTweaker.java

@@ -1,7 +0,0 @@
-package io.anuke.ucore.function;
-
-import io.anuke.ucore.scene.ui.TextButton;
-
-public interface ButtonTweaker{
-	public void tweak(TextButton button);
-}

core/src/io/anuke/ucore/function/Callable.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface Callable{
-	public void run();
-}

core/src/io/anuke/ucore/function/CheckListenable.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface CheckListenable{
-	public void listen(boolean checked);
-}

core/src/io/anuke/ucore/function/ColorListenable.java

@@ -1,7 +0,0 @@
-package io.anuke.ucore.function;
-
-import com.badlogic.gdx.graphics.Color;
-
-public interface ColorListenable{
-	public void changed(Color color);
-}

core/src/io/anuke/ucore/function/Consumer.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface Consumer<T>{
-	public void accept(T t);
-}

core/src/io/anuke/ucore/function/DelayRun.java

@@ -1,15 +0,0 @@
-package io.anuke.ucore.function;
-
-import com.badlogic.gdx.utils.Pool.Poolable;
-
-public class DelayRun implements Poolable{
-	public float delay;
-	public Callable run;
-	public Callable finish;
-	
-	@Override
-	public void reset(){
-		delay = 0;
-		run = finish = null;
-	}
-}

core/src/io/anuke/ucore/function/EffectProvider.java

@@ -1,9 +0,0 @@
-package io.anuke.ucore.function;
-
-import com.badlogic.gdx.graphics.Color;
-
-import io.anuke.ucore.core.Effects.Effect;
-
-public interface EffectProvider{
-	public void createEffect(Effect effect, Color color, float x, float y, float rotation);
-}

core/src/io/anuke/ucore/function/EffectRenderer.java

@@ -1,7 +0,0 @@
-package io.anuke.ucore.function;
-
-import io.anuke.ucore.core.Effects.EffectContainer;
-
-public interface EffectRenderer{
-	public void render(EffectContainer effect);
-}

core/src/io/anuke/ucore/function/Event.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface Event{
-
-}

core/src/io/anuke/ucore/function/FieldListenable.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface FieldListenable{
-	public void listen(String text);
-}

core/src/io/anuke/ucore/function/ISegmentConsumer.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface ISegmentConsumer{
-	public void accept(int x, int y, int x2, int y2);
-}

core/src/io/anuke/ucore/function/KeyListenable.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface KeyListenable{
-	public void pressed(int key);
-}

core/src/io/anuke/ucore/function/Listenable.java

@@ -1,6 +0,0 @@
-package io.anuke.ucore.function;
-
-/**Listener lambda class.*/
-public interface Listenable{
-	public void listen();
-}

core/src/io/anuke/ucore/function/PositionConsumer.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface PositionConsumer{
-	public void accept(float x, float y);
-}

core/src/io/anuke/ucore/function/Predicate.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface Predicate<T>{
-	public boolean test(T t);
-}

core/src/io/anuke/ucore/function/SegmentConsumer.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface SegmentConsumer{
-	public void accept(float x, float y, float x2, float y2);
-}

core/src/io/anuke/ucore/function/StringProcessor.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface StringProcessor{
-	public String get(int i);
-}

core/src/io/anuke/ucore/function/StringSupplier.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface StringSupplier{
-	public String get();
-}

core/src/io/anuke/ucore/function/Supplier.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface Supplier<T>{
-	public T get();
-}

core/src/io/anuke/ucore/function/TileCollider.java

@@ -1,6 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface TileCollider{
-	public boolean solid(int x, int y);
-}
-

core/src/io/anuke/ucore/function/TileHitboxProvider.java

@@ -1,7 +0,0 @@
-package io.anuke.ucore.function;
-
-import com.badlogic.gdx.math.Rectangle;
-
-public interface TileHitboxProvider{
-	public void getHitbox(int x, int y, Rectangle out);
-}

core/src/io/anuke/ucore/function/TriPosConsumer.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface TriPosConsumer{
-	public void accept(int x, int y, int z);
-}

core/src/io/anuke/ucore/function/TypingListenable.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface TypingListenable{
-	public void typed(char c);
-}

core/src/io/anuke/ucore/function/VisibilityProvider.java

@@ -1,5 +0,0 @@
-package io.anuke.ucore.function;
-
-public interface VisibilityProvider{
-	public boolean visible();
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun May 28 16:07:17 EDT 2017
+#Tue Dec 19 19:08:24 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-3.5-rc-3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

html/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: "java"
-apply plugin: "jetty"
 //apply plugin: 'org.akhikhl.gretty'
 
 gwt {