diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml index caced5bb..139767d8 100644 --- a/.github/workflows/codacy.yml +++ b/.github/workflows/codacy.yml @@ -51,7 +51,7 @@ jobs: # Adjust severity of non-security issues gh-code-scanning-compat: true # Force 0 exit code to allow SARIF file generation - # This will handover control about PR rejection to the GitHub side + # This will hand over control about PR rejection to the GitHub side max-allowed-issues: 2147483647 # Upload the SARIF file generated in the previous step diff --git a/.gitmodules b/.gitmodules index 155b5da1..ca24c877 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "RelluBash-Script-Collection"] - path = RelluBash-Script-Collection - url = https://github.com/Relluem94s/RelluBash-Script-Collection + path = RelluBash-Script-Collection + url = https://github.com/Relluem94s/RelluBash-Script-Collection diff --git a/.idea/compiler.xml b/.idea/compiler.xml index e3645a41..6abea8eb 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,14 @@ + + + + + + + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 86f4b6f0..aa00ffab 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/.idea/google-java-format.xml b/.idea/google-java-format.xml index 8b57f452..2aa056da 100644 --- a/.idea/google-java-format.xml +++ b/.idea/google-java-format.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/runConfigurations/relluessentials__clean_install_.xml b/.idea/runConfigurations/relluessentials__clean_install_.xml index 92577f0e..a3e5339a 100644 --- a/.idea/runConfigurations/relluessentials__clean_install_.xml +++ b/.idea/runConfigurations/relluessentials__clean_install_.xml @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c5aecb96..4c11823c 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,5 +3,6 @@ + - \ No newline at end of file + diff --git a/RelluBash-Script-Collection b/RelluBash-Script-Collection index dbb75e46..0b8e85ab 160000 --- a/RelluBash-Script-Collection +++ b/RelluBash-Script-Collection @@ -1 +1 @@ -Subproject commit dbb75e4610ae3968b345cbcc88fcb21e7bdc6978 +Subproject commit 0b8e85abe04aa28b8dd32bf1c756edc11b9db4ea diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index ee076bb9..653ae77e 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -1,181 +1,181 @@ - - - 4.0.0 - de.relluem94 - relluessentials - RelluEssentials - 4.1.8 - https://github.com/Relluem94s/RelluEssentials - - scm:git:git@github.com:Relluem94s/RelluEssentials.git - scm:git:git@github.com:Relluem94s/RelluEssentials.git - https://github.com/Relluem94s/RelluEssentials - - - src/main/java - - - true - src/main/resources - - - - - maven-compiler-plugin - 3.12.1 - - 17 - 17 - UTF-8 - - - org.projectlombok - lombok - ${lombok.version} - - - - - - maven-shade-plugin - 3.4.1 - - - package - - shade - - - true - - - *:* - - META-INF/** - LICENSE - module-info.class - - - - - - - - - maven-resources-plugin - 3.3.0 - - UTF-8 - - - - - - - - github - - - - - github - RelluLib - https://maven.pkg.github.com/Relluem94s/RelluLib - - - - - - - central - central - https://repo.maven.apache.org/maven2/ - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - papermc - https://repo.papermc.io/repository/maven-public/ - - - github - Relluem94s - https://maven.pkg.github.com/Relluem94s/RelluLib - - - - - org.spigotmc - spigot-api - 1.20.1-R0.1-SNAPSHOT - provided - - - org.junit.jupiter - junit-jupiter-engine - 5.10.1 - test - - - junit-platform-engine - org.junit.platform - - - junit-jupiter-api - org.junit.jupiter - - - apiguardian-api - org.apiguardian - - - - - org.junit.platform - junit-platform-runner - 1.10.1 - test - - - junit - junit - - - junit-platform-launcher - org.junit.platform - - - junit-platform-suite-api - org.junit.platform - - - junit-platform-suite-commons - org.junit.platform - - - apiguardian-api - org.apiguardian - - - - - - - github - GitHub Relluem94s Apache Maven Packages - https://maven.pkg.github.com/Relluem94s/RelluEssentials - - - - 17 - 1.20 - 1.18.30 - 1.20.1-R0.1-SNAPSHOT - Relluem94 - windows-1252 - https://www.relluem94.de - de.relluem94.minecraft.server.spigot.essentials.RelluEssentials - - + + + 4.0.0 + de.relluem94 + relluessentials + RelluEssentials + 4.2 + https://github.com/Relluem94s/RelluEssentials + + scm:git:git@github.com:Relluem94s/RelluEssentials.git + scm:git:git@github.com:Relluem94s/RelluEssentials.git + https://github.com/Relluem94s/RelluEssentials + + + src/main/java + + + true + src/main/resources + + + + + maven-compiler-plugin + 3.12.1 + + 17 + 17 + UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + + + + + maven-shade-plugin + 3.4.1 + + + package + + shade + + + true + + + *:* + + META-INF/** + LICENSE + module-info.class + + + + + + + + + maven-resources-plugin + 3.3.0 + + UTF-8 + + + + + + + + github + + + + + github + RelluLib + https://maven.pkg.github.com/Relluem94s/RelluLib + + + + + + + central + central + https://repo.maven.apache.org/maven2/ + + + spigotmc-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + papermc + https://repo.papermc.io/repository/maven-public/ + + + github + Relluem94s + https://maven.pkg.github.com/Relluem94s/RelluLib + + + + + org.spigotmc + spigot-api + 1.20.1-R0.1-SNAPSHOT + provided + + + org.junit.jupiter + junit-jupiter-engine + 5.10.2 + test + + + junit-platform-engine + org.junit.platform + + + junit-jupiter-api + org.junit.jupiter + + + apiguardian-api + org.apiguardian + + + + + org.junit.platform + junit-platform-runner + 1.10.2 + test + + + junit + junit + + + junit-platform-launcher + org.junit.platform + + + junit-platform-suite-api + org.junit.platform + + + junit-platform-suite-commons + org.junit.platform + + + apiguardian-api + org.apiguardian + + + + + + + github + GitHub Relluem94s Apache Maven Packages + https://maven.pkg.github.com/Relluem94s/RelluEssentials + + + + 17 + 1.20 + 1.18.32 + 1.20.1-R0.1-SNAPSHOT + Relluem94 + utf-8 + https://www.relluem94.de + de.relluem94.minecraft.server.spigot.essentials.RelluEssentials + + diff --git a/pom.xml b/pom.xml index 6c2eaae3..11b72685 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ de.relluem94 relluessentials RelluEssentials - 4.1.8 + 4.2 https://github.com/Relluem94s/RelluEssentials - 1.18.30 + 1.18.32 1.20.1-R0.1-SNAPSHOT 1.20 Relluem94 https://www.relluem94.de de.relluem94.minecraft.server.spigot.essentials.RelluEssentials - windows-1252 + utf-8 17 @@ -94,18 +94,18 @@ com.google.guava guava - 32.1.3-jre + 33.1.0-jre org.junit.jupiter junit-jupiter-engine - 5.10.1 + 5.10.2 test org.junit.platform junit-platform-runner - 1.10.1 + 1.10.2 test diff --git a/relluessentials.iml b/relluessentials.iml index d42b276b..12b34ab7 100644 --- a/relluessentials.iml +++ b/relluessentials.iml @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomEnchants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomEnchants.java index dff50286..0df3bb9c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomEnchants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomEnchants.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier.Operation; import org.bukkit.enchantments.Enchantment; @@ -19,7 +20,7 @@ public class CustomEnchants { private CustomEnchants(){ - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static final List customEnchantments = new ArrayList<>(); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomItems.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomItems.java index 79b90a0f..02c14a57 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomItems.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomItems.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -32,7 +33,7 @@ public class CustomItems { private CustomItems() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static final ItemHelper magic_water_bucket = new ItemHelper(Material.WATER_BUCKET, 1, PLUGIN_ITEM_MAGIC_WATER_BUCKET, Type.GADGET, Rarity.EPIC, List.of(PLUGIN_ITEM_MAGIC_WATER_BUCKET_LORE)){ diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomRecipes.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomRecipes.java index 9a74744a..a2c414b6 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomRecipes.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomRecipes.java @@ -4,13 +4,14 @@ import java.util.Map; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.helpers.RecipeHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.recipe.Shaped; public class CustomRecipes { private CustomRecipes() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static final RecipeHelper cloudBoots = new RecipeHelper( diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomSigns.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomSigns.java index 2e94747a..379e2c1b 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomSigns.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/CustomSigns.java @@ -1,5 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.exceptions.SignMissingCustomInputException; import de.relluem94.minecraft.server.spigot.essentials.helpers.SignHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.SignHelper.ActionType; @@ -13,7 +14,7 @@ public class CustomSigns { private CustomSigns() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static final SignHelper spawn; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/RelluEssentials.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/RelluEssentials.java index 7e8750af..00f54064 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/RelluEssentials.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/RelluEssentials.java @@ -1,15 +1,15 @@ package de.relluem94.minecraft.server.spigot.essentials; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_FORMS_BORDER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_STARTTIME_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_START_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_STOP_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_WORLD_LOBBY; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_WORLD_WORLD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_WORLD_WORLD_NETHER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_WORLD_WORLD_THE_END; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_FORMS_BORDER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_STARTTIME_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_START_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_STOP_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_WORLD_LOBBY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_WORLD_WORLD; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_WORLD_WORLD_NETHER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_WORLD_WORLD_THE_END; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import java.io.File; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/Strings.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/Strings.java deleted file mode 100644 index d97f42e3..00000000 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/Strings.java +++ /dev/null @@ -1,323 +0,0 @@ -package de.relluem94.minecraft.server.spigot.essentials; - -import de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants; - -public class Strings { - - private Strings() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); - } - - /* ******************************************************************************* */ - /* PLUGIN STUFF */ - /* ******************************************************************************* */ - - public static final String PLUGIN_EOL = System.lineSeparator(); - - public static final String PLUGIN_COLOR_COMMAND = "§f"; - public static final String PLUGIN_COLOR_COMMAND_NAME = "§b"; - public static final String PLUGIN_COLOR_COMMAND_ARG = "§b"; - public static final String PLUGIN_COLOR_MESSAGE = "§f"; - public static final String PLUGIN_COLOR_CONSOLE = "§c"; - public static final String PLUGIN_COLOR_COMMAND_BLOCK = "§8"; - public static final String PLUGIN_COLOR_MONEY = "§6"; - public static final String PLUGIN_COLOR_BROADCAST = "§5"; - public static final String PLUGIN_COLOR_MESSAGE_SPACER = "§7"; - public static final String PLUGIN_COLOR_RESET = "§r"; - public static final String PLUGIN_COLOR_LOGO_RELLU = "§8"; - public static final String PLUGIN_COLOR_LOGO_ESSENTIALS = "§c"; - public static final String PLUGIN_COLOR_POSITIVE = "§a"; - public static final String PLUGIN_COLOR_NEGATIVE = "§c"; - public static final String PLUGIN_COLOR_NEUTRAL = "§6"; - - - public static final String PLUGIN_NAME_RELLU = "Rellu"; - public static final String PLUGIN_NAME_ESSENTIALS = "Essentials"; - public static final String PLUGIN_NAME_INITIAL_RELLU = "R"; - public static final String PLUGIN_NAME_INITIAL_ESSENTIALS = "E"; - public static final String PLUGIN_NAME_SHORT = PLUGIN_COLOR_LOGO_RELLU + PLUGIN_NAME_INITIAL_RELLU + PLUGIN_COLOR_LOGO_ESSENTIALS + PLUGIN_NAME_INITIAL_ESSENTIALS + PLUGIN_COLOR_MESSAGE; - public static final String PLUGIN_NAME_PREFIX = "§o§l" + PLUGIN_COLOR_LOGO_RELLU + PLUGIN_NAME_RELLU + PLUGIN_COLOR_LOGO_ESSENTIALS + PLUGIN_NAME_ESSENTIALS + PLUGIN_COLOR_RESET + PLUGIN_COLOR_MESSAGE; - public static final String PLUGIN_NAME_CONSOLE = PLUGIN_COLOR_MESSAGE + "[" + PLUGIN_NAME_PREFIX + PLUGIN_COLOR_MESSAGE + "] "; - public static final String PLUGIN_NAME_BROADCAST = PLUGIN_COLOR_BROADCAST + "Broadcast"; - public static final String PLUGIN_NAME_CHAT_CONSOLE = PLUGIN_COLOR_CONSOLE + "Console"; - public static final String PLUGIN_NAME_MONEY = PLUGIN_COLOR_MONEY + "Coins" + PLUGIN_COLOR_MESSAGE; - - public static final String PLUGIN_WORLD_LOBBY = "lobby"; - public static final String PLUGIN_WORLD_WORLD = "world"; - public static final String PLUGIN_WORLD_WORLD_NETHER = "world_nether"; - public static final String PLUGIN_WORLD_WORLD_THE_END = "world_the_end"; - - public static final String PLUGIN_FORMS_SPACER_CHANNEL = " >> " + PLUGIN_COLOR_COMMAND; - public static final String PLUGIN_FORMS_SPACER_MESSAGE = PLUGIN_COLOR_MESSAGE_SPACER + " >> " + PLUGIN_COLOR_MESSAGE; - public static final String PLUGIN_FORMS_BORDER = "<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>"; - public static final String PLUGIN_FORMS_WHITESPACE_SHORT = " "; - public static final String PLUGIN_FORMS_COMMAND_PREFIX = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE + PLUGIN_COLOR_COMMAND; - - public static final String PLUGIN_SYMBOL_HEAVY_CHECK_MARK = PLUGIN_COLOR_POSITIVE + "✔ "; - public static final String PLUGIN_SYMBOL_BLACK_LARGE_CIRCLE = PLUGIN_COLOR_NEUTRAL + "⬤ "; - public static final String PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X = PLUGIN_COLOR_NEGATIVE + "✖ "; - public static final String PLUGIN_SYMBOL_RIGHT_POINTING_ANGLE_BRACKET = PLUGIN_COLOR_POSITIVE + "〉"; - public static final String PLUGIN_SYMBOL_LEFT_POINTING_ANGLE_BRACKET = PLUGIN_COLOR_NEGATIVE + "〈"; - public static final String PLUGIN_SYMBOL_CROSS_MARK = PLUGIN_COLOR_NEGATIVE + "❌"; - public static final String PLUGIN_SYMBOL_BLACK_FOUR_POINTED_STAR = PLUGIN_COLOR_POSITIVE + "✦"; - public static final String PLUGIN_SYMBOL_HEART = PLUGIN_COLOR_NEGATIVE + "♥"; - // ❌ Cross Mark (U+274C) - // ✦ Black Four Pointed Star (U+2726) - - public static final String PLUGIN_SIGN_NAME = PLUGIN_COLOR_MESSAGE + "[" + PLUGIN_NAME_SHORT + "]"; - public static final String PLUGIN_SIGN_CLICK = PLUGIN_COLOR_MESSAGE + "[Click here]"; - - public static final String PLUGIN_MANAGER_START_MESSAGE = "starts configuring ..."; - public static final String PLUGIN_MANAGER_STOP_MESSAGE = "shutdown();"; - public static final String PLUGIN_MANAGER_STARTTIME_MESSAGE = "wurde in %s ms gestartet!"; - public static final String PLUGIN_MANAGER_REGISTER_SKILLS = "Registriere Skills!"; - public static final String PLUGIN_MANAGER_SKILLS_REGISTERED = "Skills erfolgreich registriert!"; - public static final String PLUGIN_MANAGER_LOADING_CONFIGS = "Configs werden geladen!"; - public static final String PLUGIN_MANAGER_CONFIGS_LOADED = "Configs sind geladen!"; - public static final String PLUGIN_MANAGER_REGISTER_EVENTS = "Registriere Events!"; - public static final String PLUGIN_MANAGER_EVENTS_REGISTERED = "%s Events erfolgreich registriert!"; - public static final String PLUGIN_MANAGER_REGISTER_RECIPE = "Registriere Rezepte!"; - public static final String PLUGIN_MANAGER_RECIPE_REGISTERED = "%s Rezepte erfolgreich registriert!"; - public static final String PLUGIN_MANAGER_REGISTER_COMMANDS = "Registriere Befehle!"; - public static final String PLUGIN_MANAGER_COMMANDS_REGISTERED = "%s Befehle erfolgreich registriert!"; - public static final String PLUGIN_MANAGER_REGISTER_AUTOSAVE = "Registriere Auto Save!"; - public static final String PLUGIN_MANAGER_AUTOSAVE_REGISTERED = "Auto Save erfolgreich registriert!"; - public static final String PLUGIN_MANAGER_REGISTER_ENCHANTMENTS = "Registriere Enchantments!"; - public static final String PLUGIN_MANAGER_ENCHANTMENTS_REGISTERED = "%s Enchantments erfolgreich registriert!"; - public static final String PLUGIN_MANAGER_REGISTER_ENCHANTMENT = "Registered enchantment %s with id %s!"; - - public static final String PLUGIN_INTERNAL_UTILITY_CLASS = "This is a Utility Class"; - - - - /* ******************************************************************************* */ - /* COMMAND STUFF */ - /* ******************************************************************************* */ - public static final String PLUGIN_COMMAND_FLYMODE = PLUGIN_FORMS_COMMAND_PREFIX + "Der Flugmodus von %s" + PLUGIN_COLOR_COMMAND + " wurde " + PLUGIN_COLOR_COMMAND_ARG + "%s!"; - public static final String PLUGIN_COMMAND_FLYMODE_ACTIVATED = "aktiviert"; - public static final String PLUGIN_COMMAND_FLYMODE_DEACTIVATED = "deaktiviert"; - - public static final String PLUGIN_COMMAND_ADMIN_PING = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast ein Ping von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "ms!"; - public static final String PLUGIN_COMMAND_ADMIN_PING_OTHER = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " hast ein Ping von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "ms!"; - public static final String PLUGIN_COMMAND_ADMIN_PING_OTHER_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "wurde nicht gefunden"; - - public static final String PLUGIN_COMMAND_CRAFTINGBENCH = PLUGIN_FORMS_COMMAND_PREFIX + "Die Werkbank von %s" + PLUGIN_COLOR_COMMAND + " wurde geöffnet!"; - - public static final String PLUGIN_COMMAND_COOKIES = PLUGIN_FORMS_COMMAND_PREFIX + "Ein Keks für dich, %s"; - public static final String PLUGIN_COMMAND_COOKIES_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast %s " + PLUGIN_COLOR_COMMAND + "ein Keks geschenkt!"; - public static final String PLUGIN_COMMAND_COOKIES_LORE_1 = PLUGIN_COLOR_COMMAND + "Mit viel Liebe gebacken von %s"; - public static final String PLUGIN_COMMAND_COOKIES_LORE_3 = PLUGIN_COLOR_COMMAND + "Wie selbstverliebt!"; - public static final String PLUGIN_COMMAND_COOKIES_DISPLAYNAME = PLUGIN_COLOR_COMMAND + "Schokoladenkeks"; - - public static final String PLUGIN_COMMAND_HEAD = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast ein Kopf von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " erzeugt!"; - public static final String PLUGIN_COMMAND_VANISH_DISABLE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast vanish für " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "deaktiviert!"; - public static final String PLUGIN_COMMAND_VANISH_ENABLE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast vanish für " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "aktiviert!"; - public static final String PLUGIN_COMMAND_VANISH = PLUGIN_FORMS_COMMAND_PREFIX + "Dein vanish wurde umgeschaltet!"; - - public static final String PLUGIN_COMMAND_MORE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast mehr von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " erzeugt!"; - public static final String PLUGIN_COMMAND_MORE_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast mehr von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " erhalten!"; - - public static final String PLUGIN_COMMAND_REPAIR = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " repariert!"; - public static final String PLUGIN_COMMAND_CANNOT_REPAIR = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " nicht reparieren!"; - public static final String PLUGIN_COMMAND_REPAIR_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " repariert bekommen!"; - - public static final String PLUGIN_COMMAND_GAMERULES = PLUGIN_FORMS_COMMAND_PREFIX + "Die Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "hat folgende Einstellungen:"; - - public static final String PLUGIN_COMMAND_HOME = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "an den Bett Spawn teleportiert!"; - public static final String PLUGIN_COMMAND_HOME_TP = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest zu " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "teleportiert!"; - public static final String PLUGIN_COMMAND_HOME_NONE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Home!"; - - public static final String PLUGIN_COMMAND_HOME_LIST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast folgende Homes:"; - public static final String PLUGIN_COMMAND_HOME_LIST_NAME = PLUGIN_COLOR_COMMAND + "Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + " §7(" + PLUGIN_COLOR_COMMAND_ARG + "%s§7)"; - public static final String PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast folgende Todespunkte:"; - public static final String PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS_NAME = PLUGIN_COLOR_COMMAND + "Todespunkt: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + " §7(" + PLUGIN_COLOR_COMMAND_ARG + "%s§7)"; - - public static final String PLUGIN_COMMAND_HOME_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Home mit dem Namen " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; - public static final String PLUGIN_COMMAND_HOME_EXISTS = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast bereits ein Home mit dem Namen " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; - public static final String PLUGIN_COMMAND_HOME_RESERVED = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst kein Home mit dem Namen " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " speichern!"; - public static final String PLUGIN_COMMAND_HOME_NO_BED = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Bett in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " an das du teleportiert werden kannst!"; - public static final String PLUGIN_COMMAND_HOME_SET = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Home " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "gesetzt!"; - public static final String PLUGIN_COMMAND_HOME_DELETE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Home " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "gelöscht!"; - public static final String PLUGIN_COMMAND_HOME_DEATH_DELETE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Todespunkt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "gelöscht!"; - - public static final String PLUGIN_COMMAND_SUN = PLUGIN_FORMS_COMMAND_PREFIX + "Du lässt die Sonne in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "scheinen!"; - public static final String PLUGIN_COMMAND_SUN_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Die Sonne die Sonne scheint nur für dich!"; - - public static final String PLUGIN_COMMAND_RAIN = PLUGIN_FORMS_COMMAND_PREFIX + "Du lässt es in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " regnen!"; - public static final String PLUGIN_COMMAND_RAIN_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Es regnet nur für dich!"; - - public static final String PLUGIN_COMMAND_STORM = PLUGIN_FORMS_COMMAND_PREFIX + "Du lässt es in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " gewittern!"; - - public static final String PLUGIN_COMMAND_DAY = PLUGIN_FORMS_COMMAND_PREFIX + "Es ist jetzt Tag in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; - - public static final String PLUGIN_COMMAND_GOD_ON = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist der Gott!"; - public static final String PLUGIN_COMMAND_GOD_OFF = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist wieder sterblich!"; - - public static final String PLUGIN_COMMAND_HEAL = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest geheilt!"; - - public static final String PLUGIN_COMMAND_NIGHT = PLUGIN_FORMS_COMMAND_PREFIX + "Es ist jetzt Nacht in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; - - public static final String PLUGIN_COMMAND_ENDERCHEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast deine Enderchest geöffnet!"; - public static final String PLUGIN_COMMAND_ENDERCHEST_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast die Enderchest von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "geöffnet!"; - - public static final String PLUGIN_COMMAND_INVENTORY = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Inventar geöffnet!"; - public static final String PLUGIN_COMMAND_INVENTORY_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast das Inventar von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "geöffnet!"; - - public static final String PLUGIN_COMMAND_SPAWN = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "an den Spawn teleportiert!"; - - public static final String PLUGIN_COMMAND_NICK = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast den Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "umbenannt!"; - - public static final String PLUGIN_COMMAND_SUICIDE = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "hat sich umgebracht!"; - - public static final String PLUGIN_COMMAND_WHERE = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "befindet sich bei " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; - public static final String PLUGIN_COMMAND_WHERE_STRING = PLUGIN_COLOR_COMMAND + "X: " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "Y: " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "Z: " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "Welt: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - - public static final String PLUGIN_COMMAND_MSG_PLAYER_OFFLINE = PLUGIN_FORMS_COMMAND_PREFIX + "Spieler ist Offline!"; - public static final String PLUGIN_COMMAND_MSG_NO_ONE_TO_REPLY = PLUGIN_FORMS_COMMAND_PREFIX + "Niemand da der dir antworten könnte!"; - public static final String PLUGIN_COMMAND_MSG_SPACER_IN = "§9 >> §f"; - public static final String PLUGIN_COMMAND_MSG_SPACER_OUT = "§9 << §f"; - public static final String PLUGIN_COMMAND_MSG_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/msg " + PLUGIN_COLOR_COMMAND + "<" + PLUGIN_COLOR_COMMAND_ARG + "spieler" + PLUGIN_COLOR_COMMAND + ">" + " " + "<" + PLUGIN_COLOR_COMMAND_ARG + "nachricht" + PLUGIN_COLOR_COMMAND + ">"; - - public static final String PLUGIN_COMMAND_PRINT_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/print " + "<" + PLUGIN_COLOR_COMMAND_ARG + "nachricht" + PLUGIN_COLOR_COMMAND + ">"; - - public static final String PLUGIN_COMMAND_RENAME_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/rename " + "<" + PLUGIN_COLOR_COMMAND_ARG + "name" + PLUGIN_COLOR_COMMAND + ">"; - public static final String PLUGIN_COMMAND_RENAME_AIR = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst Luft nicht umbenennen! "; - public static final String PLUGIN_COMMAND_RENAME = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Gegenstand umbenannt!"; - - public static final String PLUGIN_COMMAND_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "Folgende Welten gibt es:"; - public static final String PLUGIN_COMMAND_WORLD_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Die Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " existiert nicht"; - - public static final String PLUGIN_COMMAND_POKE = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze /poke " + PLUGIN_COLOR_COMMAND_ARG + "" + PLUGIN_COLOR_COMMAND + " um einen Spieler anzustubsen"; - public static final String PLUGIN_COMMAND_POKE_TITLE = "§4Buuuh"; - public static final String PLUGIN_COMMAND_POKE_SUBTITLE = "~~~~~~~~~~~~~~"; - public static final String PLUGIN_COMMAND_POKE_MESSAGE_TARGET = PLUGIN_FORMS_COMMAND_PREFIX + "%s " + PLUGIN_COLOR_COMMAND + "hat dich angestupst!"; - public static final String PLUGIN_COMMAND_POKE_MESSAGE_SENDER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + "%s " + PLUGIN_COLOR_COMMAND + "angestupst!"; - - public static final String PLUGIN_COMMAND_SPEED = PLUGIN_FORMS_COMMAND_PREFIX + "Geschwindigkeit wurde auf " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " gesetzt"; - public static final String PLUGIN_COMMAND_SPEED_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/speed " + "<" + PLUGIN_COLOR_COMMAND_ARG + "0-10" + PLUGIN_COLOR_COMMAND + ">"; - - public static final String PLUGIN_COMMAND_BROADCAST_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Um ein Title Broadcast zu machen nutze " + PLUGIN_COLOR_COMMAND_ARG + "/broadcast title " + PLUGIN_COLOR_COMMAND + "sonst " + PLUGIN_COLOR_COMMAND_ARG + "/broadcast " + PLUGIN_COLOR_COMMAND + "<" + PLUGIN_COLOR_COMMAND_ARG + "message" + PLUGIN_COLOR_COMMAND + ">"; - - public static final String PLUGIN_COMMAND_INVALID = PLUGIN_FORMS_COMMAND_PREFIX + "Invalid Data!"; - public static final String PLUGIN_COMMAND_PERMISSION_MISSING = PLUGIN_FORMS_COMMAND_PREFIX + "Dafür hast du leider keine Rechte!"; - public static final String PLUGIN_COMMAND_NOT_A_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist leider kein Spieler!"; - public static final String PLUGIN_COMMAND_TO_LESS_ARGUMENTS = PLUGIN_FORMS_COMMAND_PREFIX + "Zu wenig Argumente!"; - public static final String PLUGIN_COMMAND_TO_MANY_ARGUMENTS = PLUGIN_FORMS_COMMAND_PREFIX + "Zu viele Argumente!"; - public static final String PLUGIN_COMMAND_TARGET_NOT_A_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "%s" + PLUGIN_COLOR_COMMAND + " ist kein Spieler!"; - public static final String PLUGIN_COMMAND_WRONG_SUB_COMMAND = PLUGIN_FORMS_COMMAND_PREFIX + "Wrong Sub Command"; - - public static final String PLUGIN_COMMAND_PURSE_GAIN = PLUGIN_FORMS_COMMAND_PREFIX + "You gained " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " and now have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; - public static final String PLUGIN_COMMAND_PURSE_TO_ITEM = PLUGIN_FORMS_COMMAND_PREFIX + "You put out " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_TO_HIGH = PLUGIN_FORMS_COMMAND_PREFIX + "The value you entered is to high!"; - public static final String PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_INVALID = PLUGIN_FORMS_COMMAND_PREFIX + "The value you entered is invalid!"; - public static final String PLUGIN_COMMAND_PURSE_TO_ITEM_NOT_ENOUGH_MONEY = PLUGIN_FORMS_COMMAND_PREFIX + "Not enough " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_COMMAND_PURSE_TOTAL = PLUGIN_FORMS_COMMAND_PREFIX + "You have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; - public static final String PLUGIN_COMMAND_PURSE_TOTAL_OTHER = PLUGIN_FORMS_COMMAND_PREFIX + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " has " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in the Purse!"; - - public static final String PLUGIN_COMMAND_PROTECT_COMMAND_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_ADD + PLUGIN_COLOR_MESSAGE + ", " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_REMOVE + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG + PLUGIN_COLOR_MESSAGE + ", " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT; - public static final String PLUGIN_COMMAND_PROTECT_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Click a Protected Block to view the Protection Info"; - public static final String PLUGIN_COMMAND_PROTECT_ADD = PLUGIN_FORMS_COMMAND_PREFIX + "Click Protectable Block to create a Protection"; - public static final String PLUGIN_COMMAND_PROTECT_REMOVE = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to remove the Protection"; - public static final String PLUGIN_COMMAND_PROTECT_FLAG = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG + " " + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE + " flagname"; - public static final String PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Flag was not found!"; - public static final String PLUGIN_COMMAND_PROTECT_RIGHT = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT + " " + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE + " playername"; - public static final String PLUGIN_COMMAND_PROTECT_FLAG_ADD = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to add the Flag"; - public static final String PLUGIN_COMMAND_PROTECT_FLAG_REMOVE = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to remove the Flag"; - public static final String PLUGIN_COMMAND_PROTECT_RIGHT_ADD = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to add the Player"; - public static final String PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND = PLUGIN_FORMS_COMMAND_PREFIX + "No Player found with Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_COMMAND_PROTECT_RIGHT_REMOVE = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to remove the Player"; - - public static final String PLUGIN_COMMAND_SIGN_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_SIGN + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_SIGN_COPY + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_SIGN_EDIT; - public static final String PLUGIN_COMMAND_SIGN_COPY = PLUGIN_FORMS_COMMAND_PREFIX + "Click the Sign you want to copy"; - public static final String PLUGIN_COMMAND_SIGN_EDIT = PLUGIN_FORMS_COMMAND_PREFIX + "Click the Sign you want to edit"; - public static final String PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE = PLUGIN_FORMS_COMMAND_PREFIX + "Click the Redstone Lamp you want to Lit. Use this Command again to disable the Light Toogle Mode."; - public static final String PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE_DISABLED = PLUGIN_FORMS_COMMAND_PREFIX + "Light Toogle Mode is now disabled."; - public static final String PLUGIN_COMMAND_ADMIN_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use this command with the following Subcommands: npc, chat, light, afk, top, ping, cleanProtections"; - public static final String PLUGIN_COMMAND_ADMIN_CHAT_CLEARED = PLUGIN_FORMS_COMMAND_PREFIX + "Chat was cleared"; - public static final String PLUGIN_COMMAND_ADMIN_TOP = PLUGIN_FORMS_COMMAND_PREFIX + "Teleported to the highest Block"; - public static final String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS ="ID: " + PLUGIN_COLOR_COMMAND_ARG + "#%s" + PLUGIN_COLOR_COMMAND + " PMat: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " != LMat: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_START = PLUGIN_FORMS_COMMAND_PREFIX + "Checking " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Protection Materials against their Location Materials"; - public static final String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_CLEANING_UP = PLUGIN_FORMS_COMMAND_PREFIX + "Cleaning Up " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Protections"; - public static final String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_END = PLUGIN_FORMS_COMMAND_PREFIX + "Reduced to " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Protections"; - public static final String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_NONE = PLUGIN_FORMS_COMMAND_PREFIX + "No Protections to Clean Up"; - public static final String PLUGIN_COMMAND_WORLD_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use this command with the following Subcommands: list load unload unloadNoSave"; - public static final String PLUGIN_COMMAND_WORLD_CREATE_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use this command with the following arguments: name(String) type(WordType String) environment (Environment as String) structures (boolean)"; - public static final String PLUGIN_COMMAND_WORLD_WORLD_NOT_LOADED = "World not loaded. Can't unload this World."; - public static final String PLUGIN_COMMAND_WORLD_UNLOAD_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "World get's saved and unloaded."; - public static final String PLUGIN_COMMAND_WORLD_UNLOAD_WORLD_NO_SAVE = PLUGIN_FORMS_COMMAND_PREFIX + "World get's unloaded without saving it."; - public static final String PLUGIN_COMMAND_WORLD_LOAD_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "World get's loaded."; - public static final String PLUGIN_COMMAND_WORLD_CREATE_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "World get's created."; - public static final String PLUGIN_COMMAND_WORLD_WRONG_ARGUMENTS = PLUGIN_FORMS_COMMAND_PREFIX + "Can't create World, wrong parameters given!"; - public static final String PLUGIN_COMMAND_SUDO_ACTIVATED = PLUGIN_FORMS_COMMAND_PREFIX + "You are now sudoing %s"; - public static final String PLUGIN_COMMAND_SUDO_DEACTIVATED = PLUGIN_FORMS_COMMAND_PREFIX + "Exited."; - public static final String PLUGIN_COMMAND_SUDO_PLAYER_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Can't Sudo Player " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + ". Player not found!"; - public static final String PLUGIN_COMMAND_EXIT_KICK_MESSAGE = PLUGIN_COLOR_COMMAND + "exited."; - public static final String PLUGIN_COMMAND_EXIT_SERVER_SHUTTING_DOWN = PLUGIN_COLOR_COMMAND + "Server is shutting down..."; - - - public static final String PLUGIN_COMMAND_TP_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " eine Teleport Anfrage geschickt"; - public static final String PLUGIN_COMMAND_TP_REQUEST_TARGET = PLUGIN_FORMS_COMMAND_PREFIX + "Teleport Anfrage von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND; - public static final String PLUGIN_COMMAND_TP_REQUEST_EXPIRED = PLUGIN_FORMS_COMMAND_PREFIX + "Teleport Anfrage ist abgelaufen!"; - public static final String PLUGIN_COMMAND_TP = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest zu " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "teleportiert!"; - public static final String PLUGIN_COMMAND_TP_TO = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "zu dir teleportiert!"; - public static final String PLUGIN_COMMAND_TP_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/teleport " + PLUGIN_COLOR_COMMAND + "," + PLUGIN_COLOR_COMMAND_ARG + "/teleport accept"+ PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "/teleport to " + PLUGIN_COLOR_COMMAND + " oder " + PLUGIN_COLOR_COMMAND_ARG + "/teleport "; - public static final String PLUGIN_COMMAND_TP_ACCEPT_NO_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Keine offene Teleport Anfrage!"; - public static final String PLUGIN_COMMAND_TP_SEND_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast eine Teleport Anfrage an " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " geschickt!"; - - public static final String PLUGIN_GRAPPLINGHOOK_COOLDOWN = PLUGIN_COLOR_NEGATIVE + "Please Slow down.."; - - public static final String PLUGIN_BAG_AMOUNT = "Amount: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_BAG_RETRIEVE = "Click to retrieve"; - public static final String PLUGIN_BAG_CLICK_TO_OPEN = "Click to open"; - public static final String PLUGIN_BAG_CLICK_TO_BUY = "Click to buy this Bag"; - public static final String PLUGIN_BAG_COST_TO_BUY = "Costs: %s"; - public static final String PLUGIN_BAG_GUI_TITLE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE + "Bags"; - - public static final String PLUGIN_BAGS_SAVED = "%s%s Bag(s) saved!"; - public static final String PLUGIN_PLAYERS_SAVED = "%s%s Player(s) saved!"; - public static final String PLUGIN_PLAYERS_INVENTORY_SAVED = "%s%s Player(s) Inventory saved!"; - public static final String PLUGIN_COMMAND_BAGS_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "The searched Bag " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "was not found!"; - - public static final String PLUGIN_COMMAND_MARRY_SEND_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast eine Hochzeitsanfrage an " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " geschickt!"; - public static final String PLUGIN_COMMAND_MARRY_RECEIVE_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast eine Hochzeitsanfrage von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " bekommen!"; - public static final String PLUGIN_COMMAND_MARRY_MARRIED = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "geheiratet!"; - public static final String PLUGIN_COMMAND_MARRY_REQUEST_EXPIRED = PLUGIN_FORMS_COMMAND_PREFIX + "Hochzeitsanfrage ist abgelaufen!"; - public static final String PLUGIN_COMMAND_MARRY_REQUEST_IS_MAARIED = PLUGIN_FORMS_COMMAND_PREFIX + "Hochzeitsanfrage ist ungültig, Spieler ist bereits verheitratet!"; - public static final String PLUGIN_COMMAND_MARRY_ACCEPT_NO_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Keine offene Hochzeitsanfrage!"; - public static final String PLUGIN_COMMAND_MARRY_DIVORCE_NOT_MARRIED = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist nicht verheiratet!"; - public static final String PLUGIN_COMMAND_MARRY_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/marry " + PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "/marry accept"+ PLUGIN_COLOR_COMMAND + " oder " + PLUGIN_COLOR_COMMAND_ARG + "/marry divorce"; - public static final String PLUGIN_COMMAND_MARRY_DIVORCED = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dich von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "getrennt!"; - public static final String PLUGIN_COMMAND_MARRY_SELF_MARRIGE = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst dich nicht selbst heiraten!"; - - public static final String PLUGIN_COMMAND_BACK = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest zurück teleportiert!"; - public static final String PLUGIN_COMMAND_BACK_NO_LOCATION = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Back Punkt gesetzt!"; - - - public static final String PLUGIN_COMMAND_WARP = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest gewarped!"; - public static final String PLUGIN_COMMAND_WARP_LIST_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Warp Liste:"; - public static final String PLUGIN_COMMAND_WARP_LIST = PLUGIN_COLOR_COMMAND + "Warp Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s "; - public static final String PLUGIN_COMMAND_WARP_ERROR_WORLD_UNLOADED = PLUGIN_FORMS_COMMAND_PREFIX + "Error, Welt ist nicht geladen!"; - public static final String PLUGIN_COMMAND_WARP_ERROR_NO_WARP_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Kein Warp mit diesem Namen gefunden!"; - - - public static final String PLUGIN_COMMAND_SETGROUP = PLUGIN_COLOR_COMMAND + "Group " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " for Player " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " was set!"; - public static final String PLUGIN_COMMAND_SETGROUP_GROUP_NOT_FOUND = PLUGIN_COLOR_COMMAND + "Group " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " not found!"; - public static final String PLUGIN_BANK_INTEREST_NEXT_RUN = PLUGIN_COLOR_COMMAND + "Next Interest Payment Run in: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " seconds!"; - - public static final String PLUGIN_COMMAND_CUSTOMHEADS_TITLE = PLUGIN_FORMS_COMMAND_PREFIX + "Heads"; - - public static final String PLUGIN_COMMAND_PLAYERINFO = PLUGIN_FORMS_COMMAND_PREFIX + "Player Information: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_HOMES = "Homes: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_DEATHPOINTS = "DeathPoints: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_GROUP = "Group: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_MARRIED_TO = "Married: %s " + PLUGIN_SYMBOL_HEART + PLUGIN_COLOR_COMMAND + " %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_MARRIED_SINCE = "Married since: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_LAST_ONLINE = "Last Online: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_FIRST_ONLINE = "First Online: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_MINED = "%s mined: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_DEATHS = "Deaths: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_JUMPED = "Jumped: %s"; - public static final String PLUGIN_COMMAND_PLAYERINFO_LEFT_GAME = "Left Game: %s"; - - public static final String PLUGIN_COMMAND_TEAM_TITLE = PLUGIN_FORMS_COMMAND_PREFIX + "Team:"; -} diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/NPCAPI.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/NPCAPI.java index 762e2802..385d598f 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/NPCAPI.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/NPCAPI.java @@ -2,8 +2,11 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import de.relluem94.minecraft.server.spigot.essentials.constants.ItemPrice; import org.bukkit.Material; +import org.bukkit.entity.Item; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @@ -13,6 +16,12 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.NPCEntry; import de.relluem94.minecraft.server.spigot.essentials.npc.NPC; import de.relluem94.minecraft.server.spigot.essentials.npc.NPC.Type; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.persistence.PersistentDataType; + +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemBuyPrice; +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemSellPrice; public class NPCAPI { @@ -31,7 +40,19 @@ public Inventory getMainGUI(){ for(int i = 0; i < ne.getSlotNames().length; i++){ slot = InventoryHelper.getNextSlot(slot); if(!ne.getSlotName(i).equals("AIR")){ - inv.setItem(slot, new ItemStack(Material.valueOf(ne.getSlotName(i)),1)); + ItemStack itemStack = new ItemStack(Material.valueOf(ne.getSlotName(i)), 1); + + int buyPricePerItem = ItemPrice.valueOf(itemStack.getType().name()).getBuyPrice(); + int sellPricePerItem = ItemPrice.valueOf(itemStack.getType().name()).getSellPrice(); + + ItemMeta itemMeta = itemStack.getItemMeta(); + Objects.requireNonNull(itemMeta).getPersistentDataContainer().set(itemSellPrice, PersistentDataType.INTEGER, sellPricePerItem); + Objects.requireNonNull(itemMeta).getPersistentDataContainer().set(itemBuyPrice, PersistentDataType.INTEGER, buyPricePerItem); + itemMeta.setLore(List.of(String.format(PLUGIN_ITEM_BUY_PRICE_MESSAGE, buyPricePerItem, buyPricePerItem*64), String.format(PLUGIN_ITEM_SELL_PRICE_MESSAGE, sellPricePerItem, sellPricePerItem*64))); + + itemStack.setItemMeta(itemMeta); + + inv.setItem(slot, itemStack); } slot++; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/WarpAPI.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/WarpAPI.java index 98914bf3..0ccc4dce 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/WarpAPI.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/api/WarpAPI.java @@ -1,52 +1,46 @@ package de.relluem94.minecraft.server.spigot.essentials.api; -import java.util.ArrayList; -import java.util.List; - -import lombok.Getter; -import org.bukkit.World; - import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.LocationEntry; +import org.bukkit.World; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -@Getter -public class WarpAPI { - private final List warps; +import java.util.ArrayList; +import java.util.List; - public WarpAPI(List warps){ - this.warps = warps; - } +public record WarpAPI(List warps) { - public LocationEntry getWarp(String name){ - for(LocationEntry le : warps){ - if(le != null && le.getLocationName().equals(name)){ + public @Nullable LocationEntry getWarp(String name) { + for (LocationEntry le : warps) { + if (le != null && le.getLocationName().equals(name)) { return le; } } return null; } - public LocationEntry getWarp(String name, World world){ - for(LocationEntry le : warps){ - if(le != null && le.getLocation() != null && le.getLocation().getWorld() != null && le.getLocationName().equals(name) && le.getLocation().getWorld().equals(world)){ + public @Nullable LocationEntry getWarp(String name, World world) { + for (LocationEntry le : warps) { + if (le != null && le.getLocation() != null && le.getLocation().getWorld() != null && le.getLocationName().equals(name) && le.getLocation().getWorld().equals(world)) { return le; } } return null; } - public void removeWarp(LocationEntry le){ + public void removeWarp(LocationEntry le) { warps.remove(le); } - public void addWarp(LocationEntry le){ + public void addWarp(LocationEntry le) { warps.add(le); } - public List getWarps(World world){ + public @NotNull List getWarps(World world) { List filteredWarps = new ArrayList<>(); - for(LocationEntry le : warps){ - if(le != null && le.getLocation() != null && le.getLocation().getWorld() != null && le.getLocation().getWorld().equals(world)){ + for (LocationEntry le : warps) { + if (le != null && le.getLocation() != null && le.getLocation().getWorld() != null && le.getLocation().getWorld().equals(world)) { filteredWarps.add(le); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/AFK.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/AFK.java index 83cae26e..8a837712 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/AFK.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/AFK.java @@ -11,7 +11,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_AFK; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Admin.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Admin.java index d49ca9a9..a5b51c0a 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Admin.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Admin.java @@ -1,18 +1,18 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_CHAT_CLEARED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_CLEANING_UP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_END; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_NONE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_START; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_PING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_PING_OTHER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_PING_OTHER_NOT_FOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_ADMIN_TOP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WRONG_SUB_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_CHAT_CLEARED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_CLEANING_UP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_END; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_NONE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_START; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_PING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_PING_OTHER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_PING_OTHER_NOT_FOUND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_ADMIN_TOP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WRONG_SUB_COMMAND; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ADMIN; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ADMIN_PING; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; @@ -30,7 +30,7 @@ import de.relluem94.minecraft.server.spigot.essentials.CustomItems; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.PlayerState; import de.relluem94.minecraft.server.spigot.essentials.helpers.InventoryHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; @@ -60,7 +60,7 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul } if (args.length == 0) { - p.sendMessage(Strings.PLUGIN_COMMAND_ADMIN_INFO); + p.sendMessage(Constants.PLUGIN_COMMAND_ADMIN_INFO); return true; } else if (args.length == 1) { if (args[0].equals("npc")) { @@ -71,7 +71,7 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul org.bukkit.inventory.Inventory inv = InventoryHelper.fillInventory( InventoryHelper.createInventory(18, - Strings.PLUGIN_NAME_PREFIX + Strings.PLUGIN_FORMS_SPACER_MESSAGE+ "§dNPCs"), + Constants.PLUGIN_NAME_PREFIX + Constants.PLUGIN_FORMS_SPACER_MESSAGE+ "§dNPCs"), CustomItems.npc_gui_disabled.getCustomItem() ); @@ -100,9 +100,9 @@ else if (args[0].equalsIgnoreCase("light")) { if (pe.getPlayerState().equals(PlayerState.LIGHT_TOOGLE)) { pe.setPlayerState(PlayerState.DEFAULT); - p.sendMessage(Strings.PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE_DISABLED); + p.sendMessage(Constants.PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE_DISABLED); } else { - p.sendMessage(Strings.PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE); + p.sendMessage(Constants.PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE); pe.setPlayerState(PlayerState.LIGHT_TOOGLE); } return true; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Back.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Back.java index 133f6732..d31f2222 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Back.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Back.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_BACK; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_BACK_NO_LOCATION; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_BACK; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_BACK_NO_LOCATION; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_BACK; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Bags.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Bags.java index 79ddc057..d5831fe0 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Bags.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Bags.java @@ -16,7 +16,7 @@ import java.util.Objects; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_BAGS; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Broadcast.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Broadcast.java index 4c4d9114..c7499630 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Broadcast.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Broadcast.java @@ -1,10 +1,10 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_BROADCAST_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_FORMS_SPACER_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_BROADCAST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_BROADCAST_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_FORMS_SPACER_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_BROADCAST; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_BROADCAST; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_BROADCAST_TITLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Cookies.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Cookies.java index 16cdb67d..588f2737 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Cookies.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Cookies.java @@ -1,13 +1,13 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_COOKIES; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_COOKIES_DISPLAYNAME; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_COOKIES_LORE_1; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_COOKIES_LORE_3; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_COOKIES_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_COOKIES; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_COOKIES_DISPLAYNAME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_COOKIES_LORE_1; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_COOKIES_LORE_3; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_COOKIES_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_COOCKIE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/CustomHead.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/CustomHead.java index d5dfee4c..982b9056 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/CustomHead.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/CustomHead.java @@ -1,8 +1,8 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_CUSTOMHEADS_TITLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_CUSTOMHEADS_TITLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_CUSTOMHEADS; import static de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHeadHelper.getCustomSkull; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Day.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Day.java index 3af1c10e..62ead54c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Day.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Day.java @@ -11,7 +11,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_DAY; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Enderchest.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Enderchest.java index fa647b16..0395cf14 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Enderchest.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Enderchest.java @@ -10,7 +10,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ENDERCHEST; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Exit.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Exit.java index c8e050ef..9a757259 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Exit.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Exit.java @@ -10,10 +10,10 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_EXIT; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isConsole; @@ -27,13 +27,13 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul } if (isConsole(sender)){ - Bukkit.broadcastMessage(Strings.PLUGIN_COMMAND_EXIT_SERVER_SHUTTING_DOWN); + Bukkit.broadcastMessage(Constants.PLUGIN_COMMAND_EXIT_SERVER_SHUTTING_DOWN); new BukkitRunnable() { @Override public void run() { - Bukkit.getOnlinePlayers().forEach(op -> op.kickPlayer(Strings.PLUGIN_COMMAND_EXIT_SERVER_SHUTTING_DOWN)); + Bukkit.getOnlinePlayers().forEach(op -> op.kickPlayer(Constants.PLUGIN_COMMAND_EXIT_SERVER_SHUTTING_DOWN)); } }.runTaskLater(RelluEssentials.getInstance(), 10L); @@ -53,7 +53,7 @@ public void run() { return true; } - p.kickPlayer(Strings.PLUGIN_COMMAND_EXIT_KICK_MESSAGE); + p.kickPlayer(Constants.PLUGIN_COMMAND_EXIT_KICK_MESSAGE); return true; } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Fly.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Fly.java index a6ddd60f..d2fb07a5 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Fly.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Fly.java @@ -13,7 +13,7 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; import static de.relluem94.minecraft.server.spigot.essentials.RelluEssentials.getText; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_FLY; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameMode.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameMode.java index 02a1f866..17cc6bc8 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameMode.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameMode.java @@ -1,12 +1,12 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; import static de.relluem94.minecraft.server.spigot.essentials.RelluEssentials.getText; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND_NAME; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_FORMS_COMMAND_PREFIX; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND_NAME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_FORMS_COMMAND_PREFIX; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_GAMEMODE_0; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_GAMEMODE_0_NAME; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_GAMEMODE_1; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameRules.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameRules.java index 6de994fd..ea89a7b0 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameRules.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/GameRules.java @@ -1,13 +1,13 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_NEGATIVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_POSITIVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_GAMERULES; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_NOT_FOUND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_NEGATIVE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_POSITIVE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_GAMERULES; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_NOT_FOUND; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_GAMERULES; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/God.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/God.java index c5a647ef..a4cb18ec 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/God.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/God.java @@ -1,12 +1,12 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_GOD_OFF; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_GOD_ON; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_GOD_OFF; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_GOD_ON; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_GOD; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isConsole; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Head.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Head.java index ee94edde..86b7ec1a 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Head.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Head.java @@ -10,7 +10,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_HEAD; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Heal.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Heal.java index 42272e7b..41b5c6b3 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Heal.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Heal.java @@ -1,11 +1,11 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HEAL; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HEAL; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_HEAL; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isConsole; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Home.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Home.java index 6c1af1b2..8b9ec0bd 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Home.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Home.java @@ -1,20 +1,20 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_DEATH_DELETE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_DELETE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_EXISTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_LIST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS_NAME; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_LIST_NAME; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_NONE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_NOT_FOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_NO_BED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_RESERVED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_SET; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_HOME_TP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_DEATH_DELETE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_DELETE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_EXISTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_LIST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS_NAME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_LIST_NAME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_NONE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_NOT_FOUND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_NO_BED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_RESERVED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_SET; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_HOME_TP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_HOME; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_HOME_DELETE; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_HOME_LIST; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Inventory.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Inventory.java index 26d5f614..e78204fe 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Inventory.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Inventory.java @@ -1,10 +1,10 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_INVENTORY; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_INVENTORY_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_INVENTORY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_INVENTORY_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_INVENTORY; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Marry.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Marry.java index 38bb09e5..5eeae6d6 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Marry.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Marry.java @@ -1,18 +1,18 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_ACCEPT_NO_REQUEST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_DIVORCED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_DIVORCE_NOT_MARRIED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_MARRIED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_RECEIVE_REQUEST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_REQUEST_EXPIRED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_REQUEST_IS_MAARIED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_SELF_MARRIGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_MARRY_SEND_REQUEST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_ACCEPT_NO_REQUEST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_DIVORCED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_DIVORCE_NOT_MARRIED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_MARRIED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_RECEIVE_REQUEST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_REQUEST_EXPIRED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_REQUEST_IS_MARRIED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_SELF_MARRIAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_MARRY_SEND_REQUEST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_MARRY; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_MARRY_ACCEPT; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_MARRY_DIVORCE; @@ -45,7 +45,7 @@ public class Marry implements CommandExecutor { private void addMarryEntry(Player player, Player target){ if(RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(player).getPartner() != null || RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target).getPartner() != null){ - player.sendMessage(PLUGIN_COMMAND_MARRY_REQUEST_IS_MAARIED); + player.sendMessage(PLUGIN_COMMAND_MARRY_REQUEST_IS_MARRIED); return; } @@ -201,7 +201,7 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul } if(target.getName().equalsIgnoreCase(p.getName())){ - p.sendMessage(PLUGIN_COMMAND_MARRY_SELF_MARRIGE); + p.sendMessage(PLUGIN_COMMAND_MARRY_SELF_MARRIAGE); return true; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Message.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Message.java index f40f9b52..61460f62 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Message.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Message.java @@ -13,7 +13,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_MSG; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_REPLY; import static de.relluem94.rellulib.utils.StringUtils.*; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/More.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/More.java index 8769b61f..e446e6d1 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/More.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/More.java @@ -10,7 +10,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_MORE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Nick.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Nick.java index e43344a5..f6f9064a 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Nick.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Nick.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NICK; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NICK; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_NICK; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Night.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Night.java index dcdb13a3..f3f951ad 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Night.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Night.java @@ -11,7 +11,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_NIGHT; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PermissionsGroup.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PermissionsGroup.java index d0cdd0db..58f5728e 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PermissionsGroup.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PermissionsGroup.java @@ -1,11 +1,11 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_SETGROUP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_SETGROUP_GROUP_NOT_FOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SETGROUP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SETGROUP_GROUP_NOT_FOUND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SETGROUP; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isConsole; @@ -74,7 +74,7 @@ else if (isCMDBlock(sender) || isConsole(sender)) { private static GroupEntry checkGroupExists(String groupName, Player p) { GroupEntry g = Groups.getGroup(groupName); - if(!Groups.groupExists(groupName)){ + if(Groups.groupExists(groupName)){ p.sendMessage(PLUGIN_COMMAND_SETGROUP_GROUP_NOT_FOUND); return null; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PlayerInfo.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PlayerInfo.java index cec4d126..787046e3 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PlayerInfo.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PlayerInfo.java @@ -1,21 +1,21 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_DEATHPOINTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_DEATHS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_FIRST_ONLINE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_GROUP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_HOMES; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_JUMPED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_LAST_ONLINE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_LEFT_GAME; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_MARRIED_SINCE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_MARRIED_TO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PLAYERINFO_MINED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_DEATHPOINTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_DEATHS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_FIRST_ONLINE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_GROUP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_HOMES; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_JUMPED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_LAST_ONLINE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_LEFT_GAME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_MARRIED_SINCE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_MARRIED_TO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PLAYERINFO_MINED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PLAYERINFO; import java.util.Date; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Poke.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Poke.java index 93ef1d57..2bf27630 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Poke.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Poke.java @@ -1,13 +1,13 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_POKE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_POKE_MESSAGE_SENDER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_POKE_MESSAGE_TARGET; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_POKE_SUBTITLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_POKE_TITLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CHAT_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_POKE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_POKE_MESSAGE_SENDER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_POKE_MESSAGE_TARGET; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_POKE_SUBTITLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_POKE_TITLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CHAT_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_POKE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PortableCraftingBench.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PortableCraftingBench.java index 7327fbee..81fb433f 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PortableCraftingBench.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/PortableCraftingBench.java @@ -9,7 +9,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_CRAFT; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Print.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Print.java index bec74825..d833fe51 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Print.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Print.java @@ -1,13 +1,13 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND_BLOCK; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_CONSOLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_INVALID; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PRINT_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_FORMS_SPACER_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND_BLOCK; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_INVALID; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PRINT_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_FORMS_SPACER_MESSAGE; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PRINT; import static de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper.replaceColor; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Protect.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Protect.java index 3daf9285..ffe2b2a1 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Protect.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Protect.java @@ -1,29 +1,7 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_ADD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_COMMAND_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_FLAG; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_FLAG_ADD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_FLAG_REMOVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_REMOVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_RIGHT; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_RIGHT_ADD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PROTECT_RIGHT_REMOVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WRONG_SUB_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_ADD; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_REMOVE; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; import lombok.NonNull; @@ -43,12 +21,12 @@ public class Protect implements CommandExecutor { - private String getFlags(){ + private String getFlags() { ProtectionFlags[] flags = ProtectionFlags.values(); - + StringBuilder sb = new StringBuilder(); sb.append("Available Flags: "); - for(ProtectionFlags flag : flags){ + for (ProtectionFlags flag : flags) { sb.append(flag.getName()).append(" "); } return sb.toString(); @@ -56,117 +34,101 @@ private String getFlags(){ @Override public boolean onCommand(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label, String[] args) { - - if (isPlayer(sender)) { - Player p = (Player) sender; - if (Permission.isAuthorized(p, Groups.getGroup("user").getId())) { - if (command.getName().equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT)) { - PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p.getUniqueId()); + if (!command.getName().equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT)) { + return false; + } - if (args.length == 0) { - p.sendMessage(PLUGIN_COMMAND_PROTECT_COMMAND_INFO); - } - else if (args.length == 1) { - if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_ADD)){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_ADD); - pe.setPlayerState(PlayerState.PROTECTION_ADD); - } - else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_REMOVE)){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_REMOVE); - pe.setPlayerState(PlayerState.PROTECTION_REMOVE); - } - else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG)){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG); - } - else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT)){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_RIGHT); - } - else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_INFO)){ - pe.setPlayerState(PlayerState.PROTECTION_INFO); - p.sendMessage(PLUGIN_COMMAND_PROTECT_INFO); - } - else{ - p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); - } - } - else if (args.length == 3) { - if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG)){ - if(args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD)){ - try { - if(ProtectionFlags.valueOf(args[2].toUpperCase()) != null){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_ADD); - pe.setPlayerState(PlayerState.PROTECTION_FLAG_ADD); - pe.setPlayerStateParameter(ProtectionFlags.valueOf(args[2].toUpperCase()).getName()); - } - } catch (IllegalArgumentException ex) { - p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND); - p.sendMessage(getFlags()); - } - } - else if(args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE)){ - try { - if(ProtectionFlags.valueOf(args[2].toUpperCase()) != null){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_REMOVE); - pe.setPlayerState(PlayerState.PROTECTION_FLAG_REMOVE); - pe.setPlayerStateParameter(ProtectionFlags.valueOf(args[2].toUpperCase()).getName()); - } - } catch (IllegalArgumentException ex) { - p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND); - p.sendMessage(getFlags()); - } - } - else{ - p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); - } - } - else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT)){ - if(args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD)){ - OfflinePlayerEntry player = PlayerHelper.getOfflinePlayerByName(args[2]); + if (!isPlayer(sender)) { + sender.sendMessage(PLUGIN_COMMAND_NOT_A_PLAYER); + return true; + } + + Player p = (Player) sender; - if(player != null){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_RIGHT_ADD); - pe.setPlayerState(PlayerState.PROTECTION_RIGHT_ADD); - pe.setPlayerStateParameter(player.getId().toString()); - } - else{ - p.sendMessage(String.format(PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND, args[2])); - } - } - else if(args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE)){ - OfflinePlayerEntry player = PlayerHelper.getOfflinePlayerByName(args[2]); + if (!Permission.isAuthorized(sender, Groups.getGroup("user").getId())) { + sender.sendMessage(PLUGIN_COMMAND_PERMISSION_MISSING); + return true; + } + + PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p.getUniqueId()); - if(player != null){ - p.sendMessage(PLUGIN_COMMAND_PROTECT_RIGHT_REMOVE); - pe.setPlayerState(PlayerState.PROTECTION_RIGHT_REMOVE); - pe.setPlayerStateParameter(player.getId().toString()); - } - else{ - p.sendMessage(String.format(PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND, args[2])); - } - } - else{ - p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); - } + if (args.length == 0) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_COMMAND_INFO); + } else if (args.length == 1) { + if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_ADD)) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_ADD); + pe.setPlayerState(PlayerState.PROTECTION_ADD); + } else if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_REMOVE)) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_REMOVE); + pe.setPlayerState(PlayerState.PROTECTION_REMOVE); + } else if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG)) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG); + } else if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT)) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_RIGHT); + } else if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_INFO)) { + pe.setPlayerState(PlayerState.PROTECTION_INFO); + p.sendMessage(PLUGIN_COMMAND_PROTECT_INFO); + } else { + p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); + } + } else if (args.length == 3) { + if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG)) { + if (args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD)) { + try { + if (ProtectionFlags.valueOf(args[2].toUpperCase()) != null) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_ADD); + pe.setPlayerState(PlayerState.PROTECTION_FLAG_ADD); + pe.setPlayerStateParameter(ProtectionFlags.valueOf(args[2].toUpperCase()).getName()); } - else{ - p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); + } catch (IllegalArgumentException ex) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND); + p.sendMessage(getFlags()); + } + } else if (args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE)) { + try { + if (ProtectionFlags.valueOf(args[2].toUpperCase()) != null) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_REMOVE); + pe.setPlayerState(PlayerState.PROTECTION_FLAG_REMOVE); + pe.setPlayerStateParameter(ProtectionFlags.valueOf(args[2].toUpperCase()).getName()); } + } catch (IllegalArgumentException ex) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND); + p.sendMessage(getFlags()); } - else{ - p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); + } else { + p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); + } + } else if (args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT)) { + if (args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD)) { + OfflinePlayerEntry player = PlayerHelper.getOfflinePlayerByName(args[2]); + + if (player != null) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_RIGHT_ADD); + pe.setPlayerState(PlayerState.PROTECTION_RIGHT_ADD); + pe.setPlayerStateParameter(player.getId().toString()); + } else { + p.sendMessage(String.format(PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND, args[2])); + } + } else if (args[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE)) { + OfflinePlayerEntry player = PlayerHelper.getOfflinePlayerByName(args[2]); + + if (player != null) { + p.sendMessage(PLUGIN_COMMAND_PROTECT_RIGHT_REMOVE); + pe.setPlayerState(PlayerState.PROTECTION_RIGHT_REMOVE); + pe.setPlayerStateParameter(player.getId().toString()); + } else { + p.sendMessage(String.format(PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND, args[2])); } - return true; } else { - return false; + p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); } } else { - p.sendMessage(PLUGIN_COMMAND_PERMISSION_MISSING); - return true; + p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); } + } else { + p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); } - - return false; - } - + return true; -} + } +} \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/ProtectTabCompleter.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/ProtectTabCompleter.java new file mode 100644 index 00000000..8b71585d --- /dev/null +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/ProtectTabCompleter.java @@ -0,0 +1,64 @@ +package de.relluem94.minecraft.server.spigot.essentials.commands; + +import de.relluem94.minecraft.server.spigot.essentials.helpers.TabCompleterHelper; +import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; +import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabCompleter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.*; +import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; + +public class ProtectTabCompleter implements TabCompleter { + @Nullable + @Override + public List onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) { + List tabList = new ArrayList<>(); + + if (!Permission.isAuthorized(commandSender, Groups.getGroup("user").getId())) { + return tabList; + } + + if (!isPlayer(commandSender)) { + return tabList; + } + + switch (strings.length){ + case 1: + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_ADD); + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_REMOVE); + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_FLAG); + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_RIGHT); + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_INFO); + break; + case 2: + if (strings[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG)) { + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD); + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE); + } + else if (strings[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT)) { + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD); + tabList.add(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE); + } + break; + case 3: + if (strings[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG) && (strings[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD) || strings[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE))) { + tabList.addAll(TabCompleterHelper.getProtectionFlags()); + } + else if (strings[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT) && (strings[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD) || strings[1].equalsIgnoreCase(PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE))) { + tabList.addAll(TabCompleterHelper.getOnlinePlayers()); + } + break; + default: + break; + } + + return tabList; + } +} diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Purse.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Purse.java index 6f1fe88d..90f847c6 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Purse.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Purse.java @@ -1,14 +1,14 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PURSE_TOTAL; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PURSE_TOTAL_OTHER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PURSE_TO_ITEM; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PURSE_TO_ITEM_NOT_ENOUGH_MONEY; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_INVALID; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_TO_HIGH; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PURSE_TOTAL; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PURSE_TOTAL_OTHER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PURSE_TO_ITEM; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PURSE_TO_ITEM_NOT_ENOUGH_MONEY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_INVALID; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_PURSE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemCoins; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; import java.util.Collections; @@ -59,25 +59,22 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul return true; } - if (Permission.isAuthorized(p, Groups.getGroup("mod").getId())) { - Player target = Bukkit.getPlayer(args[0]); - if (target != null) { - PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target.getUniqueId()); - p.sendMessage(String.format(PLUGIN_COMMAND_PURSE_TOTAL_OTHER, target.getCustomName(), - StringHelper.formatDouble(pe.getPurse()))); + Player target = Bukkit.getPlayer(args[0]); + if (target != null) { + if (Permission.isAuthorized(p, Groups.getGroup("mod").getId())) { + if (command.getName().equalsIgnoreCase(PLUGIN_COMMAND_NAME_PURSE)) { + PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target.getUniqueId()); + p.sendMessage(String.format(PLUGIN_COMMAND_PURSE_TOTAL_OTHER, target.getCustomName(), StringHelper.formatDouble(pe.getPurse()))); + return true; + } else { + return false; + } + } else { + p.sendMessage(PLUGIN_COMMAND_PERMISSION_MISSING); return true; } - } else { - p.sendMessage(PLUGIN_COMMAND_PERMISSION_MISSING); - return true; - } - - if (TypeHelper.isLong(args[0])) { - p.sendMessage(PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_TO_HIGH); - return true; } - if (!TypeHelper.isInt(args[0])) { p.sendMessage(PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_INVALID); return true; @@ -92,7 +89,7 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul ItemStack coin = CustomItems.coins.getCustomItem(); ItemMeta im = coin.getItemMeta(); Objects.requireNonNull(im).setLore(Collections.singletonList(String.format(ItemConstants.PLUGIN_ITEM_COINS_LORE, StringHelper.formatInt(coins)))); - im.getPersistentDataContainer().set(ItemConstants.PLUGIN_ITEM_COINS_NAMESPACE, PersistentDataType.INTEGER, coins); + im.getPersistentDataContainer().set(itemCoins, PersistentDataType.INTEGER, coins); coin.setItemMeta(im); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rain.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rain.java index 0766bb54..f29de984 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rain.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rain.java @@ -11,7 +11,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_RAIN; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rename.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rename.java index 47eb32e6..57a7f511 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rename.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rename.java @@ -14,7 +14,7 @@ import static de.relluem94.rellulib.utils.StringUtils.*; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_RENAME; import static de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper.replaceColor; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Repair.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Repair.java index 5e49c833..3a8749c0 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Repair.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Repair.java @@ -1,8 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; import lombok.NonNull; -import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.api.chat.TranslatableComponent; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -15,7 +13,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_REPAIR; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rollback.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rollback.java index 21e72334..3663e8e9 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rollback.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Rollback.java @@ -16,7 +16,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ROLLBACK; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ROLLBACK_PLAYER; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ROLLBACK_UNDO; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sign.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sign.java index 13a677cb..29b2af44 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sign.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sign.java @@ -12,7 +12,7 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Spawn.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Spawn.java index dd481ba9..68dc5485 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Spawn.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Spawn.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_SPAWN; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SPAWN; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SPAWN; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Speed.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Speed.java index 45506475..53cdca8f 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Speed.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Speed.java @@ -1,17 +1,22 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import lombok.NonNull; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_INVALID; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SPEED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SPEED_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SPEED; +import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; + import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; -import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; +import lombok.NonNull; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SPEED; -import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; +import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; +import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; public class Speed implements CommandExecutor { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Storm.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Storm.java index 78f7fab7..8312a795 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Storm.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Storm.java @@ -9,7 +9,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_STORM; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sudo.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sudo.java index 5ff31b6d..efd4c1c2 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sudo.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sudo.java @@ -1,106 +1,107 @@ -package de.relluem94.minecraft.server.spigot.essentials.commands; - -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WRONG_SUB_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SUDO; -import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; - -import lombok.NonNull; -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.entity.Player; - -import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; -import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; -import de.relluem94.minecraft.server.spigot.essentials.helpers.WorldHelper; -import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.OfflinePlayerEntry; -import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; -import de.relluem94.minecraft.server.spigot.essentials.managers.SudoManager; -import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; -import de.relluem94.rellulib.utils.StringUtils; - -public class Sudo implements CommandExecutor { - - @Override - public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNull String label, String[] args) { - if (command.getName().equalsIgnoreCase(PLUGIN_COMMAND_NAME_SUDO)) { - - if(RelluEssentials.getInstance().getCommand(args[0]) != null){ - dispatchCommand(args); - return true; - } - - if (args.length == 1) { - if (isPlayer(sender)) { - Player p = (Player) sender; - if(SudoManager.sudoers.containsKey(p.getUniqueId())){ - exitSudo(p); - return true; - } - else if (Permission.isAuthorized(p, Groups.getGroup("admin").getId())) { - OfflinePlayerEntry target = PlayerHelper.getOfflinePlayerByName((args[0])); - PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p); - if (target != null && RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target.getId()) != null) { - PlayerEntry tpe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target.getId()); - SudoManager.sudoers.put(p.getUniqueId(), new PlayerEntry(pe)); - WorldHelper.saveWorldGroupInventory(p, true); - pe.setId(tpe.getId()); - pe.setCustomName(tpe.getCustomName()); - pe.setGroup(tpe.getGroup()); - pe.setHomes(tpe.getHomes()); - pe.setPurse(tpe.getPurse()); - p.setCustomName(tpe.getGroup().getPrefix() + target.getName()); - if(tpe.getCustomName() != null){ - p.setCustomName(tpe.getGroup().getPrefix() + tpe.getCustomName()); - } - WorldHelper.loadWorldGroupInventory(p); - p.sendMessage(String.format(Strings.PLUGIN_COMMAND_SUDO_ACTIVATED, tpe.getGroup().getPrefix() + target.getName())); - } - else{ - - p.sendMessage(String.format(Strings.PLUGIN_COMMAND_SUDO_PLAYER_NOT_FOUND, args[0])); - } - return true; - } - else { - p.sendMessage(PLUGIN_COMMAND_PERMISSION_MISSING); - return true; - } - } - } - else{ - sender.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); - return true; - } - } - return false; - } - - private void dispatchCommand(String[] args){ - ConsoleCommandSender console = Bukkit.getServer().getConsoleSender(); - Bukkit.getServer().dispatchCommand(console, StringUtils.toString(args)); - } - - public static void exitSudo(Player p){ - PlayerEntry tpe = SudoManager.sudoers.get(p.getUniqueId()); - PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p); - WorldHelper.saveWorldGroupInventory(p, true); - pe.setId(tpe.getId()); - pe.setCustomName(tpe.getCustomName()); - pe.setGroup(tpe.getGroup()); - pe.setHomes(tpe.getHomes()); - pe.setPurse(tpe.getPurse()); - p.setCustomName(tpe.getGroup().getPrefix() + p.getName()); - if(tpe.getCustomName() != null){ - p.setCustomName(tpe.getGroup().getPrefix() + tpe.getCustomName()); - } - WorldHelper.loadWorldGroupInventory(p); - SudoManager.sudoers.remove(p.getUniqueId()); - p.sendMessage(Strings.PLUGIN_COMMAND_SUDO_DEACTIVATED); - } +package de.relluem94.minecraft.server.spigot.essentials.commands; + +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WRONG_SUB_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SUDO; +import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; + +import lombok.NonNull; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.entity.Player; + +import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; +import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; +import de.relluem94.minecraft.server.spigot.essentials.helpers.WorldHelper; +import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.OfflinePlayerEntry; +import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; +import de.relluem94.minecraft.server.spigot.essentials.managers.SudoManager; +import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; +import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; +import de.relluem94.rellulib.utils.StringUtils; +import org.jetbrains.annotations.NotNull; + +public class Sudo implements CommandExecutor { + + @Override + public boolean onCommand(@NonNull CommandSender sender, @NotNull Command command, @NonNull String label, String[] args) { + if (command.getName().equalsIgnoreCase(PLUGIN_COMMAND_NAME_SUDO)) { + + if(RelluEssentials.getInstance().getCommand(args[0]) != null){ + dispatchCommand(args); + return true; + } + + if (args.length == 1) { + if (isPlayer(sender)) { + Player p = (Player) sender; + if(SudoManager.sudoers.containsKey(p.getUniqueId())){ + exitSudo(p); + return true; + } + else if (Permission.isAuthorized(p, Groups.getGroup("admin").getId())) { + OfflinePlayerEntry target = PlayerHelper.getOfflinePlayerByName((args[0])); + PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p); + if (target != null && RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target.getId()) != null) { + PlayerEntry tpe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(target.getId()); + SudoManager.sudoers.put(p.getUniqueId(), new PlayerEntry(pe)); + WorldHelper.saveWorldGroupInventory(p, true); + pe.setId(tpe.getId()); + pe.setCustomName(tpe.getCustomName()); + pe.setGroup(tpe.getGroup()); + pe.setHomes(tpe.getHomes()); + pe.setPurse(tpe.getPurse()); + p.setCustomName(tpe.getGroup().getPrefix() + target.getName()); + if(tpe.getCustomName() != null){ + p.setCustomName(tpe.getGroup().getPrefix() + tpe.getCustomName()); + } + WorldHelper.loadWorldGroupInventory(p); + p.sendMessage(String.format(Constants.PLUGIN_COMMAND_SUDO_ACTIVATED, tpe.getGroup().getPrefix() + target.getName())); + } + else{ + + p.sendMessage(String.format(Constants.PLUGIN_COMMAND_SUDO_PLAYER_NOT_FOUND, args[0])); + } + return true; + } + else { + p.sendMessage(PLUGIN_COMMAND_PERMISSION_MISSING); + return true; + } + } + } + else{ + sender.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); + return true; + } + } + return false; + } + + private void dispatchCommand(String[] args){ + ConsoleCommandSender console = Bukkit.getServer().getConsoleSender(); + Bukkit.getServer().dispatchCommand(console, StringUtils.toString(args)); + } + + public static void exitSudo(Player p){ + PlayerEntry tpe = SudoManager.sudoers.get(p.getUniqueId()); + PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p); + WorldHelper.saveWorldGroupInventory(p, true); + pe.setId(tpe.getId()); + pe.setCustomName(tpe.getCustomName()); + pe.setGroup(tpe.getGroup()); + pe.setHomes(tpe.getHomes()); + pe.setPurse(tpe.getPurse()); + p.setCustomName(tpe.getGroup().getPrefix() + p.getName()); + if(tpe.getCustomName() != null){ + p.setCustomName(tpe.getGroup().getPrefix() + tpe.getCustomName()); + } + WorldHelper.loadWorldGroupInventory(p); + SudoManager.sudoers.remove(p.getUniqueId()); + p.sendMessage(Constants.PLUGIN_COMMAND_SUDO_DEACTIVATED); + } } \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Suicide.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Suicide.java index d4569d2a..ed60713c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Suicide.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Suicide.java @@ -1,10 +1,10 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_SUICIDE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SUICIDE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SUICIDE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isConsole; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sun.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sun.java index ded9cab0..f9966e08 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sun.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Sun.java @@ -11,7 +11,7 @@ import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_SUN; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Team.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Team.java index bbe1efd5..03d08cbb 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Team.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Team.java @@ -1,10 +1,10 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TEAM_TITLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_FORMS_SPACER_CHANNEL; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TEAM_TITLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_FORMS_SPACER_CHANNEL; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TEAM; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Teleport.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Teleport.java index fc346139..6d69dd44 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Teleport.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Teleport.java @@ -1,17 +1,17 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_INVALID; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP_ACCEPT_NO_REQUEST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP_REQUEST_EXPIRED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP_REQUEST_TARGET; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP_SEND_REQUEST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TP_TO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_INVALID; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP_ACCEPT_NO_REQUEST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP_REQUEST_EXPIRED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP_REQUEST_TARGET; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP_SEND_REQUEST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TP_TO; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TELEPORT; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TELEPORT_ACCEPT; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TELEPORT_TO; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/TestCommand.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/TestCommand.java index 2c0e009a..4addd880 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/TestCommand.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/TestCommand.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_INVALID; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_INVALID; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_MANY_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TEST_COMMAND; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TEST_COMMAND_CLOUDSAILOR; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TEST_COMMAND_CUSTOMMOB; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Title.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Title.java index 5f172869..f7222430 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Title.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Title.java @@ -1,8 +1,8 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_TITLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper.replaceColor; import static de.relluem94.rellulib.utils.StringUtils.implode; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Vanish.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Vanish.java index 91cc9d3b..7c40a003 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Vanish.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Vanish.java @@ -14,7 +14,7 @@ import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_VANISH; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessage; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Warp.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Warp.java index 78632361..5b2c5248 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Warp.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Warp.java @@ -1,13 +1,13 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WARP; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WARP_ERROR_NO_WARP_FOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WARP_ERROR_WORLD_UNLOADED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WARP_LIST; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WARP_LIST_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WRONG_SUB_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WARP; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WARP_ERROR_NO_WARP_FOUND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WARP_ERROR_WORLD_UNLOADED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WARP_LIST; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WARP_LIST_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WRONG_SUB_COMMAND; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WARP; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WARP_ADD; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WARP_REMOVE; @@ -23,6 +23,7 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.LocationEntry; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; +import org.jetbrains.annotations.NotNull; public class Warp implements CommandExecutor { @@ -64,10 +65,12 @@ else if (args.length == 2) { } if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_WARP_ADD)){ - return addWarp(args[1], p); + addWarp(args[1], p); + return true; } else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_WARP_REMOVE)){ - return removeWarp(args[1]); + removeWarp(args[1]); + return true; } else { p.sendMessage(PLUGIN_COMMAND_WRONG_SUB_COMMAND); @@ -77,7 +80,7 @@ else if(args[0].equalsIgnoreCase(PLUGIN_COMMAND_NAME_WARP_REMOVE)){ return false; } - private boolean addWarp(String name, Player p){ + private void addWarp(String name, Player p){ LocationEntry le = RelluEssentials.getInstance().getWarpAPI().getWarp(name); if(le == null){ int typeId = 3; @@ -93,21 +96,17 @@ private boolean addWarp(String name, Player p){ RelluEssentials.getInstance().getWarpAPI().addWarp(le); } - - return true; } - private boolean removeWarp(String name){ + private void removeWarp(String name){ LocationEntry le = RelluEssentials.getInstance().getWarpAPI().getWarp(name); if(le != null){ RelluEssentials.getInstance().getDatabaseHelper().deleteLocation(le); RelluEssentials.getInstance().getWarpAPI().removeWarp(le); } - - return true; } - private void warp(String name, Player p){ + private void warp(String name, @NotNull Player p){ LocationEntry le = RelluEssentials.getInstance().getWarpAPI().getWarp(name, p.getWorld()); if(le == null){ diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Where.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Where.java index 93a0f828..1aff4dbf 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Where.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Where.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WHERE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WHERE; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WHERE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper.locationToString; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isPlayer; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Worlds.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Worlds.java index 02b353ed..b65a1c75 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Worlds.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/commands/Worlds.java @@ -1,21 +1,21 @@ package de.relluem94.minecraft.server.spigot.essentials.commands; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_SPAWN; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_CREATE_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_CREATE_WORLD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_INFO; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_LOAD_WORLD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_NOT_FOUND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_UNLOAD_WORLD; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_UNLOAD_WORLD_NO_SAVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_WORLD_NOT_LOADED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WORLD_WRONG_ARGUMENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WRONG_SUB_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_SPAWN; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TARGET_NOT_A_PLAYER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_TO_LESS_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_CREATE_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_CREATE_WORLD; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_INFO; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_LOAD_WORLD; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_NOT_FOUND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_UNLOAD_WORLD; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_UNLOAD_WORLD_NO_SAVE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_WORLD_NOT_LOADED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WORLD_WRONG_ARGUMENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WRONG_SUB_COMMAND; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WORLD; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WORLD_CREATE; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_WORLD_LIST; @@ -43,7 +43,7 @@ import org.bukkit.inventory.meta.ItemMeta; import de.relluem94.minecraft.server.spigot.essentials.CustomItems; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.CustomHeads; import de.relluem94.minecraft.server.spigot.essentials.exceptions.WorldNotLoadedException; import de.relluem94.minecraft.server.spigot.essentials.helpers.InventoryHelper; @@ -52,6 +52,7 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.WorldHelper; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; +import org.jetbrains.annotations.NotNull; public class Worlds implements CommandExecutor { @@ -120,9 +121,11 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul p.sendMessage(PLUGIN_COMMAND_WORLD_LOAD_WORLD); return true; case PLUGIN_COMMAND_NAME_WORLD_UNLOAD: - return unloadWorld(p, args[1], true); + unloadWorld(p, args[1], true); + return true; case PLUGIN_COMMAND_NAME_WORLD_UNLOAD_NO_SAVE: - return unloadWorld(p, args[1], false); + unloadWorld(p, args[1], false); + return true; case PLUGIN_COMMAND_NAME_WORLD_CREATE: default: p.sendMessage(PLUGIN_COMMAND_WORLD_CREATE_INFO); @@ -144,7 +147,7 @@ public boolean onCommand(@NonNull CommandSender sender, Command command, @NonNul return true; } - private void createWorld(Player p, String[] args){ + private void createWorld(Player p, String @NotNull [] args){ if(WorldType.getByName(args[2].toUpperCase()) != null && World.Environment.valueOf(args[3].toUpperCase()) != null && Boolean.valueOf(args[4]) != null){ WorldType type = WorldType.getByName(args[2].toUpperCase()); World.Environment worldEnvironment = World.Environment.valueOf(args[3].toUpperCase()); @@ -157,7 +160,7 @@ private void createWorld(Player p, String[] args){ } } - private boolean unloadWorld(Player p, String name, boolean save){ + private void unloadWorld(@NotNull Player p, String name, boolean save){ try { WorldHelper.unloadWorld(name, save); p.sendMessage(save ? PLUGIN_COMMAND_WORLD_UNLOAD_WORLD : PLUGIN_COMMAND_WORLD_UNLOAD_WORLD_NO_SAVE); @@ -166,7 +169,6 @@ private boolean unloadWorld(Player p, String name, boolean save){ catch (WorldNotLoadedException ex) { Logger.getLogger(Worlds.class.getName()).log(Level.SEVERE, PLUGIN_COMMAND_WORLD_WORLD_NOT_LOADED, ex); } - return true; } private void teleportWorld(Player p, String name){ @@ -184,7 +186,7 @@ private void teleportWorld(Player p, String name){ public static void openWorldMenu(Player p){ org.bukkit.inventory.Inventory inv = InventoryHelper.fillInventory( InventoryHelper.createInventory(18, - Strings.PLUGIN_NAME_PREFIX + Strings.PLUGIN_FORMS_SPACER_MESSAGE+ "§dWorlds"), + Constants.PLUGIN_NAME_PREFIX + Constants.PLUGIN_FORMS_SPACER_MESSAGE+ "§dWorlds"), CustomItems.npc_gui_disabled.getCustomItem() ); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/CommandNameConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/CommandNameConstants.java index 57fb8a40..b5c28044 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/CommandNameConstants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/CommandNameConstants.java @@ -1,113 +1,107 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -import de.relluem94.minecraft.server.spigot.essentials.Strings; - /** * * @author rellu */ -public class CommandNameConstants { - - private CommandNameConstants() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); - } - +public interface CommandNameConstants { + //==============================================================================// // COMMAND STUFF // //==============================================================================// - public static final String PLUGIN_COMMAND_NAME_AFK = "afk"; - public static final String PLUGIN_COMMAND_NAME_BROADCAST = "broadcast"; - public static final String PLUGIN_COMMAND_NAME_BROADCAST_TITLE = "title"; - public static final String PLUGIN_COMMAND_NAME_COOCKIE = "cookie"; - public static final String PLUGIN_COMMAND_NAME_CRAFT = "craft"; - public static final String PLUGIN_COMMAND_NAME_DAY = "day"; - public static final String PLUGIN_COMMAND_NAME_ENDERCHEST = "enderchest"; - public static final String PLUGIN_COMMAND_NAME_FLY = "fly"; - public static final String PLUGIN_COMMAND_NAME_PURSE = "purse"; - public static final String PLUGIN_COMMAND_NAME_WARP = "warp"; - public static final String PLUGIN_COMMAND_NAME_WARP_ADD = "add"; - public static final String PLUGIN_COMMAND_NAME_WARP_REMOVE = "remove"; - public static final String PLUGIN_COMMAND_NAME_TELEPORT = "teleport"; - public static final String PLUGIN_COMMAND_NAME_TELEPORT_TO = "to"; - public static final String PLUGIN_COMMAND_NAME_TELEPORT_ACCEPT = "accept"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_0 = "0"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_0_NAME = "Survival"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_1 = "1"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_1_NAME = "Creative"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_2 = "2"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_2_NAME = "Adventure"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_3 = "3"; - public static final String PLUGIN_COMMAND_NAME_GAMEMODE_3_NAME = "Spectator"; - public static final String PLUGIN_COMMAND_NAME_GOD = "god"; - public static final String PLUGIN_COMMAND_NAME_ADMIN = "admin"; - public static final String PLUGIN_COMMAND_NAME_SUDO = "sudo"; - public static final String PLUGIN_COMMAND_NAME_EXIT = "exit"; - public static final String PLUGIN_COMMAND_NAME_GAMERULES = "gamerules"; - public static final String PLUGIN_COMMAND_NAME_HEAD = "head"; - public static final String PLUGIN_COMMAND_NAME_HEAL = "heal"; - public static final String PLUGIN_COMMAND_NAME_HOME = "home"; - public static final String PLUGIN_COMMAND_NAME_HOME_SET = "set"; - public static final String PLUGIN_COMMAND_NAME_HOME_DELETE = "delete"; - public static final String PLUGIN_COMMAND_NAME_HOME_LIST = "list"; - public static final String PLUGIN_COMMAND_NAME_INVENTORY = "inv"; - public static final String PLUGIN_COMMAND_NAME_MSG = "msg"; - public static final String PLUGIN_COMMAND_NAME_REPLY = "r"; - public static final String PLUGIN_COMMAND_NAME_MORE = "more"; - public static final String PLUGIN_COMMAND_NAME_NICK = "nick"; - public static final String PLUGIN_COMMAND_NAME_NIGHT = "night"; - public static final String PLUGIN_COMMAND_NAME_SETGROUP = "setGroup"; - public static final String PLUGIN_COMMAND_NAME_POKE = "poke"; - public static final String PLUGIN_COMMAND_NAME_PRINT = "print"; - public static final String PLUGIN_COMMAND_NAME_RAIN = "rain"; - public static final String PLUGIN_COMMAND_NAME_ADMIN_PING = "ping"; - public static final String PLUGIN_COMMAND_NAME_RENAME = "rename"; - public static final String PLUGIN_COMMAND_NAME_REPAIR = "repair"; - public static final String PLUGIN_COMMAND_NAME_ROLLBACK = "rollback"; - public static final String PLUGIN_COMMAND_NAME_ROLLBACK_PLAYER = "player"; - public static final String PLUGIN_COMMAND_NAME_ROLLBACK_UNDO = "undo"; - public static final String PLUGIN_COMMAND_NAME_ROLLBACK_UNDO_PLAYER = "player"; - public static final String PLUGIN_COMMAND_NAME_SPAWN = "spawn"; - public static final String PLUGIN_COMMAND_NAME_BACK = "back"; - public static final String PLUGIN_COMMAND_NAME_PLAYERINFO = "playerinfo"; - public static final String PLUGIN_COMMAND_NAME_BAGS = "bags"; - public static final String PLUGIN_COMMAND_NAME_WORLD = "world"; - public static final String PLUGIN_COMMAND_NAME_WORLD_CREATE = "create"; - public static final String PLUGIN_COMMAND_NAME_WORLD_LOAD = "load"; - public static final String PLUGIN_COMMAND_NAME_WORLD_LIST = "list"; - public static final String PLUGIN_COMMAND_NAME_WORLD_UNLOAD = "unload"; - public static final String PLUGIN_COMMAND_NAME_WORLD_UNLOAD_NO_SAVE = "unloadNoSave"; - public static final String PLUGIN_COMMAND_NAME_SPEED = "speed"; - public static final String PLUGIN_COMMAND_NAME_STORM = "storm"; - public static final String PLUGIN_COMMAND_NAME_SUICIDE = "suicide"; - public static final String PLUGIN_COMMAND_NAME_SUN = "sun"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND = "ZAQmNCRXEdwSGU7DvEcXTbBkp2qEaCSSNkQcMhL3m7KSDtmXWaxtbYCaQCFBR96fj"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_CUSTOMMOB = "cm"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_CLOUDSAILOR = "cs"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_RELLU = "rellu"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_SMELT = "smelt"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_TELE = "tele"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_NOENCHANT = "noenchant"; - public static final String PLUGIN_COMMAND_NAME_TEST_COMMAND_WORLDS = "worlds"; - public static final String PLUGIN_COMMAND_NAME_TITLE = "title"; - public static final String PLUGIN_COMMAND_NAME_VANISH = "vanish"; - public static final String PLUGIN_COMMAND_NAME_WHERE = "where"; - public static final String PLUGIN_COMMAND_NAME_PROTECT = "protect"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_ADD = "add"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_REMOVE = "remove"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_INFO = "info"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_FLAG = "flag"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_RIGHT = "right"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD = "add"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE = "remove"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD = "add"; - public static final String PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE = "remove"; - public static final String PLUGIN_COMMAND_NAME_SIGN = "sign"; - public static final String PLUGIN_COMMAND_NAME_SIGN_EDIT = "edit"; - public static final String PLUGIN_COMMAND_NAME_SIGN_COPY = "copy"; - public static final String PLUGIN_COMMAND_NAME_MARRY = "marry"; - public static final String PLUGIN_COMMAND_NAME_MARRY_ACCEPT = "accept"; - public static final String PLUGIN_COMMAND_NAME_MARRY_DIVORCE = "divorce"; - public static final String PLUGIN_COMMAND_NAME_CUSTOMHEADS = "customheads"; - public static final String PLUGIN_COMMAND_NAME_TEAM = "team"; + String PLUGIN_COMMAND_NAME_AFK = "afk"; + String PLUGIN_COMMAND_NAME_BROADCAST = "broadcast"; + String PLUGIN_COMMAND_NAME_BROADCAST_TITLE = "title"; + String PLUGIN_COMMAND_NAME_COOCKIE = "cookie"; + String PLUGIN_COMMAND_NAME_CRAFT = "craft"; + String PLUGIN_COMMAND_NAME_DAY = "day"; + String PLUGIN_COMMAND_NAME_ENDERCHEST = "enderchest"; + String PLUGIN_COMMAND_NAME_FLY = "fly"; + String PLUGIN_COMMAND_NAME_PURSE = "purse"; + String PLUGIN_COMMAND_NAME_WARP = "warp"; + String PLUGIN_COMMAND_NAME_WARP_ADD = "add"; + String PLUGIN_COMMAND_NAME_WARP_REMOVE = "remove"; + String PLUGIN_COMMAND_NAME_TELEPORT = "teleport"; + String PLUGIN_COMMAND_NAME_TELEPORT_TO = "to"; + String PLUGIN_COMMAND_NAME_TELEPORT_ACCEPT = "accept"; + String PLUGIN_COMMAND_NAME_GAMEMODE_0 = "0"; + String PLUGIN_COMMAND_NAME_GAMEMODE_0_NAME = "Survival"; + String PLUGIN_COMMAND_NAME_GAMEMODE_1 = "1"; + String PLUGIN_COMMAND_NAME_GAMEMODE_1_NAME = "Creative"; + String PLUGIN_COMMAND_NAME_GAMEMODE_2 = "2"; + String PLUGIN_COMMAND_NAME_GAMEMODE_2_NAME = "Adventure"; + String PLUGIN_COMMAND_NAME_GAMEMODE_3 = "3"; + String PLUGIN_COMMAND_NAME_GAMEMODE_3_NAME = "Spectator"; + String PLUGIN_COMMAND_NAME_GOD = "god"; + String PLUGIN_COMMAND_NAME_ADMIN = "admin"; + String PLUGIN_COMMAND_NAME_SUDO = "sudo"; + String PLUGIN_COMMAND_NAME_EXIT = "exit"; + String PLUGIN_COMMAND_NAME_GAMERULES = "gamerules"; + String PLUGIN_COMMAND_NAME_HEAD = "head"; + String PLUGIN_COMMAND_NAME_HEAL = "heal"; + String PLUGIN_COMMAND_NAME_HOME = "home"; + String PLUGIN_COMMAND_NAME_HOME_SET = "set"; + String PLUGIN_COMMAND_NAME_HOME_DELETE = "delete"; + String PLUGIN_COMMAND_NAME_HOME_LIST = "list"; + String PLUGIN_COMMAND_NAME_INVENTORY = "inv"; + String PLUGIN_COMMAND_NAME_MSG = "msg"; + String PLUGIN_COMMAND_NAME_REPLY = "r"; + String PLUGIN_COMMAND_NAME_MORE = "more"; + String PLUGIN_COMMAND_NAME_NICK = "nick"; + String PLUGIN_COMMAND_NAME_NIGHT = "night"; + String PLUGIN_COMMAND_NAME_SETGROUP = "setGroup"; + String PLUGIN_COMMAND_NAME_POKE = "poke"; + String PLUGIN_COMMAND_NAME_PRINT = "print"; + String PLUGIN_COMMAND_NAME_RAIN = "rain"; + String PLUGIN_COMMAND_NAME_ADMIN_PING = "ping"; + String PLUGIN_COMMAND_NAME_RENAME = "rename"; + String PLUGIN_COMMAND_NAME_REPAIR = "repair"; + String PLUGIN_COMMAND_NAME_ROLLBACK = "rollback"; + String PLUGIN_COMMAND_NAME_ROLLBACK_PLAYER = "player"; + String PLUGIN_COMMAND_NAME_ROLLBACK_UNDO = "undo"; + String PLUGIN_COMMAND_NAME_ROLLBACK_UNDO_PLAYER = "player"; + String PLUGIN_COMMAND_NAME_SPAWN = "spawn"; + String PLUGIN_COMMAND_NAME_BACK = "back"; + String PLUGIN_COMMAND_NAME_PLAYERINFO = "playerinfo"; + String PLUGIN_COMMAND_NAME_BAGS = "bags"; + String PLUGIN_COMMAND_NAME_WORLD = "world"; + String PLUGIN_COMMAND_NAME_WORLD_CREATE = "create"; + String PLUGIN_COMMAND_NAME_WORLD_LOAD = "load"; + String PLUGIN_COMMAND_NAME_WORLD_LIST = "list"; + String PLUGIN_COMMAND_NAME_WORLD_UNLOAD = "unload"; + String PLUGIN_COMMAND_NAME_WORLD_UNLOAD_NO_SAVE = "unloadNoSave"; + String PLUGIN_COMMAND_NAME_SPEED = "speed"; + String PLUGIN_COMMAND_NAME_STORM = "storm"; + String PLUGIN_COMMAND_NAME_SUICIDE = "suicide"; + String PLUGIN_COMMAND_NAME_SUN = "sun"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND = "ZAQmNCRXEdwSGU7DvEcXTbBkp2qEaCSSNkQcMhL3m7KSDtmXWaxtbYCaQCFBR96fj"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_CUSTOMMOB = "cm"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_CLOUDSAILOR = "cs"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_RELLU = "rellu"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_SMELT = "smelt"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_TELE = "tele"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_NOENCHANT = "noenchant"; + String PLUGIN_COMMAND_NAME_TEST_COMMAND_WORLDS = "worlds"; + String PLUGIN_COMMAND_NAME_TITLE = "title"; + String PLUGIN_COMMAND_NAME_VANISH = "vanish"; + String PLUGIN_COMMAND_NAME_WHERE = "where"; + String PLUGIN_COMMAND_NAME_PROTECT = "protect"; + String PLUGIN_COMMAND_NAME_PROTECT_ADD = "add"; + String PLUGIN_COMMAND_NAME_PROTECT_REMOVE = "remove"; + String PLUGIN_COMMAND_NAME_PROTECT_INFO = "info"; + String PLUGIN_COMMAND_NAME_PROTECT_FLAG = "flag"; + String PLUGIN_COMMAND_NAME_PROTECT_RIGHT = "right"; + String PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD = "add"; + String PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE = "remove"; + String PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD = "add"; + String PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE = "remove"; + String PLUGIN_COMMAND_NAME_SIGN = "sign"; + String PLUGIN_COMMAND_NAME_SIGN_EDIT = "edit"; + String PLUGIN_COMMAND_NAME_SIGN_COPY = "copy"; + String PLUGIN_COMMAND_NAME_MARRY = "marry"; + String PLUGIN_COMMAND_NAME_MARRY_ACCEPT = "accept"; + String PLUGIN_COMMAND_NAME_MARRY_DIVORCE = "divorce"; + String PLUGIN_COMMAND_NAME_CUSTOMHEADS = "customheads"; + String PLUGIN_COMMAND_NAME_TEAM = "team"; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/Constants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/Constants.java new file mode 100644 index 00000000..745f3f73 --- /dev/null +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/Constants.java @@ -0,0 +1,321 @@ +package de.relluem94.minecraft.server.spigot.essentials.constants; + +public interface Constants { + + /* ******************************************************************************* */ + /* PLUGIN STUFF */ + /* ******************************************************************************* */ + + String PLUGIN_EOL = System.lineSeparator(); + + String PLUGIN_COLOR_COMMAND = "§f"; + String PLUGIN_COLOR_COMMAND_NAME = "§b"; + String PLUGIN_COLOR_COMMAND_ARG = "§b"; + String PLUGIN_COLOR_MESSAGE = "§f"; + String PLUGIN_COLOR_CONSOLE = "§c"; + String PLUGIN_COLOR_COMMAND_BLOCK = "§8"; + String PLUGIN_COLOR_MONEY = "§6"; + String PLUGIN_COLOR_BROADCAST = "§5"; + String PLUGIN_COLOR_MESSAGE_SPACER = "§7"; + String PLUGIN_COLOR_RESET = "§r"; + String PLUGIN_COLOR_LOGO_RELLU = "§8"; + String PLUGIN_COLOR_LOGO_ESSENTIALS = "§c"; + String PLUGIN_COLOR_POSITIVE = "§a"; + String PLUGIN_COLOR_NEGATIVE = "§c"; + String PLUGIN_COLOR_NEUTRAL = "§6"; + + + String PLUGIN_NAME_RELLU = "Rellu"; + String PLUGIN_NAME_ESSENTIALS = "Essentials"; + String PLUGIN_NAME_INITIAL_RELLU = "R"; + String PLUGIN_NAME_INITIAL_ESSENTIALS = "E"; + String PLUGIN_NAME_SHORT = PLUGIN_COLOR_LOGO_RELLU + PLUGIN_NAME_INITIAL_RELLU + PLUGIN_COLOR_LOGO_ESSENTIALS + PLUGIN_NAME_INITIAL_ESSENTIALS + PLUGIN_COLOR_MESSAGE; + String PLUGIN_NAME_PREFIX = PLUGIN_COLOR_LOGO_RELLU + PLUGIN_NAME_RELLU + PLUGIN_COLOR_LOGO_ESSENTIALS + PLUGIN_NAME_ESSENTIALS + PLUGIN_COLOR_RESET + PLUGIN_COLOR_MESSAGE; + String PLUGIN_NAME_CONSOLE = PLUGIN_COLOR_MESSAGE + "[" + PLUGIN_NAME_PREFIX + PLUGIN_COLOR_MESSAGE + "] "; + String PLUGIN_NAME_BROADCAST = PLUGIN_COLOR_BROADCAST + "Broadcast"; + String PLUGIN_NAME_CHAT_CONSOLE = PLUGIN_COLOR_CONSOLE + "Console"; + String PLUGIN_NAME_MONEY = PLUGIN_COLOR_MONEY + "Coins" + PLUGIN_COLOR_MESSAGE; + + String PLUGIN_WORLD_LOBBY = "lobby"; + String PLUGIN_WORLD_WORLD = "world"; + String PLUGIN_WORLD_WORLD_NETHER = "world_nether"; + String PLUGIN_WORLD_WORLD_THE_END = "world_the_end"; + + String PLUGIN_FORMS_SPACER_CHANNEL = " >> " + PLUGIN_COLOR_COMMAND; + String PLUGIN_FORMS_SPACER_MESSAGE = PLUGIN_COLOR_MESSAGE_SPACER + " >> " + PLUGIN_COLOR_MESSAGE; + String PLUGIN_FORMS_BORDER = "<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>"; + String PLUGIN_FORMS_WHITESPACE_SHORT = " "; + String PLUGIN_FORMS_COMMAND_PREFIX = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE + PLUGIN_COLOR_COMMAND; + + String PLUGIN_SYMBOL_HEAVY_CHECK_MARK = PLUGIN_COLOR_POSITIVE + "✔ "; + String PLUGIN_SYMBOL_BLACK_LARGE_CIRCLE = PLUGIN_COLOR_NEUTRAL + "⬤ "; + String PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X = PLUGIN_COLOR_NEGATIVE + "✖ "; + String PLUGIN_SYMBOL_RIGHT_POINTING_ANGLE_BRACKET = PLUGIN_COLOR_POSITIVE + "〉"; + String PLUGIN_SYMBOL_LEFT_POINTING_ANGLE_BRACKET = PLUGIN_COLOR_NEGATIVE + "〈"; + String PLUGIN_SYMBOL_CROSS_MARK = PLUGIN_COLOR_NEGATIVE + "❌"; + String PLUGIN_SYMBOL_BLACK_FOUR_POINTED_STAR = PLUGIN_COLOR_POSITIVE + "✦"; + String PLUGIN_SYMBOL_HEART = PLUGIN_COLOR_NEGATIVE + "♥"; + // ❌ Cross Mark (U+274C) + // ✦ Black Four Pointed Star (U+2726) + + String PLUGIN_SIGN_NAME = PLUGIN_COLOR_MESSAGE + "[" + PLUGIN_NAME_SHORT + "]"; + String PLUGIN_SIGN_CLICK = PLUGIN_COLOR_MESSAGE + "[Click here]"; + + String PLUGIN_MANAGER_START_MESSAGE = "starts configuring ..."; + String PLUGIN_MANAGER_STOP_MESSAGE = "shutdown();"; + String PLUGIN_MANAGER_STARTTIME_MESSAGE = "wurde in %s ms gestartet!"; + String PLUGIN_MANAGER_REGISTER_SKILLS = "Registriere Skills!"; + String PLUGIN_MANAGER_SKILLS_REGISTERED = "Skills erfolgreich registriert!"; + String PLUGIN_MANAGER_LOADING_CONFIGS = "Configs werden geladen!"; + String PLUGIN_MANAGER_CONFIGS_LOADED = "Configs sind geladen!"; + String PLUGIN_MANAGER_REGISTER_EVENTS = "Registriere Events!"; + String PLUGIN_MANAGER_EVENTS_REGISTERED = "%s Events erfolgreich registriert!"; + String PLUGIN_MANAGER_REGISTER_RECIPE = "Registriere Rezepte!"; + String PLUGIN_MANAGER_RECIPE_REGISTERED = "%s Rezepte erfolgreich registriert!"; + String PLUGIN_MANAGER_REGISTER_COMMANDS = "Registriere Befehle!"; + String PLUGIN_MANAGER_COMMANDS_REGISTERED = "%s Befehle erfolgreich registriert!"; + String PLUGIN_MANAGER_REGISTER_AUTOSAVE = "Registriere Auto Save!"; + String PLUGIN_MANAGER_AUTOSAVE_REGISTERED = "Auto Save erfolgreich registriert!"; + String PLUGIN_MANAGER_REGISTER_ENCHANTMENTS = "Registriere Enchantments!"; + String PLUGIN_MANAGER_ENCHANTMENTS_REGISTERED = "%s Enchantments erfolgreich registriert!"; + String PLUGIN_MANAGER_REGISTER_ENCHANTMENT = "Registered enchantment %s with id %s!"; + + String PLUGIN_INTERNAL_UTILITY_CLASS = "This is a Utility Class"; + + String PLUGIN_FOLDER_MKDIR_ERROR = "Couldn't create the Plugin Folder"; + + + + /* ******************************************************************************* */ + /* COMMAND STUFF */ + /* ******************************************************************************* */ + String PLUGIN_COMMAND_FLYMODE = PLUGIN_FORMS_COMMAND_PREFIX + "Der Flugmodus von %s" + PLUGIN_COLOR_COMMAND + " wurde " + PLUGIN_COLOR_COMMAND_ARG + "%s!"; + String PLUGIN_COMMAND_FLYMODE_ACTIVATED = "aktiviert"; + String PLUGIN_COMMAND_FLYMODE_DEACTIVATED = "deaktiviert"; + + String PLUGIN_COMMAND_ADMIN_PING = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast ein Ping von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "ms!"; + String PLUGIN_COMMAND_ADMIN_PING_OTHER = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " hast ein Ping von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "ms!"; + String PLUGIN_COMMAND_ADMIN_PING_OTHER_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "wurde nicht gefunden"; + + String PLUGIN_COMMAND_CRAFTINGBENCH = PLUGIN_FORMS_COMMAND_PREFIX + "Die Werkbank von %s" + PLUGIN_COLOR_COMMAND + " wurde geöffnet!"; + + String PLUGIN_COMMAND_COOKIES = PLUGIN_FORMS_COMMAND_PREFIX + "Ein Keks für dich, %s"; + String PLUGIN_COMMAND_COOKIES_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast %s " + PLUGIN_COLOR_COMMAND + "ein Keks geschenkt!"; + String PLUGIN_COMMAND_COOKIES_LORE_1 = PLUGIN_COLOR_COMMAND + "Mit viel Liebe gebacken von %s"; + String PLUGIN_COMMAND_COOKIES_LORE_3 = PLUGIN_COLOR_COMMAND + "Wie selbstverliebt!"; + String PLUGIN_COMMAND_COOKIES_DISPLAYNAME = PLUGIN_COLOR_COMMAND + "Schokoladenkeks"; + + String PLUGIN_COMMAND_HEAD = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast ein Kopf von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " erzeugt!"; + String PLUGIN_COMMAND_VANISH_DISABLE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast vanish für " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "deaktiviert!"; + String PLUGIN_COMMAND_VANISH_ENABLE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast vanish für " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "aktiviert!"; + String PLUGIN_COMMAND_VANISH = PLUGIN_FORMS_COMMAND_PREFIX + "Dein vanish wurde umgeschaltet!"; + + String PLUGIN_COMMAND_MORE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast mehr von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " erzeugt!"; + String PLUGIN_COMMAND_MORE_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast mehr von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " erhalten!"; + + String PLUGIN_COMMAND_REPAIR = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " repariert!"; + String PLUGIN_COMMAND_CANNOT_REPAIR = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " nicht reparieren!"; + String PLUGIN_COMMAND_REPAIR_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " repariert bekommen!"; + + String PLUGIN_COMMAND_GAMERULES = PLUGIN_FORMS_COMMAND_PREFIX + "Die Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "hat folgende Einstellungen:"; + + String PLUGIN_COMMAND_HOME = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "an den Bett Spawn teleportiert!"; + String PLUGIN_COMMAND_HOME_TP = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest zu " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "teleportiert!"; + String PLUGIN_COMMAND_HOME_NONE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Home!"; + + String PLUGIN_COMMAND_HOME_LIST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast folgende Homes:"; + String PLUGIN_COMMAND_HOME_LIST_NAME = PLUGIN_COLOR_COMMAND + "Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + " §7(" + PLUGIN_COLOR_COMMAND_ARG + "%s§7)"; + String PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast folgende Todespunkte:"; + String PLUGIN_COMMAND_HOME_LIST_DEATHPOINTS_NAME = PLUGIN_COLOR_COMMAND + "Todespunkt: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + " §7(" + PLUGIN_COLOR_COMMAND_ARG + "%s§7)"; + + String PLUGIN_COMMAND_HOME_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Home mit dem Namen " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; + String PLUGIN_COMMAND_HOME_EXISTS = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast bereits ein Home mit dem Namen " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; + String PLUGIN_COMMAND_HOME_RESERVED = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst kein Home mit dem Namen " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " speichern!"; + String PLUGIN_COMMAND_HOME_NO_BED = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Bett in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " an das du teleportiert werden kannst!"; + String PLUGIN_COMMAND_HOME_SET = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Home " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "gesetzt!"; + String PLUGIN_COMMAND_HOME_DELETE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Home " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "gelöscht!"; + String PLUGIN_COMMAND_HOME_DEATH_DELETE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Todespunkt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "gelöscht!"; + + String PLUGIN_COMMAND_SUN = PLUGIN_FORMS_COMMAND_PREFIX + "Du lässt die Sonne in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "scheinen!"; + String PLUGIN_COMMAND_SUN_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Die Sonne die Sonne scheint nur für dich!"; + + String PLUGIN_COMMAND_RAIN = PLUGIN_FORMS_COMMAND_PREFIX + "Du lässt es in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " regnen!"; + String PLUGIN_COMMAND_RAIN_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Es regnet nur für dich!"; + + String PLUGIN_COMMAND_STORM = PLUGIN_FORMS_COMMAND_PREFIX + "Du lässt es in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " gewittern!"; + + String PLUGIN_COMMAND_DAY = PLUGIN_FORMS_COMMAND_PREFIX + "Es ist jetzt Tag in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; + + String PLUGIN_COMMAND_GOD_ON = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist der Gott!"; + String PLUGIN_COMMAND_GOD_OFF = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist wieder sterblich!"; + + String PLUGIN_COMMAND_HEAL = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest geheilt!"; + + String PLUGIN_COMMAND_NIGHT = PLUGIN_FORMS_COMMAND_PREFIX + "Es ist jetzt Nacht in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; + + String PLUGIN_COMMAND_ENDERCHEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast deine Enderchest geöffnet!"; + String PLUGIN_COMMAND_ENDERCHEST_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast die Enderchest von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "geöffnet!"; + + String PLUGIN_COMMAND_INVENTORY = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Inventar geöffnet!"; + String PLUGIN_COMMAND_INVENTORY_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast das Inventar von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "geöffnet!"; + + String PLUGIN_COMMAND_SPAWN = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest in der Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "an den Spawn teleportiert!"; + + String PLUGIN_COMMAND_NICK = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast den Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "umbenannt!"; + + String PLUGIN_COMMAND_SUICIDE = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "hat sich umgebracht!"; + + String PLUGIN_COMMAND_WHERE = PLUGIN_FORMS_COMMAND_PREFIX + "Der Spieler " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "befindet sich bei " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + "!"; + String PLUGIN_COMMAND_WHERE_STRING = PLUGIN_COLOR_COMMAND + "X: " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "Y: " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "Z: " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "Welt: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + + String PLUGIN_COMMAND_MSG_PLAYER_OFFLINE = PLUGIN_FORMS_COMMAND_PREFIX + "Spieler ist Offline!"; + String PLUGIN_COMMAND_MSG_NO_ONE_TO_REPLY = PLUGIN_FORMS_COMMAND_PREFIX + "Niemand da der dir antworten könnte!"; + String PLUGIN_COMMAND_MSG_SPACER_IN = "§9 >> §f"; + String PLUGIN_COMMAND_MSG_SPACER_OUT = "§9 << §f"; + String PLUGIN_COMMAND_MSG_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/msg " + PLUGIN_COLOR_COMMAND + "<" + PLUGIN_COLOR_COMMAND_ARG + "spieler" + PLUGIN_COLOR_COMMAND + ">" + " " + "<" + PLUGIN_COLOR_COMMAND_ARG + "nachricht" + PLUGIN_COLOR_COMMAND + ">"; + + String PLUGIN_COMMAND_PRINT_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/print " + "<" + PLUGIN_COLOR_COMMAND_ARG + "nachricht" + PLUGIN_COLOR_COMMAND + ">"; + + String PLUGIN_COMMAND_RENAME_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/rename " + "<" + PLUGIN_COLOR_COMMAND_ARG + "name" + PLUGIN_COLOR_COMMAND + ">"; + String PLUGIN_COMMAND_RENAME_AIR = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst Luft nicht umbenennen! "; + String PLUGIN_COMMAND_RENAME = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dein Gegenstand umbenannt!"; + + String PLUGIN_COMMAND_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "Folgende Welten gibt es:"; + String PLUGIN_COMMAND_WORLD_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Die Welt " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " existiert nicht"; + + String PLUGIN_COMMAND_POKE = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze /poke " + PLUGIN_COLOR_COMMAND_ARG + "" + PLUGIN_COLOR_COMMAND + " um einen Spieler anzustubsen"; + String PLUGIN_COMMAND_POKE_TITLE = "§4Buuuh"; + String PLUGIN_COMMAND_POKE_SUBTITLE = "~~~~~~~~~~~~~~"; + String PLUGIN_COMMAND_POKE_MESSAGE_TARGET = PLUGIN_FORMS_COMMAND_PREFIX + "%s " + PLUGIN_COLOR_COMMAND + "hat dich angestupst!"; + String PLUGIN_COMMAND_POKE_MESSAGE_SENDER = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + "%s " + PLUGIN_COLOR_COMMAND + "angestupst!"; + + String PLUGIN_COMMAND_SPEED = PLUGIN_FORMS_COMMAND_PREFIX + "Geschwindigkeit wurde auf " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " gesetzt"; + String PLUGIN_COMMAND_SPEED_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/speed " + "<" + PLUGIN_COLOR_COMMAND_ARG + "0-10" + PLUGIN_COLOR_COMMAND + ">"; + + String PLUGIN_COMMAND_BROADCAST_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Um ein Title Broadcast zu machen nutze " + PLUGIN_COLOR_COMMAND_ARG + "/broadcast title " + PLUGIN_COLOR_COMMAND + "sonst " + PLUGIN_COLOR_COMMAND_ARG + "/broadcast " + PLUGIN_COLOR_COMMAND + "<" + PLUGIN_COLOR_COMMAND_ARG + "message" + PLUGIN_COLOR_COMMAND + ">"; + + String PLUGIN_COMMAND_INVALID = PLUGIN_FORMS_COMMAND_PREFIX + "Invalid Data!"; + String PLUGIN_COMMAND_PERMISSION_MISSING = PLUGIN_FORMS_COMMAND_PREFIX + "Dafür hast du leider keine Rechte!"; + String PLUGIN_COMMAND_NOT_A_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist leider kein Spieler!"; + String PLUGIN_COMMAND_TO_LESS_ARGUMENTS = PLUGIN_FORMS_COMMAND_PREFIX + "Zu wenig Argumente!"; + String PLUGIN_COMMAND_TO_MANY_ARGUMENTS = PLUGIN_FORMS_COMMAND_PREFIX + "Zu viele Argumente!"; + String PLUGIN_COMMAND_TARGET_NOT_A_PLAYER = PLUGIN_FORMS_COMMAND_PREFIX + "%s" + PLUGIN_COLOR_COMMAND + " ist kein Spieler!"; + String PLUGIN_COMMAND_WRONG_SUB_COMMAND = PLUGIN_FORMS_COMMAND_PREFIX + "Wrong Sub Command"; + + String PLUGIN_COMMAND_PURSE_GAIN = PLUGIN_FORMS_COMMAND_PREFIX + "You gained " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " and now have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; + String PLUGIN_COMMAND_PURSE_TO_ITEM = PLUGIN_FORMS_COMMAND_PREFIX + "You put out " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY; + String PLUGIN_COMMAND_PURSE_TO_ITEM_VALUE_INVALID = PLUGIN_FORMS_COMMAND_PREFIX + "The value you entered is invalid!"; + String PLUGIN_COMMAND_PURSE_TO_ITEM_NOT_ENOUGH_MONEY = PLUGIN_FORMS_COMMAND_PREFIX + "Not enough " + PLUGIN_NAME_MONEY; + String PLUGIN_COMMAND_PURSE_TOTAL = PLUGIN_FORMS_COMMAND_PREFIX + "You have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; + String PLUGIN_COMMAND_PURSE_TOTAL_OTHER = PLUGIN_FORMS_COMMAND_PREFIX + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + " has " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in the Purse!"; + + String PLUGIN_COMMAND_PROTECT_COMMAND_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_ADD + PLUGIN_COLOR_MESSAGE + ", " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_REMOVE + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG + PLUGIN_COLOR_MESSAGE + ", " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT; + String PLUGIN_COMMAND_PROTECT_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Click a Protected Block to view the Protection Info"; + String PLUGIN_COMMAND_PROTECT_ADD = PLUGIN_FORMS_COMMAND_PREFIX + "Click Protectable Block to create a Protection"; + String PLUGIN_COMMAND_PROTECT_REMOVE = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to remove the Protection"; + String PLUGIN_COMMAND_PROTECT_FLAG = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG + " " + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG_ADD + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_FLAG_REMOVE + " flagname"; + String PLUGIN_COMMAND_PROTECT_FLAG_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Flag was not found!"; + String PLUGIN_COMMAND_PROTECT_RIGHT = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT + " " + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT_ADD + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_PROTECT_RIGHT_REMOVE + " playername"; + String PLUGIN_COMMAND_PROTECT_FLAG_ADD = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to add the Flag"; + String PLUGIN_COMMAND_PROTECT_FLAG_REMOVE = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to remove the Flag"; + String PLUGIN_COMMAND_PROTECT_RIGHT_ADD = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to add the Player"; + String PLUGIN_COMMAND_PROTECT_RIGHT_PLAYER_NOTFOUND = PLUGIN_FORMS_COMMAND_PREFIX + "No Player found with Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_COMMAND_PROTECT_RIGHT_REMOVE = PLUGIN_FORMS_COMMAND_PREFIX + "Click your Protected Block to remove the Player"; + + String PLUGIN_COMMAND_SIGN_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use " + PLUGIN_COLOR_COMMAND_NAME + "/" + CommandNameConstants.PLUGIN_COMMAND_NAME_SIGN + " " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_SIGN_COPY + PLUGIN_COLOR_MESSAGE + " or " + PLUGIN_COLOR_COMMAND_ARG + CommandNameConstants.PLUGIN_COMMAND_NAME_SIGN_EDIT; + String PLUGIN_COMMAND_SIGN_COPY = PLUGIN_FORMS_COMMAND_PREFIX + "Click the Sign you want to copy"; + String PLUGIN_COMMAND_SIGN_EDIT = PLUGIN_FORMS_COMMAND_PREFIX + "Click the Sign you want to edit"; + String PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE = PLUGIN_FORMS_COMMAND_PREFIX + "Click the Redstone Lamp you want to Lit. Use this Command again to disable the Light Toogle Mode."; + String PLUGIN_COMMAND_ADMIN_LIGHT_TOOGLE_DISABLED = PLUGIN_FORMS_COMMAND_PREFIX + "Light Toogle Mode is now disabled."; + String PLUGIN_COMMAND_ADMIN_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use this command with the following Subcommands: npc, chat, light, afk, top, ping, cleanProtections"; + String PLUGIN_COMMAND_ADMIN_CHAT_CLEARED = PLUGIN_FORMS_COMMAND_PREFIX + "Chat was cleared"; + String PLUGIN_COMMAND_ADMIN_TOP = PLUGIN_FORMS_COMMAND_PREFIX + "Teleported to the highest Block"; + String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS ="ID: " + PLUGIN_COLOR_COMMAND_ARG + "#%s" + PLUGIN_COLOR_COMMAND + " PMat: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " != LMat: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_START = PLUGIN_FORMS_COMMAND_PREFIX + "Checking " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Protection Materials against their Location Materials"; + String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_CLEANING_UP = PLUGIN_FORMS_COMMAND_PREFIX + "Cleaning Up " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Protections"; + String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_END = PLUGIN_FORMS_COMMAND_PREFIX + "Reduced to " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Protections"; + String PLUGIN_COMMAND_ADMIN_CLEAN_PROTECTIONS_NONE = PLUGIN_FORMS_COMMAND_PREFIX + "No Protections to Clean Up"; + String PLUGIN_COMMAND_WORLD_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use this command with the following Subcommands: list load unload unloadNoSave"; + String PLUGIN_COMMAND_WORLD_CREATE_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Use this command with the following arguments: name(String) type(WordType String) environment (Environment as String) structures (boolean)"; + String PLUGIN_COMMAND_WORLD_WORLD_NOT_LOADED = "World not loaded. Can't unload this World."; + String PLUGIN_COMMAND_WORLD_UNLOAD_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "World get's saved and unloaded."; + String PLUGIN_COMMAND_WORLD_UNLOAD_WORLD_NO_SAVE = PLUGIN_FORMS_COMMAND_PREFIX + "World get's unloaded without saving it."; + String PLUGIN_COMMAND_WORLD_LOAD_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "World get's loaded."; + String PLUGIN_COMMAND_WORLD_CREATE_WORLD = PLUGIN_FORMS_COMMAND_PREFIX + "World get's created."; + String PLUGIN_COMMAND_WORLD_WRONG_ARGUMENTS = PLUGIN_FORMS_COMMAND_PREFIX + "Can't create World, wrong parameters given!"; + String PLUGIN_COMMAND_SUDO_ACTIVATED = PLUGIN_FORMS_COMMAND_PREFIX + "You are now sudoing %s"; + String PLUGIN_COMMAND_SUDO_DEACTIVATED = PLUGIN_FORMS_COMMAND_PREFIX + "Exited."; + String PLUGIN_COMMAND_SUDO_PLAYER_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Can't Sudo Player " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + ". Player not found!"; + String PLUGIN_COMMAND_EXIT_KICK_MESSAGE = PLUGIN_COLOR_COMMAND + "exited."; + String PLUGIN_COMMAND_EXIT_SERVER_SHUTTING_DOWN = PLUGIN_COLOR_COMMAND + "Server is shutting down..."; + + + String PLUGIN_COMMAND_TP_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " eine Teleport Anfrage geschickt"; + String PLUGIN_COMMAND_TP_REQUEST_TARGET = PLUGIN_FORMS_COMMAND_PREFIX + "Teleport Anfrage von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND; + String PLUGIN_COMMAND_TP_REQUEST_EXPIRED = PLUGIN_FORMS_COMMAND_PREFIX + "Teleport Anfrage ist abgelaufen!"; + String PLUGIN_COMMAND_TP = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest zu " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "teleportiert!"; + String PLUGIN_COMMAND_TP_TO = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "zu dir teleportiert!"; + String PLUGIN_COMMAND_TP_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/teleport " + PLUGIN_COLOR_COMMAND + "," + PLUGIN_COLOR_COMMAND_ARG + "/teleport accept"+ PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "/teleport to " + PLUGIN_COLOR_COMMAND + " oder " + PLUGIN_COLOR_COMMAND_ARG + "/teleport "; + String PLUGIN_COMMAND_TP_ACCEPT_NO_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Keine offene Teleport Anfrage!"; + String PLUGIN_COMMAND_TP_SEND_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast eine Teleport Anfrage an " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " geschickt!"; + + String PLUGIN_GRAPPLING_HOOK_COOLDOWN = PLUGIN_COLOR_NEGATIVE + "Please Slow down.."; + + String PLUGIN_BAG_AMOUNT = "Amount: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_BAG_RETRIEVE = "Click to retrieve"; + String PLUGIN_BAG_CLICK_TO_OPEN = "Click to open"; + String PLUGIN_BAG_CLICK_TO_BUY = "Click to buy this Bag"; + String PLUGIN_BAG_COST_TO_BUY = "Costs: %s"; + String PLUGIN_BAG_GUI_TITLE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE + "Bags"; + + String PLUGIN_BAGS_SAVED = "%s%s Bag(s) saved!"; + String PLUGIN_PLAYERS_SAVED = "%s%s Player(s) saved!"; + String PLUGIN_PLAYERS_INVENTORY_SAVED = "%s%s Player(s) Inventory saved!"; + String PLUGIN_COMMAND_BAGS_NOT_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "The searched Bag " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "was not found!"; + + String PLUGIN_COMMAND_MARRY_SEND_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast eine Hochzeitsanfrage an " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " geschickt!"; + String PLUGIN_COMMAND_MARRY_RECEIVE_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast eine Hochzeitsanfrage von " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " bekommen!"; + String PLUGIN_COMMAND_MARRY_MARRIED = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "geheiratet!"; + String PLUGIN_COMMAND_MARRY_REQUEST_EXPIRED = PLUGIN_FORMS_COMMAND_PREFIX + "Hochzeitsanfrage ist abgelaufen!"; + String PLUGIN_COMMAND_MARRY_REQUEST_IS_MARRIED = PLUGIN_FORMS_COMMAND_PREFIX + "Hochzeitsanfrage ist ungültig, Spieler ist bereits verheitratet!"; + String PLUGIN_COMMAND_MARRY_ACCEPT_NO_REQUEST = PLUGIN_FORMS_COMMAND_PREFIX + "Keine offene Hochzeitsanfrage!"; + String PLUGIN_COMMAND_MARRY_DIVORCE_NOT_MARRIED = PLUGIN_FORMS_COMMAND_PREFIX + "Du bist nicht verheiratet!"; + String PLUGIN_COMMAND_MARRY_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Nutze " + PLUGIN_COLOR_COMMAND_ARG + "/marry " + PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "/marry accept"+ PLUGIN_COLOR_COMMAND + " oder " + PLUGIN_COLOR_COMMAND_ARG + "/marry divorce"; + String PLUGIN_COMMAND_MARRY_DIVORCED = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast dich von " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "getrennt!"; + String PLUGIN_COMMAND_MARRY_SELF_MARRIAGE = PLUGIN_FORMS_COMMAND_PREFIX + "Du kannst dich nicht selbst heiraten!"; + + String PLUGIN_COMMAND_BACK = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest zurück teleportiert!"; + String PLUGIN_COMMAND_BACK_NO_LOCATION = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast kein Back Punkt gesetzt!"; + + + String PLUGIN_COMMAND_WARP = PLUGIN_FORMS_COMMAND_PREFIX + "Du wurdest gewarped!"; + String PLUGIN_COMMAND_WARP_LIST_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Warp Liste:"; + String PLUGIN_COMMAND_WARP_LIST = PLUGIN_COLOR_COMMAND + "Warp Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s "; + String PLUGIN_COMMAND_WARP_ERROR_WORLD_UNLOADED = PLUGIN_FORMS_COMMAND_PREFIX + "Error, Welt ist nicht geladen!"; + String PLUGIN_COMMAND_WARP_ERROR_NO_WARP_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Kein Warp mit diesem Namen gefunden!"; + + + String PLUGIN_COMMAND_SETGROUP = PLUGIN_COLOR_COMMAND + "Group " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " for Player " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " was set!"; + String PLUGIN_COMMAND_SETGROUP_GROUP_NOT_FOUND = PLUGIN_COLOR_COMMAND + "Group " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " not found!"; + String PLUGIN_BANK_INTEREST_NEXT_RUN = PLUGIN_COLOR_COMMAND + "Next Interest Payment Run in: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " seconds!"; + + String PLUGIN_COMMAND_CUSTOMHEADS_TITLE = PLUGIN_FORMS_COMMAND_PREFIX + "Heads"; + + String PLUGIN_COMMAND_PLAYERINFO = PLUGIN_FORMS_COMMAND_PREFIX + "Player Information: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_COMMAND_PLAYERINFO_HOMES = "Homes: %s"; + String PLUGIN_COMMAND_PLAYERINFO_DEATHPOINTS = "DeathPoints: %s"; + String PLUGIN_COMMAND_PLAYERINFO_GROUP = "Group: %s"; + String PLUGIN_COMMAND_PLAYERINFO_MARRIED_TO = "Married: %s " + PLUGIN_SYMBOL_HEART + PLUGIN_COLOR_COMMAND + " %s"; + String PLUGIN_COMMAND_PLAYERINFO_MARRIED_SINCE = "Married since: %s"; + String PLUGIN_COMMAND_PLAYERINFO_LAST_ONLINE = "Last Online: %s"; + String PLUGIN_COMMAND_PLAYERINFO_FIRST_ONLINE = "First Online: %s"; + String PLUGIN_COMMAND_PLAYERINFO_MINED = "%s mined: %s"; + String PLUGIN_COMMAND_PLAYERINFO_DEATHS = "Deaths: %s"; + String PLUGIN_COMMAND_PLAYERINFO_JUMPED = "Jumped: %s"; + String PLUGIN_COMMAND_PLAYERINFO_LEFT_GAME = "Left Game: %s"; + + String PLUGIN_COMMAND_TEAM_TITLE = PLUGIN_FORMS_COMMAND_PREFIX + "Team:"; + + String PLUGIN_ITEM_SELL_PRICE_MESSAGE = PLUGIN_COLOR_NEGATIVE + "Sell: " + PLUGIN_NAME_MONEY + " per Item: %s " + PLUGIN_NAME_MONEY + " per Stack: %s"; + String PLUGIN_ITEM_BUY_PRICE_MESSAGE = PLUGIN_COLOR_POSITIVE + "Buy: " + PLUGIN_NAME_MONEY + " per Item: %s " + PLUGIN_NAME_MONEY + " per Stack: %s"; +} diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseConstants.java index 1ca65dfe..090b0239 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseConstants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseConstants.java @@ -1,19 +1,14 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -import de.relluem94.minecraft.server.spigot.essentials.Strings; - /** * * @author rellu */ -public class DatabaseConstants { +public interface DatabaseConstants { - private DatabaseConstants() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); - } //==============================================================================// // DATABASE STUFF // //==============================================================================// - public static final String PLUGIN_DATABASE_NAME = "rellu_essentials"; + String PLUGIN_DATABASE_NAME = "rellu_essentials"; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseMappings.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseMappings.java index 8f1ae714..5aa9970c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseMappings.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/DatabaseMappings.java @@ -1,56 +1,56 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -public class DatabaseMappings { - public static final String FIELD_ID = "id"; - public static final String FIELD_CREATED = "created"; - public static final String FIELD_CREATEDBY = "createdby"; - public static final String FIELD_UPDATED = "updated"; - public static final String FIELD_UPDATEDBY = "updatedby"; - public static final String FIELD_DELETED = "deleted"; - public static final String FIELD_DELETEDBY = "deletedby"; - public static final String FIELD_BAG_TYPE_FK = "bag_type_fk"; - public static final String FIELD_PLAYER_FK = "player_fk"; - public static final String FIELD_SLOT_VAR_VALUE = "slot_%s_value"; - public static final String FIELD_NAME = "name"; - public static final String FIELD_DISPLAY_NAME = "displayname"; - public static final String FIELD_COST = "cost"; - public static final String FIELD_SLOT_VAR_NAME = "slot_%s_name"; - public static final String FIELD_VALUE = "value"; - public static final String FIELD_BANK_TIER_FK = "bank_tier_fk"; - public static final String FIELD_LIMIT = "limit"; - public static final String FIELD_INTEREST = "interest"; - public static final String FIELD_BANK_ACCOUNT_FK = "bank_account_fk"; - public static final String FIELD_MATERIAL = "material"; - public static final String FIELD_PREFIX = "prefix"; - public static final String FIELD_LOCATION_NAME = "location_name"; - public static final String FIELD_WORLD = "world"; - public static final String FIELD_POS_X = "x"; - public static final String FIELD_POS_Y = "y"; - public static final String FIELD_POS_Z = "z"; - public static final String FIELD_YAW = "yaw"; - public static final String FIELD_PITCH = "pitch"; - public static final String FIELD_LOCATION_TYPE_FK = "location_type_fk"; - public static final String FIELD_PROFESSION = "profession"; - public static final String FIELD_TYPE = "type"; - public static final String FIELD_CUSTOM_NAME = "customname"; - public static final String FIELD_PURSE = "purse"; - public static final String FIELD_FLY = "fly"; - public static final String FIELD_AFK = "afk"; - public static final String FIELD_GROUP_FK = "group_fk"; - public static final String FIELD_UUID = "uuid"; - public static final String FIELD_FIRST_PARTNER_FK = "first_partner_fk"; - public static final String FIELD_SECOND_PARTNER_FK = "second_partner_fk"; - public static final String FIELD_SHARE_PROTECTIONS = "shareProtections"; - public static final String FIELD_TAB_HEADER = "tab_header"; - public static final String FIELD_TAB_FOOTER = "tab_footer"; - public static final String FIELD_MOTD_MESSAGE = "motd_message"; - public static final String FIELD_MOTD_PLAYERS = "motd_players"; - public static final String FIELD_DB_VERSION = "db_version"; - public static final String FIELD_FLAGS = "flags"; - public static final String FIELD_RIGHTS = "rights"; - public static final String FIELD_MATERIAL_NAME = "material_name"; - public static final String FIELD_HEALTH = "health"; - public static final String FIELD_TOTAL_EXPERIENCE = "totalExperience"; - public static final String FIELD_FOOD = "food"; - public static final String FIELD_INVENTORY = "inventory"; +public interface DatabaseMappings { + String FIELD_ID = "id"; + String FIELD_CREATED = "created"; + String FIELD_CREATEDBY = "createdby"; + String FIELD_UPDATED = "updated"; + String FIELD_UPDATEDBY = "updatedby"; + String FIELD_DELETED = "deleted"; + String FIELD_DELETEDBY = "deletedby"; + String FIELD_BAG_TYPE_FK = "bag_type_fk"; + String FIELD_PLAYER_FK = "player_fk"; + String FIELD_SLOT_VAR_VALUE = "slot_%s_value"; + String FIELD_NAME = "name"; + String FIELD_DISPLAY_NAME = "displayname"; + String FIELD_COST = "cost"; + String FIELD_SLOT_VAR_NAME = "slot_%s_name"; + String FIELD_VALUE = "value"; + String FIELD_BANK_TIER_FK = "bank_tier_fk"; + String FIELD_LIMIT = "limit"; + String FIELD_INTEREST = "interest"; + String FIELD_BANK_ACCOUNT_FK = "bank_account_fk"; + String FIELD_MATERIAL = "material"; + String FIELD_PREFIX = "prefix"; + String FIELD_LOCATION_NAME = "location_name"; + String FIELD_WORLD = "world"; + String FIELD_POS_X = "x"; + String FIELD_POS_Y = "y"; + String FIELD_POS_Z = "z"; + String FIELD_YAW = "yaw"; + String FIELD_PITCH = "pitch"; + String FIELD_LOCATION_TYPE_FK = "location_type_fk"; + String FIELD_PROFESSION = "profession"; + String FIELD_TYPE = "type"; + String FIELD_CUSTOM_NAME = "customname"; + String FIELD_PURSE = "purse"; + String FIELD_FLY = "fly"; + String FIELD_AFK = "afk"; + String FIELD_GROUP_FK = "group_fk"; + String FIELD_UUID = "uuid"; + String FIELD_FIRST_PARTNER_FK = "first_partner_fk"; + String FIELD_SECOND_PARTNER_FK = "second_partner_fk"; + String FIELD_SHARE_PROTECTIONS = "shareProtections"; + String FIELD_TAB_HEADER = "tab_header"; + String FIELD_TAB_FOOTER = "tab_footer"; + String FIELD_MOTD_MESSAGE = "motd_message"; + String FIELD_MOTD_PLAYERS = "motd_players"; + String FIELD_DB_VERSION = "db_version"; + String FIELD_FLAGS = "flags"; + String FIELD_RIGHTS = "rights"; + String FIELD_MATERIAL_NAME = "material_name"; + String FIELD_HEALTH = "health"; + String FIELD_TOTAL_EXPERIENCE = "totalExperience"; + String FIELD_FOOD = "food"; + String FIELD_INVENTORY = "inventory"; } \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EnchantmentConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EnchantmentConstants.java index ad8ccb3e..332f3a91 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EnchantmentConstants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EnchantmentConstants.java @@ -1,48 +1,42 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -import de.relluem94.minecraft.server.spigot.essentials.Strings; - /** * * @author rellu */ -public class EnchantmentConstants { - - private EnchantmentConstants() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); - } +public interface EnchantmentConstants { //==============================================================================// // ENCHANTMENT STUFF // //==============================================================================// - public static final String PLUGIN_ENCHANTMENT_COLOR = "§8"; - public static final String PLUGIN_ENCHANTMENT_LORE_COLOR = "§7§o "; - - public static final String PLUGIN_ENCHANTMENT_COLOR_WEAPON = "§c"; - public static final String PLUGIN_ENCHANTMENT_COLOR_HOE = "§a"; - - public static final String PLUGIN_ENCHANTMENT_AUTOSMELT = "autosmelt"; - public static final String PLUGIN_ENCHANTMENT_AUTOSMELT_UUID = "6e4cb9cf-69fb-4a2a-8a9e-787882bdc92d"; - public static final String PLUGIN_ENCHANTMENT_AUTOSMELT_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR + "Autosmelt"; - public static final String PLUGIN_ENCHANTMENT_AUTOSMELT_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Smelts Ores and Blocks if mined with this Tool"; - - public static final String PLUGIN_ENCHANTMENT_TELEKINESIS = "telekinesis"; - public static final String PLUGIN_ENCHANTMENT_TELEKINESIS_UUID = "bfa1f803-1e3f-4a3f-ba19-83c1283d5ddb"; - public static final String PLUGIN_ENCHANTMENT_TELEKINESIS_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR + "Telekinesis"; - public static final String PLUGIN_ENCHANTMENT_TELEKINESIS_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "All drops from Blocks broken and Mobs killed are teleported directly into your Inventory"; - - public static final String PLUGIN_ENCHANTMENT_REPLENISHMENT = "replenishment"; - public static final String PLUGIN_ENCHANTMENT_REPLENISHMENT_UUID = "a131665e-dbc7-4929-b5bc-552862b6837a"; - public static final String PLUGIN_ENCHANTMENT_REPLENISHMENT_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR_HOE + "Replenishment"; - public static final String PLUGIN_ENCHANTMENT_REPLENISHMENT_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Crops will be replant"; - - public static final String PLUGIN_ENCHANTMENT_DELICATE = "delicate"; - public static final String PLUGIN_ENCHANTMENT_DELICATE_UUID = "e945dbb1-277d-4d25-a299-425b5882337a"; - public static final String PLUGIN_ENCHANTMENT_DELICATE_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR_HOE + "Delicate"; - public static final String PLUGIN_ENCHANTMENT_DELICATE_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Only Mature Crops get Harvested"; - - public static final String PLUGIN_ENCHANTMENT_THUNDERSTRIKE = "thunderstrike"; - public static final String PLUGIN_ENCHANTMENT_THUNDERSTRIKE_UUID = "01277108-fca1-452c-8cf7-de3968f8a636"; - public static final String PLUGIN_ENCHANTMENT_THUNDERSTRIKE_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR_WEAPON + "Thunderstrike"; - public static final String PLUGIN_ENCHANTMENT_THUNDERSTRIKE_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Hits Target with a Thunderstrike"; + String PLUGIN_ENCHANTMENT_COLOR = "§8"; + String PLUGIN_ENCHANTMENT_LORE_COLOR = "§7§o "; + + String PLUGIN_ENCHANTMENT_COLOR_WEAPON = "§c"; + String PLUGIN_ENCHANTMENT_COLOR_HOE = "§a"; + + String PLUGIN_ENCHANTMENT_AUTOSMELT = "autosmelt"; + String PLUGIN_ENCHANTMENT_AUTOSMELT_UUID = "6e4cb9cf-69fb-4a2a-8a9e-787882bdc92d"; + String PLUGIN_ENCHANTMENT_AUTOSMELT_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR + "Autosmelt"; + String PLUGIN_ENCHANTMENT_AUTOSMELT_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Smelts Ores and Blocks if mined with this Tool"; + + String PLUGIN_ENCHANTMENT_TELEKINESIS = "telekinesis"; + String PLUGIN_ENCHANTMENT_TELEKINESIS_UUID = "bfa1f803-1e3f-4a3f-ba19-83c1283d5ddb"; + String PLUGIN_ENCHANTMENT_TELEKINESIS_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR + "Telekinesis"; + String PLUGIN_ENCHANTMENT_TELEKINESIS_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "All drops from Blocks broken and Mobs killed are teleported directly into your Inventory"; + + String PLUGIN_ENCHANTMENT_REPLENISHMENT = "replenishment"; + String PLUGIN_ENCHANTMENT_REPLENISHMENT_UUID = "a131665e-dbc7-4929-b5bc-552862b6837a"; + String PLUGIN_ENCHANTMENT_REPLENISHMENT_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR_HOE + "Replenishment"; + String PLUGIN_ENCHANTMENT_REPLENISHMENT_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Crops will be replant"; + + String PLUGIN_ENCHANTMENT_DELICATE = "delicate"; + String PLUGIN_ENCHANTMENT_DELICATE_UUID = "e945dbb1-277d-4d25-a299-425b5882337a"; + String PLUGIN_ENCHANTMENT_DELICATE_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR_HOE + "Delicate"; + String PLUGIN_ENCHANTMENT_DELICATE_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Only Mature Crops get Harvested"; + + String PLUGIN_ENCHANTMENT_THUNDERSTRIKE = "thunderstrike"; + String PLUGIN_ENCHANTMENT_THUNDERSTRIKE_UUID = "01277108-fca1-452c-8cf7-de3968f8a636"; + String PLUGIN_ENCHANTMENT_THUNDERSTRIKE_DISPLAYNAME = PLUGIN_ENCHANTMENT_COLOR_WEAPON + "Thunderstrike"; + String PLUGIN_ENCHANTMENT_THUNDERSTRIKE_LORE = PLUGIN_ENCHANTMENT_LORE_COLOR + "Hits Target with a Thunderstrike"; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EventConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EventConstants.java index 7385e5e8..486dbe2f 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EventConstants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/EventConstants.java @@ -1,124 +1,118 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; - -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; /** * * @author rellu */ -public class EventConstants { - - private EventConstants() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); - } +public interface EventConstants { //==============================================================================// // EVENT STUFF // //==============================================================================// - public static final String PLUGIN_EVENT_JOIN_MESSAGE = PLUGIN_COLOR_POSITIVE + "[" + PLUGIN_SYMBOL_BLACK_FOUR_POINTED_STAR + "] " + PLUGIN_COLOR_MESSAGE + "%s" + PLUGIN_COLOR_COMMAND + " hat den Server betreten."; - public static final String PLUGIN_EVENT_QUIT_MESSAGE = PLUGIN_COLOR_NEGATIVE + "[" + PLUGIN_SYMBOL_CROSS_MARK + "] " + PLUGIN_COLOR_MESSAGE + "%s" + PLUGIN_COLOR_COMMAND + " hat den Server verlassen."; - public static final String PLUGIN_EVENT_DEATH = PLUGIN_FORMS_COMMAND_PREFIX + "Du starbst bei " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + PLUGIN_COMMAND_WHERE_STRING + PLUGIN_COLOR_COMMAND; - public static final String PLUGIN_EVENT_DEATH_TP = PLUGIN_FORMS_COMMAND_PREFIX + "Klicke diese Nachricht um dich zum Todespunkt zu teleportieren!"; - - public static final String PLUGIN_EVENT_SKILL_REPAIR_DONE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast den Gegenstand repariert!"; - public static final String PLUGIN_EVENT_SKILL_REPAIR_WARNING = PLUGIN_FORMS_COMMAND_PREFIX + "Du benötigst mehr" + PLUGIN_COLOR_COMMAND_ARG + " %s " + PLUGIN_COLOR_COMMAND + "um diesen Gegenstand zu reparieren!"; - public static final String PLUGIN_EVENT_SKILL_SALVAGE_DONE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast" + PLUGIN_COLOR_COMMAND_ARG + " %s " + PLUGIN_COLOR_COMMAND + "erhalten!"; + String PLUGIN_EVENT_JOIN_MESSAGE = PLUGIN_COLOR_POSITIVE + "[" + PLUGIN_SYMBOL_BLACK_FOUR_POINTED_STAR + "] " + PLUGIN_COLOR_MESSAGE + "%s" + PLUGIN_COLOR_COMMAND + " hat den Server betreten."; + String PLUGIN_EVENT_QUIT_MESSAGE = PLUGIN_COLOR_NEGATIVE + "[" + PLUGIN_SYMBOL_CROSS_MARK + "] " + PLUGIN_COLOR_MESSAGE + "%s" + PLUGIN_COLOR_COMMAND + " hat den Server verlassen."; + String PLUGIN_EVENT_DEATH = PLUGIN_FORMS_COMMAND_PREFIX + "Du starbst bei " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + PLUGIN_COMMAND_WHERE_STRING + PLUGIN_COLOR_COMMAND; + String PLUGIN_EVENT_DEATH_TP = PLUGIN_FORMS_COMMAND_PREFIX + "Klicke diese Nachricht um dich zum Todespunkt zu teleportieren!"; + + String PLUGIN_EVENT_SKILL_REPAIR_DONE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast den Gegenstand repariert!"; + String PLUGIN_EVENT_SKILL_REPAIR_WARNING = PLUGIN_FORMS_COMMAND_PREFIX + "Du benötigst mehr" + PLUGIN_COLOR_COMMAND_ARG + " %s " + PLUGIN_COLOR_COMMAND + "um diesen Gegenstand zu reparieren!"; + String PLUGIN_EVENT_SKILL_SALVAGE_DONE = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast" + PLUGIN_COLOR_COMMAND_ARG + " %s " + PLUGIN_COLOR_COMMAND + "erhalten!"; - public static final String PLUGIN_EVENT_SKULL_INFO_SPACER = "§8~~~~~~~~~~~~~~~~~~~~~~~"; + String PLUGIN_EVENT_SKULL_INFO_SPACER = "§8~~~~~~~~~~~~~~~~~~~~~~~"; - public static final String PLUGIN_EVENT_NO_DEATH_MESSAGE = "death_%s"; + String PLUGIN_EVENT_NO_DEATH_MESSAGE = "death_%s"; - public static final String PLUGIN_EVENT_PROTECT_RIGHTS = "IDs"; - public static final String PLUGIN_EVENT_PROTECT_FLAGS = "flags"; + String PLUGIN_EVENT_PROTECT_RIGHTS = "IDs"; + String PLUGIN_EVENT_PROTECT_FLAGS = "flags"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_DISALLOW_ADMIN_OVERWRITE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + " Admin Rights Detected Protection was ignored!"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_ALLOW = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + " You're allowed to do this Action!"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_DISALLOW = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + " You're not allowed to do this Action!"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_AUTOCLOSE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_BLACK_LARGE_CIRCLE + PLUGIN_COLOR_COMMAND + " Auto Closed!"; + String PLUGIN_EVENT_PROTECTED_BLOCK_DISALLOW_ADMIN_OVERWRITE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + " Admin Rights Detected Protection was ignored!"; + String PLUGIN_EVENT_PROTECTED_BLOCK_ALLOW = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + " You're allowed to do this Action!"; + String PLUGIN_EVENT_PROTECTED_BLOCK_DISALLOW = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + " You're not allowed to do this Action!"; + String PLUGIN_EVENT_PROTECTED_BLOCK_AUTOCLOSE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_BLACK_LARGE_CIRCLE + PLUGIN_COLOR_COMMAND + " Auto Closed!"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Protection Info:"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_ID = "Protection ID: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_CREATED = "Created: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_UPDATED = "Updated: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_LOCATION = "Location: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "in World " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_ID = "Player ID: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_UUID = "Player UUID: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_NAME = "Player Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_LAST_LOGIN = "Last Login: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_LAST_LOGIN_DATE_FORMAT = "E MMM d y hh:mm:ss a"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_MATERIAL = "Material: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_FLAGS = "Flags: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - public static final String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_RIGHTS = "Rigths: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; - - public static final String PLUGIN_EVENT_PROTECT_BLOCK_ADD = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + " Successful created Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_ADD_CHEST_DENY = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + " Can't create Protection, Doublechest detected!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_REMOVE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + " Successful removed Protection!"; - - public static final String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_ADD = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + "Successful added Flag to Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_ADD_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't add Flag to Protection, Flag already found on Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_REMOVE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Successful removed Flag from Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_REMOVE_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't remove Flag from Protection, Flag not found on Protection!"; - - public static final String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_ADD = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + "Successful added Right to Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_ADD_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't add Right to Protection, Right already found on Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_REMOVE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Successful removed Right from Protection!"; - public static final String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_REMOVE_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't remove Right from Protection, Right not found on Protection!"; - - public static final String PLUGIN_EVENT_TO_MANY_PLAYERS_CANT_JOIN = PLUGIN_COLOR_NEGATIVE + "Der Server ist leider voll"; - - public static final String PLUGIN_EVENT_SIGN_COPY = PLUGIN_FORMS_COMMAND_PREFIX + "Sign Copied"; - public static final String PLUGIN_EVENT_SIGN_COPY_TO_PASTE_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "Click to paste copied Sign"; - public static final String PLUGIN_EVENT_SIGN_PASTE = PLUGIN_FORMS_COMMAND_PREFIX + "Sign Pasted"; - public static final String PLUGIN_EVENT_SIGN_EDIT = PLUGIN_FORMS_COMMAND_PREFIX + "Sign Opened"; - public static final String PLUGIN_EVENT_NPC_BAGS_NO_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_EVENT_NPC_BAGS_NO_BAG_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Error no Bag found"; - - public static final String PLUGIN_EVENT_NPC_BAGS_BOUGHT = PLUGIN_FORMS_COMMAND_PREFIX + "You bought a %s"; - public static final String PLUGIN_EVENT_NPC_BAGS_ALREADY_BOUGHT = PLUGIN_FORMS_COMMAND_PREFIX + "You already Bought a %s"; - - public static final String PLUGIN_EVENT_NPC_BANKER_DEPOIST_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "You have deposited " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " to your Bank Account"; - public static final String PLUGIN_EVENT_NPC_BANKER_DEPOIST_NO_COINS_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY + " to do a transaction"; - public static final String PLUGIN_EVENT_NPC_BANKER_DEPOIST_LIMIT_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "Your Bank Account is full. Consider Upgrading it!"; - public static final String PLUGIN_EVENT_NPC_BANKER_WITHDRAW_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "You have withdrawn " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " from your Bank Account"; - public static final String PLUGIN_EVENT_NPC_BANKER_WITHDRAW_NO_COINS_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY + " to do a transaction"; - - public static final String PLUGIN_EVENT_NPC_BANKER_TRANSACTION = PLUGIN_FORMS_COMMAND_PREFIX + "Your transactions are:"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO = PLUGIN_FORMS_COMMAND_PREFIX + "Protection Info:"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_ID = "Protection ID: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_CREATED = "Created: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_UPDATED = "Updated: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_LOCATION = "Location: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + ", " + PLUGIN_COLOR_COMMAND_ARG + "%s " + PLUGIN_COLOR_COMMAND + "in World " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_ID = "Player ID: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_UUID = "Player UUID: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_NAME = "Player Name: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_LAST_LOGIN = "Last Login: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_LAST_LOGIN_DATE_FORMAT = "E MMM d y hh:mm:ss a"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_MATERIAL = "Material: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_FLAGS = "Flags: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_PROTECTED_BLOCK_INFO_RIGHTS = "Rigths: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + + String PLUGIN_EVENT_PROTECT_BLOCK_ADD = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + " Successful created Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_ADD_CHEST_DENY = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + " Can't create Protection, Doublechest detected!"; + String PLUGIN_EVENT_PROTECT_BLOCK_REMOVE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + " Successful removed Protection!"; + + String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_ADD = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + "Successful added Flag to Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_ADD_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't add Flag to Protection, Flag already found on Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_REMOVE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Successful removed Flag from Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_FLAG_REMOVE_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't remove Flag from Protection, Flag not found on Protection!"; + + String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_ADD = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_CHECK_MARK + PLUGIN_COLOR_COMMAND + "Successful added Right to Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_ADD_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't add Right to Protection, Right already found on Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_REMOVE = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Successful removed Right from Protection!"; + String PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_REMOVE_FAILED = PLUGIN_NAME_PREFIX + PLUGIN_FORMS_SPACER_MESSAGE+ PLUGIN_SYMBOL_HEAVY_MULTIPLICATION_X + PLUGIN_COLOR_COMMAND + "Can't remove Right from Protection, Right not found on Protection!"; + + String PLUGIN_EVENT_TO_MANY_PLAYERS_CANT_JOIN = PLUGIN_COLOR_NEGATIVE + "Der Server ist leider voll"; + + String PLUGIN_EVENT_SIGN_COPY = PLUGIN_FORMS_COMMAND_PREFIX + "Sign Copied"; + String PLUGIN_EVENT_SIGN_COPY_TO_PASTE_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "Click to paste copied Sign"; + String PLUGIN_EVENT_SIGN_PASTE = PLUGIN_FORMS_COMMAND_PREFIX + "Sign Pasted"; + String PLUGIN_EVENT_SIGN_EDIT = PLUGIN_FORMS_COMMAND_PREFIX + "Sign Opened"; + String PLUGIN_EVENT_NPC_BAGS_NO_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY; + String PLUGIN_EVENT_NPC_BAGS_NO_BAG_FOUND = PLUGIN_FORMS_COMMAND_PREFIX + "Error no Bag found"; + + String PLUGIN_EVENT_NPC_BAGS_BOUGHT = PLUGIN_FORMS_COMMAND_PREFIX + "You bought a %s"; + String PLUGIN_EVENT_NPC_BAGS_ALREADY_BOUGHT = PLUGIN_FORMS_COMMAND_PREFIX + "You already Bought a %s"; + + String PLUGIN_EVENT_NPC_BANKER_DEPOIST_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "You have deposited " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " to your Bank Account"; + String PLUGIN_EVENT_NPC_BANKER_DEPOIST_NO_COINS_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY + " to do a transaction"; + String PLUGIN_EVENT_NPC_BANKER_DEPOIST_LIMIT_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "Your Bank Account is full. Consider Upgrading it!"; + String PLUGIN_EVENT_NPC_BANKER_WITHDRAW_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "You have withdrawn " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " from your Bank Account"; + String PLUGIN_EVENT_NPC_BANKER_WITHDRAW_NO_COINS_MESSAGE = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY + " to do a transaction"; + + String PLUGIN_EVENT_NPC_BANKER_TRANSACTION = PLUGIN_FORMS_COMMAND_PREFIX + "Your transactions are:"; - public static final String PLUGIN_EVENT_NPC_BANKER_TRANSACTION_POSITIVE = PLUGIN_SYMBOL_RIGHT_POINTING_ANGLE_BRACKET + PLUGIN_COLOR_MESSAGE; - public static final String PLUGIN_EVENT_NPC_BANKER_TRANSACTION_NEGATIVE = PLUGIN_SYMBOL_LEFT_POINTING_ANGLE_BRACKET + PLUGIN_COLOR_MESSAGE; - public static final String PLUGIN_EVENT_NPC_BANKER_TRANSACTION_LIST = Strings.PLUGIN_FORMS_WHITESPACE_SHORT + "%s Transaction with " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " on %s"; - public static final String PLUGIN_EVENT_NPC_BANKER_TOTAL = PLUGIN_FORMS_COMMAND_PREFIX + "You have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Bank!"; - - public static final String PLUGIN_EVENT_NPC_BUY = PLUGIN_FORMS_COMMAND_PREFIX + "Bought %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You now have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; - public static final String PLUGIN_EVENT_NPC_BUY_NOT_ENOUGH_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "Can't buy %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You only have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; - public static final String PLUGIN_EVENT_NPC_BUY_INVENTORY_FULL = PLUGIN_FORMS_COMMAND_PREFIX + "Can't buy %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You have not enough Inventory Space left!"; - public static final String PLUGIN_EVENT_NPC_BUY_NOT_TRADEABLE = PLUGIN_FORMS_COMMAND_PREFIX + "Can't buy this Item"; - - public static final String PLUGIN_EVENT_NPC_SELL = PLUGIN_FORMS_COMMAND_PREFIX + "Sold %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You now have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; - public static final String PLUGIN_EVENT_NPC_SELL_ENCHANTED = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell enchanted Items!"; - public static final String PLUGIN_EVENT_NPC_SELL_NO_PRICE = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell this Item!"; - public static final String PLUGIN_EVENT_NPC_SELL_RENAMED = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell this Item!"; - public static final String PLUGIN_EVENT_NPC_SELL_USED_ITEM = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell used Item!"; - public static final String PLUGIN_EVENT_BAG_COLLECT = "Added %sx %s to your Bag"; - public static final String PLUGIN_EVENT_NPC_BANKER_OPEN_ACCOUNT_TO_LESS_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "You don't have enough " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "The initial Account costs %sCoins!"; - public static final String PLUGIN_EVENT_NPC_BANKER_OPEN_ACCOUNT = PLUGIN_FORMS_COMMAND_PREFIX + "Welcome to your new Bank Account"; - public static final String PLUGIN_EVENT_PLAYER_DEATH_LOST_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " verloren!"; - public static final String PLUGIN_EVENT_NPC_SPAWN = PLUGIN_FORMS_COMMAND_PREFIX + "A %s " + PLUGIN_COLOR_COMMAND + "NPC was placed!"; - public static final String PLUGIN_EVENT_SIGN_UP_OR_DOWN_NO_END_POINT = PLUGIN_FORMS_COMMAND_PREFIX + "No End Point found! Can't teleport."; - public static final String PLUGIN_EVENT_LIGHTS_TOOGLE = PLUGIN_FORMS_COMMAND_PREFIX + "You toogled the Light"; - public static final String PLUGIN_EVENT_NPC_BANKER_BUY_LOWER_ACCOUNT = PLUGIN_FORMS_COMMAND_PREFIX + "You already have a greater Tier"; - public static final String PLUGIN_EVENT_NPC_BANKER_BUY_ALREADY_BOUGHT = PLUGIN_FORMS_COMMAND_PREFIX + "It's already your Account Tier"; - public static final String PLUGIN_EVENT_NPC_BANKER_BUY_USING_PURSE = PLUGIN_FORMS_COMMAND_PREFIX + "You Bought the Upgrade with your Purse"; - public static final String PLUGIN_EVENT_NPC_BANKER_BUY_USING_BANK = PLUGIN_FORMS_COMMAND_PREFIX + "You Bought the Upgrade with your Bank Account"; - public static final String PLUGIN_EVENT_NPC_BANKER_BUY_USING_BOTH = PLUGIN_FORMS_COMMAND_PREFIX + "You Bought the Upgrade with your Purse and Bank Account"; - public static final String PLUGIN_EVENT_NPC_BANKER_NOT_ENOUGH_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_EVENT_NPC_BANKER_INTEREST = PLUGIN_FORMS_COMMAND_PREFIX + "You earnd " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in interest!"; - - public static final String PLUGIN_EVENT_DAMAGE_SHOW = PLUGIN_FORMS_COMMAND_PREFIX + "Damage: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Last Damage: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Health: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; + String PLUGIN_EVENT_NPC_BANKER_TRANSACTION_POSITIVE = PLUGIN_SYMBOL_RIGHT_POINTING_ANGLE_BRACKET + PLUGIN_COLOR_MESSAGE; + String PLUGIN_EVENT_NPC_BANKER_TRANSACTION_NEGATIVE = PLUGIN_SYMBOL_LEFT_POINTING_ANGLE_BRACKET + PLUGIN_COLOR_MESSAGE; + String PLUGIN_EVENT_NPC_BANKER_TRANSACTION_LIST = Constants.PLUGIN_FORMS_WHITESPACE_SHORT + "%s Transaction with " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " on %s"; + String PLUGIN_EVENT_NPC_BANKER_TOTAL = PLUGIN_FORMS_COMMAND_PREFIX + "You have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Bank!"; + + String PLUGIN_EVENT_NPC_BUY = PLUGIN_FORMS_COMMAND_PREFIX + "Bought %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You now have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; + String PLUGIN_EVENT_NPC_BUY_NOT_ENOUGH_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "Can't buy %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You only have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; + String PLUGIN_EVENT_NPC_BUY_INVENTORY_FULL = PLUGIN_FORMS_COMMAND_PREFIX + "Can't buy %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You have not enough Inventory Space left!"; + String PLUGIN_EVENT_NPC_BUY_NOT_TRADEABLE = PLUGIN_FORMS_COMMAND_PREFIX + "Can't buy this Item"; + + String PLUGIN_EVENT_NPC_SELL = PLUGIN_FORMS_COMMAND_PREFIX + "Sold %s for " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "You now have " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in your Purse!"; + String PLUGIN_EVENT_NPC_SELL_ENCHANTED = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell enchanted Items!"; + String PLUGIN_EVENT_NPC_SELL_NO_PRICE = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell this Item!"; + String PLUGIN_EVENT_NPC_SELL_RENAMED = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell this Item!"; + String PLUGIN_EVENT_NPC_SELL_USED_ITEM = PLUGIN_FORMS_COMMAND_PREFIX + "You can't sell used Item!"; + String PLUGIN_EVENT_BAG_COLLECT = "Added %sx %s to your Bag"; + String PLUGIN_EVENT_NPC_BANKER_OPEN_ACCOUNT_TO_LESS_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "You don't have enough " + PLUGIN_NAME_MONEY + "." + PLUGIN_EOL + PLUGIN_FORMS_WHITESPACE_SHORT + "The initial Account costs %sCoins!"; + String PLUGIN_EVENT_NPC_BANKER_OPEN_ACCOUNT = PLUGIN_FORMS_COMMAND_PREFIX + "Welcome to your new Bank Account"; + String PLUGIN_EVENT_PLAYER_DEATH_LOST_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "Du hast " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " verloren!"; + String PLUGIN_EVENT_NPC_SPAWN = PLUGIN_FORMS_COMMAND_PREFIX + "A %s " + PLUGIN_COLOR_COMMAND + "NPC was placed!"; + String PLUGIN_EVENT_SIGN_UP_OR_DOWN_NO_END_POINT = PLUGIN_FORMS_COMMAND_PREFIX + "No End Point found! Can't teleport."; + String PLUGIN_EVENT_LIGHTS_TOOGLE = PLUGIN_FORMS_COMMAND_PREFIX + "You toogled the Light"; + String PLUGIN_EVENT_NPC_BANKER_BUY_LOWER_ACCOUNT = PLUGIN_FORMS_COMMAND_PREFIX + "You already have a greater Tier"; + String PLUGIN_EVENT_NPC_BANKER_BUY_ALREADY_BOUGHT = PLUGIN_FORMS_COMMAND_PREFIX + "It's already your Account Tier"; + String PLUGIN_EVENT_NPC_BANKER_BUY_USING_PURSE = PLUGIN_FORMS_COMMAND_PREFIX + "You Bought the Upgrade with your Purse"; + String PLUGIN_EVENT_NPC_BANKER_BUY_USING_BANK = PLUGIN_FORMS_COMMAND_PREFIX + "You Bought the Upgrade with your Bank Account"; + String PLUGIN_EVENT_NPC_BANKER_BUY_USING_BOTH = PLUGIN_FORMS_COMMAND_PREFIX + "You Bought the Upgrade with your Purse and Bank Account"; + String PLUGIN_EVENT_NPC_BANKER_NOT_ENOUGH_COINS = PLUGIN_FORMS_COMMAND_PREFIX + "To less " + PLUGIN_NAME_MONEY; + String PLUGIN_EVENT_NPC_BANKER_INTEREST = PLUGIN_FORMS_COMMAND_PREFIX + "You earnd " + PLUGIN_COLOR_MONEY + "%s " + PLUGIN_NAME_MONEY + " in interest!"; + + String PLUGIN_EVENT_DAMAGE_SHOW = PLUGIN_FORMS_COMMAND_PREFIX + "Damage: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Last Damage: " + PLUGIN_COLOR_COMMAND_ARG + "%s" + PLUGIN_COLOR_COMMAND + " Health: " + PLUGIN_COLOR_COMMAND_ARG + "%s"; } \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ExceptionConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ExceptionConstants.java index 5ad6525d..6c089587 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ExceptionConstants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ExceptionConstants.java @@ -1,7 +1,5 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -import de.relluem94.minecraft.server.spigot.essentials.Strings; - /** * * @author rellu @@ -9,7 +7,7 @@ public class ExceptionConstants { private ExceptionConstants() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } //==============================================================================// diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ItemConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ItemConstants.java index 1e6954e5..533e9d38 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ItemConstants.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/ItemConstants.java @@ -1,90 +1,85 @@ package de.relluem94.minecraft.server.spigot.essentials.constants; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_MONEY; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_MONEY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_MONEY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_MONEY; import org.bukkit.NamespacedKey; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; /** * * @author rellu */ -public class ItemConstants { - - private ItemConstants() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); - } +public interface ItemConstants { //==============================================================================// // ITEM STUFF // //==============================================================================// - public static final String PLUGIN_ITEM_NAMESPACE_CLOUD_BOOTS = "cloud_boots"; + String PLUGIN_ITEM_NAMESPACE_CLOUD_BOOTS = "cloud_boots"; - public static final String PLUGIN_ITEM_RELLU_HELMET = "§6Rellu's Helmet"; - public static final String PLUGIN_ITEM_RELLU_CHESTPLATE = "§3Rellu's Chestplate"; - public static final String PLUGIN_ITEM_RELLU_LEGGINGS = "§aRellu's Leggings"; - public static final String PLUGIN_ITEM_RELLU_BOOTS = "§cRellu's Boots"; - public static final String PLUGIN_ITEM_RELLU_SWORD = "§eRellu's Sword"; - public static final String PLUGIN_ITEM_RELLU_SHIELD = "§5Rellu's Shield"; - public static final String PLUGIN_ITEM_RELLU_PICKAXE = "§eRellu's Pickaxe"; + String PLUGIN_ITEM_RELLU_HELMET = "§6Rellu's Helmet"; + String PLUGIN_ITEM_RELLU_CHESTPLATE = "§3Rellu's Chestplate"; + String PLUGIN_ITEM_RELLU_LEGGINGS = "§aRellu's Leggings"; + String PLUGIN_ITEM_RELLU_BOOTS = "§cRellu's Boots"; + String PLUGIN_ITEM_RELLU_SWORD = "§eRellu's Sword"; + String PLUGIN_ITEM_RELLU_SHIELD = "§5Rellu's Shield"; + String PLUGIN_ITEM_RELLU_PICKAXE = "§eRellu's Pickaxe"; - public static final String PLUGIN_ITEM_GRAPPLINGHOCK = "§cGrappling Hook"; - public static final String PLUGIN_ITEM_WORLDSELECTOR = "§eWorld Selector"; + String PLUGIN_ITEM_AUTOSELLHOPER = PLUGIN_COLOR_MONEY + "\uD835\uDE3C\uD835\uDE6A\uD835\uDE69\uD835\uDE64 \uD835\uDE4E\uD835\uDE5A\uD835\uDE61\uD835\uDE61 \uD835\uDE43\uD835\uDE64\uD835\uDE65\uD835\uDE65\uD835\uDE5A\uD835\uDE67"; + String PLUGIN_ITEM_GRAPPLINGHOCK = "§cGrappling Hook"; + String PLUGIN_ITEM_WORLDSELECTOR = "§eWorld Selector"; - public static final String PLUGIN_ITEM_INGREDIENT = "§4§l§oThis is a crafting ingredient"; + String PLUGIN_ITEM_INGREDIENT = "§4§l§oThis is a crafting ingredient"; - public static final String PLUGIN_ITEM_CLOUDBOOTS = "§bCloud Boots"; - public static final String PLUGIN_ITEM_CLOUDBOOTS_LORE1 = "§bGrants gliding abillity if worn."; - public static final String PLUGIN_ITEM_CLOUDBOOTS_LORE2 = "§bAlso reduces Fall Damage by 100%"; - public static final String PLUGIN_ITEM_CLOUDSAILOR = "§bCloud Sailor"; - public static final String PLUGIN_ITEM_CLOUDSAILOR_LORE1 = "§bHeld in Off Hand grants gliding abillity."; - public static final String PLUGIN_ITEM_CLOUDSAILOR_LORE2 = "§bAlso reduces Fall Damage by 50%"; + String PLUGIN_ITEM_CLOUDBOOTS = "§bCloud Boots"; + String PLUGIN_ITEM_CLOUDBOOTS_LORE1 = "§bGrants gliding abillity if worn."; + String PLUGIN_ITEM_CLOUDBOOTS_LORE2 = "§bAlso reduces Fall Damage by 100%"; + String PLUGIN_ITEM_CLOUDSAILOR = "§bCloud Sailor"; + String PLUGIN_ITEM_CLOUDSAILOR_LORE1 = "§bHeld in Off Hand grants gliding abillity."; + String PLUGIN_ITEM_CLOUDSAILOR_LORE2 = "§bAlso reduces Fall Damage by 50%"; - public static final String PLUGIN_ITEM_NPC_BAGSALESMAN = "§dBag Salesman"; + String PLUGIN_ITEM_NPC_BAGSALESMAN = "§dBag Salesman"; - public static final String PLUGIN_ITEM_NPC_BANKER_COLOR = "§d"; + String PLUGIN_ITEM_NPC_BANKER_COLOR = "§d"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT = PLUGIN_ITEM_NPC_BANKER_COLOR + "Deposit " + PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT = PLUGIN_ITEM_NPC_BANKER_COLOR + "Deposit " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_ALL = PLUGIN_ITEM_NPC_BANKER_COLOR + "Deposit all " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_X_PERCENT = PLUGIN_ITEM_NPC_BANKER_COLOR + "Deposit " + PLUGIN_COLOR_MONEY + "%s" + PLUGIN_ITEM_NPC_BANKER_COLOR + " percent of " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_AMOUNT_LORE1 = "Click to deposit"; + String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_ALL = PLUGIN_ITEM_NPC_BANKER_COLOR + "Deposit all " + PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_X_PERCENT = PLUGIN_ITEM_NPC_BANKER_COLOR + "Deposit " + PLUGIN_COLOR_MONEY + "%s" + PLUGIN_ITEM_NPC_BANKER_COLOR + " percent of " + PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_AMOUNT_LORE1 = "Click to deposit"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_ALL = PLUGIN_ITEM_NPC_BANKER_COLOR + "Withdraw all " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_X_PERCENT = PLUGIN_ITEM_NPC_BANKER_COLOR + "Withdraw " + PLUGIN_COLOR_MONEY + "%s" + PLUGIN_ITEM_NPC_BANKER_COLOR + " percent of " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_AMOUNT_LORE1 = "Click to withdraw"; + String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_ALL = PLUGIN_ITEM_NPC_BANKER_COLOR + "Withdraw all " + PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_X_PERCENT = PLUGIN_ITEM_NPC_BANKER_COLOR + "Withdraw " + PLUGIN_COLOR_MONEY + "%s" + PLUGIN_ITEM_NPC_BANKER_COLOR + " percent of " + PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_AMOUNT_LORE1 = "Click to withdraw"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_LORE1 = "Click to open"; + String PLUGIN_ITEM_NPC_BANKER_GUI_DEPOSIT_LORE1 = "Click to open"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW = PLUGIN_ITEM_NPC_BANKER_COLOR + "Withdraw " + PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_LORE1 = "Click to open"; + String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW = PLUGIN_ITEM_NPC_BANKER_COLOR + "Withdraw " + PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_NPC_BANKER_GUI_WITHDRAW_LORE1 = "Click to open"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE = PLUGIN_ITEM_NPC_BANKER_COLOR + "Show Balance"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE_LORE1 = "Click to open"; + String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE = PLUGIN_ITEM_NPC_BANKER_COLOR + "Show Balance"; + String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE_LORE1 = "Click to open"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE_TOTAL = PLUGIN_ITEM_NPC_BANKER_COLOR + "Click to get your Balance"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE_TRANSACTIONS = PLUGIN_ITEM_NPC_BANKER_COLOR + "Click to get your last Transactions"; + String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE_TOTAL = PLUGIN_ITEM_NPC_BANKER_COLOR + "Click to get your Balance"; + String PLUGIN_ITEM_NPC_BANKER_GUI_BALANCE_TRANSACTIONS = PLUGIN_ITEM_NPC_BANKER_COLOR + "Click to get your last Transactions"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_UPGRADE = PLUGIN_ITEM_NPC_BANKER_COLOR + "Upgrade Account"; - public static final String PLUGIN_ITEM_NPC_BANKER_GUI_UPGRADE_LORE1 = "Click to open"; + String PLUGIN_ITEM_NPC_BANKER_GUI_UPGRADE = PLUGIN_ITEM_NPC_BANKER_COLOR + "Upgrade Account"; + String PLUGIN_ITEM_NPC_BANKER_GUI_UPGRADE_LORE1 = "Click to open"; - public static final String PLUGIN_ITEM_NPC_BANKER_PORTABLE_BANK = PLUGIN_ITEM_NPC_BANKER_COLOR + "Portable Bank"; - public static final String PLUGIN_ITEM_NPC_BANKER_PORTABLE_BANK_LORE1 = PLUGIN_ITEM_NPC_BANKER_COLOR + "Opens the Bank Menu"; + String PLUGIN_ITEM_NPC_BANKER_PORTABLE_BANK = PLUGIN_ITEM_NPC_BANKER_COLOR + "Portable Bank"; + String PLUGIN_ITEM_NPC_BANKER_PORTABLE_BANK_LORE1 = PLUGIN_ITEM_NPC_BANKER_COLOR + "Opens the Bank Menu"; - public static final String PLUGIN_ITEM_COINS = Strings.PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_COINS_LORE = Strings.PLUGIN_COLOR_MONEY + "%s " + Strings.PLUGIN_NAME_MONEY; - public static final NamespacedKey PLUGIN_ITEM_COINS_NAMESPACE = new NamespacedKey(RelluEssentials.getInstance(), "coins"); + String PLUGIN_ITEM_COINS = Constants.PLUGIN_NAME_MONEY; + String PLUGIN_ITEM_COINS_LORE = Constants.PLUGIN_COLOR_MONEY + "%s " + Constants.PLUGIN_NAME_MONEY; - public static final String PLUGIN_ITEM_NPC_LORE1 = "§7Click to Spawn"; + String PLUGIN_ITEM_NPC_LORE1 = "§7Click to Spawn"; - public static final String PLUGIN_ITEM_MAGIC_WATER_BUCKET = "§dMagic Water Bucket"; - public static final String PLUGIN_ITEM_MAGIC_WATER_BUCKET_LORE = "§7Refills immediately"; + String PLUGIN_ITEM_MAGIC_WATER_BUCKET = "§dMagic Water Bucket"; + String PLUGIN_ITEM_MAGIC_WATER_BUCKET_LORE = "§7Refills immediately"; } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/NamespacedKeyConstants.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/NamespacedKeyConstants.java new file mode 100644 index 00000000..ef7f046c --- /dev/null +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/constants/NamespacedKeyConstants.java @@ -0,0 +1,12 @@ +package de.relluem94.minecraft.server.spigot.essentials.constants; + +import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; +import org.bukkit.NamespacedKey; + +public interface NamespacedKeyConstants { + NamespacedKey itemCoins = new NamespacedKey(RelluEssentials.getInstance(), "coins"); + + NamespacedKey itemSellPrice = new NamespacedKey(RelluEssentials.getInstance(), "itemSellPrice"); + NamespacedKey itemBuyPrice = new NamespacedKey(RelluEssentials.getInstance(), "itemBuyPrice"); + +} diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterBags.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterBags.java index 247ce8ec..e1964f4f 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterBags.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterBags.java @@ -27,8 +27,7 @@ import de.relluem94.minecraft.server.spigot.essentials.CustomEnchants; import de.relluem94.minecraft.server.spigot.essentials.CustomItems; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; -import de.relluem94.minecraft.server.spigot.essentials.constants.ItemConstants; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.helpers.BagHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.EnchantmentHelper; @@ -38,6 +37,9 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.BagTypeEntry; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; import de.relluem94.rellulib.stores.DoubleStore; + +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemCoins; + public class BetterBags implements Listener { @EventHandler @@ -208,7 +210,7 @@ public void onBlockDrop(BlockDropItemEvent e) { @EventHandler public void onInventoryClickItem(InventoryClickEvent e) { if(e.getWhoClicked() instanceof Player p && e.getCurrentItem() != null){ - if (e.getView().getTitle().startsWith(Strings.PLUGIN_NAME_PREFIX + Strings.PLUGIN_FORMS_SPACER_MESSAGE) && e.getView().getTitle().endsWith(" Bag")) { + if (e.getView().getTitle().startsWith(Constants.PLUGIN_NAME_PREFIX + Constants.PLUGIN_FORMS_SPACER_MESSAGE) && e.getView().getTitle().endsWith(" Bag")) { PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p); BagTypeEntry bte = BagHelper.getBagTypeByName(e.getView().getTitle()); @@ -324,15 +326,15 @@ public void onItemCollect(EntityPickupItemEvent e) { if(CustomItems.coins.almostEquals(is)){ ItemMeta im = is.getItemMeta(); - if(im != null && im.getPersistentDataContainer().has(ItemConstants.PLUGIN_ITEM_COINS_NAMESPACE, PersistentDataType.INTEGER)){ - int coins = im.getPersistentDataContainer().get(ItemConstants.PLUGIN_ITEM_COINS_NAMESPACE, PersistentDataType.INTEGER) * is.getAmount(); - ChatHelper.sendMessageInActionBar(p, String.format(Strings.PLUGIN_COMMAND_PURSE_GAIN, StringHelper.formatInt(coins), StringHelper.formatDouble(pe.getPurse() + coins))); + if(im != null && im.getPersistentDataContainer().has(itemCoins, PersistentDataType.INTEGER)){ + int coins = im.getPersistentDataContainer().get(itemCoins, PersistentDataType.INTEGER) * is.getAmount(); + ChatHelper.sendMessageInActionBar(p, String.format(Constants.PLUGIN_COMMAND_PURSE_GAIN, StringHelper.formatInt(coins), StringHelper.formatDouble(pe.getPurse() + coins))); pe.setPurse(pe.getPurse() + coins); p.playSound(p, Sound.ITEM_ARMOR_EQUIP_GOLD, SoundCategory.PLAYERS, 1F, 1); pe.setUpdatedBy(pe.getId()); - pe.setHasToBeUpdated(false); + pe.setHasToBeUpdated(true); e.getItem().getItemStack().setAmount(0); e.setCancelled(true); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterChatFormat.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterChatFormat.java index 2dd6f3c5..64b98917 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterChatFormat.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterChatFormat.java @@ -7,7 +7,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessageInChannel; import static de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper.replaceColor; import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterLock.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterLock.java index 2c7e3ec7..c85080d0 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterLock.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterLock.java @@ -30,21 +30,18 @@ import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.PLUGIN_EVENT_PROTECT_BLOCK_RIGHT_REMOVE_FAILED; import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.PLUGIN_EVENT_PROTECT_FLAGS; import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.PLUGIN_EVENT_PROTECT_RIGHTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.ItemConstants.PLUGIN_ITEM_AUTOSELLHOPER; +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemCoins; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.Nameable; import org.bukkit.OfflinePlayer; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; -import org.bukkit.block.DoubleChest; +import org.bukkit.block.*; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Openable; import org.bukkit.block.data.type.Chest; @@ -72,13 +69,21 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.persistence.PersistentDataType; +import org.bukkit.scheduler.BukkitRunnable; import org.json.JSONArray; import org.json.JSONObject; +import de.relluem94.minecraft.server.spigot.essentials.CustomItems; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; +import de.relluem94.minecraft.server.spigot.essentials.constants.ItemConstants; +import de.relluem94.minecraft.server.spigot.essentials.constants.ItemPrice; import de.relluem94.minecraft.server.spigot.essentials.constants.PlayerState; import de.relluem94.minecraft.server.spigot.essentials.constants.ProtectionFlags; import de.relluem94.minecraft.server.spigot.essentials.helpers.ProtectionHelper; +import de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.LocationEntry; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.LocationTypeEntry; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; @@ -104,14 +109,14 @@ public void onWaterMove(BlockFromToEvent e) { } } - private boolean handleMoveItemEvent(Inventory inventory) { + private boolean handleMoveItemEvent(Inventory inventory, ItemStack is, boolean isSource) { Location location; InventoryHolder holder; if(inventory != null){ holder = inventory.getHolder(); - + if(inventory.getType().equals(InventoryType.HOPPER)){ - return false; + return sellItem(inventory, is, isSource, ((Hopper) Objects.requireNonNull(holder)).getLocation()); } try { @@ -139,6 +144,56 @@ private boolean handleMoveItemEvent(Inventory inventory) { } } + private static boolean sellItem(Inventory inventory, ItemStack is, boolean isSource, Location location) { + BlockState state = location.getBlock().getState(); + if((state instanceof Nameable)) { + String name = ((Nameable)state).getCustomName(); + + if(name != null && name.contains(PLUGIN_ITEM_AUTOSELLHOPER)){ + int sellPriceItem = ItemPrice.valueOf(is.getType().name()).getSellPrice() * is.getAmount(); + + int size = 0; + for(ItemStack itemStack : inventory.getStorageContents()){ + if(itemStack == null){ + continue; + } + + if(!itemStack.getType().equals(Material.AIR)){ + size++; + } + } + + if(CustomItems.coins.almostEquals(is) || sellPriceItem == 0){ + return false; + } + + + if(!isSource && (inventory.firstEmpty() != -1 && size < 4)){ + ItemStack coin = CustomItems.coins.getCustomItem(); + ItemMeta im = coin.getItemMeta(); + Objects.requireNonNull(im).setLore(Collections.singletonList(String.format(ItemConstants.PLUGIN_ITEM_COINS_LORE, StringHelper.formatInt(sellPriceItem)))); + im.getPersistentDataContainer().set(itemCoins, PersistentDataType.INTEGER, sellPriceItem); + + coin.setItemMeta(im); + + inventory.addItem(coin); + + new BukkitRunnable() { + @Override + public void run() { + inventory.remove(is); + } + }.runTaskLater(RelluEssentials.getInstance(), 1L); + return false; + } + else{ + return true; + } + } + } + return false; + } + private boolean removeProtectionFromBlock(Player p , Block b){ PlayerEntry pe = RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p); if(ProtectionHelper.isLockAble(b)){ @@ -423,7 +478,7 @@ else if(pe.getPlayerState().equals(PlayerState.PROTECTION_INFO)){ p.sendMessage(String.format(PLUGIN_EVENT_PROTECTED_BLOCK_INFO_ID, pre.getId())); p.sendMessage(String.format(PLUGIN_EVENT_PROTECTED_BLOCK_INFO_CREATED, pre.getCreated())); p.sendMessage(String.format(PLUGIN_EVENT_PROTECTED_BLOCK_INFO_UPDATED, pre.getUpdated())); - p.sendMessage(String.format(PLUGIN_EVENT_PROTECTED_BLOCK_INFO_LOCATION, loc.getX(), loc.getY(), loc.getZ(), loc.getWorld().getName())); + p.sendMessage(String.format(PLUGIN_EVENT_PROTECTED_BLOCK_INFO_LOCATION, loc.getX(), loc.getY(), loc.getZ(), Objects.requireNonNull(loc.getWorld()).getName())); p.sendMessage(String.format(PLUGIN_EVENT_PROTECTED_BLOCK_INFO_PLAYER_ID, pre.getLocationEntry().getPlayerId())); @@ -521,7 +576,7 @@ else if(pe.getPlayerState().equals(PlayerState.PROTECTION_FLAG_ADD)){ } else{ JSONObject flags = new JSONObject(); - if(b.getType().equals(Material.LEVER) || b.getType().equals(Material.IRON_DOOR)){ + if(Objects.requireNonNull(b).getType().equals(Material.LEVER) || b.getType().equals(Material.IRON_DOOR)){ String[] flag = {ProtectionFlags.ALLOW_REDSTONE.getName(),ProtectionFlags.valueOf(((String)pe.getPlayerStateParameter()).toUpperCase()).getName()}; flags.put(PLUGIN_EVENT_PROTECT_FLAGS, flag); } @@ -793,9 +848,6 @@ else if(ProtectionHelper.isLockAble(b)){ e.getPlayer().sendMessage(PLUGIN_EVENT_PROTECTED_BLOCK_ALLOW); } } - else{ - //Unprotected Block - } } } } @@ -803,7 +855,7 @@ else if(ProtectionHelper.isLockAble(b)){ @EventHandler(ignoreCancelled = true) public void onMoveItem(InventoryMoveItemEvent e) { - if (handleMoveItemEvent(e.getSource()) || handleMoveItemEvent(e.getDestination())){ + if (handleMoveItemEvent(e.getSource(), e.getItem(), true) || handleMoveItemEvent(e.getDestination(), e.getItem(), false)){ e.setCancelled(true); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterMobs.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterMobs.java index 2a512e76..cb9fc161 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterMobs.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterMobs.java @@ -16,7 +16,7 @@ import de.relluem94.minecraft.server.spigot.essentials.CustomEnchants; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.EntityCoins; import de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants; import de.relluem94.minecraft.server.spigot.essentials.constants.PlayerState; @@ -66,7 +66,7 @@ public void onDeath(EntityDeathEvent e) { pe.setPurse(pe.getPurse() + coinsPerDeath); pe.setUpdatedBy(pe.getId()); pe.setHasToBeUpdated(true); - ChatHelper.sendMessageInActionBar(p, String.format(Strings.PLUGIN_COMMAND_PURSE_GAIN, coinsPerDeath, StringHelper.formatDouble(pe.getPurse()))); + ChatHelper.sendMessageInActionBar(p, String.format(Constants.PLUGIN_COMMAND_PURSE_GAIN, coinsPerDeath, StringHelper.formatDouble(pe.getPurse()))); if(BagHelper.hasBags(pe.getId())){ diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterNPC.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterNPC.java index 59fa5c6c..6381d3ef 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterNPC.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterNPC.java @@ -21,11 +21,12 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; +import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; import de.relluem94.minecraft.server.spigot.essentials.CustomItems; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.commands.Worlds; import de.relluem94.minecraft.server.spigot.essentials.constants.CustomHeads; import de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants; @@ -43,6 +44,10 @@ import de.relluem94.minecraft.server.spigot.essentials.items.WorldSelector; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; +import org.bukkit.persistence.PersistentDataType; + +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemBuyPrice; +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemSellPrice; public class BetterNPC implements Listener { @@ -123,8 +128,7 @@ private void trade(ItemStack is, Inventory inv, Player p, PlayerEntry pe, int sl InventoryHelper.closeInventory(p); } else if(CustomItems.npc_gui_disabled.equalsExact(is)){ - return; - // DISABLED DOES NOTHING. COULD BE AN EASTER EGG! + p.playSound(p.getLocation(), Sound.ENTITY_CHICKEN_STEP, 1f, 1f); } else if(is.getType().equals(Material.PLAYER_HEAD) && is.getItemMeta() instanceof SkullMeta && ((SkullMeta) is.getItemMeta()).getOwnerProfile() != null && ((SkullMeta) is.getItemMeta()).getOwnerProfile().getName().equals(CustomHeads.BAG.getName()) ){ BagTypeEntry bt = null; @@ -164,9 +168,32 @@ else if(is.getType().equals(Material.PLAYER_HEAD) && is.getItemMeta() instanceof else{ String item = is.getType().name(); String itemDisplayname = item.toLowerCase().replace('_', ' '); + + ItemMeta itemMeta = is.getItemMeta(); + + if(itemMeta == null){ + return; + } + + int buyPricePerItem; + int sellPricePerItem; + + if(itemMeta.getPersistentDataContainer().has(itemSellPrice, PersistentDataType.INTEGER)){ + sellPricePerItem = itemMeta.getPersistentDataContainer().get(itemSellPrice, PersistentDataType.INTEGER); + } + else{ + sellPricePerItem = ItemPrice.valueOf(item).getSellPrice(); + } + + if(itemMeta.getPersistentDataContainer().has(itemBuyPrice, PersistentDataType.INTEGER)){ + buyPricePerItem = itemMeta.getPersistentDataContainer().get(itemBuyPrice, PersistentDataType.INTEGER); + } + else{ + buyPricePerItem = ItemPrice.valueOf(item).getBuyPrice(); + } + int amountOfItem = is.getAmount(); - int buyPricePerItem = ItemPrice.valueOf(item).getBuyPrice(); - int sellPricePerItem = ItemPrice.valueOf(item).getSellPrice(); + if(inv.getType().equals(InventoryType.CHEST)){ @@ -180,8 +207,8 @@ else if(is.getType().equals(Material.PLAYER_HEAD) && is.getItemMeta() instanceof if(buyPricePerItem > 0){ if(pe.getPurse() - buyPricePerItem * amountOfItem >= 0){ if(p.getInventory().firstEmpty() != -1){ - p.getInventory().addItem(itemStack); - p.updateInventory(); + p.getInventory().addItem(new ItemStack(itemStack.getType(), amountOfItem)); + //p.updateInventory(); pe.setPurse(pe.getPurse() - coins); pe.setUpdatedBy(pe.getId()); @@ -333,8 +360,8 @@ else if(RelluEssentials.getInstance().getNpcAPI().getNPCTraderTitleList().contai e.setCancelled(true); } else if( - e.getView().getTitle().equals(Strings.PLUGIN_NAME_PREFIX + Strings.PLUGIN_FORMS_SPACER_MESSAGE+"§dNPCs") || - e.getView().getTitle().equals(Strings.PLUGIN_COMMAND_CUSTOMHEADS_TITLE) + e.getView().getTitle().equals(Constants.PLUGIN_NAME_PREFIX + Constants.PLUGIN_FORMS_SPACER_MESSAGE+"§dNPCs") || + e.getView().getTitle().equals(Constants.PLUGIN_COMMAND_CUSTOMHEADS_TITLE) ){ if(!e.getCurrentItem().equals(CustomItems.npc_gui_disabled.getCustomItem())){ p.getInventory().addItem(e.getCurrentItem().clone()); @@ -343,7 +370,7 @@ else if( e.setCancelled(true); } else if( - e.getView().getTitle().equals(Strings.PLUGIN_NAME_PREFIX + Strings.PLUGIN_FORMS_SPACER_MESSAGE+"§dWorlds") + e.getView().getTitle().equals(Constants.PLUGIN_NAME_PREFIX + Constants.PLUGIN_FORMS_SPACER_MESSAGE+"§dWorlds") ){ if(!e.getCurrentItem().equals(CustomItems.npc_gui_disabled.getCustomItem())){ String worldName = e.getCurrentItem().getItemMeta().getDisplayName(); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerJoin.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerJoin.java index 846cdef4..f8e3bb00 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerJoin.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerJoin.java @@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerLoginEvent; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants; import de.relluem94.minecraft.server.spigot.essentials.helpers.BankerHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; @@ -68,7 +68,7 @@ public void onJoin(PlayerJoinEvent e) { BankerHelper.doInterest(e.getPlayer()); - if(WorldHelper.isInWorld(p,Strings.PLUGIN_WORLD_LOBBY)){ + if(WorldHelper.isInWorld(p, Constants.PLUGIN_WORLD_LOBBY)){ PlayerHelper.setLobbyItems(p); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerQuit.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerQuit.java index 205d8b18..ea1dffe6 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerQuit.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterPlayerQuit.java @@ -8,7 +8,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.commands.Sudo; import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; import de.relluem94.minecraft.server.spigot.essentials.managers.SudoManager; @@ -30,6 +30,6 @@ public void onLeave(PlayerQuitEvent e) { PlayerHelper.savePlayer(p); Bukkit.broadcastMessage(String.format(PLUGIN_EVENT_QUIT_MESSAGE, p.getCustomName())); - p.teleport(Objects.requireNonNull(Bukkit.getWorld(Strings.PLUGIN_WORLD_LOBBY)).getSpawnLocation()); + p.teleport(Objects.requireNonNull(Bukkit.getWorld(Constants.PLUGIN_WORLD_LOBBY)).getSpawnLocation()); } } \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSavety.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSavety.java index ab368f8f..bcfecec4 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSavety.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSavety.java @@ -1,6 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials.events; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_PERMISSION_MISSING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_PERMISSION_MISSING; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSoil.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSoil.java index e2d51192..9aacd6fb 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSoil.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterSoil.java @@ -2,7 +2,6 @@ import java.util.List; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -21,7 +20,6 @@ import de.relluem94.minecraft.server.spigot.essentials.helpers.BagHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.EnchantmentHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; -import org.bukkit.scheduler.BukkitRunnable; /* Better Call Soil */ public class BetterSoil implements Listener { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterWorlds.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterWorlds.java index cbf3115b..7f840abb 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterWorlds.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterWorlds.java @@ -5,7 +5,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerChangedWorldEvent; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.helpers.PlayerHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.WorldHelper; @@ -19,7 +19,7 @@ public void onWorldChange(PlayerChangedWorldEvent e){ WorldHelper.loadWorldGroupInventory(p); - if(WorldHelper.isInWorld(p,Strings.PLUGIN_WORLD_LOBBY)){ + if(WorldHelper.isInWorld(p, Constants.PLUGIN_WORLD_LOBBY)){ PlayerHelper.setLobbyItems(p); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BlockPlace.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BlockPlace.java index 13627098..01aef3ff 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BlockPlace.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BlockPlace.java @@ -5,7 +5,7 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.permissions.Groups; import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; @@ -17,7 +17,7 @@ public class BlockPlace implements Listener { @EventHandler public void placeBlocks(BlockPlaceEvent e) { - if(e.getBlock().getWorld().getName().equals(Strings.PLUGIN_WORLD_LOBBY)){ + if(e.getBlock().getWorld().getName().equals(Constants.PLUGIN_WORLD_LOBBY)){ e.setCancelled(!Permission.isAuthorized(e.getPlayer(), Groups.getGroup("mod").getId())); } // has to be reimplemented @@ -25,7 +25,7 @@ public void placeBlocks(BlockPlaceEvent e) { @EventHandler public void breakBlocks(BlockBreakEvent e) { - if(e.getBlock().getWorld().getName().equals(Strings.PLUGIN_WORLD_LOBBY)){ + if(e.getBlock().getWorld().getName().equals(Constants.PLUGIN_WORLD_LOBBY)){ e.setCancelled(!Permission.isAuthorized(e.getPlayer(), Groups.getGroup("mod").getId())); } // has to be reimplemented diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/GrapplingHockEvent.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/GrapplingHockEvent.java index 48821f81..d640779b 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/GrapplingHockEvent.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/GrapplingHockEvent.java @@ -13,7 +13,7 @@ import org.bukkit.util.Vector; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; public class GrapplingHockEvent implements Listener { @@ -43,7 +43,7 @@ public void run() { }.runTaskLater(RelluEssentials.getInstance(), 50L); } else{ - e.getPlayer().sendMessage(Strings.PLUGIN_GRAPPLINGHOOK_COOLDOWN); + e.getPlayer().sendMessage(Constants.PLUGIN_GRAPPLING_HOOK_COOLDOWN); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/NoDeathMessage.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/NoDeathMessage.java index b016795c..219647f1 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/NoDeathMessage.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/NoDeathMessage.java @@ -3,6 +3,7 @@ import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.PLUGIN_EVENT_DEATH; import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.PLUGIN_EVENT_DEATH_TP; import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.PLUGIN_EVENT_NO_DEATH_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.NamespacedKeyConstants.itemCoins; import java.util.Random; @@ -58,7 +59,7 @@ public void onDeath(PlayerDeathEvent e) { } for(ItemStack is : p.getInventory().getContents()){ - if(CustomItems.coins.almostEquals(is) && is.getItemMeta().getPersistentDataContainer().has(ItemConstants.PLUGIN_ITEM_COINS_NAMESPACE, PersistentDataType.INTEGER)){ + if(CustomItems.coins.almostEquals(is) && is.getItemMeta().getPersistentDataContainer().has(itemCoins, PersistentDataType.INTEGER)){ p.getInventory().remove(is); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/PlayerMove.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/PlayerMove.java index bd7eb07c..1fc54da3 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/PlayerMove.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/PlayerMove.java @@ -12,7 +12,7 @@ import org.bukkit.util.Vector; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; /** * @@ -23,14 +23,13 @@ public class PlayerMove implements Listener { @EventHandler public void onMove(PlayerMoveEvent e) { Player p = e.getPlayer(); - - if(p.getWorld().getName().equals(Strings.PLUGIN_WORLD_LOBBY)){ - if(e.getTo().clone().add(0, -1, 0).getBlock().getType().equals(Material.MYCELIUM)){ - if(p.isSneaking()){ + + if (p.getWorld().getName().equals(Constants.PLUGIN_WORLD_LOBBY)) { + if (e.getTo().clone().add(0, -1, 0).getBlock().getType().equals(Material.MYCELIUM)) { + if (p.isSneaking()) { p.getWorld().playEffect(p.getLocation(), Effect.BAT_TAKEOFF, 5); - p.getWorld().playSound(p.getLocation(), Sound.ENTITY_CHICKEN_STEP, 1F, 0F); - } - else{ + p.getWorld().playSound(p.getLocation(), Sound.ENTITY_CHICKEN_STEP, 1F, 0F); + } else { Vector dir = p.getLocation().getDirection().multiply(0.50); Vector vec = new Vector(dir.getX(), 2.0D, dir.getZ()); p.setVelocity(vec); @@ -42,8 +41,8 @@ public void onMove(PlayerMoveEvent e) { } } - if(RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p.getUniqueId()) != null){ + if (RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p.getUniqueId()) != null) { e.setCancelled(RelluEssentials.getInstance().getPlayerAPI().getPlayerEntry(p.getUniqueId()).isAfk()); } - } + } } \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/AttributeHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/AttributeHelper.java index 335e6475..a878049c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/AttributeHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/AttributeHelper.java @@ -12,12 +12,12 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; public class AttributeHelper { private AttributeHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static Multimap addAttribute(){ diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BagHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BagHelper.java index df57cf3f..bd031a97 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BagHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BagHelper.java @@ -1,16 +1,16 @@ package de.relluem94.minecraft.server.spigot.essentials.helpers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAGS_SAVED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAG_AMOUNT; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAG_CLICK_TO_BUY; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAG_CLICK_TO_OPEN; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAG_COST_TO_BUY; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAG_GUI_TITLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_BAG_RETRIEVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_FORMS_SPACER_MESSAGE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_INTERNAL_UTILITY_CLASS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CHAT_CONSOLE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_PREFIX; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAGS_SAVED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAG_AMOUNT; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAG_CLICK_TO_BUY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAG_CLICK_TO_OPEN; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAG_COST_TO_BUY; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAG_GUI_TITLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_BAG_RETRIEVE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_FORMS_SPACER_MESSAGE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_INTERNAL_UTILITY_CLASS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CHAT_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_PREFIX; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.sendMessageInChannel; import java.util.ArrayList; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BankerHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BankerHelper.java index 4dc4b63a..e0b8c2c5 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BankerHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BankerHelper.java @@ -37,7 +37,7 @@ import org.bukkit.inventory.ItemStack; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants; import de.relluem94.minecraft.server.spigot.essentials.helpers.ItemHelper.Rarity; import de.relluem94.minecraft.server.spigot.essentials.helpers.ItemHelper.Type; @@ -48,7 +48,7 @@ public class BankerHelper { private BankerHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } @SuppressWarnings("unused") diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHelper.java index 7ea98f16..50ad4114 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHelper.java @@ -1,32 +1,44 @@ package de.relluem94.minecraft.server.spigot.essentials.helpers; -import de.relluem94.minecraft.server.spigot.essentials.Strings; -import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.BlockHistoryEntry; +import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; +import lombok.Setter; +import org.bukkit.Bukkit; +import org.bukkit.Location; import org.bukkit.Material; +import java.util.HashMap; + + /** * - * @author rellu + * @author Relluem94 */ public class BlockHelper { - private BlockHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + @Setter + private Material type; + private final HashMap locations = new HashMap<>(); + public BlockHelper(Material type) { + this.type = type; + } + + public void addLocation(Location location, Long delay) { + locations.put(location, delay); + } + + public void putAll(BlockHelper setBlockHelper){ + locations.putAll(setBlockHelper.locations); + } + + public void setBlocks(long addDelay) { + locations.forEach((location, delay) -> Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(RelluEssentials.getInstance(), () -> location.getBlock().setType(type), Math.abs(delay + addDelay))); + } + + public void setBlocks() { + setBlocks(0); } - /** - * Sets a Block on the Location of the BlockHistoryEntry (bh) with the - * specified Material from the database - * - * @param bh BlockHistoryEntry - */ - public static void setBlock(BlockHistoryEntry bh) { - Material m = Material.getMaterial(bh.getMaterial()); - if (m == null) { - m = Material.AIR; - } - if (bh.getLocation() != null && bh.getLocation().getLocation() != null) { - bh.getLocation().getLocation().getBlock().setType(m); - } + public static boolean checkBlockAt(Location location, Material mat) { + return location.getBlock().getType() == mat; } -} +} \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHistoryHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHistoryHelper.java new file mode 100644 index 00000000..22bb833b --- /dev/null +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/BlockHistoryHelper.java @@ -0,0 +1,32 @@ +package de.relluem94.minecraft.server.spigot.essentials.helpers; + +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; +import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.BlockHistoryEntry; +import org.bukkit.Material; + +/** + * + * @author rellu + */ +public class BlockHistoryHelper { + + private BlockHistoryHelper() { + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); + } + + /** + * Sets a Block on the Location of the BlockHistoryEntry (bh) with the + * specified Material from the database + * + * @param bh BlockHistoryEntry + */ + public static void setBlock(BlockHistoryEntry bh) { + Material m = Material.getMaterial(bh.getMaterial()); + if (m == null) { + m = Material.AIR; + } + if (bh.getLocation() != null && bh.getLocation().getLocation() != null) { + bh.getLocation().getLocation().getBlock().setType(m); + } + } +} diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ChatHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ChatHelper.java index df54ae5d..a9f2e1ad 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ChatHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ChatHelper.java @@ -6,10 +6,10 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.StringHelper.replaceColor; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.GroupEntry; import de.relluem94.minecraft.server.spigot.essentials.permissions.Permission; import net.md_5.bungee.api.ChatMessageType; @@ -22,7 +22,7 @@ public class ChatHelper { private ChatHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ConfigHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ConfigHelper.java index 923844cc..a118930b 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ConfigHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ConfigHelper.java @@ -2,7 +2,7 @@ import java.io.File; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.LocationEntry; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.LocationTypeEntry; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/DatabaseHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/DatabaseHelper.java index c6c631a9..b541aa4c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/DatabaseHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/DatabaseHelper.java @@ -25,7 +25,7 @@ import org.json.JSONObject; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.PlayerState; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.BagEntry; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.BagTypeEntry; @@ -93,7 +93,7 @@ public String readResource(final String fileName) throws FileNotFoundException { String line; StringBuilder sb = new StringBuilder(); while ((line = br.readLine()) != null) { - sb.append(line).append(Strings.PLUGIN_EOL); + sb.append(line).append(Constants.PLUGIN_EOL); } out = sb.toString(); @@ -116,7 +116,7 @@ public void select() { private void patch1() { String v = "patches/v1/"; - consoleSendMessage(Strings.PLUGIN_NAME_CONSOLE, "applying " + v); + consoleSendMessage(Constants.PLUGIN_NAME_CONSOLE, "applying " + v); executeScriptNoSchema(v + "createSchema.sql"); executeScript(v + "createGroup.sql"); executeScript(v + "createPlayer.sql"); @@ -159,7 +159,7 @@ private void patch1() { private void patch2() { String v = "patches/v2/"; - consoleSendMessage(Strings.PLUGIN_NAME_CONSOLE, "applying " + v); + consoleSendMessage(Constants.PLUGIN_NAME_CONSOLE, "applying " + v); executeScript(v + "dropBlockHistory.sql"); executeScript(v + "createBlockHistory.sql"); executeScript(v + INSERT_NEW_DB_VERSION); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/EnchantmentHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/EnchantmentHelper.java index ba274fe0..a012ded2 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/EnchantmentHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/EnchantmentHelper.java @@ -21,7 +21,7 @@ import de.relluem94.minecraft.server.spigot.essentials.CustomEnchants; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.enchantment.EnchantLevel; import de.relluem94.minecraft.server.spigot.essentials.enchantment.EnchantName; import de.relluem94.minecraft.server.spigot.essentials.enchantment.interfaces.IEnchantment; @@ -208,9 +208,9 @@ public static void registerEnchants(Enchantment enchantment) { f.setAccessible(true); f.set(null, true); Enchantment.registerEnchantment(enchantment); - ChatHelper.consoleSendMessage(Strings.PLUGIN_NAME_CONSOLE, String.format(Strings.PLUGIN_MANAGER_REGISTER_ENCHANTMENT, enchantment.getKey().getNamespace(), enchantment.getKey())); + ChatHelper.consoleSendMessage(Constants.PLUGIN_NAME_CONSOLE, String.format(Constants.PLUGIN_MANAGER_REGISTER_ENCHANTMENT, enchantment.getKey().getNamespace(), enchantment.getKey())); } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex) { - ChatHelper.consoleSendMessage(Strings.PLUGIN_NAME_CONSOLE, ex.getMessage() + ": " + enchantment.getKey()); + ChatHelper.consoleSendMessage(Constants.PLUGIN_NAME_CONSOLE, ex.getMessage() + ": " + enchantment.getKey()); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ExperienceHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ExperienceHelper.java index ee971ca7..6bab5ab3 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ExperienceHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ExperienceHelper.java @@ -2,12 +2,12 @@ import org.bukkit.entity.Player; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; public class ExperienceHelper { private ExperienceHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static int getTotalExperience(int level) { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelper.java index c7caecd2..d10a0d3a 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelper.java @@ -3,15 +3,17 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; + import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; +import org.jetbrains.annotations.ApiStatus; import org.json.JSONObject; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; /** * @@ -19,10 +21,10 @@ */ public class InventoryHelper { private InventoryHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } - private static final String SLOT_NAME_ITEMSTACK = "itemStack"; + private static final String SLOT_NAME_ITEM_STACK = "itemStack"; private static final String SLOT_NAME_ID = "id"; /** @@ -32,6 +34,10 @@ private InventoryHelper() { */ public static int inventorySize(int amount) { + if(amount <= 9){ + return 9; + } + int[] sizes = new int[6]; sizes[0] = 9; sizes[1] = 18; @@ -62,6 +68,7 @@ public static Inventory createInventory(int size, String name) { * * @param sender Updates Inventory for CommandSender / Player */ + @Deprecated @ApiStatus.Internal @SuppressWarnings("all") public static void updateInventory(CommandSender sender) { if (sender instanceof Player p) { p.updateInventory(); @@ -132,9 +139,9 @@ public static void createInventory(String json, Player p){ for (int i=p.getInventory().getSize(); i >= 0; i--) { JSONObject slot = invJson.getJSONObject(i+""); - if (slot.has(SLOT_NAME_ITEMSTACK)) { + if (slot.has(SLOT_NAME_ITEM_STACK)) { int slotID = slot.getInt(SLOT_NAME_ID); - ItemStack stack = ItemHelper.itemFrom64(slot.getString(SLOT_NAME_ITEMSTACK)); + ItemStack stack = ItemHelper.itemFrom64(slot.getString(SLOT_NAME_ITEM_STACK)); if(stack != null){ p.getInventory().setItem(slotID, stack); @@ -156,7 +163,7 @@ public static JSONObject saveInventoryToJSON(Player p){ ItemStack stack = inventory.getItem(i); JSONObject slot = new JSONObject(); slot.put(SLOT_NAME_ID ,Integer.valueOf(i)); - slot.put(SLOT_NAME_ITEMSTACK, ItemHelper.itemTo64(stack)); + slot.put(SLOT_NAME_ITEM_STACK, ItemHelper.itemTo64(stack)); inv.put(i + "", slot); } return inv; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHeadHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHeadHelper.java index f3ae6acb..9ebc7f86 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHeadHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHeadHelper.java @@ -15,14 +15,14 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.CustomHeads; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.OfflinePlayerEntry; public class PlayerHeadHelper { private PlayerHeadHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } private static final ItemStack PLAYER_HEAD = new ItemStack(Material.PLAYER_HEAD, 1); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHelper.java index d23718d4..794721ec 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/PlayerHelper.java @@ -1,7 +1,7 @@ package de.relluem94.minecraft.server.spigot.essentials.helpers; import static de.relluem94.minecraft.server.spigot.essentials.RelluEssentials.getText; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import java.util.Objects; import java.util.Properties; @@ -16,7 +16,7 @@ import de.relluem94.minecraft.server.spigot.essentials.CustomItems; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.PlayerState; import de.relluem94.minecraft.server.spigot.essentials.events.BetterChatFormat; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.GroupEntry; @@ -36,7 +36,7 @@ public class PlayerHelper { private PlayerHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** @@ -179,7 +179,7 @@ public static void savePlayers(){ } if(updatedPlayers != 0){ - ChatHelper.sendMessageInChannel(String.format(Strings.PLUGIN_PLAYERS_SAVED, BetterChatFormat.ADMIN_CHANNEL, updatedPlayers), Strings.PLUGIN_NAME_CHAT_CONSOLE, BetterChatFormat.ADMIN_CHANNEL, Groups.getGroup("admin")); + ChatHelper.sendMessageInChannel(String.format(Constants.PLUGIN_PLAYERS_SAVED, BetterChatFormat.ADMIN_CHANNEL, updatedPlayers), Constants.PLUGIN_NAME_CHAT_CONSOLE, BetterChatFormat.ADMIN_CHANNEL, Groups.getGroup("admin")); } } @@ -191,7 +191,7 @@ public static void savePlayersInv(){ } if(updatedPlayers != 0){ - ChatHelper.sendMessageInChannel(String.format(Strings.PLUGIN_PLAYERS_INVENTORY_SAVED, BetterChatFormat.ADMIN_CHANNEL, updatedPlayers), Strings.PLUGIN_NAME_CHAT_CONSOLE, BetterChatFormat.ADMIN_CHANNEL, Groups.getGroup("admin")); + ChatHelper.sendMessageInChannel(String.format(Constants.PLUGIN_PLAYERS_INVENTORY_SAVED, BetterChatFormat.ADMIN_CHANNEL, updatedPlayers), Constants.PLUGIN_NAME_CHAT_CONSOLE, BetterChatFormat.ADMIN_CHANNEL, Groups.getGroup("admin")); } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ProtectionHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ProtectionHelper.java index 6eb45806..ae8780dd 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ProtectionHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ProtectionHelper.java @@ -12,7 +12,7 @@ import org.json.JSONObject; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.ProtectionFlags; import static de.relluem94.minecraft.server.spigot.essentials.constants.EventConstants.*; @@ -22,7 +22,7 @@ public class ProtectionHelper { private ProtectionHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/SignHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/SignHelper.java index 74b0baba..5d6d4493 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/SignHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/SignHelper.java @@ -1,7 +1,7 @@ package de.relluem94.minecraft.server.spigot.essentials.helpers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_SIGN_CLICK; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_SIGN_NAME; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_SIGN_CLICK; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_SIGN_NAME; import lombok.Getter; import org.bukkit.block.Block; @@ -11,6 +11,8 @@ import org.bukkit.block.data.type.WallSign; import de.relluem94.minecraft.server.spigot.essentials.exceptions.SignMissingCustomInputException; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; /** * @@ -24,7 +26,7 @@ public class SignHelper { private final ActionType signActionType; - public SignHelper(ActionType signActionType, String customInput) { + public SignHelper(@NotNull ActionType signActionType, String customInput) { this.signActionType = signActionType; this.line1 = signActionType.getDisplayName(); if (signActionType.isCustomInput()) { @@ -34,7 +36,7 @@ public SignHelper(ActionType signActionType, String customInput) { } } - public SignHelper(ActionType signActionType) throws SignMissingCustomInputException { + public SignHelper(@NotNull ActionType signActionType) throws SignMissingCustomInputException { this.signActionType = signActionType; this.line1 = signActionType.getDisplayName(); this.line2 = ""; @@ -51,15 +53,15 @@ public String getLine3() { return PLUGIN_SIGN_CLICK; } - public static boolean isSign(SignHelper sh, String line0, String line1, String line3) { + public static boolean isSign(@NotNull SignHelper sh, String line0, String line1, String line3) { return sh.getLine0().equals(line0) && sh.getLine1().equals(line1) && sh.getLine3().equals(line3); } - public static boolean isSign(SignHelper sh, String line1) { + public static boolean isSign(@NotNull SignHelper sh, String line1) { return sh.getSignActionType().getShorthand().equals(line1) || sh.getSignActionType().getName().equalsIgnoreCase(line1); } - public static boolean isBlockASign(Block b){ + public static boolean isBlockASign(@NotNull Block b){ return ( b.getBlockData() instanceof WallSign || b.getBlockData() instanceof Sign || @@ -88,11 +90,13 @@ public enum ActionType { } - public String getShorthand() { + @Contract(pure = true) + public @NotNull String getShorthand() { return "[" + id + "]"; } - public String getName() { + @Contract(pure = true) + public @NotNull String getName() { return "[" + this.name() + "]"; } } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/StringHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/StringHelper.java index a7ed699f..05360dfd 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/StringHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/StringHelper.java @@ -1,10 +1,10 @@ package de.relluem94.minecraft.server.spigot.essentials.helpers; import static java.lang.Math.round; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COMMAND_WHERE_STRING; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COMMAND_WHERE_STRING; import org.bukkit.Location; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; /** * @@ -13,7 +13,7 @@ public class StringHelper { private StringHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TabCompleterHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TabCompleterHelper.java new file mode 100644 index 00000000..6fb34752 --- /dev/null +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TabCompleterHelper.java @@ -0,0 +1,38 @@ +package de.relluem94.minecraft.server.spigot.essentials.helpers; + +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; +import de.relluem94.minecraft.server.spigot.essentials.constants.ProtectionFlags; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author Relluem94 + */ +public class TabCompleterHelper { + private TabCompleterHelper() { + throw new IllegalStateException( + Constants.PLUGIN_INTERNAL_UTILITY_CLASS); + } + + public static List getOnlinePlayers(){ + List playerList = new ArrayList<>(); + for(Player p : Bukkit.getOnlinePlayers()){ + playerList.add(p.getName()); + } + + return playerList; + } + + public static List getProtectionFlags(){ + List protectionFlagList = new ArrayList<>(); + for(ProtectionFlags protectionFlag : ProtectionFlags.values()){ + protectionFlagList.add(protectionFlag.toString()); + } + + return protectionFlagList; + } +} diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TypeHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TypeHelper.java index 51f6cc84..8355ac10 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TypeHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/TypeHelper.java @@ -9,7 +9,7 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; /** * @@ -18,7 +18,7 @@ public class TypeHelper { private TypeHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } public static boolean isInt(String s) { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/UUIDHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/UUIDHelper.java index c10b04fb..38b9601c 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/UUIDHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/UUIDHelper.java @@ -2,12 +2,12 @@ import java.util.UUID; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; public class UUIDHelper { private UUIDHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/WorldHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/WorldHelper.java index 8908ecca..c2a39e67 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/WorldHelper.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/WorldHelper.java @@ -17,7 +17,7 @@ import org.bukkit.entity.Player; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.exceptions.WorldNotFoundException; import de.relluem94.minecraft.server.spigot.essentials.exceptions.WorldNotLoadedException; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.PlayerEntry; @@ -32,7 +32,7 @@ public class WorldHelper { private WorldHelper() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/items/AutoSellHopper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/items/AutoSellHopper.java new file mode 100644 index 00000000..f2c0d624 --- /dev/null +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/items/AutoSellHopper.java @@ -0,0 +1,13 @@ +package de.relluem94.minecraft.server.spigot.essentials.items; + +import org.bukkit.Material; + +import de.relluem94.minecraft.server.spigot.essentials.constants.ItemConstants; +import de.relluem94.minecraft.server.spigot.essentials.helpers.ItemHelper; + +public class AutoSellHopper extends ItemHelper{ + + public AutoSellHopper() { + super(Material.HOPPER, 1, ItemConstants.PLUGIN_ITEM_AUTOSELLHOPER, Type.TOOL, Rarity.LEGENDARY); + } +} \ No newline at end of file diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/AutoSaveManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/AutoSaveManager.java index 19176f90..800deb47 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/AutoSaveManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/AutoSaveManager.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_AUTOSAVE_REGISTERED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_REGISTER_AUTOSAVE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_AUTOSAVE_REGISTERED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_REGISTER_AUTOSAVE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BankManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BankManager.java index 18e8bd30..39d14aee 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BankManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BankManager.java @@ -8,7 +8,7 @@ import org.bukkit.Bukkit; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.helpers.BankerHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper; @@ -25,7 +25,7 @@ public void enable() { private void triggerNext(){ Bukkit.getScheduler().runTaskLater(RelluEssentials.getInstance(), () -> { BankerHelper.doInterest(); - ChatHelper.consoleSendMessage(Strings.PLUGIN_NAME_CONSOLE, String.format(Strings.PLUGIN_BANK_INTEREST_NEXT_RUN, getSecondsUntilMidnight())); + ChatHelper.consoleSendMessage(Constants.PLUGIN_NAME_CONSOLE, String.format(Constants.PLUGIN_BANK_INTEREST_NEXT_RUN, getSecondsUntilMidnight())); triggerNext(); }, 20 * getSecondsUntilMidnight()); } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BlockHistoryManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BlockHistoryManager.java index 63014392..e2a2db16 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BlockHistoryManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/BlockHistoryManager.java @@ -1,7 +1,7 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.helpers.BlockHelper; +import de.relluem94.minecraft.server.spigot.essentials.helpers.BlockHistoryHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.BlockHistoryEntry; import org.bukkit.Bukkit; @@ -15,7 +15,7 @@ public void enable() { scheduler.runTaskTimer(RelluEssentials.getInstance(), () -> { if (!RelluEssentials.getInstance().blockHistoryList.isEmpty()) { BlockHistoryEntry bh = RelluEssentials.getInstance().blockHistoryList.get(0); - BlockHelper.setBlock(bh); + BlockHistoryHelper.setBlock(bh); if (bh.getDeleted() == null) { RelluEssentials.getInstance().getDatabaseHelper().insertBlockHistory(bh); } else { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/CommandManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/CommandManager.java index 1b875d5b..f66331c7 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/CommandManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/CommandManager.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_COMMANDS_REGISTERED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_REGISTER_COMMANDS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_COMMANDS_REGISTERED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_REGISTER_COMMANDS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_ADMIN; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_AFK; import static de.relluem94.minecraft.server.spigot.essentials.constants.CommandNameConstants.PLUGIN_COMMAND_NAME_BACK; @@ -61,58 +61,10 @@ import java.util.Objects; +import de.relluem94.minecraft.server.spigot.essentials.commands.*; import org.bukkit.command.PluginCommandYamlParser; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.commands.AFK; -import de.relluem94.minecraft.server.spigot.essentials.commands.Admin; -import de.relluem94.minecraft.server.spigot.essentials.commands.Back; -import de.relluem94.minecraft.server.spigot.essentials.commands.Bags; -import de.relluem94.minecraft.server.spigot.essentials.commands.Broadcast; -import de.relluem94.minecraft.server.spigot.essentials.commands.Cookies; -import de.relluem94.minecraft.server.spigot.essentials.commands.CustomHead; -import de.relluem94.minecraft.server.spigot.essentials.commands.Day; -import de.relluem94.minecraft.server.spigot.essentials.commands.Enderchest; -import de.relluem94.minecraft.server.spigot.essentials.commands.Exit; -import de.relluem94.minecraft.server.spigot.essentials.commands.Fly; -import de.relluem94.minecraft.server.spigot.essentials.commands.GameMode; -import de.relluem94.minecraft.server.spigot.essentials.commands.GameRules; -import de.relluem94.minecraft.server.spigot.essentials.commands.God; -import de.relluem94.minecraft.server.spigot.essentials.commands.Head; -import de.relluem94.minecraft.server.spigot.essentials.commands.Heal; -import de.relluem94.minecraft.server.spigot.essentials.commands.Home; -import de.relluem94.minecraft.server.spigot.essentials.commands.Inventory; -import de.relluem94.minecraft.server.spigot.essentials.commands.Marry; -import de.relluem94.minecraft.server.spigot.essentials.commands.Message; -import de.relluem94.minecraft.server.spigot.essentials.commands.More; -import de.relluem94.minecraft.server.spigot.essentials.commands.Nick; -import de.relluem94.minecraft.server.spigot.essentials.commands.Night; -import de.relluem94.minecraft.server.spigot.essentials.commands.PermissionsGroup; -import de.relluem94.minecraft.server.spigot.essentials.commands.PlayerInfo; -import de.relluem94.minecraft.server.spigot.essentials.commands.Poke; -import de.relluem94.minecraft.server.spigot.essentials.commands.PortableCraftingBench; -import de.relluem94.minecraft.server.spigot.essentials.commands.Print; -import de.relluem94.minecraft.server.spigot.essentials.commands.Protect; -import de.relluem94.minecraft.server.spigot.essentials.commands.Purse; -import de.relluem94.minecraft.server.spigot.essentials.commands.Rain; -import de.relluem94.minecraft.server.spigot.essentials.commands.Rename; -import de.relluem94.minecraft.server.spigot.essentials.commands.Repair; -import de.relluem94.minecraft.server.spigot.essentials.commands.Rollback; -import de.relluem94.minecraft.server.spigot.essentials.commands.Sign; -import de.relluem94.minecraft.server.spigot.essentials.commands.Spawn; -import de.relluem94.minecraft.server.spigot.essentials.commands.Speed; -import de.relluem94.minecraft.server.spigot.essentials.commands.Storm; -import de.relluem94.minecraft.server.spigot.essentials.commands.Sudo; -import de.relluem94.minecraft.server.spigot.essentials.commands.Suicide; -import de.relluem94.minecraft.server.spigot.essentials.commands.Sun; -import de.relluem94.minecraft.server.spigot.essentials.commands.Team; -import de.relluem94.minecraft.server.spigot.essentials.commands.Teleport; -import de.relluem94.minecraft.server.spigot.essentials.commands.TestCommand; -import de.relluem94.minecraft.server.spigot.essentials.commands.Title; -import de.relluem94.minecraft.server.spigot.essentials.commands.Vanish; -import de.relluem94.minecraft.server.spigot.essentials.commands.Warp; -import de.relluem94.minecraft.server.spigot.essentials.commands.Where; -import de.relluem94.minecraft.server.spigot.essentials.commands.Worlds; public class CommandManager implements IEnable { @@ -172,7 +124,9 @@ public void enable() { Objects.requireNonNull(RelluEssentials.getInstance().getCommand(PLUGIN_COMMAND_NAME_MARRY)).setExecutor(new Marry()); Objects.requireNonNull(RelluEssentials.getInstance().getCommand(PLUGIN_COMMAND_NAME_CUSTOMHEADS)).setExecutor(new CustomHead()); Objects.requireNonNull(RelluEssentials.getInstance().getCommand(PLUGIN_COMMAND_NAME_PLAYERINFO)).setExecutor(new PlayerInfo()); - Objects.requireNonNull(RelluEssentials.getInstance().getCommand(PLUGIN_COMMAND_NAME_TEAM)).setExecutor(new Team()); + Objects.requireNonNull(RelluEssentials.getInstance().getCommand(PLUGIN_COMMAND_NAME_TEAM)).setExecutor(new Team()); + + Objects.requireNonNull(RelluEssentials.getInstance().getCommand(PLUGIN_COMMAND_NAME_PROTECT)).setTabCompleter(new ProtectTabCompleter()); int commands = PluginCommandYamlParser.parse(RelluEssentials.getInstance()).size(); consoleSendMessage(PLUGIN_NAME_CONSOLE, PLUGIN_COLOR_COMMAND + String.format(PLUGIN_MANAGER_COMMANDS_REGISTERED, commands)); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/ConfigManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/ConfigManager.java index e49ebb19..82977b0d 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/ConfigManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/ConfigManager.java @@ -1,6 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; @@ -8,11 +8,15 @@ public class ConfigManager implements IEnable, IDisable { @Override - public void enable() { + public void enable() { consoleSendMessage(PLUGIN_NAME_CONSOLE, PLUGIN_COLOR_COMMAND + PLUGIN_MANAGER_LOADING_CONFIGS); - if (!RelluEssentials.getInstance().getDataFolder().exists()) { - RelluEssentials.getInstance().getDataFolder().mkdir(); + if (RelluEssentials.getInstance().getDataFolder().exists()) { + return; + } + + if(!RelluEssentials.getInstance().getDataFolder().mkdir()){ + consoleSendMessage(PLUGIN_NAME_CONSOLE, PLUGIN_FOLDER_MKDIR_ERROR); } RelluEssentials.getInstance().saveDefaultConfig(); diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/DatabaseManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/DatabaseManager.java index 2ea84540..30a51836 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/DatabaseManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/DatabaseManager.java @@ -1,6 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EnchantmentManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EnchantmentManager.java index b1aef4c5..ee84ea43 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EnchantmentManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EnchantmentManager.java @@ -3,7 +3,7 @@ import de.relluem94.minecraft.server.spigot.essentials.CustomEnchants; import de.relluem94.minecraft.server.spigot.essentials.helpers.EnchantmentHelper; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; public class EnchantmentManager implements IEnable { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EventManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EventManager.java index 8d4ad815..a3b32271 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EventManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/EventManager.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_EVENTS_REGISTERED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_REGISTER_EVENTS; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_EVENTS_REGISTERED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_REGISTER_EVENTS; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import org.bukkit.Bukkit; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/IEnable.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/IEnable.java index b8774f71..95b3daeb 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/IEnable.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/IEnable.java @@ -1,5 +1,7 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; +import org.bukkit.plugin.InvalidPluginException; + public interface IEnable { void enable(); } diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/RecipeManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/RecipeManager.java index d75cdbd7..aa2ab87e 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/RecipeManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/RecipeManager.java @@ -1,9 +1,9 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_RECIPE_REGISTERED; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_MANAGER_REGISTER_RECIPE; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_RECIPE_REGISTERED; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_MANAGER_REGISTER_RECIPE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import org.bukkit.Bukkit; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/SkillManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/SkillManager.java index 8718a186..6e111d96 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/SkillManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/SkillManager.java @@ -1,6 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.*; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.*; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; public class SkillManager implements IEnable { diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/WorldManager.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/WorldManager.java index 9494d946..2686b673 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/WorldManager.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/managers/WorldManager.java @@ -1,7 +1,7 @@ package de.relluem94.minecraft.server.spigot.essentials.managers; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_COLOR_COMMAND; -import static de.relluem94.minecraft.server.spigot.essentials.Strings.PLUGIN_NAME_CONSOLE; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_COLOR_COMMAND; +import static de.relluem94.minecraft.server.spigot.essentials.constants.Constants.PLUGIN_NAME_CONSOLE; import static de.relluem94.minecraft.server.spigot.essentials.helpers.ChatHelper.consoleSendMessage; import java.util.Random; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/Enchanter.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/Enchanter.java index 8a208e32..cb5d6a74 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/Enchanter.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/Enchanter.java @@ -1,5 +1,6 @@ package de.relluem94.minecraft.server.spigot.essentials.npc; +import de.relluem94.minecraft.server.spigot.essentials.items.AutoSellHopper; import org.bukkit.entity.Villager.Profession; import org.bukkit.inventory.Inventory; @@ -25,6 +26,8 @@ public Inventory getMainGUI() { } inv.setItem(slot,CustomItems.magic_water_bucket.getCustomItem()); + slot++; + inv.setItem(slot, new AutoSellHopper().getCustomItem()); return inv; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/NPC.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/NPC.java index d84507a7..8d530926 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/NPC.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/npc/NPC.java @@ -7,7 +7,7 @@ import org.bukkit.inventory.Inventory; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.constants.ItemConstants; import de.relluem94.minecraft.server.spigot.essentials.helpers.ItemHelper; import de.relluem94.minecraft.server.spigot.essentials.helpers.ItemHelper.Rarity; @@ -40,7 +40,7 @@ public String getName() { @Override public String getTitle() { - return Strings.PLUGIN_NAME_PREFIX + Strings.PLUGIN_FORMS_SPACER_MESSAGE+ getName(); + return Constants.PLUGIN_NAME_PREFIX + Constants.PLUGIN_FORMS_SPACER_MESSAGE+ getName(); } @Override diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Groups.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Groups.java index 1c485010..3784dfe9 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Groups.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Groups.java @@ -1,9 +1,11 @@ package de.relluem94.minecraft.server.spigot.essentials.permissions; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import de.relluem94.minecraft.server.spigot.essentials.helpers.pojo.GroupEntry; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @@ -12,7 +14,7 @@ public class Groups { private Groups() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** @@ -21,22 +23,27 @@ private Groups() { * @param name String * @return GroupEntry */ - public static GroupEntry getGroup(String name) { + public static @NotNull GroupEntry getGroup(String name) { for (GroupEntry ge : RelluEssentials.getInstance().groupEntryList) { if (ge.getName().equalsIgnoreCase(name)) { return ge; } } - return getGroup("user"); + if(!groupExists("user")){ + return new GroupEntry(1, "user", "§8"); + } + else{ + return getGroup("user"); + } } public static boolean groupExists(String name) { for (GroupEntry ge : RelluEssentials.getInstance().groupEntryList) { if (ge.getName().equalsIgnoreCase(name)) { - return true; + return false; } } - return false; + return true; } /** * Returns a GroupEntry if a Group is found by id
@@ -45,7 +52,7 @@ public static boolean groupExists(String name) { * @param id int * @return GroupEntry */ - public static GroupEntry getGroup(int id) { + public static @Nullable GroupEntry getGroup(int id) { for (GroupEntry ge : RelluEssentials.getInstance().groupEntryList) { if (ge.getId() == id) { return ge; @@ -61,8 +68,8 @@ public static GroupEntry getGroup(int id) { * @return boolean */ @SuppressWarnings("unused") - public static boolean addGroup(GroupEntry groupEntry) { - if (!groupExists(groupEntry.getName())) { + public static boolean addGroup(@NotNull GroupEntry groupEntry) { + if (groupExists(groupEntry.getName())) { RelluEssentials.getInstance().getDatabaseHelper().insertGroup(groupEntry); RelluEssentials.getInstance().groupEntryList.addAll(RelluEssentials.getInstance().getDatabaseHelper().getGroups()); return true; diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Permission.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Permission.java index 0cc292b9..d28c8cc3 100644 --- a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Permission.java +++ b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/permissions/Permission.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Player; import de.relluem94.minecraft.server.spigot.essentials.RelluEssentials; -import de.relluem94.minecraft.server.spigot.essentials.Strings; +import de.relluem94.minecraft.server.spigot.essentials.constants.Constants; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isCMDBlock; import static de.relluem94.minecraft.server.spigot.essentials.helpers.TypeHelper.isConsole; @@ -13,7 +13,7 @@ public class Permission { private Permission() { - throw new IllegalStateException(Strings.PLUGIN_INTERNAL_UTILITY_CLASS); + throw new IllegalStateException(Constants.PLUGIN_INTERNAL_UTILITY_CLASS); } /** diff --git a/src/test/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelperTest.java b/src/test/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelperTest.java index a5559bc8..faecc92f 100644 --- a/src/test/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelperTest.java +++ b/src/test/java/de/relluem94/minecraft/server/spigot/essentials/helpers/InventoryHelperTest.java @@ -16,6 +16,13 @@ public void testGetSkipsSize() { @Test public void testInventorySize() { + Assert.assertEquals(9, InventoryHelper.inventorySize(5)); + Assert.assertEquals(9, InventoryHelper.inventorySize(8)); + Assert.assertEquals(9, InventoryHelper.inventorySize(9)); + Assert.assertEquals(18, InventoryHelper.inventorySize(10)); + Assert.assertEquals(18, InventoryHelper.inventorySize(16)); Assert.assertEquals(27, InventoryHelper.inventorySize(25)); + Assert.assertEquals(27, InventoryHelper.inventorySize(27)); + Assert.assertEquals(36, InventoryHelper.inventorySize(28)); } }