Skip to content

Commit

Permalink
Fix merge artifacts once again
Browse files Browse the repository at this point in the history
  • Loading branch information
@FireInstall
FireInstall committed Feb 13, 2024
1 parent 91839c2 commit 20d36d6
Show file tree
Hide file tree
Showing 27 changed files with 144 additions and 171 deletions.
15 changes: 8 additions & 7 deletions Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,21 @@
import au.com.mineauz.minigames.objects.MinigamePlayer;
import au.com.mineauz.minigames.sounds.MGSounds;
import au.com.mineauz.minigames.sounds.PlayMGSound;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.bossbar.BossBar;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import org.bukkit.Bukkit;

import java.time.Duration;
import java.util.ArrayList;
import java.util.List;

public class MinigameTimer {
private static final Minigames plugin = Minigames.getPlugin();
private final long timeLength;
private final Minigame minigame;
private final List<Integer> timeMsg = new ArrayList<>();
private final List<Long> timeMsg = new ArrayList<>();
private long timeLeft = 0;
private int taskID = -1;
private boolean broadcastTime = true;
Expand All @@ -32,7 +33,7 @@ public MinigameTimer(Minigame minigame, long timeLength) {
this.timeLength = timeLength;
this.timeLeft = timeLength;
this.minigame = minigame;
timeMsg.addAll(plugin.getConfig().getIntegerList("multiplayer.timerMessageInterval"));
timeMsg.addAll(plugin.getConfig().getLongList("multiplayer.timerMessageInterval"));
startTimer();
}

Expand All @@ -59,7 +60,7 @@ private void runTimer() {
switch (minigame.getTimerDisplayType()) {
case XP_BAR -> {
float timeLeftpercent = ((float) timeLeft) / ((float) timeLength);
int level;
long level;
if (timeLeft / 60 > 0) {
level = timeLeft / 60;
} else {
Expand All @@ -72,12 +73,12 @@ private void runTimer() {
mgPlayer.getPlayer().setLevel(0);
} else {
mgPlayer.getPlayer().setExp(timeLeftpercent);
mgPlayer.getPlayer().setLevel(level);
mgPlayer.getPlayer().setLevel((int) level);
}
}
}
case BOSS_BAR -> {
Component bossBarName = Component.text(MinigameUtils.convertTime(timeLeft), NamedTextColor.DARK_GREEN);
Component bossBarName = MinigameUtils.convertTime(Duration.ofSeconds(timeLeft)).color(NamedTextColor.DARK_GREEN);

if (bossBar == null) {
bossBar = BossBar.bossBar(bossBarName, BossBar.MAX_PROGRESS, BossBar.Color.GREEN, BossBar.Overlay.PROGRESS);
Expand All @@ -95,7 +96,7 @@ private void runTimer() {
if (timeMsg.contains(timeLeft) && broadcastTime) {
PlayMGSound.playSound(minigame, MGSounds.TIMER_TICK.getSound());
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_TIMELEFT,
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(timeLeft))));
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(timeLeft)))));
}

