Resolvido integração com ItemEdit

ArmaRealms · Feb 11, 2024 · 27b2faa · 27b2faa
1 parent 62af0a2
commit 27b2faa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/common/src/main/java/com/badbones69/crazycrates/common/config/types/ConfigKeys.java b/common/src/main/java/com/badbones69/crazycrates/common/config/types/ConfigKeys.java
@@ -4,7 +4,6 @@
 import ch.jalu.configme.SettingsHolder;
 import ch.jalu.configme.configurationdata.CommentsConfiguration;
 import ch.jalu.configme.properties.Property;
-import java.util.Collections;
 import java.util.List;
 import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
@@ -151,7 +150,7 @@ public void registerComments(CommentsConfiguration conf) {
 
     public static final Property<String> filler_name = newProperty("Settings.Filler.Name", " ");
 
-    public static final Property<List<String>> filler_lore = newListProperty("Settings.Filler.Lore", Collections.emptyList());
+    public static final Property<List<String>> filler_lore = newListProperty("Settings.Filler.Lore", List.of());
 
     public static final Property<Boolean> gui_customizer_toggle = newProperty("Settings.GUI-Customizer-Toggle", true);
 

diff --git a/paper/run/server.properties b/paper/run/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Tue Feb 06 03:13:15 EST 2024
+#Sun Feb 11 12:09:18 GMT-03:00 2024
 enable-jmx-monitoring=false
 rcon.port=25575
 level-seed=

diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java b/paper/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java
@@ -15,7 +15,7 @@
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import java.util.ArrayList;
-import java.util.Collections;
+
 import java.util.List;
 
 public class Prize {
@@ -47,7 +47,7 @@ public Prize(ConfigurationSection section, List<Tier> tierPrizes, String crateNa
 
         this.crateName = crateName;
 
-        List<?> list = section.getList("Editor-Items") == null ? section.getList("Editor-Items") : Collections.emptyList();
+        List<?> list = section.getList("Editor-Items") == null ? section.getList("Editor-Items") : List.of();
 
         if (list != null) {
             for (Object key : list) {
@@ -68,10 +68,10 @@ public Prize(ConfigurationSection section, List<Tier> tierPrizes, String crateNa
         this.chance = section.getInt("Chance", 100);
         this.firework = section.getBoolean("Firework", false);
 
-        this.messages = section.contains("Messages") ? section.getStringList("Messages") : Collections.emptyList();
-        this.commands = section.contains("Commands") ? section.getStringList("Commands") : Collections.emptyList();
+        this.messages = section.contains("Messages") ? section.getStringList("Messages") : List.of();
+        this.commands = section.contains("Commands") ? section.getStringList("Commands") : List.of();
 
-        this.permissions = section.contains("BlackListed-Permissions") ? section.getStringList("BlackListed-Permissions") : Collections.emptyList();
+        this.permissions = section.contains("BlackListed-Permissions") ? section.getStringList("BlackListed-Permissions") : List.of();
 
         if (!this.permissions.isEmpty()) {
             this.permissions.replaceAll(String::toLowerCase);
@@ -116,6 +116,7 @@ public String getPrizeNumber() {
      */
     public ItemStack getDisplayItem() {
         if (this.itemStack == null) {
+            this.displayItem.setCustomItem();
             this.itemStack = this.displayItem.build();
 
             ItemMeta itemMeta = this.itemStack.getItemMeta();

diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/objects/Tier.java b/paper/src/main/java/com/badbones69/crazycrates/api/objects/Tier.java
@@ -5,7 +5,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
-import java.util.Collections;
 import java.util.List;
 
 public class Tier {
@@ -27,7 +26,7 @@ public Tier(String tier, ConfigurationSection section) {
         this.item = new ItemBuilder()
                 .setMaterial(section.getString("Item", "CHEST"))
                 .setName(this.coloredName)
-                .setLore(!lore.isEmpty() ? lore : Collections.emptyList());
+                .setLore(!lore.isEmpty() ? lore : List.of());
 
         this.chance = section.getInt("Chance");
         this.maxRange = section.getInt("MaxRange");

diff --git a/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java b/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java
@@ -5,19 +5,15 @@
 import com.badbones69.crazycrates.api.FileManager;
 import com.badbones69.crazycrates.api.FileManager.Files;
 import com.badbones69.crazycrates.api.objects.BrokeLocation;
-import com.badbones69.crazycrates.api.utils.MiscUtils;
 import com.badbones69.crazycrates.support.holograms.HologramHandler;
 import com.badbones69.crazycrates.tasks.crates.types.*;
 import com.badbones69.crazycrates.tasks.crates.types.CasinoCrate;
 import com.badbones69.crazycrates.tasks.crates.types.CsgoCrate;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
@@ -51,7 +47,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -258,7 +253,7 @@ public void loadCrates() {
                     this.giveNewPlayersKeys = true;
                 }
 
-                List<String> prizeMessage = file.contains("Crate.Prize-Message") ? file.getStringList("Crate.Prize-Message") : Collections.emptyList();
+                List<String> prizeMessage = file.contains("Crate.Prize-Message") ? file.getStringList("Crate.Prize-Message") : List.of();
 
                 CrateHologram holo = new CrateHologram(file.getBoolean("Crate.Hologram.Toggle"), file.getDouble("Crate.Hologram.Height", 0.0), file.getInt("Crate.Hologram.Range", 8), file.getStringList("Crate.Hologram.Message"));
                 addCrate(new Crate(crateName, previewName, crateType, getKey(file), prizes, file, newPlayersKeys, tiers, maxMassOpen, requiredKeys, prizeMessage, holo));
@@ -280,7 +275,7 @@ public void loadCrates() {
             }
         }
 
-        addCrate(new Crate("Menu", "Menu", CrateType.menu, new ItemStack(Material.AIR), new ArrayList<>(), null, 0, null, 0, 0, Collections.emptyList(), null));
+        addCrate(new Crate("Menu", "Menu", CrateType.menu, new ItemStack(Material.AIR), new ArrayList<>(), null, 0, null, 0, 0, List.of(), null));
 
         List.of(
                 "All crate information has been loaded.",