Skip to content

Commit b9639a0

Browse files
ShaneBeeeShaneBeee
committed
Config - more cleanup
1 parent 621e153 commit b9639a0

11 files changed

Lines changed: 46 additions & 52 deletions

File tree

‎src/main/java/com/shanebeestudios/hg/api/game/Game.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public void startRunningGame() {
267267
if (Config.MOBS_SPAWN_ENABLED) this.mobSpawnerTask = new MobSpawnerTask(this);
268268
if (Config.CHESTS_CHEST_DROP_ENABLED) this.chestDropTask = new ChestDropTask(this);
269269
this.gameBlockData.updateLobbyBlock();
270-
if (Config.bossbar) {
270+
if (Config.SETTINGS_BOSSBAR_COUNTDOWN) {
271271
this.bar.createBossBar(gameArenaData.timer);
272272
}
273273
if (Config.WORLD_BORDER_ENABLED) {
@@ -301,7 +301,7 @@ public void cancelTasks() {
301301
* @param player Player who joined
302302
*/
303303
private void broadcastJoin(Player player) {
304-
if (!Config.BROADCAST_JOIN_MESSAGES) return;
304+
if (!Config.SETTINGS_BROADCAST_JOIN_MESSAGES) return;
305305
String name = this.getGameArenaData().getName();
306306
Util.broadcast(this.lang.game_waiting_join
307307
.replace("<arena>", name)
@@ -439,7 +439,7 @@ public void stop(boolean death) {
439439
if (!winners.isEmpty() && death) {
440440
double winningReward = (double) Config.REWARD_CASH / winners.size();
441441
for (Player winner : winners) {
442-
if (Config.REWARD_GIVE_REWARD) {
442+
if (Config.REWARD_ENABLED) {
443443
// Run reward commands
444444
if (!Config.REWARD_COMMANDS.isEmpty()) {
445445
for (String cmd : Config.REWARD_COMMANDS) {
@@ -565,12 +565,8 @@ boolean canJoin(Player player) {
565565
Util.sendPrefixedMessage(player, this.lang.game_full.replace("<name>", name));
566566
return false;
567567
}
568-
return vaultCheck(player);
569-
}
570-
571-
boolean vaultCheck(Player player) {
572-
if (Config.economy) {
573-
int cost = this.getGameArenaData().getCost();
568+
int cost = this.getGameArenaData().getCost();
569+
if (Config.HAS_ECONOMY && cost > 0) {
574570
if (Vault.ECONOMY.getBalance(player) >= cost) {
575571
Vault.ECONOMY.withdrawPlayer(player, cost);
576572
return true;

‎src/main/java/com/shanebeestudios/hg/api/game/GamePlayerData.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void leaveGame(Player player, boolean death) {
276276
if (!death) this.allPlayers.remove(player); // Only remove the player if they voluntarily left the game
277277
unFreeze(player);
278278
if (death) {
279-
if (Config.SPECTATE_ENABLED && Config.spectateOnDeath && !game.isGameOver()) {
279+
if (Config.SPECTATE_ENABLED && Config.SPECTATE_DEATH_TO_SPECTATE && !game.isGameOver()) {
280280
spectate(player);
281281
player.playSound(player.getLocation(), Config.SOUNDS_DEATH, 5, 1);
282282
player.showTitle(createTitle());
@@ -334,7 +334,7 @@ public void spectate(Player spectator) {
334334
if (Config.SPECTATE_FLY)
335335
spectator.setAllowFlight(true);
336336

337-
if (Config.SPECTATE_HIDE) {
337+
if (Config.SPECTATE_HIDE_HIDE_SPECTATORS) {
338338
for (Player player : this.players.keySet()) {
339339
player.hidePlayer(this.plugin, spectator);
340340
}
@@ -366,7 +366,7 @@ public void leaveSpectate(Player spectator) {
366366
if (mode == GameMode.SURVIVAL || mode == GameMode.ADVENTURE)
367367
spectator.setAllowFlight(false);
368368
}
369-
if (Config.SPECTATE_HIDE)
369+
if (Config.SPECTATE_HIDE_HIDE_SPECTATORS)
370370
revealPlayer(spectator);
371371
exit(spectator, previousLocation);
372372
this.playerManager.removeSpectatorData(spectator);

‎src/main/java/com/shanebeestudios/hg/api/util/ItemUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static ItemStack getTrackingStick() {
4040

4141
itemStack.setData(DataComponentTypes.ITEM_NAME, Util.getMini(LANG.tracking_stick_name));
4242
itemStack.setData(DataComponentTypes.MAX_STACK_SIZE, 1);
43-
itemStack.setData(DataComponentTypes.MAX_DAMAGE, Config.TRACKING_STICK_USES);
43+
itemStack.setData(DataComponentTypes.MAX_DAMAGE, Config.SETTINGS_TRACKING_STICK_USES);
4444
itemStack.setData(DataComponentTypes.DAMAGE, 0);
4545
List<Component> lore = new ArrayList<>();
4646
LANG.tracking_stick_lore.forEach(line -> lore.add(Util.getMini(line)));

‎src/main/java/com/shanebeestudios/hg/plugin/HungerGames.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private void setupMetrics() {
182182
Map<String, Map<String, Integer>> map = new HashMap<>();
183183
map.put("worldborder-enabled", Map.of("" + Config.WORLD_BORDER_ENABLED, 1));
184184
map.put("chestdrop-enabled", Map.of("" + Config.CHESTS_CHEST_DROP_ENABLED, 1));
185-
map.put("reward-enabled", Map.of("" + Config.REWARD_GIVE_REWARD, 1));
185+
map.put("reward-enabled", Map.of("" + Config.REWARD_ENABLED, 1));
186186
map.put("spectate-enabled", Map.of("" + Config.SPECTATE_ENABLED, 1));
187187
return map;
188188
}));

‎src/main/java/com/shanebeestudios/hg/plugin/commands/LeaveCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected Argument<?> register() {
2828
Game game;
2929
if (this.playerManager.hasPlayerData(player)) {
3030
game = this.playerManager.getPlayerData(player).getGame();
31-
if (Config.economy) {
31+
if (Config.HAS_ECONOMY) {
3232
GameArenaData gameArenaData = game.getGameArenaData();
3333
Status status = gameArenaData.getStatus();
3434
int cost = gameArenaData.getCost();

‎src/main/java/com/shanebeestudios/hg/plugin/configs/Config.java‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ public class Config {
2323
public static boolean SETTINGS_DEBUG;
2424

2525
//Basic settings
26-
public static boolean BROADCAST_JOIN_MESSAGES;
26+
public static boolean SETTINGS_BROADCAST_JOIN_MESSAGES;
2727
public static boolean SETTINGS_BROADCAST_WIN_MESSAGES;
28-
public static boolean economy = true;
29-
public static boolean bossbar;
30-
public static int TRACKING_STICK_USES;
31-
public static int PLAYERS_FOR_TRACKING_STICK;
28+
public static boolean HAS_ECONOMY = true;
29+
public static boolean SETTINGS_BOSSBAR_COUNTDOWN;
30+
public static int SETTINGS_TRACKING_STICK_USES;
31+
public static int SETTINGS_PLAYERS_FOR_TRACKING_STICK;
3232
public static int SETTINGS_TELEPORT_AT_END_TIME;
3333
public static boolean SETTINGS_SAVE_PREVIOUS_LOCATION;
3434
public static int SETTINGS_FREE_ROAM_TIME;
35-
public static Location GLOBAL_EXIT_LOCATION;
35+
public static Location SETTINGS_GLOBAL_EXIT_LOCATION;
3636

3737
// Scoreboard
3838
public static boolean SCOREBOARD_HIDE_NAMETAGS;
@@ -49,8 +49,8 @@ public class Config {
4949
public static int MOBS_SPAWN_INTERVAL;
5050
public static int MOBS_SPAWN_CAP_PER_PLAYER;
5151

52-
//Reward info
53-
public static boolean REWARD_GIVE_REWARD;
52+
// Reward info
53+
public static boolean REWARD_ENABLED;
5454
public static int REWARD_CASH;
5555
public static List<String> REWARD_COMMANDS;
5656
public static List<String> REWARD_MESSAGES;
@@ -93,8 +93,8 @@ public class Config {
9393

9494
//Spectate
9595
public static boolean SPECTATE_ENABLED;
96-
public static boolean spectateOnDeath;
97-
public static boolean SPECTATE_HIDE;
96+
public static boolean SPECTATE_DEATH_TO_SPECTATE;
97+
public static boolean SPECTATE_HIDE_HIDE_SPECTATORS;
9898
public static boolean SPECTATE_FLY;
9999
public static boolean SPECTATE_CHAT;
100100

@@ -112,15 +112,15 @@ public Config(HungerGames plugin) {
112112
}
113113

114114
private void loadConfigFile() {
115-
if (configFile == null) {
116-
configFile = new File(plugin.getDataFolder(), "config.yml");
115+
if (this.configFile == null) {
116+
this.configFile = new File(this.plugin.getDataFolder(), "config.yml");
117117
}
118-
if (!configFile.exists()) {
119-
plugin.saveResource("config.yml", false);
118+
if (!this.configFile.exists()) {
119+
this.plugin.saveResource("config.yml", false);
120120
Util.log("New config.yml <green>created");
121121
}
122-
config = YamlConfiguration.loadConfiguration(configFile);
123-
matchConfig(config, configFile);
122+
this.config = YamlConfiguration.loadConfiguration(this.configFile);
123+
matchConfig(this.config, this.configFile);
124124
loadConfig();
125125
Util.log("config.yml <green>successfully loaded");
126126
}
@@ -129,17 +129,17 @@ private void loadConfigFile() {
129129
private void loadConfig() {
130130
// Settings
131131
SETTINGS_DEBUG = config.getBoolean("settings.debug");
132-
BROADCAST_JOIN_MESSAGES = config.getBoolean("settings.broadcast-join-messages");
132+
SETTINGS_BROADCAST_JOIN_MESSAGES = config.getBoolean("settings.broadcast-join-messages");
133133
SETTINGS_BROADCAST_WIN_MESSAGES = config.getBoolean("settings.broadcast-win-messages");
134-
bossbar = config.getBoolean("settings.bossbar-countdown");
135-
TRACKING_STICK_USES = config.getInt("settings.trackingstick-uses");
136-
PLAYERS_FOR_TRACKING_STICK = config.getInt("settings.players-for-trackingstick");
134+
SETTINGS_BOSSBAR_COUNTDOWN = config.getBoolean("settings.bossbar-countdown");
135+
SETTINGS_TRACKING_STICK_USES = config.getInt("settings.tracking-stick-uses");
136+
SETTINGS_PLAYERS_FOR_TRACKING_STICK = config.getInt("settings.players-for-tracking-stick");
137137
SETTINGS_SAVE_PREVIOUS_LOCATION = config.getBoolean("settings.save-previous-location");
138138
SETTINGS_TELEPORT_AT_END_TIME = config.getInt("settings.teleport-at-end-time");
139139
SETTINGS_FREE_ROAM_TIME = config.getInt("settings.free-room-time");
140140
String locString = config.getString("settings.global-exit-location");
141141
if (locString != null && locString.contains(":")) {
142-
GLOBAL_EXIT_LOCATION = LocationParser.getLocFromString(locString);
142+
SETTINGS_GLOBAL_EXIT_LOCATION = LocationParser.getLocFromString(locString);
143143
}
144144

145145
// Scoreboard
@@ -157,12 +157,10 @@ private void loadConfig() {
157157
MOBS_SPAWN_INTERVAL = config.getInt("mob-spawning.interval") * 20;
158158
MOBS_SPAWN_CAP_PER_PLAYER = config.getInt("mob-spawning.cap-per-player");
159159

160-
REWARD_GIVE_REWARD = config.getBoolean("reward.enabled");
160+
REWARD_ENABLED = config.getBoolean("reward.enabled");
161161
REWARD_CASH = config.getInt("reward.cash");
162162
REWARD_COMMANDS = config.getStringList("reward.commands");
163163
REWARD_MESSAGES = config.getStringList("reward.messages");
164-
REWARD_GIVE_REWARD = config.getBoolean("reward.enabled");
165-
REWARD_CASH = config.getInt("reward.cash");
166164

167165
// Rollback
168166
ROLLBACK_ALLOW_BREAK_BLOCKS = config.getBoolean("rollback.allow-block-break");
@@ -194,8 +192,8 @@ private void loadConfig() {
194192
WORLD_BORDER_FINAL_SIZE = config.getInt("world-border.final-border-size");
195193

196194
SPECTATE_ENABLED = config.getBoolean("spectate.enabled");
197-
spectateOnDeath = config.getBoolean("spectate.death-to-spectate");
198-
SPECTATE_HIDE = config.getBoolean("spectate.hide-spectators");
195+
SPECTATE_DEATH_TO_SPECTATE = config.getBoolean("spectate.death-to-spectate");
196+
SPECTATE_HIDE_HIDE_SPECTATORS = config.getBoolean("spectate.hide-spectators");
199197
SPECTATE_FLY = config.getBoolean("spectate.fly");
200198
SPECTATE_CHAT = config.getBoolean("spectate.chat");
201199

@@ -208,14 +206,14 @@ private void loadConfig() {
208206
Util.log("<red>Unable to setup vault!");
209207
Util.log(" - <red>Economy provider is missing.");
210208
Util.log(" - <yellow>Cash rewards will not be given out..");
211-
REWARD_GIVE_REWARD = false;
212-
economy = false;
209+
REWARD_ENABLED = false;
210+
HAS_ECONOMY = false;
213211
}
214212
} catch (NoClassDefFoundError e) {
215213
Util.log("<red>Unable to setup vault!");
216214
Util.log(" - <yellow>Cash rewards will not be given out..");
217-
REWARD_GIVE_REWARD = false;
218-
economy = false;
215+
REWARD_ENABLED = false;
216+
HAS_ECONOMY = false;
219217
}
220218
}
221219

‎src/main/java/com/shanebeestudios/hg/plugin/managers/GameManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public GameManager(HungerGames plugin) {
4545
this.plugin = plugin;
4646
this.lang = plugin.getLang();
4747
CustomArg.init(plugin, this);
48-
this.globalExitLocation = Config.GLOBAL_EXIT_LOCATION;
48+
this.globalExitLocation = Config.SETTINGS_GLOBAL_EXIT_LOCATION;
4949
}
5050

5151
/**

‎src/main/java/com/shanebeestudios/hg/plugin/managers/KillManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private List<ItemStack> dropInventoryOfPlayer(Player player) {
271271
}
272272

273273
private void checkStick(Game game) {
274-
if (Config.PLAYERS_FOR_TRACKING_STICK == game.getGamePlayerData().getPlayers().size()) {
274+
if (Config.SETTINGS_PLAYERS_FOR_TRACKING_STICK == game.getGamePlayerData().getPlayers().size()) {
275275
for (Player player : game.getGamePlayerData().getPlayers()) {
276276
Util.sendMessage(player, this.lang.tracking_stick_bar);
277277
Util.sendMessage(player, this.lang.tracking_stick_new1);

‎src/main/java/com/shanebeestudios/hg/plugin/tasks/GameTimerTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public GameTimerTask(Game game, int time) {
4747
public void run() {
4848
if (this.gameArenaData.getStatus() != Status.RUNNING) stop(); // Safety exit
4949

50-
if (Config.bossbar) this.game.getGameBarData().bossBarUpdate(this.remainingTime);
50+
if (Config.SETTINGS_BOSSBAR_COUNTDOWN) this.game.getGameBarData().bossBarUpdate(this.remainingTime);
5151

5252
// Refill chests
5353
if (this.gameArenaData.getChestRefillTime() > 0 && this.remainingTime == this.gameArenaData.getChestRefillTime()) {
@@ -62,7 +62,7 @@ public void run() {
6262
} else if (this.remainingTime <= 0) {
6363
stop();
6464
this.game.stop(false);
65-
} else if (!Config.bossbar && this.remainingTime % 30 == 0) {
65+
} else if (!Config.SETTINGS_BOSSBAR_COUNTDOWN && this.remainingTime % 30 == 0) {
6666
int minutes = this.remainingTime / 60;
6767
int seconds = this.remainingTime % 60;
6868
if (minutes != 0) {

‎src/main/java/com/shanebeestudios/hg/plugin/tasks/StartingTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public StartingTask(Game game) {
2121
String broadcast = this.lang.game_countdown_started
2222
.replace("<arena>", name)
2323
.replace("<seconds>", "" + this.timer);
24-
if (Config.BROADCAST_JOIN_MESSAGES) {
24+
if (Config.SETTINGS_BROADCAST_JOIN_MESSAGES) {
2525
Util.broadcast(broadcast);
2626
Util.broadcast(this.lang.game_join.replace("<arena>", name));
2727
} else {

0 commit comments

Comments
 (0)