Browse Source

SDK:
- fix library references for SDK
- add blender, terrain and plugins library
- remove video library
- fix android build
- fix jme3 library svn auto-versioning

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8840 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 13 years ago
parent
commit
a0ab3fe3b9

+ 2 - 2
build.xml

@@ -272,12 +272,12 @@
     <target name="-create-jme3-svn-properties">
         <mkdir dir="build"/>
         <!--jme3 svn properties-->
-        <exec executable="svn" dir="${jme3_dir}" output="build/jme3-svn.properties">
+        <exec executable="svn" dir="${jme3_dir}/src/" output="build/jme3-svn.properties">
             <arg value="info" />
         </exec>
         <replace file="build/jme3-svn.properties" token=" " value=""/>
         <!--jme3 test data svn properties-->
-        <exec executable="svn" dir="${jme3_dir}/src/test-data/" output="build/jme3-testdata-svn.properties">
+        <exec executable="svn" dir="${jme3_dir}/test-data/" output="build/jme3-testdata-svn.properties">
             <arg value="info" />
         </exec>
         <replace file="build/jme3-testdata-svn.properties" token=" " value=""/>

+ 1 - 1
jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java

@@ -57,7 +57,7 @@ public class MobileCompositeProvider implements ProjectCustomizer.CompositeCateg
     private class SavePropsListener implements ActionListener {
 
         private String extensionName = "mobile";
-        private String extensionVersion = "v0.15";
+        private String extensionVersion = "v0.16";
         private String[] extensionDependencies = new String[]{"jar", "-mobile-deployment"};
         private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies);
         private ProjectExtensionProperties properties;

+ 4 - 2
jme3-android/src/com/jme3/gde/android/mobile-targets.xml

@@ -29,7 +29,9 @@
         <mkdir dir="mobile/libs"/>
         <copy todir="mobile/libs" verbose="false" flatten="true">
             <fileset dir="dist/lib/">
-                <exclude name="jMonkeyEngine3.jar"/>
+                <exclude name="jME3-desktop.jar"/>
+                <exclude name="jME3-blender.jar"/>
+                <exclude name="jME3-lwjgl.jar"/>
                 <exclude name="jME3-lwjgl-natives.jar"/>
                 <exclude name="jME3-bullet-natives.jar"/>
                 <exclude name="jME3-jbullet.jar"/>
@@ -42,7 +44,7 @@
             </fileset>
         </copy>
 
-        <echo>Adding jMonkeyEngine3.jar for android.</echo>
+        <echo>Adding libraries for android.</echo>
         <copy todir="mobile/libs" flatten="true">
             <path>
                 <pathelement path="${libs.jme3-android.classpath}"/>