if (timeLeft <= 0) {
Expand Down
5 changes: 2 additions & 3 deletions Minigames/src/main/java/au/com/mineauz/minigames/commands/DebugCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package au.com.mineauz.minigames.commands;

import au.com.mineauz.minigames.Minigames;
import au.com.mineauz.minigames.minigame.Minigame;
import net.kyori.adventure.text.Component;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.bukkit.Bukkit;
Expand Down Expand Up @@ -70,7 +69,7 @@ public boolean onCommand(@NotNull CommandSender sender,
}
case "PASTE" -> {
sender.sendMessage(ChatColor.GRAY + "Generating a paste.....");
generatePaste(sender, minigame);
generatePaste(sender);
}
default -> {
return false;
Expand Down Expand Up @@ -108,7 +107,7 @@ private String getFile(Path file) {
}
}

private void generatePaste(CommandSender sender, Minigame minigame) {
private void generatePaste(CommandSender sender) {
StringBuilder mainInfo = new StringBuilder(); //todo
mainInfo.append(Bukkit.getName()).append(" version: ").append(Bukkit.getServer().getVersion()).append('\n');
mainInfo.append("Plugin version: ").append(Minigames.getPlugin().getDescription().getVersion()).append('\n');
Expand Down
12 changes: 6 additions & 6 deletions Minigames/src/main/java/au/com/mineauz/minigames/commands/GlobalLoadoutCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import au.com.mineauz.minigames.managers.MinigameManager;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMenuLangKey;
import au.com.mineauz.minigames.menu.Menu;
import au.com.mineauz.minigames.menu.MenuItem;
import au.com.mineauz.minigames.menu.MenuItemDisplayLoadout;
Expand Down Expand Up @@ -58,17 +59,16 @@ public boolean onCommand(@NotNull CommandSender sender,
MinigamePlayer player = Minigames.getPlugin().getPlayerManager().getMinigamePlayer((Player) sender);
Menu loadouts = new Menu(6, getName(), player);

List<Component> des = new ArrayList<>();
des.add("Shift + Right Click to Delete");
List<MenuItem> mi = new ArrayList<>();
for (String ld : mdata.getLoadouts()) {
Material item = Material.WHITE_STAINED_GLASS_PANE;
Material displayMaterial = Material.WHITE_STAINED_GLASS_PANE;
if (!mdata.getLoadout(ld).getItemSlots().isEmpty()) {
item = mdata.getLoadout(ld).getItem((Integer) mdata.getLoadout(ld).getItemSlots().toArray()[0]).getType();
displayMaterial = mdata.getLoadout(ld).getItem((Integer) mdata.getLoadout(ld).getItemSlots().toArray()[0]).getType();
}
mi.add(new MenuItemDisplayLoadout(ld, des, item, mdata.getLoadout(ld)));
mi.add(new MenuItemDisplayLoadout(displayMaterial, ld,
MinigameMessageManager.getMgMessageList(MgMenuLangKey.MENU_DELETE_SHIFTRIGHTCLICK), mdata.getLoadout(ld)));
}
loadouts.addItem(new MenuItemLoadoutAdd("Add Loadout", Material.ITEM_FRAME, mdata.getLoadoutMap()), 53);
loadouts.addItem(new MenuItemLoadoutAdd(Material.ITEM_FRAME, "Add Loadout", mdata.getLoadoutMap()), 53);
loadouts.addItems(mi);

loadouts.displayMenu(player);
Expand Down
2 changes: 1 addition & 1 deletion Minigames/src/main/java/au/com/mineauz/minigames/commands/ScoreboardCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public boolean onCommand(final @NotNull CommandSender sender, @NotNull String @N
}
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_ERROR_INTERNAL);
Minigames.getCmpnntLogger().error("An internal error occurred while loading the statistics", t);
Minigames.getCmpnntLogger().error("An internal error occurred while loading the statistics", throwable);
}
});

Expand Down
12 changes: 5 additions & 7 deletions Minigames/src/main/java/au/com/mineauz/minigames/commands/SelectCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import au.com.mineauz.minigames.MinigameUtils;
import au.com.mineauz.minigames.Minigames;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.objects.MinigamePlayer;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
Expand All @@ -13,7 +12,7 @@

import java.util.List;

