diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..7ee7329 --- /dev/null +++ b/.classpath @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..02340c4 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + PlayrimeRewards+ (Rewritten) + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3fc7e86..1b6e1ef 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.vscode/settings.json b/.vscode/settings.json index 2b52057..5b583f2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { "maven.view": "hierarchical", - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "automatic" } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1e74694..50a386e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.example - PlayrimeRewards+ (Rewritten) + PlayrimeRewardsRewritten 1.0-SNAPSHOT diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.java index ff2fd28..d6c37c8 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.java @@ -20,12 +20,16 @@ public class CommandPlaytime implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String s, String[] args) { if(sender instanceof Player){ Player player = (Player) sender; - if(args.length > 0){ - Player mentioned = Bukkit.getPlayer(args[0]); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix + "&a"+args[0]+"'s current playtime is: &7"+Integer.toString(plugin.db.getPlayer(mentioned.getUniqueId()).getPlaytime()/3600)+" Hours")); + if(player.hasPermission("playtimerewards.pt") || player.hasPermission("playtimerewards.user")) { + if(args.length > 0){ + Player mentioned = Bukkit.getPlayer(args[0]); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix + "&a"+args[0]+"'s current playtime is: &7"+Integer.toString(plugin.db.getPlayer(mentioned.getUniqueId()).getPlaytime()/3600)+" Hours")); + }else{ + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix + "&aYour current playtime is: &7"+Integer.toString(plugin.db.getPlayer(player.getUniqueId()).getPlaytime()/3600)+" Hours")); + } }else{ - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix + "&aYour current playtime is: &7"+Integer.toString(plugin.db.getPlayer(player.getUniqueId()).getPlaytime()/3600)+" Hours")); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&c You do not have permission to use this command")); } } diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.java index 7601e8b..71a2c6c 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.java @@ -22,14 +22,19 @@ public class CommandPlaytimeLeaderboard implements CommandExecutor { if (sender instanceof Player) { Player player = (Player) sender; - - int i = 0; - for (PlayerData pl : plugin.db.getSortedPlayerlist()){ - if(i<5){ - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&a"+pl.getDisplayName()+"&8| "+Integer.toString(pl.getPlaytime()/3600))); - i++; + if(player.hasPermission("playtimerewards.ptleader") || player.hasPermission("playtimerewards.user")) { + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&8-------- &7Leaderboard &8--------")); + int i = 0; + for (PlayerData pl : plugin.db.getSortedPlayerlist()){ + if(i<9){ + if((pl.getPlaytime()/3600) > 0){ + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&a"+pl.getDisplayName()+"&8 : "+" &7"+Integer.toString(pl.getPlaytime()/3600))+" Hours"); + i++; + } + } } - i++; + }else{ + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&c You do not have permission to use this command")); } } diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.java index 194a4d1..4fcef60 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.java @@ -19,9 +19,13 @@ public class CommandPluginInfo implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { if (sender instanceof Player) { Player player = (Player) sender; - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&8[&6Playtime Rewards&7+&8]")); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"This plugin was developed by: &aAstrid (O_dude)")); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"Current Plugin Version: &70.01a")); + if(player.hasPermission("playtimerewards.ptinfo") || player.hasPermission("playtimerewards.user")){ + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&8[&6Playtime Rewards&7+&8]")); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"This plugin was developed by: &aAstrid (O_dude)")); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"Current Plugin Version: &7"+plugin.getDescription().getVersion())); + }else{ + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&c You do not have permission to use this command")); + } } return true; diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.java index d47b807..7838996 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.java @@ -20,14 +20,16 @@ public class CommandSeen implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String s, String[] args) { if(sender instanceof Player){ Player player = (Player) sender; + if(player.hasPermission("playtimerewards.ptseen") || player.hasPermission("playtimerewards.admin")) { + String pName = args[0]; + Player mentioned = Bukkit.getPlayer(pName); - String pName = args[0]; - Player mentioned = Bukkit.getPlayer(pName); - - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&8--------&7 "+mentioned.getDisplayName()+" &8--------")); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&Playtime: &7"+Integer.toString(plugin.db.getPlayer(mentioned.getUniqueId()).getPlaytime()/3600)+" Hours")); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&aLogoff Location (X,Y,Z): &7"+plugin.config.getSavedX(mentioned.getUniqueId())+" "+plugin.config.getSavedY(mentioned.getUniqueId())+" "+plugin.config.getSavedZ(mentioned.getUniqueId()))); - + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&8--------&7 "+mentioned.getDisplayName()+" &8--------")); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&Playtime: &7"+Integer.toString(plugin.db.getPlayer(mentioned.getUniqueId()).getPlaytime()/3600)+" Hours")); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&aLogoff Location (X,Y,Z): &7"+plugin.config.getSavedX(mentioned.getUniqueId())+" "+plugin.config.getSavedY(mentioned.getUniqueId())+" "+plugin.config.getSavedZ(mentioned.getUniqueId()))); + }else{ + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&c You do not have permission to use this command")); + } } diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/Debug.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/Debug.java index 60c4680..6c527d6 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/Debug.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/Debug.java @@ -2,12 +2,16 @@ package dev.astridlabs.playtimerewardsplus.Commands; import dev.astridlabs.playtimerewardsplus.DataTypes.PlayerData; import dev.astridlabs.playtimerewardsplus.Plugin; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import java.util.List; +import java.util.UUID; + public class Debug implements CommandExecutor { private Plugin plugin; private String DebugPrefix = "&7[&cDEBUG MODE&7] "; @@ -20,6 +24,8 @@ public class Debug implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String s, String[] args) { if(sender instanceof Player){ Player player = (Player) sender; + + if(!player.hasPermission("playtimerewards.debug")) player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+"&c You do not have permission to use this command")); if(args[0].equals("time")){ player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+DebugPrefix + "&aUser playtime in seconds is: "+this.plugin.db.getPlayer(player.getUniqueId()).getPlaytime())); } @@ -35,8 +41,20 @@ public class Debug implements CommandExecutor { plugin.config.savePlayers(); } + + if(args[0].equals("rawdata")){ + List playerDataList = plugin.db.getSortedPlayerlist(); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+DebugPrefix + "&aPlayer UUID: &7"+ player.getUniqueId())); + + for(PlayerData p : playerDataList){ + if(player.getUniqueId().toString().equals(p.getUuid().toString())){//FIXME: This is never called, meaning somehow the UUID's are not compatable with eachother + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+DebugPrefix + "&aYou are in the Database!")); + } + player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+DebugPrefix + "&aPlayer UUID: &7"+ p.getUuid())); + } + } } return true; } -} +} \ No newline at end of file diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.java index 727a02a..e67f0b5 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; import java.io.File; import java.io.IOException; @@ -29,11 +30,16 @@ public class ConfigController { public void savePlayers(){ for (PlayerData player : plugin.db.playerList) { - customConfig.set("data."+player.getUuid()+".playtime", player.getPlaytime()); - customConfig.set("data."+player.getUuid()+".displayName", player.getDisplayName()); - customConfig.set("data."+player.getUuid()+".lastLocation.X", player.getCurrentLocation().getBlockX()); - customConfig.set("data."+player.getUuid()+".lastLocation.Y", player.getCurrentLocation().getBlockY()); - customConfig.set("data."+player.getUuid()+".lastLocation.Z", player.getCurrentLocation().getBlockZ()); + if(player.getCurrentLocation() == null){ + customConfig.set("data."+player.getUuid()+".playtime", player.getPlaytime()); + customConfig.set("data."+player.getUuid()+".displayName", player.getDisplayName()); + }else{ + customConfig.set("data."+player.getUuid()+".playtime", player.getPlaytime()); + customConfig.set("data."+player.getUuid()+".displayName", player.getDisplayName()); + customConfig.set("data."+player.getUuid()+".lastLocation.X", player.getCurrentLocation().getBlockX()); + customConfig.set("data."+player.getUuid()+".lastLocation.Y", player.getCurrentLocation().getBlockY()); + customConfig.set("data."+player.getUuid()+".lastLocation.Z", player.getCurrentLocation().getBlockZ()); + } } try { customConfig.save(customConfigFile); @@ -61,7 +67,30 @@ public class ConfigController { } + public List getPlayersFromConfig(){ + List returnList = new ArrayList(); + if (!customConfig.getConfigurationSection("data").getKeys(false).isEmpty()) { + customConfig.getConfigurationSection("data").getKeys(false).forEach(str -> { + plugin.db.CreatePlayerRaw(new PlayerData(UUID.fromString(str), customConfig.getString("data."+str+".displayName"), customConfig.getInt("data."+str+".playtime"))); + }); + } + + return returnList; + } + + public String getWelcomeBackMessage(Player player){ + return customConfig.getString("Config.WelcomeMessage.WelcomeBackMessage").replace("%player%", player.getDisplayName()); + } + + public String getFirstTimeWelcomeMessage(Player player){ + return customConfig.getString("Config.WelcomeMessage.FirstTimeWelcomeMessage").replace("%player%", player.getDisplayName()); + + } + + public boolean isWelcomeMesageEnabled(){ + return customConfig.getBoolean("Config.WelcomeMessage.Override"); + } public List getRewards(){ List returnList = new ArrayList(); diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.java index 157f308..f2a8876 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.java @@ -26,13 +26,19 @@ public class PlayerDatabase { PlayerData returnedPlayer = null; for (PlayerData player : playerList) { - if(player.getUuid() == uuid){ + if(player.getUuid().toString().equals(uuid.toString())){ returnedPlayer = player; } } return returnedPlayer; } + public void loadPlayers(){ + for(PlayerData player : plugin.config.getPlayersFromConfig()){ + playerList.add(player); + } + } + class Sortbyroll implements Comparator { // Used for sorting in ascending order of @@ -71,10 +77,27 @@ public class PlayerDatabase { player.setLastLocation(lastLocation); } + public boolean playerExists(UUID uuid){ + boolean returnState = false; - public PlayerData createPlayer(Player player){ - playerList.add(new PlayerData(player.getUniqueId(), player.getDisplayName())); - return getPlayer(player.getUniqueId()); + for (PlayerData player : playerList) { + if(player.getUuid().toString().equals(uuid.toString())){ + returnState = true; + } + } + + return returnState; + } + + public void createPlayer(Player player){ + if(playerExists(player.getUniqueId()) == false){ + playerList.add(new PlayerData(player.getUniqueId(), player.getDisplayName(), 0)); + } + return; + } + + public void CreatePlayerRaw(PlayerData playerData){ + playerList.add(playerData); } } diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.java index e0937ff..0d00277 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.java @@ -1,7 +1,9 @@ package dev.astridlabs.playtimerewardsplus.Events; import dev.astridlabs.playtimerewardsplus.Plugin; + import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; @@ -17,7 +19,13 @@ public class PlayerJoin implements Listener { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { - event.setJoinMessage("Welcome, " + event.getPlayer().getName() + "!"); + if(plugin.config.isWelcomeMesageEnabled()){ + if(plugin.db.playerExists(event.getPlayer().getUniqueId())){ + event.setJoinMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+plugin.config.getWelcomeBackMessage(event.getPlayer()))); + }else{ + event.setJoinMessage(ChatColor.translateAlternateColorCodes('&', plugin.PluginChatPrefix+plugin.config.getFirstTimeWelcomeMessage(event.getPlayer()))); + } + } plugin.db.createPlayer(event.getPlayer()); } } diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/MasterClock.java b/src/main/java/dev/astridlabs/playtimerewardsplus/MasterClock.java index 72a50a3..31575b6 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/MasterClock.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/MasterClock.java @@ -1,7 +1,6 @@ package dev.astridlabs.playtimerewardsplus; import dev.astridlabs.playtimerewardsplus.DataTypes.PlayerData; -import dev.astridlabs.playtimerewardsplus.Plugin; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/Plugin.java b/src/main/java/dev/astridlabs/playtimerewardsplus/Plugin.java index c57d5bf..758ea05 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/Plugin.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/Plugin.java @@ -39,9 +39,11 @@ public class Plugin extends JavaPlugin { } + //FIXME: This does not actually load the players + db.loadPlayers(); - PlaceholderChatPrefix = getConfig().getString("Config.PlaceholderChatPrefix")+" "; - PluginChatPrefix = getConfig().getString("Config.PluginChatPrefix")+" "; + PlaceholderChatPrefix = getConfig().getString("Config.PlaceholderChatPrefix")+" "; + PluginChatPrefix = getConfig().getString("Config.PluginChatPrefix")+" "; //Initialize Events Bukkit.getPluginManager().registerEvents(new PlayerJoin(this), this); // This fires the event and allows any listener to listen to the event diff --git a/src/main/java/dev/astridlabs/playtimerewardsplus/dataTypes/PlayerData.java b/src/main/java/dev/astridlabs/playtimerewardsplus/dataTypes/PlayerData.java index 2be1820..2c736f0 100644 --- a/src/main/java/dev/astridlabs/playtimerewardsplus/dataTypes/PlayerData.java +++ b/src/main/java/dev/astridlabs/playtimerewardsplus/dataTypes/PlayerData.java @@ -14,7 +14,7 @@ import java.util.UUID; public class PlayerData { - private int Playtime = 0; + private int Playtime; private UUID uuid; private String DisplayName; @@ -23,9 +23,10 @@ public class PlayerData { private List RepetitiveUnlocks = new ArrayList(); - public PlayerData(UUID uuid, String DisplayName){ + public PlayerData(UUID uuid, String DisplayName, Integer playtime){ this.uuid = uuid; this.DisplayName = DisplayName; + this.Playtime = playtime; } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 9bb45d4..e4ebb74 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,6 +1,15 @@ Config: PluginChatPrefix: "&7[&6PTRR+&7]" PlaceholderChatPrefix: "&8[%time%&8]&f" + WelcomeMessage: + Override: true + FirstTimeWelcomeMessage: "&aWelcome to the server, %player%" + WelcomeBackMessage: "&aWelcome back, %player%" +rewards: {} -data: {} -rewards: \ No newline at end of file + + + + +#NEVER TOUCH THIS EVER +data: {} \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 103a119..36baf59 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ main: dev.astridlabs.playtimerewardsplus.Plugin name: PlaytimeRewardsRewrittenPlus author: Astrid (O_dude) -version: 0.1a +version: 1.0b commands: pt: @@ -20,4 +20,4 @@ commands: description: Get current top 5 leaderboard usage: /ptleader -softdepend: [PlaceholderAPI] # This is used, if your plugin works without PlaceholderAPI. +softdepend: [PlaceholderAPI] diff --git a/target/PlayrimeRewardsRewritten-1.0-SNAPSHOT.jar b/target/PlayrimeRewardsRewritten-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..5e10308 Binary files /dev/null and b/target/PlayrimeRewardsRewritten-1.0-SNAPSHOT.jar differ diff --git a/target/classes/config.yml b/target/classes/config.yml index 9bb45d4..e4ebb74 100644 --- a/target/classes/config.yml +++ b/target/classes/config.yml @@ -1,6 +1,15 @@ Config: PluginChatPrefix: "&7[&6PTRR+&7]" PlaceholderChatPrefix: "&8[%time%&8]&f" + WelcomeMessage: + Override: true + FirstTimeWelcomeMessage: "&aWelcome to the server, %player%" + WelcomeBackMessage: "&aWelcome back, %player%" +rewards: {} -data: {} -rewards: \ No newline at end of file + + + + +#NEVER TOUCH THIS EVER +data: {} \ No newline at end of file diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.class b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.class index a5869db..518176d 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.class b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.class index fd472f5..e8a3986 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.class b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.class index fda501e..aeddd00 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.class b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.class index 3f344ce..45172da 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/Debug.class b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/Debug.class index 5d333e6..dd5f590 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Commands/Debug.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Commands/Debug.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.class b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.class index 28a1e8b..01446d8 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase$Sortbyroll.class b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase$Sortbyroll.class index 2b70770..53558f3 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase$Sortbyroll.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase$Sortbyroll.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.class b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.class index 2601fba..16c604c 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/RewardManager.class b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/RewardManager.class index 330ec1a..e312076 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/RewardManager.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Controllers/RewardManager.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/PlayerData.class b/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/PlayerData.class index 99e56bd..5873878 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/PlayerData.class and b/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/PlayerData.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/Reward.class b/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/Reward.class index f34b72c..f7ad37e 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/Reward.class and b/target/classes/dev/astridlabs/playtimerewardsplus/DataTypes/Reward.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.class b/target/classes/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.class index 204ff13..d684f06 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Integrations/PlaceholderAPIIntegration.class b/target/classes/dev/astridlabs/playtimerewardsplus/Integrations/PlaceholderAPIIntegration.class index 3168bbd..3e5d3bd 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Integrations/PlaceholderAPIIntegration.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Integrations/PlaceholderAPIIntegration.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/MasterClock.class b/target/classes/dev/astridlabs/playtimerewardsplus/MasterClock.class index c7667e4..15073f5 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/MasterClock.class and b/target/classes/dev/astridlabs/playtimerewardsplus/MasterClock.class differ diff --git a/target/classes/dev/astridlabs/playtimerewardsplus/Plugin.class b/target/classes/dev/astridlabs/playtimerewardsplus/Plugin.class index 70b667c..05a55fc 100644 Binary files a/target/classes/dev/astridlabs/playtimerewardsplus/Plugin.class and b/target/classes/dev/astridlabs/playtimerewardsplus/Plugin.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index 103a119..36baf59 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,7 +1,7 @@ main: dev.astridlabs.playtimerewardsplus.Plugin name: PlaytimeRewardsRewrittenPlus author: Astrid (O_dude) -version: 0.1a +version: 1.0b commands: pt: @@ -20,4 +20,4 @@ commands: description: Get current top 5 leaderboard usage: /ptleader -softdepend: [PlaceholderAPI] # This is used, if your plugin works without PlaceholderAPI. +softdepend: [PlaceholderAPI] diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..86ec367 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Thu Apr 09 14:34:44 CDT 2020 +groupId=org.example +artifactId=PlayrimeRewardsRewritten +version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..74e2549 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,15 @@ +dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.class +dev/astridlabs/playtimerewardsplus/Integrations/PlaceholderAPIIntegration.class +dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.class +dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.class +dev/astridlabs/playtimerewardsplus/DataTypes/Reward.class +dev/astridlabs/playtimerewardsplus/DataTypes/PlayerData.class +dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase$Sortbyroll.class +dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.class +dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.class +dev/astridlabs/playtimerewardsplus/Commands/Debug.class +dev/astridlabs/playtimerewardsplus/Controllers/RewardManager.class +dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.class +dev/astridlabs/playtimerewardsplus/Plugin.class +dev/astridlabs/playtimerewardsplus/MasterClock.class +dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..f6230d0 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,14 @@ +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/ConfigController.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/RewardManager.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytimeLeaderboard.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/MasterClock.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/DataTypes/Reward.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/Debug.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/DataTypes/PlayerData.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Integrations/PlaceholderAPIIntegration.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Controllers/PlayerDatabase.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPluginInfo.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandPlaytime.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Commands/CommandSeen.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Plugin.java +/Users/owen/IdeaProjects/PlayrimeRewards+ (Rewritten)/src/main/java/dev/astridlabs/playtimerewardsplus/Events/PlayerJoin.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29