diff --git a/pom.xml b/pom.xml index 6fe2771..dfec714 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.fanta.challenges Challenges - 1.19.2 + 0.0.1 UTF-8 UTF-8 @@ -24,7 +24,7 @@ io.papermc.paper paper-api - 1.19.2-R0.1-SNAPSHOT + 1.19.3-R0.1-SNAPSHOT provided @@ -83,7 +83,7 @@ maven-jar-plugin 3.2.0 - ${project.artifactId}-${project.version} + ${project.artifactId} diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 505fbf2..d66d817 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -348,10 +348,8 @@ private void createAllItemsConfig() { this.AllItemsConfigFile = new File(getDataFolder(), "allitems.yml"); - if (!this.getAllItemsConfigFile().exists()) { - this.getAllItemsConfigFile().getParentFile().mkdirs(); - saveResource("allitems.yml", false); - } + this.getAllItemsConfigFile().getParentFile().mkdirs(); + saveResource("allitems.yml", true); this.AllItemsConfig = new YamlConfiguration(); try { this.AllItemsConfig.load(this.getAllItemsConfigFile()); diff --git a/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java index 3b15c64..a2907b7 100644 --- a/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java +++ b/src/main/java/de/fanta/challenges/commands/challenges/CheckItemsCommand.java @@ -2,14 +2,19 @@ import de.fanta.challenges.Challenges; import de.fanta.challenges.guis.CheckItemsGUI; +import de.fanta.challenges.utils.ChatUtil; +import de.fanta.challenges.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; import java.io.IOException; +import java.util.Collection; +import java.util.Collections; public class CheckItemsCommand extends SubCommand { @@ -23,18 +28,29 @@ if (!(sender instanceof Player player)) { return true; } - if (!reset) { - FileConfiguration config = Challenges.getPlugin().getItemConfig(); - config.set("items", null); - try { - Challenges.getPlugin().ItemConfig.save(Challenges.getPlugin().ItemConfigFile); - } catch (IOException e) { - e.printStackTrace(); + if (!args.hasNext()) { + if (!reset) { + FileConfiguration config = Challenges.getPlugin().getItemConfig(); + config.set("items", null); + try { + Challenges.getPlugin().ItemConfig.save(Challenges.getPlugin().ItemConfigFile); + } catch (IOException e) { + e.printStackTrace(); + } + reset = true; } - reset = true; + new CheckItemsGUI(player).open(); + return true; + } + + if (args.getNext().equals("additemtoblacklist")) { + ItemStack stack = player.getInventory().getItemInMainHand(); + CheckItemsGUI.addItem(stack.getType()); + ChatUtil.sendNormalMessage(player, "Item " + ChatUtil.BLUE + stack.getI18NDisplayName() + ChatUtil.GREEN + " hinzugefügt"); + } else { + ChatUtil.sendErrorMessage(player, "/checkitems "); } - new CheckItemsGUI(player).open(); return true; } @@ -42,4 +58,12 @@ public String getRequiredPermission() { return "challenges.temp"; } + + @Override + public Collection onTabComplete(CommandSender sender, Command command, String alias, ArgsParser args) { + if (args.remaining() == 1) { + return Collections.singleton("additemtoblacklist"); + } + return Collections.emptyList(); + } } diff --git a/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java b/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java index b12ca19..d8cc8f0 100644 --- a/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java +++ b/src/main/java/de/fanta/challenges/guis/CheckItemsGUI.java @@ -85,7 +85,7 @@ FileConfiguration config = Challenges.getPlugin().getItemConfig(); List list = config.getStringList("items"); list.add(material.name()); - Config.setValue("items", list, false); + config.set("items", list); try { Challenges.getPlugin().ItemConfig.save(Challenges.getPlugin().ItemConfigFile); } catch (IOException e) { diff --git a/src/main/resources/items.yml b/src/main/resources/items.yml index 6c784d7..9e1b530 100644 --- a/src/main/resources/items.yml +++ b/src/main/resources/items.yml @@ -100,4 +100,9 @@ - KNOWLEDGE_BOOK - DEBUG_STICK - GLOBE_BANNER_PATTERN - - FROGSPAWN \ No newline at end of file + - FROGSPAWN + - CAMEL_SPAWN_EGG + - ENDER_DRAGON_SPAWN_EGG + - WITHER_SPAWN_EGG + - IRON_GOLEM_SPAWN_EGG + - SNOW_GOLEM_SPAWN_EGG \ No newline at end of file