Skip to content

Commit

Permalink
2.13.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stonley890
Stonley890 committed Jun 11, 2024
1 parent 6a2d09e commit afd26ed
Show file tree
Hide file tree
Showing 14 changed files with 326 additions and 66 deletions.
1 change: 1 addition & 0 deletions dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/Dreamvisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ public void onEnable() {
commands.add(new CmdMoonglobe());
commands.add(new CmdSetback());
commands.add(new CmdParcel());
commands.add(new CmdDreamvisitor());

debug("Initializing commands...");
CommandAPI.onLoad(new CommandAPIBukkitConfig(this).silentLogs(!debugMode));
Expand Down
119 changes: 114 additions & 5 deletions dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/commands/CmdDreamvisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public CommandAPICommand getCommand() {
.withOptionalArguments(new BooleanArgument("debug"))
.executes((sender, args) -> {
@Nullable String key = "debug";
configInt(sender, args, key);
configBoolean(sender, args, key);
}),
new CommandAPICommand("website-url")
.withHelp("Set website-url.", "Website URL\n" +
Expand All @@ -67,7 +67,7 @@ public CommandAPICommand getCommand() {
.withOptionalArguments(new BooleanArgument("web-whitelist"))
.executes((sender, args) -> {
@Nullable String key = "web-whitelist";
configInt(sender, args, key);
configBoolean(sender, args, key);
}),
new CommandAPICommand("chatChannelID")
.withHelp("Set chatChannelID.", "The channel ID of the game chat.\n" +
Expand Down Expand Up @@ -121,7 +121,7 @@ public CommandAPICommand getCommand() {
.withOptionalArguments(new BooleanArgument("chatPaused"))
.executes((sender, args) -> {
@Nullable String key = "chatPaused";
configInt(sender, args, key);
configBoolean(sender, args, key);
}),
new CommandAPICommand("softwhitelist")
.withHelp("Set softwhitelist.", "Whether the soft whitelist is enabled or not\n" +
Expand All @@ -130,7 +130,7 @@ public CommandAPICommand getCommand() {
.withOptionalArguments(new BooleanArgument("softwhitelist"))
.executes((sender, args) -> {
@Nullable String key = "softwhitelist";
configInt(sender, args, key);
configBoolean(sender, args, key);
}),
new CommandAPICommand("playerlimit")
.withHelp("Set playerlimit.", "Player limit override. This will override the player limit, both over and under.\n" +
Expand All @@ -148,7 +148,7 @@ public CommandAPICommand getCommand() {
.withOptionalArguments(new BooleanArgument("disablepvp"))
.executes((sender, args) -> {
@Nullable String key = "disablepvp";
configInt(sender, args, key);
configBoolean(sender, args, key);
}),
new CommandAPICommand("hubLocation")
.withHelp("Get hubLocation.", "The location of the recorded hub.\n" +
Expand All @@ -160,6 +160,115 @@ public CommandAPICommand getCommand() {
String reply = "none";
if (location != null) reply = location.toString();
sender.sendMessage(Dreamvisitor.PREFIX + key + " is currently set to\n" + reply);
}),
new CommandAPICommand("log-console")
.withHelp("Set log-console.", "Whether to copy the output of the console to the Discord log channel.\n" +
"This will disable the default Dreamvisitor logging in place of the Minecraft server console.\n" +
"Default: false")
.withOptionalArguments(new BooleanArgument("log-console"))
.executes((sender, args) -> {
@Nullable String key = "log-console";
configBoolean(sender, args, key);
}),
new CommandAPICommand("enable-log-console-commands")
.withHelp("Set enable-log-console-commands.", "Whether to pass messages in the log channel as console commands.\n" +
"If log-console is enabled, this will take messages sent by users with the Discord administrator permission and pass\n" +
" them as console commands.\n" +
"Default: false")
.withOptionalArguments(new BooleanArgument("enable-log-console-commands"))
.executes((sender, args) -> {
@Nullable String key = "enable-log-console-commands";
configBoolean(sender, args, key);
}),
new CommandAPICommand("infraction-expire-time-days")
.withHelp("Set infraction-expire-time-days.", "The amount of time in days (as an integer) that infractions take to expire.\n" +
"Expired infractions are not deleted, but they do not count toward a total infraction count.\n" +
"Default: 90")
.withOptionalArguments(new IntegerArgument("infraction-expire-time-days", 0))
.executes((sender, args) -> {
@Nullable String key = "infraction-expire-time-days";
configInt(sender, args, key);
}),
new CommandAPICommand("infractions-category-id")
.withHelp("Set infractions-category-id.", "The ID of the category to create infractions channels.\n" +
"They will accumulate here.\n" +
"Default: 1226180189604544593")
.withOptionalArguments(new LongArgument("infractions-category-id"))
.executes((sender, args) -> {
@Nullable String key = "infractions-category-id";
configLong(sender, args, key);
}),
new CommandAPICommand("shopName")
.withHelp("Set shopName.", "The name of the Discord shop.\n" +
"This will appear at the top of the embed.\n" +
"Default: \"Shop\"")
.withOptionalArguments(new TextArgument("shopName"))
.executes((sender, args) -> {
@Nullable String key = "shopName";
configString(sender, args, key);
}),
new CommandAPICommand("currencyIcon")
.withHelp("Set currencyIcon.", "The icon used for currency in the Discord economy system.\n" +
"This can be any string, including symbols, letters, emojis, and Discord custom emoji.\n" +
"Default: \"$\"")
.withOptionalArguments(new TextArgument("currencyIcon"))
.executes((sender, args) -> {
@Nullable String key = "currencyIcon";
configString(sender, args, key);
}),
new CommandAPICommand("dailyBaseAmount")
.withHelp("Set dailyBaseAmount.", "The base amount given by the /daily Discord command.\n" +
"This is the default amount before adding the streak bonus. The total amount is decided by dailyBaseAmount + (user's streak * this).\n" +
"Default: 10.00")
.withOptionalArguments(new LongArgument("dailyBaseAmount"))
.executes((sender, args) -> {
@Nullable String key = "dailyBaseAmount";
configLong(sender, args, key);
}),
new CommandAPICommand("dailyStreakMultiplier")
.withHelp("Set dailyStreakMultiplier.", "The multiplier of the streak bonus given by the /daily command.\n" +
"This is multiplied by the streak and added to the base amount. The total amount is decided by dailyBaseAmount + (user's streak * this).\n" +
"Default: 5.00")
.withOptionalArguments(new LongArgument("dailyStreakMultiplier"))
.executes((sender, args) -> {
@Nullable String key = "dailyStreakMultiplier";
configLong(sender, args, key);
}),
new CommandAPICommand("workReward")
.withHelp("Set workReward.", "The amount gained from the /work command.\n" +
"/work can only be run every hour.\n" +
"Default: 20.00")
.withOptionalArguments(new LongArgument("workReward"))
.executes((sender, args) -> {
@Nullable String key = "workReward";
configLong(sender, args, key);
}),
new CommandAPICommand("mailDeliveryLocationSelectionDistanceWeightMultiplier")
.withHelp("Set mailDeliveryLocationSelectionDistanceWeightMultiplier.", "The multiplier of the distance weight when choosing mail delivery locations.\n" +
"Takes the ratio (between 0 and 1) of the distance to the maximum distance between locations,\n" +
" multiplies it by this value, and adds it to the mail location weight.\n" +
"This weight is used to randomly choose a mail location to deliver to provide a realistic\n" +
" relationship between delivery locations.\n" +
"At 0, distance has no effect on location selection.\n" +
"At 1, the weight will have a slight effect on the location selection.\n" +
"At 10, the weight will have a significant effect on the location selection.\n" +
"The weight is applied inversely, making closer distances worth more than further distances.\n" +
"Default: 1.00")
.withOptionalArguments(new LongArgument("mailDeliveryLocationSelectionDistanceWeightMultiplier"))
.executes((sender, args) -> {
@Nullable String key = "mailDeliveryLocationSelectionDistanceWeightMultiplier";
configLong(sender, args, key);
}),
new CommandAPICommand("mailDistanceToRewardMultiplier")
.withHelp("Set mailDistanceToRewardMultiplier.", "Mail delivery reward is calculated by multiplying the distance by this number.\n" +
"The result is then rounded to the nearest ten.\n" +
"At 0, the reward given is 0.\n" +
"At 1, the reward given will be the distance in blocks.\n" +
"Default: 0.05")
.withOptionalArguments(new LongArgument("mailDistanceToRewardMultiplier"))
.executes((sender, args) -> {
@Nullable String key = "mailDistanceToRewardMultiplier";
configLong(sender, args, key);
})
)
);
Expand Down
50 changes: 32 additions & 18 deletions dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/data/Economy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;

Expand All @@ -38,6 +40,11 @@ public static void init() throws IOException {
}
}

public static String formatDouble(double number) {
DecimalFormat decimalFormat = new DecimalFormat("#,##0.00");
return decimalFormat.format(number);
}

@NotNull
private static YamlConfiguration getConfig() {
YamlConfiguration config = new YamlConfiguration();
Expand Down Expand Up @@ -587,12 +594,16 @@ public int getQuantityOfItem(int itemId) {
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj instanceof Consumer consumer) {
return (consumer.balance == balance && Objects.equals(consumer.items, items));
}
return false;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Consumer consumer = (Consumer) o;
return id == consumer.id && Double.compare(balance, consumer.balance) == 0 && Objects.equals(items, consumer.items) && Objects.equals(gameData, consumer.gameData);
}

@Override
public int hashCode() {
return Objects.hash(id, balance, items, gameData);
}

@NotNull
Expand Down Expand Up @@ -714,7 +725,7 @@ public void useItem(int itemId) throws NullPointerException, ItemNotEnabledExcep
* @throws CoolDownException if this consumer cannot yet claim their
*/
public double claimDaily() throws CoolDownException {
if (!gameData.timeUntilNextDaily().isZero()) throw new CoolDownException();
if (gameData.lastDaily != null && !Objects.equals(gameData.lastDaily.plusHours(24).getDayOfYear(), LocalDateTime.now().getDayOfYear())) throw new CoolDownException();
gameData.updateStreak();
double dailyBaseAmount = Economy.getDailyBaseAmount();
double reward = dailyBaseAmount + (gameData.getDailyStreak() * getDailyStreakMultiplier());
Expand Down Expand Up @@ -809,23 +820,13 @@ public void setDailyStreak(int dailyStreak) {
this.dailyStreak = dailyStreak;
}

public Duration timeUntilNextDaily() {
if (lastDaily == null || lastDaily.plusDays(1).isBefore(LocalDateTime.now())) return Duration.ZERO;
return Duration.between(lastDaily.plusDays(1), LocalDateTime.now());
}

public Duration timeUntilNextWork() {
if (lastWork == null || lastWork.plusHours(1).isBefore(LocalDateTime.now())) return Duration.ZERO;
return Duration.between(lastWork.plusHours(1), LocalDateTime.now());
}

public Duration timeUntilDailyStreakBreak() {
if (lastDaily == null || lastDaily.plusDays(2).isBefore(LocalDateTime.now())) return Duration.ZERO;
return Duration.between(lastDaily.plusDays(2), LocalDateTime.now());
}

public void updateStreak() {
if (timeUntilDailyStreakBreak().isZero()) setDailyStreak(0);
if (lastDaily == null || LocalDate.from(lastDaily).plusDays(2).equals(LocalDate.now())) setDailyStreak(0);
}

@Nullable
Expand Down Expand Up @@ -855,5 +856,18 @@ public Map<String, Object> serialize() {
map.put("lastWork", lastWork != null ? lastWork.toString() : null);
return map;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GameData gameData = (GameData) o;
return dailyStreak == gameData.dailyStreak && Objects.equals(lastDaily, gameData.lastDaily) && Objects.equals(lastWork, gameData.lastWork);
}

@Override
public int hashCode() {
return Objects.hash(dailyStreak, lastDaily, lastWork);
}
}
}
1 change: 1 addition & 0 deletions ...mvisitor/src/main/java/io/github/stonley890/dreamvisitor/discord/DiscCommandsManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public static void init() {
addList.add(new DCmdEcostats());
addList.add(new DCmdDaily());
addList.add(new DCmdWork());
addList.add(new DCmdBaltop());

Dreamvisitor.debug("Ready to add to guild.");

Expand Down
4 changes: 2 additions & 2 deletions ...visitor/src/main/java/io/github/stonley890/dreamvisitor/discord/commands/DCmdBalance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ public void onCommand(@NotNull SlashCommandInteractionEvent event) {
Economy.Consumer consumer = Economy.getConsumer(event.getUser().getIdLong());
double balance;
balance = consumer.getBalance();
message = "You have " + Economy.getCurrencySymbol() + balance + ".";
message = "You have " + Economy.getCurrencySymbol() + Economy.formatDouble(balance) + ".";
}

EmbedBuilder embed = new EmbedBuilder();
embed.setDescription(message);

event.replyEmbeds(embed.build()).setEphemeral(true).queue();
event.replyEmbeds(embed.build()).queue();

}
}
Loading

0 comments on commit afd26ed

Please sign in to comment.