+ 2 - 2
jme3-core-baselibs/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=97a53057
+build.xml.data.CRC32=05d5b002
 build.xml.script.CRC32=cdae6a36
 [email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=97a53057
+nbproject/build-impl.xml.data.CRC32=05d5b002
 nbproject/build-impl.xml.script.CRC32=246f9b81
 nbproject/[email protected]

+ 0 - 4
jme3-core-baselibs/nbproject/project.properties

@@ -1,7 +1,3 @@
-#Thu, 25 Aug 2011 20:26:48 +0200
-file.reference.jME3-jbullet.jar=release/modules/ext/jME3-jbullet.jar
-file.reference.jME3-lwjgl-natives.jar=release/modules/ext/jME3-lwjgl-natives.jar
-file.reference.jMonkeyEngine3.jar=release/modules/ext/jMonkeyEngine3.jar
 javac.source=1.5
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt

+ 32 - 6
jme3-core-baselibs/nbproject/project.xml

@@ -22,7 +22,6 @@
                 <package>com.jme3.app</package>
                 <package>com.jme3.app.state</package>
                 <package>com.jme3.asset</package>
-                <package>com.jme3.asset.pack</package>
                 <package>com.jme3.asset.plugins</package>
                 <package>com.jme3.audio</package>
                 <package>com.jme3.audio.lwjgl</package>
@@ -75,7 +74,6 @@
                 <package>com.jme3.post.filters</package>
                 <package>com.jme3.post.ssao</package>
                 <package>com.jme3.renderer</package>
-                <package>com.jme3.renderer.layer</package>
                 <package>com.jme3.renderer.lwjgl</package>
                 <package>com.jme3.renderer.queue</package>
                 <package>com.jme3.scene</package>
@@ -108,6 +106,7 @@
                 <package>com.jme3.system.lwjgl</package>
                 <package>com.jme3.terrain</package>
                 <package>com.jme3.terrain.geomipmap</package>
+                <package>com.jme3.terrain.geomipmap.grid</package>
                 <package>com.jme3.terrain.geomipmap.lodcalc</package>
                 <package>com.jme3.terrain.geomipmap.lodcalc.util</package>
                 <package>com.jme3.terrain.geomipmap.picking</package>
@@ -118,8 +117,6 @@
                 <package>com.jme3.util</package>
                 <package>com.jme3.util.blockparser</package>
                 <package>com.jme3.util.xml</package>
-                <package>com.jme3.video</package>
-                <package>com.jme3.video.plugins.jheora</package>
                 <package>com.jme3.water</package>
                 <package>jme3tools.converters</package>
                 <package>jme3tools.converters.model</package>
@@ -127,19 +124,48 @@
                 <package>jme3tools.navigation</package>
                 <package>jme3tools.nvtex</package>
                 <package>jme3tools.optimize</package>
+                <package>jme3tools.savegame</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-niftygui.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-niftygui.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-blender.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-blender.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-desktop.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-desktop.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-lwjgl.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-lwjgl.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-terrain.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-terrain.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jME3-jbullet.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jME3-jbullet.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jMonkeyEngine3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jMonkeyEngine3.jar</binary-origin>
+                <runtime-relative-path>ext/jME3-plugins.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-plugins.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-core.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-core.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jME3-lwjgl-natives.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jME3-lwjgl-natives.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-jogg.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-jogg.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

+ 0 - 8
jme3-core-libraries/nbproject/project.properties

@@ -1,14 +1,6 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
 file.reference.eventbus-1.4.jar=release/modules/ext/eventbus-1.4.jar
-file.reference.j-ogg-oggd.jar=release/modules/ext/j-ogg-oggd.jar
-file.reference.j-ogg-vorbisd.jar=release/modules/ext/j-ogg-vorbisd.jar
-file.reference.jbullet.jar=release/modules/ext/jbullet.jar
-file.reference.jinput.jar=release/modules/ext/jinput.jar
-file.reference.lwjgl.jar=release/modules/ext/lwjgl.jar
 file.reference.nifty-1.2-SNAPSHOT.jar=release/modules/ext/nifty-1.1.jar
-file.reference.noise-0.0.1-SNAPSHOT.jar=release/modules/ext/noise-0.0.1-SNAPSHOT.jar
-file.reference.stack-alloc.jar=release/modules/ext/stack-alloc.jar
-file.reference.vecmath.jar=release/modules/ext/vecmath.jar
 file.reference.xmlpull-xpp3-1.1.4c.jar=release/modules/ext/xmlpull-xpp3-1.1.4c.jar
 javac.source=1.5
 javac.compilerargs=-Xlint -Xlint\:-serial

+ 54 - 12
jme3-core-libraries/nbproject/project.xml

@@ -21,6 +21,7 @@
                 <package>com.bulletphysics.linearmath</package>
                 <package>com.bulletphysics.linearmath.convexhull</package>
                 <package>com.bulletphysics.util</package>
+                <package>com.jme3.gde.core.libraries</package>
                 <package>cz.advel.stack</package>
                 <package>cz.advel.stack.instrument</package>
                 <package>de.jarnbjo.ogg</package>
@@ -72,6 +73,43 @@
                 <package>de.lessvoid.nifty.elements.events</package>
                 <package>de.lessvoid.nifty.elements.render</package>
                 <package>de.lessvoid.nifty.elements.tools</package>
+                <package>de.lessvoid.nifty.examples</package>
+                <package>de.lessvoid.nifty.examples.all</package>
+                <package>de.lessvoid.nifty.examples.allcontrols</package>
+                <package>de.lessvoid.nifty.examples.console</package>
+                <package>de.lessvoid.nifty.examples.controls</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.chatcontrol</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.common</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.dragndrop</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.dropdown</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.listbox</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.scrollpanel</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.sliderandscrollbar</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.tabs</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.textfield</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrolsxml</package>
+                <package>de.lessvoid.nifty.examples.dragndrop</package>
+                <package>de.lessvoid.nifty.examples.falloff</package>
+                <package>de.lessvoid.nifty.examples.helloniftybuilder</package>
+                <package>de.lessvoid.nifty.examples.helloworld</package>
+                <package>de.lessvoid.nifty.examples.hint</package>
+                <package>de.lessvoid.nifty.examples.localize</package>
+                <package>de.lessvoid.nifty.examples.menu</package>
+                <package>de.lessvoid.nifty.examples.mouse</package>
+                <package>de.lessvoid.nifty.examples.multiplayer</package>
+                <package>de.lessvoid.nifty.examples.progressbar</package>
+                <package>de.lessvoid.nifty.examples.reload</package>
+                <package>de.lessvoid.nifty.examples.resolution</package>
+                <package>de.lessvoid.nifty.examples.scroll</package>
+                <package>de.lessvoid.nifty.examples.style.dynamic</package>
+                <package>de.lessvoid.nifty.examples.style.label</package>
+                <package>de.lessvoid.nifty.examples.table</package>
+                <package>de.lessvoid.nifty.examples.test</package>
+                <package>de.lessvoid.nifty.examples.textalign</package>
+                <package>de.lessvoid.nifty.examples.textfield</package>
+                <package>de.lessvoid.nifty.examples.tutorial</package>
+                <package>de.lessvoid.nifty.examples.tutorial.screen</package>
                 <package>de.lessvoid.nifty.input</package>
                 <package>de.lessvoid.nifty.input.keyboard</package>
                 <package>de.lessvoid.nifty.input.mapping</package>
@@ -153,8 +191,8 @@
                 <binary-origin>release/modules/ext/jinput.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/nifty-default-controls.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/nifty-default-controls.jar</binary-origin>
+                <runtime-relative-path>ext/nifty.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/stack-alloc.jar</runtime-relative-path>
@@ -165,33 +203,37 @@
                 <binary-origin>release/modules/ext/noise-0.0.1-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/nifty-style-black.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/nifty-style-black.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/nifty.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/nifty.jar</binary-origin>
+                <runtime-relative-path>ext/nifty-default-controls.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-default-controls.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmlpull-xpp3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlpull-xpp3.jar</binary-origin>
+                <runtime-relative-path>ext/vecmath.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/vecmath.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/eventbus.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/eventbus.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/vecmath.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/vecmath.jar</binary-origin>
+                <runtime-relative-path>ext/xmlpull-xpp3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlpull-xpp3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jbullet.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jbullet.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/nifty-examples.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-examples.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/lwjgl.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/lwjgl.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/nifty-style-black.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-style-black.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

+ 2 - 2
jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml

@@ -10,9 +10,9 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.android.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-android.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives-android.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-android.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-bullet-natives-android.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

+ 1 - 1
jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3.xml

@@ -10,7 +10,7 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.baselibs.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-core.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

+ 4 - 3
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-video.xml → jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-blender.xml

@@ -5,18 +5,19 @@ and open the template in the editor.
 -->
 <!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
 <library version="1.0">
-    <name>jme3-libraries-video</name>
+    <name>jme3-libraries-blender</name>
     <type>j2se</type>
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-blender.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
     </volume>
 </library>

+ 2 - 1
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-gui.xml

@@ -10,9 +10,10 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-niftygui.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xmlpull-xpp3.jar!/</resource>
     </volume>
     <volume>

+ 4 - 3
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-lwjgl-minimum.xml

@@ -10,17 +10,18 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-desktop.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-lwjgl.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jinput.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/lwjgl.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
     </volume>
 </library>

+ 3 - 2
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-oggvorbis.xml

@@ -10,15 +10,16 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jogg.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
     </volume>
 </library>

+ 1 - 1
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics-native.xml

@@ -11,7 +11,7 @@ and open the template in the editor.
     <volume>
         <type>classpath</type>
         <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-bullet-natives.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

+ 23 - 0
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-plugins.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version="1.0">
+    <name>jme3-libraries-plugins</name>
+    <type>j2se</type>
+    <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-plugins.jar!/</resource>
+    </volume>
+    <volume>
+        <type>src</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
+    </volume>
+    <volume>
+        <type>javadoc</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
+    </volume>
+</library>

+ 24 - 0
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-terrain.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version="1.0">
+    <name>jme3-libraries-terrain</name>
+    <type>j2se</type>
+    <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-terrain.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
+    </volume>
+    <volume>
+        <type>src</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
+    </volume>
+    <volume>
+        <type>javadoc</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
+    </volume>
+</library>

+ 17 - 6
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml

@@ -10,21 +10,32 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-jbullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-desktop.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-plugins.jar!/</resource>
+
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jogg.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/</resource>
+
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-terrain.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
+
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-lwjgl.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jinput.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/lwjgl.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
+        
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jbullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/</resource>
+        
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-niftygui.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xmlpull-xpp3.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

+ 8 - 6
jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml

@@ -3,14 +3,16 @@
 <filesystem>
     <folder name="org-netbeans-api-project-libraries">
         <folder name="Libraries">
-            <file name="jme3-libraries.xml" url="jme3-libraries.xml"/>
-            <file name="jme3-libraries-lwjgl-minimum.xml" url="jme3-libraries-lwjgl-minimum.xml"/>
-            <file name="jme3-libraries-gui.xml" url="jme3-libraries-gui.xml"/>
+            <file name="jme3-libraries-blender.xml" url="jme3-libraries-blender.xml"/>
             <file name="jme3-libraries-gui-style-black.xml" url="jme3-libraries-gui-style-black.xml"/>
-            <file name="jme3-libraries-physics.xml" url="jme3-libraries-physics.xml"/>
-            <file name="jme3-libraries-physics-native.xml" url="jme3-libraries-physics-native.xml"/>
-            <file name="jme3-libraries-video.xml" url="jme3-libraries-video.xml"/>
+            <file name="jme3-libraries-gui.xml" url="jme3-libraries-gui.xml"/>
+            <file name="jme3-libraries-lwjgl-minimum.xml" url="jme3-libraries-lwjgl-minimum.xml"/>
             <file name="jme3-libraries-oggvorbis.xml" url="jme3-libraries-oggvorbis.xml"/>
+            <file name="jme3-libraries-physics-native.xml" url="jme3-libraries-physics-native.xml"/>
+            <file name="jme3-libraries-physics.xml" url="jme3-libraries-physics.xml"/>
+            <file name="jme3-libraries-plugins.xml" url="jme3-libraries-plugins.xml"/>
+            <file name="jme3-libraries-terrain.xml" url="jme3-libraries-terrain.xml"/>
+            <file name="jme3-libraries.xml" url="jme3-libraries.xml"/>
         </folder>
     </folder>
 </filesystem>