Skip to content

Commit 516d538

Browse files
mayokekmayokek
committed
New Commitments
- /admin is now working - /list is only work for admins (BUG) - RankManager system minor revamped
1 parent 1685109 commit 516d538

9 files changed

Lines changed: 178 additions & 24 deletions

File tree

‎build.xml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- You may freely edit this file. See commented blocks below for -->
3+
<!-- some examples of how to customize the build. -->
4+
<!-- (If you delete it and reopen the project it will be recreated.) -->
5+
<!-- By default, only the Clean and Build commands use this build script. -->
6+
<!-- Commands such as Run, Debug, and Test only use this build script if -->
7+
<!-- the Compile on Save feature is turned off for the project. -->
8+
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
9+
<!-- in the project's Project Properties dialog box.-->
10+
<project name="FreedomHostingMod" default="default" basedir=".">
11+
<description>Builds, tests, and runs the project FreedomHostingMod.</description>
12+
<import file="nbproject/build-impl.xml"/>
13+
<!--
14+
There exist several targets which are by default empty and which can be
15+
used for execution of your tasks. These targets are usually executed
16+
before and after some main targets. They are:
17+
-pre-init: called before initialization of project properties
18+
-post-init: called after initialization of project properties
19+
-pre-compile: called before javac compilation
20+
-post-compile: called after javac compilation
21+
-pre-compile-single: called before javac compilation of single file
22+
-post-compile-single: called after javac compilation of single file
23+
-pre-compile-test: called before javac compilation of JUnit tests
24+
-post-compile-test: called after javac compilation of JUnit tests
25+
-pre-compile-test-single: called before javac compilation of single JUnit test
26+
-post-compile-test-single: called after javac compilation of single JUunit test
27+
-pre-jar: called before JAR building
28+
-post-jar: called after JAR building
29+
-post-clean: called after cleaning build products
30+
(Targets beginning with '-' are not intended to be called on their own.)
31+
Example of inserting an obfuscator after compilation could look like this:
32+
<target name="-post-compile">
33+
<obfuscate>
34+
<fileset dir="${build.classes.dir}"/>
35+
</obfuscate>
36+
</target>
37+
For list of available properties check the imported
38+
nbproject/build-impl.xml file.
39+
Another way to customize the build is by overriding existing main targets.
40+
The targets of interest are:
41+
-init-macrodef-javac: defines macro for javac compilation
42+
-init-macrodef-junit: defines macro for junit execution
43+
-init-macrodef-debug: defines macro for class debugging
44+
-init-macrodef-java: defines macro for class execution
45+
-do-jar: JAR building
46+
run: execution of project
47+
-javadoc-build: Javadoc generation
48+
test-report: JUnit report generation
49+
An example of overriding the target for project execution could look like this:
50+
<target name="run" depends="FreedomHostingMod-impl.jar">
51+
<exec dir="bin" executable="launcher.exe">
52+
<arg file="${dist.jar}"/>
53+
</exec>
54+
</target>
55+
Notice that the overridden target depends on the jar target and not only on
56+
the compile target as the regular run target does. Again, for a list of available
57+
properties which you can use, check the target you are overriding in the
58+
nbproject/build-impl.xml file.
59+
-->
60+
</project>

‎src/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ server:
99
forum: http://example.net/forum
1010

1111
# Server list MOTD (Use & for color)
12-
motd: "&e&k::: &b&lFreedomHostingMod Example &e&l:::"
12+
motd: "&e&k::: &b&lFreedomCore Example &e&l:::"

‎src/plugin.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: FreedomHostingMod
1+
name: FreedomCore
22
version: 1.0
33
description: A new custom mod for ChickenFreedom
44
authors: [AvalancheYT, TaahThePhoenix]
@@ -13,4 +13,7 @@ commands:
1313
usage: /<command> [-a]
1414
admin:
1515
description: add/delete players to/from admin list
16-
usage: /<command> <add | delete> <player>
16+
usage: /<command> [list] <add | delete <player>>
17+
op:
18+
description: ops a player
19+
usage: /<command> <player>

