diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 7ff5d633b3..b57dd5563e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="39" + android:versionName="3.2b" > diff --git a/android/build.gradle b/android/build.gradle index a2073df378..02204ab61d 100644 --- a/android/build.gradle +++ b/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" diff --git a/build.gradle b/build.gradle index b9a26c5ee0..6e55b1f32f 100644 --- a/build.gradle +++ b/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:+' } } diff --git a/core/assets-raw/sprites/ui/icon-file.png b/core/assets-raw/sprites/ui/icon-file.png deleted file mode 100644 index 8ebd7eba64..0000000000 Binary files a/core/assets-raw/sprites/ui/icon-file.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/icon-terrain.png b/core/assets-raw/sprites/ui/icon-terrain.png deleted file mode 100644 index 92dc447567..0000000000 Binary files a/core/assets-raw/sprites/ui/icon-terrain.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/icon-areaDelete.png b/core/assets-raw/sprites/ui/icons/icon-areaDelete.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-areaDelete.png rename to core/assets-raw/sprites/ui/icons/icon-areaDelete.png diff --git a/core/assets-raw/sprites/ui/icon-arrow-left.png b/core/assets-raw/sprites/ui/icons/icon-arrow-left.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-arrow-left.png rename to core/assets-raw/sprites/ui/icons/icon-arrow-left.png diff --git a/core/assets-raw/sprites/ui/icon-arrow-right.png b/core/assets-raw/sprites/ui/icons/icon-arrow-right.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-arrow-right.png rename to core/assets-raw/sprites/ui/icons/icon-arrow-right.png diff --git a/core/assets-raw/sprites/ui/icon-arrow.png b/core/assets-raw/sprites/ui/icons/icon-arrow.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-arrow.png rename to core/assets-raw/sprites/ui/icons/icon-arrow.png diff --git a/core/assets-raw/sprites/ui/icons/icon-back.png b/core/assets-raw/sprites/ui/icons/icon-back.png new file mode 100644 index 0000000000..be3d74fd80 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-back.png differ diff --git a/core/assets-raw/sprites/ui/icon-cancel.png b/core/assets-raw/sprites/ui/icons/icon-cancel.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-cancel.png rename to core/assets-raw/sprites/ui/icons/icon-cancel.png diff --git a/core/assets-raw/sprites/ui/icon-check.png b/core/assets-raw/sprites/ui/icons/icon-check.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-check.png rename to core/assets-raw/sprites/ui/icons/icon-check.png diff --git a/core/assets-raw/sprites/ui/icon-close-down.png b/core/assets-raw/sprites/ui/icons/icon-close-down.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-close-down.png rename to core/assets-raw/sprites/ui/icons/icon-close-down.png diff --git a/core/assets-raw/sprites/ui/icon-close-over.png b/core/assets-raw/sprites/ui/icons/icon-close-over.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-close-over.png rename to core/assets-raw/sprites/ui/icons/icon-close-over.png diff --git a/core/assets-raw/sprites/ui/icon-close.png b/core/assets-raw/sprites/ui/icons/icon-close.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-close.png rename to core/assets-raw/sprites/ui/icons/icon-close.png diff --git a/core/assets-raw/sprites/ui/icon-crafting.png b/core/assets-raw/sprites/ui/icons/icon-crafting.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-crafting.png rename to core/assets-raw/sprites/ui/icons/icon-crafting.png diff --git a/core/assets-raw/sprites/ui/icon-cursor.png b/core/assets-raw/sprites/ui/icons/icon-cursor.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-cursor.png rename to core/assets-raw/sprites/ui/icons/icon-cursor.png diff --git a/core/assets-raw/sprites/ui/icon-defense.png b/core/assets-raw/sprites/ui/icons/icon-defense.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-defense.png rename to core/assets-raw/sprites/ui/icons/icon-defense.png diff --git a/core/assets-raw/sprites/ui/icon-discord.png b/core/assets-raw/sprites/ui/icons/icon-discord.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-discord.png rename to core/assets-raw/sprites/ui/icons/icon-discord.png diff --git a/core/assets-raw/sprites/ui/icon-distribution.png b/core/assets-raw/sprites/ui/icons/icon-distribution.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-distribution.png rename to core/assets-raw/sprites/ui/icons/icon-distribution.png diff --git a/core/assets-raw/sprites/ui/icon-donate.png b/core/assets-raw/sprites/ui/icons/icon-donate.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-donate.png rename to core/assets-raw/sprites/ui/icons/icon-donate.png diff --git a/core/assets-raw/sprites/ui/icons/icon-editor.png b/core/assets-raw/sprites/ui/icons/icon-editor.png new file mode 100644 index 0000000000..d607e2bd4f Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-editor.png differ diff --git a/core/assets-raw/sprites/ui/icon-file-text.png b/core/assets-raw/sprites/ui/icons/icon-file-text.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-file-text.png rename to core/assets-raw/sprites/ui/icons/icon-file-text.png diff --git a/core/assets-raw/sprites/ui/icon-fill.png b/core/assets-raw/sprites/ui/icons/icon-fill.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-fill.png rename to core/assets-raw/sprites/ui/icons/icon-fill.png diff --git a/core/assets-raw/sprites/ui/icon-folder-parent.png b/core/assets-raw/sprites/ui/icons/icon-folder-parent.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-folder-parent.png rename to core/assets-raw/sprites/ui/icons/icon-folder-parent.png diff --git a/core/assets-raw/sprites/ui/icon-folder.png b/core/assets-raw/sprites/ui/icons/icon-folder.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-folder.png rename to core/assets-raw/sprites/ui/icons/icon-folder.png diff --git a/core/assets-raw/sprites/ui/icon-hold.png b/core/assets-raw/sprites/ui/icons/icon-hold.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-hold.png rename to core/assets-raw/sprites/ui/icons/icon-hold.png diff --git a/core/assets-raw/sprites/ui/icon-holdDelete.png b/core/assets-raw/sprites/ui/icons/icon-holdDelete.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-holdDelete.png rename to core/assets-raw/sprites/ui/icons/icon-holdDelete.png diff --git a/core/assets-raw/sprites/ui/icon-home.png b/core/assets-raw/sprites/ui/icons/icon-home.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-home.png rename to core/assets-raw/sprites/ui/icons/icon-home.png diff --git a/core/assets-raw/sprites/ui/icon-info.png b/core/assets-raw/sprites/ui/icons/icon-info.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-info.png rename to core/assets-raw/sprites/ui/icons/icon-info.png diff --git a/core/assets-raw/sprites/ui/icons/icon-load-image.png b/core/assets-raw/sprites/ui/icons/icon-load-image.png new file mode 100644 index 0000000000..f20d4a01ed Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-load-image.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-load-map.png b/core/assets-raw/sprites/ui/icons/icon-load-map.png new file mode 100644 index 0000000000..336b5efe20 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-load-map.png differ diff --git a/core/assets-raw/sprites/ui/icon-load.png b/core/assets-raw/sprites/ui/icons/icon-load.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-load.png rename to core/assets-raw/sprites/ui/icons/icon-load.png diff --git a/core/assets-raw/sprites/ui/icon-loading.png b/core/assets-raw/sprites/ui/icons/icon-loading.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-loading.png rename to core/assets-raw/sprites/ui/icons/icon-loading.png diff --git a/core/assets-raw/sprites/ui/icon-menu.png b/core/assets-raw/sprites/ui/icons/icon-menu.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-menu.png rename to core/assets-raw/sprites/ui/icons/icon-menu.png diff --git a/core/assets-raw/sprites/ui/icon-none.png b/core/assets-raw/sprites/ui/icons/icon-none.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-none.png rename to core/assets-raw/sprites/ui/icons/icon-none.png diff --git a/core/assets-raw/sprites/ui/icon-pause.png b/core/assets-raw/sprites/ui/icons/icon-pause.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-pause.png rename to core/assets-raw/sprites/ui/icons/icon-pause.png diff --git a/core/assets-raw/sprites/ui/icon-pencil.png b/core/assets-raw/sprites/ui/icons/icon-pencil.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-pencil.png rename to core/assets-raw/sprites/ui/icons/icon-pencil.png diff --git a/core/assets-raw/sprites/ui/icon-pick.png b/core/assets-raw/sprites/ui/icons/icon-pick.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-pick.png rename to core/assets-raw/sprites/ui/icons/icon-pick.png diff --git a/core/assets-raw/sprites/ui/icon-play-2.png b/core/assets-raw/sprites/ui/icons/icon-play-2.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-play-2.png rename to core/assets-raw/sprites/ui/icons/icon-play-2.png diff --git a/core/assets-raw/sprites/ui/icon-play.png b/core/assets-raw/sprites/ui/icons/icon-play.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-play.png rename to core/assets-raw/sprites/ui/icons/icon-play.png diff --git a/core/assets-raw/sprites/ui/icon-power.png b/core/assets-raw/sprites/ui/icons/icon-power.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-power.png rename to core/assets-raw/sprites/ui/icons/icon-power.png diff --git a/core/assets-raw/sprites/ui/icon-production.png b/core/assets-raw/sprites/ui/icons/icon-production.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-production.png rename to core/assets-raw/sprites/ui/icons/icon-production.png diff --git a/core/assets-raw/sprites/ui/icon-quit.png b/core/assets-raw/sprites/ui/icons/icon-quit.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-quit.png rename to core/assets-raw/sprites/ui/icons/icon-quit.png diff --git a/core/assets-raw/sprites/ui/icon-redo.png b/core/assets-raw/sprites/ui/icons/icon-redo.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-redo.png rename to core/assets-raw/sprites/ui/icons/icon-redo.png diff --git a/core/assets-raw/sprites/ui/icons/icon-resize.png b/core/assets-raw/sprites/ui/icons/icon-resize.png new file mode 100644 index 0000000000..00d11bee80 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-resize.png differ diff --git a/core/assets-raw/sprites/ui/icon-rotate-arrow.png b/core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-rotate-arrow.png rename to core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png diff --git a/core/assets-raw/sprites/ui/icon-rotate-left.png b/core/assets-raw/sprites/ui/icons/icon-rotate-left.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-rotate-left.png rename to core/assets-raw/sprites/ui/icons/icon-rotate-left.png diff --git a/core/assets-raw/sprites/ui/icon-rotate-right.png b/core/assets-raw/sprites/ui/icons/icon-rotate-right.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-rotate-right.png rename to core/assets-raw/sprites/ui/icons/icon-rotate-right.png diff --git a/core/assets-raw/sprites/ui/icon-rotate.png b/core/assets-raw/sprites/ui/icons/icon-rotate.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-rotate.png rename to core/assets-raw/sprites/ui/icons/icon-rotate.png diff --git a/core/assets-raw/sprites/ui/icons/icon-save-image.png b/core/assets-raw/sprites/ui/icons/icon-save-image.png new file mode 100644 index 0000000000..7971c82f7d Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-save-image.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-save-map.png b/core/assets-raw/sprites/ui/icons/icon-save-map.png new file mode 100644 index 0000000000..781664e578 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-save-map.png differ diff --git a/core/assets-raw/sprites/ui/icon-save.png b/core/assets-raw/sprites/ui/icons/icon-save.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-save.png rename to core/assets-raw/sprites/ui/icons/icon-save.png diff --git a/core/assets-raw/sprites/ui/icon-settings.png b/core/assets-raw/sprites/ui/icons/icon-settings.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-settings.png rename to core/assets-raw/sprites/ui/icons/icon-settings.png diff --git a/core/assets-raw/sprites/ui/icons/icon-terrain.png b/core/assets-raw/sprites/ui/icons/icon-terrain.png new file mode 100644 index 0000000000..449b861973 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-terrain.png differ diff --git a/core/assets-raw/sprites/ui/icon-tools.png b/core/assets-raw/sprites/ui/icons/icon-tools.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-tools.png rename to core/assets-raw/sprites/ui/icons/icon-tools.png diff --git a/core/assets-raw/sprites/ui/icon-touch.png b/core/assets-raw/sprites/ui/icons/icon-touch.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-touch.png rename to core/assets-raw/sprites/ui/icons/icon-touch.png diff --git a/core/assets-raw/sprites/ui/icon-touchDelete.png b/core/assets-raw/sprites/ui/icons/icon-touchDelete.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-touchDelete.png rename to core/assets-raw/sprites/ui/icons/icon-touchDelete.png diff --git a/core/assets-raw/sprites/ui/icon-tutorial.png b/core/assets-raw/sprites/ui/icons/icon-tutorial.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-tutorial.png rename to core/assets-raw/sprites/ui/icons/icon-tutorial.png diff --git a/core/assets-raw/sprites/ui/icon-undo.png b/core/assets-raw/sprites/ui/icons/icon-undo.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-undo.png rename to core/assets-raw/sprites/ui/icons/icon-undo.png diff --git a/core/assets-raw/sprites/ui/icon-weapon.png b/core/assets-raw/sprites/ui/icons/icon-weapon.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-weapon.png rename to core/assets-raw/sprites/ui/icons/icon-weapon.png diff --git a/core/assets-raw/sprites/ui/icon-zoom.png b/core/assets-raw/sprites/ui/icons/icon-zoom.png similarity index 100% rename from core/assets-raw/sprites/ui/icon-zoom.png rename to core/assets-raw/sprites/ui/icons/icon-zoom.png diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 84e0e16d12..8820f42723 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,77 +13,77 @@ backgrounds/background index: -1 blank rotate: false - xy: 744, 314 + xy: 191, 105 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 blocks/blackrock1 rotate: false - xy: 646, 238 + xy: 263, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackrockshadow1 rotate: false - xy: 646, 228 + xy: 646, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone1 rotate: false - xy: 716, 267 + xy: 646, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone2 rotate: false - xy: 716, 257 + xy: 263, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone3 rotate: false - xy: 726, 269 + xy: 736, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock1 rotate: false - xy: 726, 259 + xy: 736, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock2 rotate: false - xy: 736, 264 + xy: 736, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 716, 247 + xy: 575, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneedge rotate: false - xy: 521, 153 + xy: 537, 153 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 736, 254 + xy: 537, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,112 +118,112 @@ blocks/chainturret-icon index: -1 blocks/coal1 rotate: false - xy: 726, 239 + xy: 533, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 736, 234 + xy: 813, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 333, 91 + xy: 813, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 343, 91 + xy: 813, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 353, 91 + xy: 813, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator-top rotate: false - xy: 363, 91 + xy: 333, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 373, 91 + xy: 343, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 383, 91 + xy: 353, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 393, 95 + xy: 363, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 403, 95 + xy: 373, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 413, 95 + xy: 383, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 423, 95 + xy: 393, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 433, 95 + xy: 403, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 443, 95 + xy: 413, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 453, 95 + xy: 423, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyortunnel rotate: false - xy: 463, 95 + xy: 433, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -237,56 +237,56 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 473, 95 + xy: 443, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 483, 95 + xy: 453, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 813, 449 + xy: 463, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 813, 439 + xy: 473, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 813, 429 + xy: 483, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 813, 419 + xy: 758, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtedge rotate: false - xy: 537, 169 + xy: 537, 139 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/door rotate: false - xy: 592, 219 + xy: 740, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,7 +300,7 @@ blocks/door-large index: -1 blocks/door-large-icon rotate: false - xy: 602, 222 + xy: 740, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -314,7 +314,7 @@ blocks/door-large-open index: -1 blocks/door-open rotate: false - xy: 612, 222 + xy: 580, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,7 +328,7 @@ blocks/doubleturret index: -1 blocks/duriumwall rotate: false - xy: 622, 222 + xy: 585, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -342,14 +342,14 @@ blocks/duriumwall-large index: -1 blocks/duriumwall-large-icon rotate: false - xy: 632, 222 + xy: 585, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/enemyspawn rotate: false - xy: 269, 87 + xy: 590, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,245 +363,245 @@ blocks/flameturret index: -1 blocks/fluxpump rotate: false - xy: 289, 87 + xy: 595, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 299, 87 + xy: 600, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 309, 87 + xy: 605, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 319, 87 + xy: 605, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 393, 85 + xy: 610, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 403, 85 + xy: 615, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 709, 277 + xy: 656, 230 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/ice1 rotate: false - xy: 413, 85 + xy: 615, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 423, 85 + xy: 620, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 433, 85 + xy: 625, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iceedge rotate: false - xy: 656, 230 + xy: 670, 230 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/icerock1 rotate: false - xy: 443, 85 + xy: 625, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 453, 85 + xy: 630, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 463, 85 + xy: 635, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 463, 85 + xy: 635, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 473, 85 + xy: 635, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 473, 85 + xy: 635, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 531, 129 + xy: 655, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 529, 119 + xy: 680, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 527, 109 + xy: 690, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 881, 485 + xy: 700, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 891, 485 + xy: 710, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 901, 485 + xy: 720, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 749, 277 + xy: 441, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 911, 485 + xy: 730, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 670, 230 + xy: 684, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/lavasmelter rotate: false - xy: 921, 485 + xy: 740, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 931, 485 + xy: 665, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 941, 485 + xy: 665, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 951, 485 + xy: 675, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 575, 203 + xy: 453, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 575, 191 + xy: 465, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 575, 179 + xy: 477, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 971, 485 + xy: 695, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 971, 485 + xy: 695, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -622,7 +622,7 @@ blocks/nuclearreactor-center index: -1 blocks/nuclearreactor-icon rotate: false - xy: 991, 485 + xy: 715, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -636,301 +636,301 @@ blocks/nuclearreactor-lights index: -1 blocks/nuclearreactor-small rotate: false - xy: 904, 495 + xy: 715, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/oil rotate: false - xy: 1001, 485 + xy: 725, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 723, 279 + xy: 712, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 749, 267 + xy: 675, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 801, 413 + xy: 685, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 575, 167 + xy: 1012, 489 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/playerspawn rotate: false - xy: 800, 403 + xy: 695, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 811, 409 + xy: 705, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 810, 399 + xy: 715, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 602, 212 + xy: 725, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 612, 212 + xy: 665, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlasercorner rotate: false - xy: 622, 212 + xy: 675, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 632, 212 + xy: 685, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 599, 202 + xy: 695, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 599, 192 + xy: 705, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 609, 202 + xy: 715, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 599, 182 + xy: 725, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 580, 215 + xy: 746, 321 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 619, 202 + xy: 735, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 599, 172 + xy: 735, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 609, 182 + xy: 745, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 619, 192 + xy: 745, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator-top rotate: false - xy: 629, 202 + xy: 745, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 609, 172 + xy: 547, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 619, 182 + xy: 543, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 629, 192 + xy: 543, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 619, 172 + xy: 393, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 629, 182 + xy: 403, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 629, 172 + xy: 413, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandedge rotate: false - xy: 698, 229 + xy: 726, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 704, 263 + xy: 551, 203 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 642, 208 + xy: 433, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 704, 251 + xy: 551, 191 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 639, 178 + xy: 463, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 639, 168 + xy: 473, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 599, 162 + xy: 483, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 587, 203 + xy: 556, 215 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 609, 162 + xy: 575, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 619, 162 + xy: 585, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 629, 162 + xy: 595, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 639, 158 + xy: 605, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 652, 218 + xy: 615, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 652, 208 + xy: 625, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -944,91 +944,91 @@ blocks/snowedge index: -1 blocks/sorter rotate: false - xy: 649, 198 + xy: 635, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 649, 188 + xy: 645, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 649, 178 + xy: 655, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 649, 168 + xy: 665, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall-large rotate: false - xy: 922, 495 + xy: 191, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/steelwall-large-icon rotate: false - xy: 649, 158 + xy: 675, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 662, 220 + xy: 685, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 662, 210 + xy: 695, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 672, 220 + xy: 705, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 672, 210 + xy: 715, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 682, 219 + xy: 725, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 692, 219 + xy: 735, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 702, 219 + xy: 745, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1042,35 +1042,35 @@ blocks/stoneedge index: -1 blocks/stoneformer rotate: false - xy: 682, 209 + xy: 553, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 692, 209 + xy: 553, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 702, 209 + xy: 884, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 493, 78 + xy: 894, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 503, 78 + xy: 904, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1084,112 +1084,112 @@ blocks/titancannon index: -1 blocks/titancannon-icon rotate: false - xy: 587, 191 + xy: 568, 215 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 513, 80 + xy: 914, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 523, 80 + xy: 924, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 1011, 479 + xy: 934, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 746, 254 + xy: 944, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 746, 244 + xy: 954, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 746, 234 + xy: 964, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 659, 198 + xy: 974, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall-large rotate: false - xy: 994, 495 + xy: 728, 328 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 659, 188 + xy: 984, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 587, 179 + xy: 563, 203 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 659, 158 + xy: 523, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 669, 200 + xy: 533, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 669, 190 + xy: 543, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 669, 180 + xy: 553, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 669, 170 + xy: 741, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1203,14 +1203,14 @@ blocks/wateredge index: -1 blocks/waveturret rotate: false - xy: 587, 167 + xy: 563, 191 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 736, 244 + xy: 533, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1238,112 +1238,112 @@ circle2 index: -1 enemies/blastenemy-t1 rotate: false - xy: 173, 92 + xy: 728, 312 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 715, 293 + xy: 746, 333 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 728, 330 + xy: 582, 229 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 728, 314 + xy: 497, 98 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 744, 333 + xy: 597, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 744, 317 + xy: 613, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t1 rotate: false - xy: 582, 229 + xy: 629, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 582, 229 + xy: 629, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t2 rotate: false - xy: 521, 139 + xy: 519, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/enemy-t3 rotate: false - xy: 513, 100 + xy: 519, 107 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 497, 98 + xy: 645, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 597, 280 + xy: 661, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 613, 280 + xy: 677, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 629, 280 + xy: 592, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 645, 280 + xy: 592, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 661, 276 + xy: 608, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1371,105 +1371,105 @@ enemies/fortressenemy-t3 index: -1 enemies/healerenemy-t1 rotate: false - xy: 677, 276 + xy: 608, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t2 rotate: false - xy: 592, 264 + xy: 624, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t3 rotate: false - xy: 592, 248 + xy: 624, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 731, 298 + xy: 540, 215 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 747, 301 + xy: 519, 199 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 524, 215 + xy: 519, 183 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 540, 215 + xy: 535, 199 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 519, 199 + xy: 535, 183 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 519, 183 + xy: 521, 167 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 535, 199 + xy: 521, 151 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 535, 183 + xy: 521, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 521, 167 + xy: 537, 167 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/titanenemy-t1 rotate: false - xy: 940, 495 + xy: 209, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t2 rotate: false - xy: 958, 495 + xy: 227, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t3 rotate: false - xy: 976, 495 + xy: 245, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1483,49 +1483,49 @@ enemyarrow index: -1 icon-coal rotate: false - xy: 483, 85 + xy: 640, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 493, 88 + xy: 645, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 503, 88 + xy: 645, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 513, 90 + xy: 650, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 523, 90 + xy: 660, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 521, 129 + xy: 670, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 519, 119 + xy: 655, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1553,35 +1553,35 @@ laserfull index: -1 mechs/mech-standard rotate: false - xy: 684, 229 + xy: 698, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shell rotate: false - xy: 642, 218 + xy: 423, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 639, 198 + xy: 443, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 639, 188 + xy: 453, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 659, 178 + xy: 994, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1680,364 +1680,406 @@ ui/clear index: -1 ui/cursor rotate: false - xy: 92, 88 + xy: 513, 108 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 -ui/icon-areaDelete +ui/icons/icon-areaDelete rotate: false xy: 857, 487 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-arrow - rotate: false - xy: 608, 264 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-arrow-left - rotate: false - xy: 869, 487 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-arrow-right - rotate: false - xy: 805, 459 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-cancel - rotate: false - xy: 608, 248 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-check - rotate: false - xy: 624, 264 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-close - rotate: false - xy: 1, 43 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -ui/icon-close-down - rotate: false - xy: 1, 1 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -ui/icon-close-over - rotate: false - xy: 524, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -ui/icon-crafting - rotate: false - xy: 801, 447 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-cursor - rotate: false - xy: 801, 435 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-defense - rotate: false - xy: 801, 423 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-discord - rotate: false - xy: 624, 248 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-distribution - rotate: false - xy: 1012, 489 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-donate +ui/icons/icon-arrow rotate: false xy: 640, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-file +ui/icons/icon-arrow-left rotate: false - xy: 640, 248 - size: 14, 14 - orig: 14, 14 + xy: 869, 487 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-file-text +ui/icons/icon-arrow-right rotate: false - xy: 598, 232 - size: 14, 14 - orig: 14, 14 + xy: 805, 459 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-fill +ui/icons/icon-back rotate: false xy: 742, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -ui/icon-folder +ui/icons/icon-cancel + rotate: false + xy: 640, 248 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-check + rotate: false + xy: 598, 232 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-close + rotate: false + xy: 1, 43 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +ui/icons/icon-close-down + rotate: false + xy: 1, 1 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +ui/icons/icon-close-over + rotate: false + xy: 524, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +ui/icons/icon-crafting + rotate: false + xy: 801, 447 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-cursor + rotate: false + xy: 801, 435 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-defense + rotate: false + xy: 801, 423 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-discord rotate: false xy: 614, 232 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-folder-parent +ui/icons/icon-distribution + rotate: false + xy: 273, 85 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-donate rotate: false xy: 630, 232 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-hold - rotate: false - xy: 551, 203 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-holdDelete - rotate: false - xy: 551, 191 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-home +ui/icons/icon-editor rotate: false xy: 693, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-info +ui/icons/icon-file-text rotate: false - xy: 551, 179 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-load - rotate: false - xy: 656, 260 + xy: 709, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-loading +ui/icons/icon-fill rotate: false xy: 779, 402 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -ui/icon-menu +ui/icons/icon-folder rotate: false - xy: 556, 215 - size: 10, 10 - orig: 10, 10 + xy: 656, 260 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-none - rotate: false - xy: 568, 215 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-pause - rotate: false - xy: 563, 203 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-pencil - rotate: false - xy: 661, 292 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -ui/icon-pick - rotate: false - xy: 679, 292 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -ui/icon-play - rotate: false - xy: 563, 191 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -ui/icon-play-2 +ui/icons/icon-folder-parent rotate: false xy: 672, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-power +ui/icons/icon-hold rotate: false - xy: 563, 179 + xy: 285, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-production +ui/icons/icon-holdDelete rotate: false - xy: 551, 167 + xy: 297, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-quit +ui/icons/icon-home rotate: false xy: 656, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-redo +ui/icons/icon-info rotate: false - xy: 697, 291 - size: 16, 16 - orig: 16, 16 + xy: 309, 85 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-rotate +ui/icons/icon-load rotate: false xy: 672, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -ui/icon-rotate-arrow +ui/icons/icon-load-image rotate: false - xy: 688, 259 - size: 14, 14 - orig: 14, 14 + xy: 661, 292 + size: 16, 16 + orig: 16, 16 offset: 0, 0 index: -1 -ui/icon-rotate-left +ui/icons/icon-load-map rotate: false - xy: 688, 243 - size: 14, 14 - orig: 14, 14 + xy: 679, 292 + size: 16, 16 + orig: 16, 16 offset: 0, 0 index: -1 -ui/icon-rotate-right +ui/icons/icon-loading rotate: false - xy: 189, 89 - size: 14, 14 - orig: 14, 14 + xy: 697, 291 + size: 16, 16 + orig: 16, 16 offset: 0, 0 index: -1 -ui/icon-save +ui/icons/icon-menu rotate: false - xy: 205, 89 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-settings - rotate: false - xy: 563, 167 + xy: 321, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-terrain +ui/icons/icon-none rotate: false - xy: 221, 89 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-tools - rotate: false - xy: 237, 89 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-touch - rotate: false - xy: 737, 286 + xy: 333, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-touchDelete +ui/icons/icon-pause rotate: false - xy: 749, 289 + xy: 345, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-tutorial - rotate: false - xy: 253, 89 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -ui/icon-undo +ui/icons/icon-pencil rotate: false xy: 564, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -ui/icon-weapon +ui/icons/icon-pick rotate: false - xy: 737, 274 + xy: 886, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-play + rotate: false + xy: 357, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -ui/icon-zoom +ui/icons/icon-play-2 rotate: false - xy: 886, 495 + xy: 688, 259 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-power + rotate: false + xy: 369, 89 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-production + rotate: false + xy: 381, 89 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-quit + rotate: false + xy: 704, 259 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-redo + rotate: false + xy: 904, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-resize + rotate: false + xy: 922, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-rotate + rotate: false + xy: 688, 243 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-rotate-arrow + rotate: false + xy: 704, 243 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-rotate-left + rotate: false + xy: 733, 296 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-rotate-right + rotate: false + xy: 725, 275 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-save + rotate: false + xy: 720, 259 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-save-image + rotate: false + xy: 940, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-save-map + rotate: false + xy: 958, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-settings + rotate: false + xy: 393, 93 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-terrain + rotate: false + xy: 976, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-tools + rotate: false + xy: 720, 243 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-touch + rotate: false + xy: 405, 93 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-touchDelete + rotate: false + xy: 417, 93 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-tutorial + rotate: false + xy: 524, 215 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +ui/icons/icon-undo + rotate: false + xy: 994, 495 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +ui/icons/icon-weapon + rotate: false + xy: 429, 93 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icons/icon-zoom + rotate: false + xy: 173, 90 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2114,7 +2156,7 @@ ui/selection index: -1 ui/slider rotate: false - xy: 746, 264 + xy: 881, 489 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2142,7 +2184,7 @@ ui/slider-knob-over index: -1 ui/slider-vertical rotate: false - xy: 592, 216 + xy: 92, 91 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2251,42 +2293,42 @@ ui/window-empty index: -1 weapons/blaster rotate: false - xy: 726, 249 + xy: 575, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/flamer rotate: false - xy: 279, 87 + xy: 595, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 961, 485 + xy: 685, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 981, 485 + xy: 705, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 609, 192 + xy: 735, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 659, 168 + xy: 513, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index eced6084b0..73f2648349 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java index 8ba595d51b..794cd02cc4 100644 --- a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java +++ b/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{ diff --git a/core/src/io/anuke/mindustry/ui/FileChooser.java b/core/src/io/anuke/mindustry/ui/FileChooser.java index 4a063f85ab..6c0fa4d42a 100644 --- a/core/src/io/anuke/mindustry/ui/FileChooser.java +++ b/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; diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 550f442d7d..c07565ce1e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/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); diff --git a/core/src/io/anuke/ucore/function/ActionProvider.java b/core/src/io/anuke/ucore/function/ActionProvider.java deleted file mode 100644 index b21bf03b93..0000000000 --- a/core/src/io/anuke/ucore/function/ActionProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.anuke.ucore.function; - -import io.anuke.ucore.scene.Action; - -public interface ActionProvider{ - public Action get(); -} diff --git a/core/src/io/anuke/ucore/function/BiConsumer.java b/core/src/io/anuke/ucore/function/BiConsumer.java deleted file mode 100644 index 394c4ec78e..0000000000 --- a/core/src/io/anuke/ucore/function/BiConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface BiConsumer{ - public void accept(T t, N n); -} diff --git a/core/src/io/anuke/ucore/function/BoundingBoxProvider.java b/core/src/io/anuke/ucore/function/BoundingBoxProvider.java deleted file mode 100644 index eef5bfd4e0..0000000000 --- a/core/src/io/anuke/ucore/function/BoundingBoxProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.anuke.ucore.function; - -import com.badlogic.gdx.math.Rectangle; - -public interface BoundingBoxProvider{ - public void getBoundingBox(T type, Rectangle out); -} diff --git a/core/src/io/anuke/ucore/function/ButtonTweaker.java b/core/src/io/anuke/ucore/function/ButtonTweaker.java deleted file mode 100644 index a7ea0fb6d6..0000000000 --- a/core/src/io/anuke/ucore/function/ButtonTweaker.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.anuke.ucore.function; - -import io.anuke.ucore.scene.ui.TextButton; - -public interface ButtonTweaker{ - public void tweak(TextButton button); -} diff --git a/core/src/io/anuke/ucore/function/Callable.java b/core/src/io/anuke/ucore/function/Callable.java deleted file mode 100644 index 8b4e399eb2..0000000000 --- a/core/src/io/anuke/ucore/function/Callable.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface Callable{ - public void run(); -} diff --git a/core/src/io/anuke/ucore/function/CheckListenable.java b/core/src/io/anuke/ucore/function/CheckListenable.java deleted file mode 100644 index fd71dfb0a4..0000000000 --- a/core/src/io/anuke/ucore/function/CheckListenable.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface CheckListenable{ - public void listen(boolean checked); -} diff --git a/core/src/io/anuke/ucore/function/ColorListenable.java b/core/src/io/anuke/ucore/function/ColorListenable.java deleted file mode 100644 index 72aa5f0577..0000000000 --- a/core/src/io/anuke/ucore/function/ColorListenable.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.anuke.ucore.function; - -import com.badlogic.gdx.graphics.Color; - -public interface ColorListenable{ - public void changed(Color color); -} diff --git a/core/src/io/anuke/ucore/function/Consumer.java b/core/src/io/anuke/ucore/function/Consumer.java deleted file mode 100644 index 1799b048a5..0000000000 --- a/core/src/io/anuke/ucore/function/Consumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface Consumer{ - public void accept(T t); -} diff --git a/core/src/io/anuke/ucore/function/DelayRun.java b/core/src/io/anuke/ucore/function/DelayRun.java deleted file mode 100644 index 3e822d8c11..0000000000 --- a/core/src/io/anuke/ucore/function/DelayRun.java +++ /dev/null @@ -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; - } -} diff --git a/core/src/io/anuke/ucore/function/EffectProvider.java b/core/src/io/anuke/ucore/function/EffectProvider.java deleted file mode 100644 index 4f40ffe705..0000000000 --- a/core/src/io/anuke/ucore/function/EffectProvider.java +++ /dev/null @@ -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); -} diff --git a/core/src/io/anuke/ucore/function/EffectRenderer.java b/core/src/io/anuke/ucore/function/EffectRenderer.java deleted file mode 100644 index 7b3b988398..0000000000 --- a/core/src/io/anuke/ucore/function/EffectRenderer.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.anuke.ucore.function; - -import io.anuke.ucore.core.Effects.EffectContainer; - -public interface EffectRenderer{ - public void render(EffectContainer effect); -} diff --git a/core/src/io/anuke/ucore/function/Event.java b/core/src/io/anuke/ucore/function/Event.java deleted file mode 100644 index be41ff63c9..0000000000 --- a/core/src/io/anuke/ucore/function/Event.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface Event{ - -} diff --git a/core/src/io/anuke/ucore/function/FieldListenable.java b/core/src/io/anuke/ucore/function/FieldListenable.java deleted file mode 100644 index a16ca9c1d3..0000000000 --- a/core/src/io/anuke/ucore/function/FieldListenable.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface FieldListenable{ - public void listen(String text); -} diff --git a/core/src/io/anuke/ucore/function/ISegmentConsumer.java b/core/src/io/anuke/ucore/function/ISegmentConsumer.java deleted file mode 100644 index 2fa6163dba..0000000000 --- a/core/src/io/anuke/ucore/function/ISegmentConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface ISegmentConsumer{ - public void accept(int x, int y, int x2, int y2); -} diff --git a/core/src/io/anuke/ucore/function/KeyListenable.java b/core/src/io/anuke/ucore/function/KeyListenable.java deleted file mode 100644 index 40d4caf8be..0000000000 --- a/core/src/io/anuke/ucore/function/KeyListenable.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface KeyListenable{ - public void pressed(int key); -} diff --git a/core/src/io/anuke/ucore/function/Listenable.java b/core/src/io/anuke/ucore/function/Listenable.java deleted file mode 100644 index f77a4dcb87..0000000000 --- a/core/src/io/anuke/ucore/function/Listenable.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.anuke.ucore.function; - -/**Listener lambda class.*/ -public interface Listenable{ - public void listen(); -} diff --git a/core/src/io/anuke/ucore/function/PositionConsumer.java b/core/src/io/anuke/ucore/function/PositionConsumer.java deleted file mode 100644 index 86c855eb63..0000000000 --- a/core/src/io/anuke/ucore/function/PositionConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface PositionConsumer{ - public void accept(float x, float y); -} diff --git a/core/src/io/anuke/ucore/function/Predicate.java b/core/src/io/anuke/ucore/function/Predicate.java deleted file mode 100644 index 8a741c4d1b..0000000000 --- a/core/src/io/anuke/ucore/function/Predicate.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface Predicate{ - public boolean test(T t); -} diff --git a/core/src/io/anuke/ucore/function/SegmentConsumer.java b/core/src/io/anuke/ucore/function/SegmentConsumer.java deleted file mode 100644 index f2f028ca51..0000000000 --- a/core/src/io/anuke/ucore/function/SegmentConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface SegmentConsumer{ - public void accept(float x, float y, float x2, float y2); -} diff --git a/core/src/io/anuke/ucore/function/StringProcessor.java b/core/src/io/anuke/ucore/function/StringProcessor.java deleted file mode 100644 index ff4bc44cf4..0000000000 --- a/core/src/io/anuke/ucore/function/StringProcessor.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface StringProcessor{ - public String get(int i); -} diff --git a/core/src/io/anuke/ucore/function/StringSupplier.java b/core/src/io/anuke/ucore/function/StringSupplier.java deleted file mode 100644 index cf04609aca..0000000000 --- a/core/src/io/anuke/ucore/function/StringSupplier.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface StringSupplier{ - public String get(); -} diff --git a/core/src/io/anuke/ucore/function/Supplier.java b/core/src/io/anuke/ucore/function/Supplier.java deleted file mode 100644 index 47c8e44f34..0000000000 --- a/core/src/io/anuke/ucore/function/Supplier.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface Supplier{ - public T get(); -} diff --git a/core/src/io/anuke/ucore/function/TileCollider.java b/core/src/io/anuke/ucore/function/TileCollider.java deleted file mode 100644 index 3cd67b2771..0000000000 --- a/core/src/io/anuke/ucore/function/TileCollider.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.anuke.ucore.function; - -public interface TileCollider{ - public boolean solid(int x, int y); -} - diff --git a/core/src/io/anuke/ucore/function/TileHitboxProvider.java b/core/src/io/anuke/ucore/function/TileHitboxProvider.java deleted file mode 100644 index 328cd3984c..0000000000 --- a/core/src/io/anuke/ucore/function/TileHitboxProvider.java +++ /dev/null @@ -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); -} diff --git a/core/src/io/anuke/ucore/function/TriPosConsumer.java b/core/src/io/anuke/ucore/function/TriPosConsumer.java deleted file mode 100644 index 7e4aa73f63..0000000000 --- a/core/src/io/anuke/ucore/function/TriPosConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface TriPosConsumer{ - public void accept(int x, int y, int z); -} diff --git a/core/src/io/anuke/ucore/function/TypingListenable.java b/core/src/io/anuke/ucore/function/TypingListenable.java deleted file mode 100644 index 104bd09e19..0000000000 --- a/core/src/io/anuke/ucore/function/TypingListenable.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface TypingListenable{ - public void typed(char c); -} diff --git a/core/src/io/anuke/ucore/function/VisibilityProvider.java b/core/src/io/anuke/ucore/function/VisibilityProvider.java deleted file mode 100644 index 9b6daa84ba..0000000000 --- a/core/src/io/anuke/ucore/function/VisibilityProvider.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.ucore.function; - -public interface VisibilityProvider{ - public boolean visible(); -} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9760ad1d54..8a55292392 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/html/build.gradle b/html/build.gradle index 29f2f9b23c..3a32143f0a 100644 --- a/html/build.gradle +++ b/html/build.gradle @@ -1,5 +1,4 @@ apply plugin: "java" -apply plugin: "jetty" //apply plugin: 'org.akhikhl.gretty' gwt {