revert file manager change in vital 2.7.4

Crazy-Crew · Aug 22, 2024 · a762754 · a762754
1 parent 50aa819
commit a762754
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 47 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ triumph-cmd = "2.0.0-ALPHA-10"
 tirumph-gui = "3.1.7"
 jetbrains = "24.1.0"
 kyori = "4.17.0"
-vital = "2.7"
+vital = "2.7.4"
 
 # Paper
 paperweight = "1.7.2"

diff --git a/src/main/java/com/badbones69/crazycrates/api/builders/CrateBuilder.java b/src/main/java/com/badbones69/crazycrates/api/builders/CrateBuilder.java
@@ -15,8 +15,8 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import com.badbones69.crazycrates.CrazyCrates;

diff --git a/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateMainMenu.java b/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateMainMenu.java
@@ -22,8 +22,8 @@
 import com.badbones69.crazycrates.config.ConfigManager;
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
 import com.badbones69.crazycrates.api.builders.InventoryBuilder;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import java.text.NumberFormat;
 import java.util.List;

diff --git a/src/main/java/com/badbones69/crazycrates/api/enums/Files.java b/src/main/java/com/badbones69/crazycrates/api/enums/Files.java
@@ -1,9 +1,9 @@
 package com.badbones69.crazycrates.api.enums;
 
 import com.badbones69.crazycrates.CrazyCrates;
