summaryrefslogtreewikicommitdiff
path: root/src/main/java/dev/tylerm/khs/configuration
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/Config.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java)29
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/ConfigManager.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java)4
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/Items.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java)119
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/Leaderboard.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/Leaderboard.java)2
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/Localization.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java)8
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/LocalizationString.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/LocalizationString.java)2
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/Map.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java)34
-rw-r--r--src/main/java/dev/tylerm/khs/configuration/Maps.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java)6
8 files changed, 154 insertions, 50 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/dev/tylerm/khs/configuration/Config.java
index 9fc7009..36d74d8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Config.java
@@ -1,11 +1,11 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import com.cryptomorin.xseries.XItemStack;
import com.cryptomorin.xseries.XMaterial;
import com.cryptomorin.xseries.XSound;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.game.util.CountdownDisplay;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.game.util.CountdownDisplay;
+import dev.tylerm.khs.util.Location;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
@@ -62,8 +62,12 @@ public class Config {
allowNaturalCauses,
saveInventory,
delayedRespawn,
+ dontRewardQuit,
spawnPatch,
dropItems,
+ respawnAsSpectator,
+ waitTillNoneLeft,
+ gameOverTitle,
regenHealth;
public static int
@@ -82,7 +86,10 @@ public class Config {
lobbyItemStartPosition,
flightToggleItemPosition,
teleportItemPosition,
- delayedRespawnDelay;
+ startingSeekerCount,
+ delayedRespawnDelay,
+ hidingTimer,
+ endGameDelay;
public static float
seekerPingLeadingVolume,
@@ -154,7 +161,9 @@ public class Config {
}
//Lobby
- minPlayers = Math.max(2, config.getInt("minPlayers"));
+ startingSeekerCount = Math.max(1, config.getInt("startingSeekerCount"));
+ waitTillNoneLeft = config.getBoolean("waitTillNoneLeft");
+ minPlayers = Math.max(1 + startingSeekerCount + (waitTillNoneLeft ? 0 : 1), config.getInt("minPlayers"));
countdown = Math.max(10, config.getInt("lobby.countdown"));
changeCountdown = Math.max(minPlayers, config.getInt("lobby.changeCountdown"));
lobbyMin = Math.max(minPlayers, config.getInt("lobby.min"));
@@ -188,6 +197,12 @@ public class Config {
placeholderError = config.getString("placeholder.incorrect");
placeholderNoData = config.getString("placeholder.noData");
saveInventory = config.getBoolean("saveInventory");
+ respawnAsSpectator = config.getBoolean("respawnAsSpectator");
+ dontRewardQuit = config.getBoolean("dontRewardQuit");
+ endGameDelay = Math.max(0,config.getInt("endGameDelay"));
+ gameOverTitle = config.getBoolean("gameOverTitle");
+ hidingTimer = Math.max(10, config.getInt("hidingTimer"));
+
try {
countdownDisplay = CountdownDisplay.valueOf(config.getString("hideCountdownDisplay"));
} catch (IllegalArgumentException e) {
@@ -271,4 +286,4 @@ public class Config {
return temp;
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/dev/tylerm/khs/configuration/ConfigManager.java
index 92fa4ce..3a81cb8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
+++ b/src/main/java/dev/tylerm/khs/configuration/ConfigManager.java
@@ -1,6 +1,6 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java b/src/main/java/dev/tylerm/khs/configuration/Items.java
index e5f970b..af8216d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Items.java
@@ -1,7 +1,7 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import com.cryptomorin.xseries.XItemStack;
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
@@ -16,6 +16,12 @@ import java.util.List;
public class Items {
public static List<ItemStack> HIDER_ITEMS, SEEKER_ITEMS;
+ public static ItemStack
+ HIDER_HELM, SEEKER_HELM,
+ HIDER_CHEST, SEEKER_CHEST,
+ HIDER_LEGS, SEEKER_LEGS,
+ HIDER_BOOTS, SEEKER_BOOTS;
+
public static List<PotionEffect> HIDER_EFFECTS, SEEKER_EFFECTS;
public static void loadItems() {
@@ -23,29 +29,109 @@ public class Items {
ConfigManager manager = ConfigManager.create("items.yml");
SEEKER_ITEMS = new ArrayList<>();
+ SEEKER_HELM = null;
+ SEEKER_CHEST = null;
+ SEEKER_LEGS = null;
+ SEEKER_BOOTS = null;
+
ConfigurationSection SeekerItems = manager.getConfigurationSection("items.seeker");
- int i = 1;
- while (true) {
+
+ for (int i = 0; i < 9; i++) {
ConfigurationSection section = SeekerItems.getConfigurationSection(String.valueOf(i));
- if (section == null) break;
+ if (section == null) {
+ SEEKER_ITEMS.add(null);
+ continue;
+ }
ItemStack item = createItem(section);
- if (item != null) SEEKER_ITEMS.add(item);
- i++;
+ SEEKER_ITEMS.add(item);
+ }
+
+ ConfigurationSection SeekerHelmet = SeekerItems.getConfigurationSection("helmet");
+ if (SeekerHelmet != null) {
+ ItemStack item = createItem(SeekerHelmet);
+ if (item != null) {
+ SEEKER_HELM = item;
+ }
+ }
+
+ ConfigurationSection SeekerChestplate = SeekerItems.getConfigurationSection("chestplate");
+ if (SeekerChestplate != null) {
+ ItemStack item = createItem(SeekerChestplate);
+ if (item != null) {
+ SEEKER_CHEST = item;
+ }
+ }
+
+ ConfigurationSection SeekerLeggings = SeekerItems.getConfigurationSection("leggings");
+ if (SeekerLeggings != null) {
+ ItemStack item = createItem(SeekerLeggings);
+ if (item != null) {
+ SEEKER_LEGS = item;
+ }
+ }
+
+ ConfigurationSection SeekerBoots = SeekerItems.getConfigurationSection("boots");
+ if (SeekerBoots != null) {
+ ItemStack item = createItem(SeekerBoots);
+ if (item != null) {
+ SEEKER_BOOTS = item;
+ }
}
HIDER_ITEMS = new ArrayList<>();
+ HIDER_HELM = null;
+ HIDER_CHEST = null;
+ HIDER_LEGS = null;
+ HIDER_BOOTS = null;
+
ConfigurationSection HiderItems = manager.getConfigurationSection("items.hider");
- i = 1;
- while (true) {
+
+ for (int i = 0; i < 9; i++) {
ConfigurationSection section = HiderItems.getConfigurationSection(String.valueOf(i));
- if (section == null) break;
+ if (section == null) {
+ HIDER_ITEMS.add(null);
+ continue;
+ }
ItemStack item = createItem(section);
- if (item != null) HIDER_ITEMS.add(item);
- i++;
+ HIDER_ITEMS.add(item);
+ }
+
+ ConfigurationSection HiderHelmet = HiderItems.getConfigurationSection("helmet");
+ if (HiderHelmet != null) {
+ ItemStack item = createItem(HiderHelmet);
+ if (item != null) {
+ HIDER_HELM = item;
+ }
+ }
+
+ ConfigurationSection HiderChestplate = HiderItems.getConfigurationSection("chestplate");
+ if (HiderChestplate != null) {
+ ItemStack item = createItem(HiderChestplate);
+ if (item != null) {
+ HIDER_CHEST = item;
+ }
}
+
+ ConfigurationSection HiderLeggings = HiderItems.getConfigurationSection("leggings");
+ if (HiderLeggings != null) {
+ ItemStack item = createItem(HiderLeggings);
+ if (item != null) {
+ HIDER_LEGS = item;
+ }
+ }
+
+ ConfigurationSection HiderBoots = HiderItems.getConfigurationSection("boots");
+ if (HiderBoots != null) {
+ ItemStack item = createItem(HiderBoots);
+ if (item != null) {
+ HIDER_BOOTS = item;
+ }
+ }
+
SEEKER_EFFECTS = new ArrayList<>();
ConfigurationSection SeekerEffects = manager.getConfigurationSection("effects.seeker");
- i = 1;
+
+ int i = 1;
while (true) {
ConfigurationSection section = SeekerEffects.getConfigurationSection(String.valueOf(i));
if (section == null) break;
@@ -64,7 +150,6 @@ public class Items {
if (effect != null) HIDER_EFFECTS.add(effect);
i++;
}
-
}
private static ItemStack createItem(ConfigurationSection item) {
@@ -94,7 +179,9 @@ public class Items {
if (material.equalsIgnoreCase("POTION") || material.equalsIgnoreCase("SPLASH_POTION") || material.equalsIgnoreCase("LINGERING_POTION"))
config.set("base-effect", String.format("%s,%s,%s", item.getString("type"), false, splash));
ItemStack stack = XItemStack.deserialize(config);
- stack.setAmount(item.getInt("amount"));
+ int amt = item.getInt("amount");
+ if (amt < 1) amt = 1;
+ stack.setAmount(amt);
if (stack.getData().getItemType() == Material.AIR) return null;
return stack;
}
@@ -121,7 +208,7 @@ public class Items {
}
private static boolean equals(ItemStack a, ItemStack b) {
- if (a == null) {
+ if (a == null || b == null) {
return false;
} else if (a == b) {
return true;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Leaderboard.java b/src/main/java/dev/tylerm/khs/configuration/Leaderboard.java
index 63dc850..93ba855 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Leaderboard.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Leaderboard.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/dev/tylerm/khs/configuration/Localization.java
index b9f9b69..2ac84e7 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Localization.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import net.md_5.bungee.api.ChatColor;
@@ -15,12 +15,14 @@ public class Localization {
put("en-US", new String[][]{
{"WORLDBORDER_DECREASING"},
{"START","TAUNTED"},
- {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"}
+ {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"},
+ {"GAME_PLAYER_FOUND", "GAME_PLAYER_FOUND_BY"}
});
put("de-DE", new String[][]{
{},
{"TAUNTED"},
- {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"}
+ {"GAME_SETUP", "SETUP_GAME", "SETUP_LOBBY", "SETUP_SEEKER_LOBBY", "SETUP_EXIT", "SETUP_SAVEMAP", "SETUP_BOUNDS"},
+ {"GAME_PLAYER_FOUND", "GAME_PLAYER_FOUND_BY"}
});
}};
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/LocalizationString.java b/src/main/java/dev/tylerm/khs/configuration/LocalizationString.java
index b457622..5dc3724 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/LocalizationString.java
+++ b/src/main/java/dev/tylerm/khs/configuration/LocalizationString.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import org.bukkit.entity.Entity;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java b/src/main/java/dev/tylerm/khs/configuration/Map.java
index 394bbf3..7d3ef9f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Map.java
@@ -1,26 +1,26 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import java.util.ArrayList;
import java.util.List;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.game.events.Border;
-import net.tylermurphy.hideAndSeek.world.WorldLoader;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.game.events.Border;
+import dev.tylerm.khs.util.Location;
+import dev.tylerm.khs.world.WorldLoader;
import org.bukkit.*;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
+import static dev.tylerm.khs.configuration.Config.*;
public class Map {
private final String name;
- private Location
- spawnPosition = Location.getDefault(),
- lobbyPosition = Location.getDefault(),
- seekerLobbyPosition = Location.getDefault();
+ private dev.tylerm.khs.util.Location
+ spawnPosition = dev.tylerm.khs.util.Location.getDefault(),
+ lobbyPosition = dev.tylerm.khs.util.Location.getDefault(),
+ seekerLobbyPosition = dev.tylerm.khs.util.Location.getDefault();
private int
xBoundMin = 0,
@@ -51,15 +51,15 @@ public class Map {
this.worldLoader = new WorldLoader(this);
}
- public void setSpawn(Location pos) {
+ public void setSpawn(dev.tylerm.khs.util.Location pos) {
this.spawnPosition = pos;
}
- public void setLobby(Location pos) {
+ public void setLobby(dev.tylerm.khs.util.Location pos) {
this.lobbyPosition = pos;
}
- public void setSeekerLobby(Location pos) {
+ public void setSeekerLobby(dev.tylerm.khs.util.Location pos) {
this.seekerLobbyPosition = pos;
}
@@ -100,7 +100,7 @@ public class Map {
}
@NotNull
- public Location getGameSpawn() {
+ public dev.tylerm.khs.util.Location getGameSpawn() {
if(mapSaveEnabled) {
return spawnPosition.changeWorld("hs_"+name);
} else {
@@ -117,7 +117,7 @@ public class Map {
}
@NotNull
- public Location getSpawn() {
+ public dev.tylerm.khs.util.Location getSpawn() {
return spawnPosition;
}
@@ -127,7 +127,7 @@ public class Map {
}
@NotNull
- public Location getLobby() {
+ public dev.tylerm.khs.util.Location getLobby() {
return lobbyPosition;
}
@@ -137,7 +137,7 @@ public class Map {
}
@NotNull
- public Location getSeekerLobby() {
+ public dev.tylerm.khs.util.Location getSeekerLobby() {
return seekerLobbyPosition;
}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java b/src/main/java/dev/tylerm/khs/configuration/Maps.java
index d691fa9..54c6d5b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Maps.java
@@ -1,10 +1,10 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
import java.util.*;
import java.util.stream.Collectors;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.util.Location;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
generated by cgit v1.2.3-freya (git 2.51.0) at 2025-09-23 02:44:41 +0000