> 4.18.3

- Optimized imports - Changed Eco integration - now supports loading of eco items in CustomCrafting without throwing errors Signed-off-by: petulikan1 <[email protected]>
AureusDevelopment · Feb 2, 2025 · 66619a3 · 66619a3
1 parent ec2e97f
commit 66619a3
Show file tree

Hide file tree

Showing 127 changed files with 233 additions and 518 deletions.
diff --git a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts
@@ -19,6 +19,7 @@ repositories {
     maven(url = "https://repo.extendedclip.com/content/repositories/placeholderapi/")
     maven(url = "https://libraries.minecraft.net/")
     maven(url="https://mvn.lumine.io/repository/maven-public/")
+    maven(url="https://maven.devs.beer/")
 
     maven("https://repo.auxilor.io/repository/maven-public/")
 }

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     compileOnly(group = "com.sk89q.worldguard", name = "worldguard-bukkit", version = "7.1.0-SNAPSHOT")
     compileOnly(group = "com.plotsquared", name = "PlotSquared-Core", version = "6.4.0")
     compileOnly(group = "com.plotsquared", name = "PlotSquared-Bukkit", version = "6.4.0")
-    compileOnly(group = "com.gmail.nossr50.mcMMO", name = "mcMMO", version = "2.1.139-SNAPSHOT")
+    compileOnly(group = "com.gmail.nossr50.mcMMO", name = "mcMMO", version = "2.2.030")
     compileOnly(libs.guice)
     compileOnly(libs.reflections)
     compileOnly(libs.javassist)

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/WolfyUtilsBukkit.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/WolfyUtilsBukkit.java
@@ -1,13 +1,13 @@
 package com.wolfyscript.utilities.bukkit;
 
+import com.wolfyscript.utilities.bukkit.chat.ChatImpl;
+import com.wolfyscript.utilities.bukkit.language.LangAPISpigot;
 import com.wolfyscript.utilities.common.WolfyCore;
 import com.wolfyscript.utilities.common.WolfyUtils;
 import com.wolfyscript.utilities.common.chat.Chat;
-import com.wolfyscript.utilities.bukkit.language.LangAPISpigot;
 import me.wolfyscript.utilities.api.Permissions;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.WolfyUtilities;
-import com.wolfyscript.utilities.bukkit.chat.ChatImpl;
 import me.wolfyscript.utilities.api.config.ConfigAPI;
 import me.wolfyscript.utilities.api.console.Console;
 import me.wolfyscript.utilities.api.inventory.BookUtil;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/chat/ChatImpl.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/chat/ChatImpl.java
@@ -1,7 +1,7 @@
 package com.wolfyscript.utilities.bukkit.chat;
 
-import com.wolfyscript.utilities.common.WolfyUtils;
 import com.wolfyscript.utilities.bukkit.adapters.PlayerImpl;
+import com.wolfyscript.utilities.common.WolfyUtils;
 import me.wolfyscript.utilities.api.chat.ChatImplOld;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/ChatActionCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/ChatActionCommand.java
@@ -1,7 +1,6 @@
 package com.wolfyscript.utilities.bukkit.commands;
 
 import com.wolfyscript.utilities.bukkit.chat.ChatImpl;
-import java.util.UUID;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.chat.PlayerAction;
 import org.bukkit.command.Command;
