Skip to content

Commit abcc21a

Browse files
Move ponder classes to appropriate packages without ponder references
- AbstractPluginCommand, CommandService, ArgumentParser, PermissionChecker → commands/ - Savable, Lockable → data/ - EventHandlerRegistry → listeners/ - UUIDChecker → helpers/ - Removed ponder/ directory entirely - Cleaned up redundant same-package imports Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>
1 parent c24469f commit abcc21a

32 files changed

+32
-58
lines changed

src/main/java/dansplugins/wildpets/WildPets.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
import dansplugins.wildpets.storage.StorageService;
1212
import dansplugins.wildpets.scheduler.Scheduler;
1313
import org.bukkit.ChatColor;
14-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
15-
import dansplugins.wildpets.ponder.services.CommandService;
16-
import dansplugins.wildpets.ponder.tools.EventHandlerRegistry;
1714

1815
import org.bukkit.command.Command;
1916
import org.bukkit.command.CommandSender;
@@ -168,4 +165,4 @@ private void initializeCommandService() {
168165
));
169166
commandService.initialize(commands, "That command wasn't found.");
170167
}
171-
}
168+
}

src/main/java/dansplugins/wildpets/ponder/abs/AbstractPluginCommand.java renamed to src/main/java/dansplugins/wildpets/commands/AbstractPluginCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package dansplugins.wildpets.ponder.abs;
1+
package dansplugins.wildpets.commands;
22

33
import org.bukkit.ChatColor;
44
import org.bukkit.command.CommandSender;
5-
import dansplugins.wildpets.ponder.misc.ArgumentParser;
65

76
import java.util.ArrayList;
87
import java.util.Arrays;

src/main/java/dansplugins/wildpets/ponder/misc/ArgumentParser.java renamed to src/main/java/dansplugins/wildpets/commands/ArgumentParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dansplugins.wildpets.ponder.misc;
1+
package dansplugins.wildpets.commands;
22

33
import java.util.ArrayList;
44
import java.util.regex.Matcher;

src/main/java/dansplugins/wildpets/commands/CallCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import dansplugins.wildpets.data.EphemeralData;
44
import dansplugins.wildpets.pet.Pet;
5-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
65

76
import org.bukkit.Bukkit;
87
import org.bukkit.ChatColor;
@@ -55,4 +54,4 @@ public boolean execute(CommandSender sender) {
5554
public boolean execute(CommandSender commandSender, String[] strings) {
5655
return execute(commandSender);
5756
}
58-
}
57+
}

src/main/java/dansplugins/wildpets/commands/CheckAccessCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dansplugins.wildpets.commands;
22

33
import dansplugins.wildpets.data.EphemeralData;
4-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
54

65
import org.bukkit.ChatColor;
76
import org.bukkit.command.CommandSender;
@@ -37,4 +36,4 @@ public boolean execute(CommandSender sender) {
3736
public boolean execute(CommandSender commandSender, String[] strings) {
3837
return execute(commandSender);
3938
}
40-
}
39+
}

src/main/java/dansplugins/wildpets/ponder/services/CommandService.java renamed to src/main/java/dansplugins/wildpets/commands/CommandService.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
package dansplugins.wildpets.ponder.services;
1+
package dansplugins.wildpets.commands;
22

33
import org.bukkit.ChatColor;
44
import org.bukkit.command.CommandSender;
55
import org.bukkit.plugin.java.JavaPlugin;
6-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
7-
import dansplugins.wildpets.ponder.tools.PermissionChecker;
8-
import dansplugins.wildpets.ponder.misc.ArgumentParser;
96

107
import java.util.ArrayList;
118
import java.util.Set;

src/main/java/dansplugins/wildpets/commands/ConfigCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dansplugins.wildpets.commands;
22

3-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
43

54
import org.bukkit.ChatColor;
65
import org.bukkit.command.CommandSender;
@@ -51,4 +50,4 @@ else if (args[0].equalsIgnoreCase("set")) {
5150
return false;
5251
}
5352
}
54-
}
53+
}

src/main/java/dansplugins/wildpets/commands/DefaultCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dansplugins.wildpets.commands;
22

33
import dansplugins.wildpets.WildPets;
4-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
54

65
import org.bukkit.ChatColor;
76
import org.bukkit.command.CommandSender;
@@ -32,4 +31,4 @@ public boolean execute(CommandSender commandSender) {
3231
public boolean execute(CommandSender commandSender, String[] strings) {
3332
return execute(commandSender);
3433
}
35-
}
34+
}

src/main/java/dansplugins/wildpets/commands/FollowCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import dansplugins.wildpets.data.EphemeralData;
44
import dansplugins.wildpets.pet.Pet;
5-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
65

76
import org.bukkit.ChatColor;
87
import org.bukkit.command.CommandSender;
@@ -45,4 +44,4 @@ public boolean execute(CommandSender sender) {
4544
public boolean execute(CommandSender commandSender, String[] strings) {
4645
return execute(commandSender);
4746
}
48-
}
47+
}

src/main/java/dansplugins/wildpets/commands/GatherCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import dansplugins.wildpets.pet.list.PetListRepository;
44
import dansplugins.wildpets.pet.Pet;
55
import dansplugins.wildpets.pet.list.PetList;
6-
import dansplugins.wildpets.ponder.abs.AbstractPluginCommand;
76

87
import org.bukkit.Bukkit;
98
import org.bukkit.ChatColor;
@@ -54,4 +53,4 @@ public boolean execute(CommandSender commandSender) {
5453
public boolean execute(CommandSender commandSender, String[] strings) {
5554
return execute(commandSender);
5655
}
57-
}
56+
}

0 commit comments

Comments
 (0)