diff --git a/gradle.properties b/gradle.properties index 730b6810634..8b20c781540 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ groupid=ch.njol name=skript -version=2.5-alpha6 +version=2.5-beta1 diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java index 1cf7d5d02a1..3a5e3ac09ec 100644 --- a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java +++ b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java @@ -310,7 +310,7 @@ public Block deserialize(final String s) { "set target block of player to minecraft:oak_leaves[distance=2;persistent=false]") .after("itemtype") .requiredPlugins("Minecraft 1.13+") - .since("INSERT VERSION") + .since("2.5") .parser(new Parser() { @Nullable @Override @@ -1772,7 +1772,7 @@ public String getVariableNamePattern() { .description("The heal reason in a heal event.") .usage(regainReasons.getAllNames()) .examples("") - .since("INSERT VERSION") + .since("2.5") .parser(new Parser() { @Override @Nullable @@ -1863,24 +1863,25 @@ public String getVariableNamePattern() { }) ); } - - if (Skript.classExists("org.bukkit.persistence.PersistentDataHolder")) { - Classes.registerClass(new ClassInfo<>(PersistentDataHolder.class, "persistentdataholder") - .user("persistent data ?holders?") - .name("Persistent Data Holder") - .description( - "Represents something that can have persistent data. " - + "The following can all hold persistent data: " - + "entities, projectiles, items, banners, barrels, beds, beehives (1.15), bells, blast furnaces, " - + "brewing stands, campfires, chests, command blocks, comparators, conduits, mob spawners, " - + "daylight detectors, dispensers, droppers, enchanting tables, ender chests, end gateways, furnaces, " - + "hoppers, jigsaw blocks, jukeboxes, lecterns, shulker boxes, signs, skulls, smokers, and structure blocks. " - + "For the source list, see this page." - ) - .examples("set persistent data value \"epic\" of player to true") - .requiredPlugins("1.14 or newer") - .since("2.5")); - } + +// Temporarily disabled until bugs are fixed +// if (Skript.classExists("org.bukkit.persistence.PersistentDataHolder")) { +// Classes.registerClass(new ClassInfo<>(PersistentDataHolder.class, "persistentdataholder") +// .user("persistent data ?holders?") +// .name("Persistent Data Holder") +// .description( +// "Represents something that can have persistent data. " +// + "The following can all hold persistent data: " +// + "entities, projectiles, items, banners, barrels, beds, beehives (1.15), bells, blast furnaces, " +// + "brewing stands, campfires, chests, command blocks, comparators, conduits, mob spawners, " +// + "daylight detectors, dispensers, droppers, enchanting tables, ender chests, end gateways, furnaces, " +// + "hoppers, jigsaw blocks, jukeboxes, lecterns, shulker boxes, signs, skulls, smokers, and structure blocks. " +// + "For the source list, see this page." +// ) +// .examples("set persistent data value \"epic\" of player to true") +// .requiredPlugins("1.14 or newer") +// .since("2.5")); +// } if (Skript.classExists("org.bukkit.enchantments.EnchantmentOffer")) { Classes.registerClass(new ClassInfo<>(EnchantmentOffer.class, "enchantmentoffer") diff --git a/src/main/java/ch/njol/skript/conditions/CondHasRelationalVariable.java b/src/main/java/ch/njol/skript/conditions/CondHasRelationalVariable.java index 8f283c7444e..d30c31e88d4 100644 --- a/src/main/java/ch/njol/skript/conditions/CondHasRelationalVariable.java +++ b/src/main/java/ch/njol/skript/conditions/CondHasRelationalVariable.java @@ -51,7 +51,8 @@ public class CondHasRelationalVariable extends Condition { static { - if (Skript.isRunningMinecraft(1, 14)) { + // Temporarily disabled until bugs are fixed + if (false && Skript.isRunningMinecraft(1, 14)) { Skript.registerCondition(CondHasRelationalVariable.class, "%persistentdataholders/itemtypes/blocks% (has|have|holds) [(relational|relation( |-)based) variable[s]] %objects%", "%persistentdataholders/itemtypes/blocks% (doesn't|does not|do not|don't) (have|hold) [(relational|relation( |-)based) variable[s]] %objects%" diff --git a/src/main/java/ch/njol/skript/effects/EffStopServer.java b/src/main/java/ch/njol/skript/effects/EffStopServer.java index e0e3637edb0..2c068a8fa13 100644 --- a/src/main/java/ch/njol/skript/effects/EffStopServer.java +++ b/src/main/java/ch/njol/skript/effects/EffStopServer.java @@ -37,7 +37,7 @@ @Name("Stop Server") @Description("Stops or restarts the server. If restart is used when the restart-script spigot.yml option isn't defined, the server will stop instead.") @Examples({"stop the server", "restart server"}) -@Since("INSERT VERSION") +@Since("2.5") public class EffStopServer extends Effect { static { diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java index 43d1d44c8ba..221a0c19dd1 100644 --- a/src/main/java/ch/njol/skript/events/SimpleEvents.java +++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java @@ -346,7 +346,7 @@ public class SimpleEvents { .requiredPlugins("Paper") .examples("on projectile collide:", "\tteleport shooter of event-projectile to event-entity") - .since("INSERT VERSION"); + .since("2.5"); Skript.registerEvent("Shoot", SimpleEvent.class, ProjectileLaunchEvent.class, "[projectile] shoot") .description("Called whenever a projectile is shot. Use the shooter expression to get who shot the projectile.") .examples("on shoot:", @@ -574,6 +574,6 @@ public class SimpleEvents { .requiredPlugins("Minecraft 1.13 or newer") .examples("on block fertilize:", "\tsend \"Fertilized %size of fertilized blocks% blocks got fertilized.\"") - .since("INSERT VERSION"); + .since("2.5"); } } diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlockData.java b/src/main/java/ch/njol/skript/expressions/ExprBlockData.java index 51353f93f0a..82db431752a 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprBlockData.java +++ b/src/main/java/ch/njol/skript/expressions/ExprBlockData.java @@ -36,7 +36,7 @@ @Examples({"set {data} to block data of target block", "set block at player to {data}"}) @RequiredPlugins("Minecraft 1.13+") -@Since("INSERT VERSION") +@Since("2.5") public class ExprBlockData extends SimplePropertyExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java index 3de9a8e86a8..58d0d418791 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java +++ b/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java @@ -46,7 +46,7 @@ @RequiredPlugins("Minecraft 1.13 or newer") @Events("block fertilize") @Examples("the fertilized blocks") -@Since("INSERT VERSION") +@Since("2.5") public class ExprFertilizedBlocks extends SimpleExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprHealReason.java b/src/main/java/ch/njol/skript/expressions/ExprHealReason.java index a502fb51891..b72dc76f260 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprHealReason.java +++ b/src/main/java/ch/njol/skript/expressions/ExprHealReason.java @@ -43,7 +43,7 @@ @Examples({"on heal:", "\tif heal reason = satiated:", "\t\tsend \"You ate enough food and gained health back!\" to player"}) -@Since("INSERT VERSION") +@Since("2.5") public class ExprHealReason extends SimpleExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java b/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java index 4383b433dfe..196bc402daa 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java +++ b/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java @@ -39,7 +39,7 @@ "\ttrigger:", "\t\tsend \"You have been online for %difference between player's last login and now%.\"", "\t\tsend \"You first joined the server %difference between player's first login and now% ago.\""}) -@Since("INSERT VERSION") +@Since("2.5") public class ExprLastLoginTime extends SimplePropertyExpression { private static boolean LAST_LOGIN = Skript.methodExists(OfflinePlayer.class, "getLastLogin"); diff --git a/src/main/java/ch/njol/skript/expressions/ExprRelationalVariable.java b/src/main/java/ch/njol/skript/expressions/ExprRelationalVariable.java index bf60dbc629f..58f0a7ee734 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprRelationalVariable.java +++ b/src/main/java/ch/njol/skript/expressions/ExprRelationalVariable.java @@ -66,7 +66,8 @@ public class ExprRelationalVariable extends SimpleExpression { static { - if (Skript.isRunningMinecraft(1, 14)) { + // Temporarily disabled until bugs are fixed + if (false && Skript.isRunningMinecraft(1, 14)) { Skript.registerExpression(ExprRelationalVariable.class, Object.class, ExpressionType.PROPERTY, "[(relational|relation( |-)based) variable[s]] %objects% of %persistentdataholders/itemtypes/blocks%" ); diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRelationalVariable.sk b/src/test/skript/tests/syntaxes/expressions/ExprRelationalVariable.sk index e1062e7c738..bcc587dbfc5 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprRelationalVariable.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprRelationalVariable.sk @@ -1,4 +1,4 @@ -test "relational variables expression/condition" when minecraft version is "1.15.2": +test "relational variables expression/condition" when minecraft version is "1.99": #temporarily disabling this test # Test entities holding relational variables