Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

Commit

Permalink
Updated GitHub repository. Changed Spigot API version to 1.19.2. Ad…
Browse files Browse the repository at this point in the history 
…ded `PlayerConnectionEvent.java`. Added `PlayerDisconnectEvent.java`. Added new clan creation broadcast system. Added new clan join broadcast system. Fixed clan prefix length limits. Added new values to `config.yml`. Added new values to `messages.yml`. Added numerical value to clan members list. Changed PlaceholderAPI expansion version to `1.2.4`. Changed plugin version to `1.2.4`.
  • Loading branch information
BuildTools committed Aug 28, 2022
1 parent b20a0e4 commit beeb98d
Show file tree
Hide file tree
Showing 11 changed files with 132 additions and 20 deletions.
7 changes: 4 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<groupId>xyz.gamlin</groupId>
<artifactId>ClansLite</artifactId>
<version>1.2.3</version>
<version>1.2.4</version>
<packaging>jar</packaging>

<name>ClansLite</name>

<description>A simple clans plugin for Minecraft.</description>
<description>A simple and lightweight Clans plugin for Minecraft.</description>
<properties>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -75,11 +75,12 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/xyz/gamlin/clans/Clans.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package xyz.gamlin.clans;

import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
import xyz.gamlin.clans.commands.ClanAdmin;
Expand All @@ -9,6 +10,8 @@
import xyz.gamlin.clans.expansions.PlayerClanExpansion;
import xyz.gamlin.clans.files.ClansFileManager;
import xyz.gamlin.clans.files.MessagesFileManager;
import xyz.gamlin.clans.listeners.PlayerConnectionEvent;
import xyz.gamlin.clans.listeners.PlayerDisconnectEvent;
import xyz.gamlin.clans.listeners.PlayerMessageEvent;
import xyz.gamlin.clans.listeners.PlayerDamageEvent;
import xyz.gamlin.clans.updateSystem.JoinEvent;
Expand All @@ -18,6 +21,7 @@
import xyz.gamlin.clans.utils.TaskTimerUtils;

import java.io.IOException;
import java.util.HashMap;
import java.util.logging.Logger;

