Skip to content

Commit

Permalink
Merge branch 'dev/feature' into feature/displays
Browse files Browse the repository at this point in the history
  • Loading branch information
@sovdeeth
sovdeeth authored Aug 31, 2024
2 parents 84f5b6e + c8cd975 commit 81e4b1e
Show file tree
Hide file tree
Showing 14 changed files with 669 additions and 144 deletions.
127 changes: 61 additions & 66 deletions src/main/java/ch/njol/skript/SkriptCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -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));
Expand All @@ -124,15 +136,24 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
if (!SKRIPT_COMMAND_HELP.test(sender, args))
return true;

Set<CommandSender> 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();
Expand All @@ -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))
Expand All @@ -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;
Expand All @@ -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)
Expand All @@ -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 -> {
Expand All @@ -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 {
Expand All @@ -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;
Expand Down Expand Up @@ -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());
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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");
Expand Down Expand Up @@ -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() + "'");
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
Expand All @@ -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
Expand Down Expand Up @@ -515,7 +510,7 @@ private static File toggleFile(File file, boolean enable) throws IOException {
false
);
}

private static Set<File> toggleFiles(File folder, boolean enable) throws IOException {
FileFilter filter = enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter();

Expand All @@ -537,5 +532,5 @@ private static Set<File> toggleFiles(File folder, boolean enable) throws IOExcep

return changed;
}

}
32 changes: 17 additions & 15 deletions src/main/java/ch/njol/skript/conditions/CondIsCharged.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity> {
"\tbroadcast \"A charged creeper is at %location of last spawned creeper%\""})
@Since("2.5, INSERT VERSION (wither skulls)")
public class CondIsCharged extends PropertyCondition<Entity> {

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";
}

}
Loading

0 comments on commit 81e4b1e

Please sign in to comment.