Merge branch 'master' of github.com:neph1/sdk

BasicGameTemplate/nbproject/project.properties

@@ -42,15 +42,14 @@ javac.classpath=\
     ${libs.jme3-lwjgl.classpath}:\
     ${libs.jme3-effects.classpath}:\
     ${libs.jme3-terrain.classpath}:\
-    ${libs.jme3-bullet.classpath}:\
-    ${libs.jme3-bullet-native.classpath}
+    ${libs.jme3-jbullet.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=11
+javac.target=11
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -66,7 +65,7 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jme.project.version=3.1
+jme.project.version=3.4.1
 jnlp.codebase.type=local
 jnlp.descriptor=application
 jnlp.enabled=false

build.gradle

@@ -3,7 +3,7 @@ import groovy.xml.MarkupBuilder
 import java.util.zip.ZipFile
 
 plugins {
-    id "de.undercouch.download" version "3.4.3"
+    id "de.undercouch.download" version "5.1.0"
 }
 
 apply from: 'gradle/libs/digest.gradle'
@@ -35,29 +35,29 @@ dependencies {
     corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.1", true, true)
     corelibs dep("javax.help:javahelp:2.0.05", false, false)
 
-    corelibs dep("org.jmonkeyengine:jme3-core:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-desktop:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-lwjgl:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-effects:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-core:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-desktop:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-lwjgl:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-effects:3.4.1-stable", false, false)
     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.
     optlibs dep("com.github.stephengold:Minie:4.6.0", false, false) // replacement for bullet-native
     corelibs dep(fileTree("lib"), false, false)
-    corelibs dep("org.jmonkeyengine:jme3-jogg:3.4.0-stable", true, true)
-
-    corelibs dep("org.jmonkeyengine:jme3-networking:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-niftygui:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-plugins:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-terrain:3.4.0-stable", false, false)
-
-    optlibs dep("org.jmonkeyengine:jme3-jbullet:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-ios:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android-native:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-jogg:3.4.1-stable", true, true)
+
+    corelibs dep("org.jmonkeyengine:jme3-networking:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-niftygui:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-plugins:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-terrain:3.4.1-stable", false, false)
+
+    optlibs dep("org.jmonkeyengine:jme3-jbullet:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-ios:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android-native:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:3.4.1-stable", false, false)
     optlibs dep("com.github.stephengold:Heart:7.1.0", false, false)
     optlibs dep("com.github.stephengold:Wes:0.6.7", false, false)
-    testdatalibs dep("org.jmonkeyengine:jme3-testdata:3.4.0-stable", false, false)
-    examplelibs dep("org.jmonkeyengine:jme3-examples:3.4.0-stable", false, false)
+    testdatalibs dep("org.jmonkeyengine:jme3-testdata:3.4.1-stable", false, false)
+    examplelibs dep("org.jmonkeyengine:jme3-examples:3.4.1-stable", false, false)
 }
 
 def dep(coords, javadoc = false, sources = false) {
@@ -82,7 +82,7 @@ task checkPlatformConfig {
              * def f = file("netbeans.zip")
              * new URL(netbeansUrl).withInputStream{ i -> f.withOutputStream{ it << i }}
              */
-            download {
+            download.run {
                 src netbeansUrl
                 dest "netbeans.zip"
                 overwrite false // however if overwrite matters the build failed anyway

gradle.properties

@@ -1,5 +1,5 @@
 # Version number used for plugins, only 3 numbers (e.g. 3.1.3)
-jmeVersion = 3.4.0
+jmeVersion = 3.4.1
 # Version used for application and settings folder, no spaces!
 jmeMainVersion = 3.4
 # Version addition pre-alpha-svn, Stable, Beta
@@ -14,4 +14,4 @@ buildJavaDoc = true
 buildSdkProject = true
 
 # Path for downloading NetBeans Base
-netbeansUrl = https://archive.apache.org/dist/netbeans/netbeans/12.6/netbeans-12.6-bin.zip
+netbeansUrl = https://dlcdn.apache.org/netbeans/netbeans/14/netbeans-14-bin.zip

harness-override/override.properties

@@ -1,6 +1,6 @@
-app.exe.hashBefore=0f33727f20bc36f24345da0d1b586e47ce0ade0596df7c2a6d3a7dcae1c19374
-app.exe.hashAfter=fe6b4a2d7aaddb9c0a84c94e1553b43bd11fa468b1079cabdca82e7dea731755
-app64.exe.hashBefore=fe9c568a5ddf34944f11b820f7d3fa9c6448b14b825a49301697b4bd080de279
-app64.exe.hashAfter=f60bc962278fb5b407a7cbe86281185117b76a84e00576496d2559175843bd50
+app.exe.hashBefore=fe6b4a2d7aaddb9c0a84c94e1553b43bd11fa468b1079cabdca82e7dea731755
+app.exe.hashAfter=08568a9ece42e67685df6f20a0383e70248bb0e41c1ab2ec45883bbe001b6326
+app64.exe.hashBefore=f60bc962278fb5b407a7cbe86281185117b76a84e00576496d2559175843bd50
+app64.exe.hashAfter=ee790adfcf8436d7b128ddb43d6f6df1a8404df7612972b2bef7022b4f27bf69
 pre7_app.exe.hashBefore=f4ea42a1ec2572b2a65a6d9baef0dd1f7293980c44c5d031c5b2ea5752352e49
 pre7_app.exe.hashAfter=fa8ae6457dad70a65cecb623ef0f60a86c92e856705eaeb2f22e43310fa9226f

jdks/download-jdks.sh

@@ -11,8 +11,8 @@
 set -e # Quit on Error
 
 jdk_major_version="11"
-jdk_version="0.14.1"
-jdk_build_version="1"
+jdk_version="0.15"
+jdk_build_version="10"
 platforms=( "x64_linux" "x86-32_windows" "x64_windows" "x64_mac" )
 
 # DEPRECATED (not required anymore)

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeMesh.java

@@ -97,7 +97,9 @@ public class JmeMesh extends AbstractSceneExplorerNode{
 
         set.put(makeProperty(obj, int.class, "getId", "setId", "Id"));
         set.put(makeProperty(obj, Mesh.Mode.class, "getMode", "setMode", "Mode"));
-        set.put(makeProperty(obj, float.class, "getPointSize", "setPointSize", "Point Size"));
+        //Removed below property because it caused a nullpointer exception 
+        //because the getter and setter does not exist anymore, it was deprecated
+        //set.put(makeProperty(obj, float.class, "getPointSize", "setPointSize", "Point Size"));
 
         sheet.put(set);
         return sheet;

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSpatialChildren.java

@@ -83,11 +83,15 @@ public class JmeSpatialChildren extends Children.Keys<Object> {
         setKeys(createKeys());
         refresh();
         
-        for (Node n : nodes) { // TODO: Why is nodes always empty? What about the Children's Children?
-            if (n instanceof AbstractSceneExplorerNode) {
-                ((AbstractSceneExplorerNode)n).refresh(immediate);
+        if (nodes != null) { //Added a null check just to make sure the UI don't crash
+            
+            for (Node n : nodes) { // TODO: Why is nodes always empty? What about the Children's Children?
+                if (n instanceof AbstractSceneExplorerNode) {
+                    ((AbstractSceneExplorerNode)n).refresh(immediate);
+                }
             }
         }
+
     }
 
     public void setReadOnly(boolean cookie) {

nbproject/platform.properties

@@ -59,11 +59,9 @@ disabled.modules=\
     org.netbeans.modules.form.nb,\
     org.netbeans.modules.form.refactoring,\
     org.netbeans.modules.gradle.htmlui,\
-    org.netbeans.modules.gradle.javaee,\
     org.netbeans.modules.gradle.persistence,\
     org.netbeans.modules.gradle.spring,\
     org.netbeans.modules.gradle.test,\
-    org.netbeans.modules.groovy.and.gradle.kit,\
     org.netbeans.modules.hudson,\
     org.netbeans.modules.hudson.ant,\
     org.netbeans.modules.hudson.git,\
@@ -82,6 +80,7 @@ disabled.modules=\
     org.netbeans.modules.j2ee.jpa.verification,\
     org.netbeans.modules.j2ee.persistence,\
     org.netbeans.modules.j2ee.persistence.kit,\
+    org.netbeans.modules.java.lsp.server,\
     org.netbeans.modules.javaee.injection,\
     org.netbeans.modules.jellytools.ide,\
     org.netbeans.modules.jellytools.java,\
@@ -104,7 +103,6 @@ disabled.modules=\
     org.netbeans.modules.maven.spring,\
     org.netbeans.modules.mercurial,\
     org.netbeans.modules.mylyn.util,\
-    org.netbeans.modules.performance,\
     org.netbeans.modules.projectimport.eclipse.j2se,\
     org.netbeans.modules.schema2beans,\
     org.netbeans.modules.server,\
@@ -124,7 +122,6 @@ disabled.modules=\
     org.netbeans.upgrader,\
     org.openide.compat,\
     org.openide.options,\
-    org.openide.util.enumerations,\
     org.openidex.util
 nbjdk.active=default
 nbplatform.active=default