public final class Clans extends JavaPlugin {
Expand All @@ -30,6 +34,8 @@ public final class Clans extends JavaPlugin {
public MessagesFileManager messagesFileManager;
public ClansFileManager clansFileManager;

public static HashMap<Player, String> connectedPlayers = new HashMap<>();

@Override
public void onEnable() {
//Plugin startup logic
Expand Down Expand Up @@ -88,6 +94,8 @@ public void onEnable() {
this.getCommand("cc").setExecutor(new ClanChatCommand());

//Register the plugin events
this.getServer().getPluginManager().registerEvents(new PlayerConnectionEvent(), this);
this.getServer().getPluginManager().registerEvents(new PlayerDisconnectEvent(), this);
this.getServer().getPluginManager().registerEvents(new PlayerMessageEvent(), this);
this.getServer().getPluginManager().registerEvents(new PlayerDamageEvent(), this);
this.getServer().getPluginManager().registerEvents(new JoinEvent(), this);
Expand All @@ -111,7 +119,7 @@ public void onEnable() {

//Plugin startup message
logger.info(ColorUtils.translateColorCodes("-------------------------------------------"));
logger.info(ColorUtils.translateColorCodes("&6ClansLite: &3Plugin maintained by: &b&lLoving11ish"));
logger.info(ColorUtils.translateColorCodes("&6ClansLite: &3Plugin by: &b&lLoving11ish"));
logger.info(ColorUtils.translateColorCodes("&6ClansLite: &3has been loaded successfully"));
logger.info(ColorUtils.translateColorCodes("&6ClansLite: &3Plugin Version: &d&l" + pluginVersion));
logger.info(ColorUtils.translateColorCodes("-------------------------------------------"));
Expand Down Expand Up @@ -154,7 +162,7 @@ public void onDisable() {

//Safely stop the background tasks if running
logger.info(ColorUtils.translateColorCodes("-------------------------------------------"));
logger.info(ColorUtils.translateColorCodes("&6ClansLite: &3Plugin maintained by: &b&lLoving11ish"));
logger.info(ColorUtils.translateColorCodes("&6ClansLite: &3Plugin by: &b&lLoving11ish"));
try {
if (Bukkit.getScheduler().isCurrentlyRunning(TaskTimerUtils.taskID1)||Bukkit.getScheduler().isQueued(TaskTimerUtils.taskID1)){
Bukkit.getScheduler().cancelTask(TaskTimerUtils.taskID1);
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/xyz/gamlin/clans/commands/ClanAdmin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
}
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("save-completed")));
}


if (args[0].equalsIgnoreCase("reload")) {
Clans.getPlugin().reloadConfig();
try {
Expand All @@ -55,6 +57,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
Clans.getPlugin().messagesFileManager.reloadMessagesConfig();
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
}


if (args[0].equalsIgnoreCase("about")) {
sender.sendMessage(ColorUtils.translateColorCodes("&3~~~~~~~~~~ &6&nClansLite&r &3~~~~~~~~~~"));
sender.sendMessage(ColorUtils.translateColorCodes("&3Version: &6" + Clans.getPlugin().getDescription().getVersion()));
Expand All @@ -65,6 +69,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
sender.sendMessage(ColorUtils.translateColorCodes("&3~~~~~~~~~~ &6&nClansLite&r &3~~~~~~~~~~"));
}


}else {
sender.sendMessage(ColorUtils.translateColorCodes(
"&6ClansLite usage:&3" +
Expand All @@ -88,6 +93,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
}
logger.info(ColorUtils.translateColorCodes(messagesConfig.getString("save-completed")));
}


if (args[0].equalsIgnoreCase("reload")) {
Clans.getPlugin().reloadConfig();
try {
Expand All @@ -111,6 +118,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
Clans.getPlugin().messagesFileManager.reloadMessagesConfig();
logger.info(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
}


if (args[0].equalsIgnoreCase("about")) {
logger.info(ColorUtils.translateColorCodes("&3~~~~~~~~~~ &6ClansLite &3~~~~~~~~~~"));
logger.info(ColorUtils.translateColorCodes("&3Version: &6" + Clans.getPlugin().getDescription().getVersion()));
Expand All @@ -120,6 +129,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
logger.info(ColorUtils.translateColorCodes("&6" + Clans.getPlugin().getDescription().getWebsite()));
logger.info(ColorUtils.translateColorCodes("&3~~~~~~~~~~ &6ClansLite &3~~~~~~~~~~"));
}


}else {
sender.sendMessage(ColorUtils.translateColorCodes(
"&6ClansLite usage:&3" +
Expand Down
61 changes: 51 additions & 10 deletions src/main/java/xyz/gamlin/clans/commands/ClanCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class ClanCommand implements CommandExecutor {
int MIN_CHAR_LIMIT = clansConfig.getInt("clan-tags.min-character-limit");
int MAX_CHAR_LIMIT = clansConfig.getInt("clan-tags.max-character-limit");

private static final String PLAYER_PLACEHOLDER = "%PLAYER%";
private static final String CLAN_PLACEHOLDER = "%CLAN%";
private static final String INVITED_PLAYER = "%INVITED%";
private static final String PLAYER_TO_KICK = "%KICKEDPLAYER%";
Expand Down Expand Up @@ -161,10 +162,27 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String

if (!ClansStorageUtil.isClanExisting(player)) {
ClansStorageUtil.createClan(player, args[1]);
String clanCreated = ColorUtils.translateColorCodes(messagesConfig.getString("clan-created-successfully")).replace(CLAN_PLACEHOLDER, args[1]);
String clanCreated = ColorUtils.translateColorCodes(messagesConfig.getString("clan-created-successfully")).replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]));
player.sendMessage(clanCreated);
if (clansConfig.getBoolean("clan-creation.announce-to-all")){
if (clansConfig.getBoolean("clan-creation.send-as-title")){
for (Player onlinePlayers : Clans.connectedPlayers.keySet()){
onlinePlayers.sendTitle(ColorUtils.translateColorCodes(messagesConfig.getString("clan-created-broadcast-title-1")
.replace(CLAN_OWNER, player.getName())
.replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]))),
ColorUtils.translateColorCodes(messagesConfig.getString("clan-created-broadcast-title-2")
.replace(CLAN_OWNER, player.getName())
.replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]))),
30, 30, 30);
}
}else {
Bukkit.broadcastMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-created-broadcast-chat")
.replace(CLAN_OWNER, player.getName())
.replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]))));
}
}
} else {
String clanNotCreated = ColorUtils.translateColorCodes(messagesConfig.getString("clan-creation-failed")).replace(CLAN_PLACEHOLDER, args[1]);
String clanNotCreated = ColorUtils.translateColorCodes(messagesConfig.getString("clan-creation-failed")).replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]));
player.sendMessage(clanNotCreated);
}
clanNamesList.clear();
Expand Down Expand Up @@ -291,19 +309,21 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
return true;
}
if (ClansStorageUtil.isClanOwner(player)){
if (args[1].length() >= 3 && args[1].length() <= 32) {
if (args[1].length() >= MIN_CHAR_LIMIT && args[1].length() <= MAX_CHAR_LIMIT) {
Clan playerClan = ClansStorageUtil.findClanByOwner(player);
ClansStorageUtil.updatePrefix(player, args[1]);
String prefixConfirmation = ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-change-successful")).replace("%CLANPREFIX%", playerClan.getClanPrefix());
sender.sendMessage(prefixConfirmation);
clansPrefixList.clear();
return true;
} else if (args[1].length() > 32) {
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-too-long")));
}else if (args[1].length() > MAX_CHAR_LIMIT) {
Integer maxCharLimit = clansConfig.getInt("clan-tags.max-character-limit");
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-too-long").replace("%CHARMAX%", maxCharLimit.toString())));
clansPrefixList.clear();
return true;
} else {
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-too-short")));
}else {
Integer minCharLimit = clansConfig.getInt("clan-tags.min-character-limit");
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-too-short").replace("%CHARMIN%", minCharLimit.toString())));
clansPrefixList.clear();
return true;
}
Expand All @@ -312,7 +332,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
clansPrefixList.clear();
return true;
}
} else {
}else {
sender.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-invalid-prefix")));
clansPrefixList.clear();
}
Expand Down Expand Up @@ -349,6 +369,23 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
ClanInviteUtil.removeInvite(inviterUUIDString.toString());
String joinMessage = ColorUtils.translateColorCodes(messagesConfig.getString("clan-join-successful")).replace(CLAN_PLACEHOLDER, clan.getClanFinalName());
player.sendMessage(joinMessage);
if (clansConfig.getBoolean("clan-join.announce-to-all")){
if (clansConfig.getBoolean("clan-join.send-as-title")){
for (Player onlinePlayers : Clans.connectedPlayers.keySet()){
onlinePlayers.sendTitle(ColorUtils.translateColorCodes(messagesConfig.getString("clan-join-broadcast-title-1")
.replace(PLAYER_PLACEHOLDER, player.getName())
.replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]))),
ColorUtils.translateColorCodes(messagesConfig.getString("clan-join-broadcast-title-2")
.replace(PLAYER_PLACEHOLDER, player.getName())
.replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]))),
30, 30, 30);
}
}else {
Bukkit.broadcastMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-join-broadcast-chat")
.replace(PLAYER_PLACEHOLDER, player.getName())
.replace(CLAN_PLACEHOLDER, ColorUtils.translateColorCodes(args[1]))));
}
}
}else {
String failureMessage = ColorUtils.translateColorCodes(messagesConfig.getString("clan-join-failed")).replace(CLAN_PLACEHOLDER, clan.getClanFinalName());
player.sendMessage(failureMessage);
Expand Down Expand Up @@ -423,7 +460,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
clanInfo.append(ColorUtils.translateColorCodes(messagesConfig.getString("clan-info-owner-offline")).replace(OWNER, offlineOwner));
}
if (clanMembers.size() > 0) {
clanInfo.append(ColorUtils.translateColorCodes(messagesConfig.getString("clan-info-members-header")));
Integer clanMembersSize = clanMembers.size();
clanInfo.append(ColorUtils.translateColorCodes(messagesConfig.getString("clan-info-members-header")
.replace("%NUMBER%", ColorUtils.translateColorCodes(clanMembersSize.toString()))));
for (String clanMember : clanMembers) {
if (clanMember != null) {
UUID memberUUID = UUID.fromString(clanMember);
Expand Down Expand Up @@ -511,7 +550,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
clanInfo.append(ColorUtils.translateColorCodes(messagesConfig.getString("clan-info-owner-offline")).replace(OWNER, offlineOwner));
}
if (clanMembers.size() > 0) {
clanInfo.append(ColorUtils.translateColorCodes(messagesConfig.getString("clan-info-members-header")));
Integer clanMembersSize = clanMembers.size();
clanInfo.append(ColorUtils.translateColorCodes(messagesConfig.getString("clan-info-members-header")
.replace("%NUMBER%", ColorUtils.translateColorCodes(clanMembersSize.toString()))));
for (String clanMember : clanMembers) {
if (clanMember != null) {
UUID memberUUID = UUID.fromString(clanMember);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/xyz/gamlin/clans/expansions/PlayerClanExpansion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class PlayerClanExpansion extends PlaceholderExpansion {

@Override
public @NotNull String getVersion() {
return "1.2.3";
return "1.2.4";
}

@Override
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/xyz/gamlin/clans/listeners/PlayerConnectionEvent.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package xyz.gamlin.clans.listeners;

import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import xyz.gamlin.clans.Clans;

public class PlayerConnectionEvent implements Listener {

@EventHandler
public void onPlayerJoin(PlayerJoinEvent event){
Player player = event.getPlayer();
Clans.connectedPlayers.put(player, player.getName());
}
}
16 changes: 16 additions & 0 deletions src/main/java/xyz/gamlin/clans/listeners/PlayerDisconnectEvent.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package xyz.gamlin.clans.listeners;

import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import xyz.gamlin.clans.Clans;

public class PlayerDisconnectEvent implements Listener {

@EventHandler
public void onPlayerQuit(PlayerQuitEvent event){
Player player = event.getPlayer();
Clans.connectedPlayers.remove(player);
}
}
2 changes: 2 additions & 0 deletions src/main/java/xyz/gamlin/clans/utils/ClansStorageUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public static void restoreClans() throws IOException {
double clanHomeZ = clansStorage.getDouble("clans.data." + key + ".clanHome.z");
float clanHomeYaw = (float) clansStorage.getDouble("clans.data." + key + ".clanHome.yaw");
float clanHomePitch = (float) clansStorage.getDouble("clans.data." + key + ".clanHome.pitch");

Clan clan = new Clan(key, clanFinalName);
clan.setClanPrefix(clanPrefix);
clan.setClanMembers(clanMembers);
Expand All @@ -68,6 +69,7 @@ public static void restoreClans() throws IOException {
clan.setClanHomeZ(clanHomeZ);
clan.setClanHomeYaw(clanHomeYaw);
clan.setClanHomePitch(clanHomePitch);

clansList.put(uuid, clan);
});
}
Expand Down
Loading

0 comments on commit beeb98d

Please sign in to comment.