diff --git a/.gitignore b/.gitignore index ca8c13d..c3c9574 100644 --- a/.gitignore +++ b/.gitignore @@ -1,47 +1,4 @@ -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/jsLibraryMappings.xml -.idea - -# Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml - -# Gradle: -.idea/gradle.xml -.idea/libraries - -# Mongo Explorer plugin: -.idea/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -.class \ No newline at end of file +.idea/ +target/ +build/ +Pipeline.iml diff --git a/Pipeline.iml b/Pipeline.iml deleted file mode 100644 index d81155d..0000000 --- a/Pipeline.iml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7bd2b5f..8211ac9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.McAPI Pipeline - 0.2-alpha + 0.3-alpha @@ -30,7 +30,7 @@ maven-jar-plugin 2.3.1 - F:\Sponge Server\mods + E:\Servers\sponge\mods @@ -59,7 +59,7 @@ org.spongepowered spongeapi - 4.0.1 + 6.0.0 provided diff --git a/src/main/java/de/McAPI/Pipeline/Pipeline.java b/src/main/java/de/McAPI/Pipeline/Pipeline.java index f1168e2..d8f3e39 100644 --- a/src/main/java/de/McAPI/Pipeline/Pipeline.java +++ b/src/main/java/de/McAPI/Pipeline/Pipeline.java @@ -35,7 +35,7 @@ import java.security.Key; import java.util.Optional; -@Plugin(id = "pipeline", name = "Pipeline", version = "0.1-alpha", url = "http://mcapi.de", authors = "Yonas") +@Plugin(id = "pipeline", name = "Pipeline", version = "0.3-alpha", url = "http://mcapi.de", authors = "Yonas") public class Pipeline { public final static AttributeKey PLUGIN_ATTRIBUTE_KEY = AttributeKey.valueOf("key_pipeline_plugin"); @@ -151,21 +151,17 @@ protected void initChannel(NioSocketChannel channel) throws Exception { }) .bind(host, port) - .addListener(new ChannelFutureListener() { + .addListener((ChannelFutureListener) channelFuture -> { - public void operationComplete(ChannelFuture channelFuture) throws Exception { + if (channelFuture.isSuccess()) { + channel = channelFuture.channel(); + logger.info("Pipeline is now open."); + } else { + logger.info("Pipeline wasn't able to let the oil threw..."); - if (channelFuture.isSuccess()) { - channel = channelFuture.channel(); - logger.info("Pipeline is now open."); - } else { - logger.info("Pipeline wasn't able to let the oil threw..."); - - if (isDebug() && !(channelFuture.cause() == null)) { - logger.info(channelFuture.cause().getMessage()); - } + if (isDebug() && !(channelFuture.cause() == null)) { + logger.info(channelFuture.cause().getMessage()); } - } }); diff --git a/src/main/java/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.java b/src/main/java/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.java index 460b820..5ecfa41 100644 --- a/src/main/java/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.java +++ b/src/main/java/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.java @@ -61,7 +61,7 @@ protected void decode(ChannelHandlerContext context, String input, List } // If the key is null or it doesnt match the session key, then we will drop the connection. - if(providedKey == null || !(providedKey.toString().equals(session.getKey()))) { + if(providedKey == null || !(providedKey.equals(session.getKey()))) { if(pipeline.isDebug()) { pipeline.logger().info(String.format( "[%s] The provided key (%s) is not valid or not equals to the session key.", @@ -100,7 +100,6 @@ protected void decode(ChannelHandlerContext context, String input, List list.add(pipelineResponse); context.pipeline().remove(this); - } /** diff --git a/src/main/java/de/McAPI/Pipeline/protocol/PipelineResponseHandler.java b/src/main/java/de/McAPI/Pipeline/protocol/PipelineResponseHandler.java index cd3c2ff..91bd614 100644 --- a/src/main/java/de/McAPI/Pipeline/protocol/PipelineResponseHandler.java +++ b/src/main/java/de/McAPI/Pipeline/protocol/PipelineResponseHandler.java @@ -5,6 +5,7 @@ import de.McAPI.Pipeline.Session; import de.McAPI.Pipeline.exception.PipelineException; import de.McAPI.Pipeline.protocol.response.PipelineResponse; +import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; @@ -38,7 +39,11 @@ protected void channelRead0(ChannelHandlerContext context, PipelineResponse pipe JsonObject jsonObject = new JsonObject(); - int responseLength = pipelineResponse.getResponse().getBytes().length; + ByteBuf responseBuffer = Unpooled.copiedBuffer( + pipelineResponse.getResponse() + "\0", + StandardCharsets.UTF_8 + ); + int responseLength = responseBuffer.array().length; jsonObject.addProperty("length", responseLength); context.pipeline().writeAndFlush( @@ -55,12 +60,7 @@ protected void channelRead0(ChannelHandlerContext context, PipelineResponse pipe )); } - context.pipeline().writeAndFlush( - Unpooled.copiedBuffer( - pipelineResponse.getResponse() + "\0", - StandardCharsets.UTF_8 - ) - ).addListener(ChannelFutureListener.CLOSE); + context.pipeline().writeAndFlush(responseBuffer).addListener(ChannelFutureListener.CLOSE); if(pipeline.isDebug()) { pipeline.logger().info(String.format( @@ -73,8 +73,7 @@ protected void channelRead0(ChannelHandlerContext context, PipelineResponse pipe if(pipeline.isDebug()) { pipeline.logger().info(String.format( "[%s] Finished request.", - session.getDebugKey(), - responseLength + session.getDebugKey() )); } diff --git a/src/main/java/de/McAPI/Pipeline/protocol/response/PipelineResponse.java b/src/main/java/de/McAPI/Pipeline/protocol/response/PipelineResponse.java index 81d9605..7d53fae 100644 --- a/src/main/java/de/McAPI/Pipeline/protocol/response/PipelineResponse.java +++ b/src/main/java/de/McAPI/Pipeline/protocol/response/PipelineResponse.java @@ -103,7 +103,6 @@ public void build() { entry.addProperty("identifier", world.getUniqueId().toString()); entry.addProperty("name", world.getName()); entry.addProperty("difficulty", world.getDifficulty().getName()); - entry.addProperty("dimension", world.getDimension().getName()); entry.addProperty("generatorType", world.getDimension().getGeneratorType().getName()); diff --git a/target/classes/de/McAPI/Pipeline/Pipeline$1.class b/target/classes/de/McAPI/Pipeline/Pipeline$1.class index d1fb147..ea54958 100644 Binary files a/target/classes/de/McAPI/Pipeline/Pipeline$1.class and b/target/classes/de/McAPI/Pipeline/Pipeline$1.class differ diff --git a/target/classes/de/McAPI/Pipeline/Pipeline$2.class b/target/classes/de/McAPI/Pipeline/Pipeline$2.class deleted file mode 100644 index 19aafcf..0000000 Binary files a/target/classes/de/McAPI/Pipeline/Pipeline$2.class and /dev/null differ diff --git a/target/classes/de/McAPI/Pipeline/Pipeline.class b/target/classes/de/McAPI/Pipeline/Pipeline.class index fd7cf08..457c347 100644 Binary files a/target/classes/de/McAPI/Pipeline/Pipeline.class and b/target/classes/de/McAPI/Pipeline/Pipeline.class differ diff --git a/target/classes/de/McAPI/Pipeline/protocol/PipelineHandshakeHandler.class b/target/classes/de/McAPI/Pipeline/protocol/PipelineHandshakeHandler.class index 0e3bf7d..9a8bf3a 100644 Binary files a/target/classes/de/McAPI/Pipeline/protocol/PipelineHandshakeHandler.class and b/target/classes/de/McAPI/Pipeline/protocol/PipelineHandshakeHandler.class differ diff --git a/target/classes/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.class b/target/classes/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.class index fec6252..ffdd540 100644 Binary files a/target/classes/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.class and b/target/classes/de/McAPI/Pipeline/protocol/PipelineRequestDecoder.class differ diff --git a/target/classes/de/McAPI/Pipeline/protocol/PipelineResponseHandler.class b/target/classes/de/McAPI/Pipeline/protocol/PipelineResponseHandler.class index 2044a31..c025999 100644 Binary files a/target/classes/de/McAPI/Pipeline/protocol/PipelineResponseHandler.class and b/target/classes/de/McAPI/Pipeline/protocol/PipelineResponseHandler.class differ diff --git a/target/classes/de/McAPI/Pipeline/protocol/response/PipelineResponse.class b/target/classes/de/McAPI/Pipeline/protocol/response/PipelineResponse.class index 2d4f79a..b04354c 100644 Binary files a/target/classes/de/McAPI/Pipeline/protocol/response/PipelineResponse.class and b/target/classes/de/McAPI/Pipeline/protocol/response/PipelineResponse.class differ diff --git a/target/classes/mcmod.info b/target/classes/mcmod.info index a000793..8d582f7 100644 --- a/target/classes/mcmod.info +++ b/target/classes/mcmod.info @@ -2,10 +2,16 @@ { "modid": "pipeline", "name": "Pipeline", - "version": "0.1-alpha", + "version": "0.3-alpha", "url": "http://mcapi.de", "authorList": [ "Yonas" + ], + "dependencies": [ + "spongeapi@6.0.0" + ], + "requiredMods": [ + "spongeapi@6.0.0" ] } ] diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 1c0968f..cbb3afd 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Sun Apr 10 15:48:48 CEST 2016 -version=0.2-alpha +#Wed Nov 15 02:11:19 CET 2017 groupId=de.McAPI artifactId=Pipeline +version=0.3-alpha diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index bce4fd4..ce2f48d 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -3,9 +3,8 @@ de\McAPI\Pipeline\exception\PipelineException.class de\McAPI\Pipeline\Pipeline.class de\McAPI\Pipeline\protocol\response\PipelineResponse.class de\McAPI\Pipeline\protocol\PipelineRequestDecoder.class -de\McAPI\Pipeline\Pipeline$2.class de\McAPI\Pipeline\Token.class de\McAPI\Pipeline\Session.class mcmod.info -de\McAPI\Pipeline\protocol\PipelineHandshakeHandler.class de\McAPI\Pipeline\Pipeline$1.class +de\McAPI\Pipeline\protocol\PipelineHandshakeHandler.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 1a313c2..2caf94a 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,8 +1,8 @@ -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\Session.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\protocol\PipelineRequestDecoder.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\protocol\PipelineResponseHandler.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\protocol\response\PipelineResponse.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\exception\PipelineException.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\Pipeline.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\Token.java -G:\Q1\workspace\Pipeline\src\main\java\de\McAPI\Pipeline\protocol\PipelineHandshakeHandler.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\exception\PipelineException.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\protocol\PipelineRequestDecoder.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\protocol\response\PipelineResponse.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\Session.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\protocol\PipelineHandshakeHandler.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\Pipeline.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\protocol\PipelineResponseHandler.java +E:\workspace\private\Sponge-Pipeline\src\main\java\de\McAPI\Pipeline\Token.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000