Skip to content

Commit

Permalink
Prepare For Release (2.10.0-pre1)
Browse files Browse the repository at this point in the history
  • Loading branch information
APickledWalrus committed Jan 1, 2025
1 parent 5cbdf0e commit 5a4fb7e
Show file tree
Hide file tree
Showing 188 changed files with 221 additions and 221 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ org.gradle.parallel=true

groupid=ch.njol
name=skript
version=2.9.5
version=2.10.0-pre1
jarName=Skript.jar
testEnv=java21/paper-1.21.4
testEnvJavaVersion=21
20 changes: 10 additions & 10 deletions src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
Original file line number Diff line number Diff line change
Expand Up @@ -1470,19 +1470,19 @@ public String toVariableNameString(EnchantmentOffer eo) {
.user("unleash ?(reason|cause)s?")
.name("Unleash Reason")
.description("Represents an unleash reason of an unleash event.")
.since("INSERT VERSION"));
.since("2.10"));

Classes.registerClass(new EnumClassInfo<>(ItemFlag.class, "itemflag", "item flags")
.user("item ?flags?")
.name("Item Flag")
.description("Represents flags that may be applied to hide certain attributes of an item.")
.since("INSERT VERSION"));
.since("2.10"));

Classes.registerClass(new EnumClassInfo<>(EntityPotionEffectEvent.Cause.class, "entitypotioncause", "entity potion causes")
.user("(entity )?potion ?effect ?cause")
.name("Entity Potion Cause")
.description("Represents the cause of the action of a potion effect on an entity, e.g. arrow, command")
.since("INSERT VERSION"));
.since("2.10"));

ClassInfo<?> wolfVariantClassInfo;
if (Skript.classExists("org.bukkit.entity.Wolf$Variant") && BukkitUtils.registryExists("WOLF_VARIANT")) {
Expand All @@ -1506,20 +1506,20 @@ public String toVariableNameString(EnchantmentOffer eo) {
.user("(experience|[e]xp) cooldown change (reason|cause)s?")
.name("Experience Cooldown Change Reason")
.description("Represents a change reason of an <a href='events.html#experience cooldown change event'>experience cooldown change event</a>.")
.since("INSERT VERSION"));
.since("2.10"));

Classes.registerClass(new RegistryClassInfo<>(Villager.Type.class, Registry.VILLAGER_TYPE, "villagertype", "villager types")
.user("villager ?types?")
.name("Villager Type")
.description("Represents the different types of villagers. These are usually the biomes a villager can be from.")
.after("biome")
.since("INSERT VERSION"));
.since("2.10"));

Classes.registerClass(new RegistryClassInfo<>(Villager.Profession.class, Registry.VILLAGER_PROFESSION, "villagerprofession", "villager professions")
.user("villager ?professions?")
.name("Villager Profession")
.description("Represents the different professions of villagers.")
.since("INSERT VERSION"));
.since("2.10"));

