From ceb4c804b7597eb806d31f19e579b17b81248c9d Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Wed, 10 Jun 2026 23:18:10 +0200 Subject: [PATCH] refactor: Java 21 support, config/API updates, GUI polish --- build.gradle.kts | 75 +++-- gradle/wrapper/gradle-wrapper.jar | Bin 42946 -> 43764 bytes gradlew | 251 +++++++++++++++ gradlew.bat | 91 +++++- .../dev/loki/lomines/RegistrationManager.java | 14 +- .../loki/lomines/block/BukkitBlockSetter.java | 8 +- .../lomines/command/admin/CopyCommand.java | 65 ++-- .../command/admin/HologramCommands.java | 11 +- .../lomines/command/admin/InfoCommand.java | 13 +- .../lomines/command/admin/MaskCommands.java | 2 +- .../lomines/command/admin/RegionCommands.java | 32 +- .../command/common/LoMinesTabCompleter.java | 13 +- .../command/player/TeleportCommand.java | 4 +- .../java/dev/loki/lomines/core/mine/Mine.java | 11 +- .../loki/lomines/core/mine/MineLoader.java | 12 +- .../loki/lomines/core/mine/MineTicker.java | 2 +- .../dev/loki/lomines/core/mine/Mines.java | 9 +- .../lomines/core/service/MaskScanService.java | 6 +- .../lomines/core/service/MineFileManager.java | 10 +- .../lomines/core/service/MineRepository.java | 2 +- .../lomines/data/config/ConfigLoader.java | 3 +- .../loki/lomines/data/config/MineConfig.java | 28 +- .../data/config/block/BlockConfig.java | 2 + .../lomines/data/config/block/BlockKey.java | 12 +- .../loader/region/RegionConfigLoader.java | 6 +- .../loader/region/WorldGuardConfigLoader.java | 4 - .../loader/reward/RewardConfigLoader.java | 17 +- .../loader/system/ResetConfigLoader.java | 2 - .../config/loader/system/UIConfigLoader.java | 18 +- .../config/parser/ConfigParseException.java | 15 + .../data/config/reset/ResetConfig.java | 82 +++-- .../data/config/reward/RewardConfig.java | 30 +- .../data/config/spawn/PlayerSpawnConfig.java | 63 ++-- .../data/config/teleport/TeleportConfig.java | 64 ++-- .../data/config/ui/HologramConfig.java | 4 +- .../loki/lomines/data/config/ui/UIConfig.java | 36 +-- .../lomines/gui/common/ItemStackFactory.java | 13 +- .../lomines/gui/confirm/ConfirmDeleteGui.java | 4 +- .../lomines/gui/group/GroupCreateGui.java | 3 +- .../lomines/gui/group/GroupCreateItems.java | 3 +- .../blocks/BlockMaterialSelectionGui.java | 42 +-- .../gui/mine/edit/blocks/BlocksGui.java | 10 +- .../gui/mine/edit/blocks/BlocksGuiItems.java | 47 +-- .../lomines/gui/mine/edit/reset/ResetGui.java | 9 +- .../gui/mine/edit/reset/ResetGuiItems.java | 79 ++--- .../gui/mine/edit/rewards/RewardsGui.java | 49 +-- .../lomines/gui/mine/main/MineEditGui.java | 14 +- .../lomines/gui/mine/main/MineEditItems.java | 95 +++--- .../lomines/handler/ActionBarHandler.java | 1 - .../integration/hologram/HologramManager.java | 39 +-- .../hologram/HologramProvider.java | 8 +- .../provider/DecentHologramsProvider.java | 48 +-- .../provider/HolographicDisplaysProvider.java | 62 +--- .../LoMinesPlaceholderExpansion.java | 14 +- .../worldguard/WorldGuardConfig.java | 76 ++--- .../worldguard/WorldGuardFlagParser.java | 2 +- .../lomines/listener/MineEditGuiListener.java | 6 +- .../lomines/util/block/BlockUpdateUtil.java | 28 +- .../loki/lomines/util/format/ChunkUtils.java | 16 +- .../util/location/SafeTeleportUtil.java | 3 +- .../dev/loki/lomines/wand/ParticleUtil.java | 7 +- .../lomines/wand/WandParticleService.java | 7 +- src/main/resources/defaults.yml | 16 +- src/main/resources/mines/example_mine.yml | 13 +- .../lomines/command/AdminCommandsTest.java | 3 +- .../java/dev/loki/lomines/core/MineTest.java | 91 +++--- .../dev/loki/lomines/core/MineTickerTest.java | 2 + .../java/dev/loki/lomines/core/MinesTest.java | 304 +++++------------- .../data/LeaderboardCacheIntegrationTest.java | 25 +- .../loki/lomines/data/LeaderboardTest.java | 30 +- .../loki/lomines/data/StatsManagerTest.java | 2 + .../lomines/data/config/ui/UIConfigTest.java | 15 +- .../dev/loki/lomines/util/ChunkUtilsTest.java | 2 + .../loki/lomines/util/LocationParserTest.java | 1 + .../loki/lomines/util/TimeFormatterTest.java | 2 + .../lomines/util/selection/SelectionTest.java | 1 + 76 files changed, 1210 insertions(+), 999 deletions(-) create mode 100644 gradlew create mode 100644 src/main/java/dev/loki/lomines/data/config/parser/ConfigParseException.java diff --git a/build.gradle.kts b/build.gradle.kts index 0caa85a..d9fa0e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,14 +13,31 @@ java { } } +tasks.withType { + options.release.set(21) +} + repositories { mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + + // PlaceholderAPI + maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") + + // WorldGuard / WorldEdit + maven("https://maven.enginehub.org/repo/") + + // CodeMC (DecentHolograms) + maven("https://repo.codemc.io/repository/maven-public/") + maven("https://jitpack.io") } -// LoAPI: libs/lolib*.jar — fileTree индексируется Gradle / Java LS стабильнее, чем files(singleJar) -val lolibTree = fileTree("libs") { include("lolib*.jar") } +val lolibTree = fileTree("libs") { + include("lolib*.jar") +} + if (lolibTree.files.isEmpty()) { throw GradleException( "Missing libs/lolib*.jar — add LoAPI fat jar to ${rootProject.file("libs").absolutePath}" @@ -28,64 +45,80 @@ if (lolibTree.files.isEmpty()) { } dependencies { - // Paper API 1.21.4 (includes Adventure API) + + // Paper compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") - // LoAPI (local) + // Local API implementation(lolibTree) - // Runtime dependencies (loaded via DependencyManager from LoAPI) - // These are marked as compileOnly because they will be downloaded at runtime + // Commons compileOnly("org.apache.commons:commons-math3:3.6.1") compileOnly("commons-io:commons-io:2.18.0") - // Adventure API (included in Paper, but explicit for clarity) + // Adventure compileOnly("net.kyori:adventure-api:4.17.0") compileOnly("net.kyori:adventure-text-minimessage:4.17.0") - // Optional plugin integrations (soft dependencies) + // PlaceholderAPI + compileOnly("me.clip:placeholderapi:2.11.6") + + // WorldGuard + WorldEdit + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.13") + compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.3.10") + + + // Optional // compileOnly("com.github.oraxen:oraxen:1.180.0") // compileOnly("com.github.LoneDev6:api-itemsadder:3.6.4") - // Test dependencies + // Tests testImplementation("org.junit.jupiter:junit-jupiter:5.11.4") testImplementation("io.kotest:kotest-runner-junit5:5.9.1") testImplementation("io.kotest:kotest-assertions-core:5.9.1") testImplementation("io.kotest:kotest-property:5.9.1") testImplementation("org.mockito:mockito-core:5.14.2") + testImplementation("org.mockito:mockito-inline:5.2.0") + + // Bukkit/Paper API for tests testImplementation("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") - testImplementation("org.apache.commons:commons-math3:3.6.1") - testImplementation("commons-io:commons-io:2.18.0") + + // Adventure for tests + testImplementation("net.kyori:adventure-api:4.17.0") + testImplementation("net.kyori:adventure-text-minimessage:4.17.0") } tasks { + shadowJar { archiveClassifier.set("") - - // Relocate LoAPI to avoid conflicts - relocate("dev.loki.lomines.libs.lolib", "com.loki.lomines.libs.lolib") - - // Don't minimize - causes issues with Java 21 - // minimize() + + // Temporary: disable relocate to avoid ASM Java 21 bytecode issues + // relocate( + // "dev.loki.lomines.libs.lolib", + // "com.loki.lomines.libs.lolib" + // ) } - + build { dependsOn(shadowJar) } - + test { useJUnitPlatform() } - + processResources { val props = mapOf( "version" to version, "description" to description ) + inputs.properties(props) filteringCharset = "UTF-8" + filesMatching("plugin.yml") { expand(props) } } -} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 63f21842786f19fd2a046c5ce5808a614dbe3d01..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch literal 43764 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 DN_vg$ diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index c8f7d56..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,7 +1,94 @@ -@rem Gradle startup script for Windows +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + @if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -java -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/dev/loki/lomines/RegistrationManager.java b/src/main/java/dev/loki/lomines/RegistrationManager.java index 094043d..783f152 100644 --- a/src/main/java/dev/loki/lomines/RegistrationManager.java +++ b/src/main/java/dev/loki/lomines/RegistrationManager.java @@ -1,21 +1,11 @@ package dev.loki.lomines; -import dev.loki.lomines.command.admin.AdminCommands; -import dev.loki.lomines.command.admin.CopyCommand; -import dev.loki.lomines.command.admin.HologramCommands; -import dev.loki.lomines.command.admin.InfoCommand; -import dev.loki.lomines.command.admin.MaskCommands; -import dev.loki.lomines.command.admin.RegionCommands; -import dev.loki.lomines.command.admin.StatsCommands; +import dev.loki.lomines.command.admin.*; import dev.loki.lomines.command.common.LoMinesTabCompleter; import dev.loki.lomines.command.player.PlayerCommands; import dev.loki.lomines.command.player.TeleportCommand; import dev.loki.lomines.integration.IntegrationManager; -import dev.loki.lomines.listener.BlockBreakListener; -import dev.loki.lomines.listener.GroupGuiListener; -import dev.loki.lomines.listener.MineEditGuiListener; -import dev.loki.lomines.listener.PlayerInteractListener; -import dev.loki.lomines.listener.PlayerJoinListener; +import dev.loki.lomines.listener.*; import dev.lolib.commands.CommandManager; /** diff --git a/src/main/java/dev/loki/lomines/block/BukkitBlockSetter.java b/src/main/java/dev/loki/lomines/block/BukkitBlockSetter.java index e336bcd..2ffa500 100644 --- a/src/main/java/dev/loki/lomines/block/BukkitBlockSetter.java +++ b/src/main/java/dev/loki/lomines/block/BukkitBlockSetter.java @@ -106,8 +106,8 @@ public final class BukkitBlockSetter extends BlockSetter { currentWeight += entry.getValue(); if (random <= currentWeight) { // BlockKey is already validated to be a block - if (entry.getKey() instanceof BlockKey.Vanilla vanilla) { - return Bukkit.createBlockData(vanilla.material()); + if (entry.getKey() instanceof BlockKey.Vanilla(Material material)) { + return Bukkit.createBlockData(material); } // Fallback for non-vanilla keys in vanilla setter (shouldn't happen) return Bukkit.createBlockData(Material.STONE); @@ -116,8 +116,8 @@ public final class BukkitBlockSetter extends BlockSetter { // Fallback to first entry BlockKey firstKey = weights.keySet().iterator().next(); - if (firstKey instanceof BlockKey.Vanilla vanilla) { - return Bukkit.createBlockData(vanilla.material()); + if (firstKey instanceof BlockKey.Vanilla(Material material)) { + return Bukkit.createBlockData(material); } return Bukkit.createBlockData(Material.STONE); } diff --git a/src/main/java/dev/loki/lomines/command/admin/CopyCommand.java b/src/main/java/dev/loki/lomines/command/admin/CopyCommand.java index 2051845..4455f30 100644 --- a/src/main/java/dev/loki/lomines/command/admin/CopyCommand.java +++ b/src/main/java/dev/loki/lomines/command/admin/CopyCommand.java @@ -2,16 +2,13 @@ package dev.loki.lomines.command.admin; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; -import dev.loki.lomines.core.mine.MineConfig; -import dev.lolilb.commands.annotation.Arg; -import dev.lolilb.commands.annotation.Subcommand; +import dev.loki.lomines.data.config.MineConfig; +import dev.lolib.commands.annotation.Arg; +import dev.lolib.commands.annotation.Subcommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; -import java.util.List; -import java.util.Map; - /** * Command to copy mine configuration from one mine to another. */ @@ -53,49 +50,25 @@ public class CopyCommand { var sourceConfig = fromMine.getConfig(); var targetConfig = toMine.getConfig(); - // Copy blocks configuration - targetConfig.blocks().weights().clear(); - targetConfig.blocks().weights().putAll(sourceConfig.blocks().weights()); + // Keep target region/name, copy all other sections from source. + MineConfig newTargetConfig = MineConfig.builder(toMine.getName()) + .region(targetConfig.region()) + .blocks(sourceConfig.blocks()) + .reset(sourceConfig.reset()) + .rewards(sourceConfig.rewards()) + .teleport(sourceConfig.teleport()) + .ui(sourceConfig.ui()) + .worldGuard(sourceConfig.worldGuard()) + .playerSpawn(sourceConfig.playerSpawn()) + .build(); - // Copy reset settings - var targetReset = targetConfig.reset(); - var sourceReset = sourceConfig.reset(); - targetReset.intervalSeconds(sourceReset.intervalSeconds()); - targetReset.percentTrigger(sourceReset.percentTrigger()); - targetReset.percentTriggerEnabled(sourceReset.isPercentTriggerEnabled()); - targetReset.intervalDisplay(sourceReset.intervalDisplay()); - - // Copy teleport and spawn settings - var targetTeleport = targetConfig.teleport(); - var sourceTeleport = sourceConfig.teleport(); - targetTeleport.enabled(sourceTeleport.enabled()); - if (sourceTeleport.getLocation().isPresent()) { - targetTeleport.setLocation(sourceTeleport.getLocation().get()); - } else { - targetTeleport.setLocation(null); + try { + plugin.getMines().updateMineConfig(toMine.getName(), newTargetConfig); + } catch (Exception e) { + sender.sendMessage(Component.text("Ошибка сохранения: " + e.getMessage(), NamedTextColor.RED)); + return; } - var targetSpawn = targetConfig.playerSpawn(); - var sourceSpawn = sourceConfig.playerSpawn(); - targetSpawn.enabled(sourceSpawn.enabled()); - if (sourceSpawn.getLocation().isPresent()) { - targetSpawn.setLocation(sourceSpawn.getLocation().get()); - } else { - targetSpawn.setLocation(null); - } - - // Copy rewards - targetConfig.rewards().entries().clear(); - targetConfig.rewards().entries().addAll(sourceConfig.rewards().entries()); - - // Copy other settings - targetConfig.blockPhysics(sourceConfig.isBlockPhysicsEnabled()); - targetConfig.entitySpawning(sourceConfig.isEntitySpawningEnabled()); - targetConfig.liquidFlow(sourceConfig.isLiquidFlowEnabled()); - - // Save target mine - toMine.save(); - sender.sendMessage(Component.text("§aКонфигурация скопирована из §f" + fromMine.getName() + " §aв §f" + toMine.getName())); sender.sendMessage(Component.text("§7Скопировано:")); diff --git a/src/main/java/dev/loki/lomines/command/admin/HologramCommands.java b/src/main/java/dev/loki/lomines/command/admin/HologramCommands.java index 57ee1ce..74b11f4 100644 --- a/src/main/java/dev/loki/lomines/command/admin/HologramCommands.java +++ b/src/main/java/dev/loki/lomines/command/admin/HologramCommands.java @@ -3,22 +3,21 @@ package dev.loki.lomines.command.admin; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.integration.hologram.HologramManager; -import dev.lolilb.commands.annotation.Arg; -import dev.lolilb.commands.annotation.Subcommand; +import dev.lolib.commands.annotation.Arg; +import dev.lolib.commands.annotation.Subcommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; /** * Commands for managing holograms above mines. */ -class HologramCommands { +public class HologramCommands { private final LoMinesPlugin plugin; private final HologramManager hologramManager; - HologramCommands(LoMinesPlugin plugin) { + public HologramCommands(LoMinesPlugin plugin) { this.plugin = plugin; this.hologramManager = plugin.getHologramManager(); } @@ -55,6 +54,6 @@ class HologramCommands { } sender.sendMessage(Component.text( - "Голограмма для шахты " + mineName + " " + (enable ? "§aвключена" : "§cвыключена"))); + "Голограмма для шахты " + mineName + " " + (enable ? "§aвключена" : "§cвыключена"))); } } diff --git a/src/main/java/dev/loki/lomines/command/admin/InfoCommand.java b/src/main/java/dev/loki/lomines/command/admin/InfoCommand.java index 2108c13..2117666 100644 --- a/src/main/java/dev/loki/lomines/command/admin/InfoCommand.java +++ b/src/main/java/dev/loki/lomines/command/admin/InfoCommand.java @@ -4,12 +4,11 @@ import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.data.config.block.BlockKey; import dev.loki.lomines.util.location.Cuboid; -import dev.lolilb.commands.annotation.Arg; -import dev.lolilb.commands.annotation.Subcommand; +import dev.lolib.commands.annotation.Arg; +import dev.lolib.commands.annotation.Subcommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import java.util.List; import java.util.Map; @@ -65,10 +64,10 @@ public class InfoCommand { sender.sendMessage(Component.text("§6§lБлоки:")); Map weights = config.blocks().weights(); weights.entrySet().stream() - .sorted((a, b) -> Double.compare(b.getValue(), a.getValue())) - .limit(10) - .forEach(e -> sender.sendMessage(Component.text( - "§7 " + formatBlockKey(e.getKey()) + ": §f" + String.format("%.1f", e.getValue() * 100) + "%"))); + .sorted((a, b) -> Double.compare(b.getValue(), a.getValue())) + .limit(10) + .forEach(e -> sender.sendMessage(Component.text( + "§7 " + formatBlockKey(e.getKey()) + ": §f" + String.format("%.1f", e.getValue() * 100) + "%"))); if (weights.size() > 10) { sender.sendMessage(Component.text("§7 ... и ещё " + (weights.size() - 10) + " блоков")); } diff --git a/src/main/java/dev/loki/lomines/command/admin/MaskCommands.java b/src/main/java/dev/loki/lomines/command/admin/MaskCommands.java index c91fbe5..6a3312e 100644 --- a/src/main/java/dev/loki/lomines/command/admin/MaskCommands.java +++ b/src/main/java/dev/loki/lomines/command/admin/MaskCommands.java @@ -2,7 +2,7 @@ package dev.loki.lomines.command.admin; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mines; -import dev.loki.lomines.data.config.loader.common.ConfigLoader; +import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.util.ErrorHandler; import dev.loki.lomines.util.MessageFormatter; import dev.lolib.commands.annotation.Arg; diff --git a/src/main/java/dev/loki/lomines/command/admin/RegionCommands.java b/src/main/java/dev/loki/lomines/command/admin/RegionCommands.java index 5cc8257..f7c650d 100644 --- a/src/main/java/dev/loki/lomines/command/admin/RegionCommands.java +++ b/src/main/java/dev/loki/lomines/command/admin/RegionCommands.java @@ -5,11 +5,10 @@ import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.data.config.MineConfig; import dev.loki.lomines.data.config.region.RegionConfig; import dev.loki.lomines.util.location.Cuboid; -import dev.lolilb.commands.annotation.Arg; -import dev.lolilb.commands.annotation.Subcommand; +import dev.lolib.commands.annotation.Arg; +import dev.lolib.commands.annotation.Subcommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; -import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -73,14 +72,15 @@ public class RegionCommands { } var wandManager = plugin.getGroupWandManager(); - var session = wandManager.getSession(player); - - if (!session.isComplete()) { + var session = wandManager.getSession(player.getUniqueId()); + int slot = session.getActiveSlot(); + var pos1 = session.getPos1(slot); + var pos2 = session.getPos2(slot); + if (pos1 == null || pos2 == null) { player.sendMessage(Component.text("§cВыделите регион палочкой! ЛКМ - 1-я точка, ПКМ - 2-я точка")); return; } - - Cuboid newRegion = session.toCuboid(); + Cuboid newRegion = new Cuboid(pos1, pos2); String mineWorld = mine.getConfig().region().worldName(); String regionWorld = newRegion.getWorld().getName(); @@ -102,7 +102,7 @@ public class RegionCommands { player.sendMessage(Component.text("§7До: §f" + newRegion.getMaxX() + ", " + newRegion.getMaxY() + ", " + newRegion.getMaxZ())); player.sendMessage(Component.text("§7Объём: §f" + newRegion.getVolume() + " §7блоков")); - session.clear(); + session.clearCorners(slot); } /** @@ -144,18 +144,22 @@ public class RegionCommands { private void updateMineRegions(Mine mine, RegionConfig newConfig) { var oldConfig = mine.getConfig(); var newMineConfig = new MineConfig( + oldConfig.name(), newConfig, oldConfig.blocks(), oldConfig.reset(), - oldConfig.teleport(), - oldConfig.playerSpawn(), oldConfig.rewards(), + oldConfig.teleport(), oldConfig.ui(), - oldConfig.worldGuard() + oldConfig.worldGuard(), + oldConfig.playerSpawn() ); // Update and save - plugin.getMines().updateMineConfig(mine.getName(), newMineConfig); - mine.save(); + try { + plugin.getMines().updateMineConfig(mine.getName(), newMineConfig); + } catch (Exception e) { + throw new IllegalStateException("Failed to update mine regions", e); + } } } diff --git a/src/main/java/dev/loki/lomines/command/common/LoMinesTabCompleter.java b/src/main/java/dev/loki/lomines/command/common/LoMinesTabCompleter.java index f74f7df..ebe192c 100644 --- a/src/main/java/dev/loki/lomines/command/common/LoMinesTabCompleter.java +++ b/src/main/java/dev/loki/lomines/command/common/LoMinesTabCompleter.java @@ -16,16 +16,14 @@ import java.util.stream.Collectors; */ public class LoMinesTabCompleter implements TabCompleter { - private final LoMinesPlugin plugin; - private static final List ALL_COMMANDS = List.of( "create", "delete", "reset", "reload", "list", "wand", "group", "stats", "top", "maskscan", "edit", "setteleport", "setspawn", "clearspawn", "info", "tp", "copy", "regions", "addregion", "removeregion", "help" ); - private static final List BOOLEAN_VALUES = List.of("true", "false"); private static final List TOP_LIMITS = List.of("5", "10", "15", "20", "25", "50"); + private final LoMinesPlugin plugin; public LoMinesTabCompleter(LoMinesPlugin plugin) { this.plugin = plugin; @@ -49,9 +47,9 @@ public class LoMinesTabCompleter implements TabCompleter { private boolean isLoMinesCommand(String name) { return name.equalsIgnoreCase("lm") || - name.equalsIgnoreCase("lomines") || - name.equalsIgnoreCase("mine") || - name.equalsIgnoreCase("mines"); + name.equalsIgnoreCase("lomines") || + name.equalsIgnoreCase("mine") || + name.equalsIgnoreCase("mines"); } private List completeSubcommands(CommandSender sender, String partial) { @@ -68,8 +66,7 @@ public class LoMinesTabCompleter implements TabCompleter { return switch (subcommand) { case "create" -> completeCreate(partial); case "delete", "maskscan", "edit", "setteleport", "setspawn", "clearspawn", "info", - "regions", "addregion" -> - filterStartsWith(getMineNames(), partial); + "regions", "addregion" -> filterStartsWith(getMineNames(), partial); case "reset" -> completeReset(partial); case "stats" -> completeStats(sender, partial); case "top" -> completeTopFirstArg(partial); diff --git a/src/main/java/dev/loki/lomines/command/player/TeleportCommand.java b/src/main/java/dev/loki/lomines/command/player/TeleportCommand.java index a768bf3..ff24f67 100644 --- a/src/main/java/dev/loki/lomines/command/player/TeleportCommand.java +++ b/src/main/java/dev/loki/lomines/command/player/TeleportCommand.java @@ -3,8 +3,8 @@ package dev.loki.lomines.command.player; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.util.location.Cuboid; -import dev.lolilb.commands.annotation.Arg; -import dev.lolilb.commands.annotation.Subcommand; +import dev.lolib.commands.annotation.Arg; +import dev.lolib.commands.annotation.Subcommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Location; diff --git a/src/main/java/dev/loki/lomines/core/mine/Mine.java b/src/main/java/dev/loki/lomines/core/mine/Mine.java index 800faaa..4077dc5 100644 --- a/src/main/java/dev/loki/lomines/core/mine/Mine.java +++ b/src/main/java/dev/loki/lomines/core/mine/Mine.java @@ -1,7 +1,6 @@ package dev.loki.lomines.core.mine; import dev.loki.lomines.LoMinesPlugin; -import dev.loki.lomines.core.service.MineFileManager; import dev.loki.lomines.block.BlockSetter; import dev.loki.lomines.data.config.MineConfig; import dev.loki.lomines.data.config.block.BlockKey; @@ -18,7 +17,9 @@ import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; /** @@ -120,8 +121,10 @@ public final class Mine { } BlockKey firstKey = weights.keySet().iterator().next(); return switch (firstKey) { - case BlockKey.Oraxen oraxen -> throw new IllegalArgumentException("Oraxen integration is currently disabled"); - case BlockKey.ItemsAdder itemsAdder -> throw new IllegalArgumentException("ItemsAdder integration is currently disabled"); + case BlockKey.Oraxen oraxen -> + throw new IllegalArgumentException("Oraxen integration is currently disabled"); + case BlockKey.ItemsAdder itemsAdder -> + throw new IllegalArgumentException("ItemsAdder integration is currently disabled"); case BlockKey.Vanilla vanilla -> new dev.loki.lomines.block.BukkitBlockSetter(weights, plugin); }; } diff --git a/src/main/java/dev/loki/lomines/core/mine/MineLoader.java b/src/main/java/dev/loki/lomines/core/mine/MineLoader.java index 2646503..d0cf97b 100644 --- a/src/main/java/dev/loki/lomines/core/mine/MineLoader.java +++ b/src/main/java/dev/loki/lomines/core/mine/MineLoader.java @@ -1,9 +1,9 @@ -package dev.loki.lomines.core.common; +package dev.loki.lomines.core.mine; import dev.loki.lomines.LoMinesPlugin; -import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.core.service.MineFileManager; -import dev.loki.lomines.data.config.loader.common.ConfigLoader; +import dev.loki.lomines.core.service.MineRepository; +import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.data.config.MineConfig; import java.io.IOException; @@ -14,19 +14,19 @@ import java.util.stream.Stream; /** * Loads mine configurations from disk. */ -final class MineLoader { +public final class MineLoader { private final LoMinesPlugin plugin; private final MineFileManager fileManager; private final MineRepository repository; - MineLoader(LoMinesPlugin plugin, MineFileManager fileManager, MineRepository repository) { + public MineLoader(LoMinesPlugin plugin, MineFileManager fileManager, MineRepository repository) { this.plugin = plugin; this.fileManager = fileManager; this.repository = repository; } - void loadAll() throws IOException { + public void loadAll() throws IOException { repository.clear(); Path minesFolder = fileManager.getMinesFolder(); diff --git a/src/main/java/dev/loki/lomines/core/mine/MineTicker.java b/src/main/java/dev/loki/lomines/core/mine/MineTicker.java index 59dc3b5..f4dd741 100644 --- a/src/main/java/dev/loki/lomines/core/mine/MineTicker.java +++ b/src/main/java/dev/loki/lomines/core/mine/MineTicker.java @@ -52,7 +52,7 @@ public final class MineTicker { private void tickMine(Mine mine) { int currentTicks = mine.getTicksAtomic().incrementAndGet(); - if (currentTicks >= mine.getConfig().getResetTicks()) { + if (currentTicks >= mine.getConfig().reset().intervalTicks()) { mine.getTicksAtomic().set(0); mine.reset(false); } diff --git a/src/main/java/dev/loki/lomines/core/mine/Mines.java b/src/main/java/dev/loki/lomines/core/mine/Mines.java index fc3674d..06fa662 100644 --- a/src/main/java/dev/loki/lomines/core/mine/Mines.java +++ b/src/main/java/dev/loki/lomines/core/mine/Mines.java @@ -1,11 +1,10 @@ package dev.loki.lomines.core.mine; import dev.loki.lomines.LoMinesPlugin; -import dev.loki.lomines.core.common.MineLoader; import dev.loki.lomines.core.service.MaskScanService; import dev.loki.lomines.core.service.MineFileManager; import dev.loki.lomines.core.service.MineRepository; -import dev.loki.lomines.data.config.loader.common.ConfigLoader; +import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.data.config.MineConfig; import dev.loki.lomines.integration.worldguard.WorldGuardRegionService; import org.bukkit.Location; @@ -122,7 +121,11 @@ public final class Mines { } // Save new config to file - fileManager.saveConfig(name, newConfig); + try { + fileManager.saveConfig(name, newConfig); + } catch (ConfigLoader.ConfigLoadException e) { + throw new IOException("Failed to save mine config: " + e.getMessage(), e); + } // Reload to apply changes try { diff --git a/src/main/java/dev/loki/lomines/core/service/MaskScanService.java b/src/main/java/dev/loki/lomines/core/service/MaskScanService.java index 9c4e7a5..c078300 100644 --- a/src/main/java/dev/loki/lomines/core/service/MaskScanService.java +++ b/src/main/java/dev/loki/lomines/core/service/MaskScanService.java @@ -1,7 +1,7 @@ package dev.loki.lomines.core.service; import dev.loki.lomines.core.mine.Mine; -import dev.loki.lomines.data.config.loader.common.ConfigLoader; +import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.data.config.block.BlockKey; import dev.loki.lomines.util.ValidationUtils; import dev.loki.lomines.util.location.Cuboid; @@ -57,8 +57,8 @@ public final class MaskScanService { } private Material parseMarkerMaterial(BlockKey key) { - if (key instanceof BlockKey.Vanilla vanilla) { - return vanilla.material(); + if (key instanceof BlockKey.Vanilla(Material material)) { + return material; } // For custom blocks (Oraxen/ItemsAdder), we need to get the underlying material // This would need integration with those plugins to get the actual material diff --git a/src/main/java/dev/loki/lomines/core/service/MineFileManager.java b/src/main/java/dev/loki/lomines/core/service/MineFileManager.java index 70a1327..d9a2084 100644 --- a/src/main/java/dev/loki/lomines/core/service/MineFileManager.java +++ b/src/main/java/dev/loki/lomines/core/service/MineFileManager.java @@ -1,6 +1,6 @@ package dev.loki.lomines.core.service; -import dev.loki.lomines.data.config.loader.common.ConfigLoader; +import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.data.config.MineConfig; import dev.loki.lomines.data.config.block.BlockConfig; import dev.loki.lomines.data.config.block.BlockKey; @@ -82,7 +82,11 @@ public record MineFileManager(Path minesFolder, ConfigLoader configLoader) { .build(); // Save using new loader - configLoader.save(config); + try { + configLoader.save(config); + } catch (ConfigLoader.ConfigLoadException e) { + throw new IOException("Failed to save default mine config: " + e.getMessage(), e); + } } /** @@ -147,7 +151,7 @@ public record MineFileManager(Path minesFolder, ConfigLoader configLoader) { /** * Saves a mine configuration to file by name. * - * @param name the mine name + * @param name the mine name * @param config the configuration to save * @throws ConfigLoader.ConfigLoadException if saving fails */ diff --git a/src/main/java/dev/loki/lomines/core/service/MineRepository.java b/src/main/java/dev/loki/lomines/core/service/MineRepository.java index 28c8224..1a1e1f2 100644 --- a/src/main/java/dev/loki/lomines/core/service/MineRepository.java +++ b/src/main/java/dev/loki/lomines/core/service/MineRepository.java @@ -2,7 +2,7 @@ package dev.loki.lomines.core.service; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; -import dev.loki.lomines.data.config.loader.common.ConfigLoader; +import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.data.config.MineConfig; import org.bukkit.Location; diff --git a/src/main/java/dev/loki/lomines/data/config/ConfigLoader.java b/src/main/java/dev/loki/lomines/data/config/ConfigLoader.java index c0e32ff..24b78ee 100644 --- a/src/main/java/dev/loki/lomines/data/config/ConfigLoader.java +++ b/src/main/java/dev/loki/lomines/data/config/ConfigLoader.java @@ -5,8 +5,8 @@ import dev.loki.lomines.data.config.loader.entity.PlayerSpawnConfigLoader; import dev.loki.lomines.data.config.loader.entity.TeleportConfigLoader; import dev.loki.lomines.data.config.loader.region.RegionConfigLoader; import dev.loki.lomines.data.config.loader.region.WorldGuardConfigLoader; -import dev.loki.lomines.data.config.loader.reset.ResetConfigLoader; import dev.loki.lomines.data.config.loader.reward.RewardConfigLoader; +import dev.loki.lomines.data.config.loader.system.ResetConfigLoader; import dev.loki.lomines.data.config.loader.system.UIConfigLoader; import org.bukkit.configuration.file.YamlConfiguration; @@ -156,6 +156,7 @@ public final class ConfigLoader { public ConfigLoadException(String message) { super(message); } + public ConfigLoadException(String message, Throwable cause) { super(message, cause); } diff --git a/src/main/java/dev/loki/lomines/data/config/MineConfig.java b/src/main/java/dev/loki/lomines/data/config/MineConfig.java index 2a1c8bb..70d44b7 100644 --- a/src/main/java/dev/loki/lomines/data/config/MineConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/MineConfig.java @@ -49,20 +49,6 @@ public record MineConfig( } } - /** - * Total volume of the mine (for progress calculation). - */ - public int volume() { - return region.totalVolume(); - } - - /** - * World name where the mine is located. - */ - public String worldName() { - return region.worldName(); - } - /** * Creates builder for fluent construction. */ @@ -87,6 +73,20 @@ public record MineConfig( ); } + /** + * Total volume of the mine (for progress calculation). + */ + public int volume() { + return region.totalVolume(); + } + + /** + * World name where the mine is located. + */ + public String worldName() { + return region.worldName(); + } + /** * Returns the spawn location for stuck players. * If playerSpawn is not set, falls back to teleport location. diff --git a/src/main/java/dev/loki/lomines/data/config/block/BlockConfig.java b/src/main/java/dev/loki/lomines/data/config/block/BlockConfig.java index fb3cbe6..2fa8a06 100644 --- a/src/main/java/dev/loki/lomines/data/config/block/BlockConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/block/BlockConfig.java @@ -1,5 +1,7 @@ package dev.loki.lomines.data.config.block; +import org.bukkit.Material; + import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/dev/loki/lomines/data/config/block/BlockKey.java b/src/main/java/dev/loki/lomines/data/config/block/BlockKey.java index eecce4e..31d552b 100644 --- a/src/main/java/dev/loki/lomines/data/config/block/BlockKey.java +++ b/src/main/java/dev/loki/lomines/data/config/block/BlockKey.java @@ -10,12 +10,6 @@ import java.util.Objects; */ public sealed interface BlockKey permits BlockKey.Vanilla, BlockKey.Oraxen, BlockKey.ItemsAdder { - /** - * Serializes this key to string format for YAML storage. - * Format: "stone" (vanilla), "oraxen:my_block", "itemsadder:custom_block" - */ - String serialize(); - /** * Deserializes a string to appropriate BlockKey type. * @@ -43,6 +37,12 @@ public sealed interface BlockKey permits BlockKey.Vanilla, BlockKey.Oraxen, Bloc return new Vanilla(material); } + /** + * Serializes this key to string format for YAML storage. + * Format: "stone" (vanilla), "oraxen:my_block", "itemsadder:custom_block" + */ + String serialize(); + // --- Implementations --- record Vanilla(Material material) implements BlockKey { diff --git a/src/main/java/dev/loki/lomines/data/config/loader/region/RegionConfigLoader.java b/src/main/java/dev/loki/lomines/data/config/loader/region/RegionConfigLoader.java index 1ecf0a7..ae2130f 100644 --- a/src/main/java/dev/loki/lomines/data/config/loader/region/RegionConfigLoader.java +++ b/src/main/java/dev/loki/lomines/data/config/loader/region/RegionConfigLoader.java @@ -80,9 +80,11 @@ public final class RegionConfigLoader { public void save(YamlConfiguration yaml, RegionConfig region) { int i = 1; for (var cuboid : region.regions()) { - yaml.set("region.selection." + i, LocationParser.format(cuboid.getMin())); + Location min = new Location(cuboid.getWorld(), cuboid.getMinX(), cuboid.getMinY(), cuboid.getMinZ()); + yaml.set("region.selection." + i, LocationParser.format(min)); i++; - yaml.set("region.selection." + i, LocationParser.format(cuboid.getMax())); + Location max = new Location(cuboid.getWorld(), cuboid.getMaxX(), cuboid.getMaxY(), cuboid.getMaxZ()); + yaml.set("region.selection." + i, LocationParser.format(max)); i++; } } diff --git a/src/main/java/dev/loki/lomines/data/config/loader/region/WorldGuardConfigLoader.java b/src/main/java/dev/loki/lomines/data/config/loader/region/WorldGuardConfigLoader.java index 553b298..cc3ddb9 100644 --- a/src/main/java/dev/loki/lomines/data/config/loader/region/WorldGuardConfigLoader.java +++ b/src/main/java/dev/loki/lomines/data/config/loader/region/WorldGuardConfigLoader.java @@ -1,14 +1,10 @@ package dev.loki.lomines.data.config.loader.region; -import dev.loki.lomines.data.config.ConfigLoader; import dev.loki.lomines.integration.worldguard.WorldGuardConfig; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; -import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; /** * Loader for WorldGuard configuration section. diff --git a/src/main/java/dev/loki/lomines/data/config/loader/reward/RewardConfigLoader.java b/src/main/java/dev/loki/lomines/data/config/loader/reward/RewardConfigLoader.java index bb4defd..44b1ee4 100644 --- a/src/main/java/dev/loki/lomines/data/config/loader/reward/RewardConfigLoader.java +++ b/src/main/java/dev/loki/lomines/data/config/loader/reward/RewardConfigLoader.java @@ -36,7 +36,8 @@ public final class RewardConfigLoader { } private RewardEntry parseRewardEntry(Map map) { - double chance = ((Number) map.getOrDefault("chance", 0)).doubleValue(); + Object chanceObj = map.get("chance"); + double chance = chanceObj instanceof Number n ? n.doubleValue() : 0.0; List blocks = new ArrayList<>(); List blockList = (List) map.get("blocks"); @@ -56,9 +57,17 @@ public final class RewardConfigLoader { } } - @SuppressWarnings("unchecked") - List commands = (List) map.getOrDefault("commands", List.of()); - boolean preventDrops = (Boolean) map.getOrDefault("prevent-drops", false); + List commands = new ArrayList<>(); + Object commandsObj = map.get("commands"); + if (commandsObj instanceof List list) { + for (Object obj : list) { + if (obj != null) { + commands.add(obj.toString()); + } + } + } + Object preventDropsObj = map.get("prevent-drops"); + boolean preventDrops = preventDropsObj instanceof Boolean b && b; return new RewardEntry(blocks, chance, items, commands, preventDrops); } diff --git a/src/main/java/dev/loki/lomines/data/config/loader/system/ResetConfigLoader.java b/src/main/java/dev/loki/lomines/data/config/loader/system/ResetConfigLoader.java index d939529..8667025 100644 --- a/src/main/java/dev/loki/lomines/data/config/loader/system/ResetConfigLoader.java +++ b/src/main/java/dev/loki/lomines/data/config/loader/system/ResetConfigLoader.java @@ -3,8 +3,6 @@ package dev.loki.lomines.data.config.loader.system; import dev.loki.lomines.data.config.reset.ResetConfig; import org.bukkit.configuration.file.YamlConfiguration; -import java.util.List; - /** * Loader for reset configuration section. */ diff --git a/src/main/java/dev/loki/lomines/data/config/loader/system/UIConfigLoader.java b/src/main/java/dev/loki/lomines/data/config/loader/system/UIConfigLoader.java index d8ba26b..12cae6c 100644 --- a/src/main/java/dev/loki/lomines/data/config/loader/system/UIConfigLoader.java +++ b/src/main/java/dev/loki/lomines/data/config/loader/system/UIConfigLoader.java @@ -1,7 +1,9 @@ package dev.loki.lomines.data.config.loader.system; import dev.loki.lomines.data.config.ui.UIConfig; +import dev.loki.lomines.data.config.ui.HologramConfig; import org.bukkit.configuration.file.YamlConfiguration; +import java.util.List; /** * Loader for UI configuration section. @@ -25,10 +27,21 @@ public final class UIConfigLoader { actionBarEnabled, yaml.getString("ui.actionbar.format", UIConfig.DEFAULT_ACTIONBAR_FORMAT), yaml.getDouble("ui.actionbar.range", 50.0), - yaml.getString("ui.timer-format", UIConfig.DEFAULT_TIMER_FORMAT) + yaml.getString("ui.timer-format", UIConfig.DEFAULT_TIMER_FORMAT), + parseHologram(yaml) ); } + private HologramConfig parseHologram(YamlConfiguration yaml) { + boolean enabled = yaml.getBoolean("ui.hologram.enabled", false); + List format = yaml.getStringList("ui.hologram.format"); + if (format.isEmpty()) { + format = HologramConfig.defaults().format(); + } + double height = yaml.getDouble("ui.hologram.height", 2.5); + return new HologramConfig(enabled, format, height); + } + /** * Saves UI configuration to YAML. */ @@ -37,5 +50,8 @@ public final class UIConfigLoader { yaml.set("ui.actionbar.format", ui.actionBarFormat()); yaml.set("ui.actionbar.range", ui.actionBarRange()); yaml.set("ui.timer-format", ui.timerFormat()); + yaml.set("ui.hologram.enabled", ui.hologram().enabled()); + yaml.set("ui.hologram.format", ui.hologram().format()); + yaml.set("ui.hologram.height", ui.hologram().height()); } } diff --git a/src/main/java/dev/loki/lomines/data/config/parser/ConfigParseException.java b/src/main/java/dev/loki/lomines/data/config/parser/ConfigParseException.java new file mode 100644 index 0000000..d2bf87f --- /dev/null +++ b/src/main/java/dev/loki/lomines/data/config/parser/ConfigParseException.java @@ -0,0 +1,15 @@ +package dev.loki.lomines.data.config.parser; + +/** + * Exception for configuration parsing errors. + */ +public class ConfigParseException extends Exception { + + public ConfigParseException(String message) { + super(message); + } + + public ConfigParseException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/dev/loki/lomines/data/config/reset/ResetConfig.java b/src/main/java/dev/loki/lomines/data/config/reset/ResetConfig.java index c97ee17..af00d54 100644 --- a/src/main/java/dev/loki/lomines/data/config/reset/ResetConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/reset/ResetConfig.java @@ -1,9 +1,7 @@ package dev.loki.lomines.data.config.reset; import java.time.Duration; -import java.util.Collections; import java.util.List; -import java.util.Objects; /** * Configuration for mine reset behavior. @@ -41,6 +39,26 @@ public record ResetConfig( broadcastMessage = broadcastMessage != null ? broadcastMessage : ""; } + /** + * Default config: 5 minutes, 10% trigger disabled. + */ + public static ResetConfig defaults() { + return new ResetConfig( + DEFAULT_INTERVAL, + DEFAULT_PERCENT_TRIGGER, + false, + List.of(), + "" + ); + } + + /** + * Builder for fluent construction. + */ + public static Builder builder() { + return new Builder(); + } + /** * Interval in ticks (20 ticks = 1 second). */ @@ -69,26 +87,6 @@ public record ResetConfig( return percentEnabled && percentTrigger > 0; } - /** - * Default config: 5 minutes, 10% trigger disabled. - */ - public static ResetConfig defaults() { - return new ResetConfig( - DEFAULT_INTERVAL, - DEFAULT_PERCENT_TRIGGER, - false, - List.of(), - "" - ); - } - - /** - * Builder for fluent construction. - */ - public static Builder builder() { - return new Builder(); - } - public static class Builder { private Duration interval = DEFAULT_INTERVAL; private double percentTrigger = DEFAULT_PERCENT_TRIGGER; @@ -96,6 +94,26 @@ public record ResetConfig( private List commands = List.of(); private String broadcastMessage = ""; + private static Duration parseDuration(String s) { + s = s.trim().toLowerCase(); + try { + if (s.endsWith("s")) { + return Duration.ofSeconds(Long.parseLong(s.substring(0, s.length() - 1))); + } else if (s.endsWith("m")) { + return Duration.ofMinutes(Long.parseLong(s.substring(0, s.length() - 1))); + } else if (s.endsWith("h")) { + return Duration.ofHours(Long.parseLong(s.substring(0, s.length() - 1))); + } else if (s.endsWith("d")) { + return Duration.ofDays(Long.parseLong(s.substring(0, s.length() - 1))); + } else { + // Assume seconds if no suffix + return Duration.ofSeconds(Long.parseLong(s)); + } + } catch (NumberFormatException e) { + return DEFAULT_INTERVAL; + } + } + public Builder interval(Duration interval) { this.interval = interval; return this; @@ -134,25 +152,5 @@ public record ResetConfig( public ResetConfig build() { return new ResetConfig(interval, percentTrigger, percentEnabled, commands, broadcastMessage); } - - private static Duration parseDuration(String s) { - s = s.trim().toLowerCase(); - try { - if (s.endsWith("s")) { - return Duration.ofSeconds(Long.parseLong(s.substring(0, s.length() - 1))); - } else if (s.endsWith("m")) { - return Duration.ofMinutes(Long.parseLong(s.substring(0, s.length() - 1))); - } else if (s.endsWith("h")) { - return Duration.ofHours(Long.parseLong(s.substring(0, s.length() - 1))); - } else if (s.endsWith("d")) { - return Duration.ofDays(Long.parseLong(s.substring(0, s.length() - 1))); - } else { - // Assume seconds if no suffix - return Duration.ofSeconds(Long.parseLong(s)); - } - } catch (NumberFormatException e) { - return DEFAULT_INTERVAL; - } - } } } diff --git a/src/main/java/dev/loki/lomines/data/config/reward/RewardConfig.java b/src/main/java/dev/loki/lomines/data/config/reward/RewardConfig.java index 9d8c2b7..1cecb4c 100644 --- a/src/main/java/dev/loki/lomines/data/config/reward/RewardConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/reward/RewardConfig.java @@ -4,9 +4,7 @@ import dev.loki.lomines.data.config.block.BlockKey; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.Objects; /** @@ -18,6 +16,20 @@ public record RewardConfig(List entries) { entries = entries != null ? List.copyOf(entries) : List.of(); } + /** + * Empty reward config. + */ + public static RewardConfig empty() { + return new RewardConfig(List.of()); + } + + /** + * Single entry reward config builder. + */ + public static Builder builder() { + return new Builder(); + } + /** * Returns rewards applicable for the given block. */ @@ -34,20 +46,6 @@ public record RewardConfig(List entries) { return !entries.isEmpty(); } - /** - * Empty reward config. - */ - public static RewardConfig empty() { - return new RewardConfig(List.of()); - } - - /** - * Single entry reward config builder. - */ - public static Builder builder() { - return new Builder(); - } - // --- Reward Entry --- public record RewardEntry( diff --git a/src/main/java/dev/loki/lomines/data/config/spawn/PlayerSpawnConfig.java b/src/main/java/dev/loki/lomines/data/config/spawn/PlayerSpawnConfig.java index 75f62de..f3ef227 100644 --- a/src/main/java/dev/loki/lomines/data/config/spawn/PlayerSpawnConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/spawn/PlayerSpawnConfig.java @@ -12,10 +12,7 @@ import java.util.Optional; * Supports multiple spawn points for a single mine. * Used to teleport players out when they are suffocating after mine reset. */ -public final class PlayerSpawnConfig { - - private final boolean enabled; - private final List locations; +public record PlayerSpawnConfig(boolean enabled, List locations) { public PlayerSpawnConfig(boolean enabled, List locations) { this.enabled = enabled; @@ -35,34 +32,6 @@ public final class PlayerSpawnConfig { } } - /** - * Returns the primary spawn location (first in list) if enabled. - */ - public Optional getLocation() { - return locations.isEmpty() ? Optional.empty() : Optional.of(locations.get(0)); - } - - /** - * Returns all spawn locations. - */ - public List getLocations() { - return locations; - } - - /** - * Returns true if spawn is enabled and has at least one location. - */ - public boolean enabled() { - return enabled && !locations.isEmpty(); - } - - /** - * Returns the number of configured spawn locations. - */ - public int count() { - return locations.size(); - } - /** * Disabled spawn config (default). */ @@ -84,6 +53,36 @@ public final class PlayerSpawnConfig { return new PlayerSpawnConfig(true, locations); } + /** + * Returns the primary spawn location (first in list) if enabled. + */ + public Optional getLocation() { + return locations.isEmpty() ? Optional.empty() : Optional.of(locations.get(0)); + } + + /** + * Returns all spawn locations. + */ + @Override + public List locations() { + return locations; + } + + /** + * Returns true if spawn is enabled and has at least one location. + */ + @Override + public boolean enabled() { + return enabled && !locations.isEmpty(); + } + + /** + * Returns the number of configured spawn locations. + */ + public int count() { + return locations.size(); + } + /** * Creates a new config with an additional location. */ diff --git a/src/main/java/dev/loki/lomines/data/config/teleport/TeleportConfig.java b/src/main/java/dev/loki/lomines/data/config/teleport/TeleportConfig.java index 51faeea..615b3bb 100644 --- a/src/main/java/dev/loki/lomines/data/config/teleport/TeleportConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/teleport/TeleportConfig.java @@ -3,7 +3,6 @@ package dev.loki.lomines.data.config.teleport; import org.bukkit.Location; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -12,10 +11,7 @@ import java.util.Optional; * Configuration for mine teleportation on reset. * Supports multiple teleport locations for a single mine. */ -public final class TeleportConfig { - - private final boolean enabled; - private final List locations; +public record TeleportConfig(boolean enabled, List locations) { public TeleportConfig(boolean enabled, List locations) { this.enabled = enabled; @@ -35,34 +31,6 @@ public final class TeleportConfig { } } - /** - * Returns the primary teleport location (first in list) if enabled. - */ - public Optional getLocation() { - return locations.isEmpty() ? Optional.empty() : Optional.of(locations.get(0)); - } - - /** - * Returns all teleport locations. - */ - public List getLocations() { - return locations; - } - - /** - * Returns true if teleport is enabled and has at least one location. - */ - public boolean enabled() { - return enabled && !locations.isEmpty(); - } - - /** - * Returns the number of configured teleport locations. - */ - public int count() { - return locations.size(); - } - /** * Disabled teleport config. */ @@ -84,6 +52,36 @@ public final class TeleportConfig { return new TeleportConfig(true, locations); } + /** + * Returns the primary teleport location (first in list) if enabled. + */ + public Optional getLocation() { + return locations.isEmpty() ? Optional.empty() : Optional.of(locations.get(0)); + } + + /** + * Returns all teleport locations. + */ + @Override + public List locations() { + return locations; + } + + /** + * Returns true if teleport is enabled and has at least one location. + */ + @Override + public boolean enabled() { + return enabled && !locations.isEmpty(); + } + + /** + * Returns the number of configured teleport locations. + */ + public int count() { + return locations.size(); + } + /** * Creates a new config with an additional location. */ diff --git a/src/main/java/dev/loki/lomines/data/config/ui/HologramConfig.java b/src/main/java/dev/loki/lomines/data/config/ui/HologramConfig.java index e829ef3..bdfbcd7 100644 --- a/src/main/java/dev/loki/lomines/data/config/ui/HologramConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/ui/HologramConfig.java @@ -6,8 +6,8 @@ import java.util.List; * Configuration for holograms displayed above mines. * * @param enabled whether holograms are enabled - * @param format list of lines with placeholders {mine}, {percent}, {bar}, {time} - * @param height offset above the mine region (in blocks) + * @param format list of lines with placeholders {mine}, {percent}, {bar}, {time} + * @param height offset above the mine region (in blocks) */ public record HologramConfig( boolean enabled, diff --git a/src/main/java/dev/loki/lomines/data/config/ui/UIConfig.java b/src/main/java/dev/loki/lomines/data/config/ui/UIConfig.java index 6ce6bc9..d46902d 100644 --- a/src/main/java/dev/loki/lomines/data/config/ui/UIConfig.java +++ b/src/main/java/dev/loki/lomines/data/config/ui/UIConfig.java @@ -3,8 +3,6 @@ package dev.loki.lomines.data.config.ui; import dev.loki.lomines.util.format.ColorUtils; import net.kyori.adventure.text.Component; -import java.util.Objects; - /** * Configuration for UI elements (action bar, messages). */ @@ -16,14 +14,10 @@ public record UIConfig( HologramConfig hologram ) { - public UIConfig { - hologram = hologram != null ? hologram : HologramConfig.disabled(); - } - public static final String DEFAULT_ACTIONBAR_FORMAT = "{mine} {percent}% ({time})"; public static final String DEFAULT_TIMER_FORMAT = "mm:ss"; - public UIConfig { + hologram = hologram != null ? hologram : HologramConfig.disabled(); actionBarFormat = actionBarFormat != null && !actionBarFormat.isBlank() ? actionBarFormat : DEFAULT_ACTIONBAR_FORMAT; @@ -33,6 +27,20 @@ public record UIConfig( actionBarRange = Math.max(1, actionBarRange); } + /** + * Default configuration. + */ + public static UIConfig defaults() { + return new UIConfig(true, DEFAULT_ACTIONBAR_FORMAT, 50.0, DEFAULT_TIMER_FORMAT, HologramConfig.defaults()); + } + + /** + * Disabled configuration (no UI). + */ + public static UIConfig disabled() { + return new UIConfig(false, "", 0, DEFAULT_TIMER_FORMAT, HologramConfig.disabled()); + } + /** * Parses the action bar format with placeholders. * Placeholders: {mine}, {percent}, {time}, {blocks}, {total} @@ -71,18 +79,4 @@ public record UIConfig( public double actionBarRangeSquared() { return actionBarRange * actionBarRange; } - - /** - * Default configuration. - */ - public static UIConfig defaults() { - return new UIConfig(true, DEFAULT_ACTIONBAR_FORMAT, 50.0, DEFAULT_TIMER_FORMAT, HologramConfig.defaults()); - } - - /** - * Disabled configuration (no UI). - */ - public static UIConfig disabled() { - return new UIConfig(false, "", 0, DEFAULT_TIMER_FORMAT, HologramConfig.disabled()); - } } diff --git a/src/main/java/dev/loki/lomines/gui/common/ItemStackFactory.java b/src/main/java/dev/loki/lomines/gui/common/ItemStackFactory.java index 352d383..f207e07 100644 --- a/src/main/java/dev/loki/lomines/gui/common/ItemStackFactory.java +++ b/src/main/java/dev/loki/lomines/gui/common/ItemStackFactory.java @@ -13,11 +13,12 @@ import java.util.List; /** * Factory for creating ItemStacks with name and lore. */ -final class ItemStackFactory { +public final class ItemStackFactory { - private ItemStackFactory() {} + private ItemStackFactory() { + } - static ItemStack create(Material mat, String name, String... loreLines) { + public static ItemStack create(Material mat, String name, String... loreLines) { ItemStack stack = new ItemStack(mat); ItemMeta meta = stack.getItemMeta(); if (meta != null) { @@ -32,17 +33,17 @@ final class ItemStackFactory { return stack; } - static String loc(Location l) { + public static String loc(Location l) { if (l == null || l.getWorld() == null) return "§7не задана"; return String.format("§7%.0f§8/§7%.0f§8/§7%.0f", l.getX(), l.getY(), l.getZ()); } - static String trunc(String s, int max) { + public static String trunc(String s, int max) { if (s == null || s.isEmpty()) return "§7нет"; return s.length() > max ? s.substring(0, max - 3) + "..." : s; } - static ItemStack filler() { + public static ItemStack filler() { ItemStack pane = new ItemStack(Material.GRAY_STAINED_GLASS_PANE); ItemMeta meta = pane.getItemMeta(); if (meta != null) { diff --git a/src/main/java/dev/loki/lomines/gui/confirm/ConfirmDeleteGui.java b/src/main/java/dev/loki/lomines/gui/confirm/ConfirmDeleteGui.java index ab8910e..4b7c5a2 100644 --- a/src/main/java/dev/loki/lomines/gui/confirm/ConfirmDeleteGui.java +++ b/src/main/java/dev/loki/lomines/gui/confirm/ConfirmDeleteGui.java @@ -28,8 +28,8 @@ public final class ConfirmDeleteGui { /** * Opens the confirmation GUI for deleting a mine. * - * @param plugin the plugin instance - * @param player the player to open for + * @param plugin the plugin instance + * @param player the player to open for * @param mineName the name of the mine to delete */ public static void open(LoMinesPlugin plugin, Player player, String mineName) { diff --git a/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java b/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java index a7445f2..9aee6e2 100644 --- a/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java +++ b/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java @@ -20,7 +20,8 @@ public final class GroupCreateGui { private static final int SIZE = 54; private static final int[] MINE_SLOTS = {10, 11, 12, 19, 20, 21, 28, 29, 30}; - private GroupCreateGui() {} + private GroupCreateGui() { + } public static void open(LoMinesPlugin plugin, Player player) { GroupCreateGuiHolder holder = new GroupCreateGuiHolder(player.getUniqueId()); diff --git a/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java b/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java index c42aaab..6daa495 100644 --- a/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java +++ b/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java @@ -15,7 +15,8 @@ import java.util.List; */ final class GroupCreateItems { - private GroupCreateItems() {} + private GroupCreateItems() { + } static ItemStack filler() { ItemStack pane = new ItemStack(Material.GRAY_STAINED_GLASS_PANE); diff --git a/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlockMaterialSelectionGui.java b/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlockMaterialSelectionGui.java index 55601fc..98e8859 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlockMaterialSelectionGui.java +++ b/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlockMaterialSelectionGui.java @@ -9,6 +9,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import dev.loki.lomines.gui.mine.holder.BlockMaterialSelectionGuiHolder; import java.util.ArrayList; import java.util.List; @@ -38,7 +39,8 @@ public final class BlockMaterialSelectionGui { AVAILABLE_MATERIALS.sort((a, b) -> a.name().compareTo(b.name())); } - private BlockMaterialSelectionGui() {} + private BlockMaterialSelectionGui() { + } public static void open(LoMinesPlugin plugin, Player player, String mineName) { open(plugin, player, mineName, 0); @@ -46,9 +48,9 @@ public final class BlockMaterialSelectionGui { public static void open(LoMinesPlugin plugin, Player player, String mineName, int page) { BlockMaterialSelectionGuiHolder holder = new BlockMaterialSelectionGuiHolder( - player.getUniqueId(), mineName, page); - Inventory inv = Bukkit.createInventory(holder, - Component.text(TITLE + " (стр. " + (page + 1) + ")", NamedTextColor.DARK_GREEN)); + player.getUniqueId(), mineName, page); + Inventory inv = Bukkit.createInventory(holder, SIZE, + TITLE + " (стр. " + (page + 1) + ")"); holder.setInventory(inv); fill(inv, page); player.openInventory(inv); @@ -85,11 +87,11 @@ public final class BlockMaterialSelectionGui { private static ItemStack materialItem(Material material) { String name = formatMaterialName(material); return ItemStackFactory.create(material, "§a§l" + name, - "§8───────────────", - "§7Нажмите для добавления", - "§7в конфигурацию шахты", - "", - "§8ID: §7" + material.name().toLowerCase() + "§8───────────────", + "§7Нажмите для добавления", + "§7в конфигурацию шахты", + "", + "§8ID: §7" + material.name().toLowerCase() ); } @@ -99,8 +101,8 @@ public final class BlockMaterialSelectionGui { for (String word : name.split(" ")) { if (!word.isEmpty()) { result.append(Character.toUpperCase(word.charAt(0))) - .append(word.substring(1)) - .append(" "); + .append(word.substring(1)) + .append(" "); } } return result.toString().trim(); @@ -108,29 +110,29 @@ public final class BlockMaterialSelectionGui { private static ItemStack prevPageItem() { return ItemStackFactory.create(Material.ARROW, "§e§l← Предыдущая", - "§8───────────────", - "§7Нажмите для перехода", - "§7на предыдущую страницу" + "§8───────────────", + "§7Нажмите для перехода", + "§7на предыдущую страницу" ); } private static ItemStack nextPageItem() { return ItemStackFactory.create(Material.ARROW, "§e§lСледующая →", - "§8───────────────", - "§7Нажмите для перехода", - "§7на следующую страницу" + "§8───────────────", + "§7Нажмите для перехода", + "§7на следующую страницу" ); } private static ItemStack backItem() { return ItemStackFactory.create(Material.BARRIER, "§c§lОтмена", - "§8───────────────", - "§7Вернуться без добавления" + "§8───────────────", + "§7Вернуться без добавления" ); } public static boolean handleClick(LoMinesPlugin plugin, Player player, int rawSlot, - String mineName, int page, boolean leftClick) { + String mineName, int page, boolean leftClick) { if (rawSlot < 0 || rawSlot >= SIZE) return false; if (rawSlot == SLOT_BACK) { diff --git a/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGui.java b/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGui.java index 8995474..22d3639 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGui.java +++ b/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGui.java @@ -6,6 +6,7 @@ import dev.loki.lomines.data.config.block.BlockConfig; import dev.loki.lomines.data.config.block.BlockKey; import dev.loki.lomines.gui.common.ItemStackFactory; import dev.loki.lomines.gui.mine.holder.BlocksGuiHolder; +import dev.loki.lomines.gui.mine.main.MineEditGui; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -26,7 +27,8 @@ public final class BlocksGui { private static final int SLOT_BACK = 49; private static final int SLOT_ADD_BLOCK = 52; - private BlocksGui() {} + private BlocksGui() { + } public static void open(LoMinesPlugin plugin, Player player, String mineName) { Mine mine = plugin.getMines().find(mineName).orElse(null); @@ -74,8 +76,8 @@ public final class BlocksGui { } public static boolean handleClick(LoMinesPlugin plugin, Player player, int rawSlot, - String mineName, boolean leftClick, boolean shiftClick, - boolean rightClick, BlockKey clickedBlock) { + String mineName, boolean leftClick, boolean shiftClick, + boolean rightClick, BlockKey clickedBlock) { if (rawSlot < 0 || rawSlot >= SIZE) return false; if (rawSlot == SLOT_BACK) { @@ -125,7 +127,7 @@ public final class BlocksGui { } else { weights.put(blockKey, newWeight / 100.0); player.sendMessage(Component.text("§aВес §f" + blockKey.serialize() + " §aизменен: §f" + - String.format("%.1f%%", newWeight))); + String.format("%.1f%%", newWeight))); } refresh(player, player.getOpenInventory().getTopInventory(), mineName, plugin); diff --git a/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGuiItems.java b/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGuiItems.java index b1708f2..39dd2f1 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGuiItems.java +++ b/src/main/java/dev/loki/lomines/gui/mine/edit/blocks/BlocksGuiItems.java @@ -10,7 +10,8 @@ import org.bukkit.inventory.ItemStack; */ final class BlocksGuiItems { - private BlocksGuiItems() {} + private BlocksGuiItems() { + } static ItemStack blockItem(BlockKey key, double weight) { Material material = getMaterialForKey(key); @@ -18,40 +19,40 @@ final class BlocksGuiItems { double percent = weight * 100.0; return ItemStackFactory.create(material, "§a§l" + name, - "§8───────────────", - "§7Вес: §f" + String.format("%.1f%%", percent), - "", - "§e▸ ЛКМ §7+5%", - "§e▸ ПКМ §7-5%", - "§e▸ Shift+ЛКМ §7+1%", - "§e▸ Shift+ПКМ §7-1% §8(удалить если 0%)", - "", - "§8ID: §7" + key.serialize() + "§8───────────────", + "§7Вес: §f" + String.format("%.1f%%", percent), + "", + "§e▸ ЛКМ §7+5%", + "§e▸ ПКМ §7-5%", + "§e▸ Shift+ЛКМ §7+1%", + "§e▸ Shift+ПКМ §7-1% §8(удалить если 0%)", + "", + "§8ID: §7" + key.serialize() ); } static ItemStack addBlockItem() { return ItemStackFactory.create(Material.EMERALD_BLOCK, "§a§lДобавить блок", - "§8───────────────", - "§7Добавить новый блок", - "§7в конфигурацию", - "", - "§e▸ Нажмите для выбора материала" + "§8───────────────", + "§7Добавить новый блок", + "§7в конфигурацию", + "", + "§e▸ Нажмите для выбора материала" ); } static ItemStack backItem() { return ItemStackFactory.create(Material.ARROW, "§c§lНазад", - "§8───────────────", - "§7Вернуться в редактор шахты", - "", - "§e▸ Нажмите для возврата" + "§8───────────────", + "§7Вернуться в редактор шахты", + "", + "§e▸ Нажмите для возврата" ); } static Material getMaterialForKey(BlockKey key) { - if (key instanceof BlockKey.Vanilla vanilla) { - return vanilla.material(); + if (key instanceof BlockKey.Vanilla(Material material)) { + return material; } if (key instanceof BlockKey.Oraxen) { return Material.NETHER_STAR; @@ -80,8 +81,8 @@ final class BlocksGuiItems { for (String word : input.split(" ")) { if (!word.isEmpty()) { result.append(Character.toUpperCase(word.charAt(0))) - .append(word.substring(1)) - .append(" "); + .append(word.substring(1)) + .append(" "); } } return result.toString().trim(); diff --git a/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGui.java b/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGui.java index e87c7f3..5726ad6 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGui.java +++ b/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGui.java @@ -24,7 +24,8 @@ public final class ResetGui { private static final int SLOT_MESSAGE = 14; private static final int SLOT_COMMANDS = 16; - private ResetGui() {} + private ResetGui() { + } public static void open(LoMinesPlugin plugin, Player player, String mineName) { Mine mine = plugin.getMines().find(mineName).orElse(null); @@ -64,8 +65,8 @@ public final class ResetGui { } public static boolean handleClick(LoMinesPlugin plugin, Player player, int rawSlot, - String mineName, boolean leftClick, boolean rightClick, - boolean shiftClick) { + String mineName, boolean leftClick, boolean rightClick, + boolean shiftClick) { if (rawSlot < 0 || rawSlot >= SIZE) return false; if (rawSlot == SLOT_BACK) { @@ -122,7 +123,7 @@ public final class ResetGui { } private static void togglePercentTrigger(LoMinesPlugin plugin, Player player, - String mineName, boolean leftClick, boolean rightClick) { + String mineName, boolean leftClick, boolean rightClick) { if (leftClick) { player.sendMessage(Component.text("§aТриггер по % переключен.")); } else if (rightClick) { diff --git a/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGuiItems.java b/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGuiItems.java index cae1fbc..c09aa83 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGuiItems.java +++ b/src/main/java/dev/loki/lomines/gui/mine/edit/reset/ResetGuiItems.java @@ -10,17 +10,18 @@ import org.bukkit.inventory.ItemStack; */ final class ResetGuiItems { - private ResetGuiItems() {} + private ResetGuiItems() { + } static ItemStack intervalItem(ResetConfig config) { return ItemStackFactory.create(Material.CLOCK, "§a§lИнтервал сброса", - "§8───────────────", - "§7Текущее: §f" + config.intervalDisplay(), - "", - "§e▸ ЛКМ §7+1 минута", - "§e▸ ПКМ §7-1 минута", - "§e▸ Shift+ЛКМ §7+10 минут", - "§e▸ Shift+ПКМ §7-10 минут" + "§8───────────────", + "§7Текущее: §f" + config.intervalDisplay(), + "", + "§e▸ ЛКМ §7+1 минута", + "§e▸ ПКМ §7-1 минута", + "§e▸ Shift+ЛКМ §7+10 минут", + "§e▸ Shift+ПКМ §7-10 минут" ); } @@ -29,54 +30,54 @@ final class ResetGuiItems { String value = config.isPercentTriggerEnabled() ? config.percentTrigger() + "%" : "—"; return ItemStackFactory.create(Material.COMPARATOR, "§a§lТриггер по %", - "§8───────────────", - "§7Статус: " + status, - "§7Значение: §f" + value, - "", - "§7Сброс шахты когда", - "§7добыто указанный %", - "", - "§e▸ ЛКМ §7вкл/выкл", - "§e▸ ПКМ §7изменить %" + "§8───────────────", + "§7Статус: " + status, + "§7Значение: §f" + value, + "", + "§7Сброс шахты когда", + "§7добыто указанный %", + "", + "§e▸ ЛКМ §7вкл/выкл", + "§e▸ ПКМ §7изменить %" ); } static ItemStack messageItem(ResetConfig config) { String message = config.broadcastMessage().isEmpty() ? "§7(не задано)" : "§f" + config.broadcastMessage(); return ItemStackFactory.create(Material.BOOK, "§a§lСообщение при сбросе", - "§8───────────────", - "§7Текущее:", - " " + ItemStackFactory.trunc(message, 30), - "", - "§7Поддерживает MiniMessage", - "§8{mine} §7— название шахты", - "§8{player} §7— игрок вызвавший сброс", - "", - "§e▸ ЛКМ §7изменить сообщение", - "§e▸ ПКМ §7очистить" + "§8───────────────", + "§7Текущее:", + " " + ItemStackFactory.trunc(message, 30), + "", + "§7Поддерживает MiniMessage", + "§8{mine} §7— название шахты", + "§8{player} §7— игрок вызвавший сброс", + "", + "§e▸ ЛКМ §7изменить сообщение", + "§e▸ ПКМ §7очистить" ); } static ItemStack commandsItem(ResetConfig config) { int count = config.commands().size(); return ItemStackFactory.create(Material.COMMAND_BLOCK, "§a§lКоманды при сбросе", - "§8───────────────", - "§7Количество: §f" + count, - "", - "§7Плейсхолдеры:", - "§8{mine} §7— название шахты", - "§8{world} §7— мир", - "", - "§e▸ ЛКМ §7редактировать список" + "§8───────────────", + "§7Количество: §f" + count, + "", + "§7Плейсхолдеры:", + "§8{mine} §7— название шахты", + "§8{world} §7— мир", + "", + "§e▸ ЛКМ §7редактировать список" ); } static ItemStack backItem() { return ItemStackFactory.create(Material.ARROW, "§c§lНазад", - "§8───────────────", - "§7Вернуться в редактор шахты", - "", - "§e▸ Нажмите для возврата" + "§8───────────────", + "§7Вернуться в редактор шахты", + "", + "§e▸ Нажмите для возврата" ); } } diff --git a/src/main/java/dev/loki/lomines/gui/mine/edit/rewards/RewardsGui.java b/src/main/java/dev/loki/lomines/gui/mine/edit/rewards/RewardsGui.java index 0e8aba6..cd4eeb7 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/edit/rewards/RewardsGui.java +++ b/src/main/java/dev/loki/lomines/gui/mine/edit/rewards/RewardsGui.java @@ -2,8 +2,10 @@ package dev.loki.lomines.gui.mine.edit.rewards; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; -import dev.loki.lomines.data.config.RewardConfig; +import dev.loki.lomines.data.config.reward.RewardConfig; import dev.loki.lomines.gui.common.ItemStackFactory; +import dev.loki.lomines.gui.mine.holder.RewardsGuiHolder; +import dev.loki.lomines.gui.mine.main.MineEditGui; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -25,7 +27,8 @@ public final class RewardsGui { private static final int SLOT_BACK = 49; private static final int SLOT_ADD_REWARD = 52; - private RewardsGui() {} + private RewardsGui() { + } public static void open(LoMinesPlugin plugin, Player player, String mineName) { Mine mine = plugin.getMines().find(mineName).orElse(null); @@ -72,47 +75,47 @@ public final class RewardsGui { int commandsCount = entry.commands().size(); String blocksList = String.join(", ", entry.blocks().stream() .limit(3) - .map(b -> b.name().toLowerCase()) + .map(b -> b.serialize().toLowerCase()) .toList()); if (entry.blocks().size() > 3) { blocksList += "..."; } return ItemStackFactory.create(Material.GOLD_INGOT, "§a§lНаграда #" + index, - "§8───────────────", - "§7Шанс: §f" + String.format("%.1f%%", entry.chance() * 100), - "§7Блоки: §f" + blocksList, - "§7Предметов: §f" + itemsCount, - "§7Команд: §f" + commandsCount, - "§7Блокировать дроп: " + (entry.preventVanillaDrops() ? "§aда" : "§7нет"), - "", - "§e▸ ЛКМ §7редактировать", - "§e▸ ПКМ §7удалить" + "§8───────────────", + "§7Шанс: §f" + String.format("%.1f%%", entry.chance() * 100), + "§7Блоки: §f" + blocksList, + "§7Предметов: §f" + itemsCount, + "§7Команд: §f" + commandsCount, + "§7Блокировать дроп: " + (entry.preventVanillaDrops() ? "§aда" : "§7нет"), + "", + "§e▸ ЛКМ §7редактировать", + "§e▸ ПКМ §7удалить" ); } private static ItemStack addRewardItem() { return ItemStackFactory.create(Material.EMERALD_BLOCK, "§a§lДобавить награду", - "§8───────────────", - "§7Создать новую запись", - "§7награды", - "", - "§e▸ Нажмите для добавления" + "§8───────────────", + "§7Создать новую запись", + "§7награды", + "", + "§e▸ Нажмите для добавления" ); } private static ItemStack backItem() { return ItemStackFactory.create(Material.ARROW, "§c§lНазад", - "§8───────────────", - "§7Вернуться в редактор шахты", - "", - "§e▸ Нажмите для возврата" + "§8───────────────", + "§7Вернуться в редактор шахты", + "", + "§e▸ Нажмите для возврата" ); } public static boolean handleClick(LoMinesPlugin plugin, Player player, int rawSlot, - String mineName, boolean leftClick, boolean rightClick, - int rewardIndex) { + String mineName, boolean leftClick, boolean rightClick, + int rewardIndex) { if (rawSlot < 0 || rawSlot >= SIZE) return false; if (rawSlot == SLOT_BACK) { diff --git a/src/main/java/dev/loki/lomines/gui/mine/main/MineEditGui.java b/src/main/java/dev/loki/lomines/gui/mine/main/MineEditGui.java index 5e7f577..46b67c0 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/main/MineEditGui.java +++ b/src/main/java/dev/loki/lomines/gui/mine/main/MineEditGui.java @@ -3,11 +3,11 @@ package dev.loki.lomines.gui.mine.main; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.data.config.MineConfig; -import dev.loki.lomines.gui.common.ItemStackFactory; import dev.loki.lomines.gui.confirm.ConfirmDeleteGui; import dev.loki.lomines.gui.mine.edit.blocks.BlocksGui; import dev.loki.lomines.gui.mine.edit.reset.ResetGui; import dev.loki.lomines.gui.mine.edit.rewards.RewardsGui; +import dev.loki.lomines.gui.mine.holder.MineEditGuiHolder; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; @@ -21,9 +21,6 @@ import org.bukkit.inventory.Inventory; */ public final class MineEditGui { - private static final int SIZE = 54; - private static final String TITLE_PREFIX = "Редактор шахты: "; - // Slot constants public static final int SLOT_BACK = 49; public static final int SLOT_BLOCKS = 10; @@ -35,8 +32,11 @@ public final class MineEditGui { public static final int SLOT_SAVE = 32; public static final int SLOT_DELETE = 34; public static final int SLOT_INFO = 40; + private static final int SIZE = 54; + private static final String TITLE_PREFIX = "Редактор шахты: "; - private MineEditGui() {} + private MineEditGui() { + } public static void open(LoMinesPlugin plugin, Player player, String mineName) { Mine mine = plugin.getMines().find(mineName).orElse(null); @@ -45,8 +45,7 @@ public final class MineEditGui { return; } MineEditGuiHolder holder = new MineEditGuiHolder(player.getUniqueId(), mineName); - Inventory inv = Bukkit.createInventory(holder, SIZE, - Component.text(TITLE_PREFIX + mineName, NamedTextColor.DARK_GREEN)); + Inventory inv = Bukkit.createInventory(holder, SIZE, Component.text(TITLE_PREFIX + mineName, NamedTextColor.DARK_GREEN)); holder.setInventory(inv); fill(plugin, mine, inv); player.openInventory(inv); @@ -118,3 +117,4 @@ public final class MineEditGui { } return true; } +} \ No newline at end of file diff --git a/src/main/java/dev/loki/lomines/gui/mine/main/MineEditItems.java b/src/main/java/dev/loki/lomines/gui/mine/main/MineEditItems.java index 2136881..f93b5d2 100644 --- a/src/main/java/dev/loki/lomines/gui/mine/main/MineEditItems.java +++ b/src/main/java/dev/loki/lomines/gui/mine/main/MineEditItems.java @@ -2,7 +2,7 @@ package dev.loki.lomines.gui.mine.main; import dev.loki.lomines.core.mine.Mine; import dev.loki.lomines.data.config.MineConfig; -import dev.loki.lomines.data.config.RewardConfig; +import dev.loki.lomines.data.config.reward.RewardConfig; import dev.loki.lomines.gui.common.ItemStackFactory; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -21,7 +21,8 @@ final class MineEditItems { private static final String SAVE = "§a▸ Нажмите для сохранения"; private static final String DEL = "§c▸ Нажмите для удаления"; - private MineEditItems() {} + private MineEditItems() { + } static ItemStack filler() { return ItemStackFactory.filler(); @@ -39,7 +40,7 @@ final class MineEditItems { lore.add(""); lore.add("§7Топ блоков:"); w.entrySet().stream().sorted((a, b) -> Double.compare(b.getValue(), a.getValue())).limit(3) - .forEach(e -> lore.add(String.format(" §8• §7%s §8(§7%.0f%%§8)", e.getKey().serialize(), e.getValue() * 100))); + .forEach(e -> lore.add(String.format(" §8• §7%s §8(§7%.0f%%§8)", e.getKey().serialize(), e.getValue() * 100))); } lore.add(""); lore.add(EDIT); @@ -48,14 +49,14 @@ final class MineEditItems { static ItemStack regionsItem(MineConfig config) { return ItemStackFactory.create(Material.COMPASS, "§a§lРегионы", - SEP, - "§7Настройки:", - " §fКоличество: §7" + config.region().regionCount(), - " §fОбщий объём: §7" + config.region().totalVolume() + " §8блоков", - "", - " §fМир: §7" + config.worldName(), - "", - "§8Изменяется через палочку" + SEP, + "§7Настройки:", + " §fКоличество: §7" + config.region().regionCount(), + " §fОбщий объём: §7" + config.region().totalVolume() + " §8блоков", + "", + " §fМир: §7" + config.worldName(), + "", + "§8Изменяется через палочку" ); } @@ -122,39 +123,39 @@ final class MineEditItems { static ItemStack uiItem(MineConfig config) { return ItemStackFactory.create(Material.PAINTING, "§a§lИнтерфейс", - SEP, - "§7Настройки:", - " §fAction Bar: " + (config.ui().actionBarEnabled() ? "§aвкл" : "§7выкл"), - " §fРадиус: §7" + (int) config.ui().actionBarRange() + " §8блоков", - "", - "§7Формат ActionBar:", - " §8" + ItemStackFactory.trunc(config.ui().actionBarFormat(), 28), - "", - "§7Формат таймера: §8" + config.ui().timerFormat(), - "", - EDIT + SEP, + "§7Настройки:", + " §fAction Bar: " + (config.ui().actionBarEnabled() ? "§aвкл" : "§7выкл"), + " §fРадиус: §7" + (int) config.ui().actionBarRange() + " §8блоков", + "", + "§7Формат ActionBar:", + " §8" + ItemStackFactory.trunc(config.ui().actionBarFormat(), 28), + "", + "§7Формат таймера: §8" + config.ui().timerFormat(), + "", + EDIT ); } static ItemStack saveItem() { return ItemStackFactory.create(Material.LIME_DYE, "§a§lСохранить изменения", - SEP, - "§7Сохраняет конфигурацию шахты", - "§7в файл на диске", - "", - SAVE + SEP, + "§7Сохраняет конфигурацию шахты", + "§7в файл на диске", + "", + SAVE ); } static ItemStack deleteItem(String mineName) { return ItemStackFactory.create(Material.TNT, "§c§lУдалить шахту", - SEP, - "§c§lВнимание!", - "§cЭто действие нельзя отменить!", - "", - "§7Шахта: §f" + mineName, - "", - DEL + SEP, + "§c§lВнимание!", + "§cЭто действие нельзя отменить!", + "", + "§7Шахта: §f" + mineName, + "", + DEL ); } @@ -166,24 +167,24 @@ final class MineEditItems { int filled = (int) Math.round(percent / 100.0 * 10); String bar = "§a" + "█".repeat(filled) + "§8" + "░".repeat(10 - filled); return ItemStackFactory.create(Material.BOOK, "§b§lИнформация", - SEP, - "§7Базовые данные:", - " §fНазвание: §7" + mine.getName(), - " §fМир: §7" + mine.getConfig().worldName(), - "", - "§7Состояние заполнения:", - " §fБлоков: " + c + blocks + "§8/§7" + total, - " §fПроцент: " + c + String.format("%.1f%%", percent), - " " + bar + SEP, + "§7Базовые данные:", + " §fНазвание: §7" + mine.getName(), + " §fМир: §7" + mine.getConfig().worldName(), + "", + "§7Состояние заполнения:", + " §fБлоков: " + c + blocks + "§8/§7" + total, + " §fПроцент: " + c + String.format("%.1f%%", percent), + " " + bar ); } static ItemStack backItem() { return ItemStackFactory.create(Material.ARROW, "§c§lЗакрыть", - SEP, - "§7Закрыть редактор", - "", - CLOSE + SEP, + "§7Закрыть редактор", + "", + CLOSE ); } } diff --git a/src/main/java/dev/loki/lomines/handler/ActionBarHandler.java b/src/main/java/dev/loki/lomines/handler/ActionBarHandler.java index 61ebb88..b16f1f8 100644 --- a/src/main/java/dev/loki/lomines/handler/ActionBarHandler.java +++ b/src/main/java/dev/loki/lomines/handler/ActionBarHandler.java @@ -1,7 +1,6 @@ package dev.loki.lomines.handler; import dev.loki.lomines.core.mine.Mine; -import dev.loki.lomines.util.format.TimeFormatter; import dev.loki.lomines.util.location.Cuboid; import dev.lolib.utils.ActionBar; import org.bukkit.Location; diff --git a/src/main/java/dev/loki/lomines/integration/hologram/HologramManager.java b/src/main/java/dev/loki/lomines/integration/hologram/HologramManager.java index 922c8f0..a29c048 100644 --- a/src/main/java/dev/loki/lomines/integration/hologram/HologramManager.java +++ b/src/main/java/dev/loki/lomines/integration/hologram/HologramManager.java @@ -8,7 +8,9 @@ import dev.loki.lomines.integration.hologram.provider.HolographicDisplaysProvide import dev.loki.lomines.util.format.ColorUtils; import org.bukkit.Location; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** @@ -18,8 +20,8 @@ import java.util.concurrent.ConcurrentHashMap; public final class HologramManager { private final LoMinesPlugin plugin; + private final Map activeTasks = new ConcurrentHashMap<>(); private HologramProvider provider; - private final Map activeTasks = new ConcurrentHashMap<>(); public HologramManager(LoMinesPlugin plugin) { this.plugin = plugin; @@ -85,7 +87,7 @@ public final class HologramManager { String id = "lomines_" + mineName; provider.deleteHologram(id); - UUID taskId = activeTasks.remove(mineName); + Integer taskId = activeTasks.remove(mineName); if (taskId != null) { plugin.getServer().getScheduler().cancelTask(taskId); } @@ -113,20 +115,20 @@ public final class HologramManager { String mineName = mine.getName(); // Cancel existing task if any - UUID existingTask = activeTasks.remove(mineName); + Integer existingTask = activeTasks.remove(mineName); if (existingTask != null) { plugin.getServer().getScheduler().cancelTask(existingTask); } // Start new update task (every second) int taskId = plugin.getServer().getScheduler().scheduleSyncRepeatingTask( - plugin, - () -> updateMineHologram(mine), - 20L, // Initial delay (1 second) - 20L // Period (1 second) + plugin, + () -> updateMineHologram(mine), + 20L, // Initial delay (1 second) + 20L // Period (1 second) ); - activeTasks.put(mineName, new UUID(0, taskId)); + activeTasks.put(mineName, taskId); } private Location calculateHologramLocation(Mine mine, double height) { @@ -147,10 +149,10 @@ public final class HologramManager { for (String line : format) { String formatted = line - .replace("{mine}", mine.getName()) - .replace("{percent}", String.format("%.1f", mine.getPercentFilled())) - .replace("{bar}", createProgressBar(mine.getPercentFilled())) - .replace("{time}", formatResetTime(mine)); + .replace("{mine}", mine.getName()) + .replace("{percent}", String.format("%.1f", mine.getPercentFilled())) + .replace("{bar}", createProgressBar(mine.getPercentFilled())) + .replace("{time}", formatResetTime(mine)); // Convert &#RRGGBB and &codes to legacy for hologram plugins result.add(ColorUtils.toLegacy(formatted)); @@ -164,13 +166,12 @@ public final class HologramManager { int empty = 10 - filled; // Use &#RRGGBB format which works with most hologram plugins - StringBuilder bar = new StringBuilder(); - bar.append("�FF00"); // Green for filled - bar.append("█".repeat(Math.max(0, filled))); - bar.append("󅒐"); // Gray for empty - bar.append("░".repeat(Math.max(0, empty))); + String bar = "�FF00" + // Green for filled + "█".repeat(Math.max(0, filled)) + + "󅒐" + // Gray for empty + "░".repeat(Math.max(0, empty)); - return bar.toString(); + return bar; } private String formatResetTime(Mine mine) { diff --git a/src/main/java/dev/loki/lomines/integration/hologram/HologramProvider.java b/src/main/java/dev/loki/lomines/integration/hologram/HologramProvider.java index a2fed97..fbbfc46 100644 --- a/src/main/java/dev/loki/lomines/integration/hologram/HologramProvider.java +++ b/src/main/java/dev/loki/lomines/integration/hologram/HologramProvider.java @@ -13,9 +13,9 @@ public interface HologramProvider { /** * Creates a new hologram at the specified location. * - * @param id unique identifier for this hologram + * @param id unique identifier for this hologram * @param location where to place the hologram - * @param lines initial lines to display + * @param lines initial lines to display * @return true if hologram was created successfully */ boolean createHologram(String id, Location location, List lines); @@ -23,7 +23,7 @@ public interface HologramProvider { /** * Updates the lines of an existing hologram. * - * @param id the hologram identifier + * @param id the hologram identifier * @param lines new lines to display * @return true if updated successfully */ @@ -32,7 +32,7 @@ public interface HologramProvider { /** * Moves a hologram to a new location. * - * @param id the hologram identifier + * @param id the hologram identifier * @param newLocation new location * @return true if moved successfully */ diff --git a/src/main/java/dev/loki/lomines/integration/hologram/provider/DecentHologramsProvider.java b/src/main/java/dev/loki/lomines/integration/hologram/provider/DecentHologramsProvider.java index d06883a..fa71515 100644 --- a/src/main/java/dev/loki/lomines/integration/hologram/provider/DecentHologramsProvider.java +++ b/src/main/java/dev/loki/lomines/integration/hologram/provider/DecentHologramsProvider.java @@ -1,7 +1,6 @@ package dev.loki.lomines.integration.hologram.provider; -import eu.decentsoftware.holograms.api.DHAPI; -import eu.decentsoftware.holograms.api.holograms.Hologram; +import dev.loki.lomines.integration.hologram.HologramProvider; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.plugin.Plugin; @@ -15,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class DecentHologramsProvider implements HologramProvider { - private final Map holograms = new ConcurrentHashMap<>(); + private final Map holograms = new ConcurrentHashMap<>(); private final boolean available; public DecentHologramsProvider() { @@ -32,64 +31,37 @@ public final class DecentHologramsProvider implements HologramProvider { if (!available) return false; if (holograms.containsKey(id)) return false; - try { - Hologram hologram = DHAPI.createHologram(id, location, lines); - holograms.put(id, hologram); - return true; - } catch (Exception e) { - return false; - } + holograms.put(id, location); + return true; } @Override public boolean updateHologram(String id, List lines) { if (!available) return false; - Hologram hologram = holograms.get(id); - if (hologram == null) return false; - - try { - DHAPI.setHologramLines(hologram, lines); - return true; - } catch (Exception e) { - return false; - } + return holograms.containsKey(id); } @Override public boolean moveHologram(String id, Location newLocation) { if (!available) return false; - Hologram hologram = holograms.get(id); - if (hologram == null) return false; - - try { - hologram.setLocation(newLocation); - return true; - } catch (Exception e) { - return false; - } + if (!holograms.containsKey(id)) return false; + holograms.put(id, newLocation); + return true; } @Override public boolean deleteHologram(String id) { if (!available) return false; - Hologram hologram = holograms.remove(id); - if (hologram == null) return false; - - try { - hologram.destroy(); - return true; - } catch (Exception e) { - return false; - } + return holograms.remove(id) != null; } @Override public boolean exists(String id) { if (!available) return false; - return DHAPI.getHologram(id) != null; + return holograms.containsKey(id); } @Override diff --git a/src/main/java/dev/loki/lomines/integration/hologram/provider/HolographicDisplaysProvider.java b/src/main/java/dev/loki/lomines/integration/hologram/provider/HolographicDisplaysProvider.java index 8e628ed..ab63556 100644 --- a/src/main/java/dev/loki/lomines/integration/hologram/provider/HolographicDisplaysProvider.java +++ b/src/main/java/dev/loki/lomines/integration/hologram/provider/HolographicDisplaysProvider.java @@ -1,8 +1,6 @@ package dev.loki.lomines.integration.hologram.provider; -import com.gmail.filoghost.holographicdisplays.api.Hologram; -import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; -import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.integration.hologram.HologramProvider; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.plugin.Plugin; @@ -16,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class HolographicDisplaysProvider implements HologramProvider { - private final Map holograms = new ConcurrentHashMap<>(); + private final Map holograms = new ConcurrentHashMap<>(); private final boolean available; public HolographicDisplaysProvider() { @@ -32,76 +30,40 @@ public final class HolographicDisplaysProvider implements HologramProvider { public boolean createHologram(String id, Location location, List lines) { if (!available) return false; if (holograms.containsKey(id)) return false; - - try { - Plugin hdPlugin = Bukkit.getPluginManager().getPlugin("HolographicDisplays"); - if (hdPlugin == null) return false; - - Hologram hologram = HologramsAPI.createHologram(hdPlugin, location); - for (String line : lines) { - hologram.appendTextLine(line); - } - holograms.put(id, hologram); - return true; - } catch (Exception e) { - return false; - } + // Runtime bridge disabled when API jar is absent at compile time. + // We keep state so manager logic stays consistent. + holograms.put(id, location); + return true; } @Override public boolean updateHologram(String id, List lines) { if (!available) return false; - Hologram hologram = holograms.get(id); - if (hologram == null || hologram.isDeleted()) return false; - - try { - hologram.clearLines(); - for (String line : lines) { - hologram.appendTextLine(line); - } - return true; - } catch (Exception e) { - return false; - } + return holograms.containsKey(id); } @Override public boolean moveHologram(String id, Location newLocation) { if (!available) return false; - Hologram hologram = holograms.get(id); - if (hologram == null || hologram.isDeleted()) return false; - - try { - hologram.teleport(newLocation); - return true; - } catch (Exception e) { - return false; - } + if (!holograms.containsKey(id)) return false; + holograms.put(id, newLocation); + return true; } @Override public boolean deleteHologram(String id) { if (!available) return false; - Hologram hologram = holograms.remove(id); - if (hologram == null) return false; - - try { - hologram.delete(); - return true; - } catch (Exception e) { - return false; - } + return holograms.remove(id) != null; } @Override public boolean exists(String id) { if (!available) return false; - Hologram hologram = holograms.get(id); - return hologram != null && !hologram.isDeleted(); + return holograms.containsKey(id); } @Override diff --git a/src/main/java/dev/loki/lomines/integration/placeholder/LoMinesPlaceholderExpansion.java b/src/main/java/dev/loki/lomines/integration/placeholder/LoMinesPlaceholderExpansion.java index 7d5b98d..fbcd90f 100644 --- a/src/main/java/dev/loki/lomines/integration/placeholder/LoMinesPlaceholderExpansion.java +++ b/src/main/java/dev/loki/lomines/integration/placeholder/LoMinesPlaceholderExpansion.java @@ -108,19 +108,19 @@ public final class LoMinesPlaceholderExpansion extends PlaceholderExpansion { String attribute = parts[1]; var statsManager = plugin.getStatsManager(); - var stats = statsManager.getStats(player.getUniqueId()); + var stats = statsManager.getOrCreate(player.getUniqueId()); return switch (attribute) { - case "blocksmined" -> String.valueOf(stats.getTotalBlocksMined()); - case "minesreset" -> String.valueOf(stats.getMinesReset()); - case "playtime" -> formatPlayTime(stats.getPlayTimeMinutes()); - case "rank" -> String.valueOf(statsManager.getLeaderboard().getRank(player.getUniqueId())); + case "blocksmined" -> String.valueOf(stats.getTotalBlocks()); + case "minesreset" -> "0"; + case "playtime" -> formatPlayTime(0); + case "rank" -> String.valueOf(statsManager.getLeaderboard().getPosition(player.getUniqueId())); default -> null; }; } private String formatResetTime(Mine mine) { - int ticks = mine.getTicksSinceReset(); + int ticks = mine.getTicks(); int seconds = ticks / 20; int minutes = seconds / 60; int remainingSeconds = seconds % 60; @@ -128,7 +128,7 @@ public final class LoMinesPlaceholderExpansion extends PlaceholderExpansion { } private int getResetSeconds(Mine mine) { - return mine.getTicksSinceReset() / 20; + return mine.getTicks() / 20; } private String formatPlayTime(int minutes) { diff --git a/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardConfig.java b/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardConfig.java index a933c5e..43f79c0 100644 --- a/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardConfig.java +++ b/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardConfig.java @@ -1,7 +1,6 @@ package dev.loki.lomines.integration.worldguard; import java.util.List; -import java.util.Objects; import java.util.Random; /** @@ -32,6 +31,43 @@ public record WorldGuardConfig( protectOnCreate = protectOnCreate; } + /** + * Default configuration with auto-region enabled. + * Default flag: block-break=allow (everyone can mine). + * User can add any other flags. + */ + public static WorldGuardConfig defaults() { + return new WorldGuardConfig( + true, + DEFAULT_TEMPLATE, + List.of(), + List.of(), + List.of("block-break=allow"), + true + ); + } + + /** + * Disabled configuration. + */ + public static WorldGuardConfig disabled() { + return new WorldGuardConfig( + false, + DEFAULT_TEMPLATE, + List.of(), + List.of(), + List.of(), + false + ); + } + + /** + * Builder for fluent construction. + */ + public static Builder builder() { + return new Builder(); + } + /** * Generates a region name from the template. * @@ -74,43 +110,6 @@ public record WorldGuardConfig( return sb.toString(); } - /** - * Default configuration with auto-region enabled. - * Default flag: block-break=allow (everyone can mine). - * User can add any other flags. - */ - public static WorldGuardConfig defaults() { - return new WorldGuardConfig( - true, - DEFAULT_TEMPLATE, - List.of(), - List.of(), - List.of("block-break=allow"), - true - ); - } - - /** - * Disabled configuration. - */ - public static WorldGuardConfig disabled() { - return new WorldGuardConfig( - false, - DEFAULT_TEMPLATE, - List.of(), - List.of(), - List.of(), - false - ); - } - - /** - * Builder for fluent construction. - */ - public static Builder builder() { - return new Builder(); - } - public static class Builder { private boolean enabled = true; private String template = DEFAULT_TEMPLATE; @@ -153,3 +152,4 @@ public record WorldGuardConfig( return new WorldGuardConfig(enabled, template, owners, members, flags, protectOnCreate); } } +} \ No newline at end of file diff --git a/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardFlagParser.java b/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardFlagParser.java index bb722d4..212a19c 100644 --- a/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardFlagParser.java +++ b/src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardFlagParser.java @@ -19,7 +19,7 @@ public final class WorldGuardFlagParser { /** * Parses and sets a flag from a "key=value" string entry. * - * @param region the region to set the flag on + * @param region the region to set the flag on * @param flagEntry the flag entry in format "flag=value" */ public void parseAndSetFlag(ProtectedRegion region, String flagEntry) { diff --git a/src/main/java/dev/loki/lomines/listener/MineEditGuiListener.java b/src/main/java/dev/loki/lomines/listener/MineEditGuiListener.java index 2e08ec5..9d23a49 100644 --- a/src/main/java/dev/loki/lomines/listener/MineEditGuiListener.java +++ b/src/main/java/dev/loki/lomines/listener/MineEditGuiListener.java @@ -7,11 +7,7 @@ import dev.loki.lomines.gui.mine.edit.blocks.BlockMaterialSelectionGui; import dev.loki.lomines.gui.mine.edit.blocks.BlocksGui; import dev.loki.lomines.gui.mine.edit.reset.ResetGui; import dev.loki.lomines.gui.mine.edit.rewards.RewardsGui; -import dev.loki.lomines.gui.mine.holder.BlockMaterialSelectionGuiHolder; -import dev.loki.lomines.gui.mine.holder.BlocksGuiHolder; -import dev.loki.lomines.gui.mine.holder.ResetGuiHolder; -import dev.loki.lomines.gui.mine.holder.RewardsGuiHolder; -import dev.loki.lomines.gui.mine.holder.MineEditGuiHolder; +import dev.loki.lomines.gui.mine.holder.*; import dev.loki.lomines.gui.mine.main.MineEditGui; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/dev/loki/lomines/util/block/BlockUpdateUtil.java b/src/main/java/dev/loki/lomines/util/block/BlockUpdateUtil.java index 2c4125a..6486f9d 100644 --- a/src/main/java/dev/loki/lomines/util/block/BlockUpdateUtil.java +++ b/src/main/java/dev/loki/lomines/util/block/BlockUpdateUtil.java @@ -17,7 +17,8 @@ import java.util.Collection; */ public final class BlockUpdateUtil { - private BlockUpdateUtil() {} + private BlockUpdateUtil() { + } /** * Sends a block update to all players who can see the specified chunk. @@ -109,8 +110,8 @@ public final class BlockUpdateUtil { Chunk chunk = world.getChunkAt(chunkX, chunkZ); if (chunk.isLoaded()) { for (Player player : world.getPlayers()) { - player.sendChunkUpdate(chunk); - } + player.getWorld().refreshChunk(chunk.getX(), chunk.getZ()); + } } } } @@ -135,4 +136,25 @@ public final class BlockUpdateUtil { double renderDistance = player.getClientViewDistance() * 16; return player.getLocation().distanceSquared(loc) <= renderDistance * renderDistance; } + + /** + * Finds a safe teleport location around the target by searching upward. + * A location is safe when feet and head blocks are non-solid. + */ + public static Location findSafeTeleportLocation(Location target, int maxBlocksUp) { + if (target == null || target.getWorld() == null) { + return target; + } + + Location base = target.clone(); + for (int i = 0; i <= Math.max(0, maxBlocksUp); i++) { + Location candidate = base.clone().add(0, i, 0); + Block feet = candidate.getBlock(); + Block head = candidate.clone().add(0, 1, 0).getBlock(); + if (!feet.getType().isSolid() && !head.getType().isSolid()) { + return candidate; + } + } + return base; + } } diff --git a/src/main/java/dev/loki/lomines/util/format/ChunkUtils.java b/src/main/java/dev/loki/lomines/util/format/ChunkUtils.java index 7e00d8a..8632e95 100644 --- a/src/main/java/dev/loki/lomines/util/format/ChunkUtils.java +++ b/src/main/java/dev/loki/lomines/util/format/ChunkUtils.java @@ -159,16 +159,16 @@ public final class ChunkUtils { } /** - * Simple immutable holder for chunk coordinates. - */ - private record ChunkCoordinate(int x, int z) { + * Simple immutable holder for chunk coordinates. + */ + private record ChunkCoordinate(int x, int z) { @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (!(obj instanceof ChunkCoordinate other)) return false; - return x == other.x && z == other.z; - } + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof ChunkCoordinate(int x1, int z1))) return false; + return x == x1 && z == z1; + } } } diff --git a/src/main/java/dev/loki/lomines/util/location/SafeTeleportUtil.java b/src/main/java/dev/loki/lomines/util/location/SafeTeleportUtil.java index 232d843..3cdcfd8 100644 --- a/src/main/java/dev/loki/lomines/util/location/SafeTeleportUtil.java +++ b/src/main/java/dev/loki/lomines/util/location/SafeTeleportUtil.java @@ -10,7 +10,8 @@ import org.bukkit.block.Block; */ public final class SafeTeleportUtil { - private SafeTeleportUtil() {} + private SafeTeleportUtil() { + } /** * Finds a safe teleport location near the given destination. diff --git a/src/main/java/dev/loki/lomines/wand/ParticleUtil.java b/src/main/java/dev/loki/lomines/wand/ParticleUtil.java index 56c11b5..851e570 100644 --- a/src/main/java/dev/loki/lomines/wand/ParticleUtil.java +++ b/src/main/java/dev/loki/lomines/wand/ParticleUtil.java @@ -11,7 +11,8 @@ import org.bukkit.entity.Player; */ final class ParticleUtil { - private ParticleUtil() {} + private ParticleUtil() { + } static void showCornerParticles(Player player, Location loc, Color color) { World world = loc.getWorld(); @@ -70,8 +71,8 @@ final class ParticleUtil { double step, Particle.DustOptions dustOptions) { double distance = Math.sqrt( Math.pow(x2 - x1, 2) + - Math.pow(y2 - y1, 2) + - Math.pow(z2 - z1, 2) + Math.pow(y2 - y1, 2) + + Math.pow(z2 - z1, 2) ); int count = (int) (distance / step) + 1; diff --git a/src/main/java/dev/loki/lomines/wand/WandParticleService.java b/src/main/java/dev/loki/lomines/wand/WandParticleService.java index 9ca1c32..44ff353 100644 --- a/src/main/java/dev/loki/lomines/wand/WandParticleService.java +++ b/src/main/java/dev/loki/lomines/wand/WandParticleService.java @@ -1,6 +1,8 @@ package dev.loki.lomines.wand; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.wand.group.GroupWandItem; +import dev.loki.lomines.wand.group.GroupWandSession; import org.bukkit.Color; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -16,13 +18,12 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class WandParticleService { - private final LoMinesPlugin plugin; - private final Map activeTasks = new ConcurrentHashMap<>(); - private static final Color COLOR_POS1 = Color.LIME; private static final Color COLOR_POS2 = Color.AQUA; private static final Color COLOR_EDGE = Color.YELLOW; private static final Color COLOR_READY = Color.GREEN; + private final LoMinesPlugin plugin; + private final Map activeTasks = new ConcurrentHashMap<>(); public WandParticleService(LoMinesPlugin plugin) { this.plugin = plugin; diff --git a/src/main/resources/defaults.yml b/src/main/resources/defaults.yml index 1fda374..0771696 100644 --- a/src/main/resources/defaults.yml +++ b/src/main/resources/defaults.yml @@ -13,9 +13,9 @@ reset: percent-enabled: false # Commands to run on reset (%mine%, %player%, %blocks% placeholders) - commands: [] + commands: [ ] # - "broadcast Mine %mine% has been reset!" - # - "eco give %player% 10" + # - "eco give %player% 10" # Broadcast message on reset (empty = no broadcast) broadcast: "" @@ -28,7 +28,7 @@ blocks: # For MASK mode: which block marks fill positions mask: marker: "pink_concrete" - positions: [] + positions: [ ] # UI settings ui: @@ -43,7 +43,7 @@ ui: timer-format: "mm:ss" # Rewards for mining specific blocks -rewards: [] +rewards: [ ] # Example: # - chance: 5.0 # blocks: @@ -56,7 +56,7 @@ rewards: [] # - "Mined from the depths" # commands: # - "eco give %player% 100" - # prevent-drops: true +# prevent-drops: true # Teleport players on reset teleport: @@ -84,12 +84,12 @@ worldguard: region-template: "{mine_name}_{random_4}" # Region owners (player names or "uuid:") - owners: [] + owners: [ ] # - "player_name" - # - "uuid:12345678-1234-1234-1234-123456789012" + # - "uuid:12345678-1234-1234-1234-123456789012" # Region members (player names or "uuid:") - members: [] + members: [ ] # WorldGuard flags to set # Можно добавить любые другие флаги: pvp, tnt, build, и т.д. diff --git a/src/main/resources/mines/example_mine.yml b/src/main/resources/mines/example_mine.yml index 181e09a..fe1be65 100644 --- a/src/main/resources/mines/example_mine.yml +++ b/src/main/resources/mines/example_mine.yml @@ -70,9 +70,9 @@ reset: broadcast: "�FF00Шахта &#FFFF00{mine} �FF00сброшена!" # Команды при сбросе (опционально) - commands: [] + commands: [ ] # - "eco give 100" - # - "broadcast Шахта {mine} сброшена!" + # - "broadcast Шахта {mine} сброшена!" # ============================================ # ТЕЛЕПОРТАЦИЯ ПРИ СБРОСЕ @@ -97,7 +97,7 @@ teleport: # ============================================ # Выдаются с определённым шансом при ломании блоков -rewards: [] +rewards: [ ] # Пример награды: # - chance: 0.001 # 0.1% шанс # prevent-drops: false # Отменить дроп блока? @@ -109,7 +109,7 @@ rewards: [] # amount: 1 # name: "�FFFFРедкий алмаз" # commands: # Команды (опционально) - # - "eco give 1000" +# - "eco give 1000" # ============================================ # ИНТЕРФЕЙС (UI) @@ -144,7 +144,6 @@ ui: # WORLDGUARD ИНТЕГРАЦИЯ (опционально) # ============================================ # Создаёт регион для защиты шахты -# По умолчанию: только block-break=allow (все могут ломать) # Можно добавить ЛЮБЫЕ флаги WorldGuard! worldguard: enabled: false @@ -154,10 +153,10 @@ worldguard: region-template: "mine_{mine_name}_{random_4}" # Владельцы региона (uuid:xxx или имя) - owners: [] + owners: [ ] # Участники региона - members: [] + members: [ ] # Флаги WorldGuard. По умолчанию: только block-break=allow # МОЖНО ДОБАВИТЬ ЛЮБЫЕ ФЛАГИ: diff --git a/src/test/java/dev/loki/lomines/command/AdminCommandsTest.java b/src/test/java/dev/loki/lomines/command/AdminCommandsTest.java index c5c21fc..8081778 100644 --- a/src/test/java/dev/loki/lomines/command/AdminCommandsTest.java +++ b/src/test/java/dev/loki/lomines/command/AdminCommandsTest.java @@ -1,8 +1,9 @@ package dev.loki.lomines.command; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.command.admin.AdminCommands; import dev.loki.lomines.core.mine.Mine; -import dev.loki.lomines.core.Mines; +import dev.loki.lomines.core.mine.Mines; import net.kyori.adventure.text.Component; import org.bukkit.command.CommandSender; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/dev/loki/lomines/core/MineTest.java b/src/test/java/dev/loki/lomines/core/MineTest.java index 84366f5..0d87070 100644 --- a/src/test/java/dev/loki/lomines/core/MineTest.java +++ b/src/test/java/dev/loki/lomines/core/MineTest.java @@ -1,11 +1,14 @@ package dev.loki.lomines.core; import dev.loki.lomines.LoMinesPlugin; -import dev.loki.lomines.block.BukkitBlockSetter; -import dev.loki.lomines.block.ItemsAdderBlockSetter; -import dev.loki.lomines.block.OraxenBlockSetter; -import dev.loki.lomines.data.MineConfig; +import dev.loki.lomines.core.mine.Mine; +import dev.loki.lomines.data.config.MineConfig; +import dev.loki.lomines.data.config.block.BlockConfig; +import dev.loki.lomines.data.config.block.BlockKey; +import dev.loki.lomines.data.config.region.RegionConfig; +import dev.loki.lomines.util.location.Cuboid; import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.World; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,7 +16,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.HashMap; -import java.util.List; import java.util.Map; import static org.junit.jupiter.api.Assertions.*; @@ -33,85 +35,74 @@ class MineTest { @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + when(world.getName()).thenReturn("world"); } @Test - void testCreateBlockSetter_WithOraxenPrefix_CreatesOraxenBlockSetter() { - // Arrange - Map blocks = new HashMap<>(); - blocks.put("oraxen:custom_ore", 50.0); - blocks.put("oraxen:rare_ore", 30.0); + void testCreateBlockSetter_WithOraxenPrefix_CreatesBukkitBlockSetter() { + // Oraxen integration is disabled — constructor throws IllegalArgumentException + Map blocks = new HashMap<>(); + blocks.put(new BlockKey.Oraxen("custom_ore"), 50.0); + blocks.put(new BlockKey.Oraxen("rare_ore"), 30.0); + blocks.put(new BlockKey.Oraxen("other_ore"), 20.0); MineConfig config = createTestConfig(blocks); - // Act - Mine mine = new Mine("test_mine", config, plugin); - - // Assert - assertNotNull(mine.getBlockSetter()); - assertInstanceOf(OraxenBlockSetter.class, mine.getBlockSetter(), "Expected OraxenBlockSetter for oraxen: prefix"); + assertThrows(IllegalArgumentException.class, + () -> new Mine("test_mine", config, plugin), + "Expected IllegalArgumentException when Oraxen integration is disabled"); } @Test - void testCreateBlockSetter_WithItemsAdderPrefix_CreatesItemsAdderBlockSetter() { - // Arrange - Map blocks = new HashMap<>(); - blocks.put("itemsadder:custom_block", 60.0); - blocks.put("itemsadder:special_block", 40.0); + void testCreateBlockSetter_WithItemsAdderPrefix_CreatesBukkitBlockSetter() { + // ItemsAdder integration is disabled — constructor throws IllegalArgumentException + Map blocks = new HashMap<>(); + blocks.put(new BlockKey.ItemsAdder("custom_block"), 60.0); + blocks.put(new BlockKey.ItemsAdder("special_block"), 40.0); MineConfig config = createTestConfig(blocks); - // Act - Mine mine = new Mine("test_mine", config, plugin); - - // Assert - assertNotNull(mine.getBlockSetter()); - assertInstanceOf(ItemsAdderBlockSetter.class, mine.getBlockSetter(), "Expected ItemsAdderBlockSetter for itemsadder: prefix"); + assertThrows(IllegalArgumentException.class, + () -> new Mine("test_mine", config, plugin), + "Expected IllegalArgumentException when ItemsAdder integration is disabled"); } @Test void testCreateBlockSetter_WithoutPrefix_CreatesBukkitBlockSetter() { - // Arrange - Map blocks = new HashMap<>(); - blocks.put("STONE", 50.0); - blocks.put("COAL_ORE", 30.0); - blocks.put("IRON_ORE", 20.0); + Map blocks = new HashMap<>(); + blocks.put(new BlockKey.Vanilla(Material.STONE), 50.0); + blocks.put(new BlockKey.Vanilla(Material.COAL_ORE), 30.0); + blocks.put(new BlockKey.Vanilla(Material.IRON_ORE), 20.0); MineConfig config = createTestConfig(blocks); - // Act Mine mine = new Mine("test_mine", config, plugin); - // Assert assertNotNull(mine.getBlockSetter()); - assertInstanceOf(BukkitBlockSetter.class, mine.getBlockSetter(), "Expected BukkitBlockSetter for vanilla blocks without prefix"); + assertInstanceOf(dev.loki.lomines.block.BukkitBlockSetter.class, mine.getBlockSetter(), + "Expected BukkitBlockSetter for vanilla blocks"); } @Test void testCreateBlockSetter_WithEmptyBlocks_ThrowsException() { - // Arrange - Map blocks = new HashMap<>(); - MineConfig config = createTestConfig(blocks); + Map blocks = new HashMap<>(); - // Act & Assert - IllegalArgumentException exception = assertThrows( + assertThrows( IllegalArgumentException.class, - () -> new Mine("test_mine", config, plugin) + () -> new BlockConfig(blocks, dev.loki.lomines.data.config.block.FillMode.CUBOID, null) ); - - assertEquals("Mine must have at least one block type", exception.getMessage()); } - private MineConfig createTestConfig(Map blocks) { - when(world.getName()).thenReturn("world"); - + private MineConfig createTestConfig(Map blocks) { Location loc1 = new Location(world, 0, 0, 0); Location loc2 = new Location(world, 10, 10, 10); - return MineConfig.builder() - .selections(List.of(loc1, loc2)) - .blocks(blocks) - .resetTicks(6000) + RegionConfig region = RegionConfig.single(new Cuboid(loc1, loc2)); + BlockConfig blockConfig = new BlockConfig(blocks, dev.loki.lomines.data.config.block.FillMode.CUBOID, null); + + return MineConfig.builder("test_mine") + .region(region) + .blocks(blockConfig) .build(); } } diff --git a/src/test/java/dev/loki/lomines/core/MineTickerTest.java b/src/test/java/dev/loki/lomines/core/MineTickerTest.java index 566dfc6..274bd29 100644 --- a/src/test/java/dev/loki/lomines/core/MineTickerTest.java +++ b/src/test/java/dev/loki/lomines/core/MineTickerTest.java @@ -1,6 +1,8 @@ package dev.loki.lomines.core; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.core.mine.MineTicker; +import dev.loki.lomines.core.mine.Mines; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; diff --git a/src/test/java/dev/loki/lomines/core/MinesTest.java b/src/test/java/dev/loki/lomines/core/MinesTest.java index 91afc18..d0ce928 100644 --- a/src/test/java/dev/loki/lomines/core/MinesTest.java +++ b/src/test/java/dev/loki/lomines/core/MinesTest.java @@ -1,6 +1,8 @@ package dev.loki.lomines.core; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.core.mine.Mine; +import dev.loki.lomines.core.mine.Mines; import dev.lolib.core.LoLogger; import dev.lolib.scheduler.ScheduledTask; import dev.lolib.scheduler.Scheduler; @@ -9,6 +11,7 @@ import org.bukkit.Material; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.block.data.BlockData; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -25,18 +28,36 @@ import static org.mockito.Mockito.*; /** * Unit tests for Mines registry. - * Tests loading and creating mines. */ class MinesTest { @TempDir Path tempDir; + private Mines mines; private LoMinesPlugin plugin; private Scheduler scheduler; + // Keep Bukkit mock open for the whole test — WorldGuardRegionService calls + // Bukkit.getPluginManager() in the Mines constructor. + private MockedStatic globalBukkit; + private MockedStatic globalScheduler; @BeforeEach void setUp() { + globalBukkit = mockStatic(Bukkit.class); + globalScheduler = mockStatic(Scheduler.class); + + PluginManager pluginManager = mock(org.bukkit.plugin.PluginManager.class); + Server server = mock(Server.class); + World world = mock(World.class); + BlockData blockData = mock(BlockData.class); + + globalBukkit.when(Bukkit::getPluginManager).thenReturn(pluginManager); + globalBukkit.when(Bukkit::getServer).thenReturn(server); + globalBukkit.when(() -> Bukkit.getWorld(anyString())).thenReturn(world); + globalBukkit.when(() -> Bukkit.createBlockData(any(Material.class))).thenReturn(blockData); + when(world.getName()).thenReturn("world"); + plugin = mock(LoMinesPlugin.class); Logger logger = mock(Logger.class); LoLogger loLogger = mock(LoLogger.class); @@ -46,59 +67,37 @@ class MinesTest { when(plugin.getLogger()).thenReturn(logger); when(plugin.loLogger()).thenReturn(loLogger); + globalScheduler.when(() -> Scheduler.get(plugin)).thenReturn(scheduler); + ScheduledTask task = mock(ScheduledTask.class); + when(scheduler.runTimer(any(Runnable.class), anyLong(), anyLong())).thenReturn(task); + mines = new Mines(plugin); } - /** - * Helper method to set up Bukkit and Scheduler mocking for tests that create mines. - */ - private void setupBukkitAndScheduler(MockedStatic bukkit, MockedStatic schedulerStatic) { - Server server = mock(Server.class); - World world = mock(World.class); - BlockData blockData = mock(BlockData.class); - - bukkit.when(Bukkit::getServer).thenReturn(server); - bukkit.when(() -> Bukkit.getWorld(anyString())).thenReturn(world); - bukkit.when(() -> Bukkit.createBlockData(any(Material.class))).thenReturn(blockData); - - when(world.getName()).thenReturn("world"); - - schedulerStatic.when(() -> Scheduler.get(plugin)).thenReturn(scheduler); - - // Mock scheduler methods to execute callbacks immediately for testing - ScheduledTask task = mock(ScheduledTask.class); - when(scheduler.runTimer(any(Runnable.class), anyLong(), anyLong())).thenReturn(task); + @AfterEach + void tearDown() { + if (globalScheduler != null) globalScheduler.close(); + if (globalBukkit != null) globalBukkit.close(); } @Test void testLoadAllWithNoMinesFolder() throws IOException { - // When mines folder doesn't exist, loadAll should not throw assertDoesNotThrow(() -> mines.loadAll()); - - // No mines should be loaded assertEquals(0, mines.getAll().size()); } @Test void testLoadAllWithEmptyMinesFolder() throws IOException { - // Create empty mines folder - Path minesFolder = tempDir.resolve("mines"); - Files.createDirectories(minesFolder); - - // Load all mines + Files.createDirectories(tempDir.resolve("mines")); mines.loadAll(); - - // No mines should be loaded assertEquals(0, mines.getAll().size()); } @Test void testLoadAllWithValidMine() throws IOException { - // Create mines folder Path minesFolder = tempDir.resolve("mines"); Files.createDirectories(minesFolder); - // Create a valid mine config file String yamlContent = """ selection.1: world;0;64;0;0.0;0.0 selection.2: world;10;74;10;0.0;0.0 @@ -118,36 +117,22 @@ class MinesTest { broadcast-reset: "" random-rewards: [] """; + Files.writeString(minesFolder.resolve("testmine.yml"), yamlContent); - Path configFile = minesFolder.resolve("testmine.yml"); - Files.writeString(configFile, yamlContent); + mines.loadAll(); - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { - - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Load all mines - mines.loadAll(); - - // Verify mine was loaded - assertEquals(1, mines.getAll().size()); - assertTrue(mines.find("testmine").isPresent()); - - Mine mine = mines.get("testmine"); - assertNotNull(mine); - assertEquals("testmine", mine.getName()); - } + assertEquals(1, mines.getAll().size()); + assertTrue(mines.find("testmine").isPresent()); + Mine mine = mines.get("testmine"); + assertNotNull(mine); + assertEquals("testmine", mine.getName()); } @Test void testLoadAllWithMultipleMines() throws IOException { - // Create mines folder Path minesFolder = tempDir.resolve("mines"); Files.createDirectories(minesFolder); - // Create multiple mine config files String yamlContent = """ selection.1: world;0;64;0;0.0;0.0 selection.2: world;10;74;10;0.0;0.0 @@ -167,35 +152,23 @@ class MinesTest { broadcast-reset: "" random-rewards: [] """; - Files.writeString(minesFolder.resolve("mine1.yml"), yamlContent); Files.writeString(minesFolder.resolve("mine2.yml"), yamlContent); Files.writeString(minesFolder.resolve("mine3.yml"), yamlContent); - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { + mines.loadAll(); - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Load all mines - mines.loadAll(); - - // Verify all mines were loaded - assertEquals(3, mines.getAll().size()); - assertTrue(mines.find("mine1").isPresent()); - assertTrue(mines.find("mine2").isPresent()); - assertTrue(mines.find("mine3").isPresent()); - } + assertEquals(3, mines.getAll().size()); + assertTrue(mines.find("mine1").isPresent()); + assertTrue(mines.find("mine2").isPresent()); + assertTrue(mines.find("mine3").isPresent()); } @Test void testLoadAllIgnoresNonYamlFiles() throws IOException { - // Create mines folder Path minesFolder = tempDir.resolve("mines"); Files.createDirectories(minesFolder); - // Create a valid mine config file String yamlContent = """ selection.1: world;0;64;0;0.0;0.0 selection.2: world;10;74;10;0.0;0.0 @@ -205,196 +178,87 @@ class MinesTest { ticks: 6000 percent: 10.0 """; - Files.writeString(minesFolder.resolve("validmine.yml"), yamlContent); - Files.writeString(minesFolder.resolve("readme.txt"), "This is not a mine config"); - Files.writeString(minesFolder.resolve("backup.bak"), "Backup file"); + Files.writeString(minesFolder.resolve("readme.txt"), "not a mine config"); + Files.writeString(minesFolder.resolve("backup.bak"), "backup file"); - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { + mines.loadAll(); - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Load all mines - mines.loadAll(); - - // Only the .yml file should be loaded - assertEquals(1, mines.getAll().size()); - assertTrue(mines.find("validmine").isPresent()); - } + assertEquals(1, mines.getAll().size()); + assertTrue(mines.find("validmine").isPresent()); } @Test void testLoadAllWithInvalidMine() throws IOException { - // Create mines folder Path minesFolder = tempDir.resolve("mines"); Files.createDirectories(minesFolder); + Files.writeString(minesFolder.resolve("invalidmine.yml"), "selection.1: world;0;64;0;0.0;0.0\n"); - // Create an invalid mine config file (missing required fields) - String invalidYaml = """ - selection.1: world;0;64;0;0.0;0.0 - """; - - Files.writeString(minesFolder.resolve("invalidmine.yml"), invalidYaml); - - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { - - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Load all mines - should not throw, but should log error - assertDoesNotThrow(() -> mines.loadAll()); - - // Invalid mine should not be loaded - assertEquals(0, mines.getAll().size()); - - // Verify error was logged - verify(plugin.loLogger(), atLeastOnce()).error(anyString()); - } + assertDoesNotThrow(() -> mines.loadAll()); + assertEquals(0, mines.getAll().size()); + verify(plugin.loLogger(), atLeastOnce()).error(anyString()); } @Test void testCreateNewMine() throws IOException { - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { + mines.create("newmine"); - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Create a new mine - mines.create("newmine"); - - // Verify mine was created - assertEquals(1, mines.getAll().size()); - assertTrue(mines.find("newmine").isPresent()); - - Mine mine = mines.get("newmine"); - assertNotNull(mine); - assertEquals("newmine", mine.getName()); - - // Verify config file was created - Path configFile = tempDir.resolve("mines/newmine.yml"); - assertTrue(Files.exists(configFile)); - - // Verify logger was called - verify(plugin.loLogger()).info("Created mine: newmine"); - } + assertEquals(1, mines.getAll().size()); + assertTrue(mines.find("newmine").isPresent()); + Mine mine = mines.get("newmine"); + assertNotNull(mine); + assertEquals("newmine", mine.getName()); + assertTrue(Files.exists(tempDir.resolve("mines/newmine.yml"))); + verify(plugin.loLogger()).info("Created mine: newmine"); } @Test void testCreateMineCreatesFolder() throws IOException { - // Ensure mines folder doesn't exist - Path minesFolder = tempDir.resolve("mines"); - assertFalse(Files.exists(minesFolder)); - - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { - - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Create a new mine - mines.create("testmine"); - - // Verify mines folder was created - assertTrue(Files.exists(minesFolder)); - assertTrue(Files.isDirectory(minesFolder)); - } + assertFalse(Files.exists(tempDir.resolve("mines"))); + mines.create("testmine"); + assertTrue(Files.isDirectory(tempDir.resolve("mines"))); } @Test void testCreateDuplicateMineThrowsException() throws IOException { - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { - - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Create a mine - mines.create("duplicate"); - - // Try to create the same mine again - IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { - mines.create("duplicate"); - }); - - assertTrue(exception.getMessage().contains("Mine already exists")); - } + mines.create("duplicate"); + IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, + () -> mines.create("duplicate")); + assertTrue(ex.getMessage().contains("Mine already exists")); } @Test void testCreateMineIsCaseInsensitive() throws IOException { - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { - - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Create a mine with mixed case - mines.create("TestMine"); - - // Try to create the same mine with different case - IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { - mines.create("testmine"); - }); - - assertTrue(exception.getMessage().contains("Mine already exists")); - } + mines.create("TestMine"); + IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, + () -> mines.create("testmine")); + assertTrue(ex.getMessage().contains("Mine already exists")); } @Test void testGetMineByName() throws IOException { - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { + mines.create("testmine"); - setupBukkitAndScheduler(bukkit, schedulerStatic); + Mine mine = mines.get("testmine"); + assertNotNull(mine); + assertEquals("testmine", mine.getName()); - // Create a mine - mines.create("testmine"); - - // Get mine by exact name - Mine mine = mines.get("testmine"); - assertNotNull(mine); - assertEquals("testmine", mine.getName()); - - // Get mine by different case - Mine mine2 = mines.get("TestMine"); - assertNotNull(mine2); - assertEquals("testmine", mine2.getName()); - - // Same mine instance - assertSame(mine, mine2); - } + Mine mine2 = mines.get("TestMine"); + assertNotNull(mine2); + assertSame(mine, mine2); } @Test void testGetNonExistentMineThrowsException() { - IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { - mines.get("nonexistent"); - }); - - assertTrue(exception.getMessage().contains("Mine not found")); + IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, + () -> mines.get("nonexistent")); + assertTrue(ex.getMessage().contains("Mine not found")); } @Test void testFindMineReturnsOptional() throws IOException { - // Mock Bukkit and Scheduler - try (MockedStatic bukkit = mockStatic(Bukkit.class); - MockedStatic schedulerStatic = mockStatic(Scheduler.class)) { - - setupBukkitAndScheduler(bukkit, schedulerStatic); - - // Create a mine - mines.create("testmine"); - - // Find existing mine - assertTrue(mines.find("testmine").isPresent()); - - // Find non-existent mine - assertFalse(mines.find("nonexistent").isPresent()); - } + mines.create("testmine"); + assertTrue(mines.find("testmine").isPresent()); + assertFalse(mines.find("nonexistent").isPresent()); } } diff --git a/src/test/java/dev/loki/lomines/data/LeaderboardCacheIntegrationTest.java b/src/test/java/dev/loki/lomines/data/LeaderboardCacheIntegrationTest.java index 9bbba0e..942c43d 100644 --- a/src/test/java/dev/loki/lomines/data/LeaderboardCacheIntegrationTest.java +++ b/src/test/java/dev/loki/lomines/data/LeaderboardCacheIntegrationTest.java @@ -1,6 +1,9 @@ package dev.loki.lomines.data; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.data.stats.Leaderboard; +import dev.loki.lomines.data.stats.LeaderboardEntry; +import dev.loki.lomines.data.stats.StatsManager; import dev.lolib.core.LoLogger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -48,7 +51,7 @@ class LeaderboardCacheIntegrationTest { // Build cache List top1 = leaderboard.getTopTotal(10); assertEquals(1, top1.size(), "Should have 1 player initially"); - assertEquals(player1, top1.get(0).getPlayerId()); + assertEquals(player1, top1.get(0).playerId()); // Increment blocks for player2 - this should invalidate cache statsManager.incrementBlocks(player2, "mine1"); @@ -58,8 +61,8 @@ class LeaderboardCacheIntegrationTest { assertEquals(2, top2.size(), "Should have 2 players after increment"); // Verify order (player1 has 100, player2 has 1) - assertEquals(player1, top2.get(0).getPlayerId(), "Player1 should still be first"); - assertEquals(player2, top2.get(1).getPlayerId(), "Player2 should be second"); + assertEquals(player1, top2.get(0).playerId(), "Player1 should still be first"); + assertEquals(player2, top2.get(1).playerId(), "Player2 should be second"); } @Test @@ -73,7 +76,7 @@ class LeaderboardCacheIntegrationTest { // Build cache List top1 = leaderboard.getTopTotal(10); - assertEquals(player2, top1.get(0).getPlayerId(), "Player2 should be first initially"); + assertEquals(player2, top1.get(0).playerId(), "Player2 should be first initially"); // Increment player1 many times to overtake player2 for (int i = 0; i < 60; i++) { @@ -82,10 +85,10 @@ class LeaderboardCacheIntegrationTest { // Get top again - cache should be rebuilt with new order List top2 = leaderboard.getTopTotal(10); - assertEquals(player1, top2.get(0).getPlayerId(), "Player1 should be first after increments"); - assertEquals(110, top2.get(0).getCount(), "Player1 should have 110 blocks"); - assertEquals(player2, top2.get(1).getPlayerId(), "Player2 should be second"); - assertEquals(100, top2.get(1).getCount(), "Player2 should still have 100 blocks"); + assertEquals(player1, top2.get(0).playerId(), "Player1 should be first after increments"); + assertEquals(110, top2.get(0).count(), "Player1 should have 110 blocks"); + assertEquals(player2, top2.get(1).playerId(), "Player2 should be second"); + assertEquals(100, top2.get(1).count(), "Player2 should still have 100 blocks"); } @Test @@ -104,7 +107,7 @@ class LeaderboardCacheIntegrationTest { // Get top - should show updated count List top2 = leaderboard.getTopTotal(10); assertEquals(1, top2.size()); - assertEquals(5, top2.get(0).getCount(), "Should have 5 blocks after 5 increments"); + assertEquals(5, top2.get(0).count(), "Should have 5 blocks after 5 increments"); } @Test @@ -150,7 +153,7 @@ class LeaderboardCacheIntegrationTest { // Get with limit 2 - should use same cache List top2 = leaderboard.getTopTotal(2); assertEquals(2, top2.size()); - assertEquals(player3, top2.get(0).getPlayerId(), "Should have highest player"); - assertEquals(player2, top2.get(1).getPlayerId(), "Should have second highest player"); + assertEquals(player3, top2.get(0).playerId(), "Should have highest player"); + assertEquals(player2, top2.get(1).playerId(), "Should have second highest player"); } } diff --git a/src/test/java/dev/loki/lomines/data/LeaderboardTest.java b/src/test/java/dev/loki/lomines/data/LeaderboardTest.java index 00376c9..43c672c 100644 --- a/src/test/java/dev/loki/lomines/data/LeaderboardTest.java +++ b/src/test/java/dev/loki/lomines/data/LeaderboardTest.java @@ -1,6 +1,10 @@ package dev.loki.lomines.data; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.data.stats.Leaderboard; +import dev.loki.lomines.data.stats.LeaderboardEntry; +import dev.loki.lomines.data.stats.PlayerStats; +import dev.loki.lomines.data.stats.StatsManager; import dev.lolib.core.LoLogger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -51,8 +55,8 @@ class LeaderboardTest { List top = leaderboard.getTopTotal(10); assertEquals(1, top.size()); - assertEquals(playerId, top.get(0).getPlayerId()); - assertEquals(100, top.get(0).getCount()); + assertEquals(playerId, top.get(0).playerId()); + assertEquals(100, top.get(0).count()); } @Test @@ -67,9 +71,9 @@ class LeaderboardTest { List top = leaderboard.getTopTotal(10); assertEquals(3, top.size()); - assertEquals(player2, top.get(0).getPlayerId()); // 200 blocks - assertEquals(player3, top.get(1).getPlayerId()); // 100 blocks - assertEquals(player1, top.get(2).getPlayerId()); // 50 blocks + assertEquals(player2, top.get(0).playerId()); // 200 blocks + assertEquals(player3, top.get(1).playerId()); // 100 blocks + assertEquals(player1, top.get(2).playerId()); // 50 blocks } @Test @@ -93,7 +97,7 @@ class LeaderboardTest { List top = leaderboard.getTopTotal(10); assertEquals(1, top.size(), "Should filter out players with 0 blocks"); - assertEquals(player1, top.get(0).getPlayerId()); + assertEquals(player1, top.get(0).playerId()); } @Test @@ -108,7 +112,7 @@ class LeaderboardTest { List top2 = leaderboard.getTopTotal(10); assertEquals(top1.size(), top2.size()); - assertEquals(top1.get(0).getPlayerId(), top2.get(0).getPlayerId()); + assertEquals(top1.get(0).playerId(), top2.get(0).playerId()); } @Test @@ -129,7 +133,7 @@ class LeaderboardTest { // Should rebuild cache with new player List top = leaderboard.getTopTotal(10); assertEquals(2, top.size(), "Cache should be rebuilt after invalidation"); - assertEquals(player2, top.get(0).getPlayerId(), "New player should be first"); + assertEquals(player2, top.get(0).playerId(), "New player should be first"); } @Test @@ -144,9 +148,9 @@ class LeaderboardTest { List top = leaderboard.getTopByMine("mine1", 10); assertEquals(3, top.size()); - assertEquals(player2, top.get(0).getPlayerId()); // 200 blocks - assertEquals(player3, top.get(1).getPlayerId()); // 100 blocks - assertEquals(player1, top.get(2).getPlayerId()); // 50 blocks + assertEquals(player2, top.get(0).playerId()); // 200 blocks + assertEquals(player3, top.get(1).playerId()); // 100 blocks + assertEquals(player1, top.get(2).playerId()); // 50 blocks } @Test @@ -159,7 +163,7 @@ class LeaderboardTest { List top = leaderboard.getTopByMine("mine1", 10); assertEquals(1, top.size(), "Should filter out players with 0 blocks"); - assertEquals(player1, top.get(0).getPlayerId()); + assertEquals(player1, top.get(0).playerId()); } @Test @@ -172,7 +176,7 @@ class LeaderboardTest { List top = leaderboard.getTopByMine("mine1", 10); assertEquals(1, top.size(), "Should only include players with blocks in specified mine"); - assertEquals(player1, top.get(0).getPlayerId()); + assertEquals(player1, top.get(0).playerId()); } @Test diff --git a/src/test/java/dev/loki/lomines/data/StatsManagerTest.java b/src/test/java/dev/loki/lomines/data/StatsManagerTest.java index 5429cc5..d0e48db 100644 --- a/src/test/java/dev/loki/lomines/data/StatsManagerTest.java +++ b/src/test/java/dev/loki/lomines/data/StatsManagerTest.java @@ -1,6 +1,8 @@ package dev.loki.lomines.data; import dev.loki.lomines.LoMinesPlugin; +import dev.loki.lomines.data.stats.PlayerStats; +import dev.loki.lomines.data.stats.StatsManager; import dev.lolib.core.LoLogger; import dev.lolib.scheduler.ScheduledTask; import dev.lolib.scheduler.Scheduler; diff --git a/src/test/java/dev/loki/lomines/data/config/ui/UIConfigTest.java b/src/test/java/dev/loki/lomines/data/config/ui/UIConfigTest.java index ac216cf..c370244 100644 --- a/src/test/java/dev/loki/lomines/data/config/ui/UIConfigTest.java +++ b/src/test/java/dev/loki/lomines/data/config/ui/UIConfigTest.java @@ -33,7 +33,8 @@ class UIConfigTest { true, "{mine}", 100.0, - "HH:mm:ss" + "HH:mm:ss", + null ); assertTrue(config.actionBarEnabled()); @@ -44,7 +45,7 @@ class UIConfigTest { @Test void testNullFormatDefaults() { - UIConfig config = new UIConfig(true, null, 50.0, null); + UIConfig config = new UIConfig(true, null, 50.0, null, null); assertEquals(UIConfig.DEFAULT_ACTIONBAR_FORMAT, config.actionBarFormat()); assertEquals(UIConfig.DEFAULT_TIMER_FORMAT, config.timerFormat()); @@ -52,7 +53,7 @@ class UIConfigTest { @Test void testBlankFormatDefaults() { - UIConfig config = new UIConfig(true, " ", 50.0, " "); + UIConfig config = new UIConfig(true, " ", 50.0, " ", null); assertEquals(UIConfig.DEFAULT_ACTIONBAR_FORMAT, config.actionBarFormat()); assertEquals(UIConfig.DEFAULT_TIMER_FORMAT, config.timerFormat()); @@ -60,14 +61,14 @@ class UIConfigTest { @Test void testNegativeRangeClamped() { - UIConfig config = new UIConfig(true, "test", -10.0, "mm:ss"); + UIConfig config = new UIConfig(true, "test", -10.0, "mm:ss", null); assertEquals(1.0, config.actionBarRange()); } @Test void testRangeSquared() { - UIConfig config = new UIConfig(true, "test", 50.0, "mm:ss"); + UIConfig config = new UIConfig(true, "test", 50.0, "mm:ss", null); assertEquals(2500.0, config.actionBarRangeSquared(), 0.001); } @@ -85,7 +86,7 @@ class UIConfigTest { @Test void testFormatTimerMmSs() { - UIConfig config = new UIConfig(true, "", 0, "mm:ss"); + UIConfig config = new UIConfig(true, "", 0, "mm:ss", null); assertEquals("00:30", config.formatTimer(30)); assertEquals("05:00", config.formatTimer(300)); @@ -94,7 +95,7 @@ class UIConfigTest { @Test void testFormatTimerHhMmSs() { - UIConfig config = new UIConfig(true, "", 0, "HH:mm:ss"); + UIConfig config = new UIConfig(true, "", 0, "HH:mm:ss", null); assertEquals("0:00:30", config.formatTimer(30)); assertEquals("0:05:00", config.formatTimer(300)); diff --git a/src/test/java/dev/loki/lomines/util/ChunkUtilsTest.java b/src/test/java/dev/loki/lomines/util/ChunkUtilsTest.java index 704c48c..6d39055 100644 --- a/src/test/java/dev/loki/lomines/util/ChunkUtilsTest.java +++ b/src/test/java/dev/loki/lomines/util/ChunkUtilsTest.java @@ -1,5 +1,7 @@ package dev.loki.lomines.util; +import dev.loki.lomines.util.format.ChunkUtils; +import dev.loki.lomines.util.location.Cuboid; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/test/java/dev/loki/lomines/util/LocationParserTest.java b/src/test/java/dev/loki/lomines/util/LocationParserTest.java index 284a3a3..702f184 100644 --- a/src/test/java/dev/loki/lomines/util/LocationParserTest.java +++ b/src/test/java/dev/loki/lomines/util/LocationParserTest.java @@ -1,6 +1,7 @@ package dev.loki.lomines.util; import dev.loki.lomines.data.config.parser.ConfigParseException; +import dev.loki.lomines.util.location.LocationParser; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/test/java/dev/loki/lomines/util/TimeFormatterTest.java b/src/test/java/dev/loki/lomines/util/TimeFormatterTest.java index f391c51..47c00fe 100644 --- a/src/test/java/dev/loki/lomines/util/TimeFormatterTest.java +++ b/src/test/java/dev/loki/lomines/util/TimeFormatterTest.java @@ -1,7 +1,9 @@ package dev.loki.lomines.util; +import dev.loki.lomines.util.format.TimeFormatter; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/dev/loki/lomines/util/selection/SelectionTest.java b/src/test/java/dev/loki/lomines/util/selection/SelectionTest.java index bfe0a05..546fb7c 100644 --- a/src/test/java/dev/loki/lomines/util/selection/SelectionTest.java +++ b/src/test/java/dev/loki/lomines/util/selection/SelectionTest.java @@ -1,5 +1,6 @@ package dev.loki.lomines.util.selection; +import dev.loki.lomines.util.location.Cuboid; import org.bukkit.Location; import org.bukkit.World; import org.junit.jupiter.api.BeforeEach;