Skip to content

Commit 3e7ec42

Browse files
committed
remove check for tools directory in android sdk root.
1 parent 1437ade commit 3e7ec42

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*/
4444
public class BladeEngineSetup {
4545
public static boolean isSdkLocationValid(String sdkLocation) {
46-
return new File(sdkLocation, "tools").exists() && new File(sdkLocation, "platforms").exists();
46+
return new File(sdkLocation, "platforms").exists();
4747
}
4848

4949
public static boolean isEmptyDirectory(String destination) {
@@ -266,9 +266,12 @@ public void build(String outputDir, String appName, String packageName, String m
266266
project.files.add(new ProjectFile("desktop/src/DesktopLauncher",
267267
"desktop/src/main/java/" + packageDir + "/desktop/DesktopLauncher.java", true));
268268

269-
project.files.add(new ProjectFile("desktop/src/icons/icon16.png", "desktop/src/main/resources/icons/icon16.png", false));
270-
project.files.add(new ProjectFile("desktop/src/icons/icon32.png", "desktop/src/main/resources/icons/icon32.png", false));
271-
project.files.add(new ProjectFile("desktop/src/icons/icon128.png", "desktop/src/main/resources/icons/icon128.png", false));
269+
project.files.add(
270+
new ProjectFile("desktop/src/icons/icon16.png", "desktop/src/main/resources/icons/icon16.png", false));
271+
project.files.add(
272+
new ProjectFile("desktop/src/icons/icon32.png", "desktop/src/main/resources/icons/icon32.png", false));
273+
project.files.add(new ProjectFile("desktop/src/icons/icon128.png",
274+
"desktop/src/main/resources/icons/icon128.png", false));
272275

273276
// Assets
274277
String assetPath = "assets";
@@ -355,7 +358,6 @@ public void build(String outputDir, String appName, String packageName, String m
355358
project.files.add(new ProjectFile("ios/data/Default-1024w-1366h@2x~ipad.png", false));
356359
project.files.add(new ProjectFile("ios/data/[email protected]", false));
357360

358-
359361
project.files.add(new ProjectFile("ios/data/Media.xcassets/Contents.json", false));
360362
project.files
361363
.add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/[email protected]", false));
@@ -398,7 +400,7 @@ public void build(String outputDir, String appName, String packageName, String m
398400
project.files.add(new ProjectFile("ios/robovm.properties"));
399401
project.files.add(new ProjectFile("ios/robovm.xml", true));
400402

401-
Map<String, String> values = new HashMap<String, String>();
403+
Map<String, String> values = new HashMap<>();
402404
values.put("%APP_NAME%", appName);
403405
values.put("%APP_NAME_ESCAPED%", appName.replace("'", "\\'"));
404406
values.put("%PACKAGE%", packageName);

0 commit comments

Comments
 (0)