From d7e3f05010e6fdfc12c368b66f38f58c0ba742fc Mon Sep 17 00:00:00 2001 From: Super_ Date: Thu, 12 Dec 2019 06:52:58 -0500 Subject: [PATCH] it won't stop erroring this wouldn't be good for the server, so for now, it's removed. i will work on it again soon, though. --- .../totalfreedommod/LoginProcess.java | 1 + .../command/Command_inventorylookup.java | 55 ---------- .../config/ConfigInventory.java | 101 ------------------ .../playerverification/VPlayer.java | 15 --- 4 files changed, 1 insertion(+), 171 deletions(-) delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_inventorylookup.java delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/config/ConfigInventory.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java index 33a7c49f..bfbbd39f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java @@ -188,6 +188,7 @@ public class LoginProcess extends FreedomService { final Player player = event.getPlayer(); final FPlayer fPlayer = plugin.pl.getPlayer(player); + final VPlayer verificationPlayer = plugin.pv.getVerificationPlayer(player); player.sendTitle(ChatColor.GRAY + "Welcome to " + ChatColor.YELLOW + "TotalFreedom!", ChatColor.GREEN + "Celebrating 9 years!", 20, 100, 60); player.setOp(true); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_inventorylookup.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_inventorylookup.java deleted file mode 100644 index 33a036f9..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_inventorylookup.java +++ /dev/null @@ -1,55 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.config.ConfigInventory; -import me.totalfreedom.totalfreedommod.playerverification.VPlayer; -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.Material; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "View inventory information of players.", usage = "/ ", aliases = "il,invlookup") -public class Command_inventorylookup extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (args.length != 2) - { - return false; - } - VPlayer vPlayer = plugin.pv.getVerificationPlayer(args[0]); - if (vPlayer == null) - { - msg("Could not find player or find that player's data."); - return true; - } - ConfigInventory inv = vPlayer.getInventory(); - int slot; - try - { - slot = Integer.valueOf(args[1]); - } - catch (NumberFormatException ex) - { - msg("That is not a valid number."); - return true; - } - ItemStack stack = inv.get(slot); - if (stack == null) - { - stack = new ItemStack(Material.AIR, 1); - } - msg(args[0] + "'s Inventory - Slot " + slot + ":"); - msg(" - Material: " + stack.getType().name()); - msg(" - Amount: " + stack.getAmount()); - if (inv.hasNBT(slot)) - { - msg(" - NBT Data: " + inv.getNBT(slot).toString()); - } - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigInventory.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigInventory.java deleted file mode 100644 index 8f894ba9..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigInventory.java +++ /dev/null @@ -1,101 +0,0 @@ -package me.totalfreedom.totalfreedommod.config; - -import java.util.HashMap; -import java.util.Map; -import lombok.Getter; -import lombok.Setter; -import net.minecraft.server.v1_14_R1.NBTTagCompound; -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; - -public class ConfigInventory -{ - @Getter - @Setter - private Map inventoryItems; - - public ConfigInventory(Inventory inv) - { - updateInventory(inv); - } - - public void set(int location, Material material, int amount, NBTTagCompound nbt) - { - ItemStack stack = new ItemStack(material, amount); - /* - net.minecraft.server.v1_14_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); - nmsStack.setTag(nbt); - stack = CraftItemStack.asBukkitCopy(nmsStack); - */ - inventoryItems.put(location, stack); - } - - public void set(int location, ItemStack stack) - { - inventoryItems.put(location, stack); - } - - public ItemStack get(int location) - { - return inventoryItems.get(location); - } - - public boolean hasNBT(int location) - { - return CraftItemStack.asNMSCopy(inventoryItems.get(location)).hasTag(); - } - - public NBTTagCompound getNBT(int location) - { - return CraftItemStack.asNMSCopy(inventoryItems.get(location)).getTag(); - } - - public void updateInventory(Inventory inv) - { - inventoryItems = new HashMap<>(); - if (inv == null) - { - return; - } - for (int i = 0; i < inv.getSize(); i++) - { - inventoryItems.put(i, inv.getItem(i)); - } - } - - public void save(ConfigurationSection cs) - { - for (int i = 0; i < inventoryItems.size(); i++) - { - ItemStack currentStack = inventoryItems.get(i); - net.minecraft.server.v1_14_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(currentStack); - if (currentStack == null) - { - ItemStack air = new ItemStack(Material.AIR, 1); - inventoryItems.put(i, air); - currentStack = air; - } - cs.set("inventory." + i + ".type", currentStack.getType().name()); - cs.set("inventory." + i + ".amount", currentStack.getAmount()); - if (nmsStack.hasTag()) - { - cs.set("inventory." + i + ".nbt", nmsStack.getTag().toString()); - } - } - } - - public static ConfigInventory createInventoryFromConfig(ConfigurationSection cs) - { - ConfigInventory configInventory = new ConfigInventory(null); - for (int i = 0; i < 40; i++) - { - configInventory.set(i, Material.valueOf(cs.getString("inventory." + i + ".type")), - cs.getInt("inventory." + i + ".amount"), null);//, - //(NBTTagCompound) cs.get("inventory." + i + ".nbt")); - } - return configInventory; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java index a7894796..cbeea23f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java @@ -5,12 +5,10 @@ import java.util.Collections; import java.util.List; import lombok.Getter; import lombok.Setter; -import me.totalfreedom.totalfreedommod.config.ConfigInventory; import net.pravian.aero.base.ConfigLoadable; import net.pravian.aero.base.ConfigSavable; import net.pravian.aero.base.Validatable; import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; @@ -39,9 +37,6 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable @Getter @Setter private boolean rideToggle = true; - @Getter - @Setter - private ConfigInventory inventory = null; public VPlayer(String name) { @@ -64,14 +59,6 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable tag = cs.getString("tag", null); clearChatOptOut = cs.getBoolean("clearChatOptOut", false); rideToggle = cs.getBoolean("rideToggle", true); - if (!cs.contains("inventory") || Bukkit.getPlayer(name) != null) - { - inventory = new ConfigInventory(Bukkit.getPlayer(name).getInventory()); - } - else - { - inventory = ConfigInventory.createInventoryFromConfig(cs); - } } @Override @@ -85,8 +72,6 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable cs.set("ips", Lists.newArrayList(ips)); cs.set("clearChatOptOut", clearChatOptOut); cs.set("rideToggle", rideToggle); - inventory.updateInventory(Bukkit.getPlayer(name).getInventory()); - inventory.save(cs); } public List getIps()