quickTest runs the test suite on newest supported server version.
-skriptTestJava17 (1.17+) runs the tests on the latest supported Java version.
-skriptTestJava8 (1.13-1.16) runs the tests on the oldest supported Java version.
-skriptTest runs both skriptTestJava8 and skriptTestJava17
+skriptTestJava21 (1.20.6+) runs the tests on Java 21 supported versions.
+skriptTestJava17 (1.17-1.20.4) runs the tests on Java 17 supported versions.
+skriptTestJava11 (1.13-1.16) runs the tests on Java 11 supported versions.
+skriptTest runs the tests on all versions.
+That is, it runs skriptTestJava11, skriptTestJava17, and skriptTestJava21.
By running the tests, you agree to Mojang's End User License Agreement.
@@ -160,7 +164,7 @@ dependencies {
}
```
-An example of the version tag would be ```dev37c```.
+An example of the version tag would be ```2.8.5```.
> Note: If Gradle isn't able to resolve Skript's dependencies, just [disable the resolution of transitive dependencies](https://docs.gradle.org/current/userguide/resolution_rules.html#sec:disabling_resolution_transitive_dependencies) for Skript in your project.
diff --git a/build.gradle b/build.gradle
index 4ed4e1603be..486220cf22e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,6 @@ import java.time.LocalTime
plugins {
id 'com.github.johnrengelman.shadow' version '8.1.1'
- id 'com.github.hierynomus.license' version '0.16.1'
id 'maven-publish'
id 'java'
}
@@ -20,6 +19,7 @@ allprojects {
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
maven { url 'https://repo.papermc.io/repository/maven-public/' }
+ maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } // needed for paper adventure snapshot
maven { url 'https://ci.emc.gs/nexus/content/groups/aikar/' }
}
}
@@ -27,20 +27,20 @@ allprojects {
dependencies {
shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.0.2'
- shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.0'
+ shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.2'
- implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT'
+ implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21-R0.1-SNAPSHOT'
implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.700'
implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT'
- implementation group: 'net.milkbowl.vault', name: 'Vault', version: '1.7.1', {
+ implementation group: 'net.milkbowl.vault', name: 'Vault', version: '1.7.3', {
exclude group: 'org.bstats', module: 'bstats-bukkit'
}
implementation fileTree(dir: 'lib', include: '*.jar')
testShadow group: 'junit', name: 'junit', version: '4.13.2'
- testShadow group: 'org.easymock', name: 'easymock', version: '5.1.0'
+ testShadow group: 'org.easymock', name: 'easymock', version: '5.0.1'
}
task checkAliases {
@@ -54,23 +54,23 @@ task checkAliases {
}
task testJar(type: ShadowJar) {
- dependsOn(compileTestJava, licenseTest)
+ dependsOn(compileTestJava)
archiveFileName = 'Skript-JUnit.jar'
from sourceSets.test.output, sourceSets.main.output, project.configurations.testShadow
}
task jar(overwrite: true, type: ShadowJar) {
dependsOn checkAliases
- archiveFileName = jarName ? 'Skript.jar' : jarName
+ archiveFileName = jarName ? 'Skript-' + project.version + '.jar' : jarName
from sourceSets.main.output
}
task build(overwrite: true, type: ShadowJar) {
- archiveFileName = jarName ? 'Skript.jar' : jarName
+ archiveFileName = jarName ? 'Skript-' + project.version + '.jar' : jarName
from sourceSets.main.output
}
-// Excludes the tests for the build task. Should be using junit, junitJava17, junitJava8, skriptTest, quickTest.
+// Excludes the tests for the build task. Should be using junit, junitJava17, junitJava11, skriptTest, quickTest.
// We do not want tests to run for building. That's time consuming and annoying. Especially in development.
test {
exclude '**/*'
@@ -140,23 +140,6 @@ publishing {
}
}
-license {
- header file('licenseheader.txt')
- exclude('**/Metrics.java') // Not under GPLv3
- exclude('**/BurgerHelper.java') // Not exclusively GPLv3
- exclude('**/*.sk') // Sample scripts and maybe aliases
- exclude('**/*.lang') // Language files do not have headers (still under GPLv3)
- exclude('**/*.json') // JSON files do not have headers
-}
-
-javadoc {
- source = sourceSets.main.allJava
- classpath = configurations.compileClasspath
- options.encoding = 'UTF-8'
- // currently our javadoc has a lot of errors, so we need to suppress the linter
- options.addStringOption('Xdoclint:none', '-quiet')
-}
-
// Task to check that test scripts are named correctly
tasks.register('testNaming') {
doLast {
@@ -181,17 +164,31 @@ tasks.register('testNaming') {
}
enum Modifiers {
- DEV_MODE, GEN_DOCS, DEBUG, PROFILE, JUNIT
+ DEV_MODE, GEN_NIGHTLY_DOCS, GEN_RELEASE_DOCS, DEBUG, PROFILE, JUNIT
}
// Create a test task with given name, environments dir/file, dev mode and java version.
-void createTestTask(String name, String desc, String environments, int javaVersion, Modifiers... modifiers) {
+// -1 on the timeout means it'll be disabled.
+void createTestTask(String name, String desc, String environments, int javaVersion, long timeout, Modifiers... modifiers) {
+ if (timeout == 0)
+ timeout = 300000 // 5 minutes
boolean junit = modifiers.contains(Modifiers.JUNIT)
+ boolean releaseDocs = modifiers.contains(Modifiers.GEN_RELEASE_DOCS)
+ boolean docs = modifiers.contains(Modifiers.GEN_NIGHTLY_DOCS) || releaseDocs
+ def artifact = 'build' + File.separator + 'libs' + File.separator
+ if (junit) {
+ artifact += 'Skript-JUnit.jar'
+ } else if (releaseDocs) {
+ artifact += 'Skript-' + version + '.jar'
+ } else {
+ artifact += 'Skript-nightly.jar'
+ }
tasks.register(name, JavaExec) {
- description = desc;
- dependsOn licenseTest
+ description = desc
if (junit) {
dependsOn testJar
+ } else if (releaseDocs) {
+ dependsOn githubRelease, testNaming
} else {
dependsOn nightlyRelease, testNaming
}
@@ -203,21 +200,22 @@ void createTestTask(String name, String desc, String environments, int javaVersi
}
group = 'execution'
classpath = files([
- 'build' + File.separator + 'libs' + File.separator + (junit ? 'Skript-JUnit.jar' : 'Skript-nightly.jar'),
+ artifact,
project.configurations.runtimeClasspath.find { it.name.startsWith('gson') },
sourceSets.main.runtimeClasspath
])
main = 'ch.njol.skript.test.platform.PlatformMain'
args = [
'build/test_runners',
- junit ? 'src/test/skript/tests/junit' : 'src/test/skript/tests',
+ junit ? 'src/test/skript/junit' : 'src/test/skript/tests',
'src/test/resources/runner_data',
environments,
modifiers.contains(Modifiers.DEV_MODE),
- modifiers.contains(Modifiers.GEN_DOCS),
+ docs,
junit,
modifiers.contains(Modifiers.DEBUG),
- project.findProperty('verbosity') ?: "null"
+ project.findProperty('verbosity') ?: "null",
+ timeout
]
// Do first is used when throwing exceptions.
@@ -226,16 +224,23 @@ void createTestTask(String name, String desc, String environments, int javaVersi
if (!gradle.taskGraph.hasTask(":tasks") && !gradle.startParameter.dryRun && modifiers.contains(Modifiers.PROFILE)) {
if (!project.hasProperty('profiler'))
throw new MissingPropertyException('Add parameter -Pprofiler=-ea is used to enable them.
+## Code Complexity
+
+Dense, highly-complex code should be avoided to preserve readability and to help with future maintenance,
+especially within a single method body.
+
+There are many available metrics for measuring code complexity (for different purposes); [we have our own](https://stable.skriptlang.org/Radical_Complexity.pdf).
+There are no strict limits for code complexity, but you may be encouraged (or required) to reformat or break up methods
+into smaller, more manageable chunks. If in doubt, keep things simple.
## Minecraft Features
diff --git a/gradle.properties b/gradle.properties
index 220737a816b..469d1e072ce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,11 @@
+# Done to increase the memory available to gradle.
+# Ensure encoding is consistent across systems.
+org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+
groupid=ch.njol
name=skript
-version=2.7.0-beta2
+version=2.8.7
jarName=Skript.jar
-testEnv=java17/paper-1.19.4
-testEnvJavaVersion=17
+testEnv=java21/paper-1.21.0
+testEnvJavaVersion=21
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710d..7f93135c49b 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc10b601f7c..b82aa23a4f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421cc..0adc8e1a532 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
done
fi
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
diff --git a/licenseheader.txt b/licenseheader.txt
deleted file mode 100644
index 15be760be16..00000000000
--- a/licenseheader.txt
+++ /dev/null
@@ -1,16 +0,0 @@
- 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
* Once you made sure that Skript is loaded you can use
* Note that this method doesn't work properly if multiple methods with the same name and parameters exist but have different return types.
- *
+ *
* @param c The class
* @param methodName The name of the method
* @param parameterTypes The parameter types of the method
@@ -1053,10 +1091,10 @@ public static boolean methodExists(final Class c, final String methodName, fi
return false;
}
}
-
+
/**
* Tests whether a field exists in the given class.
- *
+ *
* @param c The class
* @param fieldName The name of the field
* @return Whether the given field exists.
@@ -1071,23 +1109,23 @@ public static boolean fieldExists(final Class c, final String fieldName) {
return false;
}
}
-
+
@Nullable
static Metrics metrics;
-
+
@Nullable
public static Metrics getMetrics() {
return metrics;
}
-
+
@SuppressWarnings("null")
private final static Collection
* All registered Closeables will be closed after all scripts have been stopped.
- *
+ *
* @param closeable
*/
public static void closeOnDisable(final Closeable closeable) {
@@ -1136,7 +1174,17 @@ public void onPluginDisable(PluginDisableEvent event) {
try {
// Spigot removed the mapping for this method in 1.18, so its back to obfuscated method
// 1.19 mapping is u and 1.18 is v
- String isRunningMethod = Skript.isRunningMinecraft(1, 19) ? "u" : Skript.isRunningMinecraft(1, 18) ? "v" :"isRunning";
+ String isRunningMethod = "isRunning";
+
+ if (Skript.isRunningMinecraft(1, 20, 5)) {
+ isRunningMethod = "x";
+ } else if (Skript.isRunningMinecraft(1, 20)) {
+ isRunningMethod = "v";
+ } else if (Skript.isRunningMinecraft(1, 19)) {
+ isRunningMethod = "u";
+ } else if (Skript.isRunningMinecraft(1, 18)) {
+ isRunningMethod = "v";
+ }
IS_RUNNING = MC_SERVER.getClass().getMethod(isRunningMethod);
} catch (NoSuchMethodException e) {
throw new RuntimeException(e);
@@ -1168,13 +1216,14 @@ public void onDisable() {
if (disabled)
return;
disabled = true;
+ this.experimentRegistry = null;
if (!partDisabled) {
beforeDisable();
}
-
+
Bukkit.getScheduler().cancelTasks(this);
-
+
for (Closeable c : closeOnDisable) {
try {
c.close();
@@ -1183,46 +1232,46 @@ public void onDisable() {
}
}
}
-
+
// ================ CONSTANTS, OPTIONS & OTHER ================
-
+
public final static String SCRIPTSFOLDER = "scripts";
-
+
public static void outdatedError() {
error("Skript v" + getInstance().getDescription().getVersion() + " is not fully compatible with Bukkit " + Bukkit.getVersion() + ". Some feature(s) will be broken until you update Skript.");
}
-
+
public static void outdatedError(final Exception e) {
outdatedError();
if (testing())
e.printStackTrace();
}
-
+
/**
* A small value, useful for comparing doubles or floats.
*
* E.g. to test whether two floating-point numbers are equal:
- *
+ *
* Skript.getInstance() whenever you need a reference to the plugin, but you likely won't need it since all API
* methods are static.
- *
+ *
* @author Peter Güttinger
* @see #registerAddon(JavaPlugin)
* @see #registerCondition(Class, String...)
@@ -182,34 +184,34 @@
* @see Converters#registerConverter(Class, Class, Converter)
*/
public final class Skript extends JavaPlugin implements Listener {
-
+
// ================ PLUGIN ================
-
+
@Nullable
private static Skript instance = null;
-
+
private static boolean disabled = false;
private static boolean partDisabled = false;
-
+
public static Skript getInstance() {
final Skript i = instance;
if (i == null)
throw new IllegalStateException();
return i;
}
-
+
/**
* Current updater instance used by Skript.
*/
@Nullable
private SkriptUpdater updater;
-
+
public Skript() throws IllegalStateException {
if (instance != null)
throw new IllegalStateException("Cannot create multiple instances of Skript!");
instance = this;
}
-
+
private static Version minecraftVersion = new Version(666), UNKNOWN_VERSION = new Version(666);
private static ServerPlatform serverPlatform = ServerPlatform.BUKKIT_UNKNOWN; // Start with unknown... onLoad changes this
@@ -227,24 +229,26 @@ public static void updateMinecraftVersion() {
minecraftVersion = new Version("" + m.group());
}
}
-
+
@Nullable
private static Version version = null;
-
+ @Deprecated(forRemoval = true) // TODO this field will be replaced by a proper registry later
+ private static @UnknownNullability ExperimentRegistry experimentRegistry;
+
public static Version getVersion() {
final Version v = version;
if (v == null)
throw new IllegalStateException();
return v;
}
-
+
public static final Message
m_invalid_reload = new Message("skript.invalid reload"),
m_finished_loading = new Message("skript.finished loading"),
m_no_errors = new Message("skript.no errors"),
m_no_scripts = new Message("skript.no scripts");
private static final PluralizingArgsMessage m_scripts_loaded = new PluralizingArgsMessage("skript.scripts loaded");
-
+
public static ServerPlatform getServerPlatform() {
if (classExists("net.glowstone.GlowServer")) {
return ServerPlatform.BUKKIT_GLOWSTONE; // Glowstone has timings too, so must check for it first
@@ -270,7 +274,7 @@ private static boolean using32BitJava() {
// Property returned should either be "Java HotSpot(TM) 32-Bit Server VM" or "OpenJDK 32-Bit Server VM" if 32-bit and using OracleJDK/OpenJDK
return System.getProperty("java.vm.name").contains("32");
}
-
+
/**
* Checks if server software and Minecraft version are supported.
* Prints errors or warnings to console if something is wrong.
@@ -287,7 +291,7 @@ private static boolean checkServerPlatform() {
minecraftVersion = new Version("" + m.group());
}
Skript.debug("Loading for Minecraft " + minecraftVersion);
-
+
// Check that MC version is supported
if (!isRunningMinecraft(1, 9)) {
// Prevent loading when not running at least Minecraft 1.9
@@ -296,7 +300,7 @@ private static boolean checkServerPlatform() {
Skript.error("Note that those versions are, of course, completely unsupported!");
return false;
}
-
+
// Check that current server platform is somewhat supported
serverPlatform = getServerPlatform();
Skript.debug("Server platform: " + serverPlatform);
@@ -316,7 +320,7 @@ private static boolean checkServerPlatform() {
Skript.warning("It will still probably work, but if it does not, you are on your own.");
Skript.warning("Skript officially supports Paper and Spigot.");
}
-
+
// If nothing got triggered, everything is probably ok
return true;
}
@@ -328,7 +332,7 @@ private static boolean checkServerPlatform() {
* Checks whether a hook has been enabled.
* @param hook The hook to check.
* @return Whether the hook is enabled.
- * @see #disableHookRegistration(Class[])
+ * @see #disableHookRegistration(Class[])
*/
public static boolean isHookEnabled(Class> hook) {
return !disabledHookRegistrations.contains(hook);
@@ -346,7 +350,7 @@ public static boolean isFinishedLoadingHooks() {
* Disables the registration for the given hook classes. If Skript has been enabled, this method
* will throw an API exception. It should be used in something like {@link JavaPlugin#onLoad()}.
* @param hooks The hooks to disable the registration of.
- * @see #isHookEnabled(Class)
+ * @see #isHookEnabled(Class)
*/
@SafeVarargs
public static void disableHookRegistration(Class>... hooks) {
@@ -362,6 +366,13 @@ public static void disableHookRegistration(Class>... hooks) {
*/
private File scriptsFolder;
+ /**
+ * @return The manager for experimental, optional features.
+ */
+ public static ExperimentRegistry experiments() {
+ return experimentRegistry;
+ }
+
/**
* @return The folder containing all Scripts.
*/
@@ -371,7 +382,7 @@ public File getScriptsFolder() {
scriptsFolder.mkdirs();
return scriptsFolder;
}
-
+
@Override
public void onEnable() {
Bukkit.getPluginManager().registerEvents(this, this);
@@ -380,11 +391,11 @@ public void onEnable() {
setEnabled(false);
return;
}
-
+
handleJvmArguments(); // JVM arguments
-
+
version = new Version("" + getDescription().getVersion()); // Skript version
-
+
// Start the updater
// Note: if config prohibits update checks, it will NOT do network connections
try {
@@ -392,7 +403,9 @@ public void onEnable() {
} catch (Exception e) {
Skript.exception(e, "Update checker could not be initialized.");
}
-
+ experimentRegistry = new ExperimentRegistry(this);
+ Feature.registerAll(getAddonInstance(), experimentRegistry);
+
if (!getDataFolder().isDirectory())
getDataFolder().mkdirs();
@@ -468,7 +481,7 @@ public void onEnable() {
// initialize the Skript addon instance
getAddonInstance();
-
+
// Load classes which are always safe to use
new JavaClasses(); // These may be needed in configuration
@@ -487,15 +500,15 @@ public void onEnable() {
} catch (Throwable e) {
classLoadError = e;
}
-
+
// Config must be loaded after Java and Skript classes are parseable
// ... but also before platform check, because there is a config option to ignore some errors
SkriptConfig.load();
-
+
// Now override the verbosity if test mode is enabled
if (TestMode.VERBOSITY != null)
SkriptLogger.setVerbosity(Verbosity.valueOf(TestMode.VERBOSITY));
-
+
// Use the updater, now that it has been configured to (not) do stuff
if (updater != null) {
CommandSender console = Bukkit.getConsoleSender();
@@ -517,28 +530,29 @@ public void onEnable() {
throw e; // Uh oh, this shouldn't happen. Re-throw the error.
}
}
-
+
// If loading can continue (platform ok), check for potentially thrown error
if (classLoadError != null) {
exception(classLoadError);
setEnabled(false);
return;
}
-
+
PluginCommand skriptCommand = getCommand("skript");
assert skriptCommand != null; // It is defined, unless build is corrupted or something like that
skriptCommand.setExecutor(new SkriptCommand());
skriptCommand.setTabCompleter(new SkriptCommandTabCompleter());
-
+
// Load Bukkit stuff. It is done after platform check, because something might be missing!
new BukkitEventValues();
-
+
new DefaultComparators();
new DefaultConverters();
new DefaultFunctions();
-
+ new DefaultOperations();
+
ChatMessages.registerListeners();
-
+
try {
getAddonInstance().loadClasses("ch.njol.skript",
"conditions", "effects", "events", "expressions", "entity", "sections", "structures");
@@ -549,17 +563,17 @@ public void onEnable() {
}
Commands.registerListeners();
-
+
if (logNormal())
info(" " + Language.get("skript.copyright"));
-
+
final long tick = testing() ? Bukkit.getWorlds().get(0).getFullTime() : 0;
Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
@SuppressWarnings("synthetic-access")
@Override
public void run() {
assert Bukkit.getWorlds().get(0).getFullTime() == tick;
-
+
// Load hooks from Skript jar
try {
try (JarFile jar = new JarFile(getFile())) {
@@ -587,68 +601,69 @@ public void run() {
Skript.exception(e);
}
finishedLoadingHooks = true;
-
+
if (TestMode.ENABLED) {
info("Preparing Skript for testing...");
tainted = true;
try {
getAddonInstance().loadClasses("ch.njol.skript.test.runner");
+ if (TestMode.JUNIT)
+ getAddonInstance().loadClasses("org.skriptlang.skript.test.junit.registration");
} catch (IOException e) {
Skript.exception("Failed to load testing environment.");
Bukkit.getServer().shutdown();
}
}
-
+
stopAcceptingRegistrations();
-
-
+
+
Documentation.generate(); // TODO move to test classes?
-
- Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.this, () -> {
- if (logNormal())
- info("Loading variables...");
- long vls = System.currentTimeMillis();
-
- LogHandler h = SkriptLogger.startLogHandler(new ErrorDescLogHandler() {
- @Override
- public LogResult log(final LogEntry entry) {
- super.log(entry);
- if (entry.level.intValue() >= Level.SEVERE.intValue()) {
- logEx(entry.message); // no [Skript] prefix
- return LogResult.DO_NOT_LOG;
- } else {
- return LogResult.LOG;
- }
- }
-
- @Override
- protected void beforeErrors() {
- logEx();
- logEx("===!!!=== Skript variable load error ===!!!===");
- logEx("Unable to load (all) variables:");
- }
-
- @Override
- protected void afterErrors() {
- logEx();
- logEx("Skript will work properly, but old variables might not be available at all and new ones may or may not be saved until Skript is able to create a backup of the old file and/or is able to connect to the database (which requires a restart of Skript)!");
- logEx();
+
+ // Variable loading
+ if (logNormal())
+ info("Loading variables...");
+ long vls = System.currentTimeMillis();
+
+ LogHandler h = SkriptLogger.startLogHandler(new ErrorDescLogHandler() {
+ @Override
+ public LogResult log(final LogEntry entry) {
+ super.log(entry);
+ if (entry.level.intValue() >= Level.SEVERE.intValue()) {
+ logEx(entry.message); // no [Skript] prefix
+ return LogResult.DO_NOT_LOG;
+ } else {
+ return LogResult.LOG;
}
- });
-
- try (CountingLogHandler c = new CountingLogHandler(SkriptLogger.SEVERE).start()) {
- if (!Variables.load())
- if (c.getCount() == 0)
- error("(no information available)");
- } finally {
- h.stop();
}
-
- long vld = System.currentTimeMillis() - vls;
- if (logNormal())
- info("Loaded " + Variables.numVariables() + " variables in " + ((vld / 100) / 10.) + " seconds");
+
+ @Override
+ protected void beforeErrors() {
+ logEx();
+ logEx("===!!!=== Skript variable load error ===!!!===");
+ logEx("Unable to load (all) variables:");
+ }
+
+ @Override
+ protected void afterErrors() {
+ logEx();
+ logEx("Skript will work properly, but old variables might not be available at all and new ones may or may not be saved until Skript is able to create a backup of the old file and/or is able to connect to the database (which requires a restart of Skript)!");
+ logEx();
+ }
});
-
+
+ try (CountingLogHandler c = new CountingLogHandler(SkriptLogger.SEVERE).start()) {
+ if (!Variables.load())
+ if (c.getCount() == 0)
+ error("(no information available)");
+ } finally {
+ h.stop();
+ }
+
+ long vld = System.currentTimeMillis() - vls;
+ if (logNormal())
+ info("Loaded " + Variables.numVariables() + " variables in " + ((vld / 100) / 10.) + " seconds");
+
// Skript initialization done
debug("Early init done");
@@ -687,11 +702,13 @@ protected void afterErrors() {
TestTracker.testFailed("exception was thrown during execution");
}
if (TestMode.JUNIT) {
- SkriptLogger.setVerbosity(Verbosity.DEBUG);
info("Running all JUnit tests...");
long milliseconds = 0, tests = 0, fails = 0, ignored = 0, size = 0;
try {
List
* Math.abs(a - b) < Skript.EPSILON
*
- *
+ *
* or whether a location is within a specific radius of another location:
- *
+ *
*
* location.distanceSquared(center) - radius * radius < Skript.EPSILON
*
- *
+ *
* @see #EPSILON_MULT
*/
public final static double EPSILON = 1e-10;
/**
* A value a bit larger than 1
- *
+ *
* @see #EPSILON
*/
public final static double EPSILON_MULT = 1.00001;
-
+
/**
* The maximum ID a block can have in Minecraft.
*/
@@ -1231,19 +1280,19 @@ public static void outdatedError(final Exception e) {
* The maximum data value of Minecraft, i.e. Short.MAX_VALUE - Short.MIN_VALUE.
*/
public final static int MAXDATAVALUE = Short.MAX_VALUE - Short.MIN_VALUE;
-
+
// TODO localise Infinity, -Infinity, NaN (and decimal point?)
public static String toString(final double n) {
return StringUtils.toString(n, SkriptConfig.numberAccuracy.value());
}
-
+
public final static UncaughtExceptionHandler UEH = new UncaughtExceptionHandler() {
@Override
public void uncaughtException(final @Nullable Thread t, final @Nullable Throwable e) {
Skript.exception(e, "Exception in thread " + (t == null ? null : t.getName()));
}
};
-
+
/**
* Creates a new Thread and sets its UncaughtExceptionHandler. The Thread is not started automatically.
*/
@@ -1252,38 +1301,38 @@ public static Thread newThread(final Runnable r, final String name) {
t.setUncaughtExceptionHandler(UEH);
return t;
}
-
+
// ================ REGISTRATIONS ================
-
+
private static boolean acceptRegistrations = true;
-
+
public static boolean isAcceptRegistrations() {
if (instance == null)
throw new IllegalStateException("Skript was never loaded");
return acceptRegistrations && instance.isEnabled();
}
-
+
public static void checkAcceptRegistrations() {
- if (!isAcceptRegistrations())
+ if (!isAcceptRegistrations() && !Skript.testing())
throw new SkriptAPIException("Registration can only be done during plugin initialization");
}
-
+
private static void stopAcceptingRegistrations() {
Converters.createChainedConverters();
acceptRegistrations = false;
-
+
Classes.onRegistrationsStop();
}
-
+
// ================ ADDONS ================
-
+
private final static HashMap