From b31e34610c273a5386fe9a649ad490ba00db233f Mon Sep 17 00:00:00 2001 From: spaffel Date: Thu, 16 Jun 2022 16:03:07 +0200 Subject: [PATCH] Clan MSGs --- src/main/java/de/spaffel/clans/Clans.java | 7 +- .../de/spaffel/clans/commands/clanmsg.java | 65 +++++++++++++++++++ .../spaffel/clans/commands/setclancolor.java | 3 +- .../de/spaffel/clans/commands/utils/Tab.java | 26 ++++---- .../clans/commands/utils/apicheck.java | 54 +++++++-------- src/main/resources/plugin.yml | 3 +- 6 files changed, 113 insertions(+), 45 deletions(-) create mode 100644 src/main/java/de/spaffel/clans/commands/clanmsg.java diff --git a/src/main/java/de/spaffel/clans/Clans.java b/src/main/java/de/spaffel/clans/Clans.java index 8c9f47c..43a4953 100644 --- a/src/main/java/de/spaffel/clans/Clans.java +++ b/src/main/java/de/spaffel/clans/Clans.java @@ -1,15 +1,11 @@ package de.spaffel.clans; +import de.spaffel.clans.commands.*; import net.luckperms.api.LuckPerms; import net.luckperms.api.model.user.User; import net.luckperms.api.event.EventBus; import net.luckperms.api.event.log.LogPublishEvent; import net.luckperms.api.event.user.UserLoadEvent; import net.luckperms.api.event.user.track.UserPromoteEvent; -import de.spaffel.clans.commands.test; -import de.spaffel.clans.commands.newclan; -import de.spaffel.clans.commands.leaveclan; -import de.spaffel.clans.commands.joinclan; -import de.spaffel.clans.commands.setclancolor; import de.spaffel.clans.commands.utils.jsonutil; import de.spaffel.clans.commands.utils.apicheck; import de.spaffel.clans.commands.utils.Tab; @@ -101,6 +97,7 @@ public final class Clans extends JavaPlugin implements Listener { getCommand("leaveclan").setExecutor(new leaveclan()); getCommand("joinclan").setExecutor(new joinclan()); getCommand("setclancolor").setExecutor(new setclancolor()); + getCommand("clanmsg").setExecutor(new clanmsg()); plugin = this; PluginManager pm = Bukkit.getPluginManager(); Tab.update(); diff --git a/src/main/java/de/spaffel/clans/commands/clanmsg.java b/src/main/java/de/spaffel/clans/commands/clanmsg.java new file mode 100644 index 0000000..3c6c7e3 --- /dev/null +++ b/src/main/java/de/spaffel/clans/commands/clanmsg.java @@ -0,0 +1,65 @@ +package de.spaffel.clans.commands; +import de.spaffel.clans.Clans; +import de.spaffel.clans.commands.utils.Tab; +import de.spaffel.clans.commands.utils.jsonutil; +import org.bukkit.Bukkit; + +import org.bukkit.ChatColor; +import org.bukkit.OfflinePlayer; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.ScoreboardManager; +import org.bukkit.scoreboard.Team; + +public class clanmsg implements CommandExecutor { + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + + if (args.length > 0){ + + String msg = ""; + + + String Clanid =""; + + + + Clanid = jsonutil.getClanOfPlayer(jsonutil.getUUID(sender.getName())); + + if(!(Clanid == null)){ + if(!(Clanid.equals("0"))){ + for(String arg : args){ + + msg = msg + arg + " "; + + } + for(Player p : Bukkit.getOnlinePlayers()) { + if(Clanid.equals(jsonutil.getClanOfPlayer(String.valueOf(p.getUniqueId())))){ + + + + p.sendMessage("§6[Clan-MSG] §e" + sender.getName() + " §a➠ " + jsonutil.getPrefix(String.valueOf(p.getUniqueId())) + ": " + msg); + + } + } + + } + + } + + + + + return true; + + } + return true; + } +} + + + diff --git a/src/main/java/de/spaffel/clans/commands/setclancolor.java b/src/main/java/de/spaffel/clans/commands/setclancolor.java index 03d9aed..b6cf795 100644 --- a/src/main/java/de/spaffel/clans/commands/setclancolor.java +++ b/src/main/java/de/spaffel/clans/commands/setclancolor.java @@ -15,6 +15,7 @@ import java.util.List; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import de.spaffel.clans.commands.utils.Tab; public class setclancolor implements TabExecutor { @@ -76,7 +77,7 @@ public class setclancolor implements TabExecutor { } jsonutil.setClanColor(jsonutil.getClanOfPlayer(leaderuuid), Colorcode); - + Tab.setPlayerteam((Player) sender, leaderuuid, playername); }else{ diff --git a/src/main/java/de/spaffel/clans/commands/utils/Tab.java b/src/main/java/de/spaffel/clans/commands/utils/Tab.java index bd99fa1..1a05567 100644 --- a/src/main/java/de/spaffel/clans/commands/utils/Tab.java +++ b/src/main/java/de/spaffel/clans/commands/utils/Tab.java @@ -8,8 +8,11 @@ import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.ScoreboardManager; import org.bukkit.scoreboard.Team; + + public class Tab { public static Thread t; + public static boolean spaffelsmp = true; public static void setTab() { Clans.update(); @@ -36,22 +39,21 @@ public class Tab { public static void setTab(Player p) { + if(spaffelsmp == true){ + String line = "§7"; + for (int i = 0; i != 12; i++) + line = String.valueOf(line) + "-"; + String head = "\n §a<§7" + line + "[§dSpaffel-Smp§7]" + line + "§a>\n" + "§eOnline§7: §a" + ( + Bukkit.getOnlinePlayers().size() + "§7/§a" + + Bukkit.getMaxPlayers() + "\n" + "§eTPS§7: §a" + TPSUtil.getTPS() + "\n"); + String foot = "\n§e/vote §afür Belohnungen!\n§e/Discord §aUmauf den Discord zu gelangen!\n<§7" + + line + "[§dSpaffel-Smp§7]" + line + "§a>\n"; + p.setPlayerListHeaderFooter(head, foot); - String line = "§7"; - for (int i = 0; i != 12; i++) - line = String.valueOf(line) + "-"; - String head = "\n §a<§7" + line + "[§dSpaffel-Smp§7]" + line + "§a>\n" + "§eOnline§7: §a"+ ( - - Bukkit.getOnlinePlayers().size() + "§7/§a" + - Bukkit.getMaxPlayers() + "\n" + "§eTPS§7: §a"+ TPSUtil.getTPS() + "\n"); - String foot = "\n§e/vote §afür Belohnungen!\n§e/Discord §aUmauf den Discord zu gelangen!\n<§7" + - line + "[§dSpaffel-Smp§7]" + line + "§a>\n"; - p.setPlayerListHeaderFooter(head, foot); - - + } } public static void setPlayerteam(Player player, String uuid, String Playername){ System.out.println("neue ranksetzen"); diff --git a/src/main/java/de/spaffel/clans/commands/utils/apicheck.java b/src/main/java/de/spaffel/clans/commands/utils/apicheck.java index b737104..a222c3c 100644 --- a/src/main/java/de/spaffel/clans/commands/utils/apicheck.java +++ b/src/main/java/de/spaffel/clans/commands/utils/apicheck.java @@ -10,35 +10,37 @@ public class apicheck { static public boolean doGet() { - try { - HttpURLConnection http = (HttpURLConnection) - new URL("http://spaffel.de/clans").openConnection(); - http.setRequestProperty("Accept-Charset", "UTF-8"); - http.setRequestMethod("GET"); + return true; + } + //try { + //HttpURLConnection http = (HttpURLConnection) + // new URL("http://spaffel.de/clans").openConnection(); + //http.setRequestProperty("Accept-Charset", "UTF-8"); + //http.setRequestMethod("GET"); // InputStream aus Verbindung bauen - InputStream inStream = http.getInputStream(); + //InputStream inStream = http.getInputStream(); // Input-Stream könnte per read in ein Array gelesen // werden. Eleganter ist allerdings ein BufferedReader - BufferedReader in = new BufferedReader( - new InputStreamReader(inStream)); + //BufferedReader in = new BufferedReader( + // new InputStreamReader(inStream)); // In antwort werden die eingelesenen Zeilen gesammelt - StringBuffer antwort = new StringBuffer(); - String empfangeneZeile; // für jede Zeile + //StringBuffer antwort = new StringBuffer(); + //String empfangeneZeile; // für jede Zeile // Lese zeilenweise .., - while ((empfangeneZeile = in.readLine()) != null) { - antwort.append(empfangeneZeile + "\n"); - } - in.close(); // Stream schließen und damit die Verbindung - System.out.println("antwort:" + antwort.toString()); - if(antwort.toString().contains("yes")){ - System.out.println("antwort:" + antwort.toString()); - return true; - }else{ - return false; - } - } catch (IOException e) { - e.printStackTrace(); - } - return false; - } + //while ((empfangeneZeile = in.readLine()) != null) { + //antwort.append(empfangeneZeile + "\n"); + //} + //in.close(); // Stream schließen und damit die Verbindung + //System.out.println("antwort:" + antwort.toString()); + //if(antwort.toString().contains("yes")){ + //System.out.println("antwort:" + antwort.toString()); + //return true; + //}else{ + //return false; + //} + //} catch (IOException e) { + //e.printStackTrace(); + //} + + //} } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 86f04b1..037bdf4 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -11,4 +11,5 @@ commands: newclan: leaveclan: joinclan: - setclancolor: \ No newline at end of file + setclancolor: + clanmsg: \ No newline at end of file