@@ -11,6 +10,8 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.UUID;
+
 public class ChatActionCommand extends Command implements PluginIdentifiableCommand {
 
     private final WolfyUtilCore core;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InfoCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InfoCommand.java
@@ -18,7 +18,6 @@
 
 package com.wolfyscript.utilities.bukkit.commands;
 
-import java.util.List;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.chat.Chat;
 import me.wolfyscript.utilities.util.version.ServerVersion;
@@ -31,7 +30,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class InfoCommand extends Command implements PluginIdentifiableCommand {
 

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InputCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InputCommand.java
@@ -1,7 +1,5 @@
 package com.wolfyscript.utilities.bukkit.commands;
 
-import java.util.List;
-import java.util.Objects;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.WolfyUtilities;
 import me.wolfyscript.utilities.api.inventory.gui.GuiHandler;
@@ -13,6 +11,9 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+import java.util.Objects;
+
 public final class InputCommand extends Command implements PluginIdentifiableCommand {
 
     private final WolfyUtilCore core;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java
@@ -3,7 +3,6 @@
 import com.wolfyscript.utilities.bukkit.nbt.NBTQuery;
 import de.tr7zw.nbtapi.NBTCompound;
 import de.tr7zw.nbtapi.NBTItem;
-import java.io.File;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.util.inventory.ItemUtils;
 import org.bukkit.command.Command;
@@ -15,6 +14,8 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+
 public final class QueryDebugCommand extends Command implements PluginIdentifiableCommand {
 
     private final WolfyUtilCore core;
@@ -43,7 +44,7 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab
                     NBTItem nbtItem = new NBTItem(stack);
                     NBTCompound result = nbtQuery.run(nbtItem);
 
-                    System.out.println(result.toString());
+                    /*System.out.println(result.toString());*/
                     if (args.length > 0) {
                         if (args[0].equalsIgnoreCase("true")) {
                             ItemStack stackToMergeIn = player.getEquipment().getItem(EquipmentSlot.OFF_HAND);

diff --git a/...rc/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleAnimationCommand.java b/...rc/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleAnimationCommand.java
@@ -1,10 +1,5 @@
 package com.wolfyscript.utilities.bukkit.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.chat.Chat;
 import me.wolfyscript.utilities.util.NamespacedKey;
@@ -29,6 +24,8 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.*;
+
 public final class SpawnParticleAnimationCommand extends Command implements PluginIdentifiableCommand {
 
     private final List<String> COMMANDS = Arrays.asList("spawn", "stop");

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleEffectCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleEffectCommand.java
@@ -1,9 +1,5 @@
 package com.wolfyscript.utilities.bukkit.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.chat.Chat;
 import me.wolfyscript.utilities.util.NamespacedKey;
@@ -19,6 +15,11 @@
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public final class SpawnParticleEffectCommand extends Command implements PluginIdentifiableCommand {
 
     private final List<String> COMMANDS = Arrays.asList("spawn", "stop");

diff --git a/.../wolfyscript/utilities/bukkit/dependency/PluginIntegrationDependencyResolverSettings.java b/.../wolfyscript/utilities/bukkit/dependency/PluginIntegrationDependencyResolverSettings.java
@@ -1,9 +1,11 @@
 package com.wolfyscript.utilities.bukkit.dependency;
 
-import com.wolfyscript.utilities.dependency.DependencyResolverSettings;
 import me.wolfyscript.utilities.compatibility.PluginIntegration;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

diff --git a/.../main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageBreakEvent.java b/.../main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageBreakEvent.java
@@ -6,7 +6,6 @@
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.block.BlockBreakEvent;
 import org.jetbrains.annotations.NotNull;
 
 public class BlockStorageBreakEvent extends Event implements BlockStorageEvent, Cancellable {

diff --git a/...n/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageDropItemsEvent.java b/...n/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageDropItemsEvent.java
@@ -1,8 +1,6 @@
 package com.wolfyscript.utilities.bukkit.events.persistent;
 
 import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage;
-import java.util.List;
-import java.util.Optional;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Item;
@@ -13,6 +11,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.Optional;
+
 public class BlockStorageDropItemsEvent extends Event implements BlockStorageEvent, Cancellable {
 
     private static final HandlerList handlers = new HandlerList();

diff --git a/...c/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMoveEvent.java b/...c/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMoveEvent.java
@@ -1,12 +1,13 @@
 package com.wolfyscript.utilities.bukkit.events.persistent;
 
 import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage;
-import java.util.Optional;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
+
 public class BlockStorageMoveEvent extends Event implements BlockStorageEvent {
 
     private static final HandlerList handlers = new HandlerList();

diff --git a/.../java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMultiPlaceEvent.java b/.../java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMultiPlaceEvent.java
@@ -2,15 +2,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage;
-import java.util.List;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockMultiPlaceEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 public class BlockStorageMultiPlaceEvent extends BlockStoragePlaceEvent implements BlockStorageEvent {
 
     private final List<BlockState> states;

diff --git a/.../main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStoragePlaceEvent.java b/.../main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStoragePlaceEvent.java
@@ -7,7 +7,6 @@
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/gui/GUIInventoryHolder.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/gui/GUIInventoryHolder.java
@@ -1,6 +1,5 @@
 package com.wolfyscript.utilities.bukkit.gui;
 
-import com.google.common.base.Preconditions;
 import me.wolfyscript.utilities.api.inventory.gui.GuiHandler;
 import me.wolfyscript.utilities.api.inventory.gui.GuiWindow;
 import me.wolfyscript.utilities.api.inventory.gui.cache.CustomCache;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomBlockSettings.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomBlockSettings.java
@@ -1,6 +1,7 @@
 package com.wolfyscript.utilities.bukkit.items;
 
 import com.wolfyscript.utilities.Copyable;
+
 import java.util.Objects;
 
 public class CustomBlockSettings implements Copyable<CustomBlockSettings> {

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomItemBlockData.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomItemBlockData.java
@@ -9,20 +9,19 @@
 import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage;
 import com.wolfyscript.utilities.bukkit.persistent.world.ChunkStorage;
 import com.wolfyscript.utilities.bukkit.persistent.world.CustomBlockData;
-import java.util.Optional;
-import java.util.UUID;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem;
 import me.wolfyscript.utilities.util.NamespacedKey;
 import me.wolfyscript.utilities.util.events.CustomItemBreakEvent;
 import me.wolfyscript.utilities.util.particles.ParticleLocation;
 import me.wolfyscript.utilities.util.particles.ParticleUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
+import java.util.UUID;
+
 public class CustomItemBlockData extends CustomBlockData {
 
     public static final NamespacedKey ID = new NamespacedKey(NamespacedKey.WOLFYUTILITIES, "custom_item");

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/language/LangAPISpigot.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/language/LangAPISpigot.java
@@ -8,17 +8,12 @@
 import me.wolfyscript.utilities.api.language.LanguageAPI;
 import me.wolfyscript.utilities.util.NamespacedKey;
 import me.wolfyscript.utilities.util.chat.ChatColor;
-import me.wolfyscript.utilities.util.json.jackson.JacksonUtil;
 import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/PersistentStorageListener.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/PersistentStorageListener.java
@@ -27,10 +27,12 @@
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
 import org.bukkit.event.world.WorldSaveEvent;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
 
 public class PersistentStorageListener implements Listener {
 

diff --git a/...n/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemDataListener.java b/...n/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemDataListener.java
@@ -1,7 +1,7 @@
 package com.wolfyscript.utilities.bukkit.listeners.custom_item;
 
-import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageDropItemsEvent;
 import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageBreakEvent;
+import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageDropItemsEvent;
 import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageMultiPlaceEvent;
 import com.wolfyscript.utilities.bukkit.events.persistent.BlockStoragePlaceEvent;
 import com.wolfyscript.utilities.bukkit.items.CustomItemBlockData;

diff --git a/...java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemPlayerListener.java b/...java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemPlayerListener.java
@@ -20,29 +20,12 @@
 
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerConsumeItem;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteract;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractAtEntity;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractEntity;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemBreak;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemDamage;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemDrop;
-import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemHandSwap;
+import me.wolfyscript.utilities.api.inventory.custom_items.actions.*;
 import me.wolfyscript.utilities.registry.RegistryCustomItem;
 import me.wolfyscript.utilities.util.NamespacedKey;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.player.PlayerInteractAtEntityEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemBreakEvent;
-import org.bukkit.event.player.PlayerItemConsumeEvent;
-import org.bukkit.event.player.PlayerItemDamageEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+import org.bukkit.event.player.*;
 
 public class CustomItemPlayerListener implements Listener {
 

diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java
@@ -22,23 +22,18 @@
 
 package com.wolfyscript.utilities.bukkit.nbt;
 
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import de.tr7zw.nbtapi.NBTCompound;
-import de.tr7zw.nbtapi.NBTList;
-import de.tr7zw.nbtapi.NBTType;
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
 import com.fasterxml.jackson.databind.annotation.JsonTypeResolver;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import de.tr7zw.nbtapi.NBTCompound;
+import de.tr7zw.nbtapi.NBTList;
+import de.tr7zw.nbtapi.NBTType;
 import me.wolfyscript.utilities.api.WolfyUtilCore;
 import me.wolfyscript.utilities.util.Keyed;
 import me.wolfyscript.utilities.util.NamespacedKey;