Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
bensku committed Jan 11, 2020
1 parent 4eb3e55 commit 45eaaae
Show file tree
Hide file tree
Showing 32 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
groupid=ch.njol
name=skript
version=2.4.1
version=2.5-alpha1
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

}
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondAI.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ItemType> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Entity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsSilent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Entity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondLeashed.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/effects/EffBan.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/effects/EffReplace.java
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/effects/EffSilence.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/events/EvtItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -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("<i>unknown</i> (before 2.1), INSERT VERSION (entity)")
.since("<i>unknown</i> (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%]")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/ch/njol/skript/events/SimpleEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -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), <i>not</i> by dropping or replacing the item in the current slot.")
.examples("on player's held item change:")
Expand Down Expand Up @@ -524,15 +524,15 @@ 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]")
.description("Called when armor pieces of a player are changed.")
.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")
Expand All @@ -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");
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/expressions/ExprAI.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity, Boolean> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<BlockStateBlock> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Player, Number> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ItemType, Long> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<LivingEntity, OfflinePlayer> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Block> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@Description("The hotbar button clicked in an <a href='events.html#inventory_click>inventory click</a> event.")
@Examples({"on inventory click:",
" send \"You clicked the hotbar button %hotbar button%!\""})
@Since("INSERT VERSION")
@Since("2.5")
public class ExprHotbarButton extends SimpleExpression<Number> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
@Examples({"give player a diamond sword with custom model data 2",
"set slot 1 of inventory of player to wooden hoe with custom model data 357"})
@RequiredPlugins("1.14+")
@Since("INSERT VERSION")
@Since("2.5")
public class ExprItemWithCustomModelData extends PropertyExpression<ItemType, ItemType> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
@Description("The maximum durability of an item.")
@Examples({"maximum durability of diamond sword",
"if max durability of player's tool is not 0: # Item is damageable"})
@Since("INSERT VERSION")
@Since("2.5")
public class ExprMaxDurability extends SimplePropertyExpression<Object, Number> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"\tif number of uppercase chars in message / length of message > 0.5",
"\t\tcancel event",
"\t\tsend \"<red>Your message has to many caps!\" to player"})
@Since("INSERT VERSION")
@Since("2.5")
public class ExprNumberOfCharacters extends SimpleExpression<Number> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Player, Timespan> {

private final static Statistic TIME_PLAYED;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/expressions/ExprUnixDate.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Number, Date> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/tests/runner/EffAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/tests/runner/EvtTestCase.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}

0 comments on commit 45eaaae

Please sign in to comment.