From 45eaaae5c7049575cef72069b6cbf5d0d210f126 Mon Sep 17 00:00:00 2001 From: bensku Date: Sat, 11 Jan 2020 18:05:58 +0200 Subject: [PATCH] Prepare for release --- gradle.properties | 2 +- .../ch/njol/skript/classes/data/DefaultFunctions.java | 2 +- src/main/java/ch/njol/skript/conditions/CondAI.java | 2 +- .../ch/njol/skript/conditions/CondHasCustomModelData.java | 2 +- .../ch/njol/skript/conditions/CondIsInvulnerable.java | 2 +- .../java/ch/njol/skript/conditions/CondIsRiptiding.java | 2 +- src/main/java/ch/njol/skript/conditions/CondIsSilent.java | 2 +- .../java/ch/njol/skript/conditions/CondIsTameable.java | 2 +- src/main/java/ch/njol/skript/conditions/CondLeashed.java | 2 +- src/main/java/ch/njol/skript/effects/EffBan.java | 2 +- .../java/ch/njol/skript/effects/EffInvulnerability.java | 2 +- src/main/java/ch/njol/skript/effects/EffReplace.java | 2 +- src/main/java/ch/njol/skript/effects/EffSilence.java | 2 +- src/main/java/ch/njol/skript/events/EvtItem.java | 2 +- src/main/java/ch/njol/skript/events/SimpleEvents.java | 8 ++++---- src/main/java/ch/njol/skript/expressions/ExprAI.java | 2 +- .../ch/njol/skript/expressions/ExprAbsorbedBlocks.java | 2 +- .../njol/skript/expressions/ExprClientViewDistance.java | 2 +- .../ch/njol/skript/expressions/ExprCustomModelData.java | 2 +- .../java/ch/njol/skript/expressions/ExprEntityTamer.java | 2 +- .../ch/njol/skript/expressions/ExprExplodedBlocks.java | 2 +- .../java/ch/njol/skript/expressions/ExprHotbarButton.java | 2 +- .../skript/expressions/ExprItemWithCustomModelData.java | 2 +- .../ch/njol/skript/expressions/ExprMaxDurability.java | 2 +- .../njol/skript/expressions/ExprNumberOfCharacters.java | 2 +- .../java/ch/njol/skript/expressions/ExprStringCase.java | 2 +- .../java/ch/njol/skript/expressions/ExprTimePlayed.java | 2 +- .../java/ch/njol/skript/expressions/ExprUnixDate.java | 2 +- .../ch/njol/skript/tests/runner/CondMinecraftVersion.java | 2 +- src/main/java/ch/njol/skript/tests/runner/EffAssert.java | 2 +- .../java/ch/njol/skript/tests/runner/EvtTestCase.java | 2 +- .../java/ch/njol/skript/tests/runner/TestFunctions.java | 2 +- 32 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gradle.properties b/gradle.properties index 70d68e8d921..8797e0f71ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ groupid=ch.njol name=skript -version=2.4.1 +version=2.5-alpha1 diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java index cd736ede67e..d138f375e89 100644 --- a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java +++ b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java @@ -427,7 +427,7 @@ public ColorRGB[] execute(FunctionEvent e, Object[][] params) { } }).description("Returns a RGB color from the given red, green and blue parameters.") .examples("dye player's leggings rgb(120, 30, 45)") - .since("INSERT VERSION"); + .since("2.5"); } } diff --git a/src/main/java/ch/njol/skript/conditions/CondAI.java b/src/main/java/ch/njol/skript/conditions/CondAI.java index 998d6ed4026..014fe9c195b 100644 --- a/src/main/java/ch/njol/skript/conditions/CondAI.java +++ b/src/main/java/ch/njol/skript/conditions/CondAI.java @@ -30,7 +30,7 @@ @Name("Has AI") @Description("Checks whether an entity has AI.") @Examples("target entity has ai") -@Since("INSERT VERSION") +@Since("2.5") public class CondAI extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java b/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java index a05eaab006d..10ecdeda1fd 100644 --- a/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java +++ b/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java @@ -34,7 +34,7 @@ @Description("Check if an item has a custom model data tag") @Examples("player's tool has custom model data") @RequiredPlugins("1.14+") -@Since("INSERT VERSION") +@Since("2.5") public class CondHasCustomModelData extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java b/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java index 580b15e202b..17898d57552 100644 --- a/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java +++ b/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java @@ -30,7 +30,7 @@ @Name("Is Invulnerable") @Description("Checks whether an entity is invulnerable.") @Examples("target entity is invulnerable") -@Since("INSERT VERSION") +@Since("2.5") public class CondIsInvulnerable extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java b/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java index 49494f5f9cc..dc799a1f89a 100644 --- a/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java +++ b/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java @@ -31,7 +31,7 @@ @Name("Is Riptiding") @Description("Checks to see if an entity is currently using the Riptide enchantment.") @Examples("target entity is riptiding") -@Since("INSERT VERSION") +@Since("2.5") public class CondIsRiptiding extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSilent.java b/src/main/java/ch/njol/skript/conditions/CondIsSilent.java index de58a6fc375..1f49ebd4b68 100644 --- a/src/main/java/ch/njol/skript/conditions/CondIsSilent.java +++ b/src/main/java/ch/njol/skript/conditions/CondIsSilent.java @@ -30,7 +30,7 @@ @Name("Is Silent") @Description("Checks whether an entity is silent i.e. its sounds are disabled.") @Examples("target entity is silent") -@Since("INSERT VERSION") +@Since("2.5") public class CondIsSilent extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/conditions/CondIsTameable.java b/src/main/java/ch/njol/skript/conditions/CondIsTameable.java index f37b00568ef..7795710fd5a 100644 --- a/src/main/java/ch/njol/skript/conditions/CondIsTameable.java +++ b/src/main/java/ch/njol/skript/conditions/CondIsTameable.java @@ -33,7 +33,7 @@ @Examples({"on damage:", "\tif victim is tameable:", "\t\tcancel event"}) -@Since("INSERT VERSION") +@Since("2.5") public class CondIsTameable extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/conditions/CondLeashed.java b/src/main/java/ch/njol/skript/conditions/CondLeashed.java index 57baf0491f9..b5d9e024fee 100644 --- a/src/main/java/ch/njol/skript/conditions/CondLeashed.java +++ b/src/main/java/ch/njol/skript/conditions/CondLeashed.java @@ -29,7 +29,7 @@ @Name("Is Leashed") @Description("Checks to see if an entity is currently leashed.") @Examples("target entity is leashed") -@Since("INSERT VERSION") +@Since("2.5") public class CondLeashed extends PropertyCondition { static { diff --git a/src/main/java/ch/njol/skript/effects/EffBan.java b/src/main/java/ch/njol/skript/effects/EffBan.java index 8e755ee995d..9060675edb6 100644 --- a/src/main/java/ch/njol/skript/effects/EffBan.java +++ b/src/main/java/ch/njol/skript/effects/EffBan.java @@ -53,7 +53,7 @@ "ban \"127.0.0.1\"", "IP-ban the player because \"he is an idiot\"", "ban player due to \"inappropriate language\" for 2 days"}) -@Since("1.4, 2.1.1 (ban reason), INSERT VERSION (timespan)") +@Since("1.4, 2.1.1 (ban reason), 2.5 (timespan)") public class EffBan extends Effect { static { diff --git a/src/main/java/ch/njol/skript/effects/EffInvulnerability.java b/src/main/java/ch/njol/skript/effects/EffInvulnerability.java index 9826691de4c..f0870b5a923 100644 --- a/src/main/java/ch/njol/skript/effects/EffInvulnerability.java +++ b/src/main/java/ch/njol/skript/effects/EffInvulnerability.java @@ -36,7 +36,7 @@ @Name("Make Invulnerable") @Description("Makes an entity invulnerable/not invulnerable.") @Examples("make target entity invulnerable") -@Since("INSERT VERSION") +@Since("2.5") public class EffInvulnerability extends Effect { static { diff --git a/src/main/java/ch/njol/skript/effects/EffReplace.java b/src/main/java/ch/njol/skript/effects/EffReplace.java index 4acb0feda05..7563ba17846 100644 --- a/src/main/java/ch/njol/skript/effects/EffReplace.java +++ b/src/main/java/ch/njol/skript/effects/EffReplace.java @@ -58,7 +58,7 @@ " replace all \"kys\", \"idiot\" and \"noob\" with \"****\" in the message", " ", "replace all stone and dirt in player's inventory and player's top inventory with diamond"}) -@Since("2.0, 2.2-dev24 (replace in muliple strings and replace items in inventory), INSERT VERSION (replace first, case sensitivity)") +@Since("2.0, 2.2-dev24 (replace in muliple strings and replace items in inventory), 2.5 (replace first, case sensitivity)") public class EffReplace extends Effect { static { Skript.registerEffect(EffReplace.class, diff --git a/src/main/java/ch/njol/skript/effects/EffSilence.java b/src/main/java/ch/njol/skript/effects/EffSilence.java index 27d871874ee..e31dc78b781 100644 --- a/src/main/java/ch/njol/skript/effects/EffSilence.java +++ b/src/main/java/ch/njol/skript/effects/EffSilence.java @@ -36,7 +36,7 @@ @Name("Silence Entity") @Description("Controls whether or not an entity is silent.") @Examples("make target entity silent") -@Since("INSERT VERSION") +@Since("2.5") public class EffSilence extends Effect { static { diff --git a/src/main/java/ch/njol/skript/events/EvtItem.java b/src/main/java/ch/njol/skript/events/EvtItem.java index d03b516c0cd..cd3de25eb05 100644 --- a/src/main/java/ch/njol/skript/events/EvtItem.java +++ b/src/main/java/ch/njol/skript/events/EvtItem.java @@ -81,7 +81,7 @@ public class EvtItem extends SkriptEvent { "[(player|1¦entity)] (pick[ ]up|picking up) [[of] %itemtypes%]") .description("Called when a player/entity picks up an item. Please note that the item is still on the ground when this event is called.") .examples("on pick up:", "on entity pickup of wheat:") - .since("unknown (before 2.1), INSERT VERSION (entity)") + .since("unknown (before 2.1), 2.5 (entity)") .requiredPlugins("1.12.2+ for entity"); } else { Skript.registerEvent("Pick Up", EvtItem.class, PlayerPickupItemEvent.class, "[player] (pick[ ]up|picking up) [[of] %itemtypes%]") diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java index d8ca44a5b5f..318c269f09c 100644 --- a/src/main/java/ch/njol/skript/events/SimpleEvents.java +++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java @@ -270,7 +270,7 @@ public class SimpleEvents { .description("Called when an item is damaged. Most tools are damaged by using them; armor is damaged when the wearer takes damage.") .examples("on item damage:", "\tcancel event") - .since("INSERT VERSION"); + .since("2.5"); Skript.registerEvent("Tool Change", SimpleEvent.class, PlayerItemHeldEvent.class, "[player['s]] (tool|item held|held item) chang(e|ing)") .description("Called whenever a player changes their held item by selecting a different slot (e.g. the keys 1-9 or the mouse wheel), not by dropping or replacing the item in the current slot.") .examples("on player's held item change:") @@ -524,7 +524,7 @@ public class SimpleEvents { "Note: the riptide action is performed client side, so manipulating the player in this event may have undesired effects.") .examples("on riptide:", " send \"You are riptiding!\"") - .since("INSERT VERSION"); + .since("2.5"); } if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerArmorChangeEvent")) { Skript.registerEvent("Armor Change", SimpleEvent.class, PlayerArmorChangeEvent.class, "[player] armor change[d]") @@ -532,7 +532,7 @@ public class SimpleEvents { .requiredPlugins("Paper") .examples("on armor change:", " send \"You equipped %event-item%!\"") - .since("INSERT VERSION"); + .since("2.5"); } if (Skript.classExists("org.bukkit.event.block.SpongeAbsorbEvent")) { Skript.registerEvent("Sponge Absorb", SimpleEvent.class, SpongeAbsorbEvent.class, "sponge absorb") @@ -541,7 +541,7 @@ public class SimpleEvents { .examples("on sponge absorb:", "\tloop absorbed blocks:", "\t\tbroadcast \"%loop-block% was absorbed by a sponge\"!") - .since("INSERT VERSION"); + .since("2.5"); } } } diff --git a/src/main/java/ch/njol/skript/expressions/ExprAI.java b/src/main/java/ch/njol/skript/expressions/ExprAI.java index d72b794fb5a..9cdabfcca43 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprAI.java +++ b/src/main/java/ch/njol/skript/expressions/ExprAI.java @@ -34,7 +34,7 @@ @Name("Entity AI") @Description("Returns whether an entity has AI.") @Examples("set artificial intelligence of target entity to false") -@Since("INSERT VERSION") +@Since("2.5") public class ExprAI extends SimplePropertyExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java index 9091b4128ec..fe7e0cd57e0 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java +++ b/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java @@ -46,7 +46,7 @@ @Description("The blocks absorbed by a sponge block.") @Events("sponge absorb") @Examples("the absorbed blocks") -@Since("INSERT VERSION") +@Since("2.5") public class ExprAbsorbedBlocks extends SimpleExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java b/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java index b0eebb2709b..04c3e2d8569 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java +++ b/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java @@ -35,7 +35,7 @@ "This differs from the server side view distance of player as this will retrieve the view distance the player has set on their client.") @Examples({"set {_clientView} to the client view distance of player", "set view distance of player to client view distance of player"}) @RequiredPlugins("1.13.2+") -@Since("INSERT VERSION") +@Since("2.5") public class ExprClientViewDistance extends SimplePropertyExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java b/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java index 8fb547b707f..9dfc90f897b 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java +++ b/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java @@ -39,7 +39,7 @@ @Examples({"set custom model data of player's tool to 3", "set {_model} to custom model data of player's tool"}) @RequiredPlugins("1.14+") -@Since("INSERT VERSION") +@Since("2.5") public class ExprCustomModelData extends SimplePropertyExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java b/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java index 0a02c0d3a27..09eba9bccab 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java +++ b/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java @@ -38,7 +38,7 @@ @Examples({"set owner of target entity to player", "delete owner of target entity", "set {_t} to uuid of tamer of target entity"}) -@Since("INSERT VERSION") +@Since("2.5") public class ExprEntityTamer extends SimplePropertyExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java index 6428ada6aae..ecb01598fbc 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java +++ b/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java @@ -45,7 +45,7 @@ "\tloop exploded blocks:", "\t\tadd loop-block to {exploded::blocks::*}"}) @Events("explode") -@Since("INSERT VERSION") +@Since("2.5") public class ExprExplodedBlocks extends SimpleExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java b/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java index ce5cbf32375..b9117891d7d 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java +++ b/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java @@ -39,7 +39,7 @@ @Description("The hotbar button clicked in an { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java b/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java index daf986049d7..82d6b142a8c 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java +++ b/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java @@ -40,7 +40,7 @@ "\tif number of uppercase chars in message / length of message > 0.5", "\t\tcancel event", "\t\tsend \"Your message has to many caps!\" to player"}) -@Since("INSERT VERSION") +@Since("2.5") public class ExprNumberOfCharacters extends SimpleExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprStringCase.java b/src/main/java/ch/njol/skript/expressions/ExprStringCase.java index 4b87bbdd2d1..fea155e0792 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprStringCase.java +++ b/src/main/java/ch/njol/skript/expressions/ExprStringCase.java @@ -55,7 +55,7 @@ "\"What is your name?\" in kebab case # What-is-your-name?", "\"What is your name?\" in lower kebab case # what-is-your-name?", "\"What is your name?\" in upper kebab case # WHAT-IS-YOUR-NAME?"}) -@Since("2.2-dev16 (lowercase and uppercase), INSERT VERSION (advanced cases)") +@Since("2.2-dev16 (lowercase and uppercase), 2.5 (advanced cases)") public class ExprStringCase extends SimpleExpression { static { diff --git a/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java b/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java index 518fd9f71a9..df5e4d48c99 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java +++ b/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java @@ -44,7 +44,7 @@ "if player's time played is greater than 10 minutes:", "\tgive player a diamond sword", "set player's time played to 0 seconds"}) -@Since("INSERT VERSION") +@Since("2.5") public class ExprTimePlayed extends SimplePropertyExpression { private final static Statistic TIME_PLAYED; diff --git a/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java b/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java index 48b97f30e48..c068958459d 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java +++ b/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java @@ -31,7 +31,7 @@ @Name("Unix Date") @Description("Converts given Unix timestamp to a date. The Unix timespan represents the number of seconds elapsed since 1 January 1970.") @Examples("unix date of 946684800 #1 January 2000 12:00 AM (UTC Time)") -@Since("INSERT VERSION") +@Since("2.5") public class ExprUnixDate extends SimplePropertyExpression { static { diff --git a/src/main/java/ch/njol/skript/tests/runner/CondMinecraftVersion.java b/src/main/java/ch/njol/skript/tests/runner/CondMinecraftVersion.java index d093981d7d0..f067baaa480 100644 --- a/src/main/java/ch/njol/skript/tests/runner/CondMinecraftVersion.java +++ b/src/main/java/ch/njol/skript/tests/runner/CondMinecraftVersion.java @@ -36,7 +36,7 @@ @Name("Running Minecraft") @Description("Checks if current Minecraft version is given version or newer.") @Examples("running minecraft \"1.14\"") -@Since("INSERT VERSION") +@Since("2.5") public class CondMinecraftVersion extends Condition { static { diff --git a/src/main/java/ch/njol/skript/tests/runner/EffAssert.java b/src/main/java/ch/njol/skript/tests/runner/EffAssert.java index 1f33fe458be..288461bd3ef 100644 --- a/src/main/java/ch/njol/skript/tests/runner/EffAssert.java +++ b/src/main/java/ch/njol/skript/tests/runner/EffAssert.java @@ -38,7 +38,7 @@ @Name("Assert") @Description("Assert that condition is true. Test fails when it is not.") @Examples("") -@Since("INSERT VERSION") +@Since("2.5") public class EffAssert extends Effect { static { diff --git a/src/main/java/ch/njol/skript/tests/runner/EvtTestCase.java b/src/main/java/ch/njol/skript/tests/runner/EvtTestCase.java index cd4a08c7248..cd8b0ec7d59 100644 --- a/src/main/java/ch/njol/skript/tests/runner/EvtTestCase.java +++ b/src/main/java/ch/njol/skript/tests/runner/EvtTestCase.java @@ -37,7 +37,7 @@ public class EvtTestCase extends SkriptEvent { Skript.registerEvent("Test Case", EvtTestCase.class, SkriptTestEvent.class, "test %string% [when <.+>]") .description("Contents represent one test case.") .examples("") - .since("INSERT VERSION"); + .since("2.5"); } @SuppressWarnings("null") diff --git a/src/main/java/ch/njol/skript/tests/runner/TestFunctions.java b/src/main/java/ch/njol/skript/tests/runner/TestFunctions.java index b263dd2dee4..c0d524d940c 100644 --- a/src/main/java/ch/njol/skript/tests/runner/TestFunctions.java +++ b/src/main/java/ch/njol/skript/tests/runner/TestFunctions.java @@ -49,6 +49,6 @@ public Boolean[] execute(final FunctionEvent e, final Object[][] params) { .examples("caseEquals(\"hi\", \"Hi\") = false", "caseEquals(\"text\", \"text\", \"text\") = true", "caseEquals({some list variable::*})") - .since("INSERT VERSION")); + .since("2.5")); } }