if (Skript.classExists("org.bukkit.entity.EntitySnapshot")) {
Classes.registerClass(new ClassInfo<>(EntitySnapshot.class, "entitysnapshot")
Expand All @@ -1530,7 +1530,7 @@ public String toVariableNameString(EnchantmentOffer eo) {
+ "Essentially, these are a way to create templates for entities.",
"Individual attributes of a snapshot cannot be modified or retrieved.")
.requiredPlugins("Minecraft 1.20.2+")
.since("INSERT VERSION")
.since("2.10")
.parser(new Parser<>() {
@Override
public boolean canParse(ParseContext context) {
Expand All @@ -1554,7 +1554,7 @@ public String toVariableNameString(EntitySnapshot snapshot) {
.user("banner ?patterns?")
.name("Banner Pattern")
.description("Represents a banner pattern.")
.since("INSERT VERSION")
.since("2.10")
);

ClassInfo<?> patternTypeInfo;
Expand All @@ -1580,7 +1580,7 @@ public String toVariableNameString(EntitySnapshot snapshot) {
.user("banner ?pattern ?types?")
.name("Banner Pattern Type")
.description("Represents the various banner patterns that can be applied to a banner.")
.since("INSERT VERSION")
.since("2.10")
);

if (Skript.classExists("io.papermc.paper.entity.TeleportFlag"))
Expand All @@ -1589,7 +1589,7 @@ public String toVariableNameString(EntitySnapshot snapshot) {
.name("Teleport Flag")
.description("Teleport Flags are settings to retain during a teleport.")
.requiredPlugins("Paper 1.19+")
.since("INSERT VERSION"));
.since("2.10"));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ public ColorRGB[] executeSimple(Object[][] params) {
"dye player's leggings rgb(120, 30, 45)",
"set the colour of a text display to rgb(10, 50, 100, 50)"
)
.since("2.5, INSERT VERSION (alpha)");
.since("2.5, 2.10 (alpha)");

Functions.registerFunction(new SimpleJavaFunction<Player>("player", new Parameter[] {
new Parameter<>("nameOrUUID", DefaultClasses.STRING, true, null),
Expand Down Expand Up @@ -649,7 +649,7 @@ public Quaternionf[] executeSimple(Object[][] params) {
})
.description("Returns a quaternion from the given W, X, Y and Z parameters. ")
.examples("quaternion(1, 5.6, 45.21, 10)")
.since("INSERT VERSION");
.since("2.10");
}

if (Skript.classExists("org.joml.AxisAngle4f")) {
Expand All @@ -669,7 +669,7 @@ public Quaternionf[] executeSimple(Object[][] params) {
})
.description("Returns a quaternion from the given angle (in degrees) and axis (as a vector). This represents a rotation around the given axis by the given angle.")
.examples("axisangle(90, (vector from player's facing))")
.since("INSERT VERSION");
.since("2.10");
}
} // end joml functions

Expand Down Expand Up @@ -710,7 +710,7 @@ public String[] executeSimple(Object[][] params) {
"\ttrigger:",
"\t\tset {_money} to formatNumber({money::%sender's uuid%})",
"\t\tsend \"Your balance: %{_money}%\" to sender")
.since("INSERT VERSION");
.since("2.10");
}

}
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/classes/data/JavaClasses.java
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public boolean mustSyncDeserialization() {
.user("quaternionf?s?")
.name("Quaternion")
.description("Quaternions are four dimensional vectors, often used for representing rotations.")
.since("INSERT VERSION")
.since("2.10")
.parser(new Parser<>() {
public boolean canParse(ParseContext context) {
return false;
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/ch/njol/skript/classes/data/SkriptClasses.java
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ public String toVariableNameString(VisualEffect e) {
"add \"hello\" to {queue}",
"broadcast the 1st element of {queue}"
)
.since("INSERT VERSION")
.since("2.10")
.changer(new Changer<>() {
@Override
public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
Expand Down Expand Up @@ -741,7 +741,7 @@ public void change(SkriptQueue[] what, Object @Nullable [] delta, ChangeMode mod
"Configs can be reloaded or navigated to find options.")
.usage("")
.examples("the skript config")
.since("INSERT VERSION")
.since("2.10")
.parser(new Parser<Config>() {

@Override
Expand Down Expand Up @@ -771,7 +771,7 @@ public String toVariableNameString(Config config) {
"This may have navigable children.")
.usage("")
.examples("the current script")
.since("INSERT VERSION")
.since("2.10")
.parser(new Parser<Node>() {

@Override
Expand All @@ -798,7 +798,7 @@ public String toVariableNameString(Node node) {
"Disabled scripts will report as being empty since their content has not been loaded.")
.usage("")
.examples("the current script")
.since("INSERT VERSION")
.since("2.10")
.parser(new Parser<Script>() {
final Path path = Skript.getInstance().getScriptsFolder().getAbsoluteFile().toPath();

Expand Down Expand Up @@ -843,7 +843,7 @@ public String toVariableNameString(final Script script) {
.description("Something that can be executed (run) and may accept arguments, e.g. a function.",
"This may also return a result.")
.examples("run {_function} with arguments 1 and true")
.since("INSERT VERSION"));
.since("2.10"));

Classes.registerClass(new ClassInfo<>(DynamicFunctionReference.class, "function")
.user("functions?")
Expand All @@ -852,7 +852,7 @@ public String toVariableNameString(final Script script) {
"This can be executed (with arguments) and may return a result.")
.examples("run {_function} with arguments 1 and true",
"set {_result} to the result of {_function}")
.since("INSERT VERSION")
.since("2.10")
.parser(new Parser<DynamicFunctionReference<?>>() {

@Override
Expand Down Expand Up @@ -888,15 +888,15 @@ public String toVariableNameString(DynamicFunctionReference<?> function) {
.description("Something that has a name (e.g. an item).")
.usage("")
.examples("{thing}'s name")
.since("INSERT VERSION")
.since("2.10")
);

Classes.registerClass(new AnyInfo<>(AnyAmount.class, "numbered")
.name("Any Numbered/Sized Thing")
.description("Something that has an amount or size.")
.usage("")
.examples("the size of {thing}", "the amount of {thing}")
.since("INSERT VERSION")
.since("2.10")
);

Classes.registerClass(new AnyInfo<>(AnyContains.class, "containing")
Expand All @@ -905,7 +905,7 @@ public String toVariableNameString(DynamicFunctionReference<?> function) {
.description("Something that contains other things.")
.usage("")
.examples("{a} contains {b}")
.since("INSERT VERSION")
.since("2.10")
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondCanSee.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"if the player can see the last spawned entity:",
"\tmessage \"hello there!\""
})
@Since("2.3, INSERT VERSION (entities)")
@Since("2.3, 2.10 (entities)")
@RequiredPlugins("Minecraft 1.19+ (entities)")
public class CondCanSee extends Condition {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"\tsend \"You cannot partake in finding the colored word.\""
})
@RequiredPlugins("Paper")
@Since("INSERT VERSION")
@Since("2.10")
public class CondChatColors extends PropertyCondition<Player> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"send \"<gray>This server may contain mature chat messages. You have been warned!\" to player",
})
@RequiredPlugins("Paper")
@Since("INSERT VERSION")
@Since("2.10")
public class CondChatFiltering extends PropertyCondition<Player> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"\tsend action bar \"Server shutting down in 5 minutes!\""
})
@RequiredPlugins("Paper")
@Since("INSERT VERSION")
@Since("2.10")
public class CondChatVisibility extends Condition {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"\t\tprevent the used firework from being consume"
})
@RequiredPlugins("Paper")
@Since("INSERT VERSION")
@Since("2.10")
public class CondElytraBoostConsume extends Condition {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Description("Checks if an entity was spawned from a mob spawner.")
@Examples("send whether target is from a mob spawner")
@RequiredPlugins("PaperMC")
@Since("INSERT VERSION")
@Since("2.10")
public class CondFromMobSpawner extends PropertyCondition<Entity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsCharged.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@Description("Checks if a creeper, wither, 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, INSERT VERSION (withers, wither skulls)")
@Since("2.5, 2.10 (withers, wither skulls)")
public class CondIsCharged extends PropertyCondition<Entity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"if {_block} is conditional:",
"\tmake {_block} unconditional"
})
@Since("INSERT VERSION")
@Since("2.10")
public class CondIsCommandBlockConditional extends PropertyCondition<Block> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@Name("Is Custom Name Visible")
@Description("Checks if an entity's custom name is visible.")
@Examples("send true if target's custom name is visible")
@Since("INSERT VERSION")
@Since("2.10")
public class CondIsCustomNameVisible extends PropertyCondition<Entity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"if 5 is evenly divisible by 5:",
"if 11 cannot be evenly divided by 10:",
})
@Since("INSERT VERSION")
@Since("2.10")
public class CondIsDivisibleBy extends Condition {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"\tif loop-value is not invulnerable:",
"\t\tbroadcast \"the gamemode %loop-value% is vulnerable!\""
})
@Since("2.5, INSERT VERSION (gamemode)")
@Since("2.5, 2.10 (gamemode)")
@RequiredPlugins("Paper 1.20.6+ (gamemodes)")
public class CondIsInvulnerable extends PropertyCondition<Object> {
private static final boolean SUPPORTS_GAMEMODE = Skript.methodExists(GameMode.class, "isInvulnerable");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsLoaded.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"if world(\"lobby\") is loaded:",
"if script named \"MyScript.sk\" is loaded:"
})
@Since("2.3, 2.5 (revamp with chunk at location/coords), INSERT VERSION (Scripts)")
@Since("2.3, 2.5 (revamp with chunk at location/coords), 2.10 (Scripts)")
@SuppressWarnings("unchecked")
public class CondIsLoaded extends Condition {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsSaddled.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"If 'properly' is used, this will only return true if the entity is wearing specifically a saddle item."
})
@Examples("send whether {_horse} is saddled")
@Since("INSERT VERSION")
@Since("2.10")
public class CondIsSaddled extends PropertyCondition<LivingEntity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsTamed.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"send true if {_horse} is tamed",
"tame {_horse} if {_horse} is untamed"
})
@Since("INSERT VERSION")
@Since("2.10")
public class CondIsTamed extends PropertyCondition<Entity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsTicking.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@Description("Checks if an entity is ticking.")
@Examples("send true if target is ticking")
@RequiredPlugins("PaperMC")
@Since("INSERT VERSION")
@Since("2.10")
public class CondIsTicking extends PropertyCondition<Entity> {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondIsValid.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"An invalid script reference may have been reloaded, moved or disabled since."
})
@Examples("if event-entity is valid")
@Since("2.7, INSERT VERSION (Scripts & Configs)")
@Since("2.7, 2.10 (Scripts & Configs)")
public class CondIsValid extends PropertyCondition<Object> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"\tsend \"This item does not have any glint override.\" to player"
})
@RequiredPlugins("Spigot 1.20.5+")
@Since("INSERT VERSION")
@Since("2.10")
public class CondItemEnchantmentGlint extends PropertyCondition<ItemType> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@Keywords("lead")
@Events("Unleash")
@RequiredPlugins("Paper 1.16+")
@Since("INSERT VERSION")
@Since("2.10")
public class CondLeashWillDrop extends Condition {

static {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/conditions/CondLidState.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"if the lid of {_chest} is closed:",
"\topen the lid of {_block}"
})
@Since("INSERT VERSION")
@Since("2.10")
public class CondLidState extends PropertyCondition<Block> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"if {_dates::*} have passed:",
"\t# this will be false"
})
@Since("INSERT VERSION")
@Since("2.10")
public class CondPastFuture extends Condition {

static {
Expand Down
Loading

0 comments on commit 5a4fb7e

Please sign in to comment.