Another painful merge
Merge branch 'netclient' into 021214renderer Conflicts: data dependency-reduced-pom.xml mosstest.iml pom.xml src/net/mosstest/scripting/MossScriptEnv.java src/net/mosstest/servercore/AbstractMossScript.javamaster
rarkenin
commit
fd83ba422e
|
|
@ -1,6 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
language: java
|
||||
=======
|
||||
language: java
|
||||
jdk:
|
||||
- oraclejdk8
|
||||
|
|
@ -13,4 +10,3 @@ notifications:
|
|||
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
|
||||
- "Change view : %{compare_url}"
|
||||
- "Build details : %{build_url}"
|
||||
>>>>>>> origin
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<etag-cache/>
|
||||
24
README.md
24
README.md
|
|
@ -7,4 +7,26 @@ Pull requesters:
|
|||
Don't touch the thread pool or the scripting interface.
|
||||
Electrocution, drowning, or security bots attacking you may occur.
|
||||
|
||||
pom.xml refers to non-maven jars in a custom jMonkey reporitory. Please hold as our server will have that repository available for download soon.
|
||||
pom.xml refers to non-maven jars in a custom jMonkey repository. `pom.xml` refers to that repository, although it may go down when the forum or wiki goes down for updates or maintenance.
|
||||
|
||||
## Licensing and legalities
|
||||
|
||||
The entire project is licensed under the GNU GPLv3 or higher.
|
||||
|
||||
The burden of ensuring license compatibility for scripts is delegated to the script author. Server operators and players are not responsible
|
||||
for non-compliant scripts. As obfuscated, "JSfuck"ed, minified, or otherwise non-original script files are not "the preferred way of making modifications"
|
||||
they may not be used as scripts without permission from the authors. As a courtesy, please comment scripts, although comments are not required.
|
||||
|
||||
## Privacy laws
|
||||
|
||||
The authors of a script, or the Mosstest developers will not be responsible for violations of privacy laws in any jurisdictions. The burden of ensuring privacy laws are followed is delegated to server owners (as a courtesy, script authors should explicitly state what data is collected by their scripts)
|
||||
|
||||
The Mosstest engine itself receives, and may *collect in any format, including the database or logfiles*, player usernames, IP addresses, and passwords.
|
||||
|
||||
In addition, operating system and network details may be collected as an artifact of network communication, for example where OS-specific or network-equipment-specific "quirks" of how network connections are created and negotiated, or details such as text encodings or line ending characters are recorded in these logs. By running this software, the user acknowledges the recording and potential use of these details, by any game server.
|
||||
|
||||
## Security
|
||||
|
||||
While Mosstest strives to be secure, the script sandbox on a client will execute code given by a server. In case of a security breach, a rogue server can compromise a client. Please play on untrusted servers at your own risk.
|
||||
|
||||
If you believe a security bug exists, please report it at [Launchpad](https://bugs.launchpad.net/mosstest/+filebug). Before submitting, please mark it as private security. Developers will make it public as soon as reasonably possible.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
/usr/lib/jvm/java-8-oracle/bin/java -classpath /usr/share/maven/boot/plexus-classworlds-2.x.jar -Dclassworlds.conf=/usr/share/maven/bin/m2.conf -Dmaven.home=/usr/share/maven org.codehaus.plexus.classworlds.launcher.Launcher clean compile
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 231 B |
2
data
2
data
|
|
@ -1 +1 @@
|
|||
Subproject commit 48c6a624dfe77e45939c48ff49e1bf8463baf821
|
||||
Subproject commit 44ac2996cb2d330d2e3160ffc86cc2440d781c06
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Information about mosstest
|
||||
--------------------------
|
||||
|
||||
This package was debianized using the mh_make command
|
||||
from the maven-debian-helper package.
|
||||
|
||||
The build system uses Maven but prevents it from downloading
|
||||
anything from the Internet, making the build compliant with
|
||||
the Debian policy.
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
mosstest (0.1.0-SNAPSHOT-1) UNRELEASED; urgency=medium
|
||||
|
||||
* Initial release (Closes: #nnnn) <nnnn is the bug number of your
|
||||
ITP>
|
||||
|
||||
-- hexafraction <hexafraction@gmail.com> Thu, 08 May 2014 20:51:08 -0400
|
||||
|
|
@ -0,0 +1 @@
|
|||
9
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
Source: mosstest
|
||||
Section: java
|
||||
Priority: optional
|
||||
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
|
||||
Uploaders: hexafraction <hexafraction@gmail.com>
|
||||
Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5)
|
||||
Build-Depends-Indep: libmaven-shade-plugin-java, libcommons-cli-java, libcommons-codec-java,
|
||||
libcommons-collections3-java, libcommons-configuration-java, libcommons-io-java,
|
||||
libcommons-lang-java, libcommons-lang3-java, libcommons-math-java, libguava-java,
|
||||
liblog4j1.2-java (>= 1.2.17), librhino-java
|
||||
Standards-Version: 3.9.5
|
||||
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/mosstest
|
||||
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/mosstest
|
||||
Homepage: https://github.com/mosstest/mosstest
|
||||
|
||||
Package: mosstest-game
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}, ${maven:Depends}
|
||||
Recommends: ${maven:OptionalDepends}
|
||||
Description: Mosstest
|
||||
Open-source voxel engine with some extra features
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: Mosstest
|
||||
Source: https://github.com/mosstest/mosstest
|
||||
|
||||
Files: *
|
||||
Copyright: 2014, hexafraction
|
||||
License: GPL-3 or LGPL-2.1
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2014, hexafraction <hexafraction@gmail.com>
|
||||
License: GPL-3+
|
||||
|
||||
License: GPL-3
|
||||
On Debian systems, the full text of the GPL-3 license
|
||||
can be found in the file '/usr/share/common-licenses/GPL-3'
|
||||
|
||||
License: GPL-3+
|
||||
TODO: include the full text of the license here
|
||||
|
||||
License: LGPL-2.1
|
||||
On Debian systems, the full text of the LGPL-2.1 license
|
||||
can be found in the file '/usr/share/common-licenses/LGPL-2.1'
|
||||
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
|
||||
com.intellij annotations * * * *
|
||||
jme3 jme3-core * * * *
|
||||
jme3 jme3-desktop * * * *
|
||||
jme3 jme3-lwjgl-natives * * * *
|
||||
jme3 jme3-lwjgl-niftygui * * * *
|
||||
jme3 jme3-lwjgl * * * *
|
||||
jme3 lwjgl-workaround * * * *
|
||||
jme3 niftygui * * * *
|
||||
junit junit * * * *
|
||||
net.java.jinput jinput * * * *
|
||||
org.fusesource.leveldbjni leveldbjni-all * * * *
|
||||
org.lwjgl.lwjgl parent * * * *
|
||||
pl.project13.maven git-commit-id-plugin * * * *
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# Include here properties to pass to Maven during the build.
|
||||
# For example:
|
||||
# maven.test.skip=true
|
||||
|
||||
maven.test.skip=true
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
mosstest mosstest jar * * *
|
||||
mosstest mosstest jar s/.*/debian/ * *
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
|
||||
com.google.guava guava bundle s/.*/debian/ * *
|
||||
com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
|
||||
commons-collections commons-collections jar s/3\..*/3.x/ * *
|
||||
mosstest mosstest jar * * *
|
||||
mosstest mosstest jar s/.*/debian/ * *
|
||||
org.apache.commons commons-lang3 jar s/3\..*/3.x/ * *
|
||||
log4j log4j * s/1\.2\..*/1.2.x/ * *
|
||||
s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
|
||||
s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
# List of POM files for the package
|
||||
# Format of this file is:
|
||||
# <path to pom file> [option]*
|
||||
# where option can be:
|
||||
# --ignore: ignore this POM and its artifact if any
|
||||
# --ignore-pom: don't install the POM. To use on POM files that are created
|
||||
# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
|
||||
# --no-parent: remove the <parent> tag from the POM
|
||||
# --package=<package>: an alternative package to use when installing this POM
|
||||
# and its artifact
|
||||
# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
|
||||
# of the version for the package.
|
||||
# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
|
||||
# during a clean operation with mh_cleanpom or mh_installpom
|
||||
# --artifact=<path>: path to the build artifact associated with this POM,
|
||||
# it will be installed when using the command mh_install. [mh_install]
|
||||
# --java-lib: install the jar into /usr/share/java to comply with Debian
|
||||
# packaging guidelines
|
||||
# --usj-name=<name>: name to use when installing the library in /usr/share/java
|
||||
# --usj-version=<version>: version to use when installing the library in /usr/share/java
|
||||
# --no-usj-versionless: don't install the versionless link in /usr/share/java
|
||||
# --dest-jar=<path>: the destination for the real jar.
|
||||
# It will be installed with mh_install. [mh_install]
|
||||
# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
|
||||
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
|
||||
# Empty by default. [mh_install]
|
||||
#
|
||||
pom.xml --has-package-version
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
# List of POM files for the package
|
||||
# Format of this file is:
|
||||
# <path to pom file> [option]*
|
||||
# where option can be:
|
||||
# --ignore: ignore this POM and its artifact if any
|
||||
# --ignore-pom: don't install the POM. To use on POM files that are created
|
||||
# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
|
||||
# --no-parent: remove the <parent> tag from the POM
|
||||
# --package=<package>: an alternative package to use when installing this POM
|
||||
# and its artifact
|
||||
# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
|
||||
# of the version for the package.
|
||||
# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
|
||||
# during a clean operation with mh_cleanpom or mh_installpom
|
||||
# --artifact=<path>: path to the build artifact associated with this POM,
|
||||
# it will be installed when using the command mh_install. [mh_install]
|
||||
# --java-lib: install the jar into /usr/share/java to comply with Debian
|
||||
# packaging guidelines
|
||||
# --usj-name=<name>: name to use when installing the library in /usr/share/java
|
||||
# --usj-version=<version>: version to use when installing the library in /usr/share/java
|
||||
# --no-usj-versionless: don't install the versionless link in /usr/share/java
|
||||
# --dest-jar=<path>: the destination for the real jar.
|
||||
# It will be installed with mh_install. [mh_install]
|
||||
# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
|
||||
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
|
||||
# Empty by default. [mh_install]
|
||||
#
|
||||
pom.xml --has-package-version
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
# List of POM files for the package
|
||||
# Format of this file is:
|
||||
# <path to pom file> [option]*
|
||||
# where option can be:
|
||||
# --ignore: ignore this POM and its artifact if any
|
||||
# --ignore-pom: don't install the POM. To use on POM files that are created
|
||||
# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
|
||||
# --no-parent: remove the <parent> tag from the POM
|
||||
# --package=<package>: an alternative package to use when installing this POM
|
||||
# and its artifact
|
||||
# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
|
||||
# of the version for the package.
|
||||
# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
|
||||
# during a clean operation with mh_cleanpom or mh_installpom
|
||||
# --artifact=<path>: path to the build artifact associated with this POM,
|
||||
# it will be installed when using the command mh_install. [mh_install]
|
||||
# --java-lib: install the jar into /usr/share/java to comply with Debian
|
||||
# packaging guidelines
|
||||
# --usj-name=<name>: name to use when installing the library in /usr/share/java
|
||||
# --usj-version=<version>: version to use when installing the library in /usr/share/java
|
||||
# --no-usj-versionless: don't install the versionless link in /usr/share/java
|
||||
# --dest-jar=<path>: the destination for the real jar.
|
||||
# It will be installed with mh_install. [mh_install]
|
||||
# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
|
||||
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
|
||||
# Empty by default. [mh_install]
|
||||
#
|
||||
pom.xml --has-package-version
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
include /usr/share/cdbs/1/rules/debhelper.mk
|
||||
include /usr/share/cdbs/1/class/maven.mk
|
||||
|
||||
JAVA_HOME := /usr/lib/jvm/default-java
|
||||
|
||||
get-orig-source:
|
||||
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
include /usr/share/cdbs/1/rules/debhelper.mk
|
||||
include /usr/share/cdbs/1/class/ant.mk
|
||||
|
||||
PACKAGE := $(DEB_SOURCE_PACKAGE)
|
||||
VERSION := $(DEB_UPSTREAM_VERSION)
|
||||
JAVA_HOME := /usr/lib/jvm/default-java
|
||||
DEB_JARS := # TODO - fill the list of jars
|
||||
DEB_ANT_BUILD_TARGET := package
|
||||
DEB_ANT_BUILDFILE := debian/build.xml
|
||||
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION)
|
||||
|
||||
binary-post-install/$(PACKAGE)::
|
||||
mh_installpoms -p$(PACKAGE)
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l # ./build/.-$(VERSION).jar
|
||||
mh_installjar -p$(PACKAGE) -l pom.xml build/$(PACKAGE)-$(VERSION).jar
|
||||
|
||||
clean::
|
||||
-rm -rf debian/tmp
|
||||
|
|
@ -0,0 +1 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -5,7 +5,11 @@
|
|||
<artifactId>mosstest</artifactId>
|
||||
<name>Mosstest</name>
|
||||
<version>0.1.0-SNAPSHOT</version>
|
||||
<<<<<<< HEAD
|
||||
<description>Open-source InfiniMiner remake</description>
|
||||
=======
|
||||
<description>Open-source voxel engine with some extra features</description>
|
||||
>>>>>>> netclient
|
||||
<url>https://github.com/mosstest/mosstest</url>
|
||||
<issueManagement>
|
||||
<system>Launchpad</system>
|
||||
|
|
@ -27,6 +31,26 @@
|
|||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>deb-maven-plugin</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<description>An open-source voxel game created in Java</description>
|
||||
<maintainer>hexafraction <hexafraction@gmail.com></maintainer>
|
||||
<section>games</section>
|
||||
<priority>optional</priority>
|
||||
<architecture>all</architecture>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
>>>>>>> netclient
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<configuration>
|
||||
|
|
@ -125,6 +149,16 @@
|
|||
<url>http://forum-mosstest.rhcloud.com/repository/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>codehaus-mojo-staging</id>
|
||||
<name>codehaus-mojo-staging</name>
|
||||
<url>https://nexus.codehaus.org/content/groups/snapshots-group/</url>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
>>>>>>> netclient
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.lwjgl.lwjgl</groupId>
|
||||
|
|
|
|||
100
mosstest.iml
100
mosstest.iml
|
|
@ -1,49 +1,51 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.java.jinput:jinput:2.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.java.jutils:jutils:1.0.0" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.jinput:jinput-platform:natives-linux:2.0.5" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.jinput:jinput-platform:natives-windows:2.0.5" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.jinput:jinput-platform:natives-osx:2.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-desktop:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl-natives:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl-niftygui:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:niftygui:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.9" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: rhino:js:1.7R2" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-core:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni:1.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.hawtjni:hawtjni-runtime:1.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.iq80.leveldb:leveldb-api:0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-osx:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-linux32:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-linux64:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-win32:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-win64:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:lwjgl-workaround:9.5.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.intellij:annotations:9.0.4" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl-niftygui: 3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.java.jinput:jinput:2.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.java.jutils:jutils:1.0.0" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.jinput:jinput-platform:natives-linux:2.0.5" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.jinput:jinput-platform:natives-windows:2.0.5" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: net.java.jinput:jinput-platform:natives-osx:2.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-desktop:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl-natives:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-lwjgl-niftygui:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:niftygui:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.9" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: rhino:js:1.7R2" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:jme3-core:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni:1.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.hawtjni:hawtjni-runtime:1.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.iq80.leveldb:leveldb-api:0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-osx:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-linux32:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-linux64:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-win32:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-win64:1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: jme3:lwjgl-workaround:9.5.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.intellij:annotations:9.0.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
|
|
|||
717
pom.xml
717
pom.xml
|
|
@ -1,341 +1,376 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>mosstest</groupId>
|
||||
<artifactId>mosstest</artifactId>
|
||||
<version>0.1.0-SNAPSHOT</version>
|
||||
<name>Mosstest</name>
|
||||
<description>Open-source voxel engine with some extra features</description>
|
||||
<repositories>
|
||||
<repository>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<id>central</id>
|
||||
<name>Central Repository</name>
|
||||
<url>http://repo.maven.apache.org/maven2</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>moss-forums</id>
|
||||
<url>http://forum-mosstest.rhcloud.com/repository/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<build>
|
||||
<testSourceDirectory>tests</testSourceDirectory>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>pl.project13.maven</groupId>
|
||||
<artifactId>git-commit-id-plugin</artifactId>
|
||||
<version>2.1.7</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>revision</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
|
||||
<configuration>
|
||||
<prefix>git</prefix>
|
||||
<dateFormat>yyyy.MM.dd '@' HH:mm:ss z</dateFormat>
|
||||
<verbose>true</verbose>
|
||||
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
|
||||
|
||||
<skipPoms>true</skipPoms>
|
||||
<generateGitPropertiesFile>true</generateGitPropertiesFile>
|
||||
<generateGitPropertiesFilename>src/git.properties</generateGitPropertiesFilename>
|
||||
<failOnNoGitDirectory>false</failOnNoGitDirectory>
|
||||
<gitDescribe>
|
||||
<skip>false</skip>
|
||||
<always>false</always>
|
||||
<abbrev>7</abbrev>
|
||||
<dirty>-dirty</dirty>
|
||||
<forceLongFormat>false</forceLongFormat>
|
||||
</gitDescribe>
|
||||
</configuration>
|
||||
|
||||
</plugin>
|
||||
<!-- END OF GIT COMMIT ID PLUGIN CONFIGURATION -->
|
||||
<!-- <plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>clientbuild</id>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>buildcfg/assembly-client.xml</descriptor>
|
||||
</descriptors>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>net.mosstest.launcher.GUIClientsideLauncher</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>serverbuild</id>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>buildcfg/assembly-server.xml</descriptor>
|
||||
</descriptors>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>net.mosstest.launcher.ServerMain</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.1</version>
|
||||
|
||||
<executions>
|
||||
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactSet>
|
||||
<!-- signed jars -->
|
||||
<excludes>
|
||||
<exclude>bouncycastle:bcprov-jdk15</exclude>
|
||||
</excludes>
|
||||
</artifactSet>
|
||||
|
||||
<filters>
|
||||
<filter>
|
||||
<artifact>*:*</artifact>
|
||||
<excludes>
|
||||
<exclude>META-INF/*.SF</exclude>
|
||||
<exclude>META-INF/*.DSA</exclude>
|
||||
<exclude>META-INF/*.RSA</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
|
||||
<transformers>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||
<!-- Main class -->
|
||||
<mainClass>net.mosstest.servercore.MossWorld</mainClass>
|
||||
</transformer>
|
||||
<!-- Use resource transformers to prevent file overwrites -->
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<resource>properties.properties</resource>
|
||||
</transformer>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
|
||||
<resource>applicationContext.xml</resource>
|
||||
</transformer>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<resource>META-INF/cxf/cxf.extension</resource>
|
||||
</transformer>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
|
||||
<resource>META-INF/cxf/bus-extensions.xml</resource>
|
||||
</transformer>
|
||||
</transformers>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- <plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-dependencies</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
||||
<overWriteReleases>false</overWriteReleases>
|
||||
<overWriteSnapshots>false</overWriteSnapshots>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<url>https://github.com/mosstest/mosstest</url>
|
||||
<issueManagement>
|
||||
<system>Launchpad</system>
|
||||
<url>https://bugs.launchpad.net/mosstest</url>
|
||||
</issueManagement>
|
||||
<ciManagement>
|
||||
<system>Travis-CI</system>
|
||||
</ciManagement>
|
||||
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-math</artifactId>
|
||||
<version>2.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-collections</groupId>
|
||||
<artifactId>commons-collections</artifactId>
|
||||
<version>3.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.java.jinput</groupId>
|
||||
<artifactId>jinput</artifactId>
|
||||
<version>2.0.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-desktop</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-lwjgl</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-lwjgl-natives</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-lwjgl-niftygui</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>niftygui</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>15.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rhino</groupId>
|
||||
<artifactId>js</artifactId>
|
||||
<version>1.7R2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-core</artifactId>
|
||||
<version>1.3.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.fusesource.leveldbjni</groupId>
|
||||
<artifactId>leveldbjni-all</artifactId>
|
||||
<version>1.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.lwjgl.lwjgl</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>2.9.0</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>lwjgl-workaround</artifactId>
|
||||
<version>9.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.8.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.15</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.mail</groupId>
|
||||
<artifactId>mail</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>javax.jms</groupId>
|
||||
<artifactId>jms</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jdmk</groupId>
|
||||
<artifactId>jmxtools</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jmx</groupId>
|
||||
<artifactId>jmxri</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.intellij</groupId>
|
||||
<artifactId>annotations</artifactId>
|
||||
<version>9.0.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>mosstest</groupId>
|
||||
<artifactId>mosstest</artifactId>
|
||||
<version>0.1.0-SNAPSHOT</version>
|
||||
<name>Mosstest</name>
|
||||
<description>Open-source voxel engine with some extra features</description>
|
||||
<repositories>
|
||||
<repository>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<id>central</id>
|
||||
<name>Central Repository</name>
|
||||
<url>http://repo.maven.apache.org/maven2</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>moss-forums</id>
|
||||
<url>http://forum-mosstest.rhcloud.com/repository/</url>
|
||||
</repository>
|
||||
|
||||
</repositories>
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>codehaus-mojo-staging</id>
|
||||
<name>codehaus-mojo-staging</name>
|
||||
<url>https://nexus.codehaus.org/content/groups/snapshots-group/</url>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
<build>
|
||||
<testSourceDirectory>tests</testSourceDirectory>
|
||||
<sourceDirectory>src</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<!-- DEB plugin -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>deb-maven-plugin</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<configuration>
|
||||
<description>An open-source voxel game created in Java</description>
|
||||
<maintainer>hexafraction <hexafraction@gmail.com></maintainer>
|
||||
<section>games</section>
|
||||
<priority>optional</priority>
|
||||
<architecture>all</architecture>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<!--<goals>
|
||||
<goal>deb</goal>
|
||||
</goals>-->
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- End DEB plugin -->
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>pl.project13.maven</groupId>
|
||||
<artifactId>git-commit-id-plugin</artifactId>
|
||||
<version>2.1.7</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>revision</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
|
||||
<configuration>
|
||||
<prefix>git</prefix>
|
||||
<dateFormat>yyyy.MM.dd '@' HH:mm:ss z</dateFormat>
|
||||
<verbose>true</verbose>
|
||||
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
|
||||
|
||||
<skipPoms>true</skipPoms>
|
||||
<generateGitPropertiesFile>true</generateGitPropertiesFile>
|
||||
<generateGitPropertiesFilename>src/git.properties</generateGitPropertiesFilename>
|
||||
<failOnNoGitDirectory>false</failOnNoGitDirectory>
|
||||
<gitDescribe>
|
||||
<skip>false</skip>
|
||||
<always>false</always>
|
||||
<abbrev>7</abbrev>
|
||||
<dirty>-dirty</dirty>
|
||||
<forceLongFormat>false</forceLongFormat>
|
||||
</gitDescribe>
|
||||
</configuration>
|
||||
|
||||
</plugin>
|
||||
<!-- END OF GIT COMMIT ID PLUGIN CONFIGURATION -->
|
||||
<!-- <plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>clientbuild</id>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>buildcfg/assembly-client.xml</descriptor>
|
||||
</descriptors>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>net.mosstest.launcher.GUIClientsideLauncher</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>serverbuild</id>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>buildcfg/assembly-server.xml</descriptor>
|
||||
</descriptors>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>net.mosstest.launcher.ServerMain</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.1</version>
|
||||
|
||||
<executions>
|
||||
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactSet>
|
||||
<!-- signed jars -->
|
||||
<excludes>
|
||||
<exclude>bouncycastle:bcprov-jdk15</exclude>
|
||||
</excludes>
|
||||
</artifactSet>
|
||||
|
||||
<filters>
|
||||
<filter>
|
||||
<artifact>*:*</artifact>
|
||||
<excludes>
|
||||
<exclude>META-INF/*.SF</exclude>
|
||||
<exclude>META-INF/*.DSA</exclude>
|
||||
<exclude>META-INF/*.RSA</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
|
||||
<transformers>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||
<!-- Main class -->
|
||||
<mainClass>net.mosstest.servercore.MossWorld</mainClass>
|
||||
</transformer>
|
||||
<!-- Use resource transformers to prevent file overwrites -->
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<resource>properties.properties</resource>
|
||||
</transformer>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
|
||||
<resource>applicationContext.xml</resource>
|
||||
</transformer>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||
<resource>META-INF/cxf/cxf.extension</resource>
|
||||
</transformer>
|
||||
<transformer
|
||||
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
|
||||
<resource>META-INF/cxf/bus-extensions.xml</resource>
|
||||
</transformer>
|
||||
</transformers>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- <plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-dependencies</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
||||
<overWriteReleases>false</overWriteReleases>
|
||||
<overWriteSnapshots>false</overWriteSnapshots>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<url>https://github.com/mosstest/mosstest</url>
|
||||
<issueManagement>
|
||||
<system>Launchpad</system>
|
||||
<url>https://bugs.launchpad.net/mosstest</url>
|
||||
</issueManagement>
|
||||
<ciManagement>
|
||||
<system>Travis-CI</system>
|
||||
</ciManagement>
|
||||
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-math</artifactId>
|
||||
<version>2.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-collections</groupId>
|
||||
<artifactId>commons-collections</artifactId>
|
||||
<version>3.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.java.jinput</groupId>
|
||||
<artifactId>jinput</artifactId>
|
||||
<version>2.0.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-desktop</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-lwjgl</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-lwjgl-natives</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-lwjgl-niftygui</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>niftygui</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>15.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.9</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>rhino</groupId>
|
||||
<artifactId>js</artifactId>
|
||||
<version>1.7R2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>jme3-core</artifactId>
|
||||
<version>1.3.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.fusesource.leveldbjni</groupId>
|
||||
<artifactId>leveldbjni-all</artifactId>
|
||||
<version>1.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.lwjgl.lwjgl</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>2.9.0</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jme3</groupId>
|
||||
<artifactId>lwjgl-workaround</artifactId>
|
||||
<version>9.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.8.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.15</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.mail</groupId>
|
||||
<artifactId>mail</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>javax.jms</groupId>
|
||||
<artifactId>jms</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jdmk</groupId>
|
||||
<artifactId>jmxtools</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jmx</groupId>
|
||||
<artifactId>jmxri</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.intellij</groupId>
|
||||
<artifactId>annotations</artifactId>
|
||||
<version>9.0.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.9</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,135 @@
|
|||
package net.mosstest.client;
|
||||
|
||||
import net.mosstest.netcommand.MalformedPacketException;
|
||||
import net.mosstest.netcommand.ToClientAuthDenied;
|
||||
import net.mosstest.netcommand.ToClientAuthRequested;
|
||||
import net.mosstest.servercore.MossNetPacket;
|
||||
import net.mosstest.servercore.MosstestFatalDeathException;
|
||||
import org.apache.commons.codec.digest.DigestUtils;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* Created by hexafraction on 4/27/14.
|
||||
*/
|
||||
public class ClientDispatcher {
|
||||
public static final byte[] EMPTY_PAYLOAD = {};
|
||||
private MossClient client;
|
||||
private boolean hasAuthed, hasBootstrapped;
|
||||
|
||||
private static final Logger logger = Logger.getLogger(ClientDispatcher.class);
|
||||
|
||||
public void dispatch(MossNetPacket inbound) {
|
||||
|
||||
this.dispatch0(inbound);
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void dispatch0(MossNetPacket inbound) {
|
||||
switch (inbound.commandId) {
|
||||
case 0x01: //TOCLIENT_AUTH_REQUESTED
|
||||
handleAuthRequested(inbound);
|
||||
break;
|
||||
case 0x03: //TOCLIENT_AUTH_DENIED
|
||||
handleAuthDenied(inbound);
|
||||
break;
|
||||
case 0x00: //SYS_NOP
|
||||
case 0xFE: //SYS_BIND_CODE
|
||||
case 0xFF: //SYS_QUENCH
|
||||
// fall-through for packets already handled at a lower level
|
||||
break;
|
||||
default:
|
||||
logger.warn(Messages.getString("PACKET_NOT_DISPATCHABLE"));
|
||||
}
|
||||
}
|
||||
|
||||
private void handleAuthDenied(MossNetPacket inbound) {
|
||||
try {
|
||||
ToClientAuthDenied parsed = new ToClientAuthDenied(inbound.payload);
|
||||
switch (parsed.getReason()) {
|
||||
case REASON_UNKNWN:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_UNKNWN"));
|
||||
break;
|
||||
case REASON_BAD_PASS:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_BAD_PASS"));
|
||||
break;
|
||||
case REASON_BANNED:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_BAN"));
|
||||
break;
|
||||
case REASON_PLAYER_LIMIT:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_PLAYER_LIM"));
|
||||
break;
|
||||
case REASON_LOGON_HOUR:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_LOGON_HOUR"));
|
||||
break;
|
||||
case REASON_NO_NEW_PLAYERS:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_NO_REGISTER"));
|
||||
break;
|
||||
case REASON_VERSION_MISMATCH:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_VERSION"));
|
||||
break;
|
||||
case REASON_AUTH_TIMED_OUT:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_TIMEOUT"));
|
||||
break;
|
||||
case REASON_SERVER_MAINT:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_MAINTENANCE"));
|
||||
break;
|
||||
case REASON_FAILED_CONNECTION:
|
||||
logger.fatal(Messages.getString("AUTH_FAILED_CONN"));
|
||||
break;
|
||||
}
|
||||
throw new MosstestFatalDeathException(Messages.getString("AUTH_FAIL_EXCEPTION"));
|
||||
} catch (IOException e) {
|
||||
logger.fatal(Messages.getString("IOEXCEPTION_DESERIALIZE_AUTH_FAIL_PCKT"));
|
||||
throw new MosstestFatalDeathException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void handleAuthRequested(MossNetPacket inbound) {
|
||||
if (hasAuthed) {
|
||||
logger.error(Messages.getString("ALREADY_AUTHED"));
|
||||
return;
|
||||
}
|
||||
try {
|
||||
ToClientAuthRequested parsed = new ToClientAuthRequested(inbound.payload);
|
||||
authenticate(parsed);
|
||||
} catch (IOException e) {
|
||||
logger.fatal(Messages.getString("IOEXCEPTION_DESERIALIZE_AUTH_PCKT"));
|
||||
throw new MosstestFatalDeathException(e);
|
||||
} catch (MalformedPacketException e) {
|
||||
logger.warn(Messages.getString("MALFORMED_TC_AUTH_REQUESTED"));
|
||||
}
|
||||
}
|
||||
|
||||
private void authenticate(ToClientAuthRequested parsed) throws IOException {
|
||||
|
||||
byte[] pass = client.getPassword();
|
||||
switch (parsed.getAuthType()) {
|
||||
case AUTH_NIL:
|
||||
logger.warn(Messages.getString("SVR_NO_AUTH"));
|
||||
client.net.sendPacket(new MossNetPacket(0x02, EMPTY_PAYLOAD));
|
||||
case AUTH_PLAIN:
|
||||
logger.warn(Messages.getString("SVR_AUTH_PLAIN"));
|
||||
// FIXME some sort of confirmation dialog
|
||||
client.net.sendPacket(new MossNetPacket(0x02, pass));
|
||||
case AUTH_HASH_SHA512:
|
||||
client.net.sendPacket(new MossNetPacket(0x02, DigestUtils.sha512(
|
||||
ArrayUtils.addAll(
|
||||
ArrayUtils.addAll(
|
||||
client.getUsername().getBytes(), pass), parsed.getAuthParam()
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
case AUTH_CHALLENGE_RESPONSE:
|
||||
logger.fatal(Messages.getString("SERVER_AUTH_CHALLENGE_RESP"));
|
||||
throw new MosstestFatalDeathException(Messages.getString("AUTH_CHAP_FAILED"));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
package net.mosstest.servercore;
|
||||
package net.mosstest.client;
|
||||
|
||||
import net.mosstest.servercore.ClientManager;
|
||||
import net.mosstest.servercore.CommonNetworking;
|
||||
import net.mosstest.servercore.Messages;
|
||||
import net.mosstest.servercore.MossNetPacket;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import java.io.*;
|
||||
|
|
@ -24,6 +28,8 @@ public class ClientNetworkingManager {
|
|||
public static final int PACKET_QUEUE_CAPACITY = 1024;
|
||||
public static final int TIME_TO_KEEPALIVE = 4000;
|
||||
public static final byte[] EMPTY_PAYLOAD = new byte[]{};
|
||||
|
||||
public static final MossNetPacket QUENCH_PACKET = new MossNetPacket(CMD_QUENCH, EMPTY_PAYLOAD, true, true, true);
|
||||
/**
|
||||
* The logger.
|
||||
*/
|
||||
|
|
@ -125,7 +131,7 @@ public class ClientNetworkingManager {
|
|||
* performance
|
||||
*/
|
||||
/**
|
||||
* The packets.
|
||||
* The packet receive queue
|
||||
*/
|
||||
public ArrayBlockingQueue<MossNetPacket> packets = new ArrayBlockingQueue<>(
|
||||
PACKET_QUEUE_CAPACITY);
|
||||
|
|
@ -351,7 +357,7 @@ public class ClientNetworkingManager {
|
|||
this.bulkReadHandler.start();
|
||||
this.fastReadHandler.start();
|
||||
this.dgramReadHandler.start();
|
||||
/* The send queue thread. */
|
||||
/* The send queue thread. */
|
||||
Thread sendQueueThread = new Thread(new Runnable() {
|
||||
|
||||
@Override
|
||||
|
|
@ -433,7 +439,13 @@ public class ClientNetworkingManager {
|
|||
ClientNetworkingManager.this.lastUdpOut
|
||||
.get(),
|
||||
ClientNetworkingManager.this.quenchedSince
|
||||
.get())))))));
|
||||
.get()
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
));
|
||||
} catch (InterruptedException e) {
|
||||
// pass
|
||||
}
|
||||
|
|
@ -451,25 +463,23 @@ public class ClientNetworkingManager {
|
|||
* @param seqnum the seqnum
|
||||
*/
|
||||
protected void sendAck(int seqnum) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
logger.error("UDP acks are not supported at this time.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Send tos udp conn.
|
||||
*/
|
||||
protected void sendTosUdpConn() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
logger.error("UDP connections are not supported at this time.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Send quench.
|
||||
* Send QUENCH_PACKET.
|
||||
*/
|
||||
protected void sendQuench() {
|
||||
protected void sendQuench() throws IOException {
|
||||
// TODO Sends a request for the server to back off with data and skip
|
||||
// non-essential data.
|
||||
|
||||
this.sendPacket(QUENCH_PACKET);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
package net.mosstest.client;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.MissingResourceException;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
// TODO: Auto-generated Javadoc
|
||||
|
||||
/**
|
||||
* The Class Messages.
|
||||
*/
|
||||
public class Messages {
|
||||
|
||||
/** The Constant BUNDLE_NAME. */
|
||||
private static final String BUNDLE_NAME = "net.mosstest.client.messages"; //$NON-NLS-1$
|
||||
|
||||
/** The res bundle. */
|
||||
private static ResourceBundle resBundle = ResourceBundle
|
||||
.getBundle(BUNDLE_NAME);
|
||||
|
||||
/**
|
||||
* Change language.
|
||||
*
|
||||
* @param identifier the identifier
|
||||
*/
|
||||
public static void changeLanguage(Locale identifier) {
|
||||
resBundle = ResourceBundle.getBundle(BUNDLE_NAME, identifier);
|
||||
}
|
||||
|
||||
/**
|
||||
* Instantiates a new messages.
|
||||
*/
|
||||
private Messages() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the string.
|
||||
*
|
||||
* @param key the key
|
||||
* @return the string
|
||||
*/
|
||||
public static String getString(String key) {
|
||||
try {
|
||||
return resBundle.getString(key);
|
||||
} catch (MissingResourceException e) {
|
||||
return '!' + key + '!';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
package net.mosstest.client;
|
||||
|
||||
import net.mosstest.netcommand.ToServerHello;
|
||||
import net.mosstest.scripting.MossScriptEnv;
|
||||
import net.mosstest.scripting.NodePosition;
|
||||
import net.mosstest.scripting.Player;
|
||||
import net.mosstest.servercore.MossNetPacket;
|
||||
import net.mosstest.servercore.MosstestSecurityManager;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.net.SocketException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
|
||||
/**
|
||||
* Created by hexafraction on 4/26/14.
|
||||
*/
|
||||
public class MossClient {
|
||||
public static final short PROTOCOL_VERSION = 1;
|
||||
private String username;
|
||||
RemoteFileManager fileManager;
|
||||
ClientNetworkingManager net;
|
||||
private byte[] password;
|
||||
|
||||
public ClientState getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
private volatile ClientState state;
|
||||
|
||||
private Player ownPlayer;
|
||||
|
||||
private ClientDispatcher dispatcher;
|
||||
|
||||
public MossClient(String remoteHost, int port, String username, byte[] pass) throws IOException, InterruptedException {
|
||||
this.username = username;
|
||||
this.password = pass;
|
||||
this.state = ClientState.PREPARING;
|
||||
this.fileManager = RemoteFileManager.getInstance();
|
||||
this.state = ClientState.CONNECTING;
|
||||
this.fileManager.setClient(this);
|
||||
this.net = new ClientNetworkingManager(remoteHost, port, false); // so far no UDP
|
||||
// we need to send the hello to kick things off
|
||||
this.net.sendPacket(new MossNetPacket(0x01, new ToServerHello(username, PROTOCOL_VERSION, MossScriptEnv.MIN_SCRIPT_API_VERSION, MossScriptEnv.MAX_SCRIPT_API_VERSION).toByteArray()));
|
||||
}
|
||||
|
||||
|
||||
public byte[] getPassword() {
|
||||
|
||||
SecurityManager sm = System.getSecurityManager();
|
||||
if (sm instanceof MosstestSecurityManager) {
|
||||
((MosstestSecurityManager) sm).checkMosstestControl();
|
||||
}
|
||||
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(byte[] password) {
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public enum ClientState {
|
||||
PREPARING,
|
||||
CONNECTING,
|
||||
BUILDING_FILE_LIST,
|
||||
FETCHING_FILES,
|
||||
EXECUTING_STARTUP_SCRIPTS,
|
||||
RENDERER_STARTING,
|
||||
PLAYING,
|
||||
CRASHED,
|
||||
TIMED_OUT
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,281 @@
|
|||
package net.mosstest.client;
|
||||
|
||||
import com.jme3.asset.*;
|
||||
import net.mosstest.servercore.*;
|
||||
import org.apache.commons.configuration.ConfigurationException;
|
||||
import org.apache.commons.configuration.XMLConfiguration;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Created by hexafraction on 4/26/14.
|
||||
*/
|
||||
public class RemoteFileManager implements IFileManager {
|
||||
private static final String XML_DEPENDENCY_KEY = "dependencies.dependency";
|
||||
private static volatile RemoteFileManager instance = null;
|
||||
private HashSet<String> visitedScripts;
|
||||
|
||||
protected HashSet<AbstractMossScript> executed = new HashSet<>();
|
||||
|
||||
public static RemoteFileManager getInstance() {
|
||||
if (instance == null) {
|
||||
synchronized (RemoteFileManager.class) {
|
||||
if (instance == null) {
|
||||
instance = new RemoteFileManager();
|
||||
}
|
||||
}
|
||||
}
|
||||
return instance;
|
||||
|
||||
}
|
||||
|
||||
private static final Logger logger = Logger.getLogger(RemoteFileManager.class);
|
||||
private HashMap<String, RemoteFile> knownByName = new HashMap<>();
|
||||
|
||||
private HashMap<String, RemoteFile> knownByHash = new HashMap<>();
|
||||
private File cacheBasedir = new File("cache");
|
||||
// used to request files
|
||||
private MossClient client;
|
||||
|
||||
public void setClient(MossClient client) {
|
||||
this.client = client;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RemoteFile getFile(String name) throws IOException {
|
||||
return knownByName.get(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerFile(String name, String sha256, long size) throws IOException {
|
||||
logger.info(MessageFormat.format("Registered {0} with hash {1}, and a size of {2} bytes", name, sha256, size));
|
||||
RemoteFile rmf = new RemoteFile(sha256, name, size);
|
||||
knownByName.put(name, rmf);
|
||||
knownByHash.put(sha256, rmf);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receiveFileChunk(String sha256, int chunkId, ByteBuffer buf) throws IOException {
|
||||
RemoteFile rmf = this.knownByHash.get(sha256);
|
||||
if (rmf == null) {
|
||||
logger.warn(MessageFormat.format("The server tried to send a file chunk for a file with hash {0} that we don't know about.", sha256));
|
||||
return;
|
||||
}
|
||||
|
||||
rmf.writeChunk(chunkId, buf.array());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Class<? extends AssetLocator> getAssetLocatorClass() {
|
||||
return RemoteAssetLocator.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<? extends IMossFile> getFiles() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractMossScript getScript(String name) throws IOException, MossWorldLoadException {
|
||||
List<AbstractMossScript> dependencies = new ArrayList<>();
|
||||
try {
|
||||
File scriptXml = this.getFile(name + "/script.xml").file;
|
||||
|
||||
|
||||
XMLConfiguration scriptCfg = new XMLConfiguration(scriptXml);
|
||||
String[] scNames = scriptCfg.getStringArray(XML_DEPENDENCY_KEY);
|
||||
for (String sc : scNames) {
|
||||
if (sc.equals(name)) continue;
|
||||
if (visitedScripts.contains(sc)) {
|
||||
logger.fatal(MessageFormat.format(Messages.getString("CIRCULAR_DEPENDENCY_ISSUE"), name, sc));
|
||||
throw new MossWorldLoadException(MessageFormat.format(Messages.getString("CIRCULAR_DEPENDENCY_ISSUE"), name, sc));
|
||||
}
|
||||
try {
|
||||
dependencies.add(this.getScript(sc));
|
||||
} catch (StackOverflowError e) {
|
||||
// should never happen
|
||||
logger.fatal(Messages.getString("DEPFIND_STACK_OVERFLOW"));
|
||||
throw new MossWorldLoadException("FIXME The stack overflowed while resolving dependencies. Either there is an undetected dependency issue, or there is simply an extreme number of dependencies.");
|
||||
}
|
||||
}
|
||||
} catch (ConfigurationException | FileNotFoundException e) {
|
||||
logger.warn(Messages.getString("SCRIPT_XML_MISSING"));
|
||||
}
|
||||
|
||||
return new RemoteScript(name, dependencies);
|
||||
}
|
||||
|
||||
|
||||
public class RemoteFile implements IMossFile {
|
||||
private final long size;
|
||||
|
||||
private final File file;
|
||||
|
||||
private final RandomAccessFile rFile;
|
||||
|
||||
private final BitSet completedChunks;
|
||||
|
||||
private final String sha256;
|
||||
|
||||
private final int numChunks;
|
||||
|
||||
private final String name;
|
||||
|
||||
RemoteFile(String sha256, String name, long size) throws IOException {
|
||||
this.sha256 = sha256;
|
||||
this.name = name;
|
||||
numChunks = (int) Math.ceil(size / IMossFile.CHUNK_SIZE);
|
||||
if (!sha256.matches("[0-9A-Za-z]{32}"))
|
||||
throw new MosstestFatalDeathException("A file SHA256 was invalid, and could not be used for caching.");
|
||||
this.file = new File(RemoteFileManager.this.cacheBasedir, sha256);
|
||||
this.file.createNewFile();
|
||||
this.rFile = new RandomAccessFile(this.file, "rw");
|
||||
this.size = size;
|
||||
try {
|
||||
completedChunks = new BitSet(numChunks);
|
||||
|
||||
String actualSha = IFileManager.getHash(file);
|
||||
if (actualSha.equalsIgnoreCase(sha256)) {
|
||||
completedChunks.set(0, numChunks);
|
||||
}
|
||||
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
throw new MosstestFatalDeathException("The SHA-256 algorithm could not be found, but is required to cache files.");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Reader getReader() throws FileNotFoundException {
|
||||
return new FileReader(this.file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getInputStream() throws FileNotFoundException {
|
||||
return new FileInputStream(this.file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] readChunk(int chunkId) throws IOException {
|
||||
this.rFile.seek(chunkId * IMossFile.CHUNK_SIZE);
|
||||
byte[] buf = new byte[(int) (chunkId == (this.numChunks - 1) ? (this.size % IMossFile.CHUNK_SIZE)
|
||||
: IMossFile.CHUNK_SIZE)];
|
||||
this.rFile.readFully(buf);
|
||||
return buf;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeChunk(int chunkId, byte[] buf) throws IOException {
|
||||
this.rFile.seek(chunkId * IMossFile.CHUNK_SIZE);
|
||||
if (((chunkId == (this.numChunks - 1) ? (this.size % IMossFile.CHUNK_SIZE) : IMossFile.CHUNK_SIZE)) != buf.length)
|
||||
throw new MosstestFatalDeathException(MessageFormat.format("An inbound chunk for file {0} is not of the correct size. The server may be sending erroneous data.", this.name));
|
||||
this.completedChunks.set(chunkId);
|
||||
if (isComplete()) {
|
||||
logger.info(MessageFormat.format("Completed file {0}.", this.name));
|
||||
}
|
||||
try {
|
||||
String realHash = IFileManager.getHash(this.file);
|
||||
if (!this.sha256.equalsIgnoreCase(realHash)) {
|
||||
logger.warn(MessageFormat.format("File {0} expected with hash {1} but got reassembled as hash {2}", this.name, this.sha256, realHash));
|
||||
}
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
throw new MosstestFatalDeathException("The SHA-256 algorithm could not be found, but is required to cache files.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSha256() {
|
||||
return this.sha256;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isComplete() {
|
||||
return (completedChunks.nextClearBit(0) == -1 || completedChunks.nextClearBit(0) == this.numChunks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getSize() {
|
||||
return this.size;
|
||||
}
|
||||
}
|
||||
|
||||
private static class RemoteAssetLocator implements AssetLocator {
|
||||
private static final Logger logger = Logger.getLogger(RemoteAssetLocator.class);
|
||||
|
||||
@Override
|
||||
public void setRootPath(String s) {
|
||||
// ignore
|
||||
logger.warn(MessageFormat.format("Tried to set root path {0} for RemoteAssetLocator, which ignores the root path.", s));
|
||||
}
|
||||
|
||||
@Override
|
||||
public AssetInfo locate(AssetManager assetManager, AssetKey assetKey) {
|
||||
try {
|
||||
return new RemoteAssetInfo(assetManager, assetKey,
|
||||
RemoteFileManager.getInstance().getFile(assetKey.getName()));
|
||||
} catch (IOException ex) {
|
||||
throw new AssetLoadException("Failed to open file: "
|
||||
+ assetKey.getName(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
private static class RemoteAssetInfo extends AssetInfo {
|
||||
|
||||
private RemoteFile file;
|
||||
|
||||
public RemoteAssetInfo(AssetManager manager, AssetKey key, RemoteFile file) {
|
||||
super(manager, key);
|
||||
this.file = file;
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream openStream() {
|
||||
try {
|
||||
return this.file.getInputStream();
|
||||
} catch (IOException ex) {
|
||||
throw new AssetLoadException("Failed to open file: "
|
||||
+ this.file.getName(), ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class RemoteScript extends AbstractMossScript {
|
||||
private final List<AbstractMossScript> dependencies;
|
||||
|
||||
public RemoteScript(String name, List<AbstractMossScript> dependencies) {
|
||||
super(name);
|
||||
this.dependencies = dependencies;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void exec(ScriptEnv sEnv) throws IOException, MossWorldLoadException {
|
||||
RemoteFileManager.this.executed.add(this);
|
||||
for (AbstractMossScript sc : dependencies) {
|
||||
sc.exec(sEnv);
|
||||
}
|
||||
sEnv.runScript(this.getInitFile());
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMossFile getInitFile() throws IOException {
|
||||
return RemoteFileManager.this.getFile(this.name + "/init.js");
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<AbstractMossScript> getDependencies() {
|
||||
return Collections.unmodifiableList(dependencies);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
IOEXCEPTION_DESERIALIZE_AUTH_PCKT=IOException deserializing an authentication packet, or sending its reply.
|
||||
IOEXCEPTION_DESERIALIZE_AUTH_FAIL_PCKT=IOException deserializing an authentication failure packet, or sending its reply.
|
||||
AUTH_FAILED_UNKNWN=Authentication failed for an unknown reason
|
||||
AUTH_FAILED_BAD_PASS=Authentication failed due to a bad password.
|
||||
AUTH_FAILED_BAN=You are banned.
|
||||
AUTH_FAILED_PLAYER_LIM=The server is at its player limit; no more players can join.
|
||||
AUTH_FAILED_LOGON_HOUR=A server reports a logon hour restriction. The meaning of this may depend as Mosstest does not use this type of failure in its default implementation
|
||||
AUTH_FAILED_NO_REGISTER=The server is not allowing new players to register.
|
||||
AUTH_FAILED_VERSION=The server and client versions do not match and no common version can be negotiated upon.
|
||||
AUTH_FAILED_TIMEOUT=Authentication has timed out
|
||||
AUTH_FAILED_MAINTENANCE=The server is undergoing maintenance. Generally, only administrators can join in such a case
|
||||
AUTH_FAILED_CONN=The connection failed; cannot authenticate
|
||||
ALREADY_AUTHED=Server request authentication, but we've already authenticated. Throwing away request for security.
|
||||
SVR_NO_AUTH=Server is not using authentication...
|
||||
SVR_AUTH_PLAIN=Server is requesting password in plain text.
|
||||
SERVER_AUTH_CHALLENGE_RESP=Challenge-response authentication is not supported at this time.
|
||||
AUTH_CHAP_FAILED=Challenge-Response auth unsupported
|
||||
MALFORMED_TC_AUTH_REQUESTED=Malformed TOCLIENT_AUTH_REQUESTED packet.
|
||||
PACKET_NOT_DISPATCHABLE=Received a packet that cannot be dispatched at this time.
|
||||
AUTH_FAIL_EXCEPTION=Server denied authentication; client cannot continue
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
GUIBugReportDialog.DLG_BUG_DESC=Descrizione dettagliata del problema\:
|
||||
GUIBugReportDialog.DLG_BUG_DESC_DEFAULT=Per favore descrivete qui il vostro problema, preferibilmente includendo quello che vi aspettavate che succedesse, che cosa \u00E8 successo, e qualsiasi altro dettaglio riguardante il mondo o il gioco.\n\nPer favore tenete presente che non possiamo aiutarvi con giochi o mod di terze parti.
|
||||
GUIBugReportDialog.DLG_BUG_EMAIL=e-mail (facoltativa)\:
|
||||
GUIBugReportDialog.DLG_BUG_NAME=Nome\:
|
||||
GUIBugReportDialog.DLG_BUG_SUMMARY=Riassunto del problema\:
|
||||
GUIBugReportDialog.DLG_BUG_TITLE=Segnalare un bug
|
||||
GUIBugReportDialog.DLG_CHECKBOX_INCLUDE_TECH_INFO=Includere informazioni tecniche
|
||||
GUIBugReportDialog.DLG_CXL=Annullare
|
||||
GUIBugReportDialog.DLG_OK=OK
|
||||
GUIBugReportDialog.DLG_SUBMIT=Inviare
|
||||
GUIBugReportDialog.NOTICE_INFO_INCLUDED=Se questa casella viene marcata verranno aggiunte alla segnalazione del bug le seguenti informazioni\: \n\n
|
||||
GUIClientsideLauncher.23=Segnalare un bug...
|
||||
GUIClientsideLauncher.24=Richiedere una caratteristica nuova...
|
||||
GUIClientsideLauncher.25=Visitare il sito web
|
||||
GUIClientsideLauncher.26=Progetto GitHub
|
||||
GUIClientsideLauncher.27=Visitare i forum
|
||||
GUIClientsideLauncher.COL_GAME_PRESET=Gioco preimpostato
|
||||
GUIClientsideLauncher.COL_WORLD_DESC=Descrizione
|
||||
GUIClientsideLauncher.COL_WORLD_NAME=Nome del mondo
|
||||
GUIClientsideLauncher.DLG_ABOUT=Informazioni
|
||||
GUIClientsideLauncher.DLG_DELETE=Cancellare...
|
||||
GUIClientsideLauncher.DLG_NEW=Nuovo...
|
||||
GUIClientsideLauncher.DLG_NO_WORLD_TO_DELETE=Non \u00E8 stato scelto nessun mondo da cancellare. Per favore selezionate un mondo esistente nella tabella.
|
||||
GUIClientsideLauncher.DLG_PLAY=Giocare
|
||||
GUIClientsideLauncher.DLG_SETTINGS=Impostazioni...
|
||||
GUIClientsideLauncher.DLG_SINGLEPLAYER=Giocatore singolo
|
||||
GUIClientsideLauncher.DLG_TITLE=Avviatore del Client Mosstest <0.0.1-initial>
|
||||
GUIClientsideLauncher.ERR_NO_WORLD_SELECTED=Non \u00E8 stato selezionato nessun mondo da avviare. Per favore selezionate un mondo esistente nella tabella, o create un mondo nuovo.
|
||||
GUIClientsideLauncher.ERR_NO_WORLD_SELECTED_TITLE=Nessun mondo selezionato
|
||||
GUIClientsideLauncher.NOTICE_DEFAULT_GAME_CODE=Il codice e le immagini predefinite del gioco sono state create da dolinksy296, hexafraction, e altri.\n
|
||||
GUIClientsideLauncher.NOTICE_PRIMARY_AUTHORS=Creato da hexafraction, thatnerd2, e altri.\n
|
||||
GUIClientsideLauncher.NOTICE_TOOLS_USED=Creato con l'aiuto di Eclipse, Git, Maven e innumerevoli servizi come TravisCI e GitHub.\n
|
||||
GUIClientsideLauncher.SYS_NEWLINE=\n
|
||||
GUIClientsideLauncher.USES_LIBS=Utilizza le librerie seguenti\:\n
|
||||
GUIClientsideLauncher.WARN_SET_LAF=Avviso\: l'aspetto non pu\u00F2 essere applicato al sistema. Si utilizza l'aspetto predefinito.
|
||||
GUIWorldCreationDialog.CXL=Annullare
|
||||
GUIWorldCreationDialog.DLG_TITLE=Creare un nuovo mondo per giocatore singolo...
|
||||
GUIWorldCreationDialog.GAME_PROFILE=Profilo di gioco\:
|
||||
GUIWorldCreationDialog.OK=OK
|
||||
GUIWorldCreationDialog.WORLD_DESC=Descrizione\:
|
||||
GUIWorldCreationDialog.WORLD_NAME=Nome del mondo\:
|
||||
GUIWorldDeletionDialog.AREYOUSURE_TEXT=Siete certi di volere cancellare {0}? Ci\u00F2 non pu\u00F2 essere annullato.
|
||||
GUIWorldDeletionDialog.DLG_TITLE=Cancellare un mondo per giocatore singolo...
|
||||
GUIWorldDeletionDialog.NO=No
|
||||
GUIWorldDeletionDialog.QUESTIONMARK_CANNOT_UNDO=? Questa operazione non pu\u00F2 essere annullata.
|
||||
GUIWorldDeletionDialog.YES=S\u00EC
|
||||
GAMEPLAY_NO_WORLD=Si \u00E8 tentato di avviare il gioco senza selezionare un mondo.
|
||||
GAME_UNCAUGHT_EXCEPT=Eccezione non notata nel codice del gioco, apertura del segnalatore di bug.
|
||||
STACKTRACE_WRITTEN=Lo stack trace \u00E8 stato scritto su {0}
|
||||
WORLD_CREATION_CXLD=Creazione del mondo annullata
|
||||
NO_WORLD_TO_DELETE=Si \u00E8 tentato di cancellare un mondo, ma non ne \u00E8 stato selezionato nessuno.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package net.mosstest.servercore.netcommand;
|
||||
package net.mosstest.netcommand;
|
||||
|
||||
/**
|
||||
* The Class MalformedPacketException.
|
||||
|
|
@ -0,0 +1,113 @@
|
|||
package net.mosstest.netcommand;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
/**
|
||||
* Created by hexafraction on 5/3/14.
|
||||
*/
|
||||
public class ToClientAuthDenied extends ToClientCommand {
|
||||
public enum DenyReason {
|
||||
REASON_UNKNWN,
|
||||
REASON_BAD_PASS,
|
||||
REASON_BANNED,
|
||||
REASON_PLAYER_LIMIT,
|
||||
REASON_LOGON_HOUR,
|
||||
REASON_NO_NEW_PLAYERS,
|
||||
REASON_VERSION_MISMATCH,
|
||||
REASON_AUTH_TIMED_OUT,
|
||||
REASON_SERVER_MAINT,
|
||||
REASON_FAILED_CONNECTION
|
||||
}
|
||||
|
||||
public DenyReason getReason() {
|
||||
return reason;
|
||||
}
|
||||
|
||||
private final DenyReason reason;
|
||||
|
||||
public ToClientAuthDenied(DenyReason reason) {
|
||||
this.reason = reason;
|
||||
}
|
||||
|
||||
public ToClientAuthDenied(byte[] buf) throws IOException {
|
||||
ByteArrayInputStream bs = new ByteArrayInputStream(buf);
|
||||
DataInputStream ds = new DataInputStream(bs);
|
||||
int reason_ = ds.readUnsignedByte();
|
||||
switch(reason_){
|
||||
case 0x01:
|
||||
this.reason = DenyReason.REASON_BAD_PASS;
|
||||
break;
|
||||
case 0x02:
|
||||
this.reason = DenyReason.REASON_BANNED;
|
||||
break;
|
||||
case 0x03:
|
||||
this.reason = DenyReason.REASON_PLAYER_LIMIT;
|
||||
break;
|
||||
case 0x04:
|
||||
this.reason = DenyReason.REASON_LOGON_HOUR;
|
||||
break;
|
||||
case 0x05:
|
||||
this.reason = DenyReason.REASON_NO_NEW_PLAYERS;
|
||||
break;
|
||||
case 0x06:
|
||||
this.reason = DenyReason.REASON_PLAYER_LIMIT;
|
||||
break;
|
||||
case 0x07:
|
||||
this.reason = DenyReason.REASON_VERSION_MISMATCH;
|
||||
break;
|
||||
case 0x08:
|
||||
this.reason = DenyReason.REASON_AUTH_TIMED_OUT;
|
||||
break;
|
||||
case 0x09:
|
||||
this.reason = DenyReason.REASON_SERVER_MAINT;
|
||||
break;
|
||||
case 0x0a:
|
||||
this.reason = DenyReason.REASON_FAILED_CONNECTION;
|
||||
break;
|
||||
// fall through for unknwn
|
||||
case 0x00:
|
||||
default:
|
||||
this.reason = DenyReason.REASON_UNKNWN;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public byte[] toByteArray() throws IOException {
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
DataOutputStream dos = new DataOutputStream(bos);
|
||||
switch (this.reason) {
|
||||
|
||||
case REASON_UNKNWN:
|
||||
dos.writeByte(0x00);
|
||||
break;
|
||||
case REASON_BAD_PASS:
|
||||
dos.writeByte(0x01);
|
||||
break;
|
||||
case REASON_BANNED:
|
||||
dos.writeByte(0x02);
|
||||
break;
|
||||
case REASON_PLAYER_LIMIT:
|
||||
dos.writeByte(0x03);
|
||||
break;
|
||||
case REASON_LOGON_HOUR:
|
||||
dos.writeByte(0x04);
|
||||
break;
|
||||
case REASON_NO_NEW_PLAYERS:
|
||||
dos.writeByte(0x06);
|
||||
break;
|
||||
case REASON_VERSION_MISMATCH:
|
||||
dos.writeByte(0x07);
|
||||
break;
|
||||
case REASON_AUTH_TIMED_OUT:
|
||||
dos.writeByte(0x08);
|
||||
break;
|
||||
case REASON_SERVER_MAINT:
|
||||
dos.writeByte(0x09);
|
||||
break;
|
||||
case REASON_FAILED_CONNECTION:
|
||||
dos.writeByte(0x0a);
|
||||
break;
|
||||
}
|
||||
return bos.toByteArray();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//just keep the same package and import lines
|
||||
package net.mosstest.servercore.netcommand;
|
||||
package net.mosstest.netcommand;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ public class ToClientAuthRequested extends ToClientCommand {
|
|||
/**
|
||||
* The Enum AuthType.
|
||||
*/
|
||||
enum AuthType {
|
||||
public enum AuthType {
|
||||
|
||||
/**
|
||||
* The auth nil.
|
||||
|
|
@ -144,4 +144,12 @@ public class ToClientAuthRequested extends ToClientCommand {
|
|||
//Use this line at the end to finish up
|
||||
return bos.toByteArray();
|
||||
}
|
||||
|
||||
public AuthType getAuthType() {
|
||||
return authType;
|
||||
}
|
||||
|
||||
public byte[] getAuthParam() {
|
||||
return authParam;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package net.mosstest.servercore.netcommand;
|
||||
package net.mosstest.netcommand;
|
||||
|
||||
/**
|
||||
* The Class ToClientCommand.
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
package net.mosstest.netcommand;
|
||||
|
||||
/**
|
||||
* The Class ToServerCommand.
|
||||
*/
|
||||
public abstract class ToServerCommand {
|
||||
|
||||
//ignore
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
package net.mosstest.netcommand;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
/**
|
||||
* Created by hexafraction on 4/27/14.
|
||||
*/
|
||||
public class ToServerHello {
|
||||
private final String username;
|
||||
private final int protocolVersion;
|
||||
private final int minScriptApi;
|
||||
private final int maxScriptApi;
|
||||
|
||||
public ToServerHello(byte[] buf) throws IOException,
|
||||
MalformedPacketException {
|
||||
|
||||
// constructor from byte[] is parsing
|
||||
// Keep lines below for all of these tasks
|
||||
ByteArrayInputStream bs = new ByteArrayInputStream(buf);
|
||||
DataInputStream ds = new DataInputStream(bs);
|
||||
this.protocolVersion = ds.readUnsignedShort();
|
||||
this.minScriptApi = ds.readUnsignedShort();
|
||||
this.maxScriptApi = ds.readUnsignedShort();
|
||||
this.username = ds.readUTF();
|
||||
}
|
||||
|
||||
public ToServerHello(String username, int protocolVersion, int minScriptApi, int maxScriptApi) {
|
||||
this.username = username;
|
||||
this.protocolVersion = protocolVersion;
|
||||
this.minScriptApi = minScriptApi;
|
||||
this.maxScriptApi = maxScriptApi;
|
||||
}
|
||||
|
||||
public byte[] toByteArray() throws IOException {
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
DataOutputStream dos = new DataOutputStream(bos);
|
||||
dos.writeShort(this.protocolVersion);
|
||||
dos.writeShort(this.minScriptApi);
|
||||
dos.writeShort(this.maxScriptApi);
|
||||
dos.writeUTF(this.username);
|
||||
return bos.toByteArray();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
package net.mosstest.scripting;
|
||||
|
||||
import net.mosstest.scripting.events.IMossEvent;
|
||||
|
|
@ -341,3 +342,362 @@ public class MossScriptEnv {
|
|||
}
|
||||
|
||||
}
|
||||
=======
|
||||
package net.mosstest.scripting;
|
||||
|
||||
import net.mosstest.scripting.events.IMossEvent;
|
||||
import net.mosstest.scripting.handlers.MossEventHandler;
|
||||
import net.mosstest.scripting.handlers.MossNodeChangeHandler;
|
||||
import net.mosstest.servercore.*;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* This class is used by scripts and script-facing portions of Mosstest. Methods
|
||||
* restricted to be called from trusted Java-side shall pass a
|
||||
* {@link ScriptSandboxBorderToken}. Each event fired will run in the thread
|
||||
* pool. All requests via this API need not concern themselves with threading as
|
||||
* everything is handled by Mosstest itself.
|
||||
* <p>
|
||||
* The event handlers called are the ones defined via this class's registerOnFoo
|
||||
* methods, followed by any handlers defined in an instance of NodeParams via an
|
||||
* anonymous inner class, and finally with the default handler.
|
||||
* <p>
|
||||
* The order in which handlers registered here are called is undefined due to
|
||||
* the undefined order of scripts being loaded. Generally, this is planned to
|
||||
* occur in an order based on the SHA512 hash of the script. Comments with dummy
|
||||
* information may be used by the script author to attempt to set the position
|
||||
* of a script in the execution order via manipulating the hash. Handlers of the
|
||||
* same types within the same script are guaranteed to be called in order.
|
||||
* <p>
|
||||
* An event handler may interrupt handling of the event so that no further event
|
||||
* handlers nor the default are ever called, by returning the proper boolean value
|
||||
*
|
||||
* @author rarkenin
|
||||
* @version 0.0
|
||||
* @since 0.0
|
||||
*/
|
||||
public class MossScriptEnv {
|
||||
public static final short SCRIPT_API_VERSION = 1;
|
||||
public static final short MIN_SCRIPT_API_VERSION = 1;
|
||||
public static final short MAX_SCRIPT_API_VERSION = 1;
|
||||
public void registerNodeChangeHandler(MossNodeChangeHandler h) {
|
||||
|
||||
}
|
||||
|
||||
private InheritableThreadLocal<Short> requestedScriptApiVer = new InheritableThreadLocal<Short>(){
|
||||
@Override
|
||||
protected Short initialValue() {
|
||||
return MAX_SCRIPT_API_VERSION;
|
||||
}
|
||||
};
|
||||
|
||||
public void setRequestedScriptApiVer(short requestedScriptApiVer) {
|
||||
if(requestedScriptApiVer >= MIN_SCRIPT_API_VERSION && requestedScriptApiVer <= MAX_SCRIPT_API_VERSION)
|
||||
this.requestedScriptApiVer.set(requestedScriptApiVer);
|
||||
else {
|
||||
throw new MosstestFatalDeathException("A plugin requests an unsatisfiable script API version.");
|
||||
}
|
||||
}
|
||||
|
||||
private HashMap<Class<? extends IMossEvent>, ArrayList<MossEventHandler>> eventHandlers;
|
||||
|
||||
private ScriptableDatabase db;
|
||||
|
||||
private MapCache nc;
|
||||
|
||||
private FuturesProcessor fp;
|
||||
|
||||
private INodeManager nm;
|
||||
|
||||
|
||||
/**
|
||||
* Sends a chat message to a player.
|
||||
*
|
||||
* @param recipient A {@link Player} object representing the recipient. A Player
|
||||
* object may be constructed with
|
||||
* {@link MossScriptEnv#getPlayerByName(String)}.
|
||||
* @param from A player object representing the sender. A Player object may
|
||||
* be constructed with
|
||||
* {@link MossScriptEnv#getPlayerByName(String)}. If null a
|
||||
* message is sent showing to users as having been sent by the
|
||||
* server with the prefix <code>[*] Server:</code>
|
||||
* @param message A string representing the message that shall be sent to the
|
||||
* specified recipient.
|
||||
*/
|
||||
public void sendChatMessage(Player recipient, Player from, String message) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends a chat message to all players.
|
||||
*
|
||||
* @param from A player object representing the sender. A Player object may
|
||||
* be constructed with
|
||||
* {@link MossScriptEnv#getPlayerByName(String)}. If null a
|
||||
* message is sent showing to users as having been sent by the
|
||||
* server with the prefix <code>[*] Server:</code>
|
||||
* @param message A string representing the message that shall be sent to the
|
||||
* specified recipient.
|
||||
*/
|
||||
public void sendChatAll(Player from, String message) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the health on an entity or player.
|
||||
*
|
||||
* @param p The player to set health on.
|
||||
* @param health A positive integer representing the amount of health to set.
|
||||
*/
|
||||
public void setHp(Player p, int health) {
|
||||
// TODO Once we have players doing stuff
|
||||
}
|
||||
|
||||
/**
|
||||
* Damages the tool of a player corresponding to a dig. The player's
|
||||
* currently selected tool is damaged.
|
||||
*
|
||||
* @param actor The player that is digging a node.
|
||||
* @param nd The node dug.
|
||||
* @throws MossScriptException Thrown if the current tool cannot be used to dig the node.
|
||||
*/
|
||||
public void damageTool(Player actor, MapNode nd) throws MossScriptException {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Gives a player an item. The item stack will be added to the player's
|
||||
* default inventory, adding to the first available partial stack. If no
|
||||
* partial stacks are available the item is added to the first open slot in
|
||||
* the inventory.
|
||||
*
|
||||
* @param player the player
|
||||
* @param item the item
|
||||
* @return True if the item could be added, false if the item could not be
|
||||
* added due to insufficient space.
|
||||
*/
|
||||
public boolean givePlayer(Player player, MossItem.Stack item) {
|
||||
MossInventory mi = player.getInventory("default", 4, 8, 128);
|
||||
|
||||
// use side effect
|
||||
return (mi.addItem(item) == item.amount);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a node of the world to a given type. This cannot be called on a
|
||||
* NodePosition with an existing solid node; use
|
||||
* {@link #removeNode(NodePosition)} first.
|
||||
*
|
||||
* @param pos The position at which to set a node.
|
||||
* @param node The node to place at that position.
|
||||
*/
|
||||
public void setNode(NodePosition pos, MapNode node) throws MapGeneratorException {
|
||||
MapChunk chk = this.nc.getChunkNoGenerate(pos.chunk);
|
||||
if (chk == null)
|
||||
return;
|
||||
if (!(this.nm.containsNode(node) || node instanceof IDynamicNode))
|
||||
throw new IllegalArgumentException("The mapnode passed is not contained in the world node manager");
|
||||
|
||||
chk.setNode(pos.xl, pos.yl, pos.zl, node.getNodeId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes a node, setting it to air. This may be called on a NodePosition
|
||||
* with an existing solid node.
|
||||
*
|
||||
* @param pos The NodePosition at which to remove the node.
|
||||
*/
|
||||
public void removeNode(NodePosition pos) throws MapGeneratorException {
|
||||
MapChunk chk = this.nc.getChunkNoGenerate(pos.chunk);
|
||||
if (chk == null)
|
||||
return;
|
||||
chk.setNode(pos.xl, pos.yl, pos.zl, this.nm.getNode("mg:air") //$NON-NLS-1$
|
||||
.getNodeId());
|
||||
this.nc.setChunk(pos.chunk, chk);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the MapNode at a certain location.
|
||||
*
|
||||
* @param pos The location at which to get the node
|
||||
* @return A MapNode object representing the node at that location.
|
||||
* @throws MapGeneratorException the map generator exception
|
||||
*/
|
||||
public MapNode getNode(NodePosition pos) throws MapGeneratorException {
|
||||
return this.nm.getNode((short) this.nc.getChunk(pos.chunk).getNodeId(
|
||||
pos.xl, pos.yl, pos.zl));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a mapnode in the world, allowing it to be placed.
|
||||
*
|
||||
* @param nd
|
||||
* @throws MossWorldLoadException
|
||||
*/
|
||||
public void registerNode(MapNode nd) throws MossWorldLoadException {
|
||||
this.nm.putNode(nd);
|
||||
}
|
||||
|
||||
/**
|
||||
* Register a new liquid in the node manager, generating intermediates as needed.
|
||||
*
|
||||
* @param sysname The name such as default:lava to set. The prefix mg: is used
|
||||
* for mapgen-specific nodes, and should be done by creating a
|
||||
* node with a different prefix and aliasing mg:foo to it.
|
||||
* @param userFacingName The name to display in the UI, such as Lava or Iron Ore
|
||||
* @param params An implementation of the {@link LiquidNodeParams} interface
|
||||
* detailing the action of the node. {@link LiquidSourceNodeParams} and
|
||||
* {@link LiquidFlowingNodeParams} are valid for liquid sources and flowing liquid nodes,
|
||||
* respectively.
|
||||
* @param flowParams the source params
|
||||
* @param textures A string stating the filename of the textures image.
|
||||
* @param light The amount of light from 0 to 255 to be emitted.
|
||||
* @return The MapNode object that has been created and added to the
|
||||
* manager.
|
||||
* @throws MossWorldLoadException If an exception occurs during the execution of the
|
||||
* registering.
|
||||
*/
|
||||
public LiquidNode registerLiquid(@NonNls String sysname, String userFacingName,
|
||||
LiquidNodeParams params, LiquidNodeParams flowParams,
|
||||
String textures, int light) throws MossWorldLoadException {
|
||||
LiquidNode nd = new LiquidNode(params, textures, sysname,
|
||||
userFacingName, light);
|
||||
this.nm.putNode(nd);
|
||||
nd.level = 0;
|
||||
for (int i = 1; i < 8; i++) {
|
||||
LiquidNode innerNd = new LiquidNode(flowParams, textures, sysname
|
||||
+ "$LEVEL$" + i, userFacingName, light); //$NON-NLS-1$
|
||||
innerNd.setByBounds(-.5f, .5f, -.5f, .5f, -.5f, (i / 8f) - 0.5f);
|
||||
nd.liquidLevels[i] = innerNd;
|
||||
innerNd.liquidLevels = nd.liquidLevels;
|
||||
innerNd.level = i;
|
||||
this.nm.putNode(innerNd);
|
||||
}
|
||||
nd.liquidLevels[0] = nd;
|
||||
return nd;
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a node alias. Since the map generator and scripts work via
|
||||
* string names, registering an alias of mg:dirt to myscript:specialdirt
|
||||
* will cause a mapgen that recognizes mg:dirt as a generated element to use
|
||||
* specialdirt for that.
|
||||
*
|
||||
* @param alias The alias to create, i.e. mg:dirt
|
||||
* @param dst The existing node to set as the alias target, i.e
|
||||
* myscript:specialdirt. This element must already exist.
|
||||
*/
|
||||
public void registerNodeAlias(String alias, String dst) {
|
||||
this.nm.putNodeAlias(alias, dst);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the inv by name.
|
||||
*
|
||||
* @param player the player
|
||||
* @param name the name
|
||||
* @return the inv by name
|
||||
*/
|
||||
public MossInventory getInvByName(Player player, String name) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the inv by name.
|
||||
*
|
||||
* @param p the p
|
||||
* @param name the name
|
||||
* @return the moss inventory
|
||||
*/
|
||||
public MossInventory createInvByName(Player p, String name) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the player by name.
|
||||
*
|
||||
* @param name the name
|
||||
* @return the player by name
|
||||
*/
|
||||
public Player getPlayerByName(String name) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the node by name.
|
||||
*
|
||||
* @param name the name
|
||||
* @return the node by name
|
||||
*/
|
||||
public MapNode getNodeByName(String name) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the db.
|
||||
*
|
||||
* @return the db
|
||||
*/
|
||||
public ScriptableDatabase getDb() {
|
||||
return this.db;
|
||||
}
|
||||
|
||||
/**
|
||||
* Instantiates a new moss script env.
|
||||
*
|
||||
* @param db the db
|
||||
* @param nc the nc
|
||||
* @param fp the fp
|
||||
* @param nm the nm
|
||||
*/
|
||||
public MossScriptEnv(ScriptableDatabase db, MapCache nc,
|
||||
FuturesProcessor fp, INodeManager nm) {
|
||||
this.db = db;
|
||||
this.nc = nc;
|
||||
this.fp = fp;
|
||||
this.nm = nm;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the futures processor.
|
||||
*
|
||||
* @return the futures processor
|
||||
*/
|
||||
public FuturesProcessor getFuturesProcessor() {
|
||||
return this.fp;
|
||||
}
|
||||
|
||||
private HashMap<Class<? extends IMossEvent>, List<WrappedHandler>> handlers = new HashMap<>();
|
||||
|
||||
public List<WrappedHandler> getEventHandlers(
|
||||
Class<? extends IMossEvent> clazz) {
|
||||
List<WrappedHandler> l = Collections.unmodifiableList(handlers.get(clazz));
|
||||
if (l == null) {
|
||||
handlers.put(clazz, new ArrayList<WrappedHandler>());
|
||||
return Collections.EMPTY_LIST;
|
||||
}
|
||||
return l;
|
||||
|
||||
}
|
||||
|
||||
public void registerHandler(MossEventHandler handler, Class<? extends IMossEvent> clazz) {
|
||||
List<WrappedHandler> l = handlers.get(clazz);
|
||||
if (l == null) {
|
||||
l = new ArrayList<WrappedHandler>();
|
||||
handlers.put(clazz, l);
|
||||
}
|
||||
l.add(new WrappedHandler(handler, this.requestedScriptApiVer.get()));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
>>>>>>> netclient
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ public class Player {
|
|||
*/
|
||||
private HashMap<String, MossInventory> inventories = new HashMap<>();
|
||||
|
||||
public int playerId;
|
||||
|
||||
/**
|
||||
* The name.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package net.mosstest.scripting;
|
||||
|
||||
import net.mosstest.scripting.handlers.MossEventHandler;
|
||||
|
||||
/**
|
||||
* Created by hexafraction on 5/3/14.
|
||||
*/
|
||||
public class WrappedHandler {
|
||||
private final MossEventHandler handler;
|
||||
private final short requestedApiVer;
|
||||
public WrappedHandler(MossEventHandler handler, short requestedApiVer) {
|
||||
this.handler = handler;
|
||||
this.requestedApiVer = requestedApiVer;
|
||||
}
|
||||
|
||||
public MossEventHandler getHandler() {
|
||||
return handler;
|
||||
}
|
||||
|
||||
public short getRequestedApiVer() {
|
||||
return requestedApiVer;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#This properties file describes game tidbits such as item names, materials, and other things a player might interact with. These are for modders' convenience.
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
AntiCheatController.THREAD_NAME=antitruffa
|
||||
MossEvent.MSG_CROSS_DMZ_SECURITY_WARNING=Tentativo di accedere alle risorse controllate nello script DMZ.
|
||||
ScriptableDatabase.DB_NAME_INVALID=Nome della banca dati non valido.
|
||||
INV_IOEXCEPTION_FATAL=IOException durante la serializzazione di un inventario. IL MONDO CADRA' A BREVE.
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
package net.mosstest.servercore;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -34,3 +35,41 @@ public abstract class AbstractMossScript {
|
|||
return name.hashCode();
|
||||
}
|
||||
}
|
||||
=======
|
||||
package net.mosstest.servercore;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
public abstract class AbstractMossScript {
|
||||
|
||||
protected AbstractMossScript(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@org.jetbrains.annotations.NonNls
|
||||
protected final String name;
|
||||
public abstract void exec(ScriptEnv sEnv) throws IOException, MossWorldLoadException;
|
||||
|
||||
public abstract IMossFile getInitFile() throws IOException;
|
||||
|
||||
public abstract List<AbstractMossScript> getDependencies();
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (!(o instanceof AbstractMossScript)) return false;
|
||||
|
||||
AbstractMossScript that = (AbstractMossScript) o;
|
||||
|
||||
if (!name.equals(that.name)) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return name.hashCode();
|
||||
}
|
||||
}
|
||||
>>>>>>> netclient
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package net.mosstest.servercore;
|
||||
|
||||
import net.mosstest.client.ClientNetworkingManager;
|
||||
import net.mosstest.scripting.Position;
|
||||
|
||||
// TODO: Auto-generated Javadoc
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package net.mosstest.servercore;
|
||||
|
||||
import net.mosstest.client.ClientNetworkingManager;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ package net.mosstest.servercore;
|
|||
public class CommonNetworking {
|
||||
|
||||
/** The Constant magic. */
|
||||
static final int magic=0xfa7d2e4a;
|
||||
public static final int magic=0xfa7d2e4a;
|
||||
|
||||
/** The Constant magicNoAck. */
|
||||
static final int magicNoAck=0xfa7d2e4f;
|
||||
public static final int magicNoAck=0xfa7d2e4f;
|
||||
|
||||
/** The Constant magicAck. */
|
||||
static final int magicAck=0xfa7d2740;
|
||||
public static final int magicAck=0xfa7d2740;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
package net.mosstest.servercore;
|
||||
|
||||
import net.mosstest.scripting.MapNode;
|
||||
import net.mosstest.scripting.MossScriptEnv;
|
||||
import net.mosstest.scripting.MossScriptException;
|
||||
import net.mosstest.scripting.NodePosition;
|
||||
import net.mosstest.scripting.*;
|
||||
import net.mosstest.scripting.events.IMossEvent;
|
||||
import net.mosstest.scripting.events.MossNodeChangeEvent;
|
||||
import net.mosstest.scripting.events.ThreadStopEvent;
|
||||
|
|
@ -27,9 +24,9 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||
* The Class EventProcessor.
|
||||
*
|
||||
* @author rarkenin, hexafraction
|
||||
* <p>
|
||||
* <p/>
|
||||
* Blargh.
|
||||
* <p>
|
||||
* <p/>
|
||||
* This is a nasty thread pool. If you don't understand threading or
|
||||
* Java well, you may want to stick to only accessing the queue as
|
||||
* otherwise asphyxiation, drowning, or chlorine poisoning may occur.
|
||||
|
|
@ -101,10 +98,10 @@ public class EventProcessor {
|
|||
}
|
||||
|
||||
private void dispatchEvent(IMossEvent evt) {
|
||||
List<MossEventHandler> evtHandlerList = this.ev
|
||||
List<WrappedHandler> evtHandlerList = this.ev
|
||||
.getEventHandlers(evt.getClass());
|
||||
try {
|
||||
for (MossEventHandler ourHandler : evtHandlerList) {
|
||||
for (WrappedHandler ourHandler : evtHandlerList) {
|
||||
if (dispatchEventInner(ourHandler, evt)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -116,13 +113,16 @@ public class EventProcessor {
|
|||
}
|
||||
}
|
||||
|
||||
private boolean dispatchEventInner(MossEventHandler ourHandler,
|
||||
private boolean dispatchEventInner(WrappedHandler wrappedHandler,
|
||||
IMossEvent evt) throws IllegalArgumentException {
|
||||
MossEventHandler ourHandler = wrappedHandler.getHandler();
|
||||
try {
|
||||
if (evt instanceof MossNodeChangeEvent) {
|
||||
|
||||
return ((MossNodeChangeHandler) ourHandler)
|
||||
.onAction((MossNodeChangeEvent) evt);
|
||||
{
|
||||
this.ev.setRequestedScriptApiVer(wrappedHandler.getRequestedApiVer());
|
||||
return ((MossNodeChangeHandler) ourHandler)
|
||||
.onAction((MossNodeChangeEvent) evt);
|
||||
}
|
||||
|
||||
} else
|
||||
throw new IllegalArgumentException(
|
||||
|
|
@ -174,7 +174,8 @@ public class EventProcessor {
|
|||
processEvents();
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
);
|
||||
threads[c].start();
|
||||
|
||||
EventProcessor.this.currentThreads.incrementAndGet();
|
||||
|
|
@ -199,7 +200,8 @@ public class EventProcessor {
|
|||
processEvents();
|
||||
}
|
||||
|
||||
}).run();
|
||||
}
|
||||
).run();
|
||||
EventProcessor.this.currentThreads
|
||||
.incrementAndGet();
|
||||
|
||||
|
|
@ -221,11 +223,11 @@ public class EventProcessor {
|
|||
}
|
||||
}
|
||||
}
|
||||
}, Messages.getString("EventProcessor.THREAD_NAME_MGR"));
|
||||
}, Messages.getString("EventProcessor.THREAD_NAME_MGR")
|
||||
);
|
||||
manager.start();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,61 @@ package net.mosstest.servercore;
|
|||
|
||||
import com.jme3.asset.AssetLocator;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.channels.FileChannel;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.List;
|
||||
|
||||
public interface IFileManager {
|
||||
static String getHash(File f) throws IOException,
|
||||
NoSuchAlgorithmException, FileNotFoundException {
|
||||
|
||||
|
||||
MessageDigest md = MessageDigest.getInstance("SHA-256");
|
||||
|
||||
try (FileInputStream fis = new FileInputStream(f)) {
|
||||
try (FileChannel fc = fis.getChannel()) {
|
||||
ByteBuffer bbf = ByteBuffer.allocateDirect(LocalFileManager.HASHING_BUFFER_SIZE);
|
||||
|
||||
int bytesRead;
|
||||
|
||||
bytesRead = fc.read(bbf);
|
||||
|
||||
while ((bytesRead != -1) && (bytesRead != 0)) {
|
||||
bbf.flip();
|
||||
|
||||
|
||||
md.update(bbf);
|
||||
|
||||
bbf.clear();
|
||||
bytesRead = fc.read(bbf);
|
||||
}
|
||||
|
||||
fis.close();
|
||||
|
||||
byte[] mdBytes = md.digest();
|
||||
|
||||
StringBuilder hexString = new StringBuilder();
|
||||
|
||||
for (byte b : mdBytes) {
|
||||
hexString.append(Integer.toHexString((LocalFileManager.BYTE_CAST_MASK & b)));
|
||||
}
|
||||
|
||||
return hexString.toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public IMossFile getFile(String name) throws IOException;
|
||||
|
||||
public void registerFile(String name, String sha256, long size);
|
||||
public void registerFile(String name, String sha256, long size) throws IOException;
|
||||
|
||||
public void receiveFileChunk(String sha512, int chunkId, ByteBuffer buf) throws IOException;
|
||||
public void receiveFileChunk(String sha256, int chunkId, ByteBuffer buf) throws IOException;
|
||||
|
||||
public Class<? extends AssetLocator> getAssetLocatorClass();
|
||||
|
||||
|
|
|
|||
|
|
@ -19,4 +19,8 @@ public interface IMossFile {
|
|||
public String getSha256();
|
||||
|
||||
public String getName();
|
||||
|
||||
public boolean isComplete();
|
||||
|
||||
public long getSize();
|
||||
}
|
||||
|
|
@ -34,6 +34,17 @@ public class LocalFile implements IMossFile {
|
|||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isComplete() {
|
||||
// local files are always complete
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getSize() {
|
||||
return f.length();
|
||||
}
|
||||
|
||||
private final String sha256;
|
||||
|
||||
public LocalFile(String name, File f) throws IOException, FileNotFoundException {
|
||||
|
|
@ -47,7 +58,7 @@ public class LocalFile implements IMossFile {
|
|||
this.numChunks = (int) Math.ceil(this.length
|
||||
/ ((double) IMossFile.CHUNK_SIZE));
|
||||
try {
|
||||
this.sha256 = LocalFileManager.getHash(f);
|
||||
this.sha256 = IFileManager.getHash(f);
|
||||
logger.info(MessageFormat.format(Messages.getString("HASH_SUCCESS"), f.getAbsolutePath(), this.sha256));
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
logger.error(MessageFormat.format(Messages.getString("ALGO_NOT_FOUND"), f.getAbsolutePath()));
|
||||
|
|
|
|||
|
|
@ -93,45 +93,6 @@ public class LocalFileManager implements IFileManager {
|
|||
|
||||
}
|
||||
|
||||
public static String getHash(File f) throws IOException,
|
||||
NoSuchAlgorithmException, FileNotFoundException {
|
||||
|
||||
|
||||
MessageDigest md = MessageDigest.getInstance("SHA-256"); //NON-NLS
|
||||
|
||||
try (FileInputStream fis = new FileInputStream(f)) {
|
||||
try (FileChannel fc = fis.getChannel()) {
|
||||
ByteBuffer bbf = ByteBuffer.allocateDirect(HASHING_BUFFER_SIZE);
|
||||
|
||||
int bytesRead;
|
||||
|
||||
bytesRead = fc.read(bbf);
|
||||
|
||||
while ((bytesRead != -1) && (bytesRead != 0)) {
|
||||
bbf.flip();
|
||||
|
||||
|
||||
md.update(bbf);
|
||||
|
||||
bbf.clear();
|
||||
bytesRead = fc.read(bbf);
|
||||
}
|
||||
|
||||
fis.close();
|
||||
|
||||
byte[] mdBytes = md.digest();
|
||||
|
||||
StringBuilder hexString = new StringBuilder();
|
||||
|
||||
for (byte b : mdBytes) {
|
||||
hexString.append(Integer.toHexString((BYTE_CAST_MASK & b)));
|
||||
}
|
||||
|
||||
return hexString.toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<? extends IMossFile> getFiles() {
|
||||
return ImmutableList.copyOf(files.values());
|
||||
|
|
|
|||
|
|
@ -4,40 +4,19 @@ package net.mosstest.servercore;
|
|||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* The Class MossNetPacket.
|
||||
*/
|
||||
public class MossNetPacket {
|
||||
|
||||
/**
|
||||
* The command id.
|
||||
*/
|
||||
int commandId;
|
||||
public int commandId;
|
||||
|
||||
/**
|
||||
* The payload.
|
||||
*/
|
||||
byte[] payload;
|
||||
public byte[] payload;
|
||||
|
||||
/**
|
||||
* The needs fast.
|
||||
*/
|
||||
boolean needsFast;
|
||||
public boolean needsFast;
|
||||
|
||||
/**
|
||||
* The needs ack.
|
||||
*/
|
||||
boolean needsAck;
|
||||
public boolean needsAck;
|
||||
|
||||
/**
|
||||
* The is important.
|
||||
*/
|
||||
boolean isImportant;
|
||||
public boolean isImportant;
|
||||
|
||||
/**
|
||||
* The sess.
|
||||
*/
|
||||
ServerSession sess;
|
||||
public ServerSession sess;
|
||||
|
||||
/**
|
||||
* Constructs a packet, for either sending or from receiving.
|
||||
|
|
|
|||
|
|
@ -14,10 +14,13 @@ import org.jetbrains.annotations.NonNls;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public class MossWorld {
|
||||
static {
|
||||
System.setSecurityManager(MosstestSecurityManager.instance);
|
||||
Messages.changeLanguage(Locale.ITALIAN);
|
||||
net.mosstest.scripting.Messages.changeLanguage(Locale.ITALIAN);
|
||||
}
|
||||
|
||||
static Logger logger = Logger.getLogger(MossWorld.class);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
AbstractNodeManager.DESC_UNKNOWN_NODE=Un pezzo sconosciuto del mondo
|
||||
ClientNetworkingManager.DESC_NETWORK_TIMEOUT=La connessione al server \u00E8 stata persa o \u00E8 diventata troppo lenta per continuare. \nProbabilmente questo \u00E8 dovuto a una connessione instabile, WiFi debole, cavi allentati, o un problema di firewall.
|
||||
ClientNetworkingManager.THREAD_NET_TIMEOUT=netTimeout
|
||||
ClientNetworkingManager.THREAD_QUEUEING=netClientSendQueue
|
||||
DefaultEventHandlers.NO_SUCH_CMD=Comando di chat inesistente.
|
||||
EventProcessor.MSG_ADD_DYNAMIC=Thread aggiunto dinamicamente
|
||||
EventProcessor.MSG_STOP_ONE_THREAD=Arresto di un thread...
|
||||
EventProcessor.MSG_THREAD_START=E' iniziato un thread di lavoro.
|
||||
EventProcessor.THREAD_NAME_MGR=EventProcessorManager
|
||||
EventProcessor.THREADGROUP=EventProcessor
|
||||
FuturesProcessor.FUTURES_THREAD=futuri
|
||||
LocalRenderPreparator.MG_EXCEPT=Il generatore di mappe ha emesso una eccezione.
|
||||
LocalRenderPreparator.MSG_REQUESTED=Aree richieste {0}, {1}, {2}.
|
||||
LocalRenderPreparator.START_MSG=Il preparatore di rendering locale si sta avviando.
|
||||
MapChunk.BAD_SER_VER=Versione di serializzazione sbagliata
|
||||
MapDatabase.ERR_DB_FAIL=Caricamento della banca dati fallito.
|
||||
MossDebugUtils.27=git.build.time
|
||||
MossDebugUtils.MSG_BUILT_ON=Costruito su\:
|
||||
MossDebugUtils.MSG_CORES=Processori disponibili\:
|
||||
MossDebugUtils.MSG_EXCEPTION_CAUGHT=<<<Exception caught>>> \n
|
||||
MossDebugUtils.MSG_FREE_SPACE=Spazio libero (byte)\:
|
||||
MossDebugUtils.MSG_FREEMEM=Memoria libera (byte)\:
|
||||
MossDebugUtils.MSG_FS_ROOT=File sistem radice\:
|
||||
MossDebugUtils.MSG_IO_EXCEPTION=IOException in caricamento, forse inesistente?
|
||||
MossDebugUtils.MSG_JAVA_PROPS=<<<Java properties>>>\n
|
||||
MossDebugUtils.MSG_MAXMEM=Memoria massima (byte)\:
|
||||
MossDebugUtils.MSG_MEM_NO_LIMIT=nessun limite
|
||||
MossDebugUtils.MSG_SYS_PROPS=<<<System properties>>>\n
|
||||
MossDebugUtils.MSG_TOTAL_MEM=Memoria totale (byte)\:
|
||||
MossDebugUtils.MSG_TOTAL_SPACE=Spazio totale (byte)\:
|
||||
MossDebugUtils.MSG_USABLE_SPACE=Spazio utilizzabile (byte)\:
|
||||
MossGame.CFG_LOAD_ERR=Errore nel caricamento del file di configurazione.
|
||||
MossGame.DIR_OR_CFG_NOT_FOUND=Cartella del gioco o file di configurazione non trovati.
|
||||
MossGame.FILE_NOT_FOUND=Il file {0} non \u00E8 stato trovato.
|
||||
MossScript.[NAME]_NOT_FOUND=\ non trovato\!
|
||||
MossScript.MSG_IO_EXCEPTION=IOException con lo script chiamato
|
||||
MossScript.MSG_OOPS=Abbiamo per le mani una situazione estremamente inaspettata
|
||||
MossScript.MSG_SCRIPT_NAMED_[NAME]=Script chiamato
|
||||
MossTest.PORT_DESC=Numero della porta da usare
|
||||
MossTest.RUN_STANDALONE=Eseguire come server autonomo
|
||||
MossWorld.ERR_DB=E' avvenuto un errore nell'apertura della banca dati. Probabilmente non \u00E8 accessibile, su un disco pieno, o corrotta.
|
||||
MossWorld.MG_SELECT_FAILURE=Non \u00E8 stato possibile inserire il seme nel generatore di mappe.
|
||||
MossWorld.NO_GAME_ID=Non \u00E8 specificato lo ID del gioco. Lo ID del gioco deve essere specificato in game.xml come <gameid>pincopallino</gameid> dove data/games/pincopallino \u00E8 una cartella con un gioco valido.
|
||||
MossWorld.NO_NETWORKING_NOW=La connettivit\u00E0 non \u00E8 completa in questa versione.
|
||||
NodeManager.DESC_UNKNWN_NODE=Un pezzo sconosciuto del mondo
|
||||
ScriptEnv.ERR_SCRIPT_ERR=E'' avvenuto un errore di script. Eccezione impacchettata\: {0} \n
|
||||
ServerNetworkingManager.ACCEPT_THREAD=svrNetAccept
|
||||
ServerNetworkingManager.CONN_THREAD_NAME=thread di connessione
|
||||
ServerNetworkingManager.THREADGROUP=SvrNetGroup
|
||||
PACKET_INVALID_MAGIC=E'' stato ricevuto un pacchetto con un numero magico non valido ed \u00E8 stato gettato.
|
||||
SERVER_CONN_TIMEOUT=La connessione al server \u00E8 scaduta o fallita in un altro modo.
|
||||
FIXME_MESSAGE=Toccato un blocco di codice che rappresenta una funzionalit\u00E0 mancante. Per favore compilate un rapporto di bug oppure ricordatelo bruscamente agli sviluppatori in un altro modo.
|
||||
EVENT_PROCESS_EXCEPTION=Notato {0} nell''elaborazione di un evento di tipo {1}. Il messaggio dell''eccezione era {2}.
|
||||
Loading…
Reference in New Issue