Skip to content

Commit 96ffaa5

Browse files
RhythmicSysRhythmicSys
committed
aaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaa aaaaaaaaaaaa aaaaaaaaaaaa
1 parent 3776cfb commit 96ffaa5

File tree

8 files changed

+33
-41
lines changed

8 files changed

+33
-41
lines changed

‎src/main/java/adhdmc/scythe/Scythe.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void onEnable() {
4343
this.getCommand("scythe").setExecutor(new CommandHandler());
4444
this.saveDefaultConfig();
4545
Defaults.configDefaults();
46-
Defaults.setPerms();
46+
ConfigHandler.setPerms();
4747
ConfigHandler.configParser();
4848
registerCommands();
4949
}

‎src/main/java/adhdmc/scythe/commands/subcommands/HelpCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public HelpCommand(){
1919

2020
@Override
2121
public void doThing(CommandSender sender, String[] args) {
22-
if(sender.hasPermission(Defaults.getPermMap().get(Defaults.permissions.USE))) {
22+
if(sender.hasPermission(ConfigHandler.getPermMap().get(ConfigHandler.Permission.USE))) {
2323
sender.sendMessage(miniMessage.deserialize(msgs.get(
2424
ConfigHandler.Message.PREFIX) + "\n" + msgs.get(ConfigHandler.Message.HELP_MAIN) +
2525
"\n" + msgs.get(ConfigHandler.Message.HELP_RELOAD) +

‎src/main/java/adhdmc/scythe/commands/subcommands/ReloadCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public ReloadCommand(){
2121

2222
@Override
2323
public void doThing(CommandSender sender, String[] args) {
24-
if (!(sender instanceof Player)|| sender.hasPermission(Defaults.getPermMap().get(Defaults.permissions.RELOAD_COMMAND))) {
24+
if (!(sender instanceof Player)|| sender.hasPermission(ConfigHandler.getPermMap().get(ConfigHandler.Permission.RELOAD_COMMAND))) {
2525
ConfigHandler.configParser();
2626
Scythe.getInstance().reloadConfig();
2727
sender.sendMessage(miniMessage.deserialize(msgs.get(ConfigHandler.Message.CONFIG_RELOAD)));

‎src/main/java/adhdmc/scythe/commands/subcommands/ToggleCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public void doThing(CommandSender sender, String[] args) {
2727
sender.sendMessage(miniMessage.deserialize(msgs.get(ConfigHandler.Message.NOT_A_PLAYER)));
2828
return;
2929
}
30-
if (!(sender.hasPermission(Defaults.getPermMap().get(Defaults.permissions.TOGGLE_COMMAND))
31-
&& sender.hasPermission(Defaults.getPermMap().get(Defaults.permissions.USE)))) {
30+
if (!(sender.hasPermission(ConfigHandler.getPermMap().get(ConfigHandler.Permission.TOGGLE_COMMAND))
31+
&& sender.hasPermission(ConfigHandler.getPermMap().get(ConfigHandler.Permission.USE)))) {
3232
sender.sendMessage(miniMessage.deserialize(msgs.get(ConfigHandler.Message.PREFIX) + msgs.get(ConfigHandler.Message.NO_PERMISSION)));
3333
return;
3434
}

‎src/main/java/adhdmc/scythe/config/ConfigHandler.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,23 @@ private static void setConfiguredCrops(){
6363
}
6464
}
6565

66+
private static final HashMap<Permission, String> permMap = new HashMap<>();
67+
68+
public enum Permission{
69+
USE, TOGGLE_COMMAND, RELOAD_COMMAND
70+
}
71+
72+
public static void setPerms(){
73+
permMap.clear();
74+
permMap.put(Permission.USE, "scythe.use");
75+
permMap.put(Permission.TOGGLE_COMMAND, "scythe.toggle");
76+
permMap.put(Permission.RELOAD_COMMAND, "scythe.reload");
77+
}
78+
79+
public static Map<Permission, String> getPermMap(){
80+
return Collections.unmodifiableMap(permMap);
81+
}
82+
6683
private static void setMessageMap(){
6784
messageMap.clear();
6885
messageMap.put(Message.CONSOLE_PREFIX, "[Scythe] ");
@@ -77,7 +94,7 @@ private static void setMessageMap(){
7794
messageMap.put(Message.CONFIG_RELOAD,
7895
config.getString("config-reload", "<gold>Scythe Config Reloaded!"));
7996
messageMap.put(Message.NO_PERMISSION,
80-
config.getString("no-permission", "<red>You do not have the required permissions to run this command"));
97+
config.getString("no-permission", "<red>You do not have the required Permission to run this command"));
8198
messageMap.put(Message.NOT_A_PLAYER,
8299
config.getString("not-a-player", "Sorry! This command can only be run by a player"));
83100
messageMap.put(Message.HELP_MAIN,

‎src/main/java/adhdmc/scythe/config/Defaults.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.Map;
1010

1111
public class Defaults {
12-
private static final HashMap<permissions, String> permMap = new HashMap<>();
1312
private static final Plugin instance = Scythe.getInstance();
1413
public static void configDefaults(){
1514
FileConfiguration config = instance.getConfig();
@@ -27,19 +26,6 @@ public static void configDefaults(){
2726
config.addDefault("help-reload", "<yellow>/scythe reload \n<grey>• Reloads config settings");
2827
}
2928

30-
public enum permissions{
31-
USE, TOGGLE_COMMAND, RELOAD_COMMAND
32-
}
33-
34-
public static void setPerms(){
35-
permMap.clear();
36-
permMap.put(permissions.USE, "scythe.use");
37-
permMap.put(permissions.TOGGLE_COMMAND, "scythe.toggle");
38-
permMap.put(permissions.RELOAD_COMMAND, "scythe.reload");
39-
}
4029

41-
public static Map<permissions, String> getPermMap(){
42-
return Collections.unmodifiableMap(permMap);
43-
}
4430

4531
}

‎src/main/java/adhdmc/scythe/listeners/InteractListener.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727

2828
public class InteractListener implements Listener {
2929

30-
private final List<Material> configuredCrops = ConfigHandler.getConfiguredCrops();
31-
private final NamespacedKey functionToggle = ToggleCommand.functionToggle;
32-
private static final String usePermission = Defaults.getPermMap().get(Defaults.permissions.USE);
33-
private final boolean requireHoe = ConfigHandler.isRequireHoe();
34-
private final boolean rightClickHarvest = ConfigHandler.isRightClickHarvest();
35-
3630
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
3731
public void playerHarvest(PlayerInteractEvent event) {
3832
if (event.getClickedBlock() == null) {
@@ -42,10 +36,10 @@ public void playerHarvest(PlayerInteractEvent event) {
4236
return;
4337
}
4438
Material clickedMaterial = event.getClickedBlock().getType();
45-
if (!configuredCrops.contains(clickedMaterial)) {
39+
if (!ConfigHandler.getConfiguredCrops().contains(clickedMaterial)) {
4640
return;
4741
}
48-
if (!rightClickHarvest && event.getAction().isRightClick()){
42+
if (!ConfigHandler.isRightClickHarvest() && event.getAction().isRightClick()){
4943
return;
5044
}
5145
Player player = event.getPlayer();
@@ -57,14 +51,14 @@ public void playerHarvest(PlayerInteractEvent event) {
5751
if (clickedCrop.getMaximumAge() != clickedCrop.getAge()) {
5852
return;
5953
}
60-
if (!player.hasPermission(usePermission)){
54+
if (!player.hasPermission(ConfigHandler.getPermMap().get(ConfigHandler.Permission.USE))){
6155
return;
6256
}
63-
Byte playerPDCValue = playerPDC.get(functionToggle, PersistentDataType.BYTE);
57+
Byte playerPDCValue = playerPDC.get(ToggleCommand.functionToggle, PersistentDataType.BYTE);
6458
if (playerPDCValue != null && playerPDCValue.equals((byte)0)){
6559
return;
6660
}
67-
if (requireHoe && !MaterialTags.HOES.isTagged(itemUsed)){
61+
if (ConfigHandler.isRequireHoe() && !MaterialTags.HOES.isTagged(itemUsed.getType())){
6862
return;
6963
}
7064
if (clickedMaterial.equals(Material.COCOA)){

‎src/main/java/adhdmc/scythe/listeners/InteractListenerDependsCoreprotect.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
public class InteractListenerDependsCoreprotect implements Listener {
3434

3535
CoreProtectAPI api = getCoreProtect();
36-
private final List<Material> configuredCrops = ConfigHandler.getConfiguredCrops();
37-
private final NamespacedKey functionToggle = ToggleCommand.functionToggle;
38-
private static final String usePermission = Defaults.getPermMap().get(Defaults.permissions.USE);
39-
private final boolean requireHoe = ConfigHandler.isRequireHoe();
40-
private final boolean rightClickHarvest = ConfigHandler.isRightClickHarvest();
4136

4237
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
4338
public void playerHarvestCoreProtect(PlayerInteractEvent event) {
@@ -48,10 +43,10 @@ public void playerHarvestCoreProtect(PlayerInteractEvent event) {
4843
return;
4944
}
5045
Material clickedMaterial = event.getClickedBlock().getType();
51-
if (!configuredCrops.contains(clickedMaterial)) {
46+
if (!ConfigHandler.getConfiguredCrops().contains(clickedMaterial)) {
5247
return;
5348
}
54-
if (!rightClickHarvest && event.getAction().isRightClick()){
49+
if (!ConfigHandler.isRightClickHarvest() && event.getAction().isRightClick()){
5550
return;
5651
}
5752
Player player = event.getPlayer();
@@ -63,14 +58,14 @@ public void playerHarvestCoreProtect(PlayerInteractEvent event) {
6358
if (clickedCrop.getMaximumAge() != clickedCrop.getAge()) {
6459
return;
6560
}
66-
if (!player.hasPermission(usePermission)){
61+
if (!player.hasPermission(ConfigHandler.getPermMap().get(ConfigHandler.Permission.USE))){
6762
return;
6863
}
69-
Byte playerPDCValue = playerPDC.get(functionToggle, PersistentDataType.BYTE);
64+
Byte playerPDCValue = playerPDC.get(ToggleCommand.functionToggle, PersistentDataType.BYTE);
7065
if (playerPDCValue != null && playerPDCValue.equals((byte)0)){
7166
return;
7267
}
73-
if (requireHoe && !MaterialTags.HOES.isTagged(itemUsed)){
68+
if (ConfigHandler.isRequireHoe() && !MaterialTags.HOES.isTagged(itemUsed.getType())){
7469
return;
7570
}
7671
if (clickedMaterial.equals(Material.COCOA)){

0 commit comments

Comments
 (0)