Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add awt-dialogs to get jME settings dialog back #505

Merged
merged 4 commits into from
May 8, 2023
Merged

Add awt-dialogs to get jME settings dialog back #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49ee497
Add the jmeVersion as LibraryVersion object instead of string
tonihele May 7, 2023
9dac5d2
Add awt dialogs with jME 3.6 and newer
tonihele May 7, 2023
75f9763
Get the awt dialogs
tonihele May 7, 2023
0515faf
Include the awt dialogs package in the Basic and Tests template
tonihele May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion BasicGameTemplate/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ javac.classpath=\
${libs.jme3-lwjgl.classpath}:\
${libs.jme3-effects.classpath}:\
${libs.jme3-terrain.classpath}:\
${libs.jme3-jbullet.classpath}
${libs.jme3-jbullet.classpath}:\
${libs.jme3-awt-dialogs.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
Expand Down
3 changes: 2 additions & 1 deletion JME3TestsTemplate/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ javac.classpath=\
${libs.jme3-effects.classpath}:\
${libs.jme3-terrain.classpath}:\
${libs.jme3-jbullet.classpath}:\
${libs.jme3-test-data.classpath}
${libs.jme3-test-data.classpath}:\
${libs.jme3-awt-dialogs.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies {

corelibs dep("org.jmonkeyengine:jme3-core:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-desktop:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-blender:3.3.2-stable", false, false) // Pin Pointed until jme3-blender has a dedicated release or support is phased out.
Expand Down
3 changes: 3 additions & 0 deletions jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ dependencies {
// Core JME
implementation "org.jmonkeyengine:jme3-core:$jmeVer"
implementation "org.jmonkeyengine:jme3-desktop:$jmeVer"
<#if jmeVersion.versionInfo.major gt 3 || (jmeVersion.versionInfo.major == 3 && jmeVersion.versionInfo.minor gte 6 )>
implementation "org.jmonkeyengine:jme3-awt-dialogs:$jmeVer"
</#if>
<#if lwjglLibrary.isCoreJmeLibrary == true>
implementation "${lwjglLibrary.groupId}:${lwjglLibrary.artifactId}:$jmeVer"
<#else>
Expand Down
2 changes: 1 addition & 1 deletion ...ates/src/com/jme3/gde/templates/gradledesktop/GradleDesktopGameJMEVersionPanelVisual.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private void updateLWJGLdescription() {
}

protected void store(WizardDescriptor d) {
String jmeVersion = jmeVersionComboBox.getSelectedItem().toString();
LibraryVersion jmeVersion = jmeVersionComboBox.getItemAt(jmeVersionComboBox.getSelectedIndex());
TemplateLibrary lwjglLibrary = lwjglComboBox.getItemAt(lwjglComboBox.getSelectedIndex());

d.putProperty("jmeVersion", jmeVersion);
Expand Down