diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java index 0bc25391267..9a6091b2df6 100644 --- a/src/main/java/ch/njol/skript/SkriptCommand.java +++ b/src/main/java/ch/njol/skript/SkriptCommand.java @@ -25,6 +25,7 @@ import ch.njol.skript.localization.ArgsMessage; import ch.njol.skript.localization.Language; import ch.njol.skript.localization.PluralizingArgsMessage; +import ch.njol.skript.log.LogEntry; import ch.njol.skript.log.RedirectingLogHandler; import ch.njol.skript.log.TimingLogHandler; import ch.njol.skript.test.runner.SkriptTestEvent; @@ -52,10 +53,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.logging.Level; import java.util.stream.Collectors; + public class SkriptCommand implements CommandExecutor { - + private static final String CONFIG_NODE = "skript command"; private static final ArgsMessage m_reloading = new ArgsMessage(CONFIG_NODE + ".reload.reloading"); @@ -90,30 +93,39 @@ public class SkriptCommand implements CommandExecutor { if (TestMode.DEV_MODE) SKRIPT_COMMAND_HELP.add("test"); } - - private static void reloading(CommandSender sender, String what, Object... args) { + + private static void reloading(CommandSender sender, String what, RedirectingLogHandler logHandler, Object... args) { what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : Language.format(CONFIG_NODE + ".reload." + what, args); - Skript.info(sender, StringUtils.fixCapitalization(m_reloading.toString(what))); + String message = StringUtils.fixCapitalization(m_reloading.toString(what)); + Skript.info(sender, message); + + // Log reloading message + logHandler.log(new LogEntry(Level.INFO, Language.format(CONFIG_NODE + ".reload." + "player reload", sender.getName(), what))); } - + + private static final ArgsMessage m_reloaded = new ArgsMessage(CONFIG_NODE + ".reload.reloaded"); private static final ArgsMessage m_reload_error = new ArgsMessage(CONFIG_NODE + ".reload.error"); - - private static void reloaded(CommandSender sender, RedirectingLogHandler r, TimingLogHandler timingLogHandler, String what, Object... args) { - what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + ".reload." + what, args)); - String timeTaken = String.valueOf(timingLogHandler.getTimeTaken()); - if (r.numErrors() == 0) - Skript.info(sender, StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reloaded.toString(what, timeTaken)))); - else - Skript.error(sender, StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reload_error.toString(what, r.numErrors(), timeTaken)))); + private static void reloaded(CommandSender sender, RedirectingLogHandler logHandler, TimingLogHandler timingLogHandler, String what, Object... args) { + what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + ".reload." + what, args)); + String timeTaken = String.valueOf(timingLogHandler.getTimeTaken()); + + String message; + if (logHandler.numErrors() == 0) { + message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reloaded.toString(what, timeTaken))); + logHandler.log(new LogEntry(Level.INFO, message)); + } else { + message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reload_error.toString(what, logHandler.numErrors(), timeTaken))); + logHandler.log(new LogEntry(Level.SEVERE, message)); + } } - + private static void info(CommandSender sender, String what, Object... args) { what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args)); Skript.info(sender, StringUtils.fixCapitalization(what)); } - + private static void error(CommandSender sender, String what, Object... args) { what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args)); Skript.error(sender, StringUtils.fixCapitalization(what)); @@ -124,15 +136,24 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (!SKRIPT_COMMAND_HELP.test(sender, args)) return true; + Set recipients = new HashSet<>(); + recipients.add(sender); + + if (args[0].equalsIgnoreCase("reload")) { + recipients.addAll(Bukkit.getOnlinePlayers().stream() + .filter(player -> player.hasPermission("skript.reloadnotify")) + .collect(Collectors.toSet())); + } + try ( - RedirectingLogHandler logHandler = new RedirectingLogHandler(sender, "").start(); + RedirectingLogHandler logHandler = new RedirectingLogHandler(recipients, "").start(); TimingLogHandler timingLogHandler = new TimingLogHandler().start() ) { if (args[0].equalsIgnoreCase("reload")) { if (args[1].equalsIgnoreCase("all")) { - reloading(sender, "config, aliases and scripts"); + reloading(sender, "config, aliases and scripts", logHandler); SkriptConfig.load(); Aliases.clear(); Aliases.load(); @@ -144,10 +165,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St Skript.warning(Skript.m_no_scripts.toString()); reloaded(sender, logHandler, timingLogHandler, "config, aliases and scripts"); }); - } - - else if (args[1].equalsIgnoreCase("scripts")) { - reloading(sender, "scripts"); + } else if (args[1].equalsIgnoreCase("scripts")) { + reloading(sender, "scripts", logHandler); ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts()); ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(logHandler, timingLogHandler)) @@ -156,22 +175,16 @@ else if (args[1].equalsIgnoreCase("scripts")) { Skript.warning(Skript.m_no_scripts.toString()); reloaded(sender, logHandler, timingLogHandler, "scripts"); }); - } - - else if (args[1].equalsIgnoreCase("config")) { - reloading(sender, "main config"); + } else if (args[1].equalsIgnoreCase("config")) { + reloading(sender, "main config", logHandler); SkriptConfig.load(); reloaded(sender, logHandler, timingLogHandler, "main config"); - } - - else if (args[1].equalsIgnoreCase("aliases")) { - reloading(sender, "aliases"); + } else if (args[1].equalsIgnoreCase("aliases")) { + reloading(sender, "aliases", logHandler); Aliases.clear(); Aliases.load(); reloaded(sender, logHandler, timingLogHandler, "aliases"); - } - - else { // Reloading an individual Script or folder + } else { // Reloading an individual Script or folder File scriptFile = getScriptFromArgs(sender, args); if (scriptFile == null) return true; @@ -182,7 +195,7 @@ else if (args[1].equalsIgnoreCase("aliases")) { return true; } - reloading(sender, "script", scriptFile.getName()); + reloading(sender, "script", logHandler, scriptFile.getName()); Script script = ScriptLoader.getScript(scriptFile); if (script != null) @@ -193,7 +206,7 @@ else if (args[1].equalsIgnoreCase("aliases")) { ); } else { final String fileName = scriptFile.getName(); - reloading(sender, "scripts in folder", fileName); + reloading(sender, "scripts in folder", logHandler, fileName); ScriptLoader.unloadScripts(ScriptLoader.getScripts(scriptFile)); ScriptLoader.loadScripts(scriptFile, OpenCloseable.combine(logHandler, timingLogHandler)) .thenAccept(scriptInfo -> { @@ -206,9 +219,7 @@ else if (args[1].equalsIgnoreCase("aliases")) { } } - } - - else if (args[0].equalsIgnoreCase("enable")) { + } else if (args[0].equalsIgnoreCase("enable")) { if (args[1].equalsIgnoreCase("all")) { try { @@ -224,9 +235,7 @@ else if (args[0].equalsIgnoreCase("enable")) { } catch (IOException e) { error(sender, "enable.all.io error", ExceptionUtils.toString(e)); } - } - - else { + } else { File scriptFile = getScriptFromArgs(sender, args); if (scriptFile == null) return true; @@ -281,9 +290,7 @@ else if (args[0].equalsIgnoreCase("enable")) { } } - } - - else if (args[0].equalsIgnoreCase("disable")) { + } else if (args[0].equalsIgnoreCase("disable")) { if (args[1].equalsIgnoreCase("all")) { ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts()); @@ -293,9 +300,7 @@ else if (args[0].equalsIgnoreCase("disable")) { } catch (IOException e) { error(sender, "disable.all.io error", ExceptionUtils.toString(e)); } - } - - else { + } else { File scriptFile = getScriptFromArgs(sender, args); if (scriptFile == null) // TODO allow disabling deleted/renamed scripts return true; @@ -339,9 +344,7 @@ else if (args[0].equalsIgnoreCase("disable")) { } } - } - - else if (args[0].equalsIgnoreCase("update")) { + } else if (args[0].equalsIgnoreCase("update")) { SkriptUpdater updater = Skript.getInstance().getUpdater(); if (updater == null) { // Oh. That is bad Skript.info(sender, "" + SkriptUpdater.m_internal_error); @@ -354,9 +357,7 @@ else if (args[0].equalsIgnoreCase("update")) { } else if (args[1].equalsIgnoreCase("download")) { updater.updateCheck(sender); } - } - - else if (args[0].equalsIgnoreCase("info")) { + } else if (args[0].equalsIgnoreCase("info")) { info(sender, "info.aliases"); info(sender, "info.documentation"); info(sender, "info.tutorials"); @@ -393,9 +394,7 @@ else if (args[0].equalsIgnoreCase("info")) { if (!dependenciesFound) info(sender, "info.dependencies", "None"); - } - - else if (args[0].equalsIgnoreCase("gen-docs")) { + } else if (args[0].equalsIgnoreCase("gen-docs")) { File templateDir = Documentation.getDocsTemplateDirectory(); if (!templateDir.exists()) { Skript.error(sender, "Cannot generate docs! Documentation templates not found at '" + Documentation.getDocsTemplateDirectory().getPath() + "'"); @@ -408,9 +407,7 @@ else if (args[0].equalsIgnoreCase("gen-docs")) { Skript.info(sender, "Generating docs..."); generator.generate(); // Try to generate docs... hopefully Skript.info(sender, "Documentation generated!"); - } - - else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) { + } else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) { File scriptFile; if (args.length == 1) { scriptFile = TestMode.lastTestFile; @@ -444,9 +441,7 @@ else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) { } }) ); - } - - else if (args[0].equalsIgnoreCase("help")) { + } else if (args[0].equalsIgnoreCase("help")) { SKRIPT_COMMAND_HELP.showHelp(sender); } @@ -457,10 +452,10 @@ else if (args[0].equalsIgnoreCase("help")) { return true; } - + private static final ArgsMessage m_invalid_script = new ArgsMessage(CONFIG_NODE + ".invalid script"); private static final ArgsMessage m_invalid_folder = new ArgsMessage(CONFIG_NODE + ".invalid folder"); - + @Nullable private static File getScriptFromArgs(CommandSender sender, String[] args) { String script = StringUtils.join(args, " ", 1, args.length); @@ -473,7 +468,7 @@ private static File getScriptFromArgs(CommandSender sender, String[] args) { } return f; } - + @Nullable public static File getScriptFromName(String script) { if (script.endsWith("/") || script.endsWith("\\")) { // Always allow '/' and '\' regardless of OS @@ -515,7 +510,7 @@ private static File toggleFile(File file, boolean enable) throws IOException { false ); } - + private static Set toggleFiles(File folder, boolean enable) throws IOException { FileFilter filter = enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter(); @@ -537,5 +532,5 @@ private static Set toggleFiles(File folder, boolean enable) throws IOExcep return changed; } - + } diff --git a/src/main/java/ch/njol/skript/conditions/CondIsCharged.java b/src/main/java/ch/njol/skript/conditions/CondIsCharged.java index cf5992ef89b..dc43dace85d 100644 --- a/src/main/java/ch/njol/skript/conditions/CondIsCharged.java +++ b/src/main/java/ch/njol/skript/conditions/CondIsCharged.java @@ -18,36 +18,38 @@ */ package ch.njol.skript.conditions; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.LivingEntity; - import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; +import org.bukkit.entity.Creeper; +import org.bukkit.entity.Entity; +import org.bukkit.entity.WitherSkull; @Name("Is Charged") -@Description("Checks if a creeper is charged (powered).") +@Description("Checks if a creeper or wither skull is charged (powered).") @Examples({"if the last spawned creeper is charged:", - "\tbroadcast \"A charged creeper is at %location of last spawned creeper%\""}) -@Since("2.5") -public class CondIsCharged extends PropertyCondition { - + "\tbroadcast \"A charged creeper is at %location of last spawned creeper%\""}) +@Since("2.5, INSERT VERSION (wither skulls)") +public class CondIsCharged extends PropertyCondition { + static { - register(CondIsCharged.class, "(charged|powered)", "livingentities"); + register(CondIsCharged.class, "(charged|powered)", "entities"); } - + @Override - public boolean check(final LivingEntity e) { - if (e instanceof Creeper) - return ((Creeper) e).isPowered(); + public boolean check(Entity entity) { + if (entity instanceof Creeper) + return ((Creeper) entity).isPowered(); + else if (entity instanceof WitherSkull) + return ((WitherSkull) entity).isCharged(); return false; } - + @Override protected String getPropertyName() { return "charged"; } - + } diff --git a/src/main/java/ch/njol/skript/effects/EffChargeCreeper.java b/src/main/java/ch/njol/skript/effects/EffCharge.java similarity index 58% rename from src/main/java/ch/njol/skript/effects/EffChargeCreeper.java rename to src/main/java/ch/njol/skript/effects/EffCharge.java index 03a1fdaebdc..54cccdca807 100644 --- a/src/main/java/ch/njol/skript/effects/EffChargeCreeper.java +++ b/src/main/java/ch/njol/skript/effects/EffCharge.java @@ -27,48 +27,54 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; - import org.bukkit.entity.Creeper; -import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Entity; +import org.bukkit.entity.WitherSkull; import org.bukkit.event.Event; -import org.eclipse.jdt.annotation.Nullable; +import org.jetbrains.annotations.Nullable; -@Name("Charge Creeper") -@Description("Charges or uncharges a creeper. A creeper is charged when it has been struck by lightning.") -@Examples({"on spawn of creeper:", - "\tcharge the event-entity"}) +@Name("Charge Entity") +@Description("Charges or uncharges a creeper or wither skull. A creeper is charged when it has been struck by lightning.") +@Examples({ + "on spawn of creeper:", + "\tcharge the event-entity" +}) @Since("2.5") -public class EffChargeCreeper extends Effect { +public class EffCharge extends Effect { static { - Skript.registerEffect(EffChargeCreeper.class, - "make %livingentities% [a[n]] (charged|powered|1¦((un|non[-])charged|(un|non[-])powered)) [creeper[s]]", - "(charge|power|1¦(uncharge|unpower)) %livingentities%"); + Skript.registerEffect(EffCharge.class, + "make %entities% [un:(un|not |non[-| ])](charged|powered)", + "[:un](charge|power) %entities%"); } @SuppressWarnings("null") - private Expression entities; + private Expression entities; private boolean charge; @SuppressWarnings({"unchecked", "null"}) @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - entities = (Expression) exprs[0]; - charge = parseResult.mark != 1; + entities = (Expression) exprs[0]; + charge = !parseResult.hasTag("un"); return true; } @Override - protected void execute(Event e) { - for (LivingEntity le : entities.getArray(e)) { - if (le instanceof Creeper) - ((Creeper) le).setPowered(charge); + protected void execute(Event event) { + for (Entity entity : entities.getArray(event)) { + if (entity instanceof Creeper) { + ((Creeper) entity).setPowered(charge); + } else if (entity instanceof WitherSkull) { + ((WitherSkull) entity).setCharged(charge); + } } } @Override - public String toString(@Nullable Event e, boolean debug) { - return "make " + entities.toString(e, debug) + (charge == true ? " charged" : " not charged"); + public String toString(@Nullable Event event, boolean debug) { + return "make " + entities.toString(event, debug) + (charge ? " charged" : " not charged"); } + } diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java index 947148aaf30..36153ae75cb 100644 --- a/src/main/java/ch/njol/skript/events/SimpleEvents.java +++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java @@ -69,6 +69,7 @@ import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.entity.SheepRegrowWoolEvent; import org.bukkit.event.entity.SlimeSplitEvent; +import org.bukkit.event.entity.PiglinBarterEvent; import org.bukkit.event.inventory.FurnaceBurnEvent; import org.bukkit.event.inventory.FurnaceSmeltEvent; import org.bukkit.event.inventory.InventoryCloseEvent; @@ -749,6 +750,20 @@ public class SimpleEvents { ) .since("2.7"); + if (Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent")) { + Skript.registerEvent("Piglin Barter", SimpleEvent.class, PiglinBarterEvent.class, "piglin (barter[ing]|trad(e|ing))") + .requiredPlugins("Minecraft 1.16+") + .description( + "Called when a piglin finishes bartering. A piglin may start bartering after picking up an item on its bartering list.", + "Cancelling will prevent piglins from dropping items, but will still make them pick up the input.") + .examples( + "on piglin barter:", + "\tif barter drops contain diamond:", + "\t\tsend \"Diamonds belong in the money pit!\" to player", + "\t\tcancel event" + ) + .since("INSERT VERSION"); + } { final Class eventClass; if (Skript.classExists("org.bukkit.event.block.BellRingEvent")) { @@ -787,6 +802,7 @@ public class SimpleEvents { ) .since("2.9.0") .requiredPlugins("Spigot 1.19.4+"); + } if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) { @@ -805,5 +821,4 @@ public class SimpleEvents { .requiredPlugins("Paper"); } } - } diff --git a/src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java b/src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java new file mode 100644 index 00000000000..e5223893ff5 --- /dev/null +++ b/src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java @@ -0,0 +1,150 @@ +/** + * This file is part of Skript. + * + * Skript is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Skript is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Skript. If not, see . + * + * Copyright Peter Güttinger, SkriptLang team and contributors + */ +package ch.njol.skript.expressions; + +import ch.njol.skript.Skript; +import ch.njol.skript.aliases.ItemType; +import ch.njol.skript.classes.Changer.ChangeMode; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Examples; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleExpression; +import ch.njol.util.Kleenean; +import ch.njol.util.coll.CollectionUtils; +import org.bukkit.event.Event; +import org.bukkit.event.entity.PiglinBarterEvent; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +@Name("Barter Drops") +@Description("The items dropped by the piglin in a piglin bartering event.") +@Examples({ + "on piglin barter:", + "\tif the bartering drops contain a jack-o-lantern:", + "\t\tremove jack-o-lantern from bartering output", + "\t\tbroadcast \"it's not halloween yet!\"" +}) +@Since("INSERT VERSION") +public class ExprBarterDrops extends SimpleExpression { + + static { + if (Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent")) { + Skript.registerExpression(ExprBarterDrops.class, ItemType.class, + ExpressionType.SIMPLE, "[the] [piglin] barter[ing] drops"); + } + } + + private Kleenean delay; + + @Override + public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) { + if (!getParser().isCurrentEvent(PiglinBarterEvent.class)) { + Skript.error("The expression 'barter drops' can only be used in the piglin bartering event"); + return false; + } + + delay = isDelayed; + + return true; + } + + @Override + @Nullable + protected ItemType[] get(Event event) { + if (!(event instanceof PiglinBarterEvent)) + return null; + + return ((PiglinBarterEvent) event).getOutcome() + .stream() + .map(ItemType::new) + .toArray(ItemType[]::new); + } + + @Override + public Class @Nullable [] acceptChange(ChangeMode mode) { + if (!delay.isFalse()) { + Skript.error("Can't change the piglin bartering drops after the event has already passed"); + return null; + } + + switch (mode) { + case SET: + case ADD: + case REMOVE: + case REMOVE_ALL: + case DELETE: + return CollectionUtils.array(ItemType[].class); + default: + return null; + } + } + + @Override + public void change(Event event, Object @Nullable [] delta, ChangeMode mode) { + if (!(event instanceof PiglinBarterEvent)) + return; + + List outcome = ((PiglinBarterEvent) event).getOutcome(); + + switch (mode) { + case SET: + outcome.clear(); + case ADD: + for (Object item : delta) { + ((ItemType) item).addTo(outcome); + } + break; + case REMOVE: + for (Object item : delta) { + ((ItemType) item).removeFrom(false, outcome); + } + break; + case REMOVE_ALL: + for (Object item : delta) { + ((ItemType) item).removeAll(false, outcome); + } + break; + case DELETE: + outcome.clear(); + break; + } + } + + @Override + public boolean isSingle() { + return false; + } + + @Override + public Class getReturnType() { + return ItemType.class; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "the barter drops"; + } + +} diff --git a/src/main/java/ch/njol/skript/expressions/ExprBarterInput.java b/src/main/java/ch/njol/skript/expressions/ExprBarterInput.java new file mode 100644 index 00000000000..1e29861173b --- /dev/null +++ b/src/main/java/ch/njol/skript/expressions/ExprBarterInput.java @@ -0,0 +1,86 @@ +/** + * This file is part of Skript. + * + * Skript is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Skript is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Skript. If not, see . + * + * Copyright Peter Güttinger, SkriptLang team and contributors + */ +package ch.njol.skript.expressions; + +import ch.njol.skript.Skript; +import ch.njol.skript.aliases.ItemType; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Examples; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleExpression; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.bukkit.event.entity.PiglinBarterEvent; +import org.jetbrains.annotations.Nullable; + +@Name("Barter Input") +@Description("The item picked up by the piglin in a piglin bartering event.") +@Examples({ + "on piglin barter:", + "\tif the bartering input is a gold ingot:", + "\t\tbroadcast \"my precious...\"" +}) +@Since("INSERT VERSION") +public class ExprBarterInput extends SimpleExpression { + + static { + if (Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent")) { + Skript.registerExpression(ExprBarterInput.class, ItemType.class, + ExpressionType.SIMPLE, "[the] [piglin] barter[ing] input"); + } + } + + @Override + public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) { + if (!getParser().isCurrentEvent(PiglinBarterEvent.class)) { + Skript.error("The expression 'barter input' can only be used in the piglin bartering event"); + return false; + } + return true; + } + + @Override + @Nullable + protected ItemType[] get(Event event) { + if (!(event instanceof PiglinBarterEvent)) + return null; + + return new ItemType[] { new ItemType(((PiglinBarterEvent) event).getInput()) }; + } + + @Override + public boolean isSingle() { + return true; + } + + @Override + public Class getReturnType() { + return ItemType.class; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "the barter input"; + } + +} diff --git a/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java b/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java index f20afa6ffc8..4d5a622082b 100644 --- a/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java +++ b/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java @@ -18,43 +18,51 @@ */ package ch.njol.skript.log; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.eclipse.jdt.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.logging.Level; /** - * Redirects the log to a {@link CommandSender}. + * Redirects the log to one or more {@link CommandSender}s. */ public class RedirectingLogHandler extends LogHandler { - private final CommandSender recipient; - - private final String prefix; - + private final Collection recipients; private int numErrors = 0; - + private final String prefix; + public RedirectingLogHandler(CommandSender recipient, @Nullable String prefix) { - this.recipient = recipient; + this(Collections.singletonList(recipient), prefix); + } + + public RedirectingLogHandler(Collection recipients, @Nullable String prefix) { + this.recipients = new ArrayList<>(recipients); this.prefix = prefix == null ? "" : prefix; } - + @Override public LogResult log(LogEntry entry) { - SkriptLogger.sendFormatted(recipient, prefix + entry.toFormattedString()); - if (entry.level == Level.SEVERE) + String formattedMessage = prefix + entry.toFormattedString(); + for (CommandSender recipient : recipients) { + SkriptLogger.sendFormatted(recipient, formattedMessage); + } + if (entry.level == Level.SEVERE) { numErrors++; + } return LogResult.DO_NOT_LOG; } - + @Override public RedirectingLogHandler start() { return SkriptLogger.startLogHandler(this); } - + public int numErrors() { return numErrors; } - } + diff --git a/src/main/java/ch/njol/skript/util/Timespan.java b/src/main/java/ch/njol/skript/util/Timespan.java index 3b192a34dff..37a0bb4b18d 100644 --- a/src/main/java/ch/njol/skript/util/Timespan.java +++ b/src/main/java/ch/njol/skript/util/Timespan.java @@ -30,6 +30,8 @@ import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; import org.jetbrains.annotations.Nullable; +import java.time.Duration; +import java.time.temporal.*; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -38,10 +40,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -public class Timespan implements YggdrasilSerializable, Comparable { // REMIND unit +import static java.time.temporal.ChronoUnit.*; +public class Timespan implements YggdrasilSerializable, Comparable, TemporalAmount { // REMIND unit - public enum TimePeriod { + public enum TimePeriod implements TemporalUnit { MILLISECOND(1L), TICK(50L), @@ -65,6 +68,36 @@ public long getTime() { return time; } + @Override + public Duration getDuration() { + return Duration.ofMillis(time); + } + + @Override + public boolean isDurationEstimated() { + return false; + } + + @Override + public boolean isDateBased() { + return false; + } + + @Override + public boolean isTimeBased() { + return true; + } + + @Override + public R addTo(R temporal, long amount) { + return (R) temporal.plus(amount, this); + } + + @Override + public long between(Temporal temporal1Inclusive, Temporal temporal2Exclusive) { + return temporal1Inclusive.until(temporal2Exclusive, this); + } + } private static final List> SIMPLE_VALUES = Arrays.asList( @@ -96,7 +129,7 @@ public void onLanguageChange() { private static final Pattern TIMESPAN_SPLIT_PATTERN = Pattern.compile("[:.]"); private final long millis; - + @Nullable public static Timespan parse(String value) { if (value.isEmpty()) @@ -126,13 +159,13 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms] String[] substring = value.toLowerCase(Locale.ENGLISH).split("\\s+"); for (int i = 0; i < substring.length; i++) { String sub = substring[i]; - + if (sub.equals(GeneralWords.and.toString())) { if (i == 0 || i == substring.length - 1) return null; continue; } - + double amount = 1; if (Noun.isIndefiniteArticle(sub)) { if (i == substring.length - 1) @@ -148,7 +181,7 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms] } sub = substring[++i]; } - + if (CollectionUtils.contains(Language.getList("time.real"), sub)) { if (i == substring.length - 1 || isMinecraftTimeSet && minecraftTime) return null; @@ -159,27 +192,27 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms] minecraftTime = true; sub = substring[++i]; } - + if (sub.endsWith(",")) sub = sub.substring(0, sub.length() - 1); Long d = PARSE_VALUES.get(sub.toLowerCase(Locale.ENGLISH)); if (d == null) return null; - + if (minecraftTime && d != TimePeriod.TICK.time) amount /= 72f; - + t += Math.round(amount * d); - + isMinecraftTimeSet = true; - + } } return new Timespan(t); } - + public Timespan() { millis = 0; } @@ -211,7 +244,7 @@ public Timespan(TimePeriod timePeriod, long time) { * Builds a Timespan from the given long parameter. * * @deprecated Use {@link #Timespan(TimePeriod, long)} - * + * * @param ticks The amount of Minecraft ticks to convert to a timespan. * @return Timespan based on the provided long. */ @@ -272,15 +305,15 @@ public long getTicks_i() { public String toString() { return toString(millis); } - + public String toString(int flags) { return toString(millis, flags); } - + public static String toString(long millis) { return toString(millis, 0); } - + @SuppressWarnings("null") public static String toString(long millis, int flags) { for (int i = 0; i < SIMPLE_VALUES.size() - 1; i++) { @@ -296,7 +329,7 @@ public static String toString(long millis, int flags) { } return toString(1. * millis / SIMPLE_VALUES.get(SIMPLE_VALUES.size() - 1).getSecond(), SIMPLE_VALUES.get(SIMPLE_VALUES.size() - 1), flags); } - + private static String toString(double amount, NonNullPair pair, int flags) { return pair.getFirst().withAmount(amount, flags); } @@ -310,7 +343,7 @@ private static String toString(double amount, NonNullPair pair, int public int compareTo(@Nullable Timespan time) { return Long.compare(millis, time == null ? millis : time.millis); } - + @Override public int hashCode() { int prime = 31; @@ -318,7 +351,7 @@ public int hashCode() { result = prime * result + (int) (millis / Integer.MAX_VALUE); return result; } - + @Override public boolean equals(@Nullable Object obj) { if (this == obj) @@ -330,5 +363,47 @@ public boolean equals(@Nullable Object obj) { return millis == ((Timespan) obj).millis; } - + + public Duration getDuration() { + return Duration.ofMillis(millis); + } + + public static Timespan fromDuration(Duration duration) { + return new Timespan(duration.toMillis()); + } + + @Override + public long get(TemporalUnit unit) { + if (unit instanceof TimePeriod period) + return this.getAs(period); + if (!(unit instanceof ChronoUnit chrono)) + throw new UnsupportedTemporalTypeException("Not a supported temporal unit: " + unit); + return switch (chrono) { + case MILLIS -> this.getAs(TimePeriod.MILLISECOND); + case SECONDS -> this.getAs(TimePeriod.SECOND); + case MINUTES -> this.getAs(TimePeriod.MINUTE); + case HOURS -> this.getAs(TimePeriod.HOUR); + case DAYS -> this.getAs(TimePeriod.DAY); + case WEEKS -> this.getAs(TimePeriod.WEEK); + case MONTHS -> this.getAs(TimePeriod.MONTH); + case YEARS -> this.getAs(TimePeriod.YEAR); + default -> throw new UnsupportedTemporalTypeException("Not a supported time unit: " + chrono); + }; + } + + @Override + public List getUnits() { + return List.of(TimePeriod.values()).reversed(); + } + + @Override + public Temporal addTo(Temporal temporal) { + return temporal.plus(millis, MILLIS); + } + + @Override + public Temporal subtractFrom(Temporal temporal) { + return temporal.minus(millis, MILLIS); + } + } diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang index 43e417be1a9..97f95fcdd3d 100644 --- a/src/main/resources/lang/english.lang +++ b/src/main/resources/lang/english.lang @@ -55,6 +55,7 @@ skript command: error line info: Line %s: (%s)\n reloading: Reloading %s... reloaded: Successfully reloaded %s. (%2$sms) + player reload: %s is reloading %s... error: Encountered %2$s error¦¦s¦ while reloading %1$s! (%3$sms) script disabled: %s is currently disabled. Use /skript enable %s to enable it. warning details: %s\n diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPiglinBarterTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPiglinBarterTest.java new file mode 100644 index 00000000000..275bfbd1b72 --- /dev/null +++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPiglinBarterTest.java @@ -0,0 +1,76 @@ +/** + * This file is part of Skript. + * + * Skript is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Skript is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Skript. If not, see . + * + * Copyright Peter Güttinger, SkriptLang team and contributors + */ +package org.skriptlang.skript.test.tests.syntaxes.events; + +import ch.njol.skript.Skript; +import ch.njol.skript.test.runner.SkriptJUnitTest; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.inventory.ItemStack; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +public class EvtPiglinBarterTest extends SkriptJUnitTest { + + private Entity piglin; + private static final boolean canRun = Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent"); + + static { + setShutdownDelay(1); + } + + @Before + public void spawn() { + if (!canRun) + return; + + piglin = getTestWorld().spawnEntity(getTestLocation(), EntityType.PIGLIN); + } + + @Test + public void testCall() { + if (!canRun) + return; + + ItemStack input = new ItemStack(Material.GOLD_INGOT); + List outcome = new ArrayList<>(); + outcome.add(new ItemStack(Material.EMERALD)); + + try { + Bukkit.getPluginManager().callEvent( + new org.bukkit.event.entity.PiglinBarterEvent( + (org.bukkit.entity.Piglin) piglin, input, outcome)); + } catch (NoClassDefFoundError ignored) { } + } + + @After + public void remove() { + if (!canRun) + return; + + piglin.remove(); + } + +} diff --git a/src/test/skript/junit/-EvtPiglinBarter.sk b/src/test/skript/junit/-EvtPiglinBarter.sk new file mode 100644 index 00000000000..72068f2b0aa --- /dev/null +++ b/src/test/skript/junit/-EvtPiglinBarter.sk @@ -0,0 +1,61 @@ +on piglin barter: + set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtPiglinBarterTest" + junit test is {_test} + + # Items + + if barter input is gold ingot: + complete objective "correct barter input" for {_test} + + clear barter drops + if size of barter drops is 0: + complete objective "clear barter drops" for {_test} + + set barter drops to 1 emerald and 1 diamond + if: + size of barter drops is 2 + barter drops contains 1 emerald + barter drops contains 1 diamond + then: + complete objective "set barter drops to 2 items" for {_test} + + add 1 iron ingot to barter drops + if: + size of barter drops is 3 + barter drops contains 1 emerald + barter drops contains 1 diamond + barter drops contains 1 iron ingot + then: + complete objective "add item to barter drops" for {_test} + + remove iron ingot from barter drops + if: + size of barter drops is 2 + barter drops contains 1 emerald + barter drops contains 1 diamond + then: + complete objective "remove item from barter drops" for {_test} + + add 1 dirt and 2 dirt to barter drops + if: + size of barter drops is 4 + barter drops contains 1 emerald + barter drops contains 1 diamond + barter drops contains 1 dirt + barter drops contains 2 dirt + then: + complete objective "add multiple items to barter drops" for {_test} + + remove all dirt from barter drops + if: + size of barter drops is 2 + barter drops contains 1 emerald + barter drops contains 1 diamond + then: + complete objective "remove all of an item from barter drops" for {_test} + + remove 1 emerald and 1 diamond from barter drops + if size of barter drops is 0: + complete objective "remove multiple items from barter drops" for {_test} + + complete objective "barter drops test complete" for {_test} diff --git a/src/test/skript/junit/EvtPiglinBarterTest.sk b/src/test/skript/junit/EvtPiglinBarterTest.sk new file mode 100644 index 00000000000..ffd0c171043 --- /dev/null +++ b/src/test/skript/junit/EvtPiglinBarterTest.sk @@ -0,0 +1,27 @@ +test "EvtPiglinBarterJUnit" when running JUnit: + set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtPiglinBarterTest" + send "test called" to console + + if running below minecraft "1.16.5": + complete objective "correct barter input" for {_test} + complete objective "clear barter drops" for {_test} + complete objective "set barter drops to 2 items" for {_test} + complete objective "remove item from barter drops" for {_test} + complete objective "add multiple items to barter drops" for {_test} + complete objective "remove all of an item from barter drops" for {_test} + complete objective "remove multiple items from barter drops" for {_test} + complete objective "barter drops test complete" for {_test} + else: + set {_slashIndex} to last index of "/" in "%script%.sk" + set {_parent} to substring of "%script%.sk" from 0 to {_slashIndex} + load script "%{_parent}%-EvtPiglinBarter.sk" + + set {_tests::1} to "correct barter input" + set {_tests::2} to "clear barter drops" + set {_tests::3} to "set barter drops to 2 items" + set {_tests::4} to "remove item from barter drops" + set {_tests::5} to "add multiple items to barter drops" + set {_tests::6} to "remove all of an item from barter drops" + set {_tests::7} to "remove multiple items from barter drops" + set {_tests::8} to "barter drops test complete" + ensure {_test} completes {_tests::*} diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsCharged.sk b/src/test/skript/tests/syntaxes/conditions/CondIsCharged.sk new file mode 100644 index 00000000000..1362a3196a5 --- /dev/null +++ b/src/test/skript/tests/syntaxes/conditions/CondIsCharged.sk @@ -0,0 +1,31 @@ +test "is charged": + spawn a creeper at (spawn of world "world"): + set {_e} to entity + shoot a wither skull from {_e} + set {_w} to last shot entity + + assert {_e} is not charged with "a normally spawned creeper should not be charged" + assert {_w} is not charged with "a normally spawned wither skull should not be charged" + + charge {_e} + charge {_w} + assert {_e} is charged with "charging a creeper should do exactly that" + assert {_w} is charged with "charging a wither skull should do exactly that" + + uncharge {_e} + uncharge {_w} + assert {_e} is not charged with "uncharging a creeper should do exactly that" + assert {_w} is not charged with "uncharging a wither skull should do exactly that" + + spawn an adult zombie at (spawn of world "world"): + set {_z} to entity + + assert {_z} is not charged with "a non-creeper/wither skull should never be charged" + charge {_z} + assert {_z} is not charged with "charging a non-creeper/wither skull should do nothing" + uncharge {_z} + assert {_z} is not charged with "uncharging a non-creeper/wither skull should do nothing" + + delete entity within {_e} + delete entity within {_w} + delete entity within {_z} diff --git a/src/test/skript/tests/syntaxes/effects/EffChargeCreeper.sk b/src/test/skript/tests/syntaxes/effects/EffChargeCreeper.sk deleted file mode 100644 index 47e9e8016af..00000000000 --- a/src/test/skript/tests/syntaxes/effects/EffChargeCreeper.sk +++ /dev/null @@ -1,8 +0,0 @@ -test "charge creeper effect/condition": - spawn a creeper at spawn of world "world" - assert last spawned creeper is not charged with "spawning a normal creeper shouldn't spawn a charged one" - charge the last spawned creeper - assert last spawned creeper is charged with "a creeper should be charged after it is set as charged" - uncharge the last spawned creeper - assert last spawned creeper is not charged with "uncharging a charged creeper should uncharge it" - delete last spawned creeper