diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java index 6c327823c..95dc0e045 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/BackpackCommand.java @@ -47,30 +47,25 @@ class BackpackCommand extends SubCommand { final Player p = (Player) sender; if (!PatternUtils.NUMERIC.matcher(args[2]).matches()) { - SlimefunPlugin.getLocal().sendMessage(sender, "guide.backpack.invalid-id"); + SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.invalid-id"); return; } final int id = Integer.parseInt(args[2]); final OfflinePlayer owner = Bukkit.getOfflinePlayer(args[1]); if (!owner.hasPlayedBefore()) { - SlimefunPlugin.getLocal().sendMessage(sender, "guide.backpack.player-never-joined"); + SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.player-never-joined"); return; } PlayerProfile.get(owner, profile -> { if (!profile.getBackpack(id).isPresent()) { - SlimefunPlugin.getLocal().sendMessage(sender, "guide.backpack.backpack-does-not-exist"); + SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.backpack-does-not-exist"); return; } Slimefun.runSync(() -> { ItemStack item = SlimefunItems.RESTORED_BACKPACK; - ItemMeta meta = item.getItemMeta(); - List lore = meta.getLore(); - lore.set(2, ChatColor.GRAY + "ID: " + profile.getUUID().toString() + "#" + id); - meta.setLore(lore); - item.setItemMeta(meta); - p.getInventory().addItem(item); - SlimefunPlugin.getLocal().sendMessage(sender, "guide.backpack.restored-backpack-given"); + SlimefunPlugin.getBackpackListener().setBackpackId(p, item, 2, id); + SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.restored-backpack-given"); }); }); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/HiddenBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/RestoredBackpack.java similarity index 59% rename from src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/HiddenBackpack.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/RestoredBackpack.java index 5f024c346..afb1f9a7f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/HiddenBackpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/RestoredBackpack.java @@ -5,10 +5,10 @@ import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import org.bukkit.inventory.ItemStack; -public class HiddenBackpack extends SlimefunBackpack { +public class RestoredBackpack extends SlimefunBackpack { - public HiddenBackpack(int size, Category category, SlimefunItemStack item) { - super(size, category, item, RecipeType.NULL, new ItemStack[9]); + public RestoredBackpack(Category category, SlimefunItemStack item) { + super(54, category, item, RecipeType.NULL, new ItemStack[9]); this.hidden = true; } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java index c1c224a65..95f540a57 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.HiddenBackpack; +import io.github.thebusybiscuit.slimefun4.implementation.items.tools.RestoredBackpack; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Effect; @@ -1203,7 +1204,7 @@ public final class SlimefunItemSetup { new ItemStack[] {SlimefunItems.GOLD_24K, null, SlimefunItems.GOLD_24K, new ItemStack(Material.LEATHER), SlimefunItems.GILDED_BACKPACK, new ItemStack(Material.LEATHER), SlimefunItems.GOLD_24K, null, SlimefunItems.GOLD_24K}) .register(plugin); - new HiddenBackpack(54, categories.usefulItems, SlimefunItems.RESTORED_BACKPACK).register(plugin); + new RestoredBackpack(categories.usefulItems, SlimefunItems.RESTORED_BACKPACK).register(plugin); new SlimefunItem(categories.technicalComponents, (SlimefunItemStack) SlimefunItems.MAGNET, RecipeType.SMELTERY, new ItemStack[] {SlimefunItems.NICKEL_INGOT, SlimefunItems.ALUMINUM_DUST, SlimefunItems.IRON_DUST, SlimefunItems.COBALT_INGOT, null, null, null, null, null}) diff --git a/src/main/resources/languages/messages_en.yml b/src/main/resources/languages/messages_en.yml index c2e64a3bc..b4877a52e 100644 --- a/src/main/resources/languages/messages_en.yml +++ b/src/main/resources/languages/messages_en.yml @@ -15,6 +15,12 @@ commands: description: Unlock/Reset researches for a player reset: '&cYou have reset %player%''s Knowledge' reset-target: '&cYour Knowledge has been reset' + + backpack: + invalid-id: '&4The backpack id must be a non-negative number!' + player-never-joined: '&4No player with that name has ever joined the server!' + backpack-does-not-exist: '&4That backpack does not exist!' + restored-backpack-given: '&bBackpack restored successfully! Added to your inventory!' guide: locked: 'LOCKED' @@ -43,12 +49,6 @@ guide: cheat: no-multiblocks: '&4You cannot cheat in Multiblocks, you have to build them!' - - backpack: - invalid-id: '&4The id must be a non-negative integer!' - player-never-joined: '&4No player with that name has ever joined the server!' - backpack-does-not-exist: '&4That backpack does not exist!' - restored-backpack-given: 'Backpack restored successfully! Added to your inventory!' pages: previous: 'Previous page'