‎src/server/AvalancheYT/FreedomCore/Commands/Command_admin.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package server.AvalancheYT.FreedomCore.Commands;
2+
3+
import org.bukkit.Bukkit;
4+
import org.bukkit.ChatColor;
5+
import org.bukkit.command.Command;
6+
import org.bukkit.command.CommandExecutor;
7+
import org.bukkit.command.CommandSender;
8+
import org.bukkit.entity.Player;
9+
import server.AvalancheYT.FreedomCore.Config.ConfigManager;
10+
import server.AvalancheYT.FreedomCore.FreedomCore;
11+
12+
public class Command_admin implements CommandExecutor {
13+
14+
private final FreedomCore plugin;
15+
16+
public Command_admin(FreedomCore plugin) {
17+
this.plugin = plugin;
18+
}
19+
20+
@Override
21+
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
22+
if (args.length == 1) {
23+
if (!args[0].equalsIgnoreCase("list")) {
24+
return false;
25+
}
26+
sender.sendMessage(ChatColor.RED + "Admin list is currently under development");
27+
return true;
28+
}
29+
30+
if (args.length == 2) {
31+
Player player = Bukkit.getPlayer(args[1]);
32+
if (player == null) {
33+
sender.sendMessage(ChatColor.RED + "Player: " + args[1] + " is invalid");
34+
return true;
35+
}
36+
if (args[0].equalsIgnoreCase("add")) {
37+
Bukkit.broadcastMessage(ChatColor.GREEN + sender.getName() + " - Adding " + player.getName() + " to superadmin list");
38+
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".name", player.getName());
39+
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".ip", player.getAddress().getHostString());
40+
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".admin", "super admin");
41+
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".tag", "");
42+
ConfigManager.getAdmin().saveConfig();
43+
return true;
44+
}
45+
46+
if (args[0].equalsIgnoreCase("delete")) {
47+
Bukkit.broadcastMessage(ChatColor.RED + sender.getName() + " - Removing " + player.getName() + " from superadmin list");
48+
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString(), null);
49+
ConfigManager.getAdmin().saveConfig();
50+
return true;
51+
}
52+
return false;
53+
}
54+
return false;
55+
}
56+
}

src/server/AvalanceYT/FreedomCore/Commands/Command_fc.java renamed to src/server/AvalancheYT/FreedomCore/Commands/Command_fc.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package server.AvalanceYT.FreedomCore.Commands;
1+
package server.AvalancheYT.FreedomCore.Commands;
22

33
import org.bukkit.ChatColor;
44
import org.bukkit.command.Command;
@@ -27,7 +27,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
2727
return true;
2828
}
2929

30-
sender.sendMessage(ChatColor.DARK_RED + "===== FreedomHostingMod =====");
30+
sender.sendMessage(ChatColor.DARK_RED + "===== FreedomCore =====");
3131
sender.sendMessage(ChatColor.GREEN + "Running on: " + ConfigManager.getMConfig().getConfig().getString("server.name"));
3232
sender.sendMessage(ChatColor.GREEN + "Forum: " + ConfigManager.getMConfig().getConfig().getString("server.forum"));
3333
sender.sendMessage(ChatColor.GOLD + "Created by AvalancheYT and TaahThePhoenix");

src/server/AvalanceYT/FreedomCore/Commands/Command_list.java renamed to src/server/AvalancheYT/FreedomCore/Commands/Command_list.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package server.AvalanceYT.FreedomCore.Commands;
1+
package server.AvalancheYT.FreedomCore.Commands;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -43,7 +43,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
4343

