SBDevelopment/ThemeParkAudio
3
0
Fork 0
Code Issues Pull requests Activity Actions

A lot of fixes

Browse source
This commit is contained in:
stijnb1234 2020-05-06 16:13:46 +02:00
parent 03eca44be5
commit 73626afe80
8 changed files with 57 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.idea/artifacts/MCTPAudio_jar.xml generated Normal file
View file

@ -0,0 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="MCTPAudio:jar">
<output-path>$PROJECT_DIR$/out/artifacts/MCTPAudio_jar</output-path>
<root id="archive" name="MCTPAudio.jar">
<element id="module-output" name="MCTPAudio" />
<element id="extracted-dir" path="$USER_HOME$/Downloads/Java-WebSocket-1.3.8.jar" path-in-jar="/" />
</root>
</artifact>
</component>

9
.idea/libraries/Java_WebSocket_1_3_8.xml generated Normal file
View file

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="Java-WebSocket-1.3.8">
<CLASSES>
<root url="jar://$USER_HOME$/Downloads/Java-WebSocket-1.3.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

4
MCTPAudio.iml
View file

@ -16,7 +16,7 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library"> <orderEntry type="module-library" scope="PROVIDED">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/Documents/Minecarft Test Server 1.14.4/server.jar!/" /> <root url="jar://$USER_HOME$/Documents/Minecarft Test Server 1.14.4/server.jar!/" />
@ -27,7 +27,7 @@
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="spigot-1.14.4" level="project" /> <orderEntry type="library" scope="PROVIDED" name="spigot-1.14.4" level="project" />
<orderEntry type="library" name="Java-WebSocket-1.3.8" level="project" /> <orderEntry type="library" name="Java-WebSocket-1.3.8" level="project" />
</component> </component>
</module> </module>

3
src/META-INF/MANIFEST.MF Normal file
View file

@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: me.mctp.Main

16
src/me/mctp/MCTPAudioCmd.java
View file

@ -1,9 +1,11 @@
package me.mctp; package me.mctp;
import me.mctp.managers.PinManager;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class MCTPAudioCmd implements CommandExecutor { public class MCTPAudioCmd implements CommandExecutor {
@ -13,7 +15,19 @@ public class MCTPAudioCmd implements CommandExecutor {
if (cmd.getName().equalsIgnoreCase("mctpaudio")) { if (cmd.getName().equalsIgnoreCase("mctpaudio")) {
sender.sendMessage(prefix + "MCTP Audio command!"); sender.sendMessage(prefix + "MCTP Audio command!");
} else if (cmd.getName().equalsIgnoreCase("audio")) { } 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; return false;
} }

17
src/me/mctp/Main.java
View file

@ -21,20 +21,23 @@ public class Main extends JavaPlugin implements Listener {
pl = this; pl = this;
client = new Client("SOCKET URL"); client = new Client("ws://144.91.100.169:30217");
client.connect(); client.connect();
getCommand("audio").setExecutor(new MCTPAudioCmd());
getCommand("mctpaudio").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!"); Bukkit.getLogger().info(prefix + "successfully enabled!");
} }
public void onDisable(){ public void onDisable() {
client.disconnect();
Bukkit.getLogger().info(prefix + "successfully disabled!"); Bukkit.getLogger().info(prefix + "successfully disabled!");
} }

4
src/me/mctp/managers/PinManager.java
View file

@ -1,5 +1,7 @@
package me.mctp.managers; package me.mctp.managers;
import org.bukkit.Bukkit;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.UUID; import java.util.UUID;
import java.util.WeakHashMap; import java.util.WeakHashMap;
@ -56,6 +58,8 @@ public class PinManager {
return false; return false;
} }
Bukkit.getLogger().info("PIN IN DATA: " + pins.get(pUUID) + " || But got: " + pin);
return pins.containsKey(pUUID) && pin.equals(pins.get(pUUID)); return pins.containsKey(pUUID) && pin.equals(pins.get(pUUID));
} }

13
src/me/mctp/socket/Client.java
View file

@ -65,18 +65,15 @@ public class Client {
if (pin == null || pin.isEmpty()) return; if (pin == null || pin.isEmpty()) return;
UUID pUUID = UUID.fromString(JSONUtil.fixUUID(uuid)); UUID pUUID = UUID.fromString(JSONUtil.fixUUID(uuid));
boolean verified = true; boolean verified = false;
Player player = Bukkit.getPlayer(uuid); if (Bukkit.getPlayer(pUUID) != null) {
if (player == null || !player.isOnline()) { verified = PinManager.checkPin(pUUID, pin);
verified = false;
} }
if (!PinManager.checkPin(pUUID, pin)) { Bukkit.getLogger().info("VERIFIED IS: " + verified);
verified = false;
}
JSONObject reply = new JSONObject(); JSONObject reply = new JSONObject();
reply.put("action", "AUTHENTICATION"); reply.put("task", "AUTHENTICATION");
reply.put("verified", verified); reply.put("verified", verified);
reply.put("uuid", uuid); reply.put("uuid", uuid);
this.send(reply.toJSONString()); this.send(reply.toJSONString());