From 0410492f7658a2ae2ea5dc2afbab3fdaa597aa76 Mon Sep 17 00:00:00 2001
From: mathiascode <mail@mathias.is>
Date: Sun, 1 Dec 2019 02:08:12 +0200
Subject: [PATCH] Add config options, fix skin issue

---
 build.sh                                      |  4 +--
 .../extras/modules/player/PlayerChat.java     | 27 +++++++------------
 .../modules/player/PlayerConnection.java      | 15 ++++++++---
 src/main/resources/config.yml                 |  8 ++++++
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/build.sh b/build.sh
index 628a9f5..f66edf3 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
-mvn package
\ No newline at end of file
+#!/bin/sh
+mvn package
diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java
index 7df6695..9ac0eb5 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java
@@ -39,30 +39,23 @@ class PlayerChat implements Listener {
 		
 		final File configFile = new File(JavaPlugin.getPlugin(Main.class).getDataFolder(), "prefixes.yml");
 		final FileConfiguration prefixConfig = YamlConfiguration.loadConfiguration(configFile);
+		final String prefix;
+		final String name = player.getDisplayName().toString();
 
 		if (prefixConfig.getString(player.getUniqueId().toString()) != null) {
-			final String prefix = ChatColor.translateAlternateColorCodes(
+			prefix = ChatColor.translateAlternateColorCodes(
 				'&',
-				prefixConfig.getString(player.getUniqueId().toString())
+				prefixConfig.getString(player.getUniqueId().toString()) +  " " + ChatColor.RESET
 			);
-
-			event.setFormat(prefix + ChatColor.RESET + " " + player.getDisplayName().toString() + ChatColor.RESET + ": " + ChatColor.RESET + "%2$s");
 		} else if (event.getPlayer().isOp()) {
-			final String prefix = ChatColor.translateAlternateColorCodes(
-				'&',
-				"&4&l[&c&lOP&4&l]"
-			);
-
-			event.setFormat(prefix + ChatColor.RED + " " + player.getDisplayName().toString() + ChatColor.RESET + ": " + ChatColor.RESET + "%2$s");
+			prefix = JavaPlugin.getPlugin(Main.class).getConfig().getString("opTag");
 		} else {
-			final String prefix = ChatColor.translateAlternateColorCodes(
-				'&',
-				"&8&l[&7&lDeOP&8&l]"
-			);
-
-			event.setFormat(prefix + ChatColor.GRAY + " " + player.getDisplayName().toString() + ChatColor.RESET + ": " + ChatColor.RESET + "%2$s");
+			prefix = JavaPlugin.getPlugin(Main.class).getConfig().getString("deOpTag");
 		}
 
-		event.setMessage(ChatColor.translateAlternateColorCodes('&', event.getMessage()));
+		event.setFormat(prefix + name + ChatColor.RESET + ": " + ChatColor.RESET + "%2$s");
+		event.setMessage(
+			ChatColor.translateAlternateColorCodes('&', event.getMessage())
+		);
 	}
 }
diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
index 0896de1..b0bba6b 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
@@ -103,7 +103,9 @@ class PlayerConnection implements Listener {
 
 	@EventHandler
 	void onPlayerKick(PlayerKickEvent event) {
-		event.setCancelled(true);
+		if (!JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("enableKick")) {
+			event.setCancelled(true);
+		}
 	}
 
 	@EventHandler
@@ -116,8 +118,13 @@ class PlayerConnection implements Listener {
 
 		final Player player = event.getPlayer();
 
-		event.allow();
-		player.setOp(true);
+		if (!JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("enableJoinRestrictions")) {
+			event.allow();
+		}
+		
+		if (JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("opOnJoin")) {
+			player.setOp(true);
+		}
 
 		HttpClient client = HttpClient.newHttpClient();
 		HttpRequest request = HttpRequest.newBuilder()
@@ -142,7 +149,7 @@ class PlayerConnection implements Listener {
 
 				new BukkitRunnable() {
 					public void run() {
-						if (profile != null) {
+						if (player.isOnline()) {
 							player.setPlayerProfile(profile);
 						}
 					}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index cf9d344..77f0e82 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,2 +1,10 @@
+# Player connection
+enableKick: false
+enableJoinRestrictions: false
+opOnJoin: true
 playerJoinTitle: "§7Welcome to Kaboom!"
 playerJoinSubtitle: "Free OP • Anarchy • Creative"
+
+# Chat
+opTag: "§4§l[§c§lOP§4§l] §c"
+deOpTag: "§8§l[§7§lDeOP§8§l] §7"
\ No newline at end of file