public class SelectCommand implements ICommand {
public class SelectCommand extends ACommand {
@Override
public @NotNull String getName() {
return "select";
Expand Down Expand Up @@ -44,12 +43,11 @@ public boolean canBeConsole() {
}

@Override
public boolean onCommand(@NotNull CommandSender sender, @Nullable Minigame minigame,
@NotNull String @Nullable [] args) {
public boolean onCommand(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
if (sender instanceof Player player) {
MinigamePlayer mgPlayer = Minigames.getPlugin().getPlayerManager().getMinigamePlayer(player);

if (args != null && args.length > 0) {
if (args.length > 0) {
if (args[0].equalsIgnoreCase("1")) {
mgPlayer.setSelection1(player.getLocation());
mgPlayer.sendInfoMessage(Component.text("Point 1 selected", NamedTextColor.GRAY));
Expand All @@ -75,8 +73,8 @@ public boolean onCommand(@NotNull CommandSender sender, @Nullable Minigame minig
}

@Override
public @Nullable List<@NotNull String> onTabComplete(@NotNull CommandSender sender, Minigame minigame, String[] args) {
if (args != null && args.length == 1) {
public @Nullable List<@NotNull String> onTabComplete(@NotNull CommandSender sender, @NotNull String @NotNull [] args) {
if (args.length == 1) {
return MinigameUtils.tabCompleteMatch(List.of("1", "2", "clear"), args[0]);
}
return null;
Expand Down
8 changes: 5 additions & 3 deletions Minigames/src/main/java/au/com/mineauz/minigames/config/ComponentFlag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import au.com.mineauz.minigames.menu.Callback;
import au.com.mineauz.minigames.menu.MenuItemComponent;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;
import org.jetbrains.annotations.NotNull;
Expand All @@ -19,13 +20,14 @@ public ComponentFlag(Component value, String name) {

@Override
public void saveValue(String path, FileConfiguration config) {
config.set(path + "." + getName(), getFlag());
config.set(path + "." + getName(), MiniMessage.miniMessage().serialize(getFlag()));
}

@Override
public void loadValue(String path, FileConfiguration config) {
if (config.contains(path + "." + getName())) {
setFlag(config.getString(path + "." + getName()));
final String confStr = config.getString(path + "." + getName());
if (confStr != null) {
setFlag(MiniMessage.miniMessage().deserialize(confStr));
} else {
setFlag(getDefaultFlag());
}
Expand Down
12 changes: 7 additions & 5 deletions Minigames/src/main/java/au/com/mineauz/minigames/config/ItemFlag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import au.com.mineauz.minigames.menu.Callback;
import au.com.mineauz.minigames.menu.MenuItemItemNbt;
import net.kyori.adventure.text.Component;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
Expand Down Expand Up @@ -51,7 +52,7 @@ public void loadValue(@NotNull String path, @NotNull FileConfiguration config) {
}


public @NotNull MenuItemItemNbt getMenuItem(@NotNull String name) {
public @NotNull MenuItemItemNbt getMenuItem(@NotNull Component name) {
return new MenuItemItemNbt(name, getFlagOrDefault(), new Callback<>() {
@Override
public ItemStack getValue() {
Expand All @@ -66,13 +67,14 @@ public void setValue(ItemStack value) {
}

@Override
public @NotNull MenuItemItemNbt getMenuItem(@NotNull String name, @Nullable Material displayMaterial) {
return getMenuItem(name, displayMaterial, null);
public @NotNull MenuItemItemNbt getMenuItem(@Nullable Material displayMaterial, @Nullable Component name) {
return getMenuItem(displayMaterial, name, null);
}

@Override
public @NotNull MenuItemItemNbt getMenuItem(@NotNull String name, @Nullable Material displayMaterial, @Nullable List<@NotNull String> description) {
return new MenuItemItemNbt(name, description, displayMaterial, new Callback<>() {
public @NotNull MenuItemItemNbt getMenuItem(@Nullable Material displayMaterial, @Nullable Component name,
@Nullable List<@NotNull Component> description) {
return new MenuItemItemNbt(displayMaterial, name, description, new Callback<>() {
@Override
public ItemStack getValue() {
return getFlag();
Expand Down
2 changes: 1 addition & 1 deletion Minigames/src/main/java/au/com/mineauz/minigames/events/MinigameTimerTickEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public MinigameTimerTickEvent(Minigame minigame, MinigameTimer timer) {
this.timer = timer;
}

public int getTimeLeft() {
public long getTimeLeft() {
return timer.getTimeLeft();
}

Expand Down
8 changes: 4 additions & 4 deletions Minigames/src/main/java/au/com/mineauz/minigames/managers/MinigamePlayerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ public void quitMinigame(@NotNull MinigamePlayer mgPlayer, boolean forced) {
if (loc != null) {
mgPlayer.teleport(loc);
} else {
Minigames.getCmpnntLogger().warn("Minigame " + minigame.getName(true) + " has no end location set! (Player: " + mgPlayer.getName() + ")");
Minigames.getCmpnntLogger().warn("Minigame " + minigame.getName() + " has no end location set! (Player: " + mgPlayer.getName() + ")");
}

mgPlayer.setStartPos(null);
Expand All @@ -544,10 +544,10 @@ public void quitMinigame(@NotNull MinigamePlayer mgPlayer, boolean forced) {
}

MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.ERROR, MinigameLangKey.PLAYER_SPECTATE_QUIT_PLAYERMSG,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName(true)));
mgManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.PLAYER_SPECTATE_QUIT_MINIGAMEMSG,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()));
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.PLAYER_SPECTATE_QUIT_MINIGAMEMSG,
Placeholder.unparsed(MinigamePlaceHolderKey.PLAYER.getKey(), mgPlayer.getName()),
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName(true))), MinigameMessageType.ERROR, mgPlayer);
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName())), MinigameMessageType.ERROR, mgPlayer);
} else {
if (mgPlayer.getEndTime() == 0)
mgPlayer.setEndTime(System.currentTimeMillis());
Expand Down
Loading

0 comments on commit 20d36d6

Please sign in to comment.