Merge dev

.github/workflows/master.yml

@@ -0,0 +1,30 @@
+name: Master CI
+
+on:
+  push:
+    branches:
+      - "master"
+
+jobs:
+  build:
+    runs-on: [ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Make gradlew executable
+      run: chmod +x ./gradlew
+    - name: Build with Gradle
+      run: ./gradlew build -x copyJar
+    - name: Release
+      uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "latest"
+        prerelease: false
+        title: "Release Build"
+        files: |
+          NetworkClient/build/libs/*.jar
+          NetworkProxy/build/libs/*.jar

.gitignore

@@ -105,7 +105,6 @@ fabric.properties
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.nar
 *.ear
@@ -118,7 +117,7 @@ hs_err_pid*
 
 ### Gradle ###
 .gradle
-build/
+**/build
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -132,7 +131,4 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
-### Gradle Patch ###
-**/build/
-
 # End of https://www.gitignore.io/api/java,gradle,intellij

NetworkClient/build.gradle

@@ -14,24 +14,24 @@ dependencies {
 task copyJar {
     doLast {
         copy {
-            from "$projectDir\\build\\libs\\NetworkClient-1.0.jar"
-            into "E:\\Sektory\\Center\\plugins"
+            from "$projectDir/build/libs/NetworkClient-1.0.jar"
+            into "E:/Sektory/Center/plugins"
         }
         copy {
-            from "$projectDir\\build\\libs\\NetworkClient-1.0.jar"
-            into "E:\\Sektory\\North\\plugins"
+            from "$projectDir/build/libs/NetworkClient-1.0.jar"
+            into "E:/Sektory/North/plugins"
         }
         copy {
-            from "$projectDir\\build\\libs\\NetworkClient-1.0.jar"
-            into "E:\\Sektory\\South\\plugins"
+            from "$projectDir/build/libs/NetworkClient-1.0.jar"
+            into "E:/Sektory/South/plugins"
         }
         copy {
-            from "$projectDir\\build\\libs\\NetworkClient-1.0.jar"
-            into "E:\\Sektory\\East\\plugins"
+            from "$projectDir/build/libs/NetworkClient-1.0.jar"
+            into "E:/Sektory/East/plugins"
         }
         copy {
-            from "$projectDir\\build\\libs\\NetworkClient-1.0.jar"
-            into "E:\\Sektory\\West\\plugins"
+            from "$projectDir/build/libs/NetworkClient-1.0.jar"
+            into "E:/Sektory/West/plugins"
         }
     }
 }

NetworkProxy/build.gradle

@@ -11,8 +11,8 @@ dependencies {
 task copyJar {
     doLast {
         copy {
-            from "$projectDir\\build\\libs\\NetworkProxy-1.0.jar"
-            into "E:\\Sektory\\aProxy\\plugins"
+            from "$projectDir/build/libs/NetworkProxy-1.0.jar"
+            into "E:/Sektory/aProxy/plugins"
         }
     }
 }

NetworkProxy/src/main/java/org/mcservernetwork/proxy/listener/bungee/ServerConnectListener.java

@@ -1,6 +1,7 @@
 package org.mcservernetwork.proxy.listener.bungee;
 
 import io.lettuce.core.RedisFuture;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -29,11 +30,11 @@ public void onServerConnect(ServerConnectEvent event) {
         data.thenAccept(packet -> {
             PlayerSectorData sectorData = (PlayerSectorData) packet;
 
-            String current = player.getServer().getInfo().getName();
+            ServerInfo current = player.getServer().getInfo();
             if (current == null)
-                current = event.getTarget().getName();
+                current = event.getTarget();
 
-            if (current.equals(sectorData.currentSectorName))
+            if (current.getName().equals(sectorData.currentSectorName))
                 return;
 
             PacketStatus status = ClientStatusHandler.get(sectorData.currentSectorName);
@@ -42,10 +43,7 @@ public void onServerConnect(ServerConnectEvent event) {
                 return;
             }
 
-            PacketTransfer transfer = new PacketTransfer();
-            transfer.targetSectorName = sectorData.currentSectorName;
-            transfer.uniqueId = player.getUniqueId().toString();
-            NetworkAPI.Net.publish(Channel.TRANSFER_REQUEST, transfer);
+            player.connect(current);
         });
     }