From 8c0ff9acfb2149b9e8a5a1c2c7bf5e9cc9866b6f Mon Sep 17 00:00:00 2001 From: Sfiguz7 Date: Mon, 11 May 2020 16:58:58 +0200 Subject: [PATCH] Now cloning :/ Also fixed double key in messages --- .../commands/subcommands/BackpackCommand.java | 3 +- .../setup/SlimefunItemSetup.java | 42 +++++++++---------- src/main/resources/languages/messages_en.yml | 2 +- 3 files changed, 23 insertions(+), 24 deletions(-) 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 95dc0e045..2d8622083 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 @@ -63,8 +63,9 @@ class BackpackCommand extends SubCommand { return; } Slimefun.runSync(() -> { - ItemStack item = SlimefunItems.RESTORED_BACKPACK; + ItemStack item = SlimefunItems.RESTORED_BACKPACK.clone(); SlimefunPlugin.getBackpackListener().setBackpackId(p, item, 2, id); + p.getInventory().addItem(item); SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.restored-backpack-given"); }); }); 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 a92850ec6..f8801bdac 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 @@ -1,26 +1,5 @@ package io.github.thebusybiscuit.slimefun4.implementation.setup; -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; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.NamespacedKey; -import org.bukkit.Sound; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.block.Chest; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; - import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections; @@ -169,6 +148,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfTh import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfVeinMining; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PortableCrafter; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PortableDustbin; +import io.github.thebusybiscuit.slimefun4.implementation.items.tools.RestoredBackpack; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.SlimefunBackpack; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.SmeltersPickaxe; import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.ExplosiveBow; @@ -177,7 +157,6 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SeismicAx import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SwordOfBeheading; import io.github.thebusybiscuit.slimefun4.implementation.items.weapons.VampireBlade; import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib; -import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -185,9 +164,28 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunMachine; import me.mrCookieSlime.Slimefun.Objects.handlers.MultiBlockInteractionHandler; import me.mrCookieSlime.Slimefun.Objects.handlers.RainbowTicker; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Effect; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.Sound; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.Chest; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; + +import java.util.ArrayList; +import java.util.List; /** * This static utility class holds the recipes of all items. diff --git a/src/main/resources/languages/messages_en.yml b/src/main/resources/languages/messages_en.yml index b4877a52e..d13fdf0ee 100644 --- a/src/main/resources/languages/messages_en.yml +++ b/src/main/resources/languages/messages_en.yml @@ -2,7 +2,6 @@ commands: help: Displays this help screen cheat: Allows you to cheat Items give: Give somebody some Slimefun Items - backpack: Retrieve an existing backpack guide: Gives yourself a Slimefun Guide timings: Lag-Info about your Server teleporter: See other Player's Waypoints @@ -17,6 +16,7 @@ commands: reset-target: '&cYour Knowledge has been reset' backpack: + description: Retrieve an existing 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!'