Skip to content

Commit

Permalink
lang 22 rework
Browse files Browse the repository at this point in the history
  • Loading branch information
@FireInstall
FireInstall committed Feb 15, 2024
1 parent 3b8261e commit a224ac5
Show file tree
Hide file tree
Showing 9 changed files with 179 additions and 127 deletions.
11 changes: 6 additions & 5 deletions Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetStartCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

public class SetStartCommand extends ASetCommand {

Expand Down Expand Up @@ -61,7 +62,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
TeamColor teamColor = TeamColor.matchColor(args[1]);

if (teamColor != null) {
Team team = teamsModule.getTeam(TeamColor.matchColor(args[1]));
Team team = teamsModule.getTeam(teamColor);

if (team != null) {
team.getStartLocations().clear();
Expand Down Expand Up @@ -183,10 +184,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
TeamsModule teamsModule = TeamsModule.getMinigameModule(minigame);

if (teamsModule != null) {
List<String> teams = new ArrayList<>(teamsModule.getTeamsNameMap().size() + 1);
for (String t : teamsModule.getTeamsNameMap().keySet()) {
teams.add(WordUtils.capitalize(t.replace("_", " ")));
}

List<String> teams = teamsModule.getTeamColors().stream().
map(t -> WordUtils.capitalizeFully(t.toString().replace("_", " "))).
collect(Collectors.toCollection(ArrayList::new));
if (args.length == 1) {
teams.add("Clear");
return MinigameUtils.tabCompleteMatch(teams, args[0]);
Expand Down
36 changes: 30 additions & 6 deletions ...ames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMenuLangKey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,19 @@ public enum MgMenuLangKey implements LangKey {
MENU_FLAGADD_ENTERCHAT("menu.flagAdd.enterChat"),
MENU_FLAGADD_NAME("menu.flagAdd.name"),
MENU_FLAG_REMOVED("menu.flag.removed"),
MENU_GAMEOVER_HUMILIATION_DESCRIPTION("menu.gameOver.humiliation.description"),
MENU_GAMEOVER_HUMILIATION_NAME("menu.gameOver.humiliation.name"),
MENU_GAMEOVER_INTERACT_NAME("menu.gameOver.interact.name"),
MENU_GAMEOVER_INVINCIBILITY_NAME("menu.gameOver.invincibility.name"),
MENU_GAMEOVER_NAME("menu.gameOver.name"),
MENU_GAMEOVER_TIME_NAME("menu.gameOver.time.name"),
MENU_GLOBALLOADOUT_NAME("menu.globalLoadout.name"),
MENU_HIERARCHY_ENTERCHAT("menu.hierarchy.enterChat"),
MENU_INFECTED_NAME("menu.infected.name"),
MENU_INFECTED_PERCENT_DESCRIPTION("menu.infected.percent.description"),
MENU_INFECTED_PERCENT_NAME("menu.infected.percent.name"),
MENU_INFECTED_TEAM_INFECTED_NAME("menu.infected.team.infected.name"),
MENU_INFECTED_TEAM_SURVIVOR_NAME("menu.infected.team.survivor.name"),
MENU_INVERT_NAME("menu.invert.name"),
MENU_LIST_ENTERCHAT("menu.list.enterChat"),
MENU_LIST_ERROR_INVALID("menu.list.error.invalid"),
Expand Down Expand Up @@ -157,7 +168,9 @@ public enum MgMenuLangKey implements LangKey {
MENU_REWARD_ENTERCHAT("menu.reward.enterChat"),
MENU_REWARD_ERROR_GROUPEXISTS("menu.reward.error.groupExists"),
MENU_REWARD_GROUP_ADD_NAME("menu.reward.group.add.name"),
MENU_REWARD_GROUP_ENTERCHAT("menu.reward.group.enterChat"),
MENU_REWARD_GROUP_NAME("menu.reward.group.name"),
MENU_REWARD_ITEM_ADD_DESCRIPTION("menu.reward.group.add.description"),
MENU_REWARD_ITEM_ADD_NAME("menu.reward.item.add.name"),
MENU_REWARD_NAME("menu.reward.name"),
MENU_REWARD_NOTREMOVED("menu.reward.notRemoved"),
Expand Down Expand Up @@ -202,6 +215,11 @@ public enum MgMenuLangKey implements LangKey {
MENU_TEAM_NAMEVISIBILITY_NAME("menu.team.nameVisibility.name"),
MENU_TEAM_NAMEVISIBILITY_NEVERVISIBLE("menu.team.nameVisibility.neverVisible"),
MENU_TEAM_OPTIONS_NAME("menu.team.options.name"),
MENU_TIMEWEATHER_NAME("menu.timeWeather.name"),
MENU_TIMEWEATHER_TIME_NAME("menu.timeWeather.time.name"),
MENU_TIMEWEATHER_TIME_USE_NAME("menu.timeWeather.time.use.name"),
MENU_TIMEWEATHER_WEATHER_NAME("menu.timeWeather.weather.name"),
MENU_TIMEWEATHER_WEATHER_USE_NAME("menu.timeWeather.weather.use.name"),
MENU_TOOL_DEGENAREA_DESCRIPTION("menu.tool.degenArea.description"),
MENU_TOOL_DEGENAREA_NAME("menu.tool.degenArea.name"),
MENU_TOOL_DESELECT_DESCRIPTION("menu.tool.deselect.description"),
Expand All @@ -226,16 +244,22 @@ public enum MgMenuLangKey implements LangKey {
MENU_TOOL_SELECT_NAME("menu.tool.select.name"),
MENU_TOOL_SETMODE_NAME("menu.tool.setMode.name"),
MENU_TOOL_SETTEAM_NAME("menu.tool.setTeam.name"),
MENU_TREASUREHUNT_DELAY_HINT_NAME("menu.treasureHunt.delay.hint.name"),
MENU_TREASUREHUNT_DELAY_RESTART_NAME("menu.treasureHunt.delay.restart.name"),
MENU_TREASUREHUNT_LOCATION_DESCRIPTION("menu.treasureHunt.location.description"),
MENU_TREASUREHUNT_LOCATION_NAME("menu.treasureHunt.location.name"),
MENU_TREASUREHUNT_MAX_HEIGHT_DESCRIPTION("menu.treasureHunt.max.height.description"),
MENU_TREASUREHUNT_MAX_HEIGHT_NAME("menu.treasureHunt.max.height.name"),
MENU_TREASUREHUNT_MAX_ITEMS_DESCRIPTION("menu.treasureHunt.max.items.description"),
MENU_TREASUREHUNT_MAX_ITEMS_NAME("menu.treasureHunt.max.items.name"),
MENU_TREASUREHUNT_MAX_RADIUS_NAME("menu.treasureHunt.max.radius.name"),
MENU_TREASUREHUNT_MIN_ITEMS_DESCRIPTION("menu.treasureHunt.min.items.description"),
MENU_TREASUREHUNT_MIN_ITEMS_NAME("menu.treasureHunt.min.items.name"),
MENU_WHITELIST_ADDMATERIAL_NAME("menu.whitelist.addMaterial.name"),
MENU_WHITELIST_BLOCK_NAME("menu.whitelist.block.name"),
MENU_WHITELIST_ENTERCHAT("menu.whitelist.enterChat"),
MENU_WHITELIST_ERROR_CONTAINS("menu.whitelist.error.contains"),
MENU_WHITELIST_MODE("menu.whitelist.mode"),
MENU_TIMEWEATHER_NAME("menu.timeWeather.name"),
MENU_TIMEWEATHER_TIME_USE_NAME("menu.timeWeather.time.use.name"),
MENU_TIMEWEATHER_TIME_NAME("menu.timeWeather.time.name"),
MENU_TIMEWEATHER_WEATHER_USE_NAME("menu.timeWeather.weather.use.name"),
MENU_TIMEWEATHER_WEATHER_NAME("menu.timeWeather.weather.name");
MENU_WHITELIST_MODE("menu.whitelist.mode");

private final @NotNull String path;

Expand Down
6 changes: 6 additions & 0 deletions Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemRewardAdd.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public MenuItemRewardAdd(@Nullable Material displayMat, @Nullable Component name
this.group = group;
}

public MenuItemRewardAdd(@Nullable Material displayMat, @Nullable LangKey langKey,
@Nullable List<@NotNull Component> description, @NotNull RewardGroup group) {
super(displayMat, langKey, description);
this.group = group;
}

public MenuItemRewardAdd(@Nullable Material displayMat, @Nullable Component name,
@Nullable List<@NotNull Component> description, @NotNull RewardGroup group) {
super(displayMat, name, description);
Expand Down
26 changes: 14 additions & 12 deletions Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemRewardGroup.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
package au.com.mineauz.minigames.menu;

import au.com.mineauz.minigames.MinigameUtils;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMenuLangKey;
import au.com.mineauz.minigames.minigame.reward.RewardGroup;
import au.com.mineauz.minigames.minigame.reward.RewardRarity;
import au.com.mineauz.minigames.minigame.reward.RewardType;
import au.com.mineauz.minigames.minigame.reward.Rewards;
import au.com.mineauz.minigames.objects.MinigamePlayer;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

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

Expand Down Expand Up @@ -138,13 +142,14 @@ public ItemStack onShiftRightClick() {
MinigamePlayer mgPlayer = getContainer().getViewer();
mgPlayer.setNoClose(true);
mgPlayer.getPlayer().closeInventory();
String itemName = group.getName();

mgPlayer.sendInfoMessage("Delete the reward group \"" + itemName + "\"? Type \"Yes\" to confirm.");
mgPlayer.sendInfoMessage("The menu will automatically reopen in 10s if nothing is entered.");
final int reopenSeconds = 10;
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MgMenuLangKey.MENU_REWARD_GROUP_ENTERCHAT,
Placeholder.unparsed(MinigamePlaceHolderKey.TYPE.getKey(), group.getName()),
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(reopenSeconds))));
mgPlayer.setManualEntry(this);

getContainer().startReopenTimer(10);
getContainer().startReopenTimer(reopenSeconds);
return null;
}

Expand All @@ -153,14 +158,11 @@ public ItemStack onDoubleClick() {
Menu rewardMenu = new Menu(5, getName(), getContainer().getViewer());
rewardMenu.setPreviousPage(getContainer());

List<String> des = new ArrayList<>();
des.add("Click this with an item");
des.add("to add it to rewards.");
des.add("Click without an item");
des.add("to add a money reward.");

rewardMenu.addItem(new MenuItemRewardAdd(MenuUtility.getCreateMaterial(), "Add Item", des, group), 43);
rewardMenu.addItem(new MenuItemPage(MenuUtility.getSaveMaterial(), "Save " + getName(), rewardMenu.getPreviousPage()), 44);
rewardMenu.addItem(new MenuItemRewardAdd(MenuUtility.getCreateMaterial(), MgMenuLangKey.MENU_REWARD_ITEM_ADD_NAME,
MinigameMessageManager.getMgMessageList(MgMenuLangKey.MENU_REWARD_ITEM_ADD_DESCRIPTION), group), 43);
rewardMenu.addItem(new MenuItemPage(MenuUtility.getSaveMaterial(),
MinigameMessageManager.getMgMessage(MgMenuLangKey.MENU_REWARD_SAVE_NAME,
Placeholder.component(MinigamePlaceHolderKey.REWARD.getKey(), getName())), rewardMenu.getPreviousPage()), 44);

List<MenuItem> mi = new ArrayList<>();
for (RewardType item : group.getItems()) {
Expand Down
18 changes: 10 additions & 8 deletions Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/GameOverModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import au.com.mineauz.minigames.config.TimeFlag;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMenuLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
import au.com.mineauz.minigames.menu.Menu;
import au.com.mineauz.minigames.menu.MenuItemBack;
Expand Down Expand Up @@ -67,17 +68,18 @@ public void load(FileConfiguration config) {
}

@Override
public void addEditMenuOptions(Menu menu) {
Menu m = new Menu(6, "Game Over Settings", menu.getViewer());
m.addItem(timer.getMenuItem(Material.CLOCK, "Time Length", 0L, null));
public void addEditMenuOptions(Menu previous) {
Menu menu = new Menu(6, MgMenuLangKey.MENU_GAMEOVER_NAME, previous.getViewer());
menu.addItem(timer.getMenuItem(Material.CLOCK, MgMenuLangKey.MENU_GAMEOVER_TIME_NAME, 0L, null));

m.addItem(invincible.getMenuItem("Invincibility", Material.ENDER_PEARL));
m.addItem(humiliation.getMenuItem(Material.DIAMOND_SWORD, "Humiliation Mode", List.of("Losers are stripped", "of weapons and can't kill")));
m.addItem(interact.getMenuItem("Allow Interact", Material.STONE_PRESSURE_PLATE));
menu.addItem(invincible.getMenuItem(Material.ENDER_PEARL, MgMenuLangKey.MENU_GAMEOVER_INVINCIBILITY_NAME));
menu.addItem(humiliation.getMenuItem(Material.DIAMOND_SWORD, MgMenuLangKey.MENU_GAMEOVER_HUMILIATION_NAME,
MgMenuLangKey.MENU_GAMEOVER_HUMILIATION_DESCRIPTION));
menu.addItem(interact.getMenuItem(Material.STONE_PRESSURE_PLATE, MgMenuLangKey.MENU_GAMEOVER_INTERACT_NAME));

m.addItem(new MenuItemBack(menu), m.getSize() - 9);
menu.addItem(new MenuItemBack(previous), menu.getSize() - 9);

menu.addItem(new MenuItemPage("Game Over Settings", Material.OAK_DOOR, m));
previous.addItem(new MenuItemPage(Material.OAK_DOOR, MgMenuLangKey.MENU_GAMEOVER_NAME, menu));
}

@Override
Expand Down
Loading

0 comments on commit a224ac5

Please sign in to comment.