Uses KnarLib where possible
This commit is contained in:
@ -1,10 +1,10 @@
|
||||
package net.knarcraft.paidsigns.command;
|
||||
|
||||
import net.knarcraft.knarlib.formatting.StringFormatter;
|
||||
import net.knarcraft.paidsigns.PaidSigns;
|
||||
import net.knarcraft.paidsigns.container.PaidSign;
|
||||
import net.knarcraft.paidsigns.container.PaidSignCondition;
|
||||
import net.knarcraft.paidsigns.formatting.StringFormatter;
|
||||
import net.knarcraft.paidsigns.formatting.TranslatableMessage;
|
||||
import net.knarcraft.paidsigns.formatting.PaidSignsTranslatableMessage;
|
||||
import net.knarcraft.paidsigns.manager.PaidSignManager;
|
||||
import net.knarcraft.paidsigns.property.OptionState;
|
||||
import net.knarcraft.paidsigns.property.PaidSignConditionProperty;
|
||||
@ -31,7 +31,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
|
||||
PaidSign sign = PaidSigns.getInstance().getSignManager().getPaidSign(arguments.get(0));
|
||||
if (sign == null) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(TranslatableMessage.ERROR_PAID_SIGN_NOT_FOUND));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_PAID_SIGN_NOT_FOUND);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
return parseGivenProperty(sign, sender);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(TranslatableMessage.ERROR_EXCEPTION_OCCURRED));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_EXCEPTION_OCCURRED);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -61,7 +61,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
@NotNull CommandSender sender) throws NumberFormatException {
|
||||
short signLine = (short) (Short.parseShort(arguments.get(1)) - 1);
|
||||
if (signLine < 0 || signLine > 3 || sign.getConditions().get(signLine) == null) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(TranslatableMessage.ERROR_NO_SUCH_CONDITION));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_NO_SUCH_CONDITION);
|
||||
return false;
|
||||
}
|
||||
if (argumentSize < 4) {
|
||||
@ -70,8 +70,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
|
||||
PaidSignConditionProperty conditionProperty = PaidSignConditionProperty.getFromString(arguments.get(2));
|
||||
if (conditionProperty == null) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(
|
||||
TranslatableMessage.ERROR_PROPERTY_NOT_RECOGNIZED));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_PROPERTY_NOT_RECOGNIZED);
|
||||
return false;
|
||||
}
|
||||
String value = arguments.get(3);
|
||||
@ -90,8 +89,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
@NotNull CommandSender sender) throws IOException {
|
||||
PaidSignProperty property = PaidSignProperty.getFromString(arguments.get(1));
|
||||
if (property == null) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(
|
||||
TranslatableMessage.ERROR_PROPERTY_NOT_RECOGNIZED));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_PROPERTY_NOT_RECOGNIZED);
|
||||
return false;
|
||||
}
|
||||
String value = arguments.get(2);
|
||||
@ -99,7 +97,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
updateProperty(sender, sign, property, value);
|
||||
return true;
|
||||
} catch (NumberFormatException exception) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(TranslatableMessage.ERROR_INVALID_NUMBER));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_INVALID_NUMBER);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -137,7 +135,7 @@ public class EditCommand extends TokenizedCommand {
|
||||
manager.removePaidSign(sign.getName());
|
||||
manager.addPaidSign(updatedSign);
|
||||
|
||||
sender.sendMessage(StringFormatter.getTranslatedInfoMessage(TranslatableMessage.SUCCESS_UPDATED_PAID_SIGN));
|
||||
StringFormatter.displaySuccessMessage(sender, PaidSignsTranslatableMessage.SUCCESS_UPDATED_PAID_SIGN);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -173,12 +171,11 @@ public class EditCommand extends TokenizedCommand {
|
||||
try {
|
||||
PaidSigns.getInstance().getSignManager().saveSigns();
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage(StringFormatter.getTranslatedErrorMessage(TranslatableMessage.ERROR_EXCEPTION_OCCURRED));
|
||||
StringFormatter.displayErrorMessage(sender, PaidSignsTranslatableMessage.ERROR_EXCEPTION_OCCURRED);
|
||||
return false;
|
||||
}
|
||||
|
||||
sender.sendMessage(StringFormatter.getTranslatedInfoMessage(
|
||||
TranslatableMessage.SUCCESS_UPDATED_PAID_SIGN_CONDITION));
|
||||
StringFormatter.displaySuccessMessage(sender, PaidSignsTranslatableMessage.SUCCESS_UPDATED_PAID_SIGN_CONDITION);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user