Skip to content

Commit 43234a4

Browse files
committed
Updated to Blade Engine v4.3.0
1 parent 2db020e commit 43234a4

File tree

23 files changed

+359
-280
lines changed

23 files changed

+359
-280
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
bladeEngineVersion=4.1.1-SNAPSHOT
1+
bladeEngineVersion=4.3.0
22
character_icon_atlas=char-icons
33
debug=false
44
fast_leave=true
5-
gdxVersion=1.11.1-SNAPSHOT
5+
gdxVersion=1.12.0
66
inventory_pos=down
77
pie_mode.desktop=false
88
resolutions=1
9-
roboVMVersion=2.3.18
9+
roboVMVersion=2.3.20
1010
title=Blade Engine Adventure
1111
ui_mode=PIE
1212
version=19

test-prj/core/build.gradle

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,19 @@ dependencies {
2323

2424

2525
task setVersion(type: WriteProperties) {
26-
def props = new Properties()
27-
def propFile = project.file("../assets/BladeEngine.properties");
28-
props.load(new FileReader(propFile))
26+
def props = new Properties()
27+
def propFile = project.file("../assets/BladeEngine.properties");
28+
props.load(new FileReader(propFile))
2929

3030
props."version" = version
31-
props."bladeEngineVersion" = bladeEngineVersion
32-
props."gdxVersion" = gdxVersion
33-
props."roboVMVersion" = roboVMVersion
34-
35-
setProperties(props);
36-
setOutputFile(propFile);
37-
38-
doLast {
39-
println "Set version info in versions.properties"
40-
}
41-
}
31+
props."bladeEngineVersion" = bladeEngineVersion
32+
props."gdxVersion" = gdxVersion
33+
props."roboVMVersion" = roboVMVersion
34+
35+
setProperties(props);
36+
setOutputFile(propFile);
4237

43-
processResources.finalizedBy(setVersion)
38+
doLast {
39+
println "Set version info in versions.properties"
40+
}
41+
}

test-prj/desktop/build.gradle

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,43 @@ dependencies {
1616
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
1717
}
1818

19+
def os = System.properties['os.name'].toLowerCase()
20+
1921
run {
2022
standardInput = System.in
2123
ignoreExitValue = true
2224

2325
if (project.hasProperty("appArgs")) {
2426
args Eval.me(appArgs)
2527
}
28+
29+
if (os.contains('mac')) {
30+
jvmArgs = ["-XstartOnFirstThread"]
31+
}
32+
}
33+
34+
jar {
35+
// sets the name of the .jar file this produces to the name of the game or app.
36+
archiveBaseName.set(appName)
37+
// using 'lib' instead of the default 'libs' appears to be needed by jpackageimage.
38+
destinationDirectory = file("$project.buildDir/lib")
39+
// the duplicatesStrategy matters starting in Gradle 7.0; this setting works.
40+
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
41+
dependsOn configurations.runtimeClasspath
42+
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
43+
// these "exclude" lines remove some unnecessary duplicate files in the output JAR.
44+
exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA')
45+
dependencies {
46+
exclude('META-INF/INDEX.LIST', 'META-INF/maven/**')
47+
}
48+
// setting the manifest makes the JAR runnable.
49+
manifest {
50+
attributes 'Main-Class': project.mainClassName
51+
}
52+
// this last step may help on some OSes that need extra instruction to make runnable JARs.
53+
doLast {
54+
file(archiveFile).setExecutable(true, false)
55+
}
2656
}
2757

2858

@@ -40,3 +70,4 @@ task dist(type: Jar) {
4070

4171
dist.dependsOn classes
4272
dist.dependsOn ':core:jar'
73+
processResources.dependsOn ':core:setVersion'

test-prj/desktop/src/main/java/com/bladecoder/engine/DesktopLauncher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ private void hideCursor() {
172172
}
173173

174174
public static void main(String[] args) {
175-
if(System.getProperty("os.name").contains("Mac"))
176-
Configuration.GLFW_LIBRARY_NAME.set("glfw_async");
175+
// if(System.getProperty("os.name").contains("Mac"))
176+
// Configuration.GLFW_LIBRARY_NAME.set("glfw_async");
177177

178178
DesktopLauncher game = new DesktopLauncher();
179179
game.parseParams(args);

test-prj/gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
android.injected.testOnly=false
2+
androidGradlePluginVersion=8.1.0
13
appName=test-prj
2-
bladeEngineVersion=4.1.1-SNAPSHOT
3-
gdxVersion=1.11.1-SNAPSHOT
4-
roboVMVersion=2.3.18
5-
androidGradlePluginVersion=7.2.2
4+
bladeEngineVersion=4.3.0
65
bladeInkVersion=1.1.2
7-
spinePlugin=false
8-
gdxControllersVersion=2.2.2
6+
gdxControllersVersion=2.2.3
7+
gdxVersion=1.12.0
8+
org.gradle.configureondemand=false
99
org.gradle.daemon=true
1010
org.gradle.jvmargs=-Xms128m -Xmx1536m
11-
org.gradle.configureondemand=false
12-
android.injected.testOnly=false
11+
roboVMVersion=2.3.20
12+
spinePlugin=false
1313
version=19
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
bladeEngineVersion=4.1.0
1+
bladeEngineVersion=4.3.0
22
debug=true
3-
gdxVersion=1.10.0
3+
gdxVersion=1.12.0
44
inventory_pos=down
55
pie_mode.desktop=false
66
resolutions=1
7-
roboVMVersion=2.3.12
7+
roboVMVersion=2.3.20
88
scene_screen=com.bladecoder.engine.ui.retro.RetroSceneScreen
99
title=Spine Animation Test
1010
version=unspecified
-952 Bytes
Binary file not shown.
-82 Bytes
Binary file not shown.
-1.58 KB
Binary file not shown.

0 commit comments

Comments
 (0)