mirror of
https://github.com/hyperdefined/ToolStats.git
synced 2026-04-22 19:11:23 +00:00
Compare commits
20 Commits
2.0
...
46db1af915
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46db1af915 | ||
|
|
772acf4332 | ||
|
|
1cd38294cc | ||
|
|
9e01726b84 | ||
|
|
1176b57886 | ||
|
|
5c54182301 | ||
|
|
47846df0e4 | ||
|
|
b666323c4a | ||
|
|
b484b772cb | ||
|
|
d56eda6512 | ||
|
|
c7a784920d | ||
|
|
e029c1af3b | ||
|
|
a0282e67c1 | ||
|
|
bb33f4031a | ||
|
|
91331965f1 | ||
|
|
7e9a62a8f1 | ||
|
|
bf4e2af631 | ||
|
|
870b086a94 | ||
|
|
58042980eb | ||
|
|
1157a4312f |
4
.github/workflows/maven.yml
vendored
4
.github/workflows/maven.yml
vendored
@@ -16,10 +16,10 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 25
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 21
|
java-version: 25
|
||||||
- name: Build with Maven
|
- name: Build with Maven
|
||||||
run: mvn -B package --file pom.xml
|
run: mvn -B package --file pom.xml
|
||||||
|
|||||||
46
pom.xml
46
pom.xml
@@ -23,13 +23,13 @@
|
|||||||
|
|
||||||
<groupId>lol.hyper</groupId>
|
<groupId>lol.hyper</groupId>
|
||||||
<artifactId>toolstats</artifactId>
|
<artifactId>toolstats</artifactId>
|
||||||
<version>2.0</version>
|
<version>2.0.3</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>ToolStats</name>
|
<name>ToolStats</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>21</java.version>
|
<java.version>25</java.version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@@ -51,36 +51,12 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.14.1</version>
|
<version>3.15.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>${java.version}</source>
|
<source>${java.version}</source>
|
||||||
<target>${java.version}</target>
|
<target>${java.version}</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<version>3.6.1</version>
|
|
||||||
<configuration>
|
|
||||||
<relocations>
|
|
||||||
<relocation>
|
|
||||||
<pattern>lol.hyper.hyperlib</pattern>
|
|
||||||
<shadedPattern>lol.hyper.toolstats.hyperlib</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
</relocations>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
@@ -99,20 +75,30 @@
|
|||||||
<id>jitpack.io</id>
|
<id>jitpack.io</id>
|
||||||
<url>https://jitpack.io</url>
|
<url>https://jitpack.io</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>rosewood-repo</id>
|
||||||
|
<url>https://repo.rosewooddev.io/repository/public/</url>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.papermc.paper</groupId>
|
<groupId>io.papermc.paper</groupId>
|
||||||
<artifactId>paper-api</artifactId>
|
<artifactId>paper-api</artifactId>
|
||||||
<version>1.21.11-R0.1-SNAPSHOT</version>
|
<version>26.1.1.build.8-alpha</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.hyperdefined</groupId>
|
<groupId>com.github.hyperdefined</groupId>
|
||||||
<artifactId>hyperlib</artifactId>
|
<artifactId>hyperlib</artifactId>
|
||||||
<version>1.0.9</version>
|
<version>1.0.10</version>
|
||||||
<scope>compile</scope>
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>dev.rosewood</groupId>
|
||||||
|
<artifactId>rosestacker</artifactId>
|
||||||
|
<version>1.5.39</version>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import lol.hyper.hyperlib.releases.HyperUpdater;
|
|||||||
import lol.hyper.hyperlib.utils.TextUtils;
|
import lol.hyper.hyperlib.utils.TextUtils;
|
||||||
import lol.hyper.toolstats.commands.CommandToolStats;
|
import lol.hyper.toolstats.commands.CommandToolStats;
|
||||||
import lol.hyper.toolstats.events.*;
|
import lol.hyper.toolstats.events.*;
|
||||||
|
import lol.hyper.toolstats.support.rosestacker.RoseStacker;
|
||||||
import lol.hyper.toolstats.tools.*;
|
import lol.hyper.toolstats.tools.*;
|
||||||
import lol.hyper.toolstats.tools.config.ConfigTools;
|
import lol.hyper.toolstats.tools.config.ConfigTools;
|
||||||
import lol.hyper.toolstats.tools.config.ConfigUpdater;
|
import lol.hyper.toolstats.tools.config.ConfigUpdater;
|
||||||
@@ -36,7 +37,7 @@ import java.io.File;
|
|||||||
|
|
||||||
public final class ToolStats extends JavaPlugin {
|
public final class ToolStats extends JavaPlugin {
|
||||||
|
|
||||||
public final int CONFIG_VERSION = 15;
|
public final int CONFIG_VERSION = 16;
|
||||||
public final ComponentLogger logger = this.getComponentLogger();
|
public final ComponentLogger logger = this.getComponentLogger();
|
||||||
public final File configFile = new File(this.getDataFolder(), "config.yml");
|
public final File configFile = new File(this.getDataFolder(), "config.yml");
|
||||||
public boolean tokens = false;
|
public boolean tokens = false;
|
||||||
@@ -74,6 +75,7 @@ public final class ToolStats extends JavaPlugin {
|
|||||||
public ToolStatsKeys toolStatsKeys;
|
public ToolStatsKeys toolStatsKeys;
|
||||||
public InventoryClose inventoryClose;
|
public InventoryClose inventoryClose;
|
||||||
public PlayerDrop playerDrop;
|
public PlayerDrop playerDrop;
|
||||||
|
public RoseStacker roseStacker = null;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
@@ -128,6 +130,10 @@ public final class ToolStats extends JavaPlugin {
|
|||||||
projectileShoot = new ProjectileShoot(this);
|
projectileShoot = new ProjectileShoot(this);
|
||||||
inventoryClose = new InventoryClose(this);
|
inventoryClose = new InventoryClose(this);
|
||||||
playerDrop = new PlayerDrop(this);
|
playerDrop = new PlayerDrop(this);
|
||||||
|
if (Bukkit.getPluginManager().isPluginEnabled("RoseStacker")) {
|
||||||
|
logger.info("RoseStacker has been detected, adding support!");
|
||||||
|
roseStacker = new RoseStacker();
|
||||||
|
}
|
||||||
|
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(blockBreak, this);
|
Bukkit.getServer().getPluginManager().registerEvents(blockBreak, this);
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
|
Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
|
||||||
@@ -152,7 +158,7 @@ public final class ToolStats extends JavaPlugin {
|
|||||||
Bukkit.getServer().getPluginManager().registerEvents(inventoryClose, this);
|
Bukkit.getServer().getPluginManager().registerEvents(inventoryClose, this);
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(playerDrop, this);
|
Bukkit.getServer().getPluginManager().registerEvents(playerDrop, this);
|
||||||
|
|
||||||
this.getCommand("toolstats").setExecutor(commandToolStats);
|
registerCommand("toolstats", commandToolStats);
|
||||||
|
|
||||||
HyperUpdater updater = new HyperUpdater(hyperLib);
|
HyperUpdater updater = new HyperUpdater(hyperLib);
|
||||||
updater.setGitHub("hyperdefined", "ToolStats");
|
updater.setGitHub("hyperdefined", "ToolStats");
|
||||||
|
|||||||
37
src/main/java/lol/hyper/toolstats/ToolStatsLoader.java
Normal file
37
src/main/java/lol/hyper/toolstats/ToolStatsLoader.java
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ToolStats.
|
||||||
|
*
|
||||||
|
* ToolStats is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* ToolStats is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lol.hyper.toolstats;
|
||||||
|
|
||||||
|
import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
|
||||||
|
import io.papermc.paper.plugin.loader.PluginLoader;
|
||||||
|
import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
|
||||||
|
import org.eclipse.aether.artifact.DefaultArtifact;
|
||||||
|
import org.eclipse.aether.graph.Dependency;
|
||||||
|
import org.eclipse.aether.repository.RemoteRepository;
|
||||||
|
|
||||||
|
public class ToolStatsLoader implements PluginLoader {
|
||||||
|
@Override
|
||||||
|
public void classloader(PluginClasspathBuilder classpathBuilder) {
|
||||||
|
MavenLibraryResolver resolver = new MavenLibraryResolver();
|
||||||
|
|
||||||
|
resolver.addRepository(new RemoteRepository.Builder("jitpack", "default", "https://jitpack.io").build());
|
||||||
|
resolver.addDependency(new Dependency(new DefaultArtifact("com.github.hyperdefined:hyperlib:1.0.10"), null));
|
||||||
|
|
||||||
|
classpathBuilder.addLibrary(resolver);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,29 +17,29 @@
|
|||||||
|
|
||||||
package lol.hyper.toolstats.commands;
|
package lol.hyper.toolstats.commands;
|
||||||
|
|
||||||
|
import io.papermc.paper.command.brigadier.BasicCommand;
|
||||||
|
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||||
import lol.hyper.hyperlib.datatypes.UUIDDataType;
|
import lol.hyper.hyperlib.datatypes.UUIDDataType;
|
||||||
import lol.hyper.toolstats.ToolStats;
|
import lol.hyper.toolstats.ToolStats;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.OfflinePlayer;
|
import org.bukkit.OfflinePlayer;
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.command.ConsoleCommandSender;
|
import org.bukkit.command.ConsoleCommandSender;
|
||||||
import org.bukkit.command.TabExecutor;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.ShapedRecipe;
|
import org.bukkit.inventory.ShapedRecipe;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.bukkit.persistence.PersistentDataContainer;
|
import org.bukkit.persistence.PersistentDataContainer;
|
||||||
import org.bukkit.persistence.PersistentDataType;
|
import org.bukkit.persistence.PersistentDataType;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jspecify.annotations.NonNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jspecify.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class CommandToolStats implements TabExecutor {
|
public class CommandToolStats implements BasicCommand {
|
||||||
|
|
||||||
private final ToolStats toolStats;
|
private final ToolStats toolStats;
|
||||||
|
|
||||||
@@ -48,14 +48,11 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
|
public void execute(@NonNull CommandSourceStack source, String @NonNull [] args) {
|
||||||
if (!sender.hasPermission("toolstats.command")) {
|
CommandSender sender = source.getSender();
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
sender.sendMessage(Component.text("ToolStats version " + toolStats.getPluginMeta().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("ToolStats version " + toolStats.getPluginMeta().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
switch (args[0]) {
|
switch (args[0]) {
|
||||||
case "reload": {
|
case "reload": {
|
||||||
@@ -87,128 +84,128 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
} else {
|
} else {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
// /toolstats edit stat value
|
// /toolstats edit stat value
|
||||||
case "edit": {
|
case "edit": {
|
||||||
if (!sender.hasPermission("toolstats.edit")) {
|
if (!sender.hasPermission("toolstats.edit")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (sender instanceof ConsoleCommandSender) {
|
if (sender instanceof ConsoleCommandSender) {
|
||||||
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length < 3) {
|
if (args.length < 3) {
|
||||||
sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats edit <stat> <value>", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats edit <stat> <value>", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
handleEdit(args[1], args[2], (Player) sender);
|
handleEdit(args[1], args[2], (Player) sender);
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
// /toolstats remove stat
|
// /toolstats remove stat
|
||||||
case "remove": {
|
case "remove": {
|
||||||
if (!sender.hasPermission("toolstats.remove")) {
|
if (!sender.hasPermission("toolstats.remove")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (sender instanceof ConsoleCommandSender) {
|
if (sender instanceof ConsoleCommandSender) {
|
||||||
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats remove <stat>", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats remove <stat>", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
handleRemove(args[1], (Player) sender);
|
handleRemove(args[1], (Player) sender);
|
||||||
return true;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
case "reset": {
|
case "reset": {
|
||||||
if (!sender.hasPermission("toolstats.reset")) {
|
if (!sender.hasPermission("toolstats.reset")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (sender instanceof ConsoleCommandSender) {
|
if (sender instanceof ConsoleCommandSender) {
|
||||||
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
|
if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
|
||||||
if (!sender.hasPermission("toolstats.reset.confirm")) {
|
if (!sender.hasPermission("toolstats.reset.confirm")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
ItemStack heldItem = player.getInventory().getItemInMainHand();
|
ItemStack heldItem = player.getInventory().getItemInMainHand();
|
||||||
if (!toolStats.itemChecker.isValidItem(heldItem.getType())) {
|
if (!toolStats.itemChecker.isValidItem(heldItem.getType())) {
|
||||||
sender.sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
fixItemLore(heldItem, player);
|
fixItemLore(heldItem, player);
|
||||||
sender.sendMessage(Component.text("The lore was reset!", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("The lore was reset!", NamedTextColor.GREEN));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
sender.sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.", NamedTextColor.GREEN));
|
||||||
sender.sendMessage(Component.text("If the owner of the item is broken, it will reset to the person holding it.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("If the owner of the item is broken, it will reset to the person holding it.", NamedTextColor.GREEN));
|
||||||
sender.sendMessage(Component.text("Only use this if the tags on the tool are incorrect.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("Only use this if the tags on the tool are incorrect.", NamedTextColor.GREEN));
|
||||||
sender.sendMessage(Component.text("Type /toolstats reset confirm to confirm this.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("Type /toolstats reset confirm to confirm this.", NamedTextColor.GREEN));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
case "purge": {
|
case "purge": {
|
||||||
if (!sender.hasPermission("toolstats.purge")) {
|
if (!sender.hasPermission("toolstats.purge")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (sender instanceof ConsoleCommandSender) {
|
if (sender instanceof ConsoleCommandSender) {
|
||||||
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
|
if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
|
||||||
if (!sender.hasPermission("toolstats.purge.confirm")) {
|
if (!sender.hasPermission("toolstats.purge.confirm")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
ItemStack heldItem = player.getInventory().getItemInMainHand();
|
ItemStack heldItem = player.getInventory().getItemInMainHand();
|
||||||
if (!toolStats.itemChecker.isValidItem(heldItem.getType())) {
|
if (!toolStats.itemChecker.isValidItem(heldItem.getType())) {
|
||||||
sender.sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
ItemStack purgedItem = toolStats.itemLore.removeAll(heldItem, true);
|
ItemStack purgedItem = toolStats.itemLore.removeAll(heldItem, true);
|
||||||
player.getInventory().setItemInMainHand(purgedItem);
|
player.getInventory().setItemInMainHand(purgedItem);
|
||||||
sender.sendMessage(Component.text("The item was purged!", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("The item was purged!", NamedTextColor.GREEN));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
sender.sendMessage(Component.text("This will purge ALL ToolStats data from this item.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("This will purge ALL ToolStats data from this item.", NamedTextColor.GREEN));
|
||||||
sender.sendMessage(Component.text("This includes all stats, ownership, and creation time.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("This includes all stats, ownership, and creation time.", NamedTextColor.GREEN));
|
||||||
sender.sendMessage(Component.text("THIS CANNOT BE UNDONE!", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("THIS CANNOT BE UNDONE!", NamedTextColor.GREEN));
|
||||||
sender.sendMessage(Component.text("Type /toolstats purge confirm to confirm this.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("Type /toolstats purge confirm to confirm this.", NamedTextColor.GREEN));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
case "givetokens": {
|
case "givetokens": {
|
||||||
if (!sender.hasPermission("toolstats.givetokens")) {
|
if (!sender.hasPermission("toolstats.givetokens")) {
|
||||||
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
// Make sure /toolstats givetoken <player> <token> is present
|
// Make sure /toolstats givetoken <player> <token> is present
|
||||||
if (args.length < 3) {
|
if (args.length < 3) {
|
||||||
sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats givetokens <player> <token>", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats givetokens <player> <token>", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
Player target = Bukkit.getPlayerExact(args[1]);
|
Player target = Bukkit.getPlayerExact(args[1]);
|
||||||
if (target == null) {
|
if (target == null) {
|
||||||
sender.sendMessage(Component.text("Player not found.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Player not found.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
String tokenType = args[2];
|
String tokenType = args[2];
|
||||||
if (!toolStats.tokenData.getTokenTypes().contains(tokenType)) {
|
if (!toolStats.tokenData.getTokenTypes().contains(tokenType)) {
|
||||||
sender.sendMessage(Component.text("Invalid token type.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Invalid token type.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
// make sure tokens are enabled before giving
|
// make sure tokens are enabled before giving
|
||||||
if (!toolStats.config.getBoolean("tokens.enabled")) {
|
if (!toolStats.config.getBoolean("tokens.enabled")) {
|
||||||
sender.sendMessage(Component.text("Unable to give tokens. Tokens are disabled", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Unable to give tokens. Tokens are disabled", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
// if the user does not send in a number, default to 1
|
// if the user does not send in a number, default to 1
|
||||||
int amount = 1;
|
int amount = 1;
|
||||||
@@ -217,24 +214,29 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
amount = Integer.parseInt(args[3]);
|
amount = Integer.parseInt(args[3]);
|
||||||
if (amount <= 0) { // Optional: Prevent negative or zero values
|
if (amount <= 0) { // Optional: Prevent negative or zero values
|
||||||
sender.sendMessage(Component.text("Token quantity must be above or 1.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Token quantity must be above or 1.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException exception) {
|
} catch (NumberFormatException exception) {
|
||||||
sender.sendMessage(Component.text("Invalid token quantity.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Invalid token quantity.", NamedTextColor.RED));
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
giveToken(target, tokenType, amount);
|
giveToken(target, tokenType, amount);
|
||||||
if (sender instanceof Player) {
|
if (sender instanceof Player) {
|
||||||
sender.sendMessage(Component.text("Gave " + target.getName() + " " + amount + " " + tokenType + " tokens.", NamedTextColor.GREEN));
|
sender.sendMessage(Component.text("Gave " + target.getName() + " " + amount + " " + tokenType + " tokens.", NamedTextColor.GREEN));
|
||||||
}
|
}
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
sender.sendMessage(Component.text("Invalid sub-command.", NamedTextColor.RED));
|
sender.sendMessage(Component.text("Invalid sub-command.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable String permission() {
|
||||||
|
return "toolstats.command";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -448,6 +450,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
* @param player The player using the command.
|
* @param player The player using the command.
|
||||||
*/
|
*/
|
||||||
private void handleEdit(String stat, Object userValue, Player player) {
|
private void handleEdit(String stat, Object userValue, Player player) {
|
||||||
|
boolean updated = false;
|
||||||
ItemStack editedItem = player.getInventory().getItemInMainHand().clone();
|
ItemStack editedItem = player.getInventory().getItemInMainHand().clone();
|
||||||
if (!toolStats.itemChecker.isValidItem(editedItem.getType())) {
|
if (!toolStats.itemChecker.isValidItem(editedItem.getType())) {
|
||||||
player.sendMessage(Component.text("This is not a valid item.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This is not a valid item.", NamedTextColor.RED));
|
||||||
@@ -480,6 +483,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateCropsMined(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateCropsMined(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -509,6 +513,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateBlocksMined(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateBlocksMined(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -538,6 +543,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
double difference = value - statValue;
|
double difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateArmorDamage(editedItem, difference, false);
|
editedItemMeta = toolStats.itemLore.updateArmorDamage(editedItem, difference, false);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -567,6 +573,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
double difference = value - statValue;
|
double difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateWeaponDamage(editedItem, difference, false);
|
editedItemMeta = toolStats.itemLore.updateWeaponDamage(editedItem, difference, false);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -596,6 +603,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateMobKills(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateMobKills(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -625,6 +633,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updatePlayerKills(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updatePlayerKills(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -654,6 +663,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateArrowsShot(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateArrowsShot(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -683,6 +693,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateSheepSheared(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateSheepSheared(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -712,6 +723,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
long difference = value - statValue;
|
long difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateFlightTime(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateFlightTime(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -741,6 +753,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateFishCaught(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateFishCaught(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -770,6 +783,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateBossesKilled(editedItem, difference, "wither");
|
editedItemMeta = toolStats.itemLore.updateBossesKilled(editedItem, difference, "wither");
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -799,6 +813,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateBossesKilled(editedItem, difference, "enderdragon");
|
editedItemMeta = toolStats.itemLore.updateBossesKilled(editedItem, difference, "enderdragon");
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -828,6 +843,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateCriticalStrikes(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateCriticalStrikes(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -857,6 +873,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
int difference = value - statValue;
|
int difference = value - statValue;
|
||||||
editedItemMeta = toolStats.itemLore.updateTridentThrows(editedItem, difference);
|
editedItemMeta = toolStats.itemLore.updateTridentThrows(editedItem, difference);
|
||||||
|
updated = true;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
|
||||||
}
|
}
|
||||||
@@ -867,9 +884,12 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
editedItem.setItemMeta(editedItemMeta);
|
|
||||||
player.getInventory().setItemInMainHand(editedItem);
|
if (updated) {
|
||||||
player.sendMessage(Component.text("Updated stat " + stat + " for held item!", NamedTextColor.GREEN));
|
editedItem.setItemMeta(editedItemMeta);
|
||||||
|
player.getInventory().setItemInMainHand(editedItem);
|
||||||
|
player.sendMessage(Component.text("Updated stat " + stat + " for held item!", NamedTextColor.GREEN));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1112,7 +1132,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "fight-caught": {
|
case "fish-caught": {
|
||||||
if (container.has(toolStats.toolStatsKeys.getFishCaught())) {
|
if (container.has(toolStats.toolStatsKeys.getFishCaught())) {
|
||||||
Integer statValue = container.get(toolStats.toolStatsKeys.getFishCaught(), PersistentDataType.INTEGER);
|
Integer statValue = container.get(toolStats.toolStatsKeys.getFishCaught(), PersistentDataType.INTEGER);
|
||||||
if (statValue == null) {
|
if (statValue == null) {
|
||||||
@@ -1125,7 +1145,7 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
container.remove(toolStats.toolStatsKeys.getFishCaught());
|
container.remove(toolStats.toolStatsKeys.getFishCaught());
|
||||||
List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "fight-caught");
|
List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "fish-caught");
|
||||||
if (newTokens.isEmpty()) {
|
if (newTokens.isEmpty()) {
|
||||||
container.remove(toolStats.toolStatsKeys.getTokenApplied());
|
container.remove(toolStats.toolStatsKeys.getTokenApplied());
|
||||||
} else {
|
} else {
|
||||||
@@ -1262,10 +1282,11 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
player.sendMessage(Component.text("Removed stat " + stat + " for held item!", NamedTextColor.GREEN));
|
player.sendMessage(Component.text("Removed stat " + stat + " for held item!", NamedTextColor.GREEN));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String @NotNull [] args) {
|
public @NonNull Collection<String> suggest(@NonNull CommandSourceStack source, String[] args) {
|
||||||
if (args.length == 1) {
|
CommandSender sender = source.getSender();
|
||||||
|
// suggest basic sub commands
|
||||||
|
if (args.length == 0) {
|
||||||
List<String> suggestions = new ArrayList<>();
|
List<String> suggestions = new ArrayList<>();
|
||||||
if (sender.hasPermission("toolstats.reload")) {
|
if (sender.hasPermission("toolstats.reload")) {
|
||||||
suggestions.add("reload");
|
suggestions.add("reload");
|
||||||
@@ -1285,15 +1306,19 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
if (sender.hasPermission("toolstats.purge")) {
|
if (sender.hasPermission("toolstats.purge")) {
|
||||||
suggestions.add("purge");
|
suggestions.add("purge");
|
||||||
}
|
}
|
||||||
return suggestions.isEmpty() ? null : suggestions;
|
return suggestions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// suggest confirm for reset
|
||||||
if (args.length == 2 && args[0].equalsIgnoreCase("reset") && sender.hasPermission("toolstats.reset.confirm")) {
|
if (args.length == 2 && args[0].equalsIgnoreCase("reset") && sender.hasPermission("toolstats.reset.confirm")) {
|
||||||
return Collections.singletonList("confirm");
|
return Collections.singletonList("confirm");
|
||||||
}
|
}
|
||||||
|
// suggest confirm for purge
|
||||||
if (args.length == 2 && args[0].equalsIgnoreCase("purge") && sender.hasPermission("toolstats.purge.confirm")) {
|
if (args.length == 2 && args[0].equalsIgnoreCase("purge") && sender.hasPermission("toolstats.purge.confirm")) {
|
||||||
return Collections.singletonList("confirm");
|
return Collections.singletonList("confirm");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// suggest keys for edit
|
||||||
if (args.length == 2 && args[0].equalsIgnoreCase("edit") && sender.hasPermission("toolstats.edit")) {
|
if (args.length == 2 && args[0].equalsIgnoreCase("edit") && sender.hasPermission("toolstats.edit")) {
|
||||||
// yes I am lazy
|
// yes I am lazy
|
||||||
return toolStats.tokenData.getTokenTypes().stream()
|
return toolStats.tokenData.getTokenTypes().stream()
|
||||||
@@ -1301,6 +1326,8 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
.map(s -> s.equals("crops-mined") ? "crops-harvested" : s)
|
.map(s -> s.equals("crops-mined") ? "crops-harvested" : s)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// suggest keys for remove
|
||||||
if (args.length == 2 && args[0].equalsIgnoreCase("remove") && sender.hasPermission("toolstats.remove")) {
|
if (args.length == 2 && args[0].equalsIgnoreCase("remove") && sender.hasPermission("toolstats.remove")) {
|
||||||
// yes I am lazy
|
// yes I am lazy
|
||||||
return toolStats.tokenData.getTokenTypes().stream()
|
return toolStats.tokenData.getTokenTypes().stream()
|
||||||
@@ -1308,10 +1335,16 @@ public class CommandToolStats implements TabExecutor {
|
|||||||
.map(s -> s.equals("crops-mined") ? "crops-harvested" : s)
|
.map(s -> s.equals("crops-mined") ? "crops-harvested" : s)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// suggest players for givetokens
|
||||||
|
if (args.length == 2 && args[0].equalsIgnoreCase("givetokens") && sender.hasPermission("toolstats.givetokens")) {
|
||||||
|
return Bukkit.getOnlinePlayers().stream().map(Player::getName).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
// suggest token types for givetokens
|
||||||
if (args.length == 3 && args[0].equalsIgnoreCase("givetokens") && sender.hasPermission("toolstats.givetokens")) {
|
if (args.length == 3 && args[0].equalsIgnoreCase("givetokens") && sender.hasPermission("toolstats.givetokens")) {
|
||||||
return toolStats.tokenData.getTokenTypes();
|
return toolStats.tokenData.getTokenTypes();
|
||||||
}
|
}
|
||||||
|
return Collections.emptyList();
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,6 +113,29 @@ public class BlockDispenseEvent implements Listener {
|
|||||||
lore = new ArrayList<>();
|
lore = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// by request
|
||||||
|
if (newItem.getType() == Material.ELYTRA) {
|
||||||
|
if (!toolStats.config.getBoolean("enabled.elytra-tag")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Component creationDate = toolStats.itemLore.formatCreationTime(timeCreated, 4, newItem);
|
||||||
|
if (creationDate != null) {
|
||||||
|
container.set(toolStats.toolStatsKeys.getTimeCreated(), PersistentDataType.LONG, timeCreated);
|
||||||
|
container.set(toolStats.toolStatsKeys.getOriginType(), PersistentDataType.INTEGER, 4);
|
||||||
|
lore.add(creationDate);
|
||||||
|
meta.lore(lore);
|
||||||
|
}
|
||||||
|
|
||||||
|
Component itemOwner = toolStats.itemLore.formatOwner(owner.getName(), 4, newItem);
|
||||||
|
if (itemOwner != null) {
|
||||||
|
container.set(toolStats.toolStatsKeys.getItemOwner(), new UUIDDataType(), owner.getUniqueId());
|
||||||
|
container.set(toolStats.toolStatsKeys.getOriginType(), PersistentDataType.INTEGER, 4);
|
||||||
|
lore.add(itemOwner);
|
||||||
|
meta.lore(lore);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// if creation date is enabled, add it
|
// if creation date is enabled, add it
|
||||||
Component creationDate = toolStats.itemLore.formatCreationTime(timeCreated, 2, newItem);
|
Component creationDate = toolStats.itemLore.formatCreationTime(timeCreated, 2, newItem);
|
||||||
if (creationDate != null) {
|
if (creationDate != null) {
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import org.bukkit.inventory.meta.ItemMeta;
|
|||||||
import org.bukkit.projectiles.ProjectileSource;
|
import org.bukkit.projectiles.ProjectileSource;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
public class EntityDamage implements Listener {
|
public class EntityDamage implements Listener {
|
||||||
|
|
||||||
@@ -76,6 +77,9 @@ public class EntityDamage implements Listener {
|
|||||||
|
|
||||||
if (playerBeingAttacked) {
|
if (playerBeingAttacked) {
|
||||||
Player player = (Player) event.getEntity();
|
Player player = (Player) event.getEntity();
|
||||||
|
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (player.isBlocking()) {
|
if (player.isBlocking()) {
|
||||||
double blockedDamage = -event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING);
|
double blockedDamage = -event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING);
|
||||||
updateShieldDamage(player.getInventory(), blockedDamage);
|
updateShieldDamage(player.getInventory(), blockedDamage);
|
||||||
@@ -85,6 +89,9 @@ public class EntityDamage implements Listener {
|
|||||||
// player attacks something
|
// player attacks something
|
||||||
if (playerAttacking) {
|
if (playerAttacking) {
|
||||||
Player player = (Player) damager;
|
Player player = (Player) damager;
|
||||||
|
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
PlayerInventory playerAttackingInventory = player.getInventory();
|
PlayerInventory playerAttackingInventory = player.getInventory();
|
||||||
// make sure the item the player used is an item we want
|
// make sure the item the player used is an item we want
|
||||||
if (!toolStats.itemChecker.isMeleeWeapon(playerAttackingInventory.getItemInMainHand().getType())) {
|
if (!toolStats.itemChecker.isMeleeWeapon(playerAttackingInventory.getItemInMainHand().getType())) {
|
||||||
@@ -103,15 +110,15 @@ public class EntityDamage implements Listener {
|
|||||||
if (modDied) {
|
if (modDied) {
|
||||||
// player killed another player
|
// player killed another player
|
||||||
if (playerBeingAttacked) {
|
if (playerBeingAttacked) {
|
||||||
updateWeaponKills(playerAttackingInventory, "player");
|
updateWeaponKills(playerAttackingInventory, "player", null);
|
||||||
} else {
|
} else {
|
||||||
// player kills a regular mob
|
// player kills a regular mob
|
||||||
updateWeaponKills(playerAttackingInventory, "mob");
|
updateWeaponKills(playerAttackingInventory, "mob", mobBeingAttacked);
|
||||||
if (mobAttackedType == EntityType.WITHER) {
|
if (mobAttackedType == EntityType.WITHER) {
|
||||||
updateBossesKilled(playerAttackingInventory, "wither");
|
updateBossesKilled(playerAttackingInventory, "wither", mobBeingAttacked);
|
||||||
}
|
}
|
||||||
if (mobAttackedType == EntityType.ENDER_DRAGON) {
|
if (mobAttackedType == EntityType.ENDER_DRAGON) {
|
||||||
updateBossesKilled(playerAttackingInventory, "enderdragon");
|
updateBossesKilled(playerAttackingInventory, "enderdragon", mobBeingAttacked);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -124,6 +131,9 @@ public class EntityDamage implements Listener {
|
|||||||
if (damager instanceof Trident trident) {
|
if (damager instanceof Trident trident) {
|
||||||
ProjectileSource source = trident.getShooter();
|
ProjectileSource source = trident.getShooter();
|
||||||
if (source instanceof Player player) {
|
if (source instanceof Player player) {
|
||||||
|
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
// update the trident's tracked damage
|
// update the trident's tracked damage
|
||||||
updateTridentDamage(trident, finalDamage);
|
updateTridentDamage(trident, finalDamage);
|
||||||
|
|
||||||
@@ -131,15 +141,15 @@ public class EntityDamage implements Listener {
|
|||||||
if (modDied) {
|
if (modDied) {
|
||||||
// if the trident killed a player, update the kills
|
// if the trident killed a player, update the kills
|
||||||
if (playerBeingAttacked) {
|
if (playerBeingAttacked) {
|
||||||
updateTridentKills(trident, "player");
|
updateTridentKills(trident, "player", null);
|
||||||
} else {
|
} else {
|
||||||
// the trident killed a mob, update the kills
|
// the trident killed a mob, update the kills
|
||||||
updateTridentKills(trident, "mob");
|
updateTridentKills(trident, "mob", mobBeingAttacked);
|
||||||
if (mobAttackedType == EntityType.WITHER) {
|
if (mobAttackedType == EntityType.WITHER) {
|
||||||
updateBossesKilled(player.getInventory(), "wither");
|
updateBossesKilled(player.getInventory(), "wither", mobBeingAttacked);
|
||||||
}
|
}
|
||||||
if (mobAttackedType == EntityType.ENDER_DRAGON) {
|
if (mobAttackedType == EntityType.ENDER_DRAGON) {
|
||||||
updateBossesKilled(player.getInventory(), "enderdragon");
|
updateBossesKilled(player.getInventory(), "enderdragon", mobBeingAttacked);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -155,6 +165,9 @@ public class EntityDamage implements Listener {
|
|||||||
|
|
||||||
// a player shot the arrow
|
// a player shot the arrow
|
||||||
if (source instanceof Player shootingPlayer) {
|
if (source instanceof Player shootingPlayer) {
|
||||||
|
if (shootingPlayer.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
// update the player's bow damage
|
// update the player's bow damage
|
||||||
updateBowDamage(shootingPlayer.getInventory(), finalDamage);
|
updateBowDamage(shootingPlayer.getInventory(), finalDamage);
|
||||||
|
|
||||||
@@ -162,15 +175,15 @@ public class EntityDamage implements Listener {
|
|||||||
if (modDied) {
|
if (modDied) {
|
||||||
if (playerBeingAttacked) {
|
if (playerBeingAttacked) {
|
||||||
// player killed another player with an arrow
|
// player killed another player with an arrow
|
||||||
updateBowKills(shootingPlayer.getInventory(), "player");
|
updateBowKills(shootingPlayer.getInventory(), "player", null);
|
||||||
} else {
|
} else {
|
||||||
// player killed mob with an arrow
|
// player killed mob with an arrow
|
||||||
updateBowKills(shootingPlayer.getInventory(), "mob");
|
updateBowKills(shootingPlayer.getInventory(), "mob", mobBeingAttacked);
|
||||||
if (mobAttackedType == EntityType.WITHER) {
|
if (mobAttackedType == EntityType.WITHER) {
|
||||||
updateBossesKilledByBow(shootingPlayer.getInventory(), "wither");
|
updateBossesKilledByBow(shootingPlayer.getInventory(), "wither", mobBeingAttacked);
|
||||||
}
|
}
|
||||||
if (mobAttackedType == EntityType.ENDER_DRAGON) {
|
if (mobAttackedType == EntityType.ENDER_DRAGON) {
|
||||||
updateBossesKilledByBow(shootingPlayer.getInventory(), "enderdragon");
|
updateBossesKilledByBow(shootingPlayer.getInventory(), "enderdragon", mobBeingAttacked);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -240,7 +253,7 @@ public class EntityDamage implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateBowKills(PlayerInventory playerInventory, String type) {
|
private void updateBowKills(PlayerInventory playerInventory, String type, LivingEntity entity) {
|
||||||
ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
|
ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
|
||||||
if (heldBow == null) {
|
if (heldBow == null) {
|
||||||
return;
|
return;
|
||||||
@@ -251,7 +264,12 @@ public class EntityDamage implements Listener {
|
|||||||
|
|
||||||
if (type.equalsIgnoreCase("mob")) {
|
if (type.equalsIgnoreCase("mob")) {
|
||||||
// player is shooting a mob
|
// player is shooting a mob
|
||||||
ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
|
ItemMeta newBow;
|
||||||
|
int count = 1;
|
||||||
|
if (toolStats.roseStacker != null) {
|
||||||
|
count = toolStats.roseStacker.countMobs(entity);
|
||||||
|
}
|
||||||
|
newBow = toolStats.itemLore.updateMobKills(heldBow, count);
|
||||||
if (newBow != null) {
|
if (newBow != null) {
|
||||||
if (isMain && isOffHand) {
|
if (isMain && isOffHand) {
|
||||||
playerInventory.getItemInMainHand().setItemMeta(newBow);
|
playerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||||
@@ -277,16 +295,20 @@ public class EntityDamage implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateTridentKills(Trident trident, String type) {
|
private void updateTridentKills(Trident trident, String type, LivingEntity entity) {
|
||||||
ItemStack newTrident = trident.getItemStack();
|
ItemStack newTrident = trident.getItemStack();
|
||||||
ItemMeta newKills;
|
ItemMeta newTridentMeta;
|
||||||
if (type.equalsIgnoreCase("player")) {
|
if (type.equalsIgnoreCase("player")) {
|
||||||
newKills = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1);
|
newTridentMeta = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1);
|
||||||
} else {
|
} else {
|
||||||
newKills = toolStats.itemLore.updateMobKills(trident.getItemStack(), 1);
|
int count = 1;
|
||||||
|
if (toolStats.roseStacker != null) {
|
||||||
|
count = toolStats.roseStacker.countMobs(entity);
|
||||||
|
}
|
||||||
|
newTridentMeta = toolStats.itemLore.updateMobKills(newTrident, count);
|
||||||
}
|
}
|
||||||
if (newKills != null) {
|
if (newTridentMeta != null) {
|
||||||
newTrident.setItemMeta(newKills);
|
newTrident.setItemMeta(newTridentMeta);
|
||||||
trident.setItemStack(newTrident);
|
trident.setItemStack(newTrident);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -308,29 +330,37 @@ public class EntityDamage implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateWeaponKills(PlayerInventory playerInventory, String type) {
|
private void updateWeaponKills(PlayerInventory playerInventory, String type, LivingEntity entity) {
|
||||||
ItemStack heldWeapon = playerInventory.getItemInMainHand();
|
ItemStack heldWeapon = playerInventory.getItemInMainHand();
|
||||||
ItemMeta newHeldWeaponMeta = null;
|
ItemMeta newHeldWeaponMeta = null;
|
||||||
if (type.equalsIgnoreCase("player")) {
|
if (type.equalsIgnoreCase("player")) {
|
||||||
newHeldWeaponMeta = toolStats.itemLore.updatePlayerKills(heldWeapon, 1);
|
newHeldWeaponMeta = toolStats.itemLore.updatePlayerKills(heldWeapon, 1);
|
||||||
}
|
}
|
||||||
if (type.equalsIgnoreCase("mob")) {
|
if (type.equalsIgnoreCase("mob")) {
|
||||||
newHeldWeaponMeta = toolStats.itemLore.updateMobKills(heldWeapon, 1);
|
int count = 1;
|
||||||
|
if (toolStats.roseStacker != null) {
|
||||||
|
count = toolStats.roseStacker.countMobs(entity);
|
||||||
|
}
|
||||||
|
newHeldWeaponMeta = toolStats.itemLore.updateMobKills(heldWeapon, count);
|
||||||
}
|
}
|
||||||
if (newHeldWeaponMeta != null) {
|
if (newHeldWeaponMeta != null) {
|
||||||
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateBossesKilled(PlayerInventory playerInventory, String boss) {
|
private void updateBossesKilled(PlayerInventory playerInventory, String boss, LivingEntity entity) {
|
||||||
ItemStack heldWeapon = playerInventory.getItemInMainHand();
|
ItemStack heldWeapon = playerInventory.getItemInMainHand();
|
||||||
ItemMeta newHeldWeaponMeta = toolStats.itemLore.updateBossesKilled(heldWeapon, 1, boss);
|
int count = 1;
|
||||||
|
if (toolStats.roseStacker != null) {
|
||||||
|
count = toolStats.roseStacker.countMobs(entity);
|
||||||
|
}
|
||||||
|
ItemMeta newHeldWeaponMeta = toolStats.itemLore.updateBossesKilled(heldWeapon, count, boss);
|
||||||
if (newHeldWeaponMeta != null) {
|
if (newHeldWeaponMeta != null) {
|
||||||
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateBossesKilledByBow(PlayerInventory playerInventory, String boss) {
|
private void updateBossesKilledByBow(PlayerInventory playerInventory, String boss, LivingEntity entity) {
|
||||||
ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
|
ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
|
||||||
if (heldBow == null) {
|
if (heldBow == null) {
|
||||||
return;
|
return;
|
||||||
@@ -339,7 +369,12 @@ public class EntityDamage implements Listener {
|
|||||||
boolean isMain = playerInventory.getItemInMainHand().getType() == Material.BOW || playerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
|
boolean isMain = playerInventory.getItemInMainHand().getType() == Material.BOW || playerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
|
||||||
boolean isOffHand = playerInventory.getItemInOffHand().getType() == Material.BOW || playerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
|
boolean isOffHand = playerInventory.getItemInOffHand().getType() == Material.BOW || playerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
|
||||||
|
|
||||||
ItemMeta newHeldWeaponMeta = toolStats.itemLore.updateBossesKilled(heldBow, 1, boss);
|
int count = 1;
|
||||||
|
if (toolStats.roseStacker != null) {
|
||||||
|
count = toolStats.roseStacker.countMobs(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemMeta newHeldWeaponMeta = toolStats.itemLore.updateBossesKilled(heldBow, count, boss);
|
||||||
if (newHeldWeaponMeta != null) {
|
if (newHeldWeaponMeta != null) {
|
||||||
if (isMain && isOffHand) {
|
if (isMain && isOffHand) {
|
||||||
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
||||||
|
|||||||
@@ -19,12 +19,14 @@ package lol.hyper.toolstats.events;
|
|||||||
|
|
||||||
import lol.hyper.hyperlib.datatypes.UUIDDataType;
|
import lol.hyper.hyperlib.datatypes.UUIDDataType;
|
||||||
import lol.hyper.toolstats.ToolStats;
|
import lol.hyper.toolstats.ToolStats;
|
||||||
|
import org.bukkit.block.DoubleChest;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.inventory.InventoryOpenEvent;
|
import org.bukkit.event.inventory.InventoryOpenEvent;
|
||||||
import org.bukkit.event.inventory.InventoryType;
|
import org.bukkit.inventory.BlockInventoryHolder;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
|
import org.bukkit.inventory.InventoryHolder;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.bukkit.persistence.PersistentDataContainer;
|
import org.bukkit.persistence.PersistentDataContainer;
|
||||||
@@ -47,6 +49,13 @@ public class InventoryOpen implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Inventory inventory = event.getInventory();
|
Inventory inventory = event.getInventory();
|
||||||
|
InventoryHolder holder = inventory.getHolder();
|
||||||
|
boolean isBlockInventory = holder instanceof BlockInventoryHolder || holder instanceof DoubleChest;
|
||||||
|
if (!(inventory.getHolder() instanceof BlockInventoryHolder)) {
|
||||||
|
// ignore not real inventories
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Player player = (Player) event.getPlayer();
|
Player player = (Player) event.getPlayer();
|
||||||
if (!toolStats.configTools.checkWorld(player.getWorld().getName())) {
|
if (!toolStats.configTools.checkWorld(player.getWorld().getName())) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -62,6 +62,11 @@ public class SheepShear implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// make sure they are not a baby
|
||||||
|
if (!sheep.isAdult()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// make sure the sheep is not sheared
|
// make sure the sheep is not sheared
|
||||||
if (sheep.isSheared()) {
|
if (sheep.isSheared()) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ToolStats.
|
||||||
|
*
|
||||||
|
* ToolStats is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* ToolStats is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of ToolStats.
|
||||||
|
*
|
||||||
|
* ToolStats is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* ToolStats is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lol.hyper.toolstats.support.rosestacker;
|
||||||
|
|
||||||
|
import dev.rosewood.rosestacker.api.RoseStackerAPI;
|
||||||
|
import dev.rosewood.rosestacker.stack.StackedEntity;
|
||||||
|
import org.bukkit.entity.LivingEntity;
|
||||||
|
|
||||||
|
public class RoseStacker {
|
||||||
|
|
||||||
|
private final RoseStackerAPI rsAPI;
|
||||||
|
|
||||||
|
public RoseStacker() {
|
||||||
|
this.rsAPI = RoseStackerAPI.getInstance();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int countMobs(LivingEntity entity) {
|
||||||
|
if (!rsAPI.isEntityStacked(entity)) {
|
||||||
|
// if the entity is not stacked, ignore
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
StackedEntity stackedEntity = rsAPI.getStackedEntity(entity);
|
||||||
|
if (stackedEntity == null) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean killAll = stackedEntity.getStackSettings().shouldKillEntireStackOnDeath();
|
||||||
|
// if we kill the entire stack, add the entire stack to the count
|
||||||
|
if (killAll) {
|
||||||
|
return stackedEntity.getStackSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1410,7 +1410,6 @@ public class ItemLore {
|
|||||||
}
|
}
|
||||||
List<Component> newLore = updateItemLore(meta, oldLine, newLine);
|
List<Component> newLore = updateItemLore(meta, oldLine, newLine);
|
||||||
meta.lore(newLore);
|
meta.lore(newLore);
|
||||||
toolStats.logger.info(meta.toString());
|
|
||||||
return meta;
|
return meta;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class ConfigTools {
|
|||||||
String itemName = material.toString().toLowerCase();
|
String itemName = material.toString().toLowerCase();
|
||||||
String itemType = null;
|
String itemType = null;
|
||||||
// hardcode these
|
// hardcode these
|
||||||
if (material == Material.BOW || material == Material.CROSSBOW || material == Material.SHEARS || material == Material.TRIDENT || material == Material.FISHING_ROD) {
|
if (material == Material.BOW || material == Material.CROSSBOW || material == Material.SHEARS || material == Material.TRIDENT || material == Material.FISHING_ROD || material == Material.SHIELD) {
|
||||||
switch (material) {
|
switch (material) {
|
||||||
case CROSSBOW:
|
case CROSSBOW:
|
||||||
case BOW: {
|
case BOW: {
|
||||||
@@ -72,6 +72,10 @@ public class ConfigTools {
|
|||||||
itemType = "fishing-rod";
|
itemType = "fishing-rod";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case SHIELD: {
|
||||||
|
itemType = "shield";
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemType = itemName.substring(itemName.indexOf('_') + 1);
|
itemType = itemName.substring(itemName.indexOf('_') + 1);
|
||||||
@@ -88,6 +92,7 @@ public class ConfigTools {
|
|||||||
case "fishing-rod" -> toolStats.config.getBoolean("enabled." + configName + ".fishing-rod");
|
case "fishing-rod" -> toolStats.config.getBoolean("enabled." + configName + ".fishing-rod");
|
||||||
case "mace" -> toolStats.config.getBoolean("enabled." + configName + ".mace");
|
case "mace" -> toolStats.config.getBoolean("enabled." + configName + ".mace");
|
||||||
case "spear" -> toolStats.config.getBoolean("enabled." + configName + ".spear");
|
case "spear" -> toolStats.config.getBoolean("enabled." + configName + ".spear");
|
||||||
|
case "shield" -> toolStats.config.getBoolean("enabled." + configName + ".shield");
|
||||||
case "helmet", "chestplate", "leggings", "boots" ->
|
case "helmet", "chestplate", "leggings", "boots" ->
|
||||||
toolStats.config.getBoolean("enabled." + configName + ".armor");
|
toolStats.config.getBoolean("enabled." + configName + ".armor");
|
||||||
default -> false;
|
default -> false;
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class ConfigUpdater {
|
|||||||
case 12 -> new Version13(toolStats).update(); // 12 to 13
|
case 12 -> new Version13(toolStats).update(); // 12 to 13
|
||||||
case 13 -> new Version14(toolStats).update(); // 13 to 14
|
case 13 -> new Version14(toolStats).update(); // 13 to 14
|
||||||
case 14 -> new Version15(toolStats).update(); // 14 to 15
|
case 14 -> new Version15(toolStats).update(); // 14 to 15
|
||||||
|
case 15 -> new Version16(toolStats).update(); // 15 to 16
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ToolStats.
|
||||||
|
*
|
||||||
|
* ToolStats is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* ToolStats is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lol.hyper.toolstats.tools.config.versions;
|
||||||
|
|
||||||
|
import lol.hyper.toolstats.ToolStats;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class Version16 {
|
||||||
|
|
||||||
|
private final ToolStats toolStats;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used for updating from version 15 to 16.
|
||||||
|
*
|
||||||
|
* @param toolStats ToolStats instance.
|
||||||
|
*/
|
||||||
|
public Version16(ToolStats toolStats) {
|
||||||
|
this.toolStats = toolStats;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform the config update.
|
||||||
|
*/
|
||||||
|
public void update() {
|
||||||
|
// save the old config first
|
||||||
|
try {
|
||||||
|
toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-15.yml");
|
||||||
|
} catch (IOException exception) {
|
||||||
|
toolStats.logger.error("Unable to save config-15.yml!", exception);
|
||||||
|
}
|
||||||
|
|
||||||
|
// we make this super verbose so that admins can see what's being added
|
||||||
|
toolStats.logger.info("Updating config.yml to version 16.");
|
||||||
|
toolStats.config.set("config-version", 16);
|
||||||
|
|
||||||
|
toolStats.logger.info("Adding enabled.crafted-on.shield to config.yml.");
|
||||||
|
toolStats.config.set("enabled.crafted-on.shield", true);
|
||||||
|
toolStats.logger.info("Adding enabled.crafted-by.shield to config.yml.");
|
||||||
|
toolStats.config.set("enabled.crafted-by.shield", true);
|
||||||
|
|
||||||
|
toolStats.logger.info("Adding enabled.traded-on.shield to config.yml.");
|
||||||
|
toolStats.config.set("enabled.traded-on.shield", true);
|
||||||
|
toolStats.logger.info("Adding enabled.traded-by.shield to config.yml.");
|
||||||
|
toolStats.config.set("enabled.traded-by.shield", true);
|
||||||
|
|
||||||
|
toolStats.logger.info("Adding enabled.looted-on.shield to config.yml.");
|
||||||
|
toolStats.config.set("enabled.looted-on.shield", true);
|
||||||
|
toolStats.logger.info("Adding enabled.looted-by.shield to config.yml.");
|
||||||
|
toolStats.config.set("enabled.looted-by.shield", true);
|
||||||
|
|
||||||
|
// save the config and reload it
|
||||||
|
try {
|
||||||
|
toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
|
||||||
|
} catch (IOException exception) {
|
||||||
|
toolStats.logger.error("Unable to save config.yml!", exception);
|
||||||
|
}
|
||||||
|
toolStats.loadConfig();
|
||||||
|
toolStats.logger.info("Config has been updated to version 16. A copy of version 6 has been saved as config-15.yml");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -195,6 +195,7 @@ enabled:
|
|||||||
mace: true
|
mace: true
|
||||||
fishing-rod: true
|
fishing-rod: true
|
||||||
spear: true
|
spear: true
|
||||||
|
shield: true
|
||||||
# Will show "Crafted on <date>"
|
# Will show "Crafted on <date>"
|
||||||
crafted-on:
|
crafted-on:
|
||||||
pickaxe: true
|
pickaxe: true
|
||||||
@@ -208,6 +209,7 @@ enabled:
|
|||||||
mace: true
|
mace: true
|
||||||
fishing-rod: true
|
fishing-rod: true
|
||||||
spear: true
|
spear: true
|
||||||
|
shield: true
|
||||||
# Will show "Fished by <player>"
|
# Will show "Fished by <player>"
|
||||||
fished-by:
|
fished-by:
|
||||||
pickaxe: true
|
pickaxe: true
|
||||||
@@ -242,6 +244,7 @@ enabled:
|
|||||||
armor: true
|
armor: true
|
||||||
fishing-rod: true
|
fishing-rod: true
|
||||||
spear: true
|
spear: true
|
||||||
|
shield: true
|
||||||
# Will show "Found on <date>"
|
# Will show "Found on <date>"
|
||||||
looted-on:
|
looted-on:
|
||||||
pickaxe: true
|
pickaxe: true
|
||||||
@@ -254,6 +257,7 @@ enabled:
|
|||||||
armor: true
|
armor: true
|
||||||
fishing-rod: true
|
fishing-rod: true
|
||||||
spear: true
|
spear: true
|
||||||
|
shield: true
|
||||||
# Will show "Traded by <player>"
|
# Will show "Traded by <player>"
|
||||||
traded-by:
|
traded-by:
|
||||||
pickaxe: true
|
pickaxe: true
|
||||||
@@ -265,6 +269,7 @@ enabled:
|
|||||||
bow: true
|
bow: true
|
||||||
armor: true
|
armor: true
|
||||||
fishing-rod: true
|
fishing-rod: true
|
||||||
|
shield: true
|
||||||
# Will show "Traded on <date>"
|
# Will show "Traded on <date>"
|
||||||
traded-on:
|
traded-on:
|
||||||
pickaxe: true
|
pickaxe: true
|
||||||
@@ -276,6 +281,7 @@ enabled:
|
|||||||
bow: true
|
bow: true
|
||||||
armor: true
|
armor: true
|
||||||
fishing-rod: true
|
fishing-rod: true
|
||||||
|
shield: true
|
||||||
damage-done:
|
damage-done:
|
||||||
sword: true
|
sword: true
|
||||||
axe: true
|
axe: true
|
||||||
|
|||||||
@@ -1,34 +1,26 @@
|
|||||||
name: ToolStats
|
name: ToolStats
|
||||||
version: '${project.version}'
|
version: ${project.version}
|
||||||
main: lol.hyper.toolstats.ToolStats
|
main: lol.hyper.toolstats.ToolStats
|
||||||
api-version: 1.21
|
api-version: 1.21
|
||||||
|
folia-supported: true
|
||||||
author: hyperdefined
|
author: hyperdefined
|
||||||
description: Track various tool stats!
|
description: Track various tool stats!
|
||||||
website: https://github.com/hyperdefined/ToolStats
|
website: https://github.com/hyperdefined/ToolStats
|
||||||
folia-supported: true
|
|
||||||
commands:
|
loader: lol.hyper.toolstats.ToolStatsLoader
|
||||||
toolstats:
|
|
||||||
usage: /toolstats
|
|
||||||
permission: toolstats.command
|
|
||||||
permissions:
|
permissions:
|
||||||
toolstats.command:
|
toolstats.command:
|
||||||
description: Allows the usage of /toolstats.
|
description: Allows the usage of /toolstats.
|
||||||
default: true
|
default: true
|
||||||
|
children:
|
||||||
|
toolstats.reset: true
|
||||||
|
toolstats.reset.confirm: true
|
||||||
|
toolstats.purge: true
|
||||||
|
toolstats.purge.confirm: true
|
||||||
toolstats.reload:
|
toolstats.reload:
|
||||||
description: Allows the usage of /toolstats reload.
|
description: Allows the usage of /toolstats reload.
|
||||||
default: op
|
default: op
|
||||||
toolstats.reset:
|
|
||||||
description: Allows the usage of /toolstats reset.
|
|
||||||
default: true
|
|
||||||
toolstats.reset.confirm:
|
|
||||||
description: Allows the usage of /toolstats reset confirm.
|
|
||||||
default: true
|
|
||||||
toolstats.purge:
|
|
||||||
description: Allows the usage of /toolstats purge.
|
|
||||||
default: true
|
|
||||||
toolstats.purge.confirm:
|
|
||||||
description: Allows the usage of /toolstats purge confirm.
|
|
||||||
default: true
|
|
||||||
toolstats.givetokens:
|
toolstats.givetokens:
|
||||||
description: Allows the usage of /toolstats givetoken.
|
description: Allows the usage of /toolstats givetoken.
|
||||||
default: op
|
default: op
|
||||||
@@ -37,4 +29,10 @@ permissions:
|
|||||||
default: op
|
default: op
|
||||||
toolstats.remove:
|
toolstats.remove:
|
||||||
description: Allows the usage of /toolstats remove.
|
description: Allows the usage of /toolstats remove.
|
||||||
default: op
|
default: op
|
||||||
|
|
||||||
|
dependencies:
|
||||||
|
server:
|
||||||
|
RoseStacker:
|
||||||
|
load: BEFORE
|
||||||
|
required: false
|
||||||
Reference in New Issue
Block a user