Skip to content

Commit db2718a

Browse files
committed
Update paths for new splash resource folder
1 parent 9e11d84 commit db2718a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

config/gradle/ide.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ ext {
253253
</pattern>
254254
</extension>
255255
<option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology"/>
256-
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1024m -splash:facades/PC/src/main/resources/splash.jpg"/>
256+
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1024m -splash:facades/PC/src/main/resources/splash/splash.jpg"/>
257257
<option name="PROGRAM_PARAMETERS" value="-homedir -noCrashReport"/>
258258
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$"/>
259259
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>

facades/PC/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jar {
5050
attributes("Class-Path" : manifestClasspath)
5151
attributes("Implementation-Title": "Terasology-" + project.name)
5252
attributes("Implementation-Version": env.BUILD_NUMBER + ", " + env.GIT_BRANCH + ", " + env.BUILD_ID)
53-
attributes("SplashScreen-Image": "splash.jpg")
53+
attributes("SplashScreen-Image": "splash/splash.jpg")
5454
}
5555
}
5656

@@ -74,7 +74,7 @@ task runPC(type:JavaExec) {
7474
workingDir = rootDir
7575
String[] runArgs = ["-homedir"]
7676
args runArgs
77-
jvmArgs "-splash:${sourceSets.main.output.resourcesDir}/splash.jpg"
77+
jvmArgs "-splash:${sourceSets.main.output.resourcesDir}/splash/splash.jpg"
7878

7979
// Classpath: PC itself, engine classes, engine dependencies. Not modules or natives since the engine finds those
8080
classpath sourceSets.main.output.classesDir

facades/PC/src/main/java/org/terasology/engine/Terasology.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ public static void main(String[] args) {
111111

112112
// To have the splash screen in your favorite IDE add
113113
//
114-
// eclipse: -splash:src/main/resources/splash.jpg (the PC facade root folder is the working dir.)
115-
// IntelliJ: -splash:facades/PC/src/main/resources/splash.jpg (root project is the working dir.)
114+
// eclipse: -splash:src/main/resources/splash/splash.jpg (the PC facade root folder is the working dir.)
115+
// IntelliJ: -splash:facades/PC/src/main/resources/splash/splash.jpg (root project is the working dir.)
116116
//
117117
// as JVM argument (not program argument!)
118118

0 commit comments

Comments
 (0)