Skip to content

Commit

Permalink
Resolvido bug chave valor negativo
Browse files Browse the repository at this point in the history
  • Loading branch information
@SrBedrock
SrBedrock committed Nov 3, 2024
1 parent e072b4d commit 7857d1d
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 35 deletions.
5 changes: 3 additions & 2 deletions common/src/main/java/com/badbones69/crazycrates/common/config/types/MessageKeys.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class MessageKeys implements SettingsHolder {
public static final Property<String> transfer_not_enough_keys = newProperty("Messages.Transfer-Keys.Not-Enough-Keys", "%prefix%&cYou do not have enough keys to transfer.");
public static final Property<String> transfer_sent_keys = newProperty("Messages.Transfer-Keys.Transferred-Keys", "%prefix%&7You have transferred %amount% %crate% keys to %player%.");
public static final Property<String> transfer_received_keys = newProperty("Messages.Transfer-Keys.Received-Transferred-Keys", "%prefix%&7You have received %amount% %crate% keys from %player%.");
public static Property<String> transfer_invalid_amount = newProperty("Messages.Transfer-Keys.Invalid-Amount", "%prefix%&cThe amount must be a positive number.");
public static final Property<List<String>> created_physical_crate = newListProperty("Messages.Created-Physical-Crate", List.of(
"%prefix%&7You have set that block to %crate%.",
"&7To remove the crate shift break in creative to remove."
Expand Down Expand Up @@ -116,8 +117,8 @@ public class MessageKeys implements SettingsHolder {
public static final Property<String> cleared_player_keys = newProperty("Messages.Cleared-Player-Keys", "%prefix%&cYou have cleared &e%amount%x %key% &cfrom &6%player%&c.");

@Override
public void registerComments(CommentsConfiguration conf) {
String[] header = {
public void registerComments(final CommentsConfiguration conf) {
final String[] header = {
"Support: https://discord.gg/badbones-s-live-chat-182615261403283459",
"Github: https://github.com/Crazy-Crew",
"",
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sources=https://github.com/Crazy-Crew/CrazyCrates
issues=https://github.com/Crazy-Crew/CrazyCrates/issues
group=com.badbones69.crazycrates
description=Add unlimited crates to your server with 10 different crate types to choose from!
version=1.25.0
version=1.26.0
apiVersion=1.20
mcVersion=1.20.4
isBeta=false
29 changes: 15 additions & 14 deletions paper/src/main/java/com/badbones69/crazycrates/api/enums/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public enum Messages {
transfer_not_enough_keys(MessageKeys.transfer_not_enough_keys),
transfer_sent_keys(MessageKeys.transfer_sent_keys),
transfer_received_keys(MessageKeys.transfer_received_keys),
transfer_invalid_amount(MessageKeys.transfer_invalid_amount),
created_physical_crate(MessageKeys.created_physical_crate, true),
removed_physical_crate(MessageKeys.removed_physical_crate),
no_virtual_keys(MessageKeys.no_virtual_keys),
Expand Down Expand Up @@ -94,7 +95,7 @@ public enum Messages {
*
* @param property the property
*/
Messages(Property<String> property) {
Messages(final Property<String> property) {
this.property = property;
}

Expand All @@ -104,7 +105,7 @@ public enum Messages {
* @param listProperty the list property
* @param isList Defines if it's a list or not.
*/
Messages(Property<List<String>> listProperty, boolean isList) {
Messages(final Property<List<String>> listProperty, final boolean isList) {
this.listProperty = listProperty;

this.isList = isList;
Expand All @@ -114,38 +115,38 @@ private boolean isList() {
return this.isList;
}

private @NotNull List<String> getPropertyList(Property<List<String>> properties) {
private @NotNull List<String> getPropertyList(final Property<List<String>> properties) {
return this.configuration.getProperty(properties);
}

private @NotNull String getProperty(Property<String> property) {
private @NotNull String getProperty(final Property<String> property) {
return this.configuration.getProperty(property);
}

public String getMessage(Map<String, String> placeholders) {
public String getMessage(final Map<String, String> placeholders) {
return getMessage(placeholders, null);
}

public String getMessage() {
return getMessage(new HashMap<>(), null);
}

public String getMessage(Player player) {
public String getMessage(final Player player) {
return getMessage(new HashMap<>(), player);
}

public String getMessage(String placeholder, String replacement, Player player) {
Map<String, String> placeholders = new HashMap<>();
public String getMessage(final String placeholder, final String replacement, final Player player) {
final Map<String, String> placeholders = new HashMap<>();
placeholders.put(placeholder, replacement);

return getMessage(placeholders, player);
}

public String getMessage(String placeholder, String replacement) {
public String getMessage(final String placeholder, final String replacement) {
return getMessage(placeholder, replacement, null);
}

public String getMessage(Map<String, String> placeholders, Player player) {
public String getMessage(final Map<String, String> placeholders, final Player player) {
// Get the string first.
String message;

Expand All @@ -156,7 +157,7 @@ public String getMessage(Map<String, String> placeholders, Player player) {
}

if (!placeholders.isEmpty()) {
for (Map.Entry<String, String> placeholder : placeholders.entrySet()) {
for (final Map.Entry<String, String> placeholder : placeholders.entrySet()) {
message = message.replace(placeholder.getKey(), placeholder.getValue());
}
}
Expand All @@ -166,10 +167,10 @@ public String getMessage(Map<String, String> placeholders, Player player) {
return asString(player);
}

private String asString(Player player) {
String prefix = this.configManager.getConfig().getProperty(ConfigKeys.command_prefix);
private String asString(final Player player) {
final String prefix = this.configManager.getConfig().getProperty(ConfigKeys.command_prefix);

String message = this.message.replaceAll("%prefix%", prefix);
final String message = this.message.replaceAll("%prefix%", prefix);

if (MiscUtils.isPapiActive() && player != null) {
return PlaceholderAPI.setPlaceholders(player, MsgUtils.color(message));
Expand Down
42 changes: 24 additions & 18 deletions paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public class BaseKeyCommand extends BaseCommand {

@Default
@Permission("crazycrates.command.player.key")
public void viewPersonal(@NotNull Player player) {
Map<String, String> placeholders = new HashMap<>();
public void viewPersonal(@NotNull final Player player) {
final Map<String, String> placeholders = new HashMap<>();

placeholders.put("%crates_opened%", String.valueOf(0));

Expand All @@ -58,9 +58,9 @@ public void viewPersonal(@NotNull Player player) {

@SubCommand("ver")
@Permission("crazycrates.command.player.key.others")
public void viewOthers(CommandSender sender, @Optional @Suggestion("online-players") Player target) {
public void viewOthers(final CommandSender sender, @Optional @Suggestion("online-players") final Player target) {
if (target == sender || target == null) {
if (!(sender instanceof Player player)) {
if (!(sender instanceof final Player player)) {
sender.sendMessage(Messages.must_be_a_player.getMessage());
return;
}
Expand All @@ -69,22 +69,22 @@ public void viewOthers(CommandSender sender, @Optional @Suggestion("online-playe
return;
}

Map<String, String> placeholders = new HashMap<>();
final Map<String, String> placeholders = new HashMap<>();

placeholders.put("%player%", target.getName());
placeholders.put("%crates_opened%", String.valueOf(0));

String header = Messages.other_player_no_keys_header.getMessage(placeholders, sender instanceof Player player ? player : null);
final String header = Messages.other_player_no_keys_header.getMessage(placeholders, sender instanceof final Player player ? player : null);

String otherPlayer = Messages.other_player_no_keys.getMessage("%player%", target.getName(), sender instanceof Player player ? player : null);
final String otherPlayer = Messages.other_player_no_keys.getMessage("%player%", target.getName(), sender instanceof final Player player ? player : null);

getKeys(target, sender, header, otherPlayer);
}

@SubCommand("transferir")
@Permission(value = "crazycrates.command.player.key.transfer")
public void onPlayerTransferKeys(Player sender, @Suggestion("crates") String crateName, @Suggestion("online-players") Player player, @Suggestion("numbers") int amount) {
Crate crate = this.crateManager.getCrateFromName(crateName);
public void onPlayerTransferKeys(final Player sender, @Suggestion("crates") final String crateName, @Suggestion("online-players") final Player player, @Suggestion("numbers") final int amount) {
final Crate crate = this.crateManager.getCrateFromName(crateName);

// If the crate is menu or null. we return
if (crate == null || crate.getCrateType() == CrateType.menu) {
Expand All @@ -98,7 +98,13 @@ public void onPlayerTransferKeys(Player sender, @Suggestion("crates") String cra
return;
}

Map<String, String> placeholders = new HashMap<>();
// check if amount is positive
if (amount <= 0) {
sender.sendMessage(Messages.transfer_invalid_amount.getMessage(sender));
return;
}

final Map<String, String> placeholders = new HashMap<>();

placeholders.put("%crate%", crate.getName());
placeholders.put("%key%", crate.getKeyName());
Expand All @@ -111,7 +117,7 @@ public void onPlayerTransferKeys(Player sender, @Suggestion("crates") String cra
return;
}

PlayerReceiveKeyEvent event = new PlayerReceiveKeyEvent(player, crate, PlayerReceiveKeyEvent.KeyReceiveReason.TRANSFER, amount);
final PlayerReceiveKeyEvent event = new PlayerReceiveKeyEvent(player, crate, PlayerReceiveKeyEvent.KeyReceiveReason.TRANSFER, amount);
this.plugin.getServer().getPluginManager().callEvent(event);

// If the event is cancelled, We return.
Expand All @@ -137,22 +143,22 @@ public void onPlayerTransferKeys(Player sender, @Suggestion("crates") String cra
* @param header header of the message.
* @param messageContent content of the message.
*/
private void getKeys(Player player, CommandSender sender, String header, String messageContent) {
List<String> message = Lists.newArrayList();
private void getKeys(final Player player, final CommandSender sender, final String header, final String messageContent) {
final List<String> message = Lists.newArrayList();

message.add(header);

Map<Crate, Integer> keys = new HashMap<>();
final Map<Crate, Integer> keys = new HashMap<>();

this.plugin.getCrateManager().getUsableCrates().forEach(crate -> keys.put(crate, this.userManager.getVirtualKeys(player.getUniqueId(), crate.getName())));

boolean hasKeys = false;

for (Crate crate : keys.keySet()) {
int amount = keys.get(crate);
for (final Crate crate : keys.keySet()) {
final int amount = keys.get(crate);

if (amount > 0) {
Map<String, String> placeholders = new HashMap<>();
final Map<String, String> placeholders = new HashMap<>();

hasKeys = true;

Expand All @@ -165,7 +171,7 @@ private void getKeys(Player player, CommandSender sender, String header, String
}

if (MiscUtils.isPapiActive()) {
if (sender instanceof Player person) {
if (sender instanceof final Player person) {
if (hasKeys) {
message.forEach(line -> person.sendMessage(PlaceholderAPI.setPlaceholders(person, line)));
return;
Expand Down

0 comments on commit 7857d1d

Please sign in to comment.