From 68dd59b519cb6752889678a1ac02ee28d37397f1 Mon Sep 17 00:00:00 2001 From: 71616 <71616@B030-PC05.bse-s.loc> Date: Thu, 15 Nov 2018 14:57:07 +0100 Subject: [PATCH] Auth Object --- .gitignore | 3 ++- pom.xml | 13 +++++++++++++ .../cf/semikolon/teamspeak/FileSystem.java | 2 +- .../semikolon/teamspeak/query/QueryEvents.java | 18 +++++++++++++++++- .../semikolon/teamspeak/query/ServerQuery.java | 1 - 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 64adf36..a4a8025 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,5 @@ com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties fabric.properties -# Created by .ignore support plugin (hsz.mobi) \ No newline at end of file +# Created by .ignore support plugin (hsz.mobi) +/target/ diff --git a/pom.xml b/pom.xml index a7e0fb0..2f39642 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,18 @@ teamspeak 1.0-SNAPSHOT + + Tysox.de + tysox.de + + + + + + Jan-Lukas Pagel + jan-lukas.pagel@tysox.de + + @@ -82,4 +94,5 @@ + diff --git a/src/main/java/cf/semikolon/teamspeak/FileSystem.java b/src/main/java/cf/semikolon/teamspeak/FileSystem.java index 232619a..f6203e3 100644 --- a/src/main/java/cf/semikolon/teamspeak/FileSystem.java +++ b/src/main/java/cf/semikolon/teamspeak/FileSystem.java @@ -6,7 +6,7 @@ import java.io.File; import java.io.IOException; /** - * Created by jan on 25.07.16. + * Created by Jan-Lukas Pagel on 25.07.16. * * @version 4.0 */ diff --git a/src/main/java/cf/semikolon/teamspeak/query/QueryEvents.java b/src/main/java/cf/semikolon/teamspeak/query/QueryEvents.java index 05d727e..5000e4e 100644 --- a/src/main/java/cf/semikolon/teamspeak/query/QueryEvents.java +++ b/src/main/java/cf/semikolon/teamspeak/query/QueryEvents.java @@ -1,6 +1,9 @@ package cf.semikolon.teamspeak.query; import cf.semikolon.teamspeak.MainClass; +import cf.semikolon.teamspeak.Messages; +import cf.semikolon.teamspeak.objects.Authentication; + import com.github.theholywaffle.teamspeak3.api.TextMessageTargetMode; import com.github.theholywaffle.teamspeak3.api.event.*; import org.bukkit.Bukkit; @@ -30,8 +33,21 @@ public class QueryEvents implements TS3Listener { Player player = Bukkit.getPlayer(mcNick); if (player != null) { String authKey = MainClass.getInstance().getRandomString().nextString(); - player.sendMessage("§9[TeamSpeakAuth] §7Dein Verifizierungscode:" + authKey); + Authentication authentication = new Authentication(player.getUniqueId(), authKey); + player.sendMessage(Messages.PREFIX + String.format(Messages.YOUR_VERIFY_CODE, authKey)); + MainClass.getInstance().getServerQuery().getApi().sendPrivateMessage(textMessageEvent.getInvokerId(), "Sie haben nun in Minecraft eine VerifizierungsNummer erhalten"); + + } else { + /** + * Spieler nicht Online + */ + } + } else { + /** + * Keine korrekte Syntax + */ + } } } diff --git a/src/main/java/cf/semikolon/teamspeak/query/ServerQuery.java b/src/main/java/cf/semikolon/teamspeak/query/ServerQuery.java index bcb6b43..0b4bcbb 100644 --- a/src/main/java/cf/semikolon/teamspeak/query/ServerQuery.java +++ b/src/main/java/cf/semikolon/teamspeak/query/ServerQuery.java @@ -17,7 +17,6 @@ public class ServerQuery { public ServerQuery(String host, int queryPort, int tsPort, String queryUser, String queryPassword, String nickname) { this.tsconfig.setHost(host); this.tsconfig.setQueryPort(queryPort); - this.tsconfig.setDebugLevel(Level.ALL); this.query = new TS3Query(tsconfig); this.query.connect(); System.out.println("Successfully connected to TeamSpeak!\n Logging in...");