Skip to content

Commit 631f993

Browse files
committed
icons in desktop project
1 parent 87235ea commit 631f993

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,10 @@ public void build (ProjectBuilder builder, String outputDir, String appName, Str
283283
if (builder.modules.contains(ProjectType.DESKTOP)) {
284284
project.files.add(new ProjectFile("desktop/build.gradle"));
285285
project.files.add(new ProjectFile("desktop/src/DesktopLauncher", "desktop/src/" + packageDir + "/desktop/DesktopLauncher.java", true));
286+
287+
project.files.add(new ProjectFile("desktop/src/icons/icon16.png", false));
288+
project.files.add(new ProjectFile("desktop/src/icons/icon32.png", false));
289+
project.files.add(new ProjectFile("desktop/src/icons/icon128.png", false));
286290
}
287291

288292
// Assets
@@ -292,17 +296,13 @@ public void build (ProjectBuilder builder, String outputDir, String appName, Str
292296
new File(outputDir + "/" + assetPath + "/3d").mkdirs();
293297
new File(outputDir + "/" + assetPath + "/atlases/1").mkdirs();
294298
new File(outputDir + "/" + assetPath + "/backgrounds/1").mkdirs();
295-
new File(outputDir + "/" + assetPath + "/icons").mkdirs();
296299
new File(outputDir + "/" + assetPath + "/images/1").mkdirs();
297300
new File(outputDir + "/" + assetPath + "/model").mkdirs();
298301
new File(outputDir + "/" + assetPath + "/music").mkdirs();
299302
new File(outputDir + "/" + assetPath + "/sounds").mkdirs();
300303
new File(outputDir + "/" + assetPath + "/test").mkdirs();
301304
new File(outputDir + "/" + assetPath + "/ui/1").mkdirs();
302-
303-
project.files.add(new ProjectFile("android/assets/icons/icon16.png", assetPath + "/icons/icon16.png", false));
304-
project.files.add(new ProjectFile("android/assets/icons/icon32.png", assetPath + "/icons/icon32.png", false));
305-
project.files.add(new ProjectFile("android/assets/icons/icon128.png", assetPath + "/icons/icon128.png", false));
305+
306306

307307
project.files.add(new ProjectFile("android/assets/model/00.chapter", assetPath + "/model/00.chapter", false));
308308
project.files.add(new ProjectFile("android/assets/model/world.properties", assetPath + "/model/world.properties", false));

adventure-composer/src/main/resources/projectTmpl/desktop/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apply plugin: "java"
22

33
sourceCompatibility = 1.6
44
sourceSets.main.java.srcDirs = [ "src/" ]
5+
sourceSets.main.resources.srcDirs = [ "src/" ]
56

67
project.ext.mainClassName = "%PACKAGE%.desktop.DesktopLauncher"
78
project.ext.assetsDir = new File("../%ASSET_PATH%");

0 commit comments

Comments
 (0)