diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7396032 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# Ignore Gradle stuff +/.gradle/ +/bulid/ +/*/.gradle/ +/*/build/ + +# JME Downloaded Stuff +/*/*.dll + +# Ignore Log files +/*/*.log +/*/logs + +# 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..1d3c72c 100644 --- a/base-sio2/build.gradle +++ b/base-sio2/build.gradle @@ -7,19 +7,15 @@ 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") { - apply plugin: "java" +project(":base-sio2-assets") { + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") @@ -51,12 +47,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..db7cd4e 100644 --- a/network-basic/build.gradle +++ b/network-basic/build.gradle @@ -12,8 +12,10 @@ repositories { ext.jmeVersion = "[3.3,)" -project(":assets") { - apply plugin: "java" +project(":network-basic-assets") { + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") @@ -53,12 +55,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..c26d88c 100644 --- a/sigem/build.gradle +++ b/sigem/build.gradle @@ -7,20 +7,14 @@ 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") { - apply plugin: "java" +ext.jmeVersion = "3.3.0-stable" +project(":sigem-assets") { + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") @@ -54,9 +48,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..8d45e41 100644 --- a/sim-eth-basic/build.gradle +++ b/sim-eth-basic/build.gradle @@ -12,8 +12,10 @@ repositories { ext.jmeVersion = "[3.3,)" -project(":assets") { - apply plugin: "java" +project(":sim-eth-basic-assets") { + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") @@ -53,10 +55,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 +96,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..6f34d84 100644 --- a/sim-eth-es/build.gradle +++ b/sim-eth-es/build.gradle @@ -12,8 +12,10 @@ repositories { ext.jmeVersion = "[3.3,)" -project(":assets") { - apply plugin: "java" +project(":sim-eth-es-assets") { + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") @@ -56,10 +58,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 +99,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..17a39a6 100644 --- a/simple-jme/build.gradle +++ b/simple-jme/build.gradle @@ -6,13 +6,16 @@ apply plugin: 'idea' mainClassName='mygame.Main' repositories { + mavenLocal() jcenter() } ext.jmeVersion = "[3.1,)" -project(":assets") { - apply plugin: "java" +project(":simple-jme-assets") { + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' buildDir = rootProject.file("build/assets") @@ -32,39 +35,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 13372ae..0000000 Binary files a/zay-es-net-basic/gradle/wrapper/gradle-wrapper.jar and /dev/null differ 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/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 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;