From de504c3d12588f93c894e4cf7779558e782fa583 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sun, 6 Oct 2019 12:25:41 -0400 Subject: [PATCH] Merging sickness. --- .../songoda/ultimatekits/UltimateKits.java | 41 +++-------- .../ultimatekits/commands/CommandSet.java | 73 +++++++++++++++++++ .../com/songoda/ultimatekits/kit/KitItem.java | 6 +- 3 files changed, 88 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/songoda/ultimatekits/commands/CommandSet.java diff --git a/src/main/java/com/songoda/ultimatekits/UltimateKits.java b/src/main/java/com/songoda/ultimatekits/UltimateKits.java index 1402871..5e81d2f 100644 --- a/src/main/java/com/songoda/ultimatekits/UltimateKits.java +++ b/src/main/java/com/songoda/ultimatekits/UltimateKits.java @@ -13,16 +13,7 @@ import com.songoda.core.gui.GuiManager; import com.songoda.core.hooks.EconomyManager; import com.songoda.core.hooks.HologramManager; import com.songoda.core.utils.TextUtils; -import com.songoda.ultimatekits.commands.CommandCreatekit; -import com.songoda.ultimatekits.commands.CommandEdit; -import com.songoda.ultimatekits.commands.CommandKey; -import com.songoda.ultimatekits.commands.CommandKit; -import com.songoda.ultimatekits.commands.CommandPreviewKit; -import com.songoda.ultimatekits.commands.CommandReload; -import com.songoda.ultimatekits.commands.CommandRemove; -import com.songoda.ultimatekits.commands.CommandSet; -import com.songoda.ultimatekits.commands.CommandSettings; -import com.songoda.ultimatekits.commands.CommandUltimateKits; +import com.songoda.ultimatekits.commands.*; import com.songoda.ultimatekits.conversion.Convert; import com.songoda.ultimatekits.database.DataManager; import com.songoda.ultimatekits.database.migrations._1_InitialMigration; @@ -31,12 +22,7 @@ import com.songoda.ultimatekits.handlers.DisplayItemHandler; import com.songoda.ultimatekits.handlers.ParticleHandler; import com.songoda.ultimatekits.key.Key; import com.songoda.ultimatekits.key.KeyManager; -import com.songoda.ultimatekits.kit.Kit; -import com.songoda.ultimatekits.kit.KitAnimation; -import com.songoda.ultimatekits.kit.KitBlockData; -import com.songoda.ultimatekits.kit.KitItem; -import com.songoda.ultimatekits.kit.KitManager; -import com.songoda.ultimatekits.kit.KitType; +import com.songoda.ultimatekits.kit.*; import com.songoda.ultimatekits.listeners.BlockListeners; import com.songoda.ultimatekits.listeners.ChatListeners; import com.songoda.ultimatekits.listeners.EntityListeners; @@ -49,11 +35,8 @@ import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.plugin.PluginManager; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; + +import java.util.*; public class UltimateKits extends SongodaPlugin { private static UltimateKits INSTANCE; @@ -61,7 +44,7 @@ public class UltimateKits extends SongodaPlugin { private final Config kitFile = new Config(this, "kit.yml"); private final Config dataFile = new Config(this, "data.yml"); private final Config keyFile = new Config(this, "keys.yml"); - + private final GuiManager guiManager = new GuiManager(this); private final ParticleHandler particleHandler = new ParticleHandler(this); private final DisplayItemHandler displayItemHandler = new DisplayItemHandler(this); @@ -107,8 +90,8 @@ public class UltimateKits extends SongodaPlugin { // Setup Config Settings.setupConfig(); - this.setLocale(Settings.LANGUGE_MODE.getString(), false); - + this.setLocale(Settings.LANGUGE_MODE.getString(), false); + // Set economy preference EconomyManager.getManager().setPreferredHook(Settings.ECONOMY_PLUGIN.getString()); @@ -134,7 +117,7 @@ public class UltimateKits extends SongodaPlugin { this.kitManager = new KitManager(); this.keyManager = new KeyManager(); this.commandManager = new CommandManager(this); - + Convert.runKitConversions(); // Event registration @@ -180,7 +163,7 @@ public class UltimateKits extends SongodaPlugin { Bukkit.getScheduler().runTaskLater(this, () -> { this.dataManager.getBlockData((blockData) -> { this.kitManager.setKitLocations(blockData); - if(HologramManager.isEnabled()) { + if (HologramManager.isEnabled()) { loadHolograms(); } }); @@ -280,12 +263,12 @@ public class UltimateKits extends SongodaPlugin { keyManager.addKey(key); } } - + }, 10); } public void removeHologram(KitBlockData data) { - if(HologramManager.isEnabled()) { + if (HologramManager.isEnabled()) { Location location = getKitLocation(data, Settings.HOLOGRAM_LAYOUT.getStringList().size()); HologramManager.removeHologram(location); } @@ -433,7 +416,7 @@ public class UltimateKits extends SongodaPlugin { * Insert default key list into config. */ private void checkKeyDefaults() { - if(keyFile.contains("Keys")) return; + if (keyFile.contains("Keys")) return; keyFile.set("Keys.Regular.Item Amount", 3); keyFile.set("Keys.Regular.Amount overrides", Collections.singletonList("Tools:2")); keyFile.set("Keys.Regular.Amount of kit received", 1); diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandSet.java b/src/main/java/com/songoda/ultimatekits/commands/CommandSet.java new file mode 100644 index 0000000..9cd0287 --- /dev/null +++ b/src/main/java/com/songoda/ultimatekits/commands/CommandSet.java @@ -0,0 +1,73 @@ +package com.songoda.ultimatekits.commands; + +import com.songoda.core.commands.AbstractCommand; +import com.songoda.ultimatekits.UltimateKits; +import com.songoda.ultimatekits.kit.Kit; +import com.songoda.ultimatekits.kit.KitBlockData; +import org.bukkit.block.Block; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import java.util.ArrayList; +import java.util.List; + +public class CommandSet extends AbstractCommand { + + final UltimateKits instance = UltimateKits.getInstance(); + + public CommandSet() { + super(true, "set"); + } + + @Override + protected ReturnType runCommand(CommandSender sender, String... args) { + if (args.length != 1) { + instance.getLocale().getMessage("command.kit.nokitsupplied").sendPrefixedMessage(sender); + return ReturnType.FAILURE; + } + Player player = (Player) sender; + Kit kit = instance.getKitManager().getKit(args[0].toLowerCase()); + if (kit == null) { + instance.getLocale().getMessage("command.kit.kitdoesntexist").sendPrefixedMessage(sender); + return ReturnType.FAILURE; + } + Block b = player.getTargetBlock(null, 200); + KitBlockData data = instance.getKitManager().addKitToLocation(kit, b.getLocation()); + UltimateKits.getInstance().getDataManager().createBlockData(data); + instance.getLocale().newMessage("&8Kit &a" + kit.getName() + " &8set to: &a" + b.getType().toString() + "&8.") + .sendPrefixedMessage(sender); + return ReturnType.SUCCESS; + + } + + @Override + protected List onTab(CommandSender sender, String... args) { + if (!(sender instanceof Player)) { + return null; + } + + if (args.length == 2) { + List tab = new ArrayList<>(); + for (Kit kit : UltimateKits.getInstance().getKitManager().getKits()) { + tab.add(kit.getName()); + } + return tab; + } + return new ArrayList<>(); + } + + @Override + public String getPermissionNode() { + return "ultimatekits.admin"; + } + + @Override + public String getSyntax() { + return "/KitAdmin set "; + } + + @Override + public String getDescription() { + return "Make the block you are looking at display a kit."; + } +} diff --git a/src/main/java/com/songoda/ultimatekits/kit/KitItem.java b/src/main/java/com/songoda/ultimatekits/kit/KitItem.java index 3cefde5..a8cf980 100644 --- a/src/main/java/com/songoda/ultimatekits/kit/KitItem.java +++ b/src/main/java/com/songoda/ultimatekits/kit/KitItem.java @@ -159,9 +159,9 @@ public class KitItem { if (chance != 0 || displayItem != null || displayName != null || displayLore != null) { String capitalizedName = meta.hasDisplayName() ? meta.getDisplayName() : WordUtils.capitalize(item.getType().toString().toLowerCase().replace("_", " ")); - if (capitalizedName.contains(Methods.convertToInvisibleString(";faqe"))) - capitalizedName = meta.getDisplayName().split(Methods.convertToInvisibleString(";faqe"))[1]; - meta.setDisplayName(Methods.convertToInvisibleString(compileOptions() + ";faqe") + capitalizedName); + if (capitalizedName.contains(TextUtils.convertToInvisibleString(";faqe"))) + capitalizedName = meta.getDisplayName().split(TextUtils.convertToInvisibleString(";faqe"))[1]; + meta.setDisplayName(TextUtils.convertToInvisibleString(compileOptions() + ";faqe") + capitalizedName); } item.setItemMeta(meta); return item;