4444
final List<String> names = new ArrayList<>();
4545
for (Player player : Bukkit.getOnlinePlayers()) {
46-
if (filter == Filter.ADMIN && !RankManager.isSuperAdmin(player)) {
46+
if (filter == Filter.ADMIN && !RankManager.isAdmin(player)) {
4747
continue;
4848
}
4949

‎src/server/AvalancheYT/FreedomCore/Commands/Command_op.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package server.AvalancheYT.FreedomCore.Commands;
2+
3+
import org.bukkit.Bukkit;
4+
import org.bukkit.ChatColor;
5+
import org.bukkit.command.Command;
6+
import org.bukkit.command.CommandExecutor;
7+
import org.bukkit.command.CommandSender;
8+
import org.bukkit.entity.Player;
9+
import server.AvalancheYT.FreedomCore.FreedomCore;
10+
11+
public class Command_op implements CommandExecutor {
12+
13+
private final FreedomCore plugin;
14+
15+
public Command_op(FreedomCore plugin) {
16+
this.plugin = plugin;
17+
}
18+
19+
@Override
20+
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
21+
final Player player = Bukkit.getPlayer(args[0]);
22+
23+
if (player == null) {
24+
sender.sendMessage(ChatColor.GRAY + "Player not found");
25+
return true;
26+
}
27+
Bukkit.broadcastMessage(ChatColor.AQUA + sender.getName() + " - Opping " + player.getName());
28+
player.setOp(true);
29+
return true;
30+
31+
}
32+
33+
}

‎src/server/AvalancheYT/FreedomCore/FreedomCore.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import java.util.logging.Level;
44
import org.bukkit.plugin.java.JavaPlugin;
5-
import server.AvalanceYT.FreedomCore.Commands.Command_fc;
6-
import server.AvalanceYT.FreedomCore.Commands.Command_list;
5+
import server.AvalancheYT.FreedomCore.Commands.Command_admin;
6+
import server.AvalancheYT.FreedomCore.Commands.Command_fc;
7+
import server.AvalancheYT.FreedomCore.Commands.Command_list;
8+
import server.AvalancheYT.FreedomCore.Commands.Command_op;
79
import server.AvalancheYT.FreedomCore.Config.ConfigManager;
810

911
public class FreedomCore extends JavaPlugin {
@@ -29,5 +31,7 @@ public void register() {
2931
new ConfigManager();
3032
this.getCommand("list").setExecutor(new Command_list(this));
3133
this.getCommand("fc").setExecutor(new Command_fc(this));
34+
this.getCommand("admin").setExecutor(new Command_admin(this));
35+
this.getCommand("op").setExecutor(new Command_op(this));
3236
}
3337
}

‎src/server/AvalancheYT/FreedomCore/RankManager.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,46 +27,44 @@ public String getPrefix() {
2727
}
2828
}
2929

30-
public static boolean isSuperAdmin(CommandSender sender) {
30+
public static boolean isAdmin(CommandSender sender) {
3131
Player player = (Player) sender;
3232
return ConfigManager.getAdmin().getConfig().contains(player.getUniqueId().toString());
3333
}
3434

35+
public static boolean isSuperAdmin(CommandSender sender) {
36+
Player player = (Player) sender;
37+
return ConfigManager.getAdmin().getConfig().getString(player.getUniqueId().toString() + ".admin").equalsIgnoreCase("super admin");
38+
}
39+
3540
public static boolean isTelnetAdmin(CommandSender sender) {
3641
Player player = (Player) sender;
37-
return ConfigManager.getAdmin().getConfig().getBoolean(player.getUniqueId().toString() + ".telnet");
42+
return ConfigManager.getAdmin().getConfig().getString(player.getUniqueId().toString() + ".admin").equalsIgnoreCase("telnet admin");
3843
}
3944

4045
public static boolean isSeniorAdmin(CommandSender sender) {
4146
Player player = (Player) sender;
42-
return ConfigManager.getAdmin().getConfig().getBoolean(player.getUniqueId().toString() + ".senior");
47+
return ConfigManager.getAdmin().getConfig().getString(player.getUniqueId().toString() + ".admin").equalsIgnoreCase("senior admin");
4348
}
4449

4550
public static Rank getRank(CommandSender sender) {
4651
if (!(sender instanceof Player)) {
4752
return Rank.CONSOLE;
4853
}
4954

50-
if (isSuperAdmin((Player) sender)) {
55+
final Player player = (Player) sender;
56+
57+
if (isSuperAdmin(player)) {
5158
return Rank.SA;
5259
}
5360

54-
if (isTelnetAdmin((Player) sender)) {
61+
if (isTelnetAdmin(player)) {
5562
return Rank.STA;
5663
}
5764

58-
if (isSeniorAdmin((Player) sender)) {
65+
if (isSeniorAdmin(player)) {
5966
return Rank.SRA;
6067
}
6168
return Rank.OP;
6269
}
63-
64-
public static void addRank(Player player) {
65-
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".name", player.getName());
66-
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".ip", player.getAddress().getHostString());
67-
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".telnet", false);
68-
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".senior", false);
69-
ConfigManager.getAdmin().getConfig().set(player.getUniqueId().toString() + ".tag", "");
70-
ConfigManager.getAdmin().saveConfig();
71-
}
7270
}

0 commit comments

Comments
 (0)