-import com.ryderbelserion.vital.common.managers.files.FileManager;
+import com.ryderbelserion.vital.paper.api.files.FileManager;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import java.io.File;
 
 public enum Files {

diff --git a/src/main/java/com/badbones69/crazycrates/api/events/CrateOpenEvent.java b/src/main/java/com/badbones69/crazycrates/api/events/CrateOpenEvent.java
@@ -6,7 +6,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 
 public class CrateOpenEvent extends Event implements Cancellable {

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/Crate.java b/src/main/java/com/badbones69/crazycrates/api/objects/Crate.java
@@ -9,7 +9,7 @@
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
 import com.badbones69.crazycrates.tasks.crates.effects.SoundEffect;
 import com.badbones69.crazycrates.api.builders.ItemBuilder;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
 import com.ryderbelserion.vital.paper.util.DyeUtil;
 import com.ryderbelserion.vital.paper.util.ItemUtil;
 import net.kyori.adventure.sound.Sound;
@@ -20,8 +20,8 @@
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.Nullable;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.CrazyCrates;
 import com.badbones69.crazycrates.tasks.crates.other.CosmicCrateManager;

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java b/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java
@@ -20,7 +20,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/Tier.java b/src/main/java/com/badbones69/crazycrates/api/objects/Tier.java
@@ -7,7 +7,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import java.util.List;
 
 public class Tier {

diff --git a/src/main/java/com/badbones69/crazycrates/api/utils/ItemUtils.java b/src/main/java/com/badbones69/crazycrates/api/utils/ItemUtils.java
@@ -18,7 +18,7 @@
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

diff --git a/src/main/java/com/badbones69/crazycrates/commands/crates/types/BaseCommand.java b/src/main/java/com/badbones69/crazycrates/commands/crates/types/BaseCommand.java
@@ -9,7 +9,7 @@
 import com.badbones69.crazycrates.tasks.BukkitUserManager;
 import com.badbones69.crazycrates.tasks.InventoryManager;
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
-import com.ryderbelserion.vital.common.managers.files.FileManager;
+import com.ryderbelserion.vital.paper.api.files.FileManager;
 import dev.triumphteam.cmd.core.annotations.Command;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;

diff --git a/src/main/java/com/badbones69/crazycrates/commands/crates/types/admin/CommandReload.java b/src/main/java/com/badbones69/crazycrates/commands/crates/types/admin/CommandReload.java
@@ -8,7 +8,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.PermissionDefault;
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 public class CommandReload extends BaseCommand {
 

diff --git a/...n/java/com/badbones69/crazycrates/commands/crates/types/admin/crates/CommandTeleport.java b/...n/java/com/badbones69/crazycrates/commands/crates/types/admin/crates/CommandTeleport.java
@@ -14,8 +14,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import java.util.Objects;
 
 public class CommandTeleport extends BaseCommand {

diff --git a/...om/badbones69/crazycrates/commands/crates/types/admin/crates/migrator/ICrateMigrator.java b/...om/badbones69/crazycrates/commands/crates/types/admin/crates/migrator/ICrateMigrator.java
@@ -8,14 +8,14 @@
 import com.badbones69.crazycrates.config.ConfigManager;
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
-import com.ryderbelserion.vital.common.managers.files.FileManager;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.FileManager;
 import com.ryderbelserion.vital.common.utils.StringUtil;
 import com.ryderbelserion.vital.paper.util.ItemUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.CommandSender;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...rates/commands/crates/types/admin/crates/migrator/types/MojangMappedMigratorMultiple.java b/...rates/commands/crates/types/admin/crates/migrator/types/MojangMappedMigratorMultiple.java
@@ -2,9 +2,9 @@
 
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.ICrateMigrator;
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.enums.MigrationType;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
 import org.bukkit.command.CommandSender;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ycrates/commands/crates/types/admin/crates/migrator/types/MojangMappedMigratorSingle.java b/...ycrates/commands/crates/types/admin/crates/migrator/types/MojangMappedMigratorSingle.java
@@ -4,9 +4,9 @@
 import com.badbones69.crazycrates.api.objects.Crate;
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.ICrateMigrator;
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.enums.MigrationType;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
 import org.bukkit.command.CommandSender;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...ommands/crates/types/admin/crates/migrator/types/deprecation/DeprecatedCrateMigrator.java b/...ommands/crates/types/admin/crates/migrator/types/deprecation/DeprecatedCrateMigrator.java
@@ -2,10 +2,10 @@
 
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.ICrateMigrator;
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.enums.MigrationType;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
 import org.bukkit.command.CommandSender;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...es/commands/crates/types/admin/crates/migrator/types/plugins/ExcellentCratesMigrator.java b/...es/commands/crates/types/admin/crates/migrator/types/plugins/ExcellentCratesMigrator.java
@@ -3,13 +3,13 @@
 import com.badbones69.crazycrates.api.enums.Files;
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.ICrateMigrator;
 import com.badbones69.crazycrates.commands.crates.types.admin.crates.migrator.enums.MigrationType;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
 import com.ryderbelserion.vital.paper.util.ItemUtil;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import su.nightexpress.excellentcrates.CratesAPI;
 import su.nightexpress.excellentcrates.crate.impl.Crate;
 import su.nightexpress.excellentcrates.key.CrateKey;
@@ -39,7 +39,7 @@ public void run() {
         final List<String> failed = new ArrayList<>();
         final List<String> success = new ArrayList<>();
 
-        org.simpleyaml.configuration.file.YamlConfiguration locationData = Files.locations.getConfiguration();
+        YamlConfiguration locationData = Files.locations.getConfiguration();
 
         for (final Crate crate : CratesAPI.getCrateManager().getCrates()) {
             final String crateName = crate.getFile().getName();
@@ -64,7 +64,7 @@ public void run() {
 
             final CustomFile customFile = new CustomFile(crateName, crateFile);
 
-            final org.simpleyaml.configuration.file.YamlConfiguration configuration = customFile.getConfiguration();
+            final YamlConfiguration configuration = customFile.getConfiguration();
 
             if (configuration == null) return;
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java
@@ -28,7 +28,7 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import com.badbones69.crazycrates.CrazyCrates;

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/CrateOpenListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/CrateOpenListener.java
@@ -16,7 +16,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.api.utils.MsgUtils;
 import java.util.List;

diff --git a/src/main/java/com/badbones69/crazycrates/tasks/BukkitUserManager.java b/src/main/java/com/badbones69/crazycrates/tasks/BukkitUserManager.java
@@ -9,9 +9,8 @@
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
 import com.badbones69.crazycrates.api.builders.ItemBuilder;
 import org.jetbrains.annotations.Nullable;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.YamlConfiguration;
-import org.simpleyaml.configuration.file.YamlFile;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import com.badbones69.crazycrates.CrazyCrates;

diff --git a/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java b/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java
@@ -24,8 +24,8 @@
 import com.badbones69.crazycrates.tasks.crates.types.WarCrate;
 import com.badbones69.crazycrates.tasks.crates.types.WheelCrate;
 import com.badbones69.crazycrates.tasks.crates.types.WonderCrate;
-import com.ryderbelserion.vital.common.managers.files.CustomFile;
-import com.ryderbelserion.vital.common.managers.files.FileManager;
+import com.ryderbelserion.vital.paper.api.files.CustomFile;
+import com.ryderbelserion.vital.paper.api.files.FileManager;
 import com.ryderbelserion.vital.common.utils.FileUtil;
 import com.badbones69.crazycrates.api.builders.ItemBuilder;
 import com.ryderbelserion.vital.paper.api.enums.Support;
@@ -38,9 +38,9 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.plugin.PluginManager;
 import org.jetbrains.annotations.Nullable;
-import org.simpleyaml.configuration.ConfigurationSection;
-import org.simpleyaml.configuration.file.FileConfiguration;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import com.badbones69.crazycrates.api.enums.PersistentKeys;

diff --git a/src/main/java/com/badbones69/crazycrates/tasks/crates/effects/SoundEffect.java b/src/main/java/com/badbones69/crazycrates/tasks/crates/effects/SoundEffect.java
@@ -5,7 +5,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 
 public class SoundEffect {
 

diff --git a/src/main/java/com/badbones69/crazycrates/tasks/crates/other/CosmicCrateManager.java b/src/main/java/com/badbones69/crazycrates/tasks/crates/other/CosmicCrateManager.java
@@ -12,7 +12,7 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/com/badbones69/crazycrates/tasks/crates/types/CasinoCrate.java b/src/main/java/com/badbones69/crazycrates/tasks/crates/types/CasinoCrate.java
@@ -16,7 +16,7 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.ConfigurationSection;
+import org.bukkit.configuration.ConfigurationSection;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import java.util.List;
 import java.util.UUID;

diff --git a/src/main/java/com/badbones69/crazycrates/tasks/crates/types/QuadCrate.java b/src/main/java/com/badbones69/crazycrates/tasks/crates/types/QuadCrate.java
@@ -7,7 +7,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import com.badbones69.crazycrates.CrazyCrates;
 import com.badbones69.crazycrates.api.builders.CrateBuilder;