mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Messages fixes, Refactored HiddenBackpack to be dedicated to restored bp
This commit is contained in:
parent
bcb2add2a6
commit
23fdd45b3d
@ -47,30 +47,25 @@ class BackpackCommand extends SubCommand {
|
|||||||
|
|
||||||
final Player p = (Player) sender;
|
final Player p = (Player) sender;
|
||||||
if (!PatternUtils.NUMERIC.matcher(args[2]).matches()) {
|
if (!PatternUtils.NUMERIC.matcher(args[2]).matches()) {
|
||||||
SlimefunPlugin.getLocal().sendMessage(sender, "guide.backpack.invalid-id");
|
SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.invalid-id");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final int id = Integer.parseInt(args[2]);
|
final int id = Integer.parseInt(args[2]);
|
||||||
final OfflinePlayer owner = Bukkit.getOfflinePlayer(args[1]);
|
final OfflinePlayer owner = Bukkit.getOfflinePlayer(args[1]);
|
||||||
if (!owner.hasPlayedBefore()) {
|
if (!owner.hasPlayedBefore()) {
|
||||||
SlimefunPlugin.getLocal().sendMessage(sender, "guide.backpack.player-never-joined");
|
SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.player-never-joined");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PlayerProfile.get(owner, profile -> {
|
PlayerProfile.get(owner, profile -> {
|
||||||
if (!profile.getBackpack(id).isPresent()) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
Slimefun.runSync(() -> {
|
Slimefun.runSync(() -> {
|
||||||
ItemStack item = SlimefunItems.RESTORED_BACKPACK;
|
ItemStack item = SlimefunItems.RESTORED_BACKPACK;
|
||||||
ItemMeta meta = item.getItemMeta();
|
SlimefunPlugin.getBackpackListener().setBackpackId(p, item, 2, id);
|
||||||
List lore = meta.getLore();
|
SlimefunPlugin.getLocal().sendMessage(sender, "commands.backpack.restored-backpack-given");
|
||||||
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");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -5,10 +5,10 @@ import me.mrCookieSlime.Slimefun.Objects.Category;
|
|||||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class HiddenBackpack extends SlimefunBackpack {
|
public class RestoredBackpack extends SlimefunBackpack {
|
||||||
|
|
||||||
public HiddenBackpack(int size, Category category, SlimefunItemStack item) {
|
public RestoredBackpack(Category category, SlimefunItemStack item) {
|
||||||
super(size, category, item, RecipeType.NULL, new ItemStack[9]);
|
super(54, category, item, RecipeType.NULL, new ItemStack[9]);
|
||||||
this.hidden = true;
|
this.hidden = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -4,6 +4,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import io.github.thebusybiscuit.slimefun4.implementation.items.tools.HiddenBackpack;
|
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.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Effect;
|
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})
|
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);
|
.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 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})
|
new ItemStack[] {SlimefunItems.NICKEL_INGOT, SlimefunItems.ALUMINUM_DUST, SlimefunItems.IRON_DUST, SlimefunItems.COBALT_INGOT, null, null, null, null, null})
|
||||||
|
@ -16,6 +16,12 @@ commands:
|
|||||||
reset: '&cYou have reset %player%''s Knowledge'
|
reset: '&cYou have reset %player%''s Knowledge'
|
||||||
reset-target: '&cYour Knowledge has been reset'
|
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:
|
guide:
|
||||||
locked: 'LOCKED'
|
locked: 'LOCKED'
|
||||||
|
|
||||||
@ -44,12 +50,6 @@ guide:
|
|||||||
cheat:
|
cheat:
|
||||||
no-multiblocks: '&4You cannot cheat in Multiblocks, you have to build them!'
|
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:
|
pages:
|
||||||
previous: 'Previous page'
|
previous: 'Previous page'
|
||||||
next: 'Next page'
|
next: 'Next page'
|
||||||
|
Loading…
Reference in New Issue
Block a user