diff --git a/.gitignore b/.gitignore
index 090c47c..d8a5b8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
# User-specific stuff
+server/
.idea/
.vscode/
.settings/
diff --git a/build.gradle b/build.gradle
index a926830..fd8b58b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
plugins {
id 'java'
id 'maven-publish'
- id "com.github.johnrengelman.shadow" version "7.1.2"
- id "io.papermc.paperweight.userdev" version "1.3.9"
+ id "com.github.johnrengelman.shadow" version "8.1.1"
+ id "io.papermc.paperweight.userdev" version "1.5.4"
}
apply plugin: "java"
@@ -62,8 +62,9 @@ dependencies {
implementation 'org.mongodb:bson:4.7.2'
implementation 'org.mongodb:mongodb-driver-core:4.7.2'
- implementation 'de.tr7zw:item-nbt-api-plugin:2.11.1'
- compileOnly 'io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT'
+ compileOnly 'io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT'
+ implementation 'de.tr7zw:item-nbt-api-plugin:2.11.2'
+// compileOnly 'de.tr7zw:item-nbt-api:2.11.2'
compileOnly 'com.comphenix.protocol:ProtocolLib:4.8.0'
compileOnly 'net.luckperms:api:5.4'
compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
@@ -71,17 +72,17 @@ dependencies {
//compileOnly 'com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.3.0'
//compileOnly 'com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.3.0'
compileOnly 'me.clip:placeholderapi:2.11.2'
- compileOnly('net.citizensnpcs:citizens-main:2.0.30-SNAPSHOT') {
+ compileOnly('net.citizensnpcs:citizens-main:2.0.31-SNAPSHOT') {
exclude group: '*', module: '*'
}
compileOnly 'com.onarandombox.multiversecore:Multiverse-Core:4.3.1'
- compileOnly 'me.filoghost.holographicdisplays:holographicdisplays-api:3.0.0'
- compileOnly fileTree(dir: 'libs', include: '*.jar')
- paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.3-R0.1-SNAPSHOT")
+// compileOnly 'me.filoghost.holographicdisplays:holographicdisplays-api:3.0.1'
+// compileOnly fileTree(dir: 'libs', include: '*.jar')
+ paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.4-R0.1-SNAPSHOT")
}
group = 'me.unurled'
-version = '0.5.6'
+version = '0.5.7'
description = 'Raxen'
java {
@@ -100,31 +101,34 @@ publishing {
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
+ options.release = 17
+ options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation"]
+
}
tasks {
assemble {
dependsOn(reobfJar)
}
+ build {
+ dependsOn(shadowJar)
+ }
}
shadowJar {
dependencies {
- include dependency('de.tr7zw:item-nbt-api-plugin:2.11.1')
+ include dependency('de.tr7zw:item-nbt-api-plugin:2.11.2')
+ include dependency('de.tr7zw:item-nbt-api:2.11.2')
include dependency('org.mongodb:mongodb-driver-sync:4.7.2')
include dependency('org.mongodb:bson:4.7.2')
include dependency('org.mongodb:mongodb-driver-core:4.7.2')
}
- relocate("de.tr7zw.changeme", "me.unurled.libs.de.tr7zw")
relocate("de.tr7zw", "me.unurled.libs.de.tr7zw")
relocate("com.mongodb", 'me.unurled.libs.com.mongodb')
relocate("org.bson", 'me.unurled.libs.org.bson')
processResources {
expand version: project.version
}
+ minimize()
}
-
-tasks.withType(JavaCompile) {
- options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation"]
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..249e583 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661..a9b6e2c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,4 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index 1b6c787..a69d9cb
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# 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.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..f127cfd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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
diff --git a/settings.gradle b/settings.gradle
index 3a919a8..8d2d6f8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,4 +7,4 @@ pluginManagement {
}
}
-rootProject.name = 'raxen'
+rootProject.name = 'raxen'
\ No newline at end of file
diff --git a/src/main/java/me/unurled/raxen/Raxen.java b/src/main/java/me/unurled/raxen/Raxen.java
index 4c3a04a..1335948 100644
--- a/src/main/java/me/unurled/raxen/Raxen.java
+++ b/src/main/java/me/unurled/raxen/Raxen.java
@@ -1,7 +1,10 @@
package me.unurled.raxen;
+import static me.unurled.raxen.utils.Utils.colorComp;
+
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager;
+import java.util.logging.Logger;
import lombok.Getter;
import me.unurled.raxen.config.Config;
import me.unurled.raxen.config.PlayerConfig;
@@ -11,135 +14,155 @@ import org.bukkit.Bukkit;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
-import java.util.logging.Logger;
-
-import static me.unurled.raxen.utils.Utils.colorComp;
-
public final class Raxen extends JavaPlugin {
- private static final String prefix = "Rx> ";
- @Getter private static String version = "0.5.6";
- private final PluginManager pm = getServer().getPluginManager();
+ private static final String prefix =
+ "Rx> ";
- private static Raxen plugin;
+ @Getter
+ private static String version = "0.5.7";
- private static Logger logger;
+ private boolean loading = true;
+ private final PluginManager pm = getServer().getPluginManager();
- private static Config config;
+ private static Raxen plugin;
- private static PlayerConfig playerConfig;
+ private static Logger logger;
- @Getter private ProtocolManager protocolManager;
+ private static Config config;
- @Getter private Manager manager;
+ private static PlayerConfig playerConfig;
- /**
- * Method when the server launch the plugin.
- */
- @Override
- public void onEnable() {
- plugin = this;
- logger = getLogger();
- version = plugin.getDescription().getVersion();
- manager = new Manager();
- manager.set(plugin);
+ @Getter
+ private ProtocolManager protocolManager;
- // Config
- config = new Config(plugin);
+ @Getter
+ private Manager manager;
- protocolManager = ProtocolLibrary.getProtocolManager();
+ /**
+ * Method when the server launch the plugin.
+ */
+ @Override
+ public void onEnable() {
+ plugin = this;
+ logger = getLogger();
- playerConfig = new PlayerConfig(plugin);
+ version = this.getPluginMeta().getVersion();
- //register Commands and Events
- registerCommands();
- registerEvents();
+ manager = new Manager();
+ manager.set(plugin);
- Bukkit.getConsoleSender().sendMessage(colorComp(prefix +"Server Started Successfully!"));
+ // Config
+ config = new Config(plugin);
- manager.getListenerManager().getServerPingEvent().setLoading(false);
+ protocolManager = ProtocolLibrary.getProtocolManager();
+
+ playerConfig = new PlayerConfig(plugin);
+
+ //register Commands and Events
+ registerCommands();
+ registerEvents();
+
+ Bukkit
+ .getConsoleSender()
+ .sendMessage(
+ colorComp(prefix + "Server Started Successfully!")
+ );
+
+ manager.getListenerManager().getServerPingEvent().setLoading(false);
+ loading = false;
+ }
+
+ /**
+ * register the command in the command manager class.
+ */
+ private void registerCommands() {
+ manager.getCommandManager().register();
+
+ Bukkit
+ .getConsoleSender()
+ .sendMessage(colorComp(prefix + "Commands Registered!"));
+ }
+
+ /**
+ * register the events in the event manager class.
+ */
+ private void registerEvents() {
+ manager.getListenerManager().register();
+
+ Bukkit
+ .getConsoleSender()
+ .sendMessage(colorComp(prefix + "Events Registered!"));
+ }
+
+ /**
+ * Method when the server stops the plugin.
+ */
+ @Override
+ public void onDisable() {
+ if (!loading) {
+ manager.getListenerManager().getServerPingEvent().setLoading(true);
+ Reload.kickAll();
+
+ playerConfig.close();
}
- /**
- * register the command in the command manager class.
- */
- private void registerCommands() {
- manager.getCommandManager().register();
+ Bukkit
+ .getConsoleSender()
+ .sendMessage(
+ colorComp(prefix + "Server Stopped Successfully!")
+ );
+ }
- Bukkit.getConsoleSender().sendMessage(colorComp(prefix +"Commands Registered!"));
- }
+ /**
+ * getter for the logger
+ * @return the plugin logger
+ */
+ public Logger getPluginLogger() {
+ return logger;
+ }
- /**
- * register the events in the event manager class.
- */
- private void registerEvents() {
- manager.getListenerManager().register();
+ /**
+ * getter for the bukkit's plugin manager
+ * @return plugin manager
+ */
+ public PluginManager getPm() {
+ return pm;
+ }
- Bukkit.getConsoleSender().sendMessage(colorComp(prefix +"Events Registered!"));
- }
+ /**
+ * return the instance which is launched.
+ * @return main instance
+ */
+ public Raxen getPlugin() {
+ return plugin;
+ }
- /**
- * Method when the server stops the plugin.
- */
- @Override
- public void onDisable() {
- manager.getListenerManager().getServerPingEvent().setLoading(true);
- Reload.kickAll();
+ /**
+ * getter for the raxen prefix
+ * @return string prefix
+ */
+ public static String getPrefix() {
+ return prefix;
+ }
- playerConfig.close();
+ /**
+ * getter for the yml's player configs.
+ * @return player config instance
+ */
+ public PlayerConfig getPlayerConfig() {
+ return playerConfig;
+ }
- Bukkit.getConsoleSender().sendMessage(colorComp(prefix +"Server Stopped Successfully!"));
- }
+ /**
+ * getter for an instance of the config utility class
+ * @return raxen's config
+ */
+ public Config getConf() {
+ return config;
+ }
- /**
- * getter for the logger
- * @return the plugin logger
- */
- public Logger getPluginLogger() {
- return logger;
- }
-
- /**
- * getter for the bukkit's plugin manager
- * @return plugin manager
- */
- public PluginManager getPm() {
- return pm;
- }
-
- /**
- * return the instance which is launched.
- * @return main instance
- */
- public Raxen getPlugin() {
- return plugin;
- }
-
- /**
- * getter for the raxen prefix
- * @return string prefix
- */
- public static String getPrefix() {
- return prefix;
- }
-
- /**
- * getter for the yml's player configs.
- * @return player config instance
- */
- public PlayerConfig getPlayerConfig() {
- return playerConfig;
- }
-
- /**
- * getter for an instance of the config utility class
- * @return raxen's config
- */
- public Config getConf() {
- return config;
- }
-
- public void disable() {
- this.setEnabled(false);
- }
+ public void disable() {
+ this.setEnabled(false);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/RaxenCommand.java b/src/main/java/me/unurled/raxen/commands/RaxenCommand.java
index ca3e96a..b12bb22 100644
--- a/src/main/java/me/unurled/raxen/commands/RaxenCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/RaxenCommand.java
@@ -1,5 +1,8 @@
package me.unurled.raxen.commands;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.List;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.manager.entity.StorageManager;
import net.kyori.adventure.text.TextComponent;
@@ -11,114 +14,209 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.*;
-
public class RaxenCommand implements TabExecutor {
- private Raxen main;
+ private Raxen main;
- public RaxenCommand(Raxen main) {
- this.main = main;
- }
+ public RaxenCommand(Raxen main) {
+ this.main = main;
+ }
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String msg, @NotNull String[] args) {
- if(sender instanceof Player) {
- Player player = (Player) sender;
- if(!(player.hasPermission("raxen."))) {
- msgPlayer(player, coloredString(Raxen.getPrefix()) + colorTextComp("You can't execute this command. Insufficient permission."));
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command cmd,
+ @NotNull String msg,
+ @NotNull String[] args
+ ) {
+ if (sender instanceof Player) {
+ Player player = (Player) sender;
+ if (!(player.hasPermission("raxen."))) {
+ msgPlayer(
+ player,
+ coloredString(Raxen.getPrefix()) +
+ colorTextComp(
+ "You can't execute this command. Insufficient permission."
+ )
+ );
+ }
+ switch (args.length) {
+ case 0 -> msgPl(player, 0);
+ case 1 -> {
+ switch (args[0]) {
+ case "mongodb", "mongo", "MONGODB", "MONGO" -> {
+ //print info about connection
+ sender.sendMessage(
+ stringToComp(
+ Raxen.getPrefix() +
+ colorTextComp(
+ "Printing About Raxen's MongoDB connection..."
+ )
+ )
+ );
+ msgPlayer(
+ player,
+ coloredString(Raxen.getPrefix()) +
+ colorTextComp(
+ "---------------------------------------------"
+ )
+ );
+ msgPlayer(player, colorTextComp("MONGO DB"));
+ msgPlayer(
+ player,
+ StorageManager
+ .getMongodb()
+ .getMongoClient()
+ .getClusterDescription()
+ .toString()
+ );
+ msgPlayer(
+ player,
+ StorageManager.getMongodb().getMongoDatabase().getName()
+ );
+ msgPlayer(
+ player,
+ StorageManager
+ .getMongodb()
+ .getMongoCollection()
+ .getNamespace()
+ .toString()
+ );
+ msgPlayer(
+ player,
+ "---------------------------------------------"
+ );
}
- switch (args.length) {
- case 0 -> msgPl(player, 0);
- case 1 -> {
- switch (args[0]) {
- case "mongodb", "mongo", "MONGODB", "MONGO" -> {
- //print info about connection
- sender.sendMessage(coloredString(Raxen.getPrefix()) + colorTextComp("Printing About Raxen's MongoDB connection..."));
- msgPlayer(player, coloredString(Raxen.getPrefix()) +
- colorTextComp("---------------------------------------------"));
- msgPlayer(player, colorTextComp("MONGO DB"));
- msgPlayer(player, StorageManager.getMongodb().getMongoClient().getClusterDescription().toString());
- msgPlayer(player, StorageManager.getMongodb().getMongoDatabase().getName());
- msgPlayer(player, StorageManager.getMongodb().getMongoCollection().getNamespace().toString());
- msgPlayer(player, "---------------------------------------------");
- }
- case "v", "version", "ver" -> {
- msgPl(player, 0);
- }
- case "hemlp", "?", "h" -> {
- //print help
- }
- }
- }
+ case "v", "version", "ver" -> {
+ msgPlayer(player, Raxen.getVersion());
}
- }
- else {
- log(String.valueOf(args.length));
- switch (args.length) {
- case 0 -> {
- msgSender(sender, Raxen.getPrefix() + "Printing About Raxen...",
- "---------------------------------------------",
- " Raxen ",
- " - Version: " + Raxen.getVersion(),
- " - Author: Unurled");
- TextComponent txt = colorTextComp(" - Website: https://unurled.me");
- sender.sendMessage(txt);
- sender.sendMessage(coloredString("---------------------------------------------"));
- return true;
- }
- case 1 -> {
- switch (args[0]) {
- case "mongodb", "mongo", "MONGODB", "MONGO" -> {
- //print info about connection
- msgSender(sender, Raxen.getPrefix() + "Printing About Raxen's MongoDB connection...",
- "---------------------------------------------" + "MONGO DB");
- sender.sendMessage(StorageManager.getMongodb().getMongoClient().getClusterDescription().toString());
- sender.sendMessage(StorageManager.getMongodb().getMongoDatabase().getName());
- sender.sendMessage(StorageManager.getMongodb().getMongoCollection().getNamespace().toString());
- sender.sendMessage(coloredString("---------------------------------------------"));
- return true;
- }
- case "v", "version", "ver" -> {
- msgSender(sender, Raxen.getPrefix() + "Printing About Raxen...",
- "---------------------------------------------",
- " Raxen ",
- " - Version: " + Raxen.getVersion(),
- " - Author: Un&eurled");
- TextComponent txt=colorTextComp(" - Website: https://unurled.me");
- sender.sendMessage(txt);
- sender.sendMessage(coloredString("---------------------------------------------"));
- return true;
- }
- case "hemlp", "?", "h" ->
- //print help
- debug(main, "print help");
- }
- }
+ case "hemlp", "?", "h" -> {
+ //print help
}
+ }
}
- return false;
- }
-
- public void msgPl(Player player, Integer in) {
- switch(in) {
- case 0:
- msgPlayer(player, Raxen.getPrefix() + "Printing About Raxen...",
- "---------------------------------------------",
- " Raxen ",
- " - Version: " + Raxen.getVersion(),
- " - Author: Un&eurled");
- TextComponent txt = (TextComponent) colorComp(" - Website: https://unurled.me")
- .clickEvent(ClickEvent.openUrl("https://unurled.me"));
- player.sendMessage(txt);
- msgPlayer(player, "", "---------------------------------------------");
+ }
+ } else {
+ switch (args.length) {
+ case 0 -> {
+ msgSender(
+ sender,
+ Raxen.getPrefix() + "Printing About Raxen...",
+ "---------------------------------------------",
+ " Raxen ",
+ " - Version: " + Raxen.getVersion(),
+ " - Author: Unurled"
+ );
+ TextComponent txt = colorTextComp(
+ " - Website: https://unurled.me"
+ );
+ sender.sendMessage(txt);
+ sender.sendMessage(
+ colorComp("---------------------------------------------")
+ );
+ return true;
}
+ case 1 -> {
+ switch (args[0]) {
+ case "mongodb", "mongo", "MONGODB", "MONGO" -> {
+ //print info about connection
+ msgSender(
+ sender,
+ Raxen.getPrefix() +
+ "Printing About Raxen's MongoDB connection...",
+ "---------------------------------------------" +
+ "MONGO DB"
+ );
+ sender.sendMessage(
+ stringToComp(
+ StorageManager
+ .getMongodb()
+ .getMongoClient()
+ .getClusterDescription()
+ .toString()
+ )
+ );
+ sender.sendMessage(
+ stringToComp(
+ StorageManager.getMongodb().getMongoDatabase().getName()
+ )
+ );
+ sender.sendMessage(
+ stringToComp(
+ StorageManager
+ .getMongodb()
+ .getMongoCollection()
+ .getNamespace()
+ .toString()
+ )
+ );
+ sender.sendMessage(
+ stringToComp(
+ coloredString(
+ "---------------------------------------------"
+ )
+ )
+ );
+ return true;
+ }
+ case "v", "version", "ver" -> {
+ msgSender(
+ sender,
+ Raxen.getPrefix() + "Printing About Raxen...",
+ "---------------------------------------------",
+ " Raxen ",
+ " - Version: " + Raxen.getVersion(),
+ " - Author: Un&eurled"
+ );
+ TextComponent txt = colorTextComp(
+ " - Website: https://unurled.me"
+ );
+ sender.sendMessage(txt);
+ sender.sendMessage(
+ colorComp("---------------------------------------------")
+ );
+ return true;
+ }
+ case "hemlp", "?", "h" -> //print help
+ debug(main, "print help");
+ }
+ }
+ }
}
+ return false;
+ }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
+ public void msgPl(Player player, Integer in) {
+ switch (in) {
+ case 0:
+ msgPlayer(
+ player,
+ Raxen.getPrefix() + "Printing About Raxen...",
+ "---------------------------------------------",
+ " Raxen ",
+ " - Version: " + Raxen.getVersion(),
+ " - Author: Un&eurled"
+ );
+ TextComponent txt = (TextComponent) colorComp(
+ " - Website: https://unurled.me"
+ )
+ .clickEvent(ClickEvent.openUrl("https://unurled.me"));
+ player.sendMessage(txt);
+ msgPlayer(
+ player,
+ "",
+ "---------------------------------------------"
+ );
}
+ }
+
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java b/src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java
index 03b64f4..c070758 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/CustomModelDataCommand.java
@@ -1,5 +1,12 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.utils.Items.customModelData;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -10,88 +17,106 @@ import org.bukkit.util.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Items.customModelData;
-import static me.unurled.raxen.utils.Utils.*;
public class CustomModelDataCommand implements TabExecutor {
- /**
- * change custom model data of an item
- * @param sender Source of the command
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args Passed command arguments
- * @return
- */
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if (!(sender instanceof Player)) {
- errorConsoleSender(sender);
- return true;
- }
- Player p = (Player) sender;
- if (!(p.hasPermission("raxen.custommodeldata.cmd"))) {
- p.sendMessage(noPerms());
- return true;
- }
- ItemStack it = p.getInventory().getItemInMainHand();
- if (args.length == 0) {
- p.sendMessage(colorComp("Usage: /custommodeldata "));
- return true;
- }
- if (!(isInt(args[0]))) {
- Material material = Material.getMaterial(args[1]);
- if (material != null) {
- it = customModelData(new ItemStack(material), Integer.parseInt(args[0]));
- p.getInventory().setItemInMainHand(it);
- p.updateInventory();
- } else {
- p.sendMessage(colorComp("Please specify a valid Item Name or a valid Integer."));
- }
- } else {
- if (it != null && it.getType() != Material.AIR) { // check if player has an item in hand
- // has item in hand applying the custom model data
- it = customModelData(it, Integer.parseInt(args[0]));
- p.getInventory().setItemInMainHand(it);
- p.updateInventory();
- } else {
- p.sendMessage(colorComp("Get an item in hand please or specify an item"));
- p.sendMessage(colorComp("Usage: /custommodeldata "));
- }
- }
- return true;
+ /**
+ * change custom model data of an item
+ * @param sender Source of the command
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args Passed command arguments
+ * @return
+ */
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ errorConsoleSender(sender);
+ return true;
}
-
- /**
- * @param sender Source of the command. For players tab-completing a
- * command inside of a command block, this will be the player, not
- * the command block.
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args The arguments passed to the command, including final
- * partial argument to be completed
- * @return
- */
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- final List completions = new ArrayList<>();
-
- List SUB_COMMANDS= new ArrayList<>();
-
- if (!(isInt(args[0]))) {
- return Arrays.asList( "§c" + args[0]);
- }
- if (args.length == 2) {
- for (Material mat : Material.values()) {
- SUB_COMMANDS.add(mat.name());
- }
- StringUtil.copyPartialMatches(args[1], SUB_COMMANDS, completions);
- Collections.sort(completions);
- }
- return completions;
+ Player p = (Player) sender;
+ if (!(p.hasPermission("raxen.custommodeldata.cmd"))) {
+ p.sendMessage(noPerms());
+ return true;
}
+ ItemStack it = p.getInventory().getItemInMainHand();
+ if (args.length == 0) {
+ p.sendMessage(
+ colorComp(
+ "Usage: /custommodeldata "
+ )
+ );
+ return true;
+ }
+ if (!(isInt(args[0]))) {
+ Material material = Material.getMaterial(args[1]);
+ if (material != null) {
+ it =
+ customModelData(new ItemStack(material), Integer.parseInt(args[0]));
+ p.getInventory().setItemInMainHand(it);
+ p.updateInventory();
+ } else {
+ p.sendMessage(
+ colorComp(
+ "Please specify a valid Item Name or a valid Integer."
+ )
+ );
+ }
+ } else {
+ if (it != null && it.getType() != Material.AIR) { // check if player has an item in hand
+ // has item in hand applying the custom model data
+ it = customModelData(it, Integer.parseInt(args[0]));
+ p.getInventory().setItemInMainHand(it);
+ p.updateInventory();
+ } else {
+ p.sendMessage(
+ colorComp("Get an item in hand please or specify an item")
+ );
+ p.sendMessage(
+ colorComp(
+ "Usage: /custommodeldata "
+ )
+ );
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @param sender Source of the command. For players tab-completing a
+ * command inside of a command block, this will be the player, not
+ * the command block.
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args The arguments passed to the command, including final
+ * partial argument to be completed
+ * @return
+ */
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ final List completions = new ArrayList<>();
+
+ List SUB_COMMANDS = new ArrayList<>();
+
+ if (!(isInt(args[0]))) {
+ return Arrays.asList("§c" + args[0]);
+ }
+ if (args.length == 2) {
+ for (Material mat : Material.values()) {
+ SUB_COMMANDS.add(mat.name());
+ }
+ StringUtil.copyPartialMatches(args[1], SUB_COMMANDS, completions);
+ Collections.sort(completions);
+ }
+ return completions;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/EntitiyCommand.java b/src/main/java/me/unurled/raxen/commands/admin/EntitiyCommand.java
index 8dd0322..2afc02a 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/EntitiyCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/EntitiyCommand.java
@@ -1,40 +1,49 @@
package me.unurled.raxen.commands.admin;
+import java.util.List;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
public class EntitiyCommand implements TabExecutor {
- /**
- * Get the egg spawn of a custom entity :)
- * @param sender Source of the command
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args Passed command arguments
- * @return
- */
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- return false;
- }
+ /**
+ * Get the egg spawn of a custom entity :)
+ * @param sender Source of the command
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args Passed command arguments
+ * @return
+ */
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ return false;
+ }
- /**
- * @param sender Source of the command. For players tab-completing a
- * command inside a command block, this will be the player, not
- * the command block.
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args The arguments passed to the command, including final
- * partial argument to be completed
- * @return
- */
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- return null;
- }
+ /**
+ * @param sender Source of the command. For players tab-completing a
+ * command inside a command block, this will be the player, not
+ * the command block.
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args The arguments passed to the command, including final
+ * partial argument to be completed
+ * @return
+ */
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java b/src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java
index 346aed9..d6b507d 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/ItemListCommand.java
@@ -1,5 +1,8 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.List;
import lombok.Getter;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.gui.ItemListGui;
@@ -10,40 +13,51 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.*;
-
public class ItemListCommand implements TabExecutor {
- private Raxen main;
+ private Raxen main;
- @Getter
- private ItemListGui itemListGui;
+ @Getter
+ private ItemListGui itemListGui;
- public ItemListCommand(Raxen main) {
- this.main = main;
- this.itemListGui = new ItemListGui(this.main);
+ public ItemListCommand(Raxen main) {
+ this.main = main;
+ this.itemListGui = new ItemListGui(this.main);
+ }
+
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command cmd,
+ @NotNull String msg,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ log("Console can't execute this command atm.");
+ return true;
}
-
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String msg, @NotNull String[] args) {
- if (!(sender instanceof Player)) {
- log("Console can't execute this command atm.");
- return true;
- }
- Player player = (Player) sender;
- if(!(player.hasPermission("raxen.itemlist.cmd"))) {
- msgPlayer(player, colorString("You'dont have the permission to execute this command."));
- return true;
- }
- //openGui logic
- player.openInventory(itemListGui.getInv());
- return false;
+ Player player = (Player) sender;
+ if (!(player.hasPermission("raxen.itemlist.cmd"))) {
+ msgPlayer(
+ player,
+ colorString(
+ "You'dont have the permission to execute this command."
+ )
+ );
+ return true;
}
+ //openGui logic
+ player.openInventory(itemListGui.getInv());
+ return false;
+ }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
- }
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/ItemTo64Command.java b/src/main/java/me/unurled/raxen/commands/admin/ItemTo64Command.java
index d13fdda..8638a31 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/ItemTo64Command.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/ItemTo64Command.java
@@ -1,5 +1,9 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.utils.Items.itemTo64;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.List;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
@@ -7,42 +11,48 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.*;
-import static me.unurled.raxen.utils.Items.itemTo64;
-
public class ItemTo64Command implements TabExecutor {
- /**
- * @param sender Source of the command
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args Passed command arguments
- * @return
- */
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if (sender instanceof Player p) {
- msgPlayer(p, itemTo64(p.getInventory().getItemInMainHand()));
- } else {
- errorConsoleSender(sender);
- return true;
- }
- return false;
- }
- /**
- * @param sender Source of the command. For players tab-completing a
- * command inside of a command block, this will be the player, not
- * the command block.
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args The arguments passed to the command, including final
- * partial argument to be completed
- * @return
- */
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- return null;
+ /**
+ * @param sender Source of the command
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args Passed command arguments
+ * @return
+ */
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (sender instanceof Player p) {
+ msgPlayer(p, itemTo64(p.getInventory().getItemInMainHand()));
+ } else {
+ errorConsoleSender(sender);
+ return true;
}
+ return false;
+ }
+
+ /**
+ * @param sender Source of the command. For players tab-completing a
+ * command inside of a command block, this will be the player, not
+ * the command block.
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args The arguments passed to the command, including final
+ * partial argument to be completed
+ * @return
+ */
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java b/src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java
index a4d339d..8267eca 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/NbtCommand.java
@@ -1,6 +1,12 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.components.entity.player.PlayerUtils.updateSkills;
+import static me.unurled.raxen.utils.Utils.*;
+
import de.tr7zw.nbtapi.NBTItem;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.manager.entity.PlayerManager;
import net.kyori.adventure.text.Component;
@@ -15,94 +21,119 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static me.unurled.raxen.components.entity.player.PlayerUtils.updateSkills;
-import static me.unurled.raxen.utils.Utils.*;
-
public class NbtCommand implements TabExecutor {
- private final Raxen main;
+ private final Raxen main;
- public NbtCommand(Raxen main) {
- this.main = main;
+ public NbtCommand(Raxen main) {
+ this.main = main;
+ }
+
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command cmd,
+ @NotNull String msg,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player player)) {
+ error(
+ (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),
+ colorString("You can't execute this command as the Console!")
+ );
+ return true;
}
-
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String msg, @NotNull String[] args) {
- if(!(sender instanceof Player player)) {
- error((Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),colorString("You can't execute this command as the Console!"));
- return true;
+ if (player.getInventory().getItemInMainHand().getType() == Material.AIR) {
+ msgPlayer(player, colorTextComp("You must hold an Item in hand."));
+ return true;
+ } else {
+ player.getInventory().getItemInMainHand();
+ }
+ switch (args.length) {
+ case 0, 1 -> msgPlayer(
+ player,
+ colorTextComp("You must specify an nbt and an int.")
+ );
+ case 2 -> {
+ debug("'" + args[0] + "'", "'" + args[1] + "'");
+ ItemStack it = player.getInventory().getItemInMainHand();
+ NBTItem nbti = new NBTItem(it);
+ int a = 0;
+ if (nbti.hasTag(args[0])) {
+ a = nbti.getInteger(args[0]);
}
- if(player.getInventory().getItemInMainHand().getType() == Material.AIR) {
- msgPlayer(player,colorTextComp("You must hold an Item in hand."));
- return true;
- } else {
- player.getInventory().getItemInMainHand();
- }
- switch (args.length) {
- case 0, 1 -> msgPlayer(player, colorTextComp("You must specify an nbt and an int."));
- case 2 -> {
- debug("'" + args[0] + "'", "'" + args[1] + "'");
- ItemStack it = player.getInventory().getItemInMainHand();
- NBTItem nbti = new NBTItem(it);
- int a = 0;
- if (nbti.hasTag(args[0])) {
- a = nbti.getInteger(args[0]);
- }
- List lore = new ArrayList<>();
- // ItemMeta itm = it.getItemMeta();
- // lore.add((Component) itm.lore());
- boolean yes = false;
- boolean ever = false;
- for (Component ct : lore) {
- if (ct != null) {
- if (ct.contains(Component.text("Attributes:"))) {
- yes = true;
- ever = true;
- } else {
- if (yes) {
- //ct.append(Component.text(colorString(attributes(args[0]) + ": " + (Integer.parseInt(args[1]) + a)))); deprecated
- yes = false;
- }
- }
- }
- }
- if (!ever) {
- lore.add(colorTextComp("Attributes:"));
- //lore.add(colorTextComp(attributes(args[0]) + ": " + (Integer.parseInt(args[1]) + a))); deprecated
- }
- // itm.lore(lore);
- // it.setItemMeta(itm);
- PlayerManager pm = ((Raxen) Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("Raxen"))).getManager().getPlayerManager();
- nbti.setInteger(args[0], Integer.parseInt(args[1]) + a);
- if (nbti.hasTag("SPEED")) {
- pm.getSpeed().add(player, nbti.getInteger("SPEED"));
- }
- if (nbti.hasTag("HEALTH")) {
- pm.getHealth().add(player, nbti.getInteger("HEALTH"));
- }
- if (nbti.hasTag("DEFENSE")) {
- pm.getDefense().add(player, nbti.getInteger("DEFENSE"));
-
- }
- if (nbti.hasTag("STRENGTH")) {
- pm.getStrength().add(player, nbti.getInteger("STRENGTH"));
- }
- it = nbti.getItem();
- msgPlayer(player, colorTextComp(Raxen.getPrefix() + "You successfully added the nbt " + /*attributes(args[0])*/ args[0] + "with " + args[1] + "."));
- updateSkills(main, player);
- player.getInventory().setItem(player.getInventory().getHeldItemSlot(), it);
+ List lore = new ArrayList<>();
+ // ItemMeta itm = it.getItemMeta();
+ // lore.add((Component) itm.lore());
+ boolean yes = false;
+ boolean ever = false;
+ for (Component ct : lore) {
+ if (ct != null) {
+ if (ct.contains(Component.text("Attributes:"))) {
+ yes = true;
+ ever = true;
+ } else {
+ if (yes) {
+ //ct.append(Component.text(colorString(attributes(args[0]) + ": " + (Integer.parseInt(args[1]) + a)))); deprecated
+ yes = false;
+ }
}
+ }
}
- return true;
+ if (!ever) {
+ lore.add(colorTextComp("Attributes:"));
+ //lore.add(colorTextComp(attributes(args[0]) + ": " + (Integer.parseInt(args[1]) + a))); deprecated
+ }
+ // itm.lore(lore);
+ // it.setItemMeta(itm);
+ PlayerManager pm =
+ (
+ (Raxen) Objects.requireNonNull(
+ Bukkit.getPluginManager().getPlugin("Raxen")
+ )
+ ).getManager()
+ .getPlayerManager();
+ nbti.setInteger(args[0], Integer.parseInt(args[1]) + a);
+ if (nbti.hasTag("SPEED")) {
+ pm.getSpeed().add(player, nbti.getInteger("SPEED"));
+ }
+ if (nbti.hasTag("HEALTH")) {
+ pm.getHealth().add(player, nbti.getInteger("HEALTH"));
+ }
+ if (nbti.hasTag("DEFENSE")) {
+ pm.getDefense().add(player, nbti.getInteger("DEFENSE"));
+ }
+ if (nbti.hasTag("STRENGTH")) {
+ pm.getStrength().add(player, nbti.getInteger("STRENGTH"));
+ }
+ it = nbti.getItem();
+ msgPlayer(
+ player,
+ colorTextComp(
+ Raxen.getPrefix() +
+ "You successfully added the nbt " +
+ /*attributes(args[0])*/args[0] +
+ "with " +
+ args[1] +
+ "."
+ )
+ );
+ updateSkills(main, player);
+ player
+ .getInventory()
+ .setItem(player.getInventory().getHeldItemSlot(), it);
+ }
}
+ return true;
+ }
-
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
- }
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java b/src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java
index edfe519..89115e3 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/ReloadCommand.java
@@ -1,5 +1,8 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.List;
import me.unurled.raxen.utils.Reload;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -9,28 +12,39 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.*;
-
public class ReloadCommand implements TabExecutor {
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String msg, @NotNull String[] args) {
- if(sender instanceof Player) {
- Player player = (Player) sender;
- if(!player.hasPermission("raxen.reload.cmd")) {
- player.sendMessage(noPerms());
- return true;
- }
- }
- Reload.kickAll();
- log(colorString("Server stopping!\n Using: /rlpl.\n Please wait a little bit."));
- Bukkit.getServer().shutdown();
- return false;
- }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String msg,
+ @NotNull String[] args
+ ) {
+ if (sender instanceof Player) {
+ Player player = (Player) sender;
+ if (!player.hasPermission("raxen.reload.cmd")) {
+ player.sendMessage(noPerms());
+ return true;
+ }
}
+ Reload.kickAll();
+ log(
+ colorString(
+ "Server stopping!\n Using: /rlpl.\n Please wait a little bit."
+ )
+ );
+ Bukkit.getServer().shutdown();
+ return false;
+ }
+
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java b/src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java
index 2e6917b..66e6c2f 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/SpawnEntity.java
@@ -1,5 +1,13 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.components.entity.other.EntityUtils.setNameSpacedKeys;
+import static me.unurled.raxen.utils.Items.itemFrom64;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.entity.other.EntityNamespacedKey;
import org.bukkit.Bukkit;
@@ -16,132 +24,189 @@ import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static me.unurled.raxen.components.entity.other.EntityUtils.setNameSpacedKeys;
-import static me.unurled.raxen.utils.Items.itemFrom64;
-import static me.unurled.raxen.utils.Utils.*;
-
public class SpawnEntity implements TabExecutor {
- private Raxen main;
- private EntityNamespacedKey namespacedKey;
+ private Raxen main;
+ private EntityNamespacedKey namespacedKey;
- public SpawnEntity(Raxen main) {
- this.main = main;
- this.namespacedKey = new EntityNamespacedKey(main);
+ public SpawnEntity(Raxen main) {
+ this.main = main;
+ this.namespacedKey = new EntityNamespacedKey(main);
+ }
+
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ log(colorTextComp("Console can't execute this command!"));
+ try { // /entityspawn ZOMBIE "&cHello folks" x:0 y:0 z:0 level health defense speed strength itemStackBinary64: helmet, chestplate, leggings, boots, main-hand, off-hand
+ if (validateArgs(args, 16)) {
+ args = setNullInArgs(args);
+ } else {
+ log(
+ colorTextComp(
+ "Please use null if you don't want some parameters in the command."
+ )
+ );
+ log(
+ colorTextComp(
+ "Follow this command: /entityspawn TYPE \"name\" x y z level health defense speed strength " +
+ "helmet(itemStackBinary64) chestplate(itemStackBinary64) leggings(itemStackBinary64) boots(itemStackBinary64) main-hand(itemStackBinary64) off-hand(itemStackBinary64)"
+ )
+ );
+ return false;
+ }
+
+ EntityType types = EntityType.valueOf(args[0]);
+ Location loc = new Location(
+ Bukkit.getWorld("world"),
+ Double.parseDouble(args[2]),
+ Double.parseDouble(args[3]),
+ Double.parseDouble(args[4])
+ );
+ Entity e = loc.getWorld().spawnEntity(loc, types, false);
+ setNameSpacedKeys(
+ e,
+ getStringFromArg(args),
+ Integer.parseInt(args[6]),
+ Integer.parseInt(args[7]),
+ 0,
+ Integer.parseInt(args[8]),
+ 0,
+ Integer.parseInt(args[9]),
+ 0,
+ Integer.parseInt(args[10]),
+ 0
+ );
+ e.customName(colorTextComp(getStringFromArg(args)));
+ e.setCustomNameVisible(true);
+ if (e instanceof LivingEntity livingEntity) {
+ // livingEntity.getEquipment().set
+ ItemStack helmet = itemFrom64(args[11]);
+ ItemStack chestplate = itemFrom64(args[12]);
+ ItemStack leggins = itemFrom64(args[13]);
+ ItemStack boots = itemFrom64(args[14]);
+ ItemStack mainhand = itemFrom64(args[15]);
+ ItemStack offhand = itemFrom64(args[14]);
+ EntityEquipment equip = livingEntity.getEquipment();
+ equip.setHelmet(helmet);
+ equip.setChestplate(chestplate);
+ equip.setLeggings(leggins);
+ equip.setBoots(boots);
+ equip.setItemInMainHand(mainhand);
+ equip.setItemInOffHand(offhand);
+ }
+
+ System.out.println(e.getName());
+ } catch (IllegalArgumentException e) {
+ error("Something happened near the SpawnEntity command.");
+ throw new RuntimeException(e);
+ } catch (IOException e) {
+ error(
+ "Could not deserialize item from the command EntitySpawn (command launched by " +
+ sender.getName() +
+ ")"
+ );
+ throw new RuntimeException(e);
+ }
}
-
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if (!(sender instanceof Player)) {
- log(colorTextComp("Console can't execute this command!"));
- try { // /entityspawn ZOMBIE "&cHello folks" x:0 y:0 z:0 level health defense speed strength itemStackBinary64: helmet, chestplate, leggings, boots, main-hand, off-hand
- if (validateArgs(args, 16)) {
- args = setNullInArgs(args);
- } else {
- log(colorTextComp("Please use null if you don't want some parameters in the command."));
- log(colorTextComp("Follow this command: /entityspawn TYPE \"name\" x y z level health defense speed strength " +
- "helmet(itemStackBinary64) chestplate(itemStackBinary64) leggings(itemStackBinary64) boots(itemStackBinary64) main-hand(itemStackBinary64) off-hand(itemStackBinary64)"));
- return false;
- }
-
- EntityType types = EntityType.valueOf(args[0]);
- Location loc = new Location(Bukkit.getWorld("world"), Double.parseDouble(args[2]), Double.parseDouble(args[3]), Double.parseDouble(args[4]));
- Entity e = loc.getWorld().spawnEntity(loc, types, false);
- setNameSpacedKeys(e, getStringFromArg(args), Integer.parseInt(args[6]), Integer.parseInt(args[7]),0,
- Integer.parseInt(args[8]),0, Integer.parseInt(args[9]),0, Integer.parseInt(args[10]),0);
- e.customName(colorTextComp(getStringFromArg(args)));
- e.setCustomNameVisible(true);
- if (e instanceof LivingEntity livingEntity) {
-// livingEntity.getEquipment().set
- ItemStack helmet = itemFrom64(args[11]);
- ItemStack chestplate = itemFrom64(args[12]);
- ItemStack leggins = itemFrom64(args[13]);
- ItemStack boots = itemFrom64(args[14]);
- ItemStack mainhand = itemFrom64(args[15]);
- ItemStack offhand = itemFrom64(args[14]);
- EntityEquipment equip = livingEntity.getEquipment();
- equip.setHelmet(helmet);
- equip.setChestplate(chestplate);
- equip.setLeggings(leggins);
- equip.setBoots(boots);
- equip.setItemInMainHand(mainhand);
- equip.setItemInOffHand(offhand);
- }
-
- System.out.println(e.getName());
- } catch (IllegalArgumentException e) {
- error("Something happened near the SpawnEntity command.");
- throw new RuntimeException(e);
- } catch (IOException e) {
- error("Could not deserialize item from the command EntitySpawn (command launched by " + sender.getName() + ")");
- throw new RuntimeException(e);
- }
- }
- for (String arg : args) {
- log(arg);
- }
- Player player = (Player) sender;
- if (!player.hasPermission("raxen.entityspawn.cmd")) {
- player.sendMessage(noPerms());
- return false;
- }
- try { // /entityspawn ZOMBIE "&cHello folks" x:0 y:0 z:0 level health defense speed strength itemStackBinary64: helmet, chestplate, leggings, boots, main-hand, off-hand
- if (validateArgs(args, 16)) {
- args = setNullInArgs(args);
- } else {
- log(colorTextComp("Please use null if you don't want some parameters in the command."));
- log(colorTextComp("Follow this command: /entityspawn TYPE \"name\" x y z level health defense speed strength " +
- "helmet(itemStackBinary64) chestplate(itemStackBinary64) leggings(itemStackBinary64) boots(itemStackBinary64) main-hand(itemStackBinary64) off-hand(itemStackBinary64)"));
- return false;
- }
-
- EntityType types = EntityType.valueOf(args[0]);
- Location loc = new Location(Bukkit.getWorld("world"), Double.parseDouble(args[2]), Double.parseDouble(args[3]), Double.parseDouble(args[4]));
- Entity e = loc.getWorld().spawnEntity(loc, types, false);
- setNameSpacedKeys(e, getStringFromArg(args), Integer.parseInt(args[6]), Integer.parseInt(args[7]),0,
- Integer.parseInt(args[8]),0, Integer.parseInt(args[9]),0, Integer.parseInt(args[10]),0);
- e.customName(colorTextComp(getStringFromArg(args)));
- e.setCustomNameVisible(true);
- if (e instanceof LivingEntity livingEntity) {
-// livingEntity.getEquipment().set
- ItemStack helmet = itemFrom64(args[11]);
- ItemStack chestplate = itemFrom64(args[12]);
- ItemStack leggins = itemFrom64(args[13]);
- ItemStack boots = itemFrom64(args[14]);
- ItemStack mainhand = itemFrom64(args[15]);
- ItemStack offhand = itemFrom64(args[14]);
- EntityEquipment equip = livingEntity.getEquipment();
- equip.setHelmet(helmet);
- equip.setChestplate(chestplate);
- equip.setLeggings(leggins);
- equip.setBoots(boots);
- equip.setItemInMainHand(mainhand);
- equip.setItemInOffHand(offhand);
- }
-
- System.out.println(e.getName());
- } catch (IllegalArgumentException e) {
- error("Something happened near the SpawnEntity command.");
- throw new RuntimeException(e);
- } catch (IOException e) {
- error("Could not deserialize item from the command EntitySpawn (command launched by " + sender.getName() + ")");
- throw new RuntimeException(e);
- }
-
+ for (String arg : args) {
+ log(arg);
+ }
+ Player player = (Player) sender;
+ if (!player.hasPermission("raxen.entityspawn.cmd")) {
+ player.sendMessage(noPerms());
+ return false;
+ }
+ try { // /entityspawn ZOMBIE "&cHello folks" x:0 y:0 z:0 level health defense speed strength itemStackBinary64: helmet, chestplate, leggings, boots, main-hand, off-hand
+ if (validateArgs(args, 16)) {
+ args = setNullInArgs(args);
+ } else {
+ log(
+ colorTextComp(
+ "Please use null if you don't want some parameters in the command."
+ )
+ );
+ log(
+ colorTextComp(
+ "Follow this command: /entityspawn TYPE \"name\" x y z level health defense speed strength " +
+ "helmet(itemStackBinary64) chestplate(itemStackBinary64) leggings(itemStackBinary64) boots(itemStackBinary64) main-hand(itemStackBinary64) off-hand(itemStackBinary64)"
+ )
+ );
return false;
+ }
+
+ EntityType types = EntityType.valueOf(args[0]);
+ Location loc = new Location(
+ Bukkit.getWorld("world"),
+ Double.parseDouble(args[2]),
+ Double.parseDouble(args[3]),
+ Double.parseDouble(args[4])
+ );
+ Entity e = loc.getWorld().spawnEntity(loc, types, false);
+ setNameSpacedKeys(
+ e,
+ getStringFromArg(args),
+ Integer.parseInt(args[6]),
+ Integer.parseInt(args[7]),
+ 0,
+ Integer.parseInt(args[8]),
+ 0,
+ Integer.parseInt(args[9]),
+ 0,
+ Integer.parseInt(args[10]),
+ 0
+ );
+ e.customName(colorTextComp(getStringFromArg(args)));
+ e.setCustomNameVisible(true);
+ if (e instanceof LivingEntity livingEntity) {
+ // livingEntity.getEquipment().set
+ ItemStack helmet = itemFrom64(args[11]);
+ ItemStack chestplate = itemFrom64(args[12]);
+ ItemStack leggins = itemFrom64(args[13]);
+ ItemStack boots = itemFrom64(args[14]);
+ ItemStack mainhand = itemFrom64(args[15]);
+ ItemStack offhand = itemFrom64(args[14]);
+ EntityEquipment equip = livingEntity.getEquipment();
+ equip.setHelmet(helmet);
+ equip.setChestplate(chestplate);
+ equip.setLeggings(leggins);
+ equip.setBoots(boots);
+ equip.setItemInMainHand(mainhand);
+ equip.setItemInOffHand(offhand);
+ }
+
+ System.out.println(e.getName());
+ } catch (IllegalArgumentException e) {
+ error("Something happened near the SpawnEntity command.");
+ throw new RuntimeException(e);
+ } catch (IOException e) {
+ error(
+ "Could not deserialize item from the command EntitySpawn (command launched by " +
+ sender.getName() +
+ ")"
+ );
+ throw new RuntimeException(e);
}
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- List list = new ArrayList<>();
- for (EntityType types : EntityType.values()) {
- list.add(types.name());
- }
- return list;
+ return false;
+ }
+
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ List list = new ArrayList<>();
+ for (EntityType types : EntityType.values()) {
+ list.add(types.name());
}
+ return list;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java b/src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java
index b7b9ffd..83c3b42 100644
--- a/src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/admin/TestGuiCommand.java
@@ -1,5 +1,9 @@
package me.unurled.raxen.commands.admin;
+import static me.unurled.raxen.utils.Utils.colorTextComp;
+import static me.unurled.raxen.utils.Utils.log;
+
+import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -8,29 +12,36 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.colorTextComp;
-import static me.unurled.raxen.utils.Utils.log;
-
public class TestGuiCommand implements TabExecutor {
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if(sender instanceof Player) {
- Player player = (Player) sender;
- if(player.hasPermission("raxen.test.gui.cmd")) {
- player.openInventory(Bukkit.createInventory(null, 54, colorTextComp(args[0])));
- }
- }
- else {
- log("The console can't execute this Command!");
- return true;
- }
- return false;
- }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (sender instanceof Player) {
+ Player player = (Player) sender;
+ if (player.hasPermission("raxen.test.gui.cmd")) {
+ player.openInventory(
+ Bukkit.createInventory(null, 54, colorTextComp(args[0]))
+ );
+ }
+ } else {
+ log("The console can't execute this Command!");
+ return true;
}
+ return false;
+ }
+
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/admin/TestHoloCommand.java b/src/main/java/me/unurled/raxen/commands/admin/TestHoloCommand.java
deleted file mode 100644
index 928500c..0000000
--- a/src/main/java/me/unurled/raxen/commands/admin/TestHoloCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package me.unurled.raxen.commands.admin;
-
-import me.unurled.raxen.Raxen;
-import me.unurled.raxen.utils.Utils;
-import net.kyori.adventure.text.TextComponent;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-public class TestHoloCommand implements TabExecutor {
-
- private Raxen main;
-
- public TestHoloCommand(Raxen main) {
- this.main = main;
- }
-
- /**
- * @param sender Source of the command
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args Passed command arguments
- * @return
- */
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if (sender instanceof Player player) {
- if (player.hasPermission("raxen.testholo.cmd")) {
- // spawn a hologram
- if (args.length > 0) {
- if (args[0].equalsIgnoreCase("text")) {
- main.getManager().getLibsManager().getHolographicDisplay().createHologram("test holo", player.getLocation().add(0.0, 2.0, 0.0));
- } else if (args[0].equalsIgnoreCase("item")) {
- main.getManager().getLibsManager().getHolographicDisplay().createHologram(player.getInventory().getItemInMainHand(), player.getLocation().add(0.0, 2.0, 0.0));
- }
- } else {
- Utils.msgPlayer(player, "You need to use the correct syntax :", "/" + label + " [text | item]");
- }
- } else {
- Utils.msgPlayer(player, (TextComponent) Utils.noPerms());
- }
- } else {
- Utils.errorConsoleSender(sender);
- }
- return true;
- }
-
- /**
- * @param sender Source of the command. For players tab-completing a
- * command inside of a command block, this will be the player, not
- * the command block.
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args The arguments passed to the command, including final
- * partial argument to be completed
- * @return
- */
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- return null;
- }
-}
diff --git a/src/main/java/me/unurled/raxen/commands/player/ClassCommand.java b/src/main/java/me/unurled/raxen/commands/player/ClassCommand.java
index b7309c4..47900ed 100644
--- a/src/main/java/me/unurled/raxen/commands/player/ClassCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/player/ClassCommand.java
@@ -1,5 +1,10 @@
package me.unurled.raxen.commands.player;
+import static me.unurled.raxen.utils.Utils.colorTextComp;
+import static me.unurled.raxen.utils.Utils.error;
+
+import java.util.HashMap;
+import java.util.List;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.entity.player.classes.Class;
import org.bukkit.Bukkit;
@@ -12,47 +17,66 @@ import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.HashMap;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.colorTextComp;
-import static me.unurled.raxen.utils.Utils.error;
-
public class ClassCommand implements TabExecutor {
- private Raxen main;
+ private Raxen main;
- /**
- * the Command to choose the class
- * @param main
- */
- public ClassCommand(Raxen main) {
- this.main = main;
- }
+ /**
+ * the Command to choose the class
+ * @param main
+ */
+ public ClassCommand(Raxen main) {
+ this.main = main;
+ }
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if(!(sender instanceof Player)) {
- error((Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),"The console can't execute this Command!");
- return true;
- }
- Player player = (Player) sender;
- Inventory inv = Bukkit.createInventory(null, 9, colorTextComp("Choose your class"));
- HashMap classes = main.getManager().getPlayerManager().getClasses();
- if (classes.size() > 10) {
- if (classes.size() > 55) {
- inv = Bukkit.createInventory(null, classes.size(), colorTextComp("Choose your class"));
- }
- }
- for (Class clas : classes.values()) {
- ItemStack item = clas.getPlaceHolder();
- inv.addItem(item);
- }
- return false;
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ error(
+ (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),
+ "The console can't execute this Command!"
+ );
+ return true;
}
+ Player player = (Player) sender;
+ Inventory inv = Bukkit.createInventory(
+ null,
+ 9,
+ colorTextComp("Choose your class")
+ );
+ HashMap classes = main
+ .getManager()
+ .getPlayerManager()
+ .getClasses();
+ if (classes.size() > 10) {
+ if (classes.size() > 55) {
+ inv =
+ Bukkit.createInventory(
+ null,
+ classes.size(),
+ colorTextComp("Choose your class")
+ );
+ }
+ }
+ for (Class clas : classes.values()) {
+ ItemStack item = clas.getPlaceHolder();
+ inv.addItem(item);
+ }
+ return false;
+ }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
- }
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java b/src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java
index 19a2845..694c2f9 100644
--- a/src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/player/MainGuiCommand.java
@@ -1,5 +1,9 @@
package me.unurled.raxen.commands.player;
+import static me.unurled.raxen.utils.Utils.errorConsoleSender;
+import static me.unurled.raxen.utils.Utils.noPerms;
+
+import java.util.List;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.gui.MainGui;
import org.bukkit.command.Command;
@@ -10,54 +14,59 @@ import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.errorConsoleSender;
-import static me.unurled.raxen.utils.Utils.noPerms;
-
public class MainGuiCommand implements TabExecutor {
- private Raxen main;
+ private Raxen main;
- public MainGuiCommand(Raxen main) {
- this.main = main;
- }
+ public MainGuiCommand(Raxen main) {
+ this.main = main;
+ }
- /**
- * @param sender Source of the command
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args Passed command arguments
- * @return
- */
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if (!(sender instanceof Player)) {
- errorConsoleSender(sender);
- return true;
- }
- Player p = (Player) sender;
- if (!(p.hasPermission("raxen.maingui.cmd"))) {
- sender.sendMessage(noPerms());
- return true;
- }
- Inventory inv = MainGui.build(p);
- p.openInventory(inv);
- return true;
+ /**
+ * @param sender Source of the command
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args Passed command arguments
+ * @return
+ */
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ errorConsoleSender(sender);
+ return true;
}
+ Player p = (Player) sender;
+ if (!(p.hasPermission("raxen.maingui.cmd"))) {
+ sender.sendMessage(noPerms());
+ return true;
+ }
+ Inventory inv = MainGui.build(p);
+ p.openInventory(inv);
+ return true;
+ }
- /**
- * @param sender Source of the command. For players tab-completing a
- * command inside of a command block, this will be the player, not
- * the command block.
- * @param command Command which was executed
- * @param label Alias of the command which was used
- * @param args The arguments passed to the command, including final
- * partial argument to be completed
- * @return
- */
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- return null;
- }
+ /**
+ * @param sender Source of the command. For players tab-completing a
+ * command inside of a command block, this will be the player, not
+ * the command block.
+ * @param command Command which was executed
+ * @param label Alias of the command which was used
+ * @param args The arguments passed to the command, including final
+ * partial argument to be completed
+ * @return
+ */
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java b/src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java
index dfbcd52..83863b4 100644
--- a/src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/player/SkillsCommand.java
@@ -1,5 +1,9 @@
package me.unurled.raxen.commands.player;
+import static me.unurled.raxen.utils.Utils.colorTextComp;
+import static me.unurled.raxen.utils.Utils.error;
+
+import java.util.List;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.entity.player.PlayerUtils;
import me.unurled.raxen.components.entity.player.attributes.Attributes;
@@ -12,57 +16,78 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.colorTextComp;
-import static me.unurled.raxen.utils.Utils.error;
-
public class SkillsCommand implements TabExecutor {
- private Raxen main;
+ private Raxen main;
- public SkillsCommand(Raxen main) {
- this.main = main;
+ public SkillsCommand(Raxen main) {
+ this.main = main;
+ }
+
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String msg,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ error(
+ (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),
+ "The console can't execute this Command!"
+ );
+ return true;
}
-
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String msg, @NotNull String[] args) {
- if(!(sender instanceof Player)) {
- error((Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),"The console can't execute this Command!");
- return true;
+ Player player = (Player) sender;
+ Attributes attributes = new Attributes(main);
+ switch (args.length) {
+ case 0:
+ //open gui
+ player.sendMessage(
+ colorTextComp("GUI not implemented yet..")
+ .append(colorTextComp("Try /skill help."))
+ );
+ break;
+ case 1:
+ case 2:
+ player.sendMessage(
+ colorTextComp("Use the command like: ")
+ .append(
+ colorTextComp(
+ "/skill {health|defense|speed|strength} {add|set|remove} {amount}"
+ )
+ )
+ );
+ break;
+ case 3:
+ PlayerManager pm =
+ ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager()
+ .getPlayerManager();
+ for (String s : pm.getAttribute().keySet()) {
+ if (s.equalsIgnoreCase(args[0])) switch (args[1]) {
+ case "add":
+ pm.getAttribute().get(s).add(player, Integer.parseInt(args[2]));
+ case "remove":
+ pm
+ .getAttribute()
+ .get(s)
+ .remove(player, Integer.parseInt(args[2]));
+ case "set":
+ pm.getAttribute().get(s).set(player, Integer.parseInt(args[2]));
+ }
}
- Player player = (Player) sender;
- Attributes attributes = new Attributes(main);
- switch (args.length) {
- case 0:
- //open gui
- player.sendMessage(colorTextComp("GUI not implemented yet..").append(colorTextComp("Try /skill help.")));
- break;
- case 1:
- case 2:
- player.sendMessage(colorTextComp("Use the command like: ")
- .append(colorTextComp("/skill {health|defense|speed|strength} {add|set|remove} {amount}")));
- break;
- case 3:
- PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
- for (String s : pm.getAttribute().keySet()) {
- if (s.equalsIgnoreCase(args[0]))
- switch (args[1]) {
- case "add":
- pm.getAttribute().get(s).add(player, Integer.parseInt(args[2]));
- case "remove":
- pm.getAttribute().get(s).remove(player, Integer.parseInt(args[2]));
- case "set":
- pm.getAttribute().get(s).set(player, Integer.parseInt(args[2]));
- }
- }
- PlayerUtils.updateSkills(main, player);
- }
- return false;
+ PlayerUtils.updateSkills(main, player);
}
+ return false;
+ }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
- }
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/commands/player/StorageCommand.java b/src/main/java/me/unurled/raxen/commands/player/StorageCommand.java
index 29f3955..6558421 100644
--- a/src/main/java/me/unurled/raxen/commands/player/StorageCommand.java
+++ b/src/main/java/me/unurled/raxen/commands/player/StorageCommand.java
@@ -1,5 +1,8 @@
package me.unurled.raxen.commands.player;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.List;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.manager.entity.PlayerManager;
import org.bukkit.Bukkit;
@@ -11,47 +14,67 @@ import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Utils.*;
-
public class StorageCommand implements TabExecutor {
- private PlayerManager playerManager;
+ private PlayerManager playerManager;
- @Override
- public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
- if(!(sender instanceof Player)) {
- error((Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),"The console can't execute this Command!");
- return true;
- }
- Player player = (Player) sender;
- Inventory inv;
- playerManager = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
- switch (args.length) {
- case 0:
- if(playerManager.getRaxenPlayer(player).getStorage() == null) {
- inv = playerManager.getRaxenPlayer(player).createStorage().getEc().getEc();
- } else {
- inv = playerManager.getRaxenPlayer(player).getStorage().getEc().getEc();
- }
- player.openInventory(inv);
- break;
- case 1:
- Player p = Bukkit.getPlayer(args[0]);
- if(p == null) {
- msgPlayer(player, colorString("You can't open the Storage of an unknown Player."));
- return true;
- }
- inv = playerManager.getRaxenPlayer(player).getStorage().getEc().getEc();
- player.openInventory(inv);
- break;
- }
- return true;
+ @Override
+ public boolean onCommand(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String label,
+ @NotNull String[] args
+ ) {
+ if (!(sender instanceof Player)) {
+ error(
+ (Raxen) Bukkit.getPluginManager().getPlugin("Raxen"),
+ "The console can't execute this Command!"
+ );
+ return true;
}
+ Player player = (Player) sender;
+ Inventory inv;
+ playerManager =
+ ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager()
+ .getPlayerManager();
+ switch (args.length) {
+ case 0:
+ if (playerManager.getRaxenPlayer(player).getStorage() == null) {
+ inv =
+ playerManager
+ .getRaxenPlayer(player)
+ .createStorage()
+ .getEc()
+ .getEc();
+ } else {
+ inv =
+ playerManager.getRaxenPlayer(player).getStorage().getEc().getEc();
+ }
+ player.openInventory(inv);
+ break;
+ case 1:
+ Player p = Bukkit.getPlayer(args[0]);
+ if (p == null) {
+ msgPlayer(
+ player,
+ colorString("You can't open the Storage of an unknown Player.")
+ );
+ return true;
+ }
+ inv = playerManager.getRaxenPlayer(player).getStorage().getEc().getEc();
+ player.openInventory(inv);
+ break;
+ }
+ return true;
+ }
- @Override
- public @Nullable List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
- return null;
- }
+ @Override
+ public @Nullable List onTabComplete(
+ @NotNull CommandSender sender,
+ @NotNull Command command,
+ @NotNull String alias,
+ @NotNull String[] args
+ ) {
+ return null;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java b/src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java
index 5ed20e0..0192dda 100644
--- a/src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java
+++ b/src/main/java/me/unurled/raxen/components/dungeons/Dungeon.java
@@ -1,5 +1,8 @@
package me.unurled.raxen.components.dungeons;
+import static me.unurled.raxen.utils.DungeonUtils.getRadiusFromRank;
+
+import java.util.HashMap;
import lombok.Getter;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.dungeons.types.MonsterType;
@@ -7,60 +10,69 @@ import me.unurled.raxen.components.entity.other.RaxenEntity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
-import java.util.HashMap;
-
-import static me.unurled.raxen.utils.DungeonUtils.getRadiusFromRank;
-
public class Dungeon {
- @Getter private String name;
+ @Getter
+ private String name;
- @Getter private Rank rank;
+ @Getter
+ private Rank rank;
- @Getter private Gate gate;
+ @Getter
+ private Gate gate;
- //String, RaxenEntity
- @Getter private HashMap monster = new HashMap<>();
+ //String, RaxenEntity
+ @Getter
+ private HashMap monster = new HashMap<>();
- /**
- * The Type of the Dungeon
- */
- @Getter private Types types;
+ /**
+ * The Type of the Dungeon
+ */
+ @Getter
+ private Types types;
- /**
- * Monster Types
- */
- @Getter private MonsterType monsterType;
+ /**
+ * Monster Types
+ */
+ @Getter
+ private MonsterType monsterType;
- @Getter private Location location;
- @Getter private Integer radius;
+ @Getter
+ private Location location;
- public Dungeon(String name, Rank rank, Types types, MonsterType mType) {
- this.name = name;
- this.rank = rank;
- this.types = types;
- this.monsterType = mType;
- generateGate();
- }
+ @Getter
+ private Integer radius;
- /**
- * Generate the Gate and make it available to players in the world.
- * //TODO: Place the gate at a random place.
- */
- public void generateGate() {
- // -281.50 36.00 187.50
- Location loc = new Location(Bukkit.getWorld("Liberty_City"), -284.0, 45.00, 187.50);
- Integer radius = getRadiusFromRank(this.rank);
- this.gate = new Gate(name, loc, radius);
- }
+ public Dungeon(String name, Rank rank, Types types, MonsterType mType) {
+ this.name = name;
+ this.rank = rank;
+ this.types = types;
+ this.monsterType = mType;
+ generateGate();
+ }
- /**
- * //TODO: Terrain Generation of the inside of the Dungeons
- */
- public void generate() {
- Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen");
- main.getManager().getWorldManager().loadWorld(name);
- monsterType.genMonster(Bukkit.getWorld(name), rank);
+ /**
+ * Generate the Gate and make it available to players in the world.
+ * //TODO: Place the gate at a random place.
+ */
+ public void generateGate() {
+ // -281.50 36.00 187.50
+ Location loc = new Location(
+ Bukkit.getWorld("Liberty_City"),
+ -284.0,
+ 45.00,
+ 187.50
+ );
+ Integer radius = getRadiusFromRank(this.rank);
+ this.gate = new Gate(name, loc, radius);
+ }
- }
+ /**
+ * //TODO: Terrain Generation of the inside of the Dungeons
+ */
+ public void generate() {
+ Raxen main = (Raxen) Bukkit.getPluginManager().getPlugin("Raxen");
+ main.getManager().getWorldManager().loadWorld(name);
+ monsterType.genMonster(Bukkit.getWorld(name), rank);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/dungeons/Gate.java b/src/main/java/me/unurled/raxen/components/dungeons/Gate.java
index 5c90e57..0cc4323 100644
--- a/src/main/java/me/unurled/raxen/components/dungeons/Gate.java
+++ b/src/main/java/me/unurled/raxen/components/dungeons/Gate.java
@@ -1,48 +1,44 @@
package me.unurled.raxen.components.dungeons;
+import java.util.Random;
import org.bukkit.Location;
import org.bukkit.Material;
-import java.util.Random;
-
public class Gate {
- private String name;
+ private String name;
- private Location loc;
- private Integer portalRadius;
+ private Location loc;
+ private Integer portalRadius;
+ public Gate(String name, Location loc, Integer portalRadius) {
+ this.loc = loc;
+ this.portalRadius = portalRadius;
+ this.name = name;
+ }
- public Gate(String name, Location loc, Integer portalRadius) {
- this.loc = loc;
- this.portalRadius = portalRadius;
- this.name = name;
+ public void teleport() {}
+
+ public void genGate() {
+ // get which side it's gonna expand with radius
+ Random r = new Random();
+ Boolean xExpend = false;
+ if (r.nextInt(2) == 0) {
+ xExpend = true;
}
- public void teleport() {
-
+ // place blocks
+ for (double i = 0; i <= Math.PI; i += Math.PI / portalRadius) {
+ double radius = Math.sin(i);
+ double y = Math.cos(i);
+ for (double a = 0; a < Math.PI * 2; a += Math.PI / portalRadius) {
+ double x = Math.cos(a) * radius;
+ double z = Math.sin(a) * radius;
+ Location locc = new Location(loc.getWorld(), x, y, z);
+ loc.getBlock().setType(Material.NETHER_PORTAL);
+ }
}
-
- public void genGate() {
- // get which side it's gonna expand with radius
- Random r = new Random();
- Boolean xExpend = false;
- if (r.nextInt(2) == 0) {
- xExpend = true;
- }
-
- // place blocks
- for (double i = 0; i <= Math.PI; i += Math.PI / portalRadius) {
- double radius = Math.sin(i);
- double y = Math.cos(i);
- for (double a = 0; a < Math.PI * 2; a+= Math.PI / portalRadius) {
- double x = Math.cos(a) * radius;
- double z = Math.sin(a) * radius;
- Location locc = new Location(loc.getWorld(), x, y, z);
- loc.getBlock().setType(Material.NETHER_PORTAL);
- }
- }
- /*
+ /*
for (int n=0; n monster = new HashMap<>();
+ public Map monster = new HashMap<>();
- public Map lootItem = new HashMap<>();
-
- // public Map chest
+ public Map lootItem = new HashMap<>();
+ // public Map chest
}
diff --git a/src/main/java/me/unurled/raxen/components/dungeons/Types.java b/src/main/java/me/unurled/raxen/components/dungeons/Types.java
index 7685d19..c842107 100644
--- a/src/main/java/me/unurled/raxen/components/dungeons/Types.java
+++ b/src/main/java/me/unurled/raxen/components/dungeons/Types.java
@@ -1,20 +1,20 @@
package me.unurled.raxen.components.dungeons;
public enum Types {
- JUNGLE,
- TROPICAL_JUNGLE,
- PLAINS,
- GRAVES,
- CASTLE,
- ABANDONED_CASTLE,
- FIELD,
- ICE_FOREST,
- FOREST,
- VOLCANO,
- MOUNTAINS,
- HIGH_MOUNTAINS,
- CAVES,
- LABYRINTH,
- UNDERGROUND_LABYRINTH,
- FOREST_LABYRINTH
+ JUNGLE,
+ TROPICAL_JUNGLE,
+ PLAINS,
+ GRAVES,
+ CASTLE,
+ ABANDONED_CASTLE,
+ FIELD,
+ ICE_FOREST,
+ FOREST,
+ VOLCANO,
+ MOUNTAINS,
+ HIGH_MOUNTAINS,
+ CAVES,
+ LABYRINTH,
+ UNDERGROUND_LABYRINTH,
+ FOREST_LABYRINTH,
}
diff --git a/src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java b/src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java
index 7e3da0e..5815f35 100644
--- a/src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java
+++ b/src/main/java/me/unurled/raxen/components/dungeons/types/MonsterType.java
@@ -1,5 +1,8 @@
package me.unurled.raxen.components.dungeons.types;
+import static me.unurled.raxen.utils.Utils.debug;
+
+import java.util.Random;
import me.unurled.raxen.components.dungeons.Rank;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@@ -11,84 +14,95 @@ import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
import org.jetbrains.annotations.Nullable;
-import java.util.Random;
-
-import static me.unurled.raxen.utils.Utils.debug;
-
public class MonsterType {
- public enum type {;
- private Double rate;
- public String ID;
- public Class clazz;
+ public enum type {
+ ;
- type(Double rate, String ID, Class clazz) {
- this.rate = rate;
- this.ID = ID;
- this.clazz = clazz;
- }
+ private Double rate;
+ public String ID;
+ public Class clazz;
- public static @Nullable type getTypeById(String ID) {
- for (type type : type.values()) {
- if(type.ID.equals(ID)) {
- return type;
- }
- }
- return null;
- }
-
- public Double getRate() {
- return rate;
- }
-
- public void setRate(Double rate) {
- this.rate = rate;
- }
-
- public String getID() {
- return ID;
- }
-
- public void setID(String ID) {
- this.ID = ID;
- }
-
- public Class getClazz() {
- return clazz;
- }
-
- public void getClazz(Class clazz) {
- this.clazz = clazz;
- }
+ type(Double rate, String ID, Class clazz) {
+ this.rate = rate;
+ this.ID = ID;
+ this.clazz = clazz;
}
- public void genMonster(World world, Rank rank) {
- Double x = 0.0;
- Double y = 100.0;
- Double z = 0.0;
- for (type type : type.values()) {
- type.name();
- Random r = new Random();
- int per = r.nextInt(100);
- if (per >= type.rate) {
- // spawn entity
- debug("Spawning Entity " + type.ID);
- Entity e = world.spawnEntity(new Location(world, x, y, z), EntityType.ARROW);
- // e = ((RaxenEntity) type.getClazz()).createEntity();
- e.setInvulnerable(true);
- BukkitTask task = new BukkitRunnable() {
- @Override
- public void run() {
- Location loc = new Location(e.getWorld(), e.getLocation().getX(), e.getLocation().getY()-1, e.getLocation().getZ());
- if (loc.getBlock().getType() != Material.AIR) {
- e.setInvulnerable(false);
- this.cancel();
- }
- }
- }.runTaskTimerAsynchronously(Bukkit.getPluginManager().getPlugin("Raxen"), 0L, 20L);
- }
- x = 5.0 + ( 50.0 - 5.0 ) * r.nextDouble();
- z = 5.0 + ( 50.0 - 5.0 ) * r.nextDouble();
+ public static @Nullable type getTypeById(String ID) {
+ for (type type : type.values()) {
+ if (type.ID.equals(ID)) {
+ return type;
}
+ }
+ return null;
}
+
+ public Double getRate() {
+ return rate;
+ }
+
+ public void setRate(Double rate) {
+ this.rate = rate;
+ }
+
+ public String getID() {
+ return ID;
+ }
+
+ public void setID(String ID) {
+ this.ID = ID;
+ }
+
+ public Class getClazz() {
+ return clazz;
+ }
+
+ public void getClazz(Class clazz) {
+ this.clazz = clazz;
+ }
+ }
+
+ public void genMonster(World world, Rank rank) {
+ Double x = 0.0;
+ Double y = 100.0;
+ Double z = 0.0;
+ for (type type : type.values()) {
+ type.name();
+ Random r = new Random();
+ int per = r.nextInt(100);
+ if (per >= type.rate) {
+ // spawn entity
+ debug("Spawning Entity " + type.ID);
+ Entity e = world.spawnEntity(
+ new Location(world, x, y, z),
+ EntityType.ARROW
+ );
+ // e = ((RaxenEntity) type.getClazz()).createEntity();
+ e.setInvulnerable(true);
+ BukkitTask task = new BukkitRunnable() {
+ @Override
+ public void run() {
+ Location loc = new Location(
+ e.getWorld(),
+ e.getLocation().getX(),
+ e.getLocation().getY() - 1,
+ e.getLocation().getZ()
+ );
+ if (loc.getBlock().getType() != Material.AIR) {
+ e.setInvulnerable(false);
+ this.cancel();
+ }
+ }
+ }
+ .runTaskTimerAsynchronously(
+ Bukkit.getPluginManager().getPlugin("Raxen"),
+ 0L,
+ 20L
+ );
+ }
+ x = 5.0 + (50.0 - 5.0) * r.nextDouble();
+ z = 5.0 + (50.0 - 5.0) * r.nextDouble();
+ }
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java
index f389c05..1d13444 100644
--- a/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java
+++ b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestDungeon.java
@@ -6,11 +6,12 @@ import me.unurled.raxen.components.dungeons.Types;
import me.unurled.raxen.components.dungeons.types.MonsterType;
public class ForestDungeon extends Dungeon {
- public ForestDungeon(String name, Rank rank, Types types, MonsterType mType) {
- super(name, rank, types, mType);
- }
- public ForestDungeon() {
- super("Forest", Rank.E, Types.FOREST, new ForestMonster());
- }
+ public ForestDungeon(String name, Rank rank, Types types, MonsterType mType) {
+ super(name, rank, types, mType);
+ }
+
+ public ForestDungeon() {
+ super("Forest", Rank.E, Types.FOREST, new ForestMonster());
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java
index ea93b79..ee312bf 100644
--- a/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java
+++ b/src/main/java/me/unurled/raxen/components/dungeons/types/forest/ForestMonster.java
@@ -7,18 +7,19 @@ import me.unurled.raxen.components.entity.other.custom.dungeon.forest.Wolf;
public class ForestMonster extends MonsterType {
- @Getter enum type {
- ELF(50.0 ,"ELF", Elf.class),
- WOLF(50.0, "WOLF", Wolf.class);
+ @Getter
+ enum type {
+ ELF(50.0, "ELF", Elf.class),
+ WOLF(50.0, "WOLF", Wolf.class);
- private Double rate;
- public String ID;
- public Class clazz;
+ private Double rate;
+ public String ID;
+ public Class clazz;
- type(Double rate, String ID, Class clazz) {
- this.rate = rate;
- this.ID = ID;
- this.clazz = clazz;
- }
+ type(Double rate, String ID, Class clazz) {
+ this.rate = rate;
+ this.ID = ID;
+ this.clazz = clazz;
}
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java b/src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java
index 48651a9..fa529b8 100644
--- a/src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java
+++ b/src/main/java/me/unurled/raxen/components/enchantments/EnchantmentWarpper.java
@@ -1,6 +1,7 @@
package me.unurled.raxen.components.enchantments;
import io.papermc.paper.enchantments.EnchantmentRarity;
+import java.util.Set;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.text.Component;
import org.bukkit.NamespacedKey;
@@ -11,93 +12,96 @@ import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
-import java.util.Set;
-
public class EnchantmentWarpper extends Enchantment {
- private final int maxLevel;
- public EnchantmentWarpper(String nameSpace, String name, int lvl) {
- super(NamespacedKey.minecraft(nameSpace));
- this.maxLevel = lvl;
- }
+ private final int maxLevel;
- @Override @Deprecated
- public @NotNull String getName() {
- return null;
- }
+ public EnchantmentWarpper(String nameSpace, String name, int lvl) {
+ super(NamespacedKey.minecraft(nameSpace));
+ this.maxLevel = lvl;
+ }
- @Override
- public int getMaxLevel() {
- return maxLevel;
- }
+ @Override
+ @Deprecated
+ public @NotNull String getName() {
+ return null;
+ }
- @Override
- public int getStartLevel() {
- return 0;
- }
+ @Override
+ public int getMaxLevel() {
+ return maxLevel;
+ }
- @Override
- public @NotNull EnchantmentTarget getItemTarget() {
- return null;
- }
+ @Override
+ public int getStartLevel() {
+ return 0;
+ }
- @Override
- public boolean isTreasure() {
- return false;
- }
+ @Override
+ public @NotNull EnchantmentTarget getItemTarget() {
+ return null;
+ }
- @Override
- public boolean isCursed() {
- return false;
- }
+ @Override
+ public boolean isTreasure() {
+ return false;
+ }
- @Override
- public boolean conflictsWith(@NotNull Enchantment other) {
- return false;
- }
+ @Override
+ public boolean isCursed() {
+ return false;
+ }
- @Override
- public boolean canEnchantItem(@NotNull ItemStack item) {
- return false;
- }
+ @Override
+ public boolean conflictsWith(@NotNull Enchantment other) {
+ return false;
+ }
- @Override
- public @NotNull Component displayName(int level) {
- return null;
- }
+ @Override
+ public boolean canEnchantItem(@NotNull ItemStack item) {
+ return false;
+ }
- @Override
- public boolean isTradeable() {
- return false;
- }
+ @Override
+ public @NotNull Component displayName(int level) {
+ return null;
+ }
- @Override
- public boolean isDiscoverable() {
- return false;
- }
+ @Override
+ public boolean isTradeable() {
+ return false;
+ }
- @Override
- public @NotNull EnchantmentRarity getRarity() {
- return null;
- }
+ @Override
+ public boolean isDiscoverable() {
+ return false;
+ }
- @Override
- public float getDamageIncrease(int level, @NotNull EntityCategory entityCategory) {
- return 0;
- }
+ @Override
+ public @NotNull EnchantmentRarity getRarity() {
+ return null;
+ }
- @Override
- public @NotNull Set getActiveSlots() {
- return null;
- }
+ @Override
+ public float getDamageIncrease(
+ int level,
+ @NotNull EntityCategory entityCategory
+ ) {
+ return 0;
+ }
- @Override
- public @NotNull String translationKey() {
- return null;
- }
+ @Override
+ public @NotNull Set getActiveSlots() {
+ return null;
+ }
- @Override
- public @NotNull Key key() {
- return super.key();
- }
+ @Override
+ public @NotNull String translationKey() {
+ return null;
+ }
+
+ @Override
+ public @NotNull Key key() {
+ return super.key();
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java b/src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java
index 1f94e28..904ae8b 100644
--- a/src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java
+++ b/src/main/java/me/unurled/raxen/components/enchantments/player/Telekinesis.java
@@ -6,5 +6,9 @@ import org.bukkit.event.Listener;
public class Telekinesis implements Listener {
- public static final Enchantment TELEKINESIS = new EnchantmentWarpper("telekinesis", "telekinesis", 1);
+ public static final Enchantment TELEKINESIS = new EnchantmentWarpper(
+ "telekinesis",
+ "telekinesis",
+ 1
+ );
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java
index 64de2d7..ceb9671 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Attribute.java
@@ -1,5 +1,7 @@
package me.unurled.raxen.components.entity.Attributes;
+import static me.unurled.raxen.utils.Utils.debug;
+
import de.tr7zw.nbtapi.NBTItem;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
@@ -10,125 +12,160 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.NotNull;
-import static me.unurled.raxen.utils.Utils.debug;
-
public class Attribute {
- /**
- * The NamespaceKey register for the PersistentDataContainer.
- * static NamespacedKey namespacekey = namespacedKey.TYPE;
- */
- public NamespacedKey namespacekey;
+ /**
+ * The NamespaceKey register for the PersistentDataContainer.
+ * static NamespacedKey namespacekey = namespacedKey.TYPE;
+ */
+ public NamespacedKey namespacekey;
- /**
- * The name of the attribute
- * static String name = "null";
- */
- public String name;
+ /**
+ * The name of the attribute
+ * static String name = "null";
+ */
+ public String name;
- public Attribute(NamespacedKey namespacekey, String name) {
- this.namespacekey = namespacekey;
- this.name = name;
+ public Attribute(NamespacedKey namespacekey, String name) {
+ this.namespacekey = namespacekey;
+ this.name = name;
+ }
+
+ /**
+ * gives the name uppercased
+ * @return the name in uppercase
+ */
+ public String nameUppercase() {
+ return name.toUpperCase();
+ }
+
+ /**
+ * get how many the Entity has Attributed
+ * @param entity a living entity
+ * @return the amount of attribute
+ */
+ public Integer get(@NotNull Entity entity) {
+ if (
+ entity
+ .getPersistentDataContainer()
+ .has(namespacekey, PersistentDataType.INTEGER)
+ ) {
+ debug(
+ " attribute gett" +
+ entity
+ .getPersistentDataContainer()
+ .get(namespacekey, PersistentDataType.INTEGER)
+ );
+ return entity
+ .getPersistentDataContainer()
+ .get(namespacekey, PersistentDataType.INTEGER);
}
+ debug(
+ name +
+ " not found in Entity: " +
+ entity.getType().toString() +
+ " " +
+ entity.getName() +
+ " " +
+ entity.getUniqueId().toString()
+ );
+ set(entity, 0);
+ return 0;
+ }
- /**
- * gives the name uppercased
- * @return the name in uppercase
- */
- public String nameUppercase() {
- return name.toUpperCase();
+ /**
+ * get how many the Entity has Attributed
+ * @param it an ItemStack
+ * @return the amount of attribute
+ */
+ public Integer get(@NotNull ItemStack it) {
+ NBTItem nbti = new NBTItem(it);
+ if (nbti.hasTag(name)) {
+ return nbti.getInteger(name);
}
+ return 0;
+ }
- /**
- * get how many the Entity has Attributed
- * @param entity a living entity
- * @return the amount of attribute
- */
- public Integer get(@NotNull Entity entity) {
- if (entity.getPersistentDataContainer().has(namespacekey, PersistentDataType.INTEGER)) {
- debug(" attribute gett" + entity.getPersistentDataContainer().get(namespacekey, PersistentDataType.INTEGER));
- return entity.getPersistentDataContainer().get(namespacekey, PersistentDataType.INTEGER);
- }
- debug(name + " not found in Entity: " + entity.getType().toString() + " " + entity.getName() + " " + entity.getUniqueId().toString());
- set(entity, 0);
- return 0;
+ /**
+ * Get the amount of attribute on the item
+ * @param e a LivingEntity
+ * @return an amount of attribute on the item
+ */
+ public Integer getItem(@NotNull LivingEntity e) {
+ EntityEquipment equi = e.getEquipment();
+ Integer attribute = 0;
+ if (equi != null) {
+ if (
+ equi.getItemInMainHand().getType() != Material.AIR &&
+ equi.getHelmet() != null
+ ) {
+ ItemStack item = equi.getItemInMainHand();
+ attribute = attribute + get(item);
+ }
+ if (
+ equi.getHelmet().getType() != Material.AIR && equi.getHelmet() != null
+ ) {
+ ItemStack item = equi.getHelmet();
+ attribute = attribute + get(item);
+ }
+ if (
+ equi.getChestplate().getType() != Material.AIR &&
+ equi.getChestplate() != null
+ ) {
+ ItemStack item = equi.getChestplate();
+ attribute = attribute + get(item);
+ }
+ if (
+ equi.getChestplate().getType() != Material.AIR &&
+ equi.getChestplate() != null
+ ) {
+ ItemStack item = equi.getChestplate();
+ attribute = attribute + get(item);
+ }
+ if (
+ equi.getLeggings().getType() != Material.AIR &&
+ equi.getLeggings() != null
+ ) {
+ ItemStack item = equi.getLeggings();
+ attribute = attribute + get(item);
+ }
+ if (
+ equi.getBoots().getType() != Material.AIR && equi.getBoots() != null
+ ) {
+ ItemStack item = equi.getBoots();
+ attribute = attribute + get(item);
+ }
}
+ return attribute;
+ }
- /**
- * get how many the Entity has Attributed
- * @param it an ItemStack
- * @return the amount of attribute
- */
- public Integer get(@NotNull ItemStack it) {
- NBTItem nbti = new NBTItem(it);
- if (nbti.hasTag(name)){
- return nbti.getInteger(name);
- }
- return 0;
- }
+ /**
+ * set amount to the entity's attribute
+ * @param entity a living entity
+ * @param amount the amount you want to set
+ */
+ public void set(@NotNull Entity entity, @NotNull Integer amount) {
+ entity
+ .getPersistentDataContainer()
+ .set(namespacekey, PersistentDataType.INTEGER, amount);
+ debug("set " + name + " " + amount);
+ }
- /**
- * Get the amount of attribute on the item
- * @param e a LivingEntity
- * @return an amount of attribute on the item
- */
- public Integer getItem(@NotNull LivingEntity e) {
- EntityEquipment equi = e.getEquipment();
- Integer attribute = 0;
- if (equi != null) {
- if (equi.getItemInMainHand().getType() != Material.AIR && equi.getHelmet() != null) {
- ItemStack item = equi.getItemInMainHand();
- attribute = attribute + get(item);
- }
- if (equi.getHelmet().getType() != Material.AIR && equi.getHelmet() != null) {
- ItemStack item = equi.getHelmet();
- attribute = attribute + get(item);
- }
- if (equi.getChestplate().getType() != Material.AIR && equi.getChestplate() != null) {
- ItemStack item = equi.getChestplate();
- attribute = attribute + get(item);
- }
- if (equi.getChestplate().getType() != Material.AIR && equi.getChestplate() != null) {
- ItemStack item = equi.getChestplate();
- attribute = attribute + get(item);
- }
- if (equi.getLeggings().getType() != Material.AIR && equi.getLeggings() != null) {
- ItemStack item = equi.getLeggings();
- attribute = attribute + get(item);
- }
- if (equi.getBoots().getType() != Material.AIR && equi.getBoots() != null) {
- ItemStack item = equi.getBoots();
- attribute = attribute + get(item);
- }
- }
- return attribute;
- }
+ /**
+ * add amount to the entity's attribute
+ * @param entity a living entity
+ * @param amount the amount you want to set
+ */
+ public void add(@NotNull Entity entity, @NotNull Integer amount) {
+ set(entity, get(entity) + amount);
+ }
- /**
- * set amount to the entity's attribute
- * @param entity a living entity
- * @param amount the amount you want to set
- */
- public void set(@NotNull Entity entity, @NotNull Integer amount) {
- entity.getPersistentDataContainer().set(namespacekey, PersistentDataType.INTEGER, amount);
- debug("set " + name + " " + amount);
- }
-
- /**
- * add amount to the entity's attribute
- * @param entity a living entity
- * @param amount the amount you want to set
- */
- public void add(@NotNull Entity entity, @NotNull Integer amount) {
- set(entity, get(entity) + amount);
- }
-
- /**
- * remove amount to the entity's attribute
- * @param entity a living entity
- * @param amount the amount you want to set
- */
- public void remove(@NotNull Entity entity, @NotNull Integer amount) {
- set(entity, get(entity) - amount);
- }
+ /**
+ * remove amount to the entity's attribute
+ * @param entity a living entity
+ * @param amount the amount you want to set
+ */
+ public void remove(@NotNull Entity entity, @NotNull Integer amount) {
+ set(entity, get(entity) - amount);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java
index bee51fd..fb701bf 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Defense.java
@@ -4,8 +4,7 @@ import org.bukkit.NamespacedKey;
public class Defense extends Attribute {
- public Defense(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public Defense(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
-
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java
index acfdfaa..b5d847c 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Health.java
@@ -4,8 +4,7 @@ import org.bukkit.NamespacedKey;
public class Health extends Attribute {
- public Health(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public Health(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
-
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java
index 2d9cdaa..a48dc67 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemDefense.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class ItemDefense extends Attribute {
- public ItemDefense(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public ItemDefense(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java
index 342842a..a9127a2 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemHealth.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class ItemHealth extends Attribute {
- public ItemHealth(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public ItemHealth(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java
index 206e0d6..f4d5067 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemLuck.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class ItemLuck extends Attribute {
- public ItemLuck(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public ItemLuck(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java
index 93c8b2b..78a22f3 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemMana.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class ItemMana extends Attribute {
- public ItemMana(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public ItemMana(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java
index cfbc3b6..4dde9f2 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemSpeed.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class ItemSpeed extends Attribute {
- public ItemSpeed(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public ItemSpeed(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java
index ee11e62..78e97c3 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/ItemStrength.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class ItemStrength extends Attribute {
- public ItemStrength(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public ItemStrength(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java
index 0fdb7e2..7ca34b5 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Luck.java
@@ -4,8 +4,7 @@ import org.bukkit.NamespacedKey;
public class Luck extends Attribute {
- public Luck(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public Luck(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
-
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java
index e3beb23..01f5ea5 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Mana.java
@@ -4,8 +4,7 @@ import org.bukkit.NamespacedKey;
public class Mana extends Attribute {
- public Mana(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public Mana(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
-
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java
index b76886e..2206ab4 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxHealth.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class MaxHealth extends Attribute {
- public MaxHealth(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public MaxHealth(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java
index 58467e6..8a4688f 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxMana.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class MaxMana extends Attribute {
- public MaxMana(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public MaxMana(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java
index 6977388..b54bc7c 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/MaxManaBuilder.java
@@ -3,20 +3,21 @@ package me.unurled.raxen.components.entity.Attributes;
import org.bukkit.NamespacedKey;
public class MaxManaBuilder {
- private NamespacedKey namespacekey;
- private String name;
- public MaxManaBuilder setNamespacekey(NamespacedKey namespacekey) {
- this.namespacekey = namespacekey;
- return this;
- }
+ private NamespacedKey namespacekey;
+ private String name;
- public MaxManaBuilder setName(String name) {
- this.name = name;
- return this;
- }
+ public MaxManaBuilder setNamespacekey(NamespacedKey namespacekey) {
+ this.namespacekey = namespacekey;
+ return this;
+ }
- public MaxMana createMaxMana() {
- return new MaxMana(namespacekey, name);
- }
-}
\ No newline at end of file
+ public MaxManaBuilder setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public MaxMana createMaxMana() {
+ return new MaxMana(namespacekey, name);
+ }
+}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java
index 0264d2f..c0586a1 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Speed.java
@@ -4,7 +4,7 @@ import org.bukkit.NamespacedKey;
public class Speed extends Attribute {
- public Speed(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public Speed(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java b/src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java
index 5bf8644..05ed16e 100644
--- a/src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java
+++ b/src/main/java/me/unurled/raxen/components/entity/Attributes/Strength.java
@@ -4,8 +4,7 @@ import org.bukkit.NamespacedKey;
public class Strength extends Attribute {
- public Strength(NamespacedKey namespacekey, String name) {
- super(namespacekey, name);
- }
+ public Strength(NamespacedKey namespacekey, String name) {
+ super(namespacekey, name);
+ }
}
-
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java b/src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java
index 13a4dcc..4e29387 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/EntityNamespacedKey.java
@@ -5,45 +5,43 @@ import org.bukkit.NamespacedKey;
public class EntityNamespacedKey {
- public EntityNamespacedKey(Raxen main) {
- name = new NamespacedKey(main, "NAME");
- level = new NamespacedKey(main, "LEVEL");
- maxHealth = new NamespacedKey(main, "MAX_HEALTH");
- health = new NamespacedKey(main, "HEALTH");
- itemHealth = new NamespacedKey(main, "ITEM_HEALTH");
- speed = new NamespacedKey(main, "SPEED");
- itemSpeed = new NamespacedKey(main, "ITEM_SPEED");
- defense = new NamespacedKey(main, "DEFENSE");
- itemDefense = new NamespacedKey(main, "ITEM_DEFENSE");
- strength = new NamespacedKey(main, "STRENGTH");
- itemStrength = new NamespacedKey(main, "ITEM_STRENGTH");
- maxMana = new NamespacedKey(main, "MAX_MANA");
- mana = new NamespacedKey(main, "MANA");
- itemMana = new NamespacedKey(main, "ITEM_MANA");
- luck = new NamespacedKey(main, "LUCK");
- itemLuck = new NamespacedKey(main, "ITEM_LUCK");
- inventory = new NamespacedKey(main, "INVENTORY");
- storage = new NamespacedKey(main, "STORAGE");
-
- }
-
- public final NamespacedKey name;
- public final NamespacedKey level;
- public final NamespacedKey maxHealth;
- public final NamespacedKey health;
- public final NamespacedKey itemHealth;
- public final NamespacedKey speed;
- public final NamespacedKey itemSpeed;
- public final NamespacedKey defense;
- public final NamespacedKey itemDefense;
- public final NamespacedKey strength;
- public final NamespacedKey itemStrength;
- public final NamespacedKey maxMana;
- public final NamespacedKey mana;
- public final NamespacedKey itemMana;
- public final NamespacedKey luck;
- public final NamespacedKey itemLuck;
- public final NamespacedKey inventory;
- public final NamespacedKey storage;
+ public EntityNamespacedKey(Raxen main) {
+ name = new NamespacedKey(main, "NAME");
+ level = new NamespacedKey(main, "LEVEL");
+ maxHealth = new NamespacedKey(main, "MAX_HEALTH");
+ health = new NamespacedKey(main, "HEALTH");
+ itemHealth = new NamespacedKey(main, "ITEM_HEALTH");
+ speed = new NamespacedKey(main, "SPEED");
+ itemSpeed = new NamespacedKey(main, "ITEM_SPEED");
+ defense = new NamespacedKey(main, "DEFENSE");
+ itemDefense = new NamespacedKey(main, "ITEM_DEFENSE");
+ strength = new NamespacedKey(main, "STRENGTH");
+ itemStrength = new NamespacedKey(main, "ITEM_STRENGTH");
+ maxMana = new NamespacedKey(main, "MAX_MANA");
+ mana = new NamespacedKey(main, "MANA");
+ itemMana = new NamespacedKey(main, "ITEM_MANA");
+ luck = new NamespacedKey(main, "LUCK");
+ itemLuck = new NamespacedKey(main, "ITEM_LUCK");
+ inventory = new NamespacedKey(main, "INVENTORY");
+ storage = new NamespacedKey(main, "STORAGE");
+ }
+ public final NamespacedKey name;
+ public final NamespacedKey level;
+ public final NamespacedKey maxHealth;
+ public final NamespacedKey health;
+ public final NamespacedKey itemHealth;
+ public final NamespacedKey speed;
+ public final NamespacedKey itemSpeed;
+ public final NamespacedKey defense;
+ public final NamespacedKey itemDefense;
+ public final NamespacedKey strength;
+ public final NamespacedKey itemStrength;
+ public final NamespacedKey maxMana;
+ public final NamespacedKey mana;
+ public final NamespacedKey itemMana;
+ public final NamespacedKey luck;
+ public final NamespacedKey itemLuck;
+ public final NamespacedKey inventory;
+ public final NamespacedKey storage;
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java b/src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java
index eb59b23..24286a7 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/EntityUtils.java
@@ -1,5 +1,7 @@
package me.unurled.raxen.components.entity.other;
+import static me.unurled.raxen.utils.Utils.debug;
+
import me.unurled.raxen.Raxen;
import me.unurled.raxen.manager.entity.PlayerManager;
import org.bukkit.Bukkit;
@@ -8,63 +10,96 @@ import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.NotNull;
-import static me.unurled.raxen.utils.Utils.debug;
-
public class EntityUtils {
- private static Raxen main;
- private static EntityNamespacedKey namespacedKey;
+ private static Raxen main;
+ private static EntityNamespacedKey namespacedKey;
- public EntityUtils(Raxen main) {
- this.main = main;
- namespacedKey = new EntityNamespacedKey(main);
+ public EntityUtils(Raxen main) {
+ this.main = main;
+ namespacedKey = new EntityNamespacedKey(main);
+ }
+
+ public static void setNameSpacedKeys(
+ org.bukkit.entity.@NotNull Entity e,
+ String name,
+ Integer level,
+ int health,
+ int itemHealth,
+ int defense,
+ int itemDefense,
+ int speed,
+ int itemSpeed,
+ int strength,
+ int itemDmg
+ ) {
+ PersistentDataContainer data = e.getPersistentDataContainer();
+ data.set(namespacedKey.health, PersistentDataType.INTEGER, health);
+ data.set(namespacedKey.itemHealth, PersistentDataType.INTEGER, itemHealth);
+ data.set(namespacedKey.speed, PersistentDataType.INTEGER, speed);
+ data.set(namespacedKey.itemSpeed, PersistentDataType.INTEGER, itemSpeed);
+ data.set(namespacedKey.defense, PersistentDataType.INTEGER, defense);
+ data.set(
+ namespacedKey.itemDefense,
+ PersistentDataType.INTEGER,
+ itemDefense
+ );
+ data.set(namespacedKey.strength, PersistentDataType.INTEGER, strength);
+ data.set(namespacedKey.itemStrength, PersistentDataType.INTEGER, itemDmg);
+ data.set(namespacedKey.name, PersistentDataType.STRING, name);
+ data.set(namespacedKey.level, PersistentDataType.INTEGER, level);
+ }
+
+ public static void updateSkills(@NotNull LivingEntity livingEntity) {
+ PlayerManager pm =
+ ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager()
+ .getPlayerManager();
+ int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
+ defense = pm.getDefense().get(livingEntity);
+ maxMana = pm.getMaxMana().get(livingEntity);
+ itemDefense = pm.getItemDefense().get(livingEntity);
+ health = pm.getHealth().get(livingEntity);
+ itemHealth = pm.getItemHealth().get(livingEntity);
+ mana = pm.getMana().get(livingEntity);
+ speed = pm.getSpeed().get(livingEntity);
+ itemLuck = pm.getItemLuck().get(livingEntity);
+ strength = pm.getStrength().get(livingEntity);
+ luck = pm.getLuck().get(livingEntity);
+ maxHealth = pm.getMaxHealth().get(livingEntity);
+ itemStrength = pm.getItemStrength().get(livingEntity);
+ itemSpeed = pm.getItemSpeed().get(livingEntity);
+ itemMana = pm.getItemMana().get(livingEntity);
+ if (
+ livingEntity.getAttribute(
+ org.bukkit.attribute.Attribute.GENERIC_FLYING_SPEED
+ ) !=
+ null
+ ) {
+ livingEntity
+ .getAttribute(org.bukkit.attribute.Attribute.GENERIC_FLYING_SPEED)
+ .setBaseValue((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
}
-
- public static void setNameSpacedKeys(org.bukkit.entity.@NotNull Entity e, String name, Integer level, int health, int itemHealth, int defense, int itemDefense, int speed, int itemSpeed, int strength, int itemDmg) {
- PersistentDataContainer data = e.getPersistentDataContainer();
- data.set(namespacedKey.health, PersistentDataType.INTEGER, health);
- data.set(namespacedKey.itemHealth, PersistentDataType.INTEGER, itemHealth);
- data.set(namespacedKey.speed, PersistentDataType.INTEGER, speed);
- data.set(namespacedKey.itemSpeed, PersistentDataType.INTEGER, itemSpeed);
- data.set(namespacedKey.defense, PersistentDataType.INTEGER, defense);
- data.set(namespacedKey.itemDefense, PersistentDataType.INTEGER, itemDefense);
- data.set(namespacedKey.strength, PersistentDataType.INTEGER, strength);
- data.set(namespacedKey.itemStrength, PersistentDataType.INTEGER, itemDmg);
- data.set(namespacedKey.name, PersistentDataType.STRING, name);
- data.set(namespacedKey.level, PersistentDataType.INTEGER, level);
+ if (
+ livingEntity.getAttribute(
+ org.bukkit.attribute.Attribute.GENERIC_MOVEMENT_SPEED
+ ) !=
+ null
+ ) {
+ livingEntity
+ .getAttribute(org.bukkit.attribute.Attribute.GENERIC_MOVEMENT_SPEED)
+ .setBaseValue((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
}
-
- public static void updateSkills(@NotNull LivingEntity livingEntity) {
- PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
- int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
- defense= pm.getDefense().get(livingEntity);
- maxMana = pm.getMaxMana().get(livingEntity);
- itemDefense= pm.getItemDefense().get(livingEntity);
- health = pm.getHealth().get(livingEntity);
- itemHealth = pm.getItemHealth().get(livingEntity);
- mana = pm.getMana().get(livingEntity);
- speed = pm.getSpeed().get(livingEntity);
- itemLuck = pm.getItemLuck().get(livingEntity);
- strength = pm.getStrength().get(livingEntity);
- luck = pm.getLuck().get(livingEntity);
- maxHealth = pm.getMaxHealth().get(livingEntity);
- itemStrength = pm.getItemStrength().get(livingEntity);
- itemSpeed = pm.getItemSpeed().get(livingEntity);
- itemMana = pm.getItemMana().get(livingEntity);
- if (livingEntity.getAttribute(org.bukkit.attribute.Attribute.GENERIC_FLYING_SPEED) != null) {
- livingEntity.getAttribute(org.bukkit.attribute.Attribute.GENERIC_FLYING_SPEED).setBaseValue((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
- }
- if (livingEntity.getAttribute(org.bukkit.attribute.Attribute.GENERIC_MOVEMENT_SPEED) != null) {
- livingEntity.getAttribute(org.bukkit.attribute.Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
- }
- livingEntity.getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH).setBaseValue(20D + (health + itemHealth) / 100);
- debug("Entity " + livingEntity.getType().name(),
- "Speed " + (speed + itemSpeed),
- "Health " + (health + itemHealth) + " Max Health " + maxHealth,
- "Defense " + (defense+itemDefense),
- "Strength " + (strength+itemStrength),
- "Luck " + (luck+itemLuck),
- "Mana " + (mana + itemMana) + " Max Mana " + maxMana);
- }
-
+ livingEntity
+ .getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH)
+ .setBaseValue(20D + (health + itemHealth) / 100);
+ debug(
+ "Entity " + livingEntity.getType().name(),
+ "Speed " + (speed + itemSpeed),
+ "Health " + (health + itemHealth) + " Max Health " + maxHealth,
+ "Defense " + (defense + itemDefense),
+ "Strength " + (strength + itemStrength),
+ "Luck " + (luck + itemLuck),
+ "Mana " + (mana + itemMana) + " Max Mana " + maxMana
+ );
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java b/src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java
index ad4a2f4..af12ecc 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/RaxenEntity.java
@@ -13,44 +13,58 @@ import org.bukkit.persistence.PersistentDataType;
public abstract class RaxenEntity {
- private final Raxen main;
+ private final Raxen main;
- @Getter private final String name;
+ @Getter
+ private final String name;
- @Getter private Integer level;
+ @Getter
+ private Integer level;
- @Getter @Setter private Double health;
+ @Getter
+ @Setter
+ private Double health;
- @Getter @Setter private Double strength;
+ @Getter
+ @Setter
+ private Double strength;
- @Getter @Setter Boolean isAlive = false;
+ @Getter
+ @Setter
+ Boolean isAlive = false;
- public RaxenEntity(Raxen main, String name, Integer level, Double health, Double strength) {
- this.main = main;
- this.name = name;
- this.level = level;
- this.health = health;
- this.strength = strength;
- }
+ public RaxenEntity(
+ Raxen main,
+ String name,
+ Integer level,
+ Double health,
+ Double strength
+ ) {
+ this.main = main;
+ this.name = name;
+ this.level = level;
+ this.health = health;
+ this.strength = strength;
+ }
- public Entity createEntity(EntityType types, String name, Location location) {
- Entity e = location.getWorld().spawnEntity(location, types);
- e.setCustomNameVisible(true);
- e.customName(Component.text(name));
+ public Entity createEntity(EntityType types, String name, Location location) {
+ Entity e = location.getWorld().spawnEntity(location, types);
+ e.setCustomNameVisible(true);
+ e.customName(Component.text(name));
- return e;
- }
+ return e;
+ }
- public void register(Entity e) {
- PersistentDataContainer data = e.getPersistentDataContainer();
- data.set(new NamespacedKey(main ,"NAME"), PersistentDataType.STRING, name);
- }
+ public void register(Entity e) {
+ PersistentDataContainer data = e.getPersistentDataContainer();
+ data.set(new NamespacedKey(main, "NAME"), PersistentDataType.STRING, name);
+ }
- public Double getMaxHealth(Entity e) {
- PersistentDataContainer data = e.getPersistentDataContainer();
- EntityNamespacedKey key = new EntityNamespacedKey(main);
- return data.get(key.maxHealth, PersistentDataType.DOUBLE);
- }
+ public Double getMaxHealth(Entity e) {
+ PersistentDataContainer data = e.getPersistentDataContainer();
+ EntityNamespacedKey key = new EntityNamespacedKey(main);
+ return data.get(key.maxHealth, PersistentDataType.DOUBLE);
+ }
- public abstract Entity createEntity(Location location);
+ public abstract Entity createEntity(Location location);
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java
index 3ab65c6..f3c8c30 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/Entity.java
@@ -1,73 +1,103 @@
package me.unurled.raxen.components.entity.other.custom;
+import static me.unurled.raxen.utils.Utils.colorString;
+
+import java.util.UUID;
import lombok.Getter;
import lombok.Setter;
import me.unurled.raxen.Raxen;
-import java.util.UUID;
-
-import static me.unurled.raxen.utils.Utils.colorString;
-
public class Entity {
- private java.util.UUID uuid;
+ private java.util.UUID uuid;
- private final String name;
- @Getter
- private Integer level;
- @Setter
- private Double health;
- @Getter
- @Setter
- private Double strength;
- @Getter
- @Setter
- private Double defense;
- @Getter
- @Setter
- private Double speed;
- @Getter
- @Setter
- private Double maxHealth;
- @Getter
- @Setter
- private boolean isHostile;
+ private final String name;
- public Entity(String name, Integer level, Double maxHealth, Double strength, Double defense, Double speed, boolean isHostile) {
- this.name = name;
- this.level = level;
- this.health = maxHealth;
- this.strength = strength;
- this.defense = defense;
- this.speed = speed;
- this.maxHealth = maxHealth;
- this.isHostile = isHostile;
- this.uuid = UUID.randomUUID();
+ @Getter
+ private Integer level;
+
+ @Setter
+ private Double health;
+
+ @Getter
+ @Setter
+ private Double strength;
+
+ @Getter
+ @Setter
+ private Double defense;
+
+ @Getter
+ @Setter
+ private Double speed;
+
+ @Getter
+ @Setter
+ private Double maxHealth;
+
+ @Getter
+ @Setter
+ private boolean isHostile;
+
+ public Entity(
+ String name,
+ Integer level,
+ Double maxHealth,
+ Double strength,
+ Double defense,
+ Double speed,
+ boolean isHostile
+ ) {
+ this.name = name;
+ this.level = level;
+ this.health = maxHealth;
+ this.strength = strength;
+ this.defense = defense;
+ this.speed = speed;
+ this.maxHealth = maxHealth;
+ this.isHostile = isHostile;
+ this.uuid = UUID.randomUUID();
+ }
+
+ public void register(Raxen main) {
+ main.getManager().getEntityManager().entities.put(name, this);
+ }
+
+ public String getName() {
+ return "" + name;
+ }
+
+ public String getFullName(Entity e) {
+ if (isHostile) {
+ return colorString(
+ getColorLevel() +
+ "⚔️" +
+ getName() +
+ "" +
+ health +
+ "/" +
+ maxHealth
+ );
+ } else {
+ return colorString(
+ getColorLevel() +
+ "❤️" +
+ getName() +
+ "" +
+ health +
+ "/" +
+ maxHealth
+ );
}
+ }
- public void register (Raxen main) {
- main.getManager().getEntityManager().entities.put(name, this);
- }
+ public String getColorLevel() {
+ return level.toString();
+ }
- public String getName() {
- return "" + name;
- }
+ public Double getHealth() {
+ Double health = 0.0;
- public String getFullName(Entity e) {
- if (isHostile) {
- return colorString(getColorLevel() + "⚔️" + getName() + "" + health + "/" + maxHealth);
- } else {
- return colorString(getColorLevel() + "❤️" + getName() + "" + health + "/" + maxHealth);
- }
- }
-
- public String getColorLevel() {
- return level.toString();
- }
-
- public Double getHealth() {
- Double health = 0.0;
-
- return health;
- }
+ return health;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java
index f76c294..512e352 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java
@@ -4,12 +4,22 @@ import java.util.UUID;
public class Humanoid extends Entity {
- private String skin; // used to get the path to the skin
- private UUID skinUuid; // used to get the player skin (if i do it this way...
+ private String skin; // used to get the path to the skin
+ private UUID skinUuid; // used to get the player skin (if i do it this way...
- public Humanoid(String name, Integer level, Double maxHealth, Double strength, Double defense, Double speed, boolean isHostile, String skin, UUID skinUuid) {
- super(name, level, maxHealth, strength, defense, speed, isHostile);
- this.skin = skin;
- this.skinUuid = skinUuid;
- }
+ public Humanoid(
+ String name,
+ Integer level,
+ Double maxHealth,
+ Double strength,
+ Double defense,
+ Double speed,
+ boolean isHostile,
+ String skin,
+ UUID skinUuid
+ ) {
+ super(name, level, maxHealth, strength, defense, speed, isHostile);
+ this.skin = skin;
+ this.skinUuid = skinUuid;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java
index e94833c..761cd2c 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Elf.java
@@ -9,26 +9,32 @@ import org.bukkit.entity.EntityType;
public class Elf extends RaxenEntity {
- @Getter private final String name;
+ @Getter
+ private final String name;
- public Elf(Raxen main, String name, Integer level, Double health, Double strength) {
- super(main, name, level, health, strength);
- this.name = name;
- }
+ public Elf(
+ Raxen main,
+ String name,
+ Integer level,
+ Double health,
+ Double strength
+ ) {
+ super(main, name, level, health, strength);
+ this.name = name;
+ }
- @Override
- public Entity createEntity(Location location) {
- return super.createEntity(EntityType.PLAYER, name, location);
- }
-
- /**
- * Elf Default values
- * @param main the main instance
- * @param name
- */
- public Elf(Raxen main, String name) {
- super(main, "Elf", 10, 120.0, 25.0);
- this.name = name;
- }
+ @Override
+ public Entity createEntity(Location location) {
+ return super.createEntity(EntityType.PLAYER, name, location);
+ }
+ /**
+ * Elf Default values
+ * @param main the main instance
+ * @param name
+ */
+ public Elf(Raxen main, String name) {
+ super(main, "Elf", 10, 120.0, 25.0);
+ this.name = name;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java
index fd51009..421478d 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/dungeon/forest/Wolf.java
@@ -9,21 +9,27 @@ import org.bukkit.entity.EntityType;
public class Wolf extends RaxenEntity {
- @Getter private final String name;
+ @Getter
+ private final String name;
+ public Wolf(
+ Raxen main,
+ String name,
+ Integer level,
+ Double health,
+ Double strength
+ ) {
+ super(main, name, level, health, strength);
+ this.name = name;
+ }
- public Wolf(Raxen main, String name, Integer level, Double health, Double strength) {
- super(main, name, level, health, strength);
- this.name = name;
- }
+ public Wolf(Raxen main) {
+ super(main, "Wolf", 5, 100.0, 20.0);
+ this.name = "Wolf";
+ }
- public Wolf(Raxen main) {
- super(main, "Wolf", 5, 100.0, 20.0);
- this.name = "Wolf";
- }
-
- @Override
- public Entity createEntity(Location location) {
- return super.createEntity(EntityType.WOLF, name, location);
- }
+ @Override
+ public Entity createEntity(Location location) {
+ return super.createEntity(EntityType.WOLF, name, location);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java
index b3ed93d..b760dac 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java
@@ -8,24 +8,32 @@ import org.bukkit.entity.EntityType;
public class Goblin extends Entity {
- RaxenEntity goblin;
+ RaxenEntity goblin;
- public Goblin(Raxen main) {
- super("Goblin", 1, 100.0, 10.0, 0.0, 50.0, true);
- this.goblin = new RaxenEntity(main, "Goblin", 1, 100.0, 10.0) {
- @Override
- public org.bukkit.entity.Entity createEntity(Location location) {
- return super.createEntity(EntityType.PLAYER, "Goblin", location);
- }
- };
- register(main);
- }
+ public Goblin(Raxen main) {
+ super("Goblin", 1, 100.0, 10.0, 0.0, 50.0, true);
+ this.goblin =
+ new RaxenEntity(main, "Goblin", 1, 100.0, 10.0) {
+ @Override
+ public org.bukkit.entity.Entity createEntity(Location location) {
+ return super.createEntity(EntityType.PLAYER, "Goblin", location);
+ }
+ };
+ register(main);
+ }
- public String getName() {
- return "" + goblin.getName();
- }
+ public String getName() {
+ return "" + goblin.getName();
+ }
- public String getFullName(Entity e) {
- return "⚔️" + getName() + "" + getHealth() + "/" + getMaxHealth();
- }
+ public String getFullName(Entity e) {
+ return (
+ "⚔️" +
+ getName() +
+ "" +
+ getHealth() +
+ "/" +
+ getMaxHealth()
+ );
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java b/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java
index 8af0d8e..3e83691 100644
--- a/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java
+++ b/src/main/java/me/unurled/raxen/components/entity/other/spawn/Eggs.java
@@ -1,4 +1,3 @@
package me.unurled.raxen.components.entity.other.spawn;
-public class Eggs {
-}
+public class Eggs {}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/Inventories.java b/src/main/java/me/unurled/raxen/components/entity/player/Inventories.java
index b5256f4..5bf971c 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/Inventories.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/Inventories.java
@@ -3,17 +3,18 @@ package me.unurled.raxen.components.entity.player;
import me.unurled.raxen.components.entity.player.storages.Inventory;
public class Inventories {
- private Inventory inv;
- public Inventories(Inventory inv) {
- this.inv = inv;
- }
+ private Inventory inv;
- public Inventory getInv() {
- return inv;
- }
+ public Inventories(Inventory inv) {
+ this.inv = inv;
+ }
- public void setInv(Inventory inv) {
- this.inv = inv;
- }
+ public Inventory getInv() {
+ return inv;
+ }
+
+ public void setInv(Inventory inv) {
+ this.inv = inv;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java b/src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java
index 7858543..2c9ddc4 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/PlayerUtils.java
@@ -1,42 +1,47 @@
package me.unurled.raxen.components.entity.player;
+import static me.unurled.raxen.utils.Utils.debug;
+
import me.unurled.raxen.Raxen;
import me.unurled.raxen.manager.entity.PlayerManager;
import org.bukkit.Bukkit;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Player;
-import static me.unurled.raxen.utils.Utils.debug;
-
public class PlayerUtils {
- public static void updateSkills(Raxen main, Player player) {
- PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
- int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
- defense= pm.getDefense().get(player);
- maxMana = pm.getMaxMana().get(player);
- itemDefense= pm.getItemDefense().get(player);
- health = pm.getHealth().get(player);
- itemHealth = pm.getItemHealth().get(player);
- mana = pm.getMana().get(player);
- speed = pm.getSpeed().get(player);
- itemLuck = pm.getItemLuck().get(player);
- strength = pm.getStrength().get(player);
- luck = pm.getLuck().get(player);
- maxHealth = pm.getMaxHealth().get(player);
- itemStrength = pm.getItemStrength().get(player);
- itemSpeed = pm.getItemSpeed().get(player);
- itemMana = pm.getItemMana().get(player);
- player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(20D + (health + itemHealth) / 100);
- player.setWalkSpeed((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
- player.setFlySpeed((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
- debug("Player " + player.getName(),
- "Speed " + (speed + itemSpeed),
- "Health " + (health + itemHealth) + " Max Health " + maxHealth,
- "Defense " + (defense+itemDefense),
- "Strength " + (strength+itemStrength),
- "Luck " + (luck+itemLuck),
- "Mana " + (mana + itemMana) + " Max Mana " + maxMana);
- }
-
+ public static void updateSkills(Raxen main, Player player) {
+ PlayerManager pm =
+ ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager()
+ .getPlayerManager();
+ int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
+ defense = pm.getDefense().get(player);
+ maxMana = pm.getMaxMana().get(player);
+ itemDefense = pm.getItemDefense().get(player);
+ health = pm.getHealth().get(player);
+ itemHealth = pm.getItemHealth().get(player);
+ mana = pm.getMana().get(player);
+ speed = pm.getSpeed().get(player);
+ itemLuck = pm.getItemLuck().get(player);
+ strength = pm.getStrength().get(player);
+ luck = pm.getLuck().get(player);
+ maxHealth = pm.getMaxHealth().get(player);
+ itemStrength = pm.getItemStrength().get(player);
+ itemSpeed = pm.getItemSpeed().get(player);
+ itemMana = pm.getItemMana().get(player);
+ player
+ .getAttribute(Attribute.GENERIC_MAX_HEALTH)
+ .setBaseValue(20D + (health + itemHealth) / 100);
+ player.setWalkSpeed((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
+ player.setFlySpeed((float) (0.0 + ((speed + itemSpeed) / 100) * 0.2));
+ debug(
+ "Player " + player.getName(),
+ "Speed " + (speed + itemSpeed),
+ "Health " + (health + itemHealth) + " Max Health " + maxHealth,
+ "Defense " + (defense + itemDefense),
+ "Strength " + (strength + itemStrength),
+ "Luck " + (luck + itemLuck),
+ "Mana " + (mana + itemMana) + " Max Mana " + maxMana
+ );
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java b/src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java
index 53cbdb8..2a26726 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/RaxenPlayer.java
@@ -1,5 +1,10 @@
package me.unurled.raxen.components.entity.player;
+import static me.unurled.raxen.utils.Items.setItemsToInventory;
+import static me.unurled.raxen.utils.Utils.debug;
+
+import java.util.ArrayList;
+import java.util.List;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.entity.other.EntityNamespacedKey;
import me.unurled.raxen.components.entity.player.attributes.Attribute;
@@ -17,114 +22,153 @@ import org.bukkit.inventory.PlayerInventory;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
-import java.util.ArrayList;
-import java.util.List;
-
-import static me.unurled.raxen.utils.Items.setItemsToInventory;
-import static me.unurled.raxen.utils.Utils.debug;
-
public class RaxenPlayer {
- private final Raxen main;
- private final Player player;
- private final EntityNamespacedKey namespacedKey;
+ private final Raxen main;
+ private final Player player;
+ private final EntityNamespacedKey namespacedKey;
- private Boolean isRaxenPlayer;
+ private Boolean isRaxenPlayer;
- private Attribute attribute;
+ private Attribute attribute;
- private Storage storages;
- private Inventories inventory;
+ private Storage storages;
+ private Inventories inventory;
- public RaxenPlayer(Raxen main, Player player) {
- this.main = main;
- this.player = player;
- this.namespacedKey = new EntityNamespacedKey(main);
- this.isRaxenPlayer = true;
+ public RaxenPlayer(Raxen main, Player player) {
+ this.main = main;
+ this.player = player;
+ this.namespacedKey = new EntityNamespacedKey(main);
+ this.isRaxenPlayer = true;
+ }
+
+ public Attribute createNewAttribute() {
+ debug(main, "Created new Attribute");
+ EntityAttributes.setAttributes(
+ player,
+ 100,
+ 100,
+ 0,
+ 50,
+ 0,
+ 100,
+ 0,
+ 100,
+ 0,
+ 100,
+ 100,
+ 0,
+ 10,
+ 0
+ );
+ return new Attribute(
+ 100,
+ 100,
+ 0,
+ 50,
+ 0,
+ 100,
+ 0,
+ 100,
+ 0,
+ 100,
+ 100,
+ 0,
+ 10,
+ 0
+ );
+ }
+
+ public void setStorages(
+ org.bukkit.inventory.Inventory inv,
+ org.bukkit.inventory.Inventory ec
+ ) {
+ setStorage(ec);
+ setInventory(inv);
+ }
+
+ public Storage getStorage() {
+ PersistentDataContainer data = player.getPersistentDataContainer();
+ String store = data.get(namespacedKey.storage, PersistentDataType.STRING);
+ org.bukkit.inventory.Inventory ec = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Ender Chest")
+ );
+ ec = setItemsToInventory(Items.mapItemStackDeserialize(store), ec);
+ EnderChest ecc = new EnderChest(ec);
+ Storage storage = new Storage(ecc);
+ return storage;
+ }
+
+ public Inventories getInventory() {
+ PersistentDataContainer data = player.getPersistentDataContainer();
+ String inv = data.get(namespacedKey.inventory, PersistentDataType.STRING);
+ org.bukkit.inventory.Inventory invv = Bukkit.createInventory(
+ player,
+ InventoryType.PLAYER
+ );
+ invv =
+ setItemsToInventory(
+ Items.listItemStackDeserialize(inv),
+ (PlayerInventory) invv
+ );
+ Inventory invvv = new Inventory(invv);
+ Inventories invvvv = new Inventories(invvv);
+ return invvvv;
+ }
+
+ public void setInventory(org.bukkit.inventory.Inventory inv) {
+ PersistentDataContainer data = player.getPersistentDataContainer();
+ List listInv = new ArrayList();
+ Integer reverse = 0;
+ for (ItemStack it : inv) {
+ reverse = reverse + 1;
+ if (it != null && it.getType() != Material.AIR) {
+ String s = Items.itemStackSerialize(it, reverse);
+ listInv.add(s);
+ }
}
+ String invv = Items.listItemStackSerialize(listInv);
+ this.inventory = new Inventories(new Inventory(inv));
+ data.set(namespacedKey.inventory, PersistentDataType.STRING, invv);
+ }
- public Attribute createNewAttribute() {
- debug(main, "Created new Attribute");
- EntityAttributes.setAttributes(player, 100, 100,0,50,0,100,0,100,0, 100, 100, 0, 10, 0);
- return new Attribute(100,100,0,50,0,100,0,100,0, 100, 100, 0, 10, 0);
+ public void setStorage(org.bukkit.inventory.Inventory ec) {
+ PersistentDataContainer data = player.getPersistentDataContainer();
+ List list = new ArrayList();
+ int reverse = 0;
+ for (ItemStack it : ec) {
+ if (it != null) {
+ String s = Items.itemStackSerialize(it, reverse);
+ list.add(s);
+ }
+ reverse += 1;
}
+ String store = Items.listItemStackSerialize(list);
+ this.storages = new Storage(new EnderChest(ec));
+ data.set(namespacedKey.storage, PersistentDataType.STRING, store);
+ }
- public void setStorages(org.bukkit.inventory.Inventory inv, org.bukkit.inventory.Inventory ec) {
- setStorage(ec);
- setInventory(inv);
- }
+ public Storage createStorage() {
+ setStorage(Bukkit.createInventory(null, 54, Component.text("Ender Chest")));
+ return getStorage();
+ }
- public Storage getStorage() {
- PersistentDataContainer data = player.getPersistentDataContainer();
- String store = data.get(namespacedKey.storage, PersistentDataType.STRING);
- org.bukkit.inventory.Inventory ec = Bukkit.createInventory(null, 54, Component.text("Ender Chest"));
- ec = setItemsToInventory(Items.mapItemStackDeserialize(store), ec);
- EnderChest ecc = new EnderChest(ec);
- Storage storage = new Storage(ecc);
- return storage;
- }
+ public Inventories createInventory() {
+ setInventory(Bukkit.createInventory(null, InventoryType.PLAYER));
+ return getInventory();
+ }
- public Inventories getInventory() {
- PersistentDataContainer data = player.getPersistentDataContainer();
- String inv = data.get(namespacedKey.inventory, PersistentDataType.STRING);
- org.bukkit.inventory.Inventory invv = Bukkit.createInventory(player, InventoryType.PLAYER);
- invv = setItemsToInventory(Items.listItemStackDeserialize(inv), (PlayerInventory) invv);
- Inventory invvv = new Inventory(invv);
- Inventories invvvv = new Inventories(invvv);
- return invvvv;
- }
+ public Boolean isRaxenPlayer() {
+ return isRaxenPlayer;
+ }
- public void setInventory(org.bukkit.inventory.Inventory inv) {
- PersistentDataContainer data = player.getPersistentDataContainer();
- List listInv = new ArrayList();
- Integer reverse = 0;
- for(ItemStack it : inv) {
- reverse = reverse + 1;
- if(it != null && it.getType() != Material.AIR) {
- String s = Items.itemStackSerialize(it, reverse);
- listInv.add(s);
- }
- }
- String invv = Items.listItemStackSerialize(listInv);
- this.inventory = new Inventories(new Inventory(inv));
- data.set(namespacedKey.inventory, PersistentDataType.STRING, invv);
- }
+ public void isRaxenPlayer(boolean player) {
+ isRaxenPlayer = player;
+ }
- public void setStorage(org.bukkit.inventory.Inventory ec) {
- PersistentDataContainer data = player.getPersistentDataContainer();
- List list = new ArrayList();
- int reverse = 0;
- for(ItemStack it : ec) {
- if(it != null) {
- String s = Items.itemStackSerialize(it, reverse);
- list.add(s);
- }
- reverse += 1;
- }
- String store = Items.listItemStackSerialize(list);
- this.storages = new Storage(new EnderChest(ec));
- data.set(namespacedKey.storage, PersistentDataType.STRING, store);
- }
-
- public Storage createStorage() {
- setStorage(Bukkit.createInventory(null, 54, Component.text("Ender Chest")));
- return getStorage();
- }
-
- public Inventories createInventory() {
- setInventory(Bukkit.createInventory(null, InventoryType.PLAYER));
- return getInventory();
- }
-
- public Boolean isRaxenPlayer() {
- return isRaxenPlayer;
- }
-
- public void isRaxenPlayer(boolean player) {
- isRaxenPlayer = player;
- }
-
- public Attribute getAttribute() {
- return attribute;
- }
+ public Attribute getAttribute() {
+ return attribute;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java b/src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java
index 5aee096..4f9e644 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/Scoreboard.java
@@ -1,55 +1,75 @@
package me.unurled.raxen.components.entity.player;
+import static me.unurled.raxen.utils.Utils.*;
+
import me.unurled.raxen.Raxen;
import me.unurled.raxen.utils.libs.Vault;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.*;
-import static me.unurled.raxen.utils.Utils.*;
-
public class Scoreboard {
- private Raxen main;
- private Vault vault;
+ private Raxen main;
+ private Vault vault;
- public Scoreboard(Raxen main) {
- this.main = main;
- this.vault = main.getManager().getLibsManager().getVault();
- }
-
- public void createScorebord(Player player) {
- ScoreboardManager manager = Bukkit.getScoreboardManager();
- org.bukkit.scoreboard.Scoreboard board = manager.getNewScoreboard();
- Objective obj = board.registerNewObjective("Raxen", "dummy", colorTextComp("Elixium"));
- obj.setDisplaySlot(DisplaySlot.SIDEBAR);
- Score score = obj.getScore(textCompToString(colorTextComp("-------------")));
- score.setScore(4);
- Score score1 = obj.getScore(textCompToString(colorTextComp("Name:" + player.getName())));
- score1.setScore(3);
- Score score2 = obj.getScore(textCompToString(colorTextComp("Location")));
- score2.setScore(2);
- Score score3 = obj.getScore(textCompToString(colorTextComp("Coins: " + vault.getBalanceString(player))));
- score3.setScore(1);
- Score score4 = obj.getScore(textCompToString(colorTextComp("unurled.me")));
- score4.setScore(0);
- player.setScoreboard(board);
- }
-
- public void updateScoreboardTransaction(Player player) {
- if(player != null) {
- Objective objective = player.getScoreboard().getObjective(DisplaySlot.SIDEBAR);
- player.getScoreboard().getObjective(DisplaySlot.SIDEBAR);
- debug(main, String.valueOf(player.getScoreboard().getEntries()));
- for (String str : player.getScoreboard().getEntries()) {
- if(str.contains(player.getName())) {
-
- }
- }
- player.getScoreboard().resetScores("Coins");
- assert objective != null;
- Score score = objective.getScore(textCompToString(colorTextComp("Coins: " + vault.getBalanceString(player))));
- score.setScore(1);
- }
+ public Scoreboard(Raxen main) {
+ this.main = main;
+ this.vault = main.getManager().getLibsManager().getVault();
+ }
+
+ public void createScorebord(Player player) {
+ ScoreboardManager manager = Bukkit.getScoreboardManager();
+ org.bukkit.scoreboard.Scoreboard board = manager.getNewScoreboard();
+ Objective obj = board.registerNewObjective(
+ "Raxen",
+ Criteria.DUMMY,
+ colorTextComp("Elixium")
+ );
+ obj.setDisplaySlot(DisplaySlot.SIDEBAR);
+ Score score = obj.getScore(
+ textCompToString(colorTextComp("-------------"))
+ );
+ score.setScore(4);
+ Score score1 = obj.getScore(
+ textCompToString(colorTextComp("Name:" + player.getName()))
+ );
+ score1.setScore(3);
+ Score score2 = obj.getScore(
+ textCompToString(colorTextComp("Location"))
+ );
+ score2.setScore(2);
+ Score score3 = obj.getScore(
+ textCompToString(
+ colorTextComp("Coins: " + vault.getBalanceString(player))
+ )
+ );
+ score3.setScore(1);
+ Score score4 = obj.getScore(
+ textCompToString(colorTextComp("unurled.me"))
+ );
+ score4.setScore(0);
+ player.setScoreboard(board);
+ }
+
+ public void updateScoreboardTransaction(Player player) {
+ if (player != null) {
+ Objective objective = player
+ .getScoreboard()
+ .getObjective(DisplaySlot.SIDEBAR);
+ player.getScoreboard().getObjective(DisplaySlot.SIDEBAR);
+ debug(main, String.valueOf(player.getScoreboard().getEntries()));
+ for (String str : player.getScoreboard().getEntries()) {
+ if (str.contains(player.getName())) {}
+ }
+ player.getScoreboard().resetScores("Coins");
+ assert objective != null;
+ Score score = objective.getScore(
+ textCompToString(
+ colorTextComp("Coins: " + vault.getBalanceString(player))
+ )
+ );
+ score.setScore(1);
}
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/Storage.java b/src/main/java/me/unurled/raxen/components/entity/player/Storage.java
index f1da721..3caff10 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/Storage.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/Storage.java
@@ -4,17 +4,17 @@ import me.unurled.raxen.components.entity.player.storages.EnderChest;
public class Storage {
- private EnderChest ec;
+ private EnderChest ec;
- public Storage(EnderChest ec) {
- this.ec = ec;
- }
+ public Storage(EnderChest ec) {
+ this.ec = ec;
+ }
- public EnderChest getEc() {
- return ec;
- }
+ public EnderChest getEc() {
+ return ec;
+ }
- public void setEc(EnderChest ec) {
- this.ec = ec;
- }
+ public void setEc(EnderChest ec) {
+ this.ec = ec;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java
index 297eb8f..c19242a 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attribute.java
@@ -5,24 +5,39 @@ import lombok.Setter;
public class Attribute {
- @Getter
- @Setter
- private int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
+ @Getter
+ @Setter
+ private int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
- public Attribute(int maxHealth, int health, int itemHealth, int defense, int itemDefense, int speed, int itemSpeed, int strength, int itemStrength, int maxMana, int mana, int itemMana, int luck, int itemLuck) {
- this.maxHealth = maxHealth;
- this.health = health;
- this.itemHealth = itemHealth;
- this.defense = defense;
- this.itemDefense = itemDefense;
- this.speed = speed;
- this.itemSpeed = itemSpeed;
- this.strength = strength;
- this.itemStrength = itemStrength;
- this.maxHealth = maxMana;
- this.mana = mana;
- this.itemMana = itemMana;
- this.luck = luck;
- this.itemLuck = itemLuck;
- }
+ public Attribute(
+ int maxHealth,
+ int health,
+ int itemHealth,
+ int defense,
+ int itemDefense,
+ int speed,
+ int itemSpeed,
+ int strength,
+ int itemStrength,
+ int maxMana,
+ int mana,
+ int itemMana,
+ int luck,
+ int itemLuck
+ ) {
+ this.maxHealth = maxHealth;
+ this.health = health;
+ this.itemHealth = itemHealth;
+ this.defense = defense;
+ this.itemDefense = itemDefense;
+ this.speed = speed;
+ this.itemSpeed = itemSpeed;
+ this.strength = strength;
+ this.itemStrength = itemStrength;
+ this.maxHealth = maxMana;
+ this.mana = mana;
+ this.itemMana = itemMana;
+ this.luck = luck;
+ this.itemLuck = itemLuck;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java
index 9ed0816..f4049f8 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/attributes/Attributes.java
@@ -11,55 +11,96 @@ import org.jetbrains.annotations.NotNull;
public class Attributes {
- private static EntityNamespacedKey namespacedKey;
+ private static EntityNamespacedKey namespacedKey;
- public Attributes(Raxen main) {
- namespacedKey = new EntityNamespacedKey(main);
- }
+ public Attributes(Raxen main) {
+ namespacedKey = new EntityNamespacedKey(main);
+ }
- @Contract("_ -> new")
- public static @NotNull Attribute getAttribute(Player player) {
- int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
- PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
- Entity e = player;
- defense= pm.getDefense().get(e);
- maxMana = pm.getMaxMana().get(e);
- itemDefense= pm.getItemDefense().get(e);
- health = pm.getHealth().get(e);
- itemHealth = pm.getItemHealth().get(e);
- mana = pm.getMana().get(e);
- speed = pm.getSpeed().get(e);
- itemLuck = pm.getItemLuck().get(e);
- strength = pm.getStrength().get(e);
- luck = pm.getLuck().get(e);
- maxHealth = pm.getMaxHealth().get(e);
- itemStrength = pm.getItemStrength().get(e);
- itemSpeed = pm.getItemSpeed().get(e);
- itemMana = pm.getItemMana().get(e);
- return new Attribute(maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck);
- }
+ @Contract("_ -> new")
+ public static @NotNull Attribute getAttribute(Player player) {
+ int maxHealth, health, itemHealth, defense, itemDefense, speed, itemSpeed, strength, itemStrength, maxMana, mana, itemMana, luck, itemLuck;
+ PlayerManager pm =
+ ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager()
+ .getPlayerManager();
+ Entity e = player;
+ defense = pm.getDefense().get(e);
+ maxMana = pm.getMaxMana().get(e);
+ itemDefense = pm.getItemDefense().get(e);
+ health = pm.getHealth().get(e);
+ itemHealth = pm.getItemHealth().get(e);
+ mana = pm.getMana().get(e);
+ speed = pm.getSpeed().get(e);
+ itemLuck = pm.getItemLuck().get(e);
+ strength = pm.getStrength().get(e);
+ luck = pm.getLuck().get(e);
+ maxHealth = pm.getMaxHealth().get(e);
+ itemStrength = pm.getItemStrength().get(e);
+ itemSpeed = pm.getItemSpeed().get(e);
+ itemMana = pm.getItemMana().get(e);
+ return new Attribute(
+ maxHealth,
+ health,
+ itemHealth,
+ defense,
+ itemDefense,
+ speed,
+ itemSpeed,
+ strength,
+ itemStrength,
+ maxMana,
+ mana,
+ itemMana,
+ luck,
+ itemLuck
+ );
+ }
- public static void setAttributes(Player player, int maxHealth, int health, int itemHealth, int defense, int itemDefense, int speed, int itemSpeed, int strength, int itemStrength, int maxMana, int mana, int itemMana, int luck, int itemLuck) {
- PlayerManager pm = ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager().getPlayerManager();
- Entity e = player;
- pm.getDefense().set(e, defense);
- pm.getMaxMana().set(e, maxMana);
- pm.getItemDefense().set(e, itemDefense);
- pm.getHealth().set(e, health);
- pm.getItemHealth().set(e, itemHealth);
- pm.getMana().set(e, mana);
- pm.getSpeed().set(e, speed);
- pm.getItemLuck().set(e, itemLuck);
- pm.getStrength().set(e, strength);
- pm.getLuck().set(e, luck);
- pm.getMaxHealth().set(e, maxHealth);
- pm.getItemStrength().set(e, itemStrength);
- pm.getItemSpeed().set(e, itemSpeed);
- pm.getItemMana().set(e, itemMana);
- }
+ public static void setAttributes(
+ Player player,
+ int maxHealth,
+ int health,
+ int itemHealth,
+ int defense,
+ int itemDefense,
+ int speed,
+ int itemSpeed,
+ int strength,
+ int itemStrength,
+ int maxMana,
+ int mana,
+ int itemMana,
+ int luck,
+ int itemLuck
+ ) {
+ PlayerManager pm =
+ ((Raxen) Bukkit.getPluginManager().getPlugin("Raxen")).getManager()
+ .getPlayerManager();
+ Entity e = player;
+ pm.getDefense().set(e, defense);
+ pm.getMaxMana().set(e, maxMana);
+ pm.getItemDefense().set(e, itemDefense);
+ pm.getHealth().set(e, health);
+ pm.getItemHealth().set(e, itemHealth);
+ pm.getMana().set(e, mana);
+ pm.getSpeed().set(e, speed);
+ pm.getItemLuck().set(e, itemLuck);
+ pm.getStrength().set(e, strength);
+ pm.getLuck().set(e, luck);
+ pm.getMaxHealth().set(e, maxHealth);
+ pm.getItemStrength().set(e, itemStrength);
+ pm.getItemSpeed().set(e, itemSpeed);
+ pm.getItemMana().set(e, itemMana);
+ }
- public static String[] getNameList() {
- return new String[]{"Defense", "Health", "Luck", "Mana", "Speed", "Strength"};
-
- }
+ public static String[] getNameList() {
+ return new String[] {
+ "Defense",
+ "Health",
+ "Luck",
+ "Mana",
+ "Speed",
+ "Strength",
+ };
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java b/src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java
index d9f03a4..9ccc4b6 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/classes/Class.java
@@ -1,37 +1,53 @@
package me.unurled.raxen.components.entity.player.classes;
+import static me.unurled.raxen.utils.Utils.colorTextComp;
+
import lombok.Getter;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
-import static me.unurled.raxen.utils.Utils.colorTextComp;
-
public class Class {
- @Getter
- String name;
- @Getter
- String colorName;
- @Getter
- String ID;
- @Getter
- ItemStack placeHolder;
- @Getter
- Integer max_level;
+ @Getter
+ String name;
- public Class(String name, String colorName, String ID, String itemPlaceHolder, Integer max_level) {
- this.name = name;
- this.ID = ID;
- this.placeHolder = new ItemStack(Material.getMaterial(itemPlaceHolder));
- this.placeHolder.getItemMeta().displayName(colorTextComp(colorName));
- this.max_level = max_level;
- }
+ @Getter
+ String colorName;
- public Class(String name, String colorName, String ID, ItemStack itemPlaceHolder, Integer max_level) {
- this.name = name;
- this.ID = ID;
- this.placeHolder = itemPlaceHolder;
- this.placeHolder.getItemMeta().displayName(colorTextComp(colorName));
- this.max_level = max_level;
- }
+ @Getter
+ String ID;
+
+ @Getter
+ ItemStack placeHolder;
+
+ @Getter
+ Integer max_level;
+
+ public Class(
+ String name,
+ String colorName,
+ String ID,
+ String itemPlaceHolder,
+ Integer max_level
+ ) {
+ this.name = name;
+ this.ID = ID;
+ this.placeHolder = new ItemStack(Material.getMaterial(itemPlaceHolder));
+ this.placeHolder.getItemMeta().displayName(colorTextComp(colorName));
+ this.max_level = max_level;
+ }
+
+ public Class(
+ String name,
+ String colorName,
+ String ID,
+ ItemStack itemPlaceHolder,
+ Integer max_level
+ ) {
+ this.name = name;
+ this.ID = ID;
+ this.placeHolder = itemPlaceHolder;
+ this.placeHolder.getItemMeta().displayName(colorTextComp(colorName));
+ this.max_level = max_level;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java b/src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java
index 08299f2..5c8848e 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/classes/Classes.java
@@ -1,40 +1,43 @@
package me.unurled.raxen.components.entity.player.classes;
+import static me.unurled.raxen.utils.Utils.debug;
+
import lombok.Getter;
import lombok.Setter;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.entity.player.classes.list.Assassin;
-import static me.unurled.raxen.utils.Utils.debug;
-
public class Classes {
- private final Raxen main;
+ private final Raxen main;
- public Classes(Raxen main) {
- this.main = main;
- register();
- }
+ public Classes(Raxen main) {
+ this.main = main;
+ register();
+ }
- public void register() {
- registerClass(new Assassin());
- }
+ public void register() {
+ registerClass(new Assassin());
+ }
- public class resultClass {
- @Getter
- @Setter
- public Class clas;
- @Getter
- @Setter
- public String id;
- public resultClass(Class clas, String id) {
- this.clas = clas;
- this.id = id;
- }
- }
+ public class resultClass {
- public void registerClass(Class clas) {
- debug(clas.getID());
- main.getManager().getPlayerManager().addClasses(clas, clas.getID());
+ @Getter
+ @Setter
+ public Class clas;
+
+ @Getter
+ @Setter
+ public String id;
+
+ public resultClass(Class clas, String id) {
+ this.clas = clas;
+ this.id = id;
}
+ }
+
+ public void registerClass(Class clas) {
+ debug(clas.getID());
+ main.getManager().getPlayerManager().addClasses(clas, clas.getID());
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java b/src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java
index 775203f..8548324 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/classes/list/Assassin.java
@@ -7,21 +7,33 @@ import org.bukkit.inventory.ItemStack;
public class Assassin extends Class {
- String ID = "ASSASSIN";
- String name = "Assassin";
- String colorName = "Assassin";
- Integer max_level = 100;
+ String ID = "ASSASSIN";
+ String name = "Assassin";
+ String colorName = "Assassin";
+ Integer max_level = 100;
- ItemStack placeHolder;
+ ItemStack placeHolder;
- public Assassin() {
- super("Assassin", "Assassin", "ASSASSIN", new ItemStack(Material.AIR), 100);
- Dagger dagger = new Dagger();
- dagger.buildItem();
- placeHolder = dagger.getItem();
- }
+ public Assassin() {
+ super(
+ "Assassin",
+ "Assassin",
+ "ASSASSIN",
+ new ItemStack(Material.AIR),
+ 100
+ );
+ Dagger dagger = new Dagger();
+ dagger.buildItem();
+ placeHolder = dagger.getItem();
+ }
- public Assassin(String name, String colorName, String ID, String itemPlaceHolder, Integer max_level) {
- super(name, colorName, ID, itemPlaceHolder, max_level);
- }
+ public Assassin(
+ String name,
+ String colorName,
+ String ID,
+ String itemPlaceHolder,
+ Integer max_level
+ ) {
+ super(name, colorName, ID, itemPlaceHolder, max_level);
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java b/src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java
index aca7dbe..bcd9e8d 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/storages/EnderChest.java
@@ -8,11 +8,15 @@ import org.bukkit.inventory.Inventory;
public class EnderChest {
- @Getter
- @Setter
- public Inventory ec = Bukkit.createInventory(null, 54, Component.text("Ender Chest"));
+ @Getter
+ @Setter
+ public Inventory ec = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Ender Chest")
+ );
- public EnderChest(Inventory ec) {
- this.ec = ec;
- }
+ public EnderChest(Inventory ec) {
+ this.ec = ec;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java b/src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java
index 3582675..22cf211 100644
--- a/src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java
+++ b/src/main/java/me/unurled/raxen/components/entity/player/storages/Inventory.java
@@ -6,11 +6,15 @@ import org.bukkit.Bukkit;
import org.bukkit.event.inventory.InventoryType;
public class Inventory {
- @Getter
- @Setter
- public org.bukkit.inventory.Inventory inv = Bukkit.createInventory(null, InventoryType.PLAYER);
- public Inventory(org.bukkit.inventory.Inventory inv) {
- this.inv = inv;
- }
+ @Getter
+ @Setter
+ public org.bukkit.inventory.Inventory inv = Bukkit.createInventory(
+ null,
+ InventoryType.PLAYER
+ );
+
+ public Inventory(org.bukkit.inventory.Inventory inv) {
+ this.inv = inv;
+ }
}
diff --git a/src/main/java/me/unurled/raxen/components/gui/ItemListGui.java b/src/main/java/me/unurled/raxen/components/gui/ItemListGui.java
index fec5d97..40802e3 100644
--- a/src/main/java/me/unurled/raxen/components/gui/ItemListGui.java
+++ b/src/main/java/me/unurled/raxen/components/gui/ItemListGui.java
@@ -1,5 +1,11 @@
package me.unurled.raxen.components.gui;
+import static me.unurled.raxen.utils.Items.*;
+import static me.unurled.raxen.utils.Utils.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
import lombok.Getter;
import me.unurled.raxen.Raxen;
import me.unurled.raxen.components.entity.player.PlayerUtils;
@@ -17,219 +23,295 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static me.unurled.raxen.utils.Items.*;
-import static me.unurled.raxen.utils.Utils.fillGreyPane;
-import static me.unurled.raxen.utils.Utils.log;
-
public class ItemListGui implements Listener {
- private Raxen main;
- @Getter
- private Inventory inv = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv2 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv3 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv4 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv5 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv6 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv7 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv8 = Bukkit.createInventory(null, 54, Component.text("Item List"));
- private Inventory inv9 = Bukkit.createInventory(null, 54, Component.text("Item List"));
+ private Raxen main;
- private HashMap itlist;
+ @Getter
+ private Inventory inv = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
- public ItemListGui(Raxen main) {
- this.main = main;
- this.itlist = this.main.getManager().getItemManager().getList();
- this.inv = getInventories();
- }
+ private Inventory inv2 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv3 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv4 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv5 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv6 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv7 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv8 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
+ private Inventory inv9 = Bukkit.createInventory(
+ null,
+ 54,
+ Component.text("Item List")
+ );
- private ItemStack PREVIOUS = createItem(Material.ARROW, 1,true, false, "Previous page");
- private ItemStack NEXT = createItem(Material.ARROW, 1,true, false, "Next page");
- private ItemStack PAGE = createItem(Material.PAPER, 1,true, false, "Page");
- private ItemStack CLOSE = closeItem();
- private ItemStack GREY_PANE = greyPane();
+ private HashMap itlist;
- public Inventory getInventories() {
- Integer page = 1;
- Integer item = -1;
- for (Map.Entry entry : itlist.entrySet()) {
- ItemStack it = entry.getValue();
- item++;
- if(item > 44 && item < 91) {
- inv2.addItem(it);
- inv2.setItem(48, PREVIOUS);
- inv2.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv2.setItem(53, CLOSE);
- inv2 = fillGreyPane(inv2);
- }
- if (item > 90 && item < 136) {
- inv3.setItem(48, PREVIOUS);
- inv3.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv3.setItem(53, CLOSE);
- inv3 = fillGreyPane(inv3);
- }
- if (item > 135 && item < 181) {
- inv4.addItem(it);
- inv4.setItem(48, PREVIOUS);
- inv4.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv4.setItem(53, CLOSE);
- inv4 = fillGreyPane(inv4);
- }
- if (item > 180 && item < 226) {
- inv5.addItem(it);
- inv5.setItem(48, PREVIOUS);
- inv5.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv5.setItem(53, CLOSE);
- inv5 = fillGreyPane(inv5);
- }
- if (item > 225 && item < 271) {
- inv6.addItem(it);
- inv6.setItem(48, PREVIOUS);
- inv6.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv6.setItem(53, CLOSE);
- inv6 = fillGreyPane(inv6);
- }
- if (item > 270 && item < 316) {
- inv7.addItem(it);
- inv7.setItem(48, PREVIOUS);
- inv7.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv7.setItem(53, CLOSE);
- inv7 = fillGreyPane(inv7);
- }
- if (item > 315 && item < 361) {
- inv8.addItem(it);
- inv8.setItem(48, PREVIOUS);
- inv8.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv8.setItem(53, CLOSE);
- inv8 = fillGreyPane(inv8);
- }
- if (item > 360 && item < 406) {
- inv9.addItem(it);
- inv9.setItem(48, PREVIOUS);
- inv9.setItem(49, editItem(PAGE, "page" + page,1, new ArrayList()));
- inv9.setItem(53, CLOSE);
- inv9 = fillGreyPane(inv9);
- }
- if (item > 405) {
- log("Too many item to render.");
- }
- else {
- inv.addItem(it);
- inv.setItem(49, PAGE);
- inv.setItem(50, NEXT);
- }
- if (item > 44) {
- inv.setItem(50, NEXT);
- if (item > 90) {
- inv2.setItem(50, NEXT);
- if (item > 135) {
- inv3.setItem(50, NEXT);
- if (item > 180) {
- inv4.setItem(50, NEXT);
- if (item > 225) {
- inv5.setItem(50, NEXT);
- if (item > 270) {
- inv6.setItem(50, NEXT);
- if (item > 315) {
- inv7.setItem(50, NEXT);
- if (item > 360) {
- inv8.setItem(50, NEXT);
- }
- }
- }
- }
- }
+ public ItemListGui(Raxen main) {
+ this.main = main;
+ this.itlist = this.main.getManager().getItemManager().getList();
+ this.inv = getInventories();
+ }
+
+ private ItemStack PREVIOUS = createItem(
+ Material.ARROW,
+ 1,
+ true,
+ false,
+ "Previous page"
+ );
+ private ItemStack NEXT = createItem(
+ Material.ARROW,
+ 1,
+ true,
+ false,
+ "Next page"
+ );
+ private ItemStack PAGE = createItem(Material.PAPER, 1, true, false, "Page");
+ private ItemStack CLOSE = closeItem();
+ private ItemStack GREY_PANE = greyPane();
+
+ public Inventory getInventories() {
+ Integer page = 1;
+ Integer item = -1;
+ for (Map.Entry