Minor build fixes

This commit is contained in:
Anuken
2019-07-22 12:42:42 -04:00
parent 8d2a637bd8
commit 6f0bc2ecf8
7 changed files with 4 additions and 3 deletions

View File

@@ -9,7 +9,7 @@ buildscript{
dependencies{ dependencies{
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
classpath "com.badlogicgames.gdx:gdx-tools:1.9.9" classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT" classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
} }
} }
@@ -22,7 +22,7 @@ allprojects{
versionModifier = 'beta' versionModifier = 'beta'
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.9' gdxVersion = '1.9.10'
roboVMVersion = '2.3.6' roboVMVersion = '2.3.6'
arcHash = null arcHash = null

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 KiB

After

Width:  |  Height:  |  Size: 676 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 KiB

After

Width:  |  Height:  |  Size: 459 KiB

View File

@@ -349,6 +349,6 @@ public class PlacementFragment extends Fragment{
/** Returns the block currently being hovered over in the world. */ /** Returns the block currently being hovered over in the world. */
Block tileDisplayBlock(){ Block tileDisplayBlock(){
return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : null; return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.drop() != null ? hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : hoverTile.floor() : null;
} }
} }

View File

@@ -96,6 +96,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
FileHandle file = Core.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent()); FileHandle file = Core.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent());
Core.files.absolute(url.getPath()).copyTo(file); Core.files.absolute(url.getPath()).copyTo(file);
//TODO detect if it's a map or save
if(file.extension().equalsIgnoreCase(saveExtension)){ //open save if(file.extension().equalsIgnoreCase(saveExtension)){ //open save
if(SaveIO.isSaveValid(file)){ if(SaveIO.isSaveValid(file)){