Skip to content

refactor: apply Clean Code principles to Medieval-Roleplay-Engine #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor: apply Clean Code principles to Medieval-Roleplay-Engine #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cadd3e
refactor: apply clean code principles across codebase
Copilot Apr 26, 2026
a5a5112
fix: add null world checks in Messenger.deliverMessageToNearbyPlayers
Copilot Apr 26, 2026
55b61bc
fix: address all PR review comments
Copilot Apr 26, 2026
4e45c27
fix: address second round of PR review comments
Copilot Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/main/java/dansplugins/rpsystem/MedievalRoleplayEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.io.File;

public class MedievalRoleplayEngine extends JavaPlugin {
private static final int BSTATS_PLUGIN_ID = 8996;

private final String pluginVersion = "v" + getDescription().getVersion();

public final CardLookupService cardLookupService = new CardLookupServiceImpl(this);
Expand All @@ -38,12 +40,10 @@ public class MedievalRoleplayEngine extends JavaPlugin {

@Override
public void onEnable() {
// create/load config
if (!(new File("./plugins/MedievalRoleplayEngine/config.yml").exists())) {
configService.saveConfigDefaults();
}
else {
// pre load compatibility checks
if (isVersionMismatched()) {
configService.handleVersionMismatch();
}
Expand All @@ -62,8 +62,7 @@ public void onEnable() {

registerListeners();

int pluginId = 8996;
new Metrics(this, pluginId);
new Metrics(this, BSTATS_PLUGIN_ID);

if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
new PlaceholderAPI(this).register();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dansplugins/rpsystem/cards/CardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public ArrayList<CharacterCard> getCards() {

public CharacterCard getCard(UUID uuid) {
for (CharacterCard card : getCards()) {
if (card.getPlayerUUID().equals(uuid)) {
if (uuid != null && uuid.equals(card.getPlayerUUID())) {
return card;
}
}
Expand All @@ -21,7 +21,7 @@ public CharacterCard getCard(UUID uuid) {

public boolean hasCard(UUID uuid) {
for (CharacterCard card : getCards()) {
if (card.getPlayerUUID().equals(uuid)) {
if (uuid != null && uuid.equals(card.getPlayerUUID())) {
return true;
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/dansplugins/rpsystem/cards/CharacterCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public CharacterCard(MedievalRoleplayEngine medievalRoleplayEngine, UUID uuid) {
playerUUID = uuid;
}

// storage constructor
public CharacterCard(MedievalRoleplayEngine medievalRoleplayEngine) {
this.medievalRoleplayEngine = medievalRoleplayEngine;
}
Expand All @@ -38,8 +37,8 @@ public UUID getPlayerUUID() {
return playerUUID;
}

public void setName(String newUUID) {
name = newUUID;
public void setName(String newName) {
name = newName;
}

public String getName() {
Expand Down Expand Up @@ -101,7 +100,6 @@ public boolean save() {

FileWriter saveWriter = new FileWriter("./plugins/MedievalRoleplayEngine/" + playerUUID + ".txt");

// actual saving takes place here
saveWriter.write(playerUUID.toString() + "\n");
saveWriter.write(name + "\n");
saveWriter.write(race + "\n");
Expand All @@ -126,7 +124,6 @@ public boolean load(String filename) {
File loadFile = new File("./plugins/MedievalRoleplayEngine/" + filename);
Scanner loadReader = new Scanner(loadFile);

// actual loading
if (loadReader.hasNextLine()) {
setPlayerUUID(UUID.fromString(loadReader.nextLine()));
}
Expand Down Expand Up @@ -163,7 +160,6 @@ public boolean legacyLoad(String filename) {
File loadFile = new File("./plugins/medieval-roleplay-engine/" + filename);
Scanner loadReader = new Scanner(loadFile);

// actual loading
if (loadReader.hasNextLine()) {
setPlayerUUID(medievalRoleplayEngine.uuidChecker.findUUIDBasedOnPlayerName(loadReader.nextLine()));
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/dansplugins/rpsystem/commands/CommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@ public CommandService(MedievalRoleplayEngine medievalRoleplayEngine) {

public boolean interpretCommand(CommandSender sender, String label, String[] args) {

// help command
if (label.equalsIgnoreCase("rphelp")) {
HelpCommand command = new HelpCommand(medievalRoleplayEngine);
command.showListOfCommands(sender);
return true;
}

// card command
if (label.equalsIgnoreCase("card")) {
CardCommand command = new CardCommand(medievalRoleplayEngine);
if (args.length == 0) {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/dansplugins/rpsystem/commands/bird/BirdCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public BirdCommand(MedievalRoleplayEngine medievalRoleplayEngine) {
}

public void sendBird(CommandSender sender, String[] args) {
// player check
if (!(sender instanceof Player)) {
return;
}
Expand All @@ -28,7 +27,6 @@ public void sendBird(CommandSender sender, String[] args) {
return;
}

// zero args check
if (args.length < 2) {
player.sendMessage(medievalRoleplayEngine.colorChecker.getNegativeAlertColor() + "Usage: /bird (player-name) (message)");
return;
Expand Down
Loading
Loading