Merge branch 'develop'

BentoBoxWorld · Nov 25, 2024 · a1839a7 · a1839a7
2 parents 388d944 + eda4f67
commit a1839a7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 11 deletions.
diff --git a/src/main/java/com/wasteofplastic/invswitcher/InvSwitcher.java b/src/main/java/com/wasteofplastic/invswitcher/InvSwitcher.java
@@ -1,15 +1,12 @@
 package com.wasteofplastic.invswitcher;
 
 
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.World;
 
 import com.wasteofplastic.invswitcher.listeners.PlayerListener;
@@ -26,9 +23,6 @@
  */
 public class InvSwitcher extends Addon {
 
-    protected static final List<Material> MAT = Arrays.stream(Material.values())
-            .filter(m -> !m.name().startsWith("LEGACY")).toList();
-
     private Store store;
 
     private Settings settings;

diff --git a/src/main/java/com/wasteofplastic/invswitcher/InvSwitcherPladdon.java b/src/main/java/com/wasteofplastic/invswitcher/InvSwitcherPladdon.java
@@ -0,0 +1,19 @@
+package com.wasteofplastic.invswitcher;
+
+
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
+import world.bentobox.bentobox.api.addons.Pladdon;
+
+public class InvSwitcherPladdon extends Pladdon {
+
+    private Addon addon;
+
+    @Override
+    public Addon getAddon() {
+        if (addon == null) {
+            addon = new InvSwitcher();
+        }
+        return addon;
+    }
+}
diff --git a/src/main/java/com/wasteofplastic/invswitcher/Store.java b/src/main/java/com/wasteofplastic/invswitcher/Store.java
@@ -36,6 +36,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Registry;
 import org.bukkit.Statistic;
 import org.bukkit.World;
 import org.bukkit.advancement.Advancement;
@@ -275,26 +276,26 @@ private CompletableFuture<InventoryStorage> saveStats(InventoryStorage store, Pl
 
     private void saveStatistics(CompletableFuture<InventoryStorage> result, InventoryStorage store, Player player,
             String worldName) {
-        Arrays.stream(Statistic.values()).forEach(s -> {
+        Registry.STATISTIC.forEach(s -> {
             Map<Material, Integer> map;
             Map<EntityType, Integer> entMap;
             switch (s.getType()) {
             case BLOCK -> {
-                map = InvSwitcher.MAT.stream().filter(Material::isBlock).filter(m -> player.getStatistic(s, m) > 0)
+                map = Registry.MATERIAL.stream().filter(Material::isBlock).filter(m -> player.getStatistic(s, m) > 0)
                         .collect(Collectors.toMap(k -> k, v -> player.getStatistic(s, v)));
                 if (!map.isEmpty()) {
                     store.getBlockStats(worldName).put(s, map);
                 }
             }
             case ITEM -> {
-                map = InvSwitcher.MAT.stream().filter(Material::isItem).filter(m -> player.getStatistic(s, m) > 0)
+                map = Registry.MATERIAL.stream().filter(Material::isItem).filter(m -> player.getStatistic(s, m) > 0)
                         .collect(Collectors.toMap(k -> k, v -> player.getStatistic(s, v)));
                 if (!map.isEmpty()) {
                     store.getItemStats(worldName).put(s, map);
                 }
             }
             case ENTITY -> {
-                entMap = Arrays.stream(EntityType.values()).filter(EntityType::isAlive)
+                entMap = Registry.ENTITY_TYPE.stream().filter(EntityType::isAlive)
                         .filter(m -> player.getStatistic(s, m) > 0)
                         .collect(Collectors.toMap(k -> k, v -> player.getStatistic(s, v)));
                 if (!entMap.isEmpty()) {

diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
@@ -1,7 +1,7 @@
 name: InvSwitcher
 main: com.wasteofplastic.invswitcher.InvSwitcher
 version: ${version}${build.number}
-api-version: 2.7.1
+api-version: 3.0.0
 
 authors: tastybento
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -0,0 +1,9 @@
+name: BentoBox-InvSwitcher
+main: com.wasteofplastic.invswitcher.InvSwitcherPladdon 
+version: ${project.version}${build.number}
+api-version: "1.21"
+
+authors: [tastybento]
+contributors: ["The BentoBoxWorld Community"]
+website: https://bentobox.world
+description: ${project.description}