Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Cleaned up to work with Java 14, Gradle 6.5.1, and Eclipse 2020-06-R #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/
24 changes: 9 additions & 15 deletions base-sio2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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"]
}
4 changes: 3 additions & 1 deletion base-sio2/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include 'assets'
rootProject.name = 'base-sio2'
include ':base-sio2-assets'
project(":base-sio2-assets").projectDir = file("assets")
9 changes: 5 additions & 4 deletions base-sio2/src/main/java/rename/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions base-sio2/src/main/java/rename/SiliconDioxideState.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
23 changes: 23 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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')
}
15 changes: 7 additions & 8 deletions network-basic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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"]
}
4 changes: 3 additions & 1 deletion network-basic/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include 'assets'
rootProject.name = 'network-basic'
include 'network-basic-assets'
project(":network-basic-assets").projectDir = file("assets")
13 changes: 6 additions & 7 deletions network-basic/src/main/java/example/ConnectionState.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -243,7 +242,7 @@ public void execute( Button source ) {
private class ConnectionObserver implements ClientStateListener, ErrorListener<Client> {
public void clientConnected( final Client c ) {
log.info("clientConnected(" + c + ")");
getApplication().enqueue(new Callable() {
getApplication().enqueue(new Callable<>() {
public Object call() {
onConnected();
return null;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion network-basic/src/main/java/example/GameSessionEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion network-basic/src/main/java/example/GameSessionState.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 9 additions & 4 deletions network-basic/src/main/java/example/HostState.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,23 @@

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;
import com.jme3.network.ConnectionListener;
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;
Expand Down
22 changes: 14 additions & 8 deletions network-basic/src/main/java/example/InGameMenuState.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand Down
15 changes: 10 additions & 5 deletions network-basic/src/main/java/example/LoginState.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down
15 changes: 7 additions & 8 deletions network-basic/src/main/java/example/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -62,6 +58,7 @@
*/
public class Main extends SimpleApplication {

@SuppressWarnings("unused")
private Node logo;

public static void main( String... args ) {
Expand Down Expand Up @@ -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);
}
Expand Down
18 changes: 13 additions & 5 deletions network-basic/src/main/java/example/MainMenuState.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading