diff --git a/.idea/artifacts/MCTPAudio_jar.xml b/.idea/artifacts/MCTPAudio_jar.xml
new file mode 100644
index 0000000..e6e74de
--- /dev/null
+++ b/.idea/artifacts/MCTPAudio_jar.xml
@@ -0,0 +1,9 @@
+
+
+ $PROJECT_DIR$/out/artifacts/MCTPAudio_jar
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Java_WebSocket_1_3_8.xml b/.idea/libraries/Java_WebSocket_1_3_8.xml
new file mode 100644
index 0000000..6d80218
--- /dev/null
+++ b/.idea/libraries/Java_WebSocket_1_3_8.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MCTPAudio.iml b/MCTPAudio.iml
index c185603..8d68862 100644
--- a/MCTPAudio.iml
+++ b/MCTPAudio.iml
@@ -16,7 +16,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
\ No newline at end of file
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d3ba355
--- /dev/null
+++ b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: me.mctp.Main
+
diff --git a/src/me/mctp/MCTPAudioCmd.java b/src/me/mctp/MCTPAudioCmd.java
index 9d53c2e..1783011 100644
--- a/src/me/mctp/MCTPAudioCmd.java
+++ b/src/me/mctp/MCTPAudioCmd.java
@@ -1,9 +1,11 @@
package me.mctp;
+import me.mctp.managers.PinManager;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
public class MCTPAudioCmd implements CommandExecutor {
@@ -13,7 +15,19 @@ public class MCTPAudioCmd implements CommandExecutor {
if (cmd.getName().equalsIgnoreCase("mctpaudio")) {
sender.sendMessage(prefix + "MCTP Audio command!");
} else if (cmd.getName().equalsIgnoreCase("audio")) {
- sender.sendMessage(prefix + "MCTP Audio connect command!");
+ if (!(sender instanceof Player)) {
+ sender.sendMessage(prefix + "Alleen spelers kunnen verbinden met onze audioclient.");
+ return true;
+ }
+
+ Player p = (Player) sender;
+ String pin = PinManager.getPIN(p.getUniqueId());
+
+ String url = "http://localhost/audio/index";
+ url = url + "?uuid=" + p.getUniqueId().toString().replace("-", "") + "&pin=" + pin;
+
+ sender.sendMessage(prefix + "Gebruik: " + url);
+ return true;
}
return false;
}
diff --git a/src/me/mctp/Main.java b/src/me/mctp/Main.java
index 54f6a4a..8f8c3ca 100644
--- a/src/me/mctp/Main.java
+++ b/src/me/mctp/Main.java
@@ -21,20 +21,23 @@ public class Main extends JavaPlugin implements Listener {
pl = this;
- client = new Client("SOCKET URL");
+ client = new Client("ws://144.91.100.169:30217");
client.connect();
+ getCommand("audio").setExecutor(new MCTPAudioCmd());
getCommand("mctpaudio").setExecutor(new MCTPAudioCmd());
- Bukkit.getLogger().info(prefix + " __ __ ____ _____ ____ _ _ _ ");
- Bukkit.getLogger().info(prefix + "| \\/ |/ ___|_ _| _ \\ / \\ _ _ __| (_) ___ ");
- Bukkit.getLogger().info(prefix + "| |\\/| | | | | | |_) | / _ \\| | | |/ _` | |/ _ \\ ");
- Bukkit.getLogger().info(prefix + "| | | | |___ | | | __/ / ___ \\ |_| | (_| | | (_) |");
- Bukkit.getLogger().info(prefix + "|_| |_|\\____| |_| |_| /_/ \\_\\__,_|\\__,_|_|\\___/ ");
+ Bukkit.getLogger().info(prefix + " __ __ ____ _____ ____ _ _ _ ");
+ Bukkit.getLogger().info(prefix + " | \\/ |/ ___|_ _| _ \\ / \\ _ _ __| (_) ___ ");
+ Bukkit.getLogger().info(prefix + " | |\\/| | | | | | |_) / _ \\| | | |/ _` | |/ _ \\ ");
+ Bukkit.getLogger().info(prefix + " | | | | |___ | | | __/ ___ \\ |_| | (_| | | (_) |");
+ Bukkit.getLogger().info(prefix + " |_| |_|\\____| |_| |_| /_/ \\_\\__,_|\\__,_|_|\\___/ ");
+ Bukkit.getLogger().info(prefix + " ");
Bukkit.getLogger().info(prefix + "successfully enabled!");
}
- public void onDisable(){
+ public void onDisable() {
+ client.disconnect();
Bukkit.getLogger().info(prefix + "successfully disabled!");
}
diff --git a/src/me/mctp/managers/PinManager.java b/src/me/mctp/managers/PinManager.java
index e4409c7..ac7a73d 100644
--- a/src/me/mctp/managers/PinManager.java
+++ b/src/me/mctp/managers/PinManager.java
@@ -1,5 +1,7 @@
package me.mctp.managers;
+import org.bukkit.Bukkit;
+
import java.security.SecureRandom;
import java.util.UUID;
import java.util.WeakHashMap;
@@ -56,6 +58,8 @@ public class PinManager {
return false;
}
+ Bukkit.getLogger().info("PIN IN DATA: " + pins.get(pUUID) + " || But got: " + pin);
+
return pins.containsKey(pUUID) && pin.equals(pins.get(pUUID));
}
diff --git a/src/me/mctp/socket/Client.java b/src/me/mctp/socket/Client.java
index f7f75db..e6cbd7f 100644
--- a/src/me/mctp/socket/Client.java
+++ b/src/me/mctp/socket/Client.java
@@ -65,18 +65,15 @@ public class Client {
if (pin == null || pin.isEmpty()) return;
UUID pUUID = UUID.fromString(JSONUtil.fixUUID(uuid));
- boolean verified = true;
- Player player = Bukkit.getPlayer(uuid);
- if (player == null || !player.isOnline()) {
- verified = false;
+ boolean verified = false;
+ if (Bukkit.getPlayer(pUUID) != null) {
+ verified = PinManager.checkPin(pUUID, pin);
}
- if (!PinManager.checkPin(pUUID, pin)) {
- verified = false;
- }
+ Bukkit.getLogger().info("VERIFIED IS: " + verified);
JSONObject reply = new JSONObject();
- reply.put("action", "AUTHENTICATION");
+ reply.put("task", "AUTHENTICATION");
reply.put("verified", verified);
reply.put("uuid", uuid);
this.send(reply.toJSONString());