diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java index de7303d05..5dd48a083 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java @@ -93,6 +93,16 @@ public class SlimefunRegistry { public List getEnabledSlimefunItems() { return enabledItems; } + + public List getEnabledSlimefunItemIds() { + List list = new ArrayList<>(enabledItems.size()); + + for (SlimefunItem item : enabledItems) { + list.add(item.getID()); + } + + return list; + } public int countVanillaItems() { return (int) getEnabledSlimefunItems().stream().filter(item -> !item.isAddonItem()).count(); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java index 391ec5880..32509de2b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunTabCompleter.java @@ -3,14 +3,13 @@ package io.github.thebusybiscuit.slimefun4.core.commands; import java.util.ArrayList; import java.util.List; -import me.mrCookieSlime.Slimefun.SlimefunPlugin; -import me.mrCookieSlime.Slimefun.Objects.Research; -import me.mrCookieSlime.Slimefun.api.Slimefun; - import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; +import me.mrCookieSlime.Slimefun.Objects.Research; + public class SlimefunTabCompleter implements TabCompleter { private final SlimefunCommand command; @@ -26,7 +25,7 @@ public class SlimefunTabCompleter implements TabCompleter { } else if (args.length == 3) { if (args[0].equalsIgnoreCase("give")) { - return createReturnList(Slimefun.listIDs(), args[2]); + return createReturnList(SlimefunPlugin.getRegistry().getEnabledSlimefunItemIds(), args[2]); } else if (args[0].equalsIgnoreCase("research")) { List researches = new ArrayList<>(); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java b/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java index cd290755a..270fc79df 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java @@ -11,6 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitTask; import io.github.thebusybiscuit.cscorelib2.config.Config; +import io.github.thebusybiscuit.slimefun4.core.SlimefunRegistry; import io.github.thebusybiscuit.slimefun4.core.services.LocalizationService; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.GPS.GPSNetwork; @@ -248,6 +249,8 @@ public final class Slimefun { /** * Lists all the IDs of the enabled items. * + * @deprecated Use {@link SlimefunRegistry#getEnabledSlimefunItemIds()} + * * @return the list of all the IDs of the enabled items. */ @Deprecated