From c9d750207869f7b4d38e3e8b1d31590fc3148a56 Mon Sep 17 00:00:00 2001 From: "J.C. Hamlin" Date: Fri, 7 Aug 2020 20:03:01 -0500 Subject: [PATCH 1/2] Cleaned up to work with Java 14, Gradle 6.5.1, and Eclipse 2020-06-R. Fixed a few compiler warnings as well. --- .gitignore | 15 ++ base-sio2/build.gradle | 20 +-- base-sio2/settings.gradle | 4 +- base-sio2/src/main/java/rename/Main.java | 9 +- .../main/java/rename/SiliconDioxideState.java | 5 +- build.gradle | 23 +++ network-basic/build.gradle | 11 +- network-basic/settings.gradle | 4 +- .../main/java/example/ConnectionState.java | 13 +- .../main/java/example/GameSessionEvent.java | 2 +- .../main/java/example/GameSessionState.java | 1 - .../src/main/java/example/HostState.java | 13 +- .../main/java/example/InGameMenuState.java | 22 ++- .../src/main/java/example/LoginState.java | 15 +- network-basic/src/main/java/example/Main.java | 15 +- .../src/main/java/example/MainMenuState.java | 18 +- .../src/main/java/example/MessageState.java | 14 +- .../java/example/SiliconDioxideState.java | 4 +- .../java/example/net/client/GameClient.java | 8 +- .../java/example/net/server/GameServer.java | 9 +- settings.gradle | 8 + sigem/build.gradle | 22 +-- sigem/settings.gradle | 4 +- sigem/src/main/java/sigem/GameConstants.java | 2 +- .../src/main/java/sigem/GameSessionEvent.java | 2 +- sigem/src/main/java/sigem/Main.java | 14 +- sigem/src/main/java/sigem/MainMenuState.java | 21 ++- .../main/java/sigem/SiliconDioxideState.java | 5 +- sigem/src/main/java/sigem/es/ShipInput.java | 2 +- .../main/java/sigem/sim/ArenaBoundary.java | 17 +- .../java/sigem/sim/AsteroidHitListener.java | 17 +- sigem/src/main/java/sigem/sim/Body.java | 7 +- .../main/java/sigem/sim/CollisionSystem.java | 14 +- sigem/src/main/java/sigem/sim/Contact.java | 3 +- .../src/main/java/sigem/sim/GameEntities.java | 21 ++- .../java/sigem/sim/MissileHitListener.java | 13 +- .../main/java/sigem/sim/PlanetGravity.java | 8 +- .../java/sigem/sim/PositionPublisher.java | 7 +- sigem/src/main/java/sigem/sim/ShipDriver.java | 12 +- .../main/java/sigem/sim/ShipInputSystem.java | 20 ++- .../main/java/sigem/sim/SimplePhysics.java | 21 ++- .../src/main/java/sigem/view/CameraState.java | 27 ++- .../java/sigem/view/GameSessionState.java | 35 ++-- .../main/java/sigem/view/InGameMenuState.java | 22 ++- .../main/java/sigem/view/ModelViewState.java | 45 +++-- .../java/sigem/view/PlayerInputState.java | 16 +- sim-eth-basic/build.gradle | 9 +- sim-eth-basic/settings.gradle | 4 +- .../java/example/CommandConsoleState.java | 17 +- .../main/java/example/ConnectionState.java | 20 +-- .../src/main/java/example/GameConstants.java | 5 +- .../main/java/example/GameSessionEvent.java | 2 +- .../main/java/example/GameSessionState.java | 12 +- .../src/main/java/example/HelpState.java | 10 +- .../src/main/java/example/HostState.java | 14 +- .../main/java/example/InGameMenuState.java | 22 ++- .../src/main/java/example/LoginState.java | 18 +- sim-eth-basic/src/main/java/example/Main.java | 17 +- .../src/main/java/example/MainMenuState.java | 19 ++- .../src/main/java/example/MessageState.java | 15 +- .../java/example/SiliconDioxideState.java | 5 +- .../src/main/java/example/TimeState.java | 1 - .../java/example/debug/TimeSequenceState.java | 18 +- .../java/example/net/GameSessionListener.java | 1 - .../net/chat/client/ChatClientService.java | 4 +- .../net/chat/server/ChatHostedService.java | 11 +- .../net/client/AccountClientService.java | 4 +- .../java/example/net/client/GameClient.java | 6 +- .../net/client/GameSessionClientService.java | 4 +- .../java/example/net/server/AccountEvent.java | 2 - .../net/server/AccountHostedService.java | 6 +- .../java/example/net/server/GameServer.java | 14 +- .../net/server/GameSessionHostedService.java | 17 +- .../src/main/java/example/sim/Body.java | 4 +- .../src/main/java/example/sim/ShipDriver.java | 6 +- .../main/java/example/sim/SimplePhysics.java | 9 +- .../java/example/view/ModelViewState.java | 29 ++-- .../example/view/PlayerMovementState.java | 6 +- .../java/example/view/SpaceGridState.java | 17 +- sim-eth-es/build.gradle | 9 +- sim-eth-es/settings.gradle | 4 +- .../java/example/CommandConsoleState.java | 17 +- .../main/java/example/ConnectionState.java | 27 ++- .../src/main/java/example/GameConstants.java | 5 +- .../main/java/example/GameSessionEvent.java | 2 +- .../main/java/example/GameSessionState.java | 16 +- .../src/main/java/example/HelpState.java | 9 +- .../src/main/java/example/HostState.java | 14 +- .../main/java/example/InGameMenuState.java | 22 ++- .../src/main/java/example/LoginState.java | 18 +- sim-eth-es/src/main/java/example/Main.java | 19 +-- .../src/main/java/example/MainMenuState.java | 21 ++- .../src/main/java/example/MessageState.java | 15 +- .../java/example/SiliconDioxideState.java | 5 +- .../src/main/java/example/TimeState.java | 1 - .../java/example/debug/TimeSequenceState.java | 16 +- .../main/java/example/es/BodyPosition.java | 1 + .../java/example/es/BodyPositionCache.java | 9 +- .../main/java/example/net/GameSession.java | 1 - .../java/example/net/GameSessionListener.java | 3 - .../net/chat/client/ChatClientService.java | 4 +- .../net/chat/server/ChatHostedService.java | 11 +- .../net/client/AccountClientService.java | 4 +- .../java/example/net/client/GameClient.java | 11 +- .../net/client/GameSessionClientService.java | 5 +- .../net/client/SharedObjectUpdater.java | 15 +- .../java/example/net/server/AccountEvent.java | 3 - .../net/server/AccountHostedService.java | 9 +- .../java/example/net/server/GameServer.java | 33 ++-- .../net/server/GameSessionHostedService.java | 24 ++- .../java/example/sim/BasicEnvironment.java | 8 +- .../src/main/java/example/sim/Body.java | 6 +- .../example/sim/BodyPositionPublisher.java | 6 +- .../main/java/example/sim/GameEntities.java | 12 +- .../src/main/java/example/sim/ShipDriver.java | 6 +- .../main/java/example/sim/SimplePhysics.java | 22 ++- .../main/java/example/view/HudLabelState.java | 23 +-- .../java/example/view/ModelViewState.java | 34 ++-- .../java/example/view/PlayerListState.java | 22 +-- .../example/view/PlayerMovementState.java | 7 +- .../java/example/view/SpaceGridState.java | 17 +- simple-jme/build.gradle | 64 +++---- simple-jme/settings.gradle | 4 +- simple-jme/src/main/java/mygame/Main.java | 2 +- zay-es-net-basic/build.gradle | 17 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - zay-es-net-basic/gradlew | 160 ------------------ zay-es-net-basic/gradlew.bat | 90 ---------- .../src/main/java/example/GameClient.java | 1 - .../src/main/java/example/GameServer.java | 2 - .../src/main/java/example/LogUtil.java | 2 +- .../main/java/example/SimpleGameLogic.java | 1 - 133 files changed, 917 insertions(+), 906 deletions(-) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 settings.gradle delete mode 100644 zay-es-net-basic/gradle/wrapper/gradle-wrapper.jar delete mode 100644 zay-es-net-basic/gradle/wrapper/gradle-wrapper.properties delete mode 100644 zay-es-net-basic/gradlew delete mode 100644 zay-es-net-basic/gradlew.bat diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3a96c48 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +# Ignore Gradle stuff +/.gradle/ +/bulid/ +/*/.gradle/ +/*/build/ + +# Ignore Eclipse stuff +.project +.classpath +.settings/ +bin/ +/*/.project +/*/.classpath +/*/.settings/ +/*/bin/ diff --git a/base-sio2/build.gradle b/base-sio2/build.gradle index 15cf2a3..968168d 100644 --- a/base-sio2/build.gradle +++ b/base-sio2/build.gradle @@ -7,18 +7,12 @@ mainClassName='rename.Main' repositories { mavenLocal() - - if( JavaVersion.current() == JavaVersion.VERSION_1_7 ) { - // Fallback for JDK 7 that can no longer connect to jcenter with https - maven { url "http://jcenter.bintray.com" } - } else { - jcenter() - } + jcenter() } ext.jmeVersion = "[3.2,)" -project(":assets") { +project(":base-sio2-assets") { apply plugin: "java" buildDir = rootProject.file("build/assets") @@ -51,12 +45,10 @@ dependencies { compile 'com.google.guava:guava:19.0' compile 'org.slf4j:slf4j-api:1.7.13' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.5' - - runtime project(':assets') + runtime project(':base-sio2-assets') } -task wrapper(type: Wrapper) { -} - - +tasks.withType(JavaCompile) { + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] +} \ No newline at end of file diff --git a/base-sio2/settings.gradle b/base-sio2/settings.gradle index 9a51ffd..94f3b03 100644 --- a/base-sio2/settings.gradle +++ b/base-sio2/settings.gradle @@ -1 +1,3 @@ -include 'assets' +rootProject.name = 'base-sio2' +include ':base-sio2-assets' +project(":base-sio2-assets").projectDir = file("assets") \ No newline at end of file diff --git a/base-sio2/src/main/java/rename/Main.java b/base-sio2/src/main/java/rename/Main.java index 2114288..42520e8 100644 --- a/base-sio2/src/main/java/rename/Main.java +++ b/base-sio2/src/main/java/rename/Main.java @@ -36,14 +36,15 @@ package rename; -import com.jme3.app.*; +import com.jme3.app.BasicProfilerState; +import com.jme3.app.DebugKeysAppState; +import com.jme3.app.SimpleApplication; +import com.jme3.app.StatsAppState; import com.jme3.app.state.ScreenshotAppState; -import com.jme3.math.ColorRGBA; import com.jme3.material.Material; +import com.jme3.math.ColorRGBA; import com.jme3.scene.Geometry; import com.jme3.scene.shape.Box; -import com.jme3.texture.Texture; - import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.style.BaseStyles; import com.simsilica.state.DebugHudState; diff --git a/base-sio2/src/main/java/rename/SiliconDioxideState.java b/base-sio2/src/main/java/rename/SiliconDioxideState.java index 63b2f1d..8645010 100644 --- a/base-sio2/src/main/java/rename/SiliconDioxideState.java +++ b/base-sio2/src/main/java/rename/SiliconDioxideState.java @@ -38,8 +38,9 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; /** * Just a spinning silicon dioxide molecule. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f700f00 --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +tasks.register('clean') { + dependsOn gradle.includedBuilds*.task(':clean') +} + +tasks.register('build') { + dependsOn gradle.includedBuilds*.task(':build') +} + +tasks.register('eclipse') { + dependsOn gradle.includedBuilds*.task(':eclipse') +} + +tasks.register('idea') { + dependsOn gradle.includedBuilds*.task(':idea') +} + +tasks.register('distZip') { + dependsOn gradle.includedBuilds*.task(':distZip') +} + +tasks.register('wrapper') { + dependsOn gradle.includedBuilds*.task(':distZip') +} diff --git a/network-basic/build.gradle b/network-basic/build.gradle index f85c96d..1f6c2f3 100644 --- a/network-basic/build.gradle +++ b/network-basic/build.gradle @@ -12,7 +12,7 @@ repositories { ext.jmeVersion = "[3.3,)" -project(":assets") { +project(":network-basic-assets") { apply plugin: "java" buildDir = rootProject.file("build/assets") @@ -53,12 +53,9 @@ dependencies { compile 'org.slf4j:slf4j-api:1.7.13' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.5' - runtime project(':assets') -} - -task wrapper(type: Wrapper) { + runtime project(':network-basic-assets') } tasks.withType(JavaCompile) { - options.compilerArgs = ["-Xlint:deprecation"] -} + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] +} \ No newline at end of file diff --git a/network-basic/settings.gradle b/network-basic/settings.gradle index 9a51ffd..c00451f 100644 --- a/network-basic/settings.gradle +++ b/network-basic/settings.gradle @@ -1 +1,3 @@ -include 'assets' +rootProject.name = 'network-basic' +include 'network-basic-assets' +project(":network-basic-assets").projectDir = file("assets") \ No newline at end of file diff --git a/network-basic/src/main/java/example/ConnectionState.java b/network-basic/src/main/java/example/ConnectionState.java index 41e858d..4d04ae4 100644 --- a/network-basic/src/main/java/example/ConnectionState.java +++ b/network-basic/src/main/java/example/ConnectionState.java @@ -39,17 +39,16 @@ import java.io.IOException; import java.util.concurrent.Callable; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Strings; - import com.jme3.app.Application; import com.jme3.app.state.AppState; import com.jme3.network.Client; import com.jme3.network.ClientStateListener; import com.jme3.network.ClientStateListener.DisconnectInfo; import com.jme3.network.ErrorListener; - import com.simsilica.lemur.Action; import com.simsilica.lemur.Button; import com.simsilica.lemur.OptionPanel; @@ -178,7 +177,7 @@ protected void showError( final String title, final String message, final Throwa } getState(OptionPanelState.class).show(title, m, new ExitAction(fatal)); } else { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { showError(title, e, fatal); return null; @@ -192,7 +191,7 @@ protected void setClient( final GameClient client ) { if( isRenderThread() ) { this.client = client; } else { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { setClient(client); return null; @@ -243,7 +242,7 @@ public void execute( Button source ) { private class ConnectionObserver implements ClientStateListener, ErrorListener { public void clientConnected( final Client c ) { log.info("clientConnected(" + c + ")"); - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onConnected(); return null; @@ -253,7 +252,7 @@ public Object call() { public void clientDisconnected( final Client c, final DisconnectInfo info ) { log.info("clientDisconnected(" + c + ", " + info + ")"); - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onDisconnected(info); return null; diff --git a/network-basic/src/main/java/example/GameSessionEvent.java b/network-basic/src/main/java/example/GameSessionEvent.java index eec830a..f73fb1c 100644 --- a/network-basic/src/main/java/example/GameSessionEvent.java +++ b/network-basic/src/main/java/example/GameSessionEvent.java @@ -36,7 +36,7 @@ package example; -import com.simsilica.event.*; +import com.simsilica.event.EventType; /** * Events that are sent to the event bus for different client side player-related diff --git a/network-basic/src/main/java/example/GameSessionState.java b/network-basic/src/main/java/example/GameSessionState.java index eaedb49..72ea62e 100644 --- a/network-basic/src/main/java/example/GameSessionState.java +++ b/network-basic/src/main/java/example/GameSessionState.java @@ -38,7 +38,6 @@ import com.jme3.app.Application; import com.jme3.math.ColorRGBA; - import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.input.InputMapper; diff --git a/network-basic/src/main/java/example/HostState.java b/network-basic/src/main/java/example/HostState.java index 6f28c51..f7a4644 100644 --- a/network-basic/src/main/java/example/HostState.java +++ b/network-basic/src/main/java/example/HostState.java @@ -36,9 +36,10 @@ package example; -import java.io.*; +import java.io.IOException; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; @@ -46,8 +47,12 @@ import com.jme3.network.HostedConnection; import com.jme3.network.Server; import com.jme3.scene.Node; - -import com.simsilica.lemur.*; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; import com.simsilica.lemur.core.VersionedHolder; import com.simsilica.lemur.style.ElementId; import com.simsilica.state.DebugHudState; diff --git a/network-basic/src/main/java/example/InGameMenuState.java b/network-basic/src/main/java/example/InGameMenuState.java index b01d0d0..c7b9432 100644 --- a/network-basic/src/main/java/example/InGameMenuState.java +++ b/network-basic/src/main/java/example/InGameMenuState.java @@ -36,19 +36,25 @@ package example; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.component.SpringGridLayout; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.Action; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TabbedPanel; import com.simsilica.lemur.input.InputMapper; -import com.simsilica.lemur.style.ElementId; /** * diff --git a/network-basic/src/main/java/example/LoginState.java b/network-basic/src/main/java/example/LoginState.java index a84a0cd..e041de6 100644 --- a/network-basic/src/main/java/example/LoginState.java +++ b/network-basic/src/main/java/example/LoginState.java @@ -38,10 +38,15 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.style.ElementId; @@ -61,7 +66,7 @@ public LoginState() { } protected void join() { - + @SuppressWarnings("unused") String name = nameField.getText().trim(); if( getState(ConnectionState.class).join(nameField.getText()) ) { getStateManager().detach(this); diff --git a/network-basic/src/main/java/example/Main.java b/network-basic/src/main/java/example/Main.java index ef046ba..0a8e846 100644 --- a/network-basic/src/main/java/example/Main.java +++ b/network-basic/src/main/java/example/Main.java @@ -36,16 +36,12 @@ package example; -import com.jme3.app.*; +import com.jme3.app.BasicProfilerState; +import com.jme3.app.DebugKeysAppState; +import com.jme3.app.SimpleApplication; +import com.jme3.app.StatsAppState; import com.jme3.app.state.ScreenshotAppState; -import com.jme3.math.ColorRGBA; -import com.jme3.material.Material; -import com.jme3.scene.Geometry; import com.jme3.scene.Node; -import com.jme3.scene.Spatial; -import com.jme3.scene.shape.Box; -import com.jme3.texture.Texture; - import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.OptionPanelState; @@ -62,6 +58,7 @@ */ public class Main extends SimpleApplication { + @SuppressWarnings("unused") private Node logo; public static void main( String... args ) { @@ -112,10 +109,12 @@ public void simpleInitApp() { } private class GameListener { + @SuppressWarnings("unused") public void sessionStarted( GameSessionEvent event ) { stateManager.getState(SiliconDioxideState.class).setEnabled(false); } + @SuppressWarnings("unused") public void sessionEnded( GameSessionEvent event ) { stateManager.getState(SiliconDioxideState.class).setEnabled(true); } diff --git a/network-basic/src/main/java/example/MainMenuState.java b/network-basic/src/main/java/example/MainMenuState.java index a2f6b2f..12398ce 100644 --- a/network-basic/src/main/java/example/MainMenuState.java +++ b/network-basic/src/main/java/example/MainMenuState.java @@ -36,14 +36,22 @@ package example; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.style.ElementId; diff --git a/network-basic/src/main/java/example/MessageState.java b/network-basic/src/main/java/example/MessageState.java index ef19be8..1b55c4c 100644 --- a/network-basic/src/main/java/example/MessageState.java +++ b/network-basic/src/main/java/example/MessageState.java @@ -36,15 +36,14 @@ package example; -import java.util.*; - import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; -import com.jme3.util.SafeArrayList; - -import com.simsilica.lemur.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.util.SafeArrayList; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.Panel; import com.simsilica.lemur.style.ElementId; /** @@ -140,6 +139,7 @@ protected void onDisable() { protected void refreshLayout() { int height = getApplication().getCamera().getHeight(); + @SuppressWarnings("unused") int width = getApplication().getCamera().getWidth(); float y = 0; diff --git a/network-basic/src/main/java/example/SiliconDioxideState.java b/network-basic/src/main/java/example/SiliconDioxideState.java index 64f1c46..c0e6662 100644 --- a/network-basic/src/main/java/example/SiliconDioxideState.java +++ b/network-basic/src/main/java/example/SiliconDioxideState.java @@ -38,8 +38,8 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; /** * Just a spinning silicon dioxide molecule. diff --git a/network-basic/src/main/java/example/net/client/GameClient.java b/network-basic/src/main/java/example/net/client/GameClient.java index e35b662..6b44ab8 100644 --- a/network-basic/src/main/java/example/net/client/GameClient.java +++ b/network-basic/src/main/java/example/net/client/GameClient.java @@ -36,14 +36,16 @@ package example.net.client; -import org.slf4j.*; +import java.io.IOException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.Client; import com.jme3.network.Network; import com.jme3.network.service.ClientService; -import com.jme3.network.service.rpc.RpcClientService; import com.jme3.network.service.rmi.RmiClientService; -import java.io.IOException; +import com.jme3.network.service.rpc.RpcClientService; import example.GameConstants; diff --git a/network-basic/src/main/java/example/net/server/GameServer.java b/network-basic/src/main/java/example/net/server/GameServer.java index 03203d1..230f142 100644 --- a/network-basic/src/main/java/example/net/server/GameServer.java +++ b/network-basic/src/main/java/example/net/server/GameServer.java @@ -36,16 +36,18 @@ package example.net.server; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; import com.jme3.network.Network; import com.jme3.network.Server; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rpc.RpcHostedService; - import com.simsilica.sim.GameLoop; import com.simsilica.sim.GameSystemManager; @@ -65,6 +67,7 @@ public class GameServer { private GameSystemManager systems; private GameLoop loop; + @SuppressWarnings("unused") private String description; public GameServer( int port, String description ) throws IOException { diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2b3d8e0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,8 @@ +rootProject.name = 'Simsilica-Examples' +includeBuild 'base-sio2' +includeBuild 'network-basic' +includeBuild 'sigem' +includeBuild 'sim-eth-basic' +includeBuild 'sim-eth-es' +includeBuild 'simple-jme' +includeBuild 'zay-es-net-basic' \ No newline at end of file diff --git a/sigem/build.gradle b/sigem/build.gradle index 5d29fef..432e61f 100644 --- a/sigem/build.gradle +++ b/sigem/build.gradle @@ -7,19 +7,11 @@ mainClassName='sigem.Main' repositories { mavenLocal() - - if( JavaVersion.current() == JavaVersion.VERSION_1_7 ) { - // Fallback for JDK 7 that can no longer connect to jcenter with https - maven { url "http://jcenter.bintray.com" } - } else { - jcenter() - } + jcenter() } -//ext.jmeVersion = "[3.2,)" -ext.jmeVersion = "3.3.0-SNAPSHOT" - -project(":assets") { +ext.jmeVersion = "3.3.0-stable" +project(":sigem-assets") { apply plugin: "java" buildDir = rootProject.file("build/assets") @@ -54,9 +46,9 @@ dependencies { runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.5' - runtime project(':assets') -} - -task wrapper(type: Wrapper) { + runtime project(':sigem-assets') } +tasks.withType(JavaCompile) { + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] +} \ No newline at end of file diff --git a/sigem/settings.gradle b/sigem/settings.gradle index 9a51ffd..e7a05a8 100644 --- a/sigem/settings.gradle +++ b/sigem/settings.gradle @@ -1 +1,3 @@ -include 'assets' +rootProject.name = 'sigem' +include 'sigem-assets' +project(":sigem-assets").projectDir = file("assets") \ No newline at end of file diff --git a/sigem/src/main/java/sigem/GameConstants.java b/sigem/src/main/java/sigem/GameConstants.java index 8936c8c..8d3c411 100644 --- a/sigem/src/main/java/sigem/GameConstants.java +++ b/sigem/src/main/java/sigem/GameConstants.java @@ -36,7 +36,7 @@ package sigem; -import com.simsilica.mathd.*; +import com.simsilica.mathd.Vec3d; /** * diff --git a/sigem/src/main/java/sigem/GameSessionEvent.java b/sigem/src/main/java/sigem/GameSessionEvent.java index f9e4784..945d0c0 100644 --- a/sigem/src/main/java/sigem/GameSessionEvent.java +++ b/sigem/src/main/java/sigem/GameSessionEvent.java @@ -36,7 +36,7 @@ package sigem; -import com.simsilica.event.*; +import com.simsilica.event.EventType; /** * Events that are sent to the event bus for different client side player-related diff --git a/sigem/src/main/java/sigem/Main.java b/sigem/src/main/java/sigem/Main.java index e2b9fea..e3b226a 100644 --- a/sigem/src/main/java/sigem/Main.java +++ b/sigem/src/main/java/sigem/Main.java @@ -36,17 +36,15 @@ package sigem; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.jme3.app.*; +import com.jme3.app.BasicProfilerState; +import com.jme3.app.DebugKeysAppState; +import com.jme3.app.SimpleApplication; +import com.jme3.app.StatsAppState; import com.jme3.app.state.ScreenshotAppState; -import com.jme3.math.ColorRGBA; -import com.jme3.material.Material; -import com.jme3.scene.Geometry; -import com.jme3.scene.shape.Box; import com.jme3.system.AppSettings; -import com.jme3.texture.Texture; - import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.OptionPanelState; diff --git a/sigem/src/main/java/sigem/MainMenuState.java b/sigem/src/main/java/sigem/MainMenuState.java index 4c43364..c30d85c 100644 --- a/sigem/src/main/java/sigem/MainMenuState.java +++ b/sigem/src/main/java/sigem/MainMenuState.java @@ -36,19 +36,24 @@ package sigem; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.component.SpringGridLayout; +import com.jme3.math.Vector2f; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; import com.simsilica.lemur.event.PopupState; -import com.simsilica.lemur.style.ElementId; -import sigem.view.*; +import sigem.view.GameSessionState; /** * diff --git a/sigem/src/main/java/sigem/SiliconDioxideState.java b/sigem/src/main/java/sigem/SiliconDioxideState.java index f8e7d18..523def0 100644 --- a/sigem/src/main/java/sigem/SiliconDioxideState.java +++ b/sigem/src/main/java/sigem/SiliconDioxideState.java @@ -38,8 +38,9 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; /** * Just a spinning silicon dioxide molecule. diff --git a/sigem/src/main/java/sigem/es/ShipInput.java b/sigem/src/main/java/sigem/es/ShipInput.java index 70fbe89..a0f3bc5 100644 --- a/sigem/src/main/java/sigem/es/ShipInput.java +++ b/sigem/src/main/java/sigem/es/ShipInput.java @@ -37,7 +37,7 @@ package sigem.es; import com.simsilica.es.EntityComponent; -import com.simsilica.mathd.*; +import com.simsilica.mathd.Vec3d; /** * The current control input for a ship. Consists of diff --git a/sigem/src/main/java/sigem/sim/ArenaBoundary.java b/sigem/src/main/java/sigem/sim/ArenaBoundary.java index 052a7e3..8b3c256 100644 --- a/sigem/src/main/java/sigem/sim/ArenaBoundary.java +++ b/sigem/src/main/java/sigem/sim/ArenaBoundary.java @@ -36,13 +36,17 @@ package sigem.sim; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; -import sigem.es.*; +import sigem.es.Position; /** * This system clips all positioned entities to the arena bounds, wrapping @@ -144,7 +148,8 @@ private class ObjectContainer extends EntityContainer { private Vec3d temp = new Vec3d(); - public ObjectContainer( EntityData ed ) { + @SuppressWarnings("unchecked") + public ObjectContainer( EntityData ed ) { super(ed, Position.class); } diff --git a/sigem/src/main/java/sigem/sim/AsteroidHitListener.java b/sigem/src/main/java/sigem/sim/AsteroidHitListener.java index 751bf51..8588757 100644 --- a/sigem/src/main/java/sigem/sim/AsteroidHitListener.java +++ b/sigem/src/main/java/sigem/sim/AsteroidHitListener.java @@ -38,13 +38,17 @@ import java.util.Random; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.es.CreatedBy; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.es.Name; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; -import sigem.es.*; +import sigem.es.ObjectType; /** * Checks for missile-asteroid hits or high energy asteroid @@ -126,9 +130,11 @@ protected void missileHit( Body missile, Body asteroid, Contact contact ) { Vec3d loc1 = asteroid.pos.add(offset.mult(asteroid.radius * 0.5)); Vec3d loc2 = asteroid.pos.subtract(offset.mult(asteroid.radius * 0.5)); + @SuppressWarnings("unused") EntityId ast1 = gameEntities.createAsteroid(loc1, offset.add(asteroid.velocity), new Vec3d(rand.nextDouble() + 1, rand.nextDouble(), 0), size); + @SuppressWarnings("unused") EntityId ast2 = gameEntities.createAsteroid(loc2, offset.subtract(asteroid.velocity), new Vec3d(rand.nextDouble() + 1, rand.nextDouble(), 0), size); @@ -145,6 +151,7 @@ protected void missileHit( Body missile, Body asteroid, Contact contact ) { Vec3d dir = new Vec3d(x, 0, z); double size = 0.2 + rand.nextDouble() * 0.4; + @SuppressWarnings("unused") EntityId chunk = gameEntities.createAsteroidChunk(debrisLoc.add(dir), dir, new Vec3d(rand.nextDouble() + 1, rand.nextDouble(), 0), size); diff --git a/sigem/src/main/java/sigem/sim/Body.java b/sigem/src/main/java/sigem/sim/Body.java index a4b4671..4d1e7e7 100644 --- a/sigem/src/main/java/sigem/sim/Body.java +++ b/sigem/src/main/java/sigem/sim/Body.java @@ -36,12 +36,11 @@ package sigem.sim; -import java.util.concurrent.atomic.AtomicLong; - import com.google.common.base.MoreObjects; - import com.simsilica.es.EntityId; -import com.simsilica.mathd.*; +import com.simsilica.mathd.AaBBox; +import com.simsilica.mathd.Quatd; +import com.simsilica.mathd.Vec3d; import sigem.es.Position; diff --git a/sigem/src/main/java/sigem/sim/CollisionSystem.java b/sigem/src/main/java/sigem/sim/CollisionSystem.java index 9edc087..05e04c6 100644 --- a/sigem/src/main/java/sigem/sim/CollisionSystem.java +++ b/sigem/src/main/java/sigem/sim/CollisionSystem.java @@ -36,16 +36,16 @@ package sigem.sim; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.util.SafeArrayList; - -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.es.EntityData; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; import sigem.GameConstants; -import sigem.es.Position; /** @@ -58,7 +58,9 @@ public class CollisionSystem extends AbstractGameSystem static Logger log = LoggerFactory.getLogger(CollisionSystem.class); + @SuppressWarnings("unused") private EntityData ed; + @SuppressWarnings("unused") private SimTime time; private Vec3d arenaSize = GameConstants.ARENA_EXTENTS.mult(2); diff --git a/sigem/src/main/java/sigem/sim/Contact.java b/sigem/src/main/java/sigem/sim/Contact.java index 5502ced..da7f5ac 100644 --- a/sigem/src/main/java/sigem/sim/Contact.java +++ b/sigem/src/main/java/sigem/sim/Contact.java @@ -37,8 +37,7 @@ package sigem.sim; import com.google.common.base.MoreObjects; - -import com.simsilica.mathd.*; +import com.simsilica.mathd.Vec3d; /** * diff --git a/sigem/src/main/java/sigem/sim/GameEntities.java b/sigem/src/main/java/sigem/sim/GameEntities.java index 278fd43..e032f6f 100644 --- a/sigem/src/main/java/sigem/sim/GameEntities.java +++ b/sigem/src/main/java/sigem/sim/GameEntities.java @@ -36,16 +36,23 @@ package sigem.sim; -import java.util.*; +import java.util.Random; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.simsilica.es.*; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; import com.simsilica.es.common.Decay; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; - -import sigem.es.*; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; + +import sigem.es.Impulse; +import sigem.es.MassProperties; +import sigem.es.ObjectType; +import sigem.es.Position; +import sigem.es.SphereShape; /** * Factory methods for common game entities. diff --git a/sigem/src/main/java/sigem/sim/MissileHitListener.java b/sigem/src/main/java/sigem/sim/MissileHitListener.java index 977bdd4..47d5538 100644 --- a/sigem/src/main/java/sigem/sim/MissileHitListener.java +++ b/sigem/src/main/java/sigem/sim/MissileHitListener.java @@ -39,13 +39,13 @@ import java.util.Objects; import java.util.Random; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.es.EntityData; +import com.simsilica.sim.AbstractGameSystem; -import sigem.es.*; +import sigem.es.ObjectType; /** * Checks for any missile hits to create the hit effect and destroy @@ -60,7 +60,8 @@ public class MissileHitListener extends AbstractGameSystem private EntityData ed; private GameEntities gameEntities; - private Random rand = new Random(0); + @SuppressWarnings("unused") + private Random rand = new Random(0); public MissileHitListener() { } diff --git a/sigem/src/main/java/sigem/sim/PlanetGravity.java b/sigem/src/main/java/sigem/sim/PlanetGravity.java index 2f157f2..c655841 100644 --- a/sigem/src/main/java/sigem/sim/PlanetGravity.java +++ b/sigem/src/main/java/sigem/sim/PlanetGravity.java @@ -36,10 +36,12 @@ package sigem.sim; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; /** * Cheating a little... we'll use a physics listener to add diff --git a/sigem/src/main/java/sigem/sim/PositionPublisher.java b/sigem/src/main/java/sigem/sim/PositionPublisher.java index 3fd7671..784e481 100644 --- a/sigem/src/main/java/sigem/sim/PositionPublisher.java +++ b/sigem/src/main/java/sigem/sim/PositionPublisher.java @@ -36,9 +36,9 @@ package sigem.sim; -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.es.EntityData; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; import sigem.es.Position; @@ -52,6 +52,7 @@ public class PositionPublisher extends AbstractGameSystem implements PhysicsListener { private EntityData ed; + @SuppressWarnings("unused") private SimTime time; public PositionPublisher() { diff --git a/sigem/src/main/java/sigem/sim/ShipDriver.java b/sigem/src/main/java/sigem/sim/ShipDriver.java index 03bb19e..0250502 100644 --- a/sigem/src/main/java/sigem/sim/ShipDriver.java +++ b/sigem/src/main/java/sigem/sim/ShipDriver.java @@ -36,13 +36,12 @@ package sigem.sim; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.jme3.math.*; +import com.simsilica.mathd.Vec3d; -import com.simsilica.mathd.*; - -import sigem.es.*; +import sigem.es.ShipInput; /** * Applies thrust values to a ship. @@ -92,6 +91,7 @@ public void update( double stepTime, Body body ) { // Grab local versions of the player settings in case another // thread sets them while we are calculating. + @SuppressWarnings("unused") Vec3d vec = thrust; // Add a threshold to thrust to make it easier to turn with the @@ -106,7 +106,7 @@ public void update( double stepTime, Body body ) { // We want to apply our acceleration to reach the target // velocity... unless that acceleration would actually slow - // us down (ie: we're heading towards a gravity well) + // us down (i.e. we're heading towards a gravity well) // So we can't just subtract the tips of targetVel and velocity // and use that as acceleration. It might slow us down. // But we _do_ want to apply any lateral acceleration. diff --git a/sigem/src/main/java/sigem/sim/ShipInputSystem.java b/sigem/src/main/java/sigem/sim/ShipInputSystem.java index 751581e..21256da 100644 --- a/sigem/src/main/java/sigem/sim/ShipInputSystem.java +++ b/sigem/src/main/java/sigem/sim/ShipInputSystem.java @@ -36,16 +36,21 @@ package sigem.sim; -import java.util.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.slf4j.*; - -import com.simsilica.es.*; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; import com.simsilica.es.common.Decay; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; -import sigem.es.*; +import sigem.es.ObjectType; +import sigem.es.Position; +import sigem.es.ShipInput; /** * Manages the various ShipInput entities and makes sure their @@ -126,6 +131,7 @@ public void update( SimTime time ) { } private class ShipContainer extends EntityContainer { + @SuppressWarnings("unchecked") public ShipContainer( EntityData ed ) { super(ed, ShipInput.class); } diff --git a/sigem/src/main/java/sigem/sim/SimplePhysics.java b/sigem/src/main/java/sigem/sim/SimplePhysics.java index dab81d1..276c240 100644 --- a/sigem/src/main/java/sigem/sim/SimplePhysics.java +++ b/sigem/src/main/java/sigem/sim/SimplePhysics.java @@ -36,15 +36,22 @@ package sigem.sim; -import java.util.*; -import java.util.concurrent.*; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; import com.jme3.util.SafeArrayList; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; -import com.simsilica.es.*; -import com.simsilica.sim.*; - -import sigem.es.*; +import sigem.es.Impulse; +import sigem.es.MassProperties; +import sigem.es.Position; +import sigem.es.SphereShape; /** * Just a basic physics simulation that integrates acceleration, @@ -233,7 +240,7 @@ public void update( SimTime time ) { * Maps the appropriate entities to physics bodies. */ private class BodyContainer extends EntityContainer { - + @SuppressWarnings("unchecked") public BodyContainer( EntityData ed ) { super(ed, Position.class, MassProperties.class, SphereShape.class); } diff --git a/sigem/src/main/java/sigem/view/CameraState.java b/sigem/src/main/java/sigem/view/CameraState.java index e53d618..b77b966 100644 --- a/sigem/src/main/java/sigem/view/CameraState.java +++ b/sigem/src/main/java/sigem/view/CameraState.java @@ -36,25 +36,33 @@ package sigem.view; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.material.Material; -import com.jme3.math.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.FastMath; +import com.jme3.math.Quaternion; +import com.jme3.math.Vector2f; +import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; -import com.jme3.scene.*; -import com.jme3.scene.shape.*; +import com.jme3.scene.Geometry; +import com.jme3.scene.Node; +import com.jme3.scene.shape.Quad; import com.jme3.texture.Texture; - +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; import com.simsilica.lemur.GuiGlobals; -import com.simsilica.mathd.*; -import com.simsilica.es.*; -import com.simsilica.state.*; +import com.simsilica.mathd.Vec3d; +import com.simsilica.state.GameSystemsState; import sigem.GameConstants; import sigem.Main; -import sigem.es.*; +import sigem.es.Position; +import sigem.es.ShipInput; /** * Manages the camera location and the background star field based on the @@ -241,6 +249,7 @@ public void update( float tpf ) { * this is really just a membership set. */ private class ShipContainer extends EntityContainer { + @SuppressWarnings("unchecked") public ShipContainer( EntityData ed ) { super(ed, ShipInput.class, Position.class); } diff --git a/sigem/src/main/java/sigem/view/GameSessionState.java b/sigem/src/main/java/sigem/view/GameSessionState.java index c254ea1..ce8ebe6 100644 --- a/sigem/src/main/java/sigem/view/GameSessionState.java +++ b/sigem/src/main/java/sigem/view/GameSessionState.java @@ -38,28 +38,43 @@ import java.util.Random; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; -import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; - -import com.simsilica.es.*; +import com.simsilica.es.CreatedBy; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.es.Name; import com.simsilica.es.base.DefaultEntityData; import com.simsilica.es.common.Decay; -import com.simsilica.event.*; +import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.input.InputMapper; -import com.simsilica.mathd.*; +import com.simsilica.mathd.Vec3d; import com.simsilica.sim.SimTime; import com.simsilica.sim.common.DecaySystem; -import com.simsilica.state.*; +import com.simsilica.state.CompositeAppState; +import com.simsilica.state.GameSystemsState; import sigem.GameConstants; import sigem.GameSessionEvent; import sigem.MainGameFunctions; -import sigem.es.*; -import sigem.sim.*; +import sigem.es.Impulse; +import sigem.es.MassProperties; +import sigem.es.ObjectType; +import sigem.es.Position; +import sigem.es.ShipInput; +import sigem.es.SphereShape; +import sigem.sim.ArenaBoundary; +import sigem.sim.AsteroidHitListener; +import sigem.sim.CollisionSystem; +import sigem.sim.GameEntities; +import sigem.sim.MissileHitListener; +import sigem.sim.PlanetGravity; +import sigem.sim.PositionPublisher; +import sigem.sim.ShipInputSystem; +import sigem.sim.SimplePhysics; /** * diff --git a/sigem/src/main/java/sigem/view/InGameMenuState.java b/sigem/src/main/java/sigem/view/InGameMenuState.java index 5120c2a..ee2ac1a 100644 --- a/sigem/src/main/java/sigem/view/InGameMenuState.java +++ b/sigem/src/main/java/sigem/view/InGameMenuState.java @@ -36,19 +36,24 @@ package sigem.view; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.component.SpringGridLayout; +import com.jme3.math.Vector3f; +import com.simsilica.lemur.Action; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TabbedPanel; import com.simsilica.lemur.input.InputMapper; -import com.simsilica.lemur.style.ElementId; import sigem.MainGameFunctions; import sigem.MainMenuState; @@ -68,6 +73,7 @@ public class InGameMenuState extends BaseAppState { private List sessionActions = new ArrayList<>(); private Container sessionButtons; + @SuppressWarnings("unused") private boolean movementState = false; public InGameMenuState( boolean enabled ) { diff --git a/sigem/src/main/java/sigem/view/ModelViewState.java b/sigem/src/main/java/sigem/view/ModelViewState.java index cfb1a75..55cdbfd 100644 --- a/sigem/src/main/java/sigem/view/ModelViewState.java +++ b/sigem/src/main/java/sigem/view/ModelViewState.java @@ -36,35 +36,44 @@ package sigem.view; -import java.util.*; -import java.util.concurrent.*; +import java.util.HashMap; +import java.util.Map; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.asset.AssetManager; -import com.jme3.math.*; -import com.jme3.renderer.Camera; import com.jme3.material.Material; import com.jme3.material.RenderState.BlendMode; -import com.jme3.renderer.Camera; +import com.jme3.math.ColorRGBA; +import com.jme3.math.FastMath; +import com.jme3.math.Vector3f; import com.jme3.renderer.queue.RenderQueue.Bucket; -import com.jme3.scene.*; +import com.jme3.scene.Geometry; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; import com.jme3.scene.Spatial.CullHint; -import com.jme3.scene.shape.*; +import com.jme3.scene.shape.Quad; +import com.jme3.scene.shape.Sphere; import com.jme3.texture.Texture; -import com.jme3.util.SafeArrayList; - -import com.simsilica.es.*; -import com.simsilica.lemur.*; -import com.simsilica.lemur.anim.*; -import com.simsilica.lemur.style.ElementId; -import com.simsilica.mathd.*; -import com.simsilica.state.*; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.LayerComparator; +import com.simsilica.lemur.anim.AbstractTween; +import com.simsilica.lemur.anim.AnimationState; +import com.simsilica.lemur.anim.Tweens; +import com.simsilica.mathd.Vec3d; +import com.simsilica.state.GameSystemsState; import sigem.Main; -import sigem.es.*; +import sigem.es.ObjectType; +import sigem.es.Position; +import sigem.es.SphereShape; /** * Displays the models for the various physics objects. @@ -296,6 +305,7 @@ protected Spatial createMissile( Entity entity ) { Node result = new Node("thrust"); Geometry geom = createQuad(4, "Textures/missile.png", BlendMode.AlphaAdditive); geom.move(0, -1, 0); + @SuppressWarnings("unused") Material mat = geom.getMaterial(); //ColorRGBA color = new ColorRGBA(2, 2, 0, 1); @@ -445,6 +455,7 @@ protected void removeModel( Spatial spatial, Entity entity ) { * MobContainer takes precedence. */ private class ModelContainer extends EntityContainer { + @SuppressWarnings("unchecked") public ModelContainer( EntityData ed ) { super(ed, ObjectType.class, Position.class); } diff --git a/sigem/src/main/java/sigem/view/PlayerInputState.java b/sigem/src/main/java/sigem/view/PlayerInputState.java index a838111..63b10e3 100644 --- a/sigem/src/main/java/sigem/view/PlayerInputState.java +++ b/sigem/src/main/java/sigem/view/PlayerInputState.java @@ -36,17 +36,21 @@ package sigem.view; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; - -import com.simsilica.es.*; +import com.simsilica.es.EntityId; import com.simsilica.lemur.GuiGlobals; -import com.simsilica.lemur.input.*; -import com.simsilica.mathd.*; +import com.simsilica.lemur.input.AnalogFunctionListener; +import com.simsilica.lemur.input.FunctionId; +import com.simsilica.lemur.input.InputMapper; +import com.simsilica.lemur.input.InputState; +import com.simsilica.lemur.input.StateFunctionListener; +import com.simsilica.mathd.Vec3d; -import sigem.es.*; +import sigem.es.ShipInput; /** * Maps player inputs to ships. diff --git a/sim-eth-basic/build.gradle b/sim-eth-basic/build.gradle index fbbef07..b001c5f 100644 --- a/sim-eth-basic/build.gradle +++ b/sim-eth-basic/build.gradle @@ -12,7 +12,7 @@ repositories { ext.jmeVersion = "[3.3,)" -project(":assets") { +project(":sim-eth-basic-assets") { apply plugin: "java" buildDir = rootProject.file("build/assets") @@ -53,10 +53,7 @@ dependencies { compile 'org.slf4j:slf4j-api:1.7.13' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.5' - runtime project(':assets') -} - -task wrapper(type: Wrapper) { + runtime project(':sim-eth-basic-assets') } task runServer(type: JavaExec) { @@ -97,5 +94,5 @@ distZip { } tasks.withType(JavaCompile) { - options.compilerArgs = ["-Xlint:deprecation"] + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] } \ No newline at end of file diff --git a/sim-eth-basic/settings.gradle b/sim-eth-basic/settings.gradle index 9a51ffd..e413668 100644 --- a/sim-eth-basic/settings.gradle +++ b/sim-eth-basic/settings.gradle @@ -1 +1,3 @@ -include 'assets' +rootProject.name = 'sim-eth-basic' +include 'sim-eth-basic-assets' +project(":sim-eth-basic-assets").projectDir = file("assets") diff --git a/sim-eth-basic/src/main/java/example/CommandConsoleState.java b/sim-eth-basic/src/main/java/example/CommandConsoleState.java index 0073c63..3dfbbf7 100644 --- a/sim-eth-basic/src/main/java/example/CommandConsoleState.java +++ b/sim-eth-basic/src/main/java/example/CommandConsoleState.java @@ -36,16 +36,18 @@ package example; -import java.util.*; - import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.input.KeyInput; -import com.jme3.math.*; -import com.jme3.scene.*; -import com.jme3.util.SafeArrayList; - -import com.simsilica.lemur.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.component.TextEntryComponent; import com.simsilica.lemur.event.KeyAction; @@ -67,6 +69,7 @@ public class CommandConsoleState extends BaseAppState { public static final ElementId TEXT_ENTRY_ID = new ElementId("console.textField"); private Container entryPanel; + @SuppressWarnings("unused") private Label prompt; private TextField entry; diff --git a/sim-eth-basic/src/main/java/example/ConnectionState.java b/sim-eth-basic/src/main/java/example/ConnectionState.java index 7fd390f..8e2c2f9 100644 --- a/sim-eth-basic/src/main/java/example/ConnectionState.java +++ b/sim-eth-basic/src/main/java/example/ConnectionState.java @@ -39,10 +39,10 @@ import java.io.IOException; import java.util.concurrent.Callable; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Strings; - import com.jme3.app.Application; import com.jme3.app.state.AppState; import com.jme3.network.Client; @@ -50,16 +50,14 @@ import com.jme3.network.ClientStateListener.DisconnectInfo; import com.jme3.network.ErrorListener; import com.jme3.network.service.ClientService; - +import com.simsilica.ethereal.EtherealClient; +import com.simsilica.ethereal.TimeSource; import com.simsilica.lemur.Action; import com.simsilica.lemur.Button; import com.simsilica.lemur.OptionPanel; import com.simsilica.lemur.OptionPanelState; import com.simsilica.state.CompositeAppState; -import com.simsilica.ethereal.EtherealClient; -import com.simsilica.ethereal.TimeSource; - import example.net.AccountSessionListener; import example.net.client.AccountClientService; import example.net.client.GameClient; @@ -200,7 +198,7 @@ protected void showError( final String title, final String message, final Throwa } getState(OptionPanelState.class).show(title, m, new ExitAction(fatal)); } else { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { showError(title, e, fatal); return null; @@ -214,7 +212,7 @@ protected void setClient( final GameClient client ) { if( isRenderThread() ) { this.client = client; } else { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { setClient(client); return null; @@ -272,7 +270,7 @@ public void execute( Button source ) { private class ConnectionObserver implements ClientStateListener, ErrorListener { public void clientConnected( final Client c ) { log.info("clientConnected(" + c + ")"); - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onConnected(); return null; @@ -282,7 +280,7 @@ public Object call() { public void clientDisconnected( final Client c, final DisconnectInfo info ) { log.info("clientDisconnected(" + c + ", " + info + ")"); - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onDisconnected(info); return null; @@ -299,7 +297,7 @@ public void handleError( Client source, Throwable t ) { private class AccountObserver implements AccountSessionListener { public void notifyLoginStatus( final boolean loggedIn ) { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onLoggedOn(loggedIn); return null; diff --git a/sim-eth-basic/src/main/java/example/GameConstants.java b/sim-eth-basic/src/main/java/example/GameConstants.java index 42ac82f..9bf2bca 100644 --- a/sim-eth-basic/src/main/java/example/GameConstants.java +++ b/sim-eth-basic/src/main/java/example/GameConstants.java @@ -36,12 +36,11 @@ package example; -import com.jme3.math.*; +import com.simsilica.ethereal.net.ObjectStateProtocol; +import com.simsilica.ethereal.zone.ZoneGrid; import com.simsilica.mathd.Vec3i; import com.simsilica.mathd.bits.QuatBits; import com.simsilica.mathd.bits.Vec3Bits; -import com.simsilica.ethereal.net.ObjectStateProtocol; -import com.simsilica.ethereal.zone.ZoneGrid; /** diff --git a/sim-eth-basic/src/main/java/example/GameSessionEvent.java b/sim-eth-basic/src/main/java/example/GameSessionEvent.java index 28a3e8a..6bf818c 100644 --- a/sim-eth-basic/src/main/java/example/GameSessionEvent.java +++ b/sim-eth-basic/src/main/java/example/GameSessionEvent.java @@ -36,7 +36,7 @@ package example; -import com.simsilica.event.*; +import com.simsilica.event.EventType; /** * Events that are sent to the event bus for different client side player-related diff --git a/sim-eth-basic/src/main/java/example/GameSessionState.java b/sim-eth-basic/src/main/java/example/GameSessionState.java index b4cb152..f20bcbc 100644 --- a/sim-eth-basic/src/main/java/example/GameSessionState.java +++ b/sim-eth-basic/src/main/java/example/GameSessionState.java @@ -36,23 +36,22 @@ package example; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; -import com.jme3.math.*; - +import com.jme3.math.ColorRGBA; +import com.simsilica.ethereal.TimeSource; import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.input.InputMapper; import com.simsilica.state.CompositeAppState; -import com.simsilica.ethereal.TimeSource; - import example.debug.TimeSequenceState; import example.net.GameSessionListener; -import example.net.client.GameSessionClientService; import example.net.chat.ChatSessionListener; import example.net.chat.client.ChatClientService; +import example.net.client.GameSessionClientService; import example.view.ModelViewState; import example.view.PlayerMovementState; import example.view.SkyState; @@ -74,6 +73,7 @@ public class GameSessionState extends CompositeAppState { // Temporary reference FIXME private PlayerMovementState us; + @SuppressWarnings("unused") private int clientId; private int shipId = -1; diff --git a/sim-eth-basic/src/main/java/example/HelpState.java b/sim-eth-basic/src/main/java/example/HelpState.java index 2b14699..6eccc07 100644 --- a/sim-eth-basic/src/main/java/example/HelpState.java +++ b/sim-eth-basic/src/main/java/example/HelpState.java @@ -40,14 +40,17 @@ import java.util.List; import com.google.common.base.Joiner; - import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.input.KeyNames; import com.jme3.math.Vector3f; import com.jme3.scene.Node; - -import com.simsilica.lemur.*; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; import com.simsilica.lemur.input.FunctionId; import com.simsilica.lemur.input.InputMapper; import com.simsilica.lemur.input.InputMapper.Mapping; @@ -66,6 +69,7 @@ public class HelpState extends BaseAppState { private Container helpWindow; private boolean movementState = false; + @SuppressWarnings("unused") private String[][] keyHelpStrings = { {"F1", "Opens this help window."}, diff --git a/sim-eth-basic/src/main/java/example/HostState.java b/sim-eth-basic/src/main/java/example/HostState.java index a45b6dd..730d6aa 100644 --- a/sim-eth-basic/src/main/java/example/HostState.java +++ b/sim-eth-basic/src/main/java/example/HostState.java @@ -36,9 +36,10 @@ package example; -import java.io.*; +import java.io.IOException; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; @@ -46,8 +47,13 @@ import com.jme3.network.HostedConnection; import com.jme3.network.Server; import com.jme3.scene.Node; - -import com.simsilica.lemur.*; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; import com.simsilica.lemur.core.VersionedHolder; import com.simsilica.lemur.style.ElementId; import com.simsilica.state.DebugHudState; diff --git a/sim-eth-basic/src/main/java/example/InGameMenuState.java b/sim-eth-basic/src/main/java/example/InGameMenuState.java index 0c36f4a..1662f3a 100644 --- a/sim-eth-basic/src/main/java/example/InGameMenuState.java +++ b/sim-eth-basic/src/main/java/example/InGameMenuState.java @@ -36,19 +36,25 @@ package example; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.component.SpringGridLayout; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.Action; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TabbedPanel; import com.simsilica.lemur.input.InputMapper; -import com.simsilica.lemur.style.ElementId; import example.view.PlayerMovementState; diff --git a/sim-eth-basic/src/main/java/example/LoginState.java b/sim-eth-basic/src/main/java/example/LoginState.java index 1761f43..6f0a9d5 100644 --- a/sim-eth-basic/src/main/java/example/LoginState.java +++ b/sim-eth-basic/src/main/java/example/LoginState.java @@ -38,10 +38,18 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.HAlignment; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.style.ElementId; @@ -65,7 +73,7 @@ public LoginState( String serverInfo ) { } protected void join() { - + @SuppressWarnings("unused") String name = nameField.getText().trim(); if( getState(ConnectionState.class).join(nameField.getText()) ) { getStateManager().detach(this); diff --git a/sim-eth-basic/src/main/java/example/Main.java b/sim-eth-basic/src/main/java/example/Main.java index 78b4988..a5d8ec0 100644 --- a/sim-eth-basic/src/main/java/example/Main.java +++ b/sim-eth-basic/src/main/java/example/Main.java @@ -36,19 +36,13 @@ package example; -import java.util.prefs.Preferences; - -import com.jme3.app.*; +import com.jme3.app.BasicProfilerState; +import com.jme3.app.DebugKeysAppState; +import com.jme3.app.SimpleApplication; +import com.jme3.app.StatsAppState; import com.jme3.app.state.ScreenshotAppState; -import com.jme3.math.ColorRGBA; -import com.jme3.material.Material; -import com.jme3.scene.Geometry; import com.jme3.scene.Node; -import com.jme3.scene.Spatial; -import com.jme3.scene.shape.Box; import com.jme3.system.AppSettings; -import com.jme3.texture.Texture; - import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.OptionPanelState; @@ -67,6 +61,7 @@ */ public class Main extends SimpleApplication { + @SuppressWarnings("unused") private Node logo; public static void main( String... args ) throws Exception { @@ -154,10 +149,12 @@ public void simpleInitApp() { } private class GameListener { + @SuppressWarnings("unused") public void sessionStarted( GameSessionEvent event ) { stateManager.getState(SiliconDioxideState.class).setEnabled(false); } + @SuppressWarnings("unused") public void sessionEnded( GameSessionEvent event ) { stateManager.getState(SiliconDioxideState.class).setEnabled(true); } diff --git a/sim-eth-basic/src/main/java/example/MainMenuState.java b/sim-eth-basic/src/main/java/example/MainMenuState.java index 823d47e..915008d 100644 --- a/sim-eth-basic/src/main/java/example/MainMenuState.java +++ b/sim-eth-basic/src/main/java/example/MainMenuState.java @@ -36,14 +36,23 @@ package example; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.style.ElementId; diff --git a/sim-eth-basic/src/main/java/example/MessageState.java b/sim-eth-basic/src/main/java/example/MessageState.java index b705fa2..7b6e98b 100644 --- a/sim-eth-basic/src/main/java/example/MessageState.java +++ b/sim-eth-basic/src/main/java/example/MessageState.java @@ -36,16 +36,16 @@ package example; -import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentLinkedQueue; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; -import com.jme3.util.SafeArrayList; - -import com.simsilica.lemur.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.util.SafeArrayList; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.Panel; import com.simsilica.lemur.style.ElementId; /** @@ -173,6 +173,7 @@ protected void resetMessageRootLocation() { protected void refreshLayout() { int height = getApplication().getCamera().getHeight(); + @SuppressWarnings("unused") int width = getApplication().getCamera().getWidth(); float y = 0; diff --git a/sim-eth-basic/src/main/java/example/SiliconDioxideState.java b/sim-eth-basic/src/main/java/example/SiliconDioxideState.java index a9bd4bc..2ef180a 100644 --- a/sim-eth-basic/src/main/java/example/SiliconDioxideState.java +++ b/sim-eth-basic/src/main/java/example/SiliconDioxideState.java @@ -38,8 +38,9 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; /** * Just a spinning silicon dioxide molecule. diff --git a/sim-eth-basic/src/main/java/example/TimeState.java b/sim-eth-basic/src/main/java/example/TimeState.java index eea14a6..07f8eb1 100644 --- a/sim-eth-basic/src/main/java/example/TimeState.java +++ b/sim-eth-basic/src/main/java/example/TimeState.java @@ -38,7 +38,6 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; - import com.simsilica.ethereal.TimeSource; diff --git a/sim-eth-basic/src/main/java/example/debug/TimeSequenceState.java b/sim-eth-basic/src/main/java/example/debug/TimeSequenceState.java index 5385258..cbd1f8c 100644 --- a/sim-eth-basic/src/main/java/example/debug/TimeSequenceState.java +++ b/sim-eth-basic/src/main/java/example/debug/TimeSequenceState.java @@ -53,7 +53,10 @@ import com.jme3.scene.VertexBuffer.Type; import com.jme3.scene.shape.Line; import com.jme3.util.BufferUtils; - +import com.simsilica.ethereal.Statistics; +import com.simsilica.ethereal.Statistics.Sequence; +import com.simsilica.ethereal.Statistics.Tracker; +import com.simsilica.ethereal.SynchedTimeSource; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.Label; import com.simsilica.lemur.input.InputMapper; @@ -62,11 +65,6 @@ import example.MainGameFunctions; import example.TimeState; -import com.simsilica.ethereal.Statistics; -import com.simsilica.ethereal.Statistics.Sequence; -import com.simsilica.ethereal.Statistics.Tracker; -import com.simsilica.ethereal.SynchedTimeSource; - /** @@ -281,6 +279,7 @@ private class SequenceEntry { private Material mat; private Label label; + @SuppressWarnings("unused") public SequenceEntry( String name, ColorRGBA color ) { this(name, color, 12); } @@ -386,7 +385,8 @@ private class Graph { private Mesh mesh; - public Graph( ColorRGBA color ) { + @SuppressWarnings("unused") + public Graph( ColorRGBA color ) { this(color, 1280); } @@ -419,6 +419,7 @@ public final void setFrameCount( int size ) { } } + @SuppressWarnings("unused") public int getFrameCount() { return size; } @@ -427,10 +428,12 @@ public int getFrameCount() { * Sets the number of nanoseconds to wait before updating the * mesh. By default this is once a millisecond, ie: 1000000 nanoseconds. */ + @SuppressWarnings("unused") public void setUpdateInterval( long nanos ) { this.updateInterval = nanos; } + @SuppressWarnings("unused") public long getUpdateInterval() { return updateInterval; } @@ -439,6 +442,7 @@ public long getUpdateInterval() { * Returns the mesh that contains the bar chart of tracked frame * timings. */ + @SuppressWarnings("unused") public Mesh getMesh() { return mesh; } diff --git a/sim-eth-basic/src/main/java/example/net/GameSessionListener.java b/sim-eth-basic/src/main/java/example/net/GameSessionListener.java index 0478925..8847476 100644 --- a/sim-eth-basic/src/main/java/example/net/GameSessionListener.java +++ b/sim-eth-basic/src/main/java/example/net/GameSessionListener.java @@ -36,7 +36,6 @@ package example.net; -import com.jme3.math.*; import com.jme3.network.service.rmi.Asynchronous; /** diff --git a/sim-eth-basic/src/main/java/example/net/chat/client/ChatClientService.java b/sim-eth-basic/src/main/java/example/net/chat/client/ChatClientService.java index e2df946..40f0d5c 100644 --- a/sim-eth-basic/src/main/java/example/net/chat/client/ChatClientService.java +++ b/sim-eth-basic/src/main/java/example/net/chat/client/ChatClientService.java @@ -39,7 +39,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.MessageConnection; import com.jme3.network.service.AbstractClientService; @@ -63,6 +64,7 @@ public class ChatClientService extends AbstractClientService private int channel; private ChatSession delegate; + @SuppressWarnings("unused") private String playerName; private ChatSessionCallback sessionCallback = new ChatSessionCallback(); diff --git a/sim-eth-basic/src/main/java/example/net/chat/server/ChatHostedService.java b/sim-eth-basic/src/main/java/example/net/chat/server/ChatHostedService.java index 3021884..b57c6a2 100644 --- a/sim-eth-basic/src/main/java/example/net/chat/server/ChatHostedService.java +++ b/sim-eth-basic/src/main/java/example/net/chat/server/ChatHostedService.java @@ -36,21 +36,20 @@ package example.net.chat.server; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; import com.jme3.network.MessageConnection; -import com.jme3.network.Server; import com.jme3.network.service.AbstractHostedConnectionService; import com.jme3.network.service.HostedServiceManager; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rmi.RmiRegistry; -import com.simsilica.event.EventBus; - import example.net.chat.ChatSession; import example.net.chat.ChatSessionListener; diff --git a/sim-eth-basic/src/main/java/example/net/client/AccountClientService.java b/sim-eth-basic/src/main/java/example/net/client/AccountClientService.java index a5f101a..603a524 100644 --- a/sim-eth-basic/src/main/java/example/net/client/AccountClientService.java +++ b/sim-eth-basic/src/main/java/example/net/client/AccountClientService.java @@ -39,7 +39,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.service.AbstractClientService; import com.jme3.network.service.ClientServiceManager; @@ -64,6 +65,7 @@ public class AccountClientService extends AbstractClientService private RmiClientService rmiService; private AccountSession delegate; + @SuppressWarnings("unused") private String playerName; private AccountSessionCallback sessionCallback = new AccountSessionCallback(); diff --git a/sim-eth-basic/src/main/java/example/net/client/GameClient.java b/sim-eth-basic/src/main/java/example/net/client/GameClient.java index f6e09f0..5ed2484 100644 --- a/sim-eth-basic/src/main/java/example/net/client/GameClient.java +++ b/sim-eth-basic/src/main/java/example/net/client/GameClient.java @@ -38,14 +38,14 @@ import java.io.IOException; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.Client; import com.jme3.network.Network; import com.jme3.network.service.ClientService; -import com.jme3.network.service.rpc.RpcClientService; import com.jme3.network.service.rmi.RmiClientService; - +import com.jme3.network.service.rpc.RpcClientService; import com.simsilica.ethereal.EtherealClient; import com.simsilica.ethereal.TimeSource; diff --git a/sim-eth-basic/src/main/java/example/net/client/GameSessionClientService.java b/sim-eth-basic/src/main/java/example/net/client/GameSessionClientService.java index 59274db..ecc7e8f 100644 --- a/sim-eth-basic/src/main/java/example/net/client/GameSessionClientService.java +++ b/sim-eth-basic/src/main/java/example/net/client/GameSessionClientService.java @@ -39,7 +39,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; @@ -61,6 +62,7 @@ public class GameSessionClientService extends AbstractClientService static Logger log = LoggerFactory.getLogger(GameSessionClientService.class); private RmiClientService rmiService; + @SuppressWarnings("unused") private AccountClientService accountService; private GameSession delegate; diff --git a/sim-eth-basic/src/main/java/example/net/server/AccountEvent.java b/sim-eth-basic/src/main/java/example/net/server/AccountEvent.java index a9ff896..f29be61 100644 --- a/sim-eth-basic/src/main/java/example/net/server/AccountEvent.java +++ b/sim-eth-basic/src/main/java/example/net/server/AccountEvent.java @@ -37,9 +37,7 @@ package example.net.server; import com.google.common.base.MoreObjects; - import com.jme3.network.HostedConnection; - import com.simsilica.event.EventType; /** diff --git a/sim-eth-basic/src/main/java/example/net/server/AccountHostedService.java b/sim-eth-basic/src/main/java/example/net/server/AccountHostedService.java index 1a046ef..83f5efa 100644 --- a/sim-eth-basic/src/main/java/example/net/server/AccountHostedService.java +++ b/sim-eth-basic/src/main/java/example/net/server/AccountHostedService.java @@ -36,16 +36,14 @@ package example.net.server; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; -import com.jme3.network.MessageConnection; -import com.jme3.network.Server; import com.jme3.network.service.AbstractHostedConnectionService; import com.jme3.network.service.HostedServiceManager; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rmi.RmiRegistry; - import com.simsilica.event.EventBus; import example.net.AccountSession; diff --git a/sim-eth-basic/src/main/java/example/net/server/GameServer.java b/sim-eth-basic/src/main/java/example/net/server/GameServer.java index 3942c7d..ff34ef1 100644 --- a/sim-eth-basic/src/main/java/example/net/server/GameServer.java +++ b/sim-eth-basic/src/main/java/example/net/server/GameServer.java @@ -36,26 +36,29 @@ package example.net.server; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.StringWriter; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; import com.jme3.network.Network; import com.jme3.network.Server; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rpc.RpcHostedService; - import com.simsilica.ethereal.EtherealHost; import com.simsilica.ethereal.NetworkStateListener; import com.simsilica.ethereal.TimeSource; - import com.simsilica.sim.GameLoop; import com.simsilica.sim.GameSystemManager; import example.GameConstants; import example.net.chat.server.ChatHostedService; -import example.sim.*; +import example.sim.SimplePhysics; /** * The main GameServer that manages the back end game services, hosts @@ -71,6 +74,7 @@ public class GameServer { private GameSystemManager systems; private GameLoop loop; + @SuppressWarnings("unused") private String description; public GameServer( int port, String description ) throws IOException { diff --git a/sim-eth-basic/src/main/java/example/net/server/GameSessionHostedService.java b/sim-eth-basic/src/main/java/example/net/server/GameSessionHostedService.java index cde63fc..5a7098d 100644 --- a/sim-eth-basic/src/main/java/example/net/server/GameSessionHostedService.java +++ b/sim-eth-basic/src/main/java/example/net/server/GameSessionHostedService.java @@ -36,35 +36,29 @@ package example.net.server; -import org.slf4j.*; - import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.network.HostedConnection; -import com.jme3.network.MessageConnection; -import com.jme3.network.Server; import com.jme3.network.serializing.Serializer; import com.jme3.network.serializing.serializers.FieldSerializer; import com.jme3.network.service.AbstractHostedConnectionService; import com.jme3.network.service.HostedServiceManager; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rmi.RmiRegistry; - +import com.simsilica.ethereal.EtherealHost; import com.simsilica.event.EventBus; import com.simsilica.mathd.Vec3d; import com.simsilica.sim.GameSystemManager; -import com.simsilica.sim.SimTime; - -import com.simsilica.ethereal.EtherealHost; import example.net.GameSession; import example.net.GameSessionListener; import example.net.chat.server.ChatHostedService; -import example.sim.Body; -import example.sim.PhysicsListener; import example.sim.ShipDriver; import example.sim.SimplePhysics; @@ -206,6 +200,7 @@ public void stopHostingOnConnection( HostedConnection conn ) { } } + @SuppressWarnings("unused") private GameSessionImpl[] getPlayerArray() { // Copy the reference so we're sure we are returning // what we null-check. @@ -226,11 +221,13 @@ private GameSessionImpl[] getPlayerArray() { private class AccountObserver { + @SuppressWarnings("unused") public void onPlayerLoggedOn( AccountEvent event ) { log.debug("onPlayerLoggedOn()"); startHostingOnConnection(event.getConnection()); } + @SuppressWarnings("unused") public void onPlayerLoggedOff( AccountEvent event ) { log.debug("onPlayerLoggedOff()"); stopHostingOnConnection(event.getConnection()); diff --git a/sim-eth-basic/src/main/java/example/sim/Body.java b/sim-eth-basic/src/main/java/example/sim/Body.java index 86bb288..3f9a596 100644 --- a/sim-eth-basic/src/main/java/example/sim/Body.java +++ b/sim-eth-basic/src/main/java/example/sim/Body.java @@ -38,7 +38,9 @@ import java.util.concurrent.atomic.AtomicLong; -import com.simsilica.mathd.*; +import com.simsilica.mathd.AaBBox; +import com.simsilica.mathd.Quatd; +import com.simsilica.mathd.Vec3d; /** * A physical body in space. These are modeled as a "point mass" diff --git a/sim-eth-basic/src/main/java/example/sim/ShipDriver.java b/sim-eth-basic/src/main/java/example/sim/ShipDriver.java index 09547ab..b64635a 100644 --- a/sim-eth-basic/src/main/java/example/sim/ShipDriver.java +++ b/sim-eth-basic/src/main/java/example/sim/ShipDriver.java @@ -36,9 +36,9 @@ package example.sim; -import com.jme3.math.*; - -import com.simsilica.mathd.*; +import com.jme3.math.Quaternion; +import com.jme3.math.Vector3f; +import com.simsilica.mathd.Vec3d; /** * Uses rotation and a 3-axis thrust vector to supply diff --git a/sim-eth-basic/src/main/java/example/sim/SimplePhysics.java b/sim-eth-basic/src/main/java/example/sim/SimplePhysics.java index 3a50f11..addd26d 100644 --- a/sim-eth-basic/src/main/java/example/sim/SimplePhysics.java +++ b/sim-eth-basic/src/main/java/example/sim/SimplePhysics.java @@ -36,12 +36,13 @@ package example.sim; -import java.util.*; -import java.util.concurrent.*; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; import com.jme3.util.SafeArrayList; - -import com.simsilica.sim.*; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; /** * Just a basic physics simulation that integrates acceleration, diff --git a/sim-eth-basic/src/main/java/example/view/ModelViewState.java b/sim-eth-basic/src/main/java/example/view/ModelViewState.java index 38b49c0..d884f9c 100644 --- a/sim-eth-basic/src/main/java/example/view/ModelViewState.java +++ b/sim-eth-basic/src/main/java/example/view/ModelViewState.java @@ -36,28 +36,32 @@ package example.view; -import java.util.*; -import java.util.concurrent.*; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.asset.AssetManager; -import com.jme3.math.*; import com.jme3.material.Material; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Quaternion; +import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; -import com.jme3.scene.*; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; import com.jme3.texture.Texture; import com.jme3.util.SafeArrayList; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.style.ElementId; - import com.simsilica.ethereal.EtherealClient; import com.simsilica.ethereal.SharedObject; import com.simsilica.ethereal.SharedObjectListener; - +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.style.ElementId; import com.simsilica.mathd.trans.PositionTransition3f; import com.simsilica.mathd.trans.TransitionBuffer; @@ -244,8 +248,10 @@ protected ObjectInfo getObjectInfo( int shipId, boolean create ) { } private class PlayerInfo { + @SuppressWarnings("unused") int clientId; String playerName; + @SuppressWarnings("unused") int shipId; public PlayerInfo( int clientId, String playerName, int shipId ) { @@ -267,7 +273,9 @@ private class ObjectInfo { Label shipLabel; float labelOffset = 0.1f; + @SuppressWarnings("unused") volatile Vector3f updatePos; + @SuppressWarnings("unused") volatile Quaternion updateRot; TransitionBuffer buffer; @@ -355,6 +363,7 @@ public void addFrame( long endTime, Vector3f pos, Quaternion quat, boolean visib buffer.addTransition(trans); } + @SuppressWarnings("unused") public PositionTransition3f getFrame( long time ) { return buffer.getTransition(time); } diff --git a/sim-eth-basic/src/main/java/example/view/PlayerMovementState.java b/sim-eth-basic/src/main/java/example/view/PlayerMovementState.java index 3f7a310..b0238c5 100644 --- a/sim-eth-basic/src/main/java/example/view/PlayerMovementState.java +++ b/sim-eth-basic/src/main/java/example/view/PlayerMovementState.java @@ -36,7 +36,8 @@ package example.view; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; @@ -45,7 +46,6 @@ import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; import com.jme3.scene.Spatial; - import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.core.VersionedHolder; import com.simsilica.lemur.input.AnalogFunctionListener; @@ -53,11 +53,9 @@ import com.simsilica.lemur.input.InputMapper; import com.simsilica.lemur.input.InputState; import com.simsilica.lemur.input.StateFunctionListener; - import com.simsilica.state.DebugHudState; import example.ConnectionState; -import example.GameSessionState; import example.net.GameSession; import example.net.client.GameSessionClientService; diff --git a/sim-eth-basic/src/main/java/example/view/SpaceGridState.java b/sim-eth-basic/src/main/java/example/view/SpaceGridState.java index 71cd120..3a8cdda 100644 --- a/sim-eth-basic/src/main/java/example/view/SpaceGridState.java +++ b/sim-eth-basic/src/main/java/example/view/SpaceGridState.java @@ -36,16 +36,20 @@ package example.view; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.material.*; -import com.jme3.math.*; -import com.jme3.renderer.Camera; +import com.jme3.material.Material; +import com.jme3.material.RenderState; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; import com.jme3.renderer.queue.RenderQueue.Bucket; -import com.jme3.scene.*; - +import com.jme3.scene.Geometry; +import com.jme3.scene.Mesh; +import com.jme3.scene.VertexBuffer; import com.simsilica.lemur.GuiGlobals; import example.Main; @@ -92,6 +96,7 @@ protected void initialize( Application app ) { float yCenter = cellSize * 0.5f; float zCenter = cellSize * 0.5f; float maxDist = gridRadius * cellSize; // just short of full grid + @SuppressWarnings("unused") float maxDistSq = maxDist * maxDist; //float maxDist = gridRadius; //maxDistSq * maxDistSq; diff --git a/sim-eth-es/build.gradle b/sim-eth-es/build.gradle index ef52f24..16d03e8 100644 --- a/sim-eth-es/build.gradle +++ b/sim-eth-es/build.gradle @@ -12,7 +12,7 @@ repositories { ext.jmeVersion = "[3.3,)" -project(":assets") { +project(":sim-eth-es-assets") { apply plugin: "java" buildDir = rootProject.file("build/assets") @@ -56,10 +56,7 @@ dependencies { compile 'org.slf4j:slf4j-api:1.7.13' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.5' - runtime project(':assets') -} - -task wrapper(type: Wrapper) { + runtime project(':sim-eth-es-assets') } task runServer(type: JavaExec) { @@ -100,5 +97,5 @@ distZip { } tasks.withType(JavaCompile) { - options.compilerArgs = ["-Xlint:deprecation"] + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] } \ No newline at end of file diff --git a/sim-eth-es/settings.gradle b/sim-eth-es/settings.gradle index 9a51ffd..ae68bd2 100644 --- a/sim-eth-es/settings.gradle +++ b/sim-eth-es/settings.gradle @@ -1 +1,3 @@ -include 'assets' +rootProject.name = 'sim-eth-es' +include 'sim-eth-es-assets' +project(":sim-eth-es-assets").projectDir = file("assets") diff --git a/sim-eth-es/src/main/java/example/CommandConsoleState.java b/sim-eth-es/src/main/java/example/CommandConsoleState.java index 0073c63..3dfbbf7 100644 --- a/sim-eth-es/src/main/java/example/CommandConsoleState.java +++ b/sim-eth-es/src/main/java/example/CommandConsoleState.java @@ -36,16 +36,18 @@ package example; -import java.util.*; - import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.input.KeyInput; -import com.jme3.math.*; -import com.jme3.scene.*; -import com.jme3.util.SafeArrayList; - -import com.simsilica.lemur.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.component.TextEntryComponent; import com.simsilica.lemur.event.KeyAction; @@ -67,6 +69,7 @@ public class CommandConsoleState extends BaseAppState { public static final ElementId TEXT_ENTRY_ID = new ElementId("console.textField"); private Container entryPanel; + @SuppressWarnings("unused") private Label prompt; private TextField entry; diff --git a/sim-eth-es/src/main/java/example/ConnectionState.java b/sim-eth-es/src/main/java/example/ConnectionState.java index 4d8e71f..388237c 100644 --- a/sim-eth-es/src/main/java/example/ConnectionState.java +++ b/sim-eth-es/src/main/java/example/ConnectionState.java @@ -39,32 +39,27 @@ import java.io.IOException; import java.util.concurrent.Callable; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Strings; - import com.jme3.app.Application; import com.jme3.app.state.AppState; -import com.jme3.app.state.BaseAppState; import com.jme3.network.Client; import com.jme3.network.ClientStateListener; import com.jme3.network.ClientStateListener.DisconnectInfo; import com.jme3.network.ErrorListener; import com.jme3.network.service.ClientService; - +import com.simsilica.es.EntityData; +import com.simsilica.es.client.EntityDataClientService; +import com.simsilica.ethereal.EtherealClient; +import com.simsilica.ethereal.TimeSource; import com.simsilica.lemur.Action; import com.simsilica.lemur.Button; import com.simsilica.lemur.OptionPanel; import com.simsilica.lemur.OptionPanelState; import com.simsilica.state.CompositeAppState; -import com.simsilica.ethereal.EtherealClient; -import com.simsilica.ethereal.TimeSource; - -import com.simsilica.es.EntityData; -import com.simsilica.es.EntityId; -import com.simsilica.es.client.EntityDataClientService; - import example.net.AccountSessionListener; import example.net.client.AccountClientService; import example.net.client.GameClient; @@ -209,7 +204,7 @@ protected void showError( final String title, final String message, final Throwa } getState(OptionPanelState.class).show(title, m, new ExitAction(fatal)); } else { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { showError(title, e, fatal); return null; @@ -223,7 +218,7 @@ protected void setClient( final GameClient client ) { if( isRenderThread() ) { this.client = client; } else { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { setClient(client); return null; @@ -281,7 +276,7 @@ public void execute( Button source ) { private class ConnectionObserver implements ClientStateListener, ErrorListener { public void clientConnected( final Client c ) { log.info("clientConnected(" + c + ")"); - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onConnected(); return null; @@ -291,7 +286,7 @@ public Object call() { public void clientDisconnected( final Client c, final DisconnectInfo info ) { log.info("clientDisconnected(" + c + ", " + info + ")"); - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onDisconnected(info); return null; @@ -308,7 +303,7 @@ public void handleError( Client source, Throwable t ) { private class AccountObserver implements AccountSessionListener { public void notifyLoginStatus( final boolean loggedIn ) { - getApplication().enqueue(new Callable() { + getApplication().enqueue(new Callable<>() { public Object call() { onLoggedOn(loggedIn); return null; diff --git a/sim-eth-es/src/main/java/example/GameConstants.java b/sim-eth-es/src/main/java/example/GameConstants.java index fb54855..c905aef 100644 --- a/sim-eth-es/src/main/java/example/GameConstants.java +++ b/sim-eth-es/src/main/java/example/GameConstants.java @@ -36,12 +36,11 @@ package example; -import com.jme3.math.*; +import com.simsilica.ethereal.net.ObjectStateProtocol; +import com.simsilica.ethereal.zone.ZoneGrid; import com.simsilica.mathd.Vec3i; import com.simsilica.mathd.bits.QuatBits; import com.simsilica.mathd.bits.Vec3Bits; -import com.simsilica.ethereal.net.ObjectStateProtocol; -import com.simsilica.ethereal.zone.ZoneGrid; /** diff --git a/sim-eth-es/src/main/java/example/GameSessionEvent.java b/sim-eth-es/src/main/java/example/GameSessionEvent.java index eec830a..f73fb1c 100644 --- a/sim-eth-es/src/main/java/example/GameSessionEvent.java +++ b/sim-eth-es/src/main/java/example/GameSessionEvent.java @@ -36,7 +36,7 @@ package example; -import com.simsilica.event.*; +import com.simsilica.event.EventType; /** * Events that are sent to the event bus for different client side player-related diff --git a/sim-eth-es/src/main/java/example/GameSessionState.java b/sim-eth-es/src/main/java/example/GameSessionState.java index 1099f16..7426672 100644 --- a/sim-eth-es/src/main/java/example/GameSessionState.java +++ b/sim-eth-es/src/main/java/example/GameSessionState.java @@ -36,25 +36,23 @@ package example; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; -import com.jme3.math.*; - +import com.jme3.math.ColorRGBA; +import com.simsilica.es.EntityId; +import com.simsilica.ethereal.TimeSource; import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.input.InputMapper; import com.simsilica.state.CompositeAppState; -import com.simsilica.ethereal.TimeSource; - -import com.simsilica.es.EntityId; - import example.debug.TimeSequenceState; import example.net.GameSessionListener; -import example.net.client.GameSessionClientService; import example.net.chat.ChatSessionListener; import example.net.chat.client.ChatClientService; +import example.net.client.GameSessionClientService; import example.view.HudLabelState; import example.view.ModelViewState; import example.view.PlayerListState; @@ -78,8 +76,10 @@ public class GameSessionState extends CompositeAppState { // Temporary reference FIXME private PlayerMovementState us; + @SuppressWarnings("unused") private int clientId; + @SuppressWarnings("unused") private EntityId playerId; private EntityId shipId; diff --git a/sim-eth-es/src/main/java/example/HelpState.java b/sim-eth-es/src/main/java/example/HelpState.java index f687b15..cc45947 100644 --- a/sim-eth-es/src/main/java/example/HelpState.java +++ b/sim-eth-es/src/main/java/example/HelpState.java @@ -40,14 +40,17 @@ import java.util.List; import com.google.common.base.Joiner; - import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.input.KeyNames; import com.jme3.math.Vector3f; import com.jme3.scene.Node; - -import com.simsilica.lemur.*; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; import com.simsilica.lemur.input.FunctionId; import com.simsilica.lemur.input.InputMapper; import com.simsilica.lemur.input.InputMapper.Mapping; diff --git a/sim-eth-es/src/main/java/example/HostState.java b/sim-eth-es/src/main/java/example/HostState.java index a45b6dd..730d6aa 100644 --- a/sim-eth-es/src/main/java/example/HostState.java +++ b/sim-eth-es/src/main/java/example/HostState.java @@ -36,9 +36,10 @@ package example; -import java.io.*; +import java.io.IOException; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; @@ -46,8 +47,13 @@ import com.jme3.network.HostedConnection; import com.jme3.network.Server; import com.jme3.scene.Node; - -import com.simsilica.lemur.*; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; import com.simsilica.lemur.core.VersionedHolder; import com.simsilica.lemur.style.ElementId; import com.simsilica.state.DebugHudState; diff --git a/sim-eth-es/src/main/java/example/InGameMenuState.java b/sim-eth-es/src/main/java/example/InGameMenuState.java index 0c36f4a..1662f3a 100644 --- a/sim-eth-es/src/main/java/example/InGameMenuState.java +++ b/sim-eth-es/src/main/java/example/InGameMenuState.java @@ -36,19 +36,25 @@ package example; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.component.SpringGridLayout; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.Action; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.EmptyAction; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TabbedPanel; import com.simsilica.lemur.input.InputMapper; -import com.simsilica.lemur.style.ElementId; import example.view.PlayerMovementState; diff --git a/sim-eth-es/src/main/java/example/LoginState.java b/sim-eth-es/src/main/java/example/LoginState.java index 1761f43..6f0a9d5 100644 --- a/sim-eth-es/src/main/java/example/LoginState.java +++ b/sim-eth-es/src/main/java/example/LoginState.java @@ -38,10 +38,18 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.HAlignment; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.style.ElementId; @@ -65,7 +73,7 @@ public LoginState( String serverInfo ) { } protected void join() { - + @SuppressWarnings("unused") String name = nameField.getText().trim(); if( getState(ConnectionState.class).join(nameField.getText()) ) { getStateManager().detach(this); diff --git a/sim-eth-es/src/main/java/example/Main.java b/sim-eth-es/src/main/java/example/Main.java index 73b9ae2..c365905 100644 --- a/sim-eth-es/src/main/java/example/Main.java +++ b/sim-eth-es/src/main/java/example/Main.java @@ -36,19 +36,13 @@ package example; -import java.util.prefs.Preferences; - -import com.jme3.app.*; +import com.jme3.app.BasicProfilerState; +import com.jme3.app.DebugKeysAppState; +import com.jme3.app.SimpleApplication; +import com.jme3.app.StatsAppState; import com.jme3.app.state.ScreenshotAppState; -import com.jme3.math.ColorRGBA; -import com.jme3.material.Material; -import com.jme3.scene.Geometry; import com.jme3.scene.Node; -import com.jme3.scene.Spatial; -import com.jme3.scene.shape.Box; import com.jme3.system.AppSettings; -import com.jme3.texture.Texture; - import com.simsilica.event.EventBus; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.OptionPanelState; @@ -67,7 +61,8 @@ */ public class Main extends SimpleApplication { - private Node logo; + @SuppressWarnings("unused") + private Node logo; public static void main( String... args ) throws Exception { System.out.println("SimEthereal Example 2"); @@ -153,10 +148,12 @@ public void simpleInitApp() { } private class GameListener { + @SuppressWarnings("unused") public void sessionStarted( GameSessionEvent event ) { stateManager.getState(SiliconDioxideState.class).setEnabled(false); } + @SuppressWarnings("unused") public void sessionEnded( GameSessionEvent event ) { stateManager.getState(SiliconDioxideState.class).setEnabled(true); } diff --git a/sim-eth-es/src/main/java/example/MainMenuState.java b/sim-eth-es/src/main/java/example/MainMenuState.java index 050a603..a02860a 100644 --- a/sim-eth-es/src/main/java/example/MainMenuState.java +++ b/sim-eth-es/src/main/java/example/MainMenuState.java @@ -36,14 +36,25 @@ package example; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.Axis; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.FillMode; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.HAlignment; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.OptionPanelState; +import com.simsilica.lemur.TextField; import com.simsilica.lemur.component.SpringGridLayout; import com.simsilica.lemur.style.ElementId; diff --git a/sim-eth-es/src/main/java/example/MessageState.java b/sim-eth-es/src/main/java/example/MessageState.java index b705fa2..7b6e98b 100644 --- a/sim-eth-es/src/main/java/example/MessageState.java +++ b/sim-eth-es/src/main/java/example/MessageState.java @@ -36,16 +36,16 @@ package example; -import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentLinkedQueue; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; -import com.jme3.util.SafeArrayList; - -import com.simsilica.lemur.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.util.SafeArrayList; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.Panel; import com.simsilica.lemur.style.ElementId; /** @@ -173,6 +173,7 @@ protected void resetMessageRootLocation() { protected void refreshLayout() { int height = getApplication().getCamera().getHeight(); + @SuppressWarnings("unused") int width = getApplication().getCamera().getWidth(); float y = 0; diff --git a/sim-eth-es/src/main/java/example/SiliconDioxideState.java b/sim-eth-es/src/main/java/example/SiliconDioxideState.java index a9bd4bc..2ef180a 100644 --- a/sim-eth-es/src/main/java/example/SiliconDioxideState.java +++ b/sim-eth-es/src/main/java/example/SiliconDioxideState.java @@ -38,8 +38,9 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; -import com.jme3.scene.*; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; /** * Just a spinning silicon dioxide molecule. diff --git a/sim-eth-es/src/main/java/example/TimeState.java b/sim-eth-es/src/main/java/example/TimeState.java index eea14a6..07f8eb1 100644 --- a/sim-eth-es/src/main/java/example/TimeState.java +++ b/sim-eth-es/src/main/java/example/TimeState.java @@ -38,7 +38,6 @@ import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; - import com.simsilica.ethereal.TimeSource; diff --git a/sim-eth-es/src/main/java/example/debug/TimeSequenceState.java b/sim-eth-es/src/main/java/example/debug/TimeSequenceState.java index 5385258..c4dd5fa 100644 --- a/sim-eth-es/src/main/java/example/debug/TimeSequenceState.java +++ b/sim-eth-es/src/main/java/example/debug/TimeSequenceState.java @@ -53,7 +53,10 @@ import com.jme3.scene.VertexBuffer.Type; import com.jme3.scene.shape.Line; import com.jme3.util.BufferUtils; - +import com.simsilica.ethereal.Statistics; +import com.simsilica.ethereal.Statistics.Sequence; +import com.simsilica.ethereal.Statistics.Tracker; +import com.simsilica.ethereal.SynchedTimeSource; import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.Label; import com.simsilica.lemur.input.InputMapper; @@ -62,11 +65,6 @@ import example.MainGameFunctions; import example.TimeState; -import com.simsilica.ethereal.Statistics; -import com.simsilica.ethereal.Statistics.Sequence; -import com.simsilica.ethereal.Statistics.Tracker; -import com.simsilica.ethereal.SynchedTimeSource; - /** @@ -281,6 +279,7 @@ private class SequenceEntry { private Material mat; private Label label; + @SuppressWarnings("unused") public SequenceEntry( String name, ColorRGBA color ) { this(name, color, 12); } @@ -386,6 +385,7 @@ private class Graph { private Mesh mesh; + @SuppressWarnings("unused") public Graph( ColorRGBA color ) { this(color, 1280); } @@ -419,6 +419,7 @@ public final void setFrameCount( int size ) { } } + @SuppressWarnings("unused") public int getFrameCount() { return size; } @@ -427,10 +428,12 @@ public int getFrameCount() { * Sets the number of nanoseconds to wait before updating the * mesh. By default this is once a millisecond, ie: 1000000 nanoseconds. */ + @SuppressWarnings("unused") public void setUpdateInterval( long nanos ) { this.updateInterval = nanos; } + @SuppressWarnings("unused") public long getUpdateInterval() { return updateInterval; } @@ -439,6 +442,7 @@ public long getUpdateInterval() { * Returns the mesh that contains the bar chart of tracked frame * timings. */ + @SuppressWarnings("unused") public Mesh getMesh() { return mesh; } diff --git a/sim-eth-es/src/main/java/example/es/BodyPosition.java b/sim-eth-es/src/main/java/example/es/BodyPosition.java index e3125c1..558a3b1 100644 --- a/sim-eth-es/src/main/java/example/es/BodyPosition.java +++ b/sim-eth-es/src/main/java/example/es/BodyPosition.java @@ -54,6 +54,7 @@ * @author Paul Speed */ public final class BodyPosition implements EntityComponent { + @SuppressWarnings("unused") private transient int size; private transient TransitionBuffer position; diff --git a/sim-eth-es/src/main/java/example/es/BodyPositionCache.java b/sim-eth-es/src/main/java/example/es/BodyPositionCache.java index 70a9f4e..ef6511b 100644 --- a/sim-eth-es/src/main/java/example/es/BodyPositionCache.java +++ b/sim-eth-es/src/main/java/example/es/BodyPositionCache.java @@ -36,15 +36,16 @@ package example.es; -import com.simsilica.es.EntityId; -import com.simsilica.mathd.trans.PositionTransition3f; -import com.simsilica.mathd.trans.TransitionBuffer; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.HashMap; import java.util.Map; +import com.simsilica.es.EntityId; +import com.simsilica.mathd.trans.PositionTransition3f; +import com.simsilica.mathd.trans.TransitionBuffer; + /** * BodyPosition components hold a buffer that should be shared * across all references to the same entity. It's not your normal @@ -90,7 +91,7 @@ protected synchronized TransitionBuffer get( EntityId id, } // Clean out any dead references to keep our map from growing and growing - Reference toRemove; + Reference toRemove; while( (toRemove = refs.poll()) != null ) { map.values().remove(toRemove); } diff --git a/sim-eth-es/src/main/java/example/net/GameSession.java b/sim-eth-es/src/main/java/example/net/GameSession.java index 187a048..696334c 100644 --- a/sim-eth-es/src/main/java/example/net/GameSession.java +++ b/sim-eth-es/src/main/java/example/net/GameSession.java @@ -39,7 +39,6 @@ import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.network.service.rmi.Asynchronous; - import com.simsilica.es.EntityId; /** diff --git a/sim-eth-es/src/main/java/example/net/GameSessionListener.java b/sim-eth-es/src/main/java/example/net/GameSessionListener.java index cd2fdf5..3265305 100644 --- a/sim-eth-es/src/main/java/example/net/GameSessionListener.java +++ b/sim-eth-es/src/main/java/example/net/GameSessionListener.java @@ -36,9 +36,6 @@ package example.net; -import com.jme3.math.*; -import com.jme3.network.service.rmi.Asynchronous; - /** * The asynchronous callbacks that the game back-end uses to * send game-session information to the player. diff --git a/sim-eth-es/src/main/java/example/net/chat/client/ChatClientService.java b/sim-eth-es/src/main/java/example/net/chat/client/ChatClientService.java index e2df946..40f0d5c 100644 --- a/sim-eth-es/src/main/java/example/net/chat/client/ChatClientService.java +++ b/sim-eth-es/src/main/java/example/net/chat/client/ChatClientService.java @@ -39,7 +39,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.MessageConnection; import com.jme3.network.service.AbstractClientService; @@ -63,6 +64,7 @@ public class ChatClientService extends AbstractClientService private int channel; private ChatSession delegate; + @SuppressWarnings("unused") private String playerName; private ChatSessionCallback sessionCallback = new ChatSessionCallback(); diff --git a/sim-eth-es/src/main/java/example/net/chat/server/ChatHostedService.java b/sim-eth-es/src/main/java/example/net/chat/server/ChatHostedService.java index 3021884..b57c6a2 100644 --- a/sim-eth-es/src/main/java/example/net/chat/server/ChatHostedService.java +++ b/sim-eth-es/src/main/java/example/net/chat/server/ChatHostedService.java @@ -36,21 +36,20 @@ package example.net.chat.server; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; import com.jme3.network.MessageConnection; -import com.jme3.network.Server; import com.jme3.network.service.AbstractHostedConnectionService; import com.jme3.network.service.HostedServiceManager; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rmi.RmiRegistry; -import com.simsilica.event.EventBus; - import example.net.chat.ChatSession; import example.net.chat.ChatSessionListener; diff --git a/sim-eth-es/src/main/java/example/net/client/AccountClientService.java b/sim-eth-es/src/main/java/example/net/client/AccountClientService.java index a5f101a..603a524 100644 --- a/sim-eth-es/src/main/java/example/net/client/AccountClientService.java +++ b/sim-eth-es/src/main/java/example/net/client/AccountClientService.java @@ -39,7 +39,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.service.AbstractClientService; import com.jme3.network.service.ClientServiceManager; @@ -64,6 +65,7 @@ public class AccountClientService extends AbstractClientService private RmiClientService rmiService; private AccountSession delegate; + @SuppressWarnings("unused") private String playerName; private AccountSessionCallback sessionCallback = new AccountSessionCallback(); diff --git a/sim-eth-es/src/main/java/example/net/client/GameClient.java b/sim-eth-es/src/main/java/example/net/client/GameClient.java index abfd6af..e645308 100644 --- a/sim-eth-es/src/main/java/example/net/client/GameClient.java +++ b/sim-eth-es/src/main/java/example/net/client/GameClient.java @@ -38,21 +38,20 @@ import java.io.IOException; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.Client; import com.jme3.network.Message; import com.jme3.network.MessageListener; import com.jme3.network.Network; import com.jme3.network.service.ClientService; -import com.jme3.network.service.rpc.RpcClientService; import com.jme3.network.service.rmi.RmiClientService; - -import com.simsilica.ethereal.EtherealClient; -import com.simsilica.ethereal.TimeSource; - +import com.jme3.network.service.rpc.RpcClientService; import com.simsilica.es.EntityData; import com.simsilica.es.client.EntityDataClientService; +import com.simsilica.ethereal.EtherealClient; +import com.simsilica.ethereal.TimeSource; import example.GameConstants; import example.net.chat.client.ChatClientService; diff --git a/sim-eth-es/src/main/java/example/net/client/GameSessionClientService.java b/sim-eth-es/src/main/java/example/net/client/GameSessionClientService.java index 425c156..2011c5d 100644 --- a/sim-eth-es/src/main/java/example/net/client/GameSessionClientService.java +++ b/sim-eth-es/src/main/java/example/net/client/GameSessionClientService.java @@ -39,14 +39,14 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.network.service.AbstractClientService; import com.jme3.network.service.ClientServiceManager; import com.jme3.network.service.rmi.RmiClientService; - import com.simsilica.es.EntityId; import example.net.GameSession; @@ -63,6 +63,7 @@ public class GameSessionClientService extends AbstractClientService static Logger log = LoggerFactory.getLogger(GameSessionClientService.class); private RmiClientService rmiService; + @SuppressWarnings("unused") private AccountClientService accountService; private GameSession delegate; diff --git a/sim-eth-es/src/main/java/example/net/client/SharedObjectUpdater.java b/sim-eth-es/src/main/java/example/net/client/SharedObjectUpdater.java index 3d8905e..7075237 100644 --- a/sim-eth-es/src/main/java/example/net/client/SharedObjectUpdater.java +++ b/sim-eth-es/src/main/java/example/net/client/SharedObjectUpdater.java @@ -36,21 +36,22 @@ package example.net.client; -import java.util.*; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import com.jme3.math.Vector3f; import com.jme3.network.service.AbstractClientService; import com.jme3.network.service.ClientServiceManager; - -import com.simsilica.es.*; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.es.EntitySet; import com.simsilica.es.client.EntityDataClientService; - import com.simsilica.ethereal.EtherealClient; import com.simsilica.ethereal.SharedObject; import com.simsilica.ethereal.SharedObjectListener; -import org.slf4j.*; - import example.es.BodyPosition; diff --git a/sim-eth-es/src/main/java/example/net/server/AccountEvent.java b/sim-eth-es/src/main/java/example/net/server/AccountEvent.java index 89b146e..ce444e5 100644 --- a/sim-eth-es/src/main/java/example/net/server/AccountEvent.java +++ b/sim-eth-es/src/main/java/example/net/server/AccountEvent.java @@ -37,11 +37,8 @@ package example.net.server; import com.google.common.base.MoreObjects; - import com.jme3.network.HostedConnection; - import com.simsilica.es.EntityId; - import com.simsilica.event.EventType; /** diff --git a/sim-eth-es/src/main/java/example/net/server/AccountHostedService.java b/sim-eth-es/src/main/java/example/net/server/AccountHostedService.java index 6518e84..651590a 100644 --- a/sim-eth-es/src/main/java/example/net/server/AccountHostedService.java +++ b/sim-eth-es/src/main/java/example/net/server/AccountHostedService.java @@ -36,22 +36,19 @@ package example.net.server; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; -import com.jme3.network.MessageConnection; -import com.jme3.network.Server; import com.jme3.network.service.AbstractHostedConnectionService; import com.jme3.network.service.HostedServiceManager; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rmi.RmiRegistry; - -import com.simsilica.event.EventBus; - import com.simsilica.es.EntityData; import com.simsilica.es.EntityId; import com.simsilica.es.Name; import com.simsilica.es.server.EntityDataHostedService; +import com.simsilica.event.EventBus; import example.net.AccountSession; import example.net.AccountSessionListener; diff --git a/sim-eth-es/src/main/java/example/net/server/GameServer.java b/sim-eth-es/src/main/java/example/net/server/GameServer.java index 5a388c3..252f65d 100644 --- a/sim-eth-es/src/main/java/example/net/server/GameServer.java +++ b/sim-eth-es/src/main/java/example/net/server/GameServer.java @@ -36,37 +36,45 @@ package example.net.server; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.StringWriter; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.network.HostedConnection; import com.jme3.network.Network; -import com.jme3.network.Server; +import com.jme3.network.Server; import com.jme3.network.serializing.Serializer; import com.jme3.network.serializing.serializers.FieldSerializer; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rpc.RpcHostedService; - -// To test something - -import com.simsilica.ethereal.EtherealHost; -import com.simsilica.ethereal.NetworkStateListener; - import com.simsilica.es.EntityData; import com.simsilica.es.Name; import com.simsilica.es.base.DefaultEntityData; import com.simsilica.es.server.EntityDataHostedService; import com.simsilica.es.server.EntityUpdater; // from SiO2 -import com.simsilica.ethereal.TimeSource; +// To test something + +import com.simsilica.ethereal.EtherealHost; +import com.simsilica.ethereal.NetworkStateListener; +import com.simsilica.ethereal.TimeSource; import com.simsilica.sim.GameLoop; import com.simsilica.sim.GameSystemManager; import example.GameConstants; +import example.es.BodyPosition; +import example.es.ObjectType; +import example.es.Position; +import example.es.SphereShape; import example.net.chat.server.ChatHostedService; -import example.es.*; -import example.sim.*; +import example.sim.BasicEnvironment; +import example.sim.BodyPositionPublisher; +import example.sim.SimplePhysics; /** * The main GameServer that manages the back end game services, hosts @@ -82,6 +90,7 @@ public class GameServer { private GameSystemManager systems; private GameLoop loop; + @SuppressWarnings("unused") private String description; public GameServer( int port, String description ) throws IOException { diff --git a/sim-eth-es/src/main/java/example/net/server/GameSessionHostedService.java b/sim-eth-es/src/main/java/example/net/server/GameSessionHostedService.java index ddc7e69..de3cdd8 100644 --- a/sim-eth-es/src/main/java/example/net/server/GameSessionHostedService.java +++ b/sim-eth-es/src/main/java/example/net/server/GameSessionHostedService.java @@ -36,41 +36,34 @@ package example.net.server; -import org.slf4j.*; - import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.network.HostedConnection; -import com.jme3.network.MessageConnection; -import com.jme3.network.Server; import com.jme3.network.serializing.Serializer; import com.jme3.network.serializing.serializers.FieldSerializer; import com.jme3.network.service.AbstractHostedConnectionService; import com.jme3.network.service.HostedServiceManager; import com.jme3.network.service.rmi.RmiHostedService; import com.jme3.network.service.rmi.RmiRegistry; - -import com.simsilica.event.EventBus; -import com.simsilica.mathd.Vec3d; -import com.simsilica.sim.GameSystemManager; -import com.simsilica.sim.SimTime; - -import com.simsilica.ethereal.EtherealHost; - import com.simsilica.es.EntityData; import com.simsilica.es.EntityId; import com.simsilica.es.server.EntityDataHostedService; +import com.simsilica.ethereal.EtherealHost; +import com.simsilica.event.EventBus; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.GameSystemManager; import example.es.Position; import example.net.GameSession; import example.net.GameSessionListener; import example.net.chat.server.ChatHostedService; -import example.sim.Body; import example.sim.GameEntities; -import example.sim.PhysicsListener; import example.sim.ShipDriver; import example.sim.SimplePhysics; @@ -206,11 +199,13 @@ public void stopHostingOnConnection( HostedConnection conn ) { private class AccountObserver { + @SuppressWarnings("unused") public void onPlayerLoggedOn( AccountEvent event ) { log.debug("onPlayerLoggedOn()"); startHostingOnConnection(event.getConnection(), event.getPlayerEntity()); } + @SuppressWarnings("unused") public void onPlayerLoggedOff( AccountEvent event ) { log.debug("onPlayerLoggedOff()"); stopHostingOnConnection(event.getConnection()); @@ -282,6 +277,7 @@ public void move( Quaternion rotation, Vector3f thrust ) { shipDriver.applyMovementState(rotation, thrust); } + @SuppressWarnings("unused") protected GameSessionListener getCallback() { if( callback == null ) { RmiRegistry rmi = rmiService.getRmiRegistry(conn); diff --git a/sim-eth-es/src/main/java/example/sim/BasicEnvironment.java b/sim-eth-es/src/main/java/example/sim/BasicEnvironment.java index 544deb3..5e15707 100644 --- a/sim-eth-es/src/main/java/example/sim/BasicEnvironment.java +++ b/sim-eth-es/src/main/java/example/sim/BasicEnvironment.java @@ -36,11 +36,9 @@ package example.sim; -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; - -import example.es.*; +import com.simsilica.es.EntityData; +import com.simsilica.mathd.Vec3d; +import com.simsilica.sim.AbstractGameSystem; /** * Creates a bunch of base entities in the environment. diff --git a/sim-eth-es/src/main/java/example/sim/Body.java b/sim-eth-es/src/main/java/example/sim/Body.java index 286e468..6e4fe0a 100644 --- a/sim-eth-es/src/main/java/example/sim/Body.java +++ b/sim-eth-es/src/main/java/example/sim/Body.java @@ -36,10 +36,10 @@ package example.sim; -import java.util.concurrent.atomic.AtomicLong; - import com.simsilica.es.EntityId; -import com.simsilica.mathd.*; +import com.simsilica.mathd.AaBBox; +import com.simsilica.mathd.Quatd; +import com.simsilica.mathd.Vec3d; import example.es.Position; diff --git a/sim-eth-es/src/main/java/example/sim/BodyPositionPublisher.java b/sim-eth-es/src/main/java/example/sim/BodyPositionPublisher.java index 40fb7ea..9c209ed 100644 --- a/sim-eth-es/src/main/java/example/sim/BodyPositionPublisher.java +++ b/sim-eth-es/src/main/java/example/sim/BodyPositionPublisher.java @@ -36,9 +36,9 @@ package example.sim; -import com.simsilica.es.*; -import com.simsilica.mathd.*; -import com.simsilica.sim.*; +import com.simsilica.es.EntityData; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; import example.es.BodyPosition; diff --git a/sim-eth-es/src/main/java/example/sim/GameEntities.java b/sim-eth-es/src/main/java/example/sim/GameEntities.java index 145874f..0ca709f 100644 --- a/sim-eth-es/src/main/java/example/sim/GameEntities.java +++ b/sim-eth-es/src/main/java/example/sim/GameEntities.java @@ -36,10 +36,16 @@ package example.sim; -import com.simsilica.mathd.*; -import com.simsilica.es.*; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.es.Name; +import com.simsilica.mathd.Quatd; +import com.simsilica.mathd.Vec3d; -import example.es.*; +import example.es.MassProperties; +import example.es.ObjectTypes; +import example.es.Position; +import example.es.SphereShape; /** * Utility methods for creating the common game entities used by diff --git a/sim-eth-es/src/main/java/example/sim/ShipDriver.java b/sim-eth-es/src/main/java/example/sim/ShipDriver.java index 09547ab..b64635a 100644 --- a/sim-eth-es/src/main/java/example/sim/ShipDriver.java +++ b/sim-eth-es/src/main/java/example/sim/ShipDriver.java @@ -36,9 +36,9 @@ package example.sim; -import com.jme3.math.*; - -import com.simsilica.mathd.*; +import com.jme3.math.Quaternion; +import com.jme3.math.Vector3f; +import com.simsilica.mathd.Vec3d; /** * Uses rotation and a 3-axis thrust vector to supply diff --git a/sim-eth-es/src/main/java/example/sim/SimplePhysics.java b/sim-eth-es/src/main/java/example/sim/SimplePhysics.java index 0d9039b..234fd55 100644 --- a/sim-eth-es/src/main/java/example/sim/SimplePhysics.java +++ b/sim-eth-es/src/main/java/example/sim/SimplePhysics.java @@ -36,15 +36,21 @@ package example.sim; -import java.util.*; -import java.util.concurrent.*; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; import com.jme3.util.SafeArrayList; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.sim.AbstractGameSystem; +import com.simsilica.sim.SimTime; -import com.simsilica.es.*; -import com.simsilica.sim.*; - -import example.es.*; +import example.es.MassProperties; +import example.es.Position; +import example.es.SphereShape; /** * Just a basic physics simulation that integrates acceleration, @@ -222,8 +228,8 @@ public void update( SimTime time ) { * Maps the appropriate entities to physics bodies. */ private class BodyContainer extends EntityContainer { - - public BodyContainer( EntityData ed ) { + @SuppressWarnings("unchecked") + public BodyContainer( EntityData ed ) { super(ed, Position.class, MassProperties.class, SphereShape.class); } diff --git a/sim-eth-es/src/main/java/example/view/HudLabelState.java b/sim-eth-es/src/main/java/example/view/HudLabelState.java index a675c17..079c4f8 100644 --- a/sim-eth-es/src/main/java/example/view/HudLabelState.java +++ b/sim-eth-es/src/main/java/example/view/HudLabelState.java @@ -37,21 +37,23 @@ package example.view; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; -import com.jme3.scene.*; - -import com.simsilica.lemur.*; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.es.Name; +import com.simsilica.ethereal.TimeSource; +import com.simsilica.lemur.Label; import com.simsilica.lemur.style.ElementId; - -import com.simsilica.ethereal.TimeSource; - -import com.simsilica.es.*; - import com.simsilica.mathd.trans.PositionTransition3f; import com.simsilica.mathd.trans.TransitionBuffer; @@ -234,6 +236,7 @@ public void dispose() { } private class LabelContainer extends EntityContainer { + @SuppressWarnings("unchecked") public LabelContainer( EntityData ed ) { super(ed, Name.class, BodyPosition.class); } diff --git a/sim-eth-es/src/main/java/example/view/ModelViewState.java b/sim-eth-es/src/main/java/example/view/ModelViewState.java index 4042e7c..ffd149a 100644 --- a/sim-eth-es/src/main/java/example/view/ModelViewState.java +++ b/sim-eth-es/src/main/java/example/view/ModelViewState.java @@ -36,23 +36,29 @@ package example.view; -import java.util.*; +import java.util.HashMap; +import java.util.Map; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; import com.jme3.asset.AssetManager; -import com.jme3.math.*; import com.jme3.material.Material; -import com.jme3.scene.*; -import com.jme3.scene.shape.*; +import com.jme3.math.ColorRGBA; +import com.jme3.math.FastMath; +import com.jme3.math.Vector2f; +import com.jme3.scene.Geometry; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; +import com.jme3.scene.shape.Sphere; import com.jme3.texture.Texture; - -import com.simsilica.lemur.*; - -import com.simsilica.es.*; - +import com.simsilica.es.Entity; +import com.simsilica.es.EntityContainer; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntityId; +import com.simsilica.lemur.GuiGlobals; import com.simsilica.mathd.trans.PositionTransition3f; import com.simsilica.mathd.trans.TransitionBuffer; @@ -60,7 +66,11 @@ import example.GameSessionState; import example.Main; import example.TimeState; -import example.es.*; +import example.es.BodyPosition; +import example.es.ObjectType; +import example.es.ObjectTypes; +import example.es.Position; +import example.es.SphereShape; /** * Displays the models for the various physics objects. @@ -313,6 +323,7 @@ public void dispose() { } private class MobContainer extends EntityContainer { + @SuppressWarnings("unchecked") public MobContainer( EntityData ed ) { super(ed, ObjectType.class, BodyPosition.class); } @@ -345,6 +356,7 @@ protected void removeObject( Mob object, Entity e ) { * MobContainer takes precedence. */ private class ModelContainer extends EntityContainer { + @SuppressWarnings("unchecked") public ModelContainer( EntityData ed ) { super(ed, ObjectType.class, Position.class); } diff --git a/sim-eth-es/src/main/java/example/view/PlayerListState.java b/sim-eth-es/src/main/java/example/view/PlayerListState.java index 5e613db..8d949a7 100644 --- a/sim-eth-es/src/main/java/example/view/PlayerListState.java +++ b/sim-eth-es/src/main/java/example/view/PlayerListState.java @@ -36,22 +36,24 @@ package example.view; -import java.util.ArrayList; -import java.util.List; - import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.math.*; +import com.jme3.math.Vector3f; import com.jme3.scene.Node; - -import com.simsilica.lemur.*; -import com.simsilica.lemur.input.FunctionId; +import com.simsilica.es.Entity; +import com.simsilica.es.EntityData; +import com.simsilica.es.EntitySet; +import com.simsilica.es.Name; +import com.simsilica.lemur.ActionButton; +import com.simsilica.lemur.CallMethodAction; +import com.simsilica.lemur.Container; +import com.simsilica.lemur.GuiGlobals; +import com.simsilica.lemur.Insets3f; +import com.simsilica.lemur.Label; +import com.simsilica.lemur.ListBox; import com.simsilica.lemur.input.InputMapper; -import com.simsilica.lemur.input.InputMapper.Mapping; import com.simsilica.lemur.style.ElementId; -import com.simsilica.es.*; - import example.ConnectionState; import example.Main; import example.MainGameFunctions; diff --git a/sim-eth-es/src/main/java/example/view/PlayerMovementState.java b/sim-eth-es/src/main/java/example/view/PlayerMovementState.java index a24810e..5a9bdd7 100644 --- a/sim-eth-es/src/main/java/example/view/PlayerMovementState.java +++ b/sim-eth-es/src/main/java/example/view/PlayerMovementState.java @@ -36,7 +36,8 @@ package example.view; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; @@ -45,9 +46,7 @@ import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; import com.jme3.scene.Spatial; - import com.simsilica.es.EntityId; - import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.core.VersionedHolder; import com.simsilica.lemur.input.AnalogFunctionListener; @@ -55,11 +54,9 @@ import com.simsilica.lemur.input.InputMapper; import com.simsilica.lemur.input.InputState; import com.simsilica.lemur.input.StateFunctionListener; - import com.simsilica.state.DebugHudState; import example.ConnectionState; -import example.GameSessionState; import example.net.GameSession; import example.net.client.GameSessionClientService; diff --git a/sim-eth-es/src/main/java/example/view/SpaceGridState.java b/sim-eth-es/src/main/java/example/view/SpaceGridState.java index 71cd120..3a8cdda 100644 --- a/sim-eth-es/src/main/java/example/view/SpaceGridState.java +++ b/sim-eth-es/src/main/java/example/view/SpaceGridState.java @@ -36,16 +36,20 @@ package example.view; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import com.jme3.app.Application; import com.jme3.app.state.BaseAppState; -import com.jme3.material.*; -import com.jme3.math.*; -import com.jme3.renderer.Camera; +import com.jme3.material.Material; +import com.jme3.material.RenderState; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; import com.jme3.renderer.queue.RenderQueue.Bucket; -import com.jme3.scene.*; - +import com.jme3.scene.Geometry; +import com.jme3.scene.Mesh; +import com.jme3.scene.VertexBuffer; import com.simsilica.lemur.GuiGlobals; import example.Main; @@ -92,6 +96,7 @@ protected void initialize( Application app ) { float yCenter = cellSize * 0.5f; float zCenter = cellSize * 0.5f; float maxDist = gridRadius * cellSize; // just short of full grid + @SuppressWarnings("unused") float maxDistSq = maxDist * maxDist; //float maxDist = gridRadius; //maxDistSq * maxDistSq; diff --git a/simple-jme/build.gradle b/simple-jme/build.gradle index ab7abeb..d71e74e 100644 --- a/simple-jme/build.gradle +++ b/simple-jme/build.gradle @@ -6,12 +6,13 @@ apply plugin: 'idea' mainClassName='mygame.Main' repositories { + mavenLocal() jcenter() } ext.jmeVersion = "[3.1,)" -project(":assets") { +project(":simple-jme-assets") { apply plugin: "java" buildDir = rootProject.file("build/assets") @@ -32,39 +33,40 @@ dependencies { compile "org.jmonkeyengine:jme3-desktop:$jmeVersion" compile "org.jmonkeyengine:jme3-lwjgl:$jmeVersion" - runtime project(':assets') + runtime project(':simple-jme-assets') } -task wrapper(type: Wrapper) { -} - -task createDirs << { - - def pkg = 'mygame' - def dirs = [ - file("./src/main/java/$pkg"), - file("./src/main/resources"), - file("./assets/Interface"), - file("./assets/MatDefs"), - file("./assets/Materials"), - file("./assets/Models"), - file("./assets/Scenes"), - file("./assets/Shaders"), - file("./assets/Sounds"), - file("./assets/Textures"), - ] - - dirs.each { - if( !it.exists() ) { - println "Creating " + it - it.mkdirs() - } - if( it.listFiles().length == 0 ) { - def stub = new File(it, 'removeme.txt') - println "Creating stub file to allow git checkin, file:$stub" - stub.text = "Remove me when there are files here." +task createDirs { + doLast { + def pkg = 'mygame' + def dirs = [ + file("./src/main/java/$pkg"), + file("./src/main/resources"), + file("./assets/Interface"), + file("./assets/MatDefs"), + file("./assets/Materials"), + file("./assets/Models"), + file("./assets/Scenes"), + file("./assets/Shaders"), + file("./assets/Sounds"), + file("./assets/Textures"), + ] + + dirs.each { + if( !it.exists() ) { + println "Creating " + it + it.mkdirs() + } + if( it.listFiles().length == 0 ) { + def stub = new File(it, 'removeme.txt') + println "Creating stub file to allow git checkin, file:$stub" + stub.text = "Remove me when there are files here." + } + } } - } } +tasks.withType(JavaCompile) { + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] +} diff --git a/simple-jme/settings.gradle b/simple-jme/settings.gradle index 9a51ffd..d7197d1 100644 --- a/simple-jme/settings.gradle +++ b/simple-jme/settings.gradle @@ -1 +1,3 @@ -include 'assets' +rootProject.name = 'simple-jme' +include 'simple-jme-assets' +project(":simple-jme-assets").projectDir = file("assets") \ No newline at end of file diff --git a/simple-jme/src/main/java/mygame/Main.java b/simple-jme/src/main/java/mygame/Main.java index ecf5942..3b16914 100644 --- a/simple-jme/src/main/java/mygame/Main.java +++ b/simple-jme/src/main/java/mygame/Main.java @@ -37,8 +37,8 @@ package mygame; import com.jme3.app.SimpleApplication; -import com.jme3.math.ColorRGBA; import com.jme3.material.Material; +import com.jme3.math.ColorRGBA; import com.jme3.scene.Geometry; import com.jme3.scene.shape.Box; import com.jme3.texture.Texture; diff --git a/zay-es-net-basic/build.gradle b/zay-es-net-basic/build.gradle index 0590b0b..d8a7674 100644 --- a/zay-es-net-basic/build.gradle +++ b/zay-es-net-basic/build.gradle @@ -1,14 +1,21 @@ - apply plugin: 'java' +apply plugin: 'application' +apply plugin: 'eclipse' +apply plugin: 'idea' + +mainClassName='example.GameClient' repositories { + mavenLocal() jcenter() } +ext.jmeVersion = "[3.1,)" + dependencies { // Just for the jme.math - compile 'org.jmonkeyengine:jme3-core:[3.1,)' + compile 'org.jmonkeyengine:jme3-core:$jmeVersion' compile 'com.simsilica:zay-es:[1.2,)' compile 'com.simsilica:zay-es-net:[1.2,)' @@ -34,5 +41,7 @@ task runClient(type: JavaExec) { jvmArgs '-Dlog4j.configurationFile=client-log4j2.xml' } -task wrapper(type: Wrapper) { -} + +tasks.withType(JavaCompile) { + options.compilerArgs = ["-Xlint:deprecation", "-Xlint:unchecked"] +} \ No newline at end of file diff --git a/zay-es-net-basic/gradle/wrapper/gradle-wrapper.jar b/zay-es-net-basic/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372aef5e24af05341d49695ee84e5f9b594659..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53636 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ⅅ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 H-+%o-(+5aQ diff --git a/zay-es-net-basic/gradle/wrapper/gradle-wrapper.properties b/zay-es-net-basic/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 0a95ec1..0000000 --- a/zay-es-net-basic/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Mar 01 12:35:48 EST 2016 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip diff --git a/zay-es-net-basic/gradlew b/zay-es-net-basic/gradlew deleted file mode 100644 index 9d82f78..0000000 --- a/zay-es-net-basic/gradlew +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/zay-es-net-basic/gradlew.bat b/zay-es-net-basic/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/zay-es-net-basic/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/zay-es-net-basic/src/main/java/example/GameClient.java b/zay-es-net-basic/src/main/java/example/GameClient.java index f49cc28..5332a31 100644 --- a/zay-es-net-basic/src/main/java/example/GameClient.java +++ b/zay-es-net-basic/src/main/java/example/GameClient.java @@ -42,7 +42,6 @@ import com.jme3.network.ClientStateListener; import com.jme3.network.MessageConnection; import com.jme3.network.Network; - import com.simsilica.es.Entity; import com.simsilica.es.EntityData; import com.simsilica.es.EntitySet; diff --git a/zay-es-net-basic/src/main/java/example/GameServer.java b/zay-es-net-basic/src/main/java/example/GameServer.java index 3da9f8c..c31548f 100644 --- a/zay-es-net-basic/src/main/java/example/GameServer.java +++ b/zay-es-net-basic/src/main/java/example/GameServer.java @@ -42,8 +42,6 @@ import com.jme3.network.Server; import com.jme3.network.serializing.Serializer; import com.jme3.network.serializing.serializers.FieldSerializer; - -import com.simsilica.es.EntityData; import com.simsilica.es.Name; import com.simsilica.es.base.DefaultEntityData; import com.simsilica.es.server.EntityDataHostedService; diff --git a/zay-es-net-basic/src/main/java/example/LogUtil.java b/zay-es-net-basic/src/main/java/example/LogUtil.java index f993410..850774d 100644 --- a/zay-es-net-basic/src/main/java/example/LogUtil.java +++ b/zay-es-net-basic/src/main/java/example/LogUtil.java @@ -38,7 +38,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import java.util.logging.LogManager; + import org.slf4j.bridge.SLF4JBridgeHandler; /** diff --git a/zay-es-net-basic/src/main/java/example/SimpleGameLogic.java b/zay-es-net-basic/src/main/java/example/SimpleGameLogic.java index 851c7c7..31fb709 100644 --- a/zay-es-net-basic/src/main/java/example/SimpleGameLogic.java +++ b/zay-es-net-basic/src/main/java/example/SimpleGameLogic.java @@ -39,7 +39,6 @@ import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; - import com.simsilica.es.Entity; import com.simsilica.es.EntityData; import com.simsilica.es.EntityId; From a114a583fe6fc1c5270e88e8bc6e14f81b4055fb Mon Sep 17 00:00:00 2001 From: "J.C. Hamlin" Date: Fri, 7 Aug 2020 20:34:36 -0500 Subject: [PATCH 2/2] Make projects runnable within Eclipse, which requires eclipse .project and .classpath files be created for the assets subprojects --- .gitignore | 7 +++++++ base-sio2/build.gradle | 4 +++- network-basic/build.gradle | 4 +++- sigem/build.gradle | 4 +++- sim-eth-basic/build.gradle | 4 +++- sim-eth-es/build.gradle | 4 +++- simple-jme/build.gradle | 4 +++- zay-es-net-basic/settings.gradle | 1 + 8 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 zay-es-net-basic/settings.gradle diff --git a/.gitignore b/.gitignore index 3a96c48..7396032 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,13 @@ /*/.gradle/ /*/build/ +# JME Downloaded Stuff +/*/*.dll + +# Ignore Log files +/*/*.log +/*/logs + # Ignore Eclipse stuff .project .classpath diff --git a/base-sio2/build.gradle b/base-sio2/build.gradle index 968168d..1d3c72c 100644 --- a/base-sio2/build.gradle +++ b/base-sio2/build.gradle @@ -13,7 +13,9 @@ repositories { ext.jmeVersion = "[3.2,)" project(":base-sio2-assets") { - apply plugin: "java" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") diff --git a/network-basic/build.gradle b/network-basic/build.gradle index 1f6c2f3..db7cd4e 100644 --- a/network-basic/build.gradle +++ b/network-basic/build.gradle @@ -13,7 +13,9 @@ repositories { ext.jmeVersion = "[3.3,)" project(":network-basic-assets") { - apply plugin: "java" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") diff --git a/sigem/build.gradle b/sigem/build.gradle index 432e61f..c26d88c 100644 --- a/sigem/build.gradle +++ b/sigem/build.gradle @@ -12,7 +12,9 @@ repositories { ext.jmeVersion = "3.3.0-stable" project(":sigem-assets") { - apply plugin: "java" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") diff --git a/sim-eth-basic/build.gradle b/sim-eth-basic/build.gradle index b001c5f..8d45e41 100644 --- a/sim-eth-basic/build.gradle +++ b/sim-eth-basic/build.gradle @@ -13,7 +13,9 @@ repositories { ext.jmeVersion = "[3.3,)" project(":sim-eth-basic-assets") { - apply plugin: "java" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") diff --git a/sim-eth-es/build.gradle b/sim-eth-es/build.gradle index 16d03e8..6f34d84 100644 --- a/sim-eth-es/build.gradle +++ b/sim-eth-es/build.gradle @@ -13,7 +13,9 @@ repositories { ext.jmeVersion = "[3.3,)" project(":sim-eth-es-assets") { - apply plugin: "java" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") diff --git a/simple-jme/build.gradle b/simple-jme/build.gradle index d71e74e..17a39a6 100644 --- a/simple-jme/build.gradle +++ b/simple-jme/build.gradle @@ -13,7 +13,9 @@ repositories { ext.jmeVersion = "[3.1,)" project(":simple-jme-assets") { - apply plugin: "java" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") diff --git a/zay-es-net-basic/settings.gradle b/zay-es-net-basic/settings.gradle new file mode 100644 index 0000000..56a05e5 --- /dev/null +++ b/zay-es-net-basic/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'zay-es-net-basic' \ No newline at end of file