Skip to content

Commit 0278847

Browse files
authored
Prepare for 2.13-pre1 (#8214)
* Bump version * remove 1.19.4 test env and update various documentation on required versions. * fix codeowners + version
1 parent dbe0221 commit 0278847

File tree

165 files changed

+186
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+186
-405
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
/src/main/java/org/skriptlang/skript/bukkit/input/ @UnderscoreTud @skriptlang/core-developers
6363

6464
# Documentation
65-
/src/main/java/ch/njol/skript/doc/ @Pikachu920 @AyhamAl-Ali @Efnilite @skriptlang/core-developers
65+
/src/main/java/ch/njol/skript/doc/@Efnilite @skriptlang/core-developers
6666

6767
# Functions
6868
/src/main/java/ch/njol/skript/lang/function @Efnilite @skriptlang/core-developers

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ body:
77
## Guidelines
88
Please make sure you are running the latest version of Skript on a supported server platform and version.
99
Try to make sure there are no issues of this same problem currently open either.
10-
As of the release of Skript 2.10, the oldest supported version has been raised to 1.19.4.
11-
Any issues created for versions older than 1.19.4 will not be looked into or fixed unless the issue persists on supported versions.
10+
As of the release of Skript 2.13, the oldest supported version has been raised to Paper 1.20.4.
11+
Any issues created for versions older than 1.20.4, or for Spigot, will not be looked into or fixed unless the issue persists on supported versions.
1212
- type: textarea
1313
attributes:
1414
label: Skript/Server Version

.github/workflows/java-17-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java 17 CI (MC 1.19.4-1.20.4)
1+
name: Java 17 CI (MC 1.20.4)
22

33
on:
44
push:

.github/workflows/junit-17-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: JUnit (MC 1.19.4-1.20.4)
1+
name: JUnit (MC 1.20.4)
22

33
on:
44
push:

README.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
# Skript
6-
**Skript** is a Minecraft plugin for Paper/Spigot, which allows server owners and other people
6+
**Skript** is a Minecraft plugin for Paper, which allows server owners and other people
77
to modify their servers without learning Java. It can also be useful if you
88
*do* know Java; some tasks are quicker to do with Skript, and so it can be used
99
for prototyping etc.
@@ -12,16 +12,12 @@ This Github fork of Skript is based on Mirreski's improvements which was built
1212
on Njol's original Skript.
1313

1414
## Requirements
15-
Skript requires **Spigot** to work. You heard it right, **CraftBukkit** does *not* work.
16-
**Paper**, which is a fork of Spigot, is recommended; it is required for some
17-
parts of Skript to be available.
15+
Skript requires **Paper** to work. You heard it right, **Spigot** does *not* work.
1816

19-
Skript supports only the **latest** patch versions of Minecraft 1.19 and newer.
20-
For example, this means that 1.19.4 is supported, but 1.19.3 is *not*.
21-
Testing with all old patch versions is not feasible for us.
17+
Skript supports the last 18 months of Minecraft versions, counting from the release date of Skript's newest version.
18+
For example, this means that 1.20.4 is supported, but 1.20.3 is *not*.
2219

23-
Minecraft 1.12 and earlier are not, and will not be supported. New Minecraft
24-
versions will be supported as soon as possible.
20+
New Minecraft versions will be supported as soon as possible.
2521

2622
## Download
2723
You can find the downloads for each version with their release notes in the [releases page](https://github.com/SkriptLang/Skript/releases).
@@ -82,7 +78,7 @@ server, but our build script will create one for you. Running the tests is easy:
8278

8379
<code>quickTest</code> runs the test suite on newest supported server version.
8480
<code>skriptTestJava21</code> (1.20.6+) runs the tests on Java 21 supported versions.
85-
<code>skriptTestJava17</code> (1.19.4-1.20.4) runs the tests on Java 17 supported versions.
81+
<code>skriptTestJava17</code> (1.20.4) runs the tests on Java 17 supported versions.
8682
<code>skriptTest</code> runs the tests on all versions.
8783
That is, it runs skriptTestJava17, and skriptTestJava21.
8884

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.parallel=true
55

66
groupid=ch.njol
77
name=skript
8-
version=2.12.2
8+
version=2.13.0-pre1
99
jarName=Skript.jar
1010
testEnv=java21/paper-1.21.8
1111
testEnvJavaVersion=21

src/main/java/ch/njol/skript/classes/AnyInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @see AnyProvider
1515
* @deprecated Use {@link org.skriptlang.skript.lang.properties.Property} instead.
1616
*/
17-
@Deprecated(since="INSERT VERSION", forRemoval = true)
17+
@Deprecated(since="2.13", forRemoval = true)
1818
public class AnyInfo<Type extends AnyProvider> extends ClassInfo<Type> {
1919

2020
/**

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,15 @@
44
import ch.njol.skript.bukkitutil.BukkitUtils;
55
import ch.njol.skript.bukkitutil.EntityUtils;
66
import ch.njol.skript.bukkitutil.SkriptTeleportFlag;
7-
import ch.njol.skript.classes.ClassInfo;
8-
import ch.njol.skript.classes.ConfigurationSerializer;
9-
import ch.njol.skript.classes.EnumClassInfo;
10-
import ch.njol.skript.classes.Parser;
11-
import ch.njol.skript.classes.PatternedParser;
12-
import ch.njol.skript.classes.Serializer;
7+
import ch.njol.skript.classes.*;
138
import ch.njol.skript.classes.registry.RegistryClassInfo;
14-
import ch.njol.skript.entity.EntityData;
159
import ch.njol.skript.expressions.ExprDamageCause;
1610
import ch.njol.skript.expressions.base.EventValueExpression;
1711
import ch.njol.skript.lang.ParseContext;
1812
import ch.njol.skript.lang.util.SimpleLiteral;
1913
import ch.njol.skript.registrations.Classes;
2014
import ch.njol.skript.util.BlockUtils;
2115
import ch.njol.skript.util.PotionEffectUtils;
22-
import ch.njol.skript.util.StringMode;
23-
import ch.njol.skript.util.Utils;
2416
import ch.njol.yggdrasil.Fields;
2517
import io.papermc.paper.world.MoonPhase;
2618
import org.bukkit.*;
@@ -34,14 +26,7 @@
3426
import org.bukkit.command.CommandSender;
3527
import org.bukkit.enchantments.Enchantment;
3628
import org.bukkit.enchantments.EnchantmentOffer;
37-
import org.bukkit.entity.Entity;
38-
import org.bukkit.entity.EntitySnapshot;
39-
import org.bukkit.entity.Item;
40-
import org.bukkit.entity.LivingEntity;
41-
import org.bukkit.entity.Player;
42-
import org.bukkit.entity.Projectile;
43-
import org.bukkit.entity.Vehicle;
44-
import org.bukkit.entity.Villager;
29+
import org.bukkit.entity.*;
4530
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
4631
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
4732
import org.bukkit.event.entity.EntityPotionEffectEvent;
@@ -59,10 +44,8 @@
5944
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
6045
import org.bukkit.inventory.BlockInventoryHolder;
6146
import org.bukkit.inventory.EquipmentSlot;
62-
import org.bukkit.inventory.Inventory;
6347
import org.bukkit.inventory.InventoryHolder;
6448
import org.bukkit.inventory.ItemFlag;
65-
import org.bukkit.inventory.ItemStack;
6649
import org.bukkit.metadata.Metadatable;
6750
import org.bukkit.potion.PotionEffect;
6851
import org.bukkit.potion.PotionEffectType;
@@ -75,12 +58,7 @@
7558
import org.skriptlang.skript.lang.properties.PropertyHandler.ExpressionPropertyHandler;
7659

7760
import java.io.StreamCorruptedException;
78-
import java.util.ArrayList;
7961
import java.util.Arrays;
80-
import java.util.List;
81-
import java.util.Locale;
82-
import java.util.Map.Entry;
83-
import java.util.UUID;
8462
import java.util.regex.Matcher;
8563
import java.util.regex.Pattern;
8664

@@ -988,23 +966,20 @@ public String toVariableNameString(EnchantmentOffer eo) {
988966
.user("(lunar|moon) ?phases?")
989967
.name("Moon Phase")
990968
.description("Represents the phase of a moon.")
991-
.requiredPlugins("Paper 1.16+")
992969
.since("2.7"));
993970

994971
if (Skript.classExists("org.bukkit.event.player.PlayerQuitEvent$QuitReason"))
995972
Classes.registerClass(new EnumClassInfo<>(QuitReason.class, "quitreason", "quit reasons")
996973
.user("(quit|disconnect) ?(reason|cause)s?")
997974
.name("Quit Reason")
998975
.description("Represents a quit reason from a <a href='/#quit'>player quit server event</a>.")
999-
.requiredPlugins("Paper 1.16.5+")
1000976
.since("2.8.0"));
1001977

1002978
if (Skript.classExists("org.bukkit.event.inventory.InventoryCloseEvent$Reason"))
1003979
Classes.registerClass(new EnumClassInfo<>(InventoryCloseEvent.Reason.class, "inventoryclosereason", "inventory close reasons")
1004980
.user("inventory ?close ?reasons?")
1005981
.name("Inventory Close Reasons")
1006982
.description("The inventory close reason in an <a href='/#inventory_close'>inventory close event</a>.")
1007-
.requiredPlugins("Paper")
1008983
.since("2.8.0"));
1009984

1010985
Classes.registerClass(new EnumClassInfo<>(TransformReason.class, "transformreason", "transform reasons")
@@ -1058,7 +1033,6 @@ public String toVariableNameString(EnchantmentOffer eo) {
10581033
"This includes all of the data associated with an entity (its name, health, attributes, etc.), at the time this expression is used. "
10591034
+ "Essentially, these are a way to create templates for entities.",
10601035
"Individual attributes of a snapshot cannot be modified or retrieved.")
1061-
.requiredPlugins("Minecraft 1.20.2+")
10621036
.since("2.10")
10631037
.parser(new Parser<>() {
10641038
@Override
@@ -1142,7 +1116,6 @@ public String toVariableNameString(WorldBorder border) {
11421116
.user("teleport ?flags?")
11431117
.name("Teleport Flag")
11441118
.description("Teleport Flags are settings to retain during a teleport.")
1145-
.requiredPlugins("Paper 1.19+")
11461119
.since("2.10"));
11471120

11481121
Classes.registerClass(new ClassInfo<>(Vehicle.class, "vehicle")

src/main/java/ch/njol/skript/conditions/CondChatColors.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"else:",
1515
"\tsend \"You cannot partake in finding the colored word.\""
1616
})
17-
@RequiredPlugins("Paper")
1817
@Since("2.10")
1918
public class CondChatColors extends PropertyCondition<Player> {
2019

src/main/java/ch/njol/skript/conditions/CondChatFiltering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"if player doesn't have chat filtering enabled:",
1313
"send \"<gray>This server may contain mature chat messages. You have been warned!\" to player",
1414
})
15-
@RequiredPlugins("Paper")
15+
1616
@Since("2.10")
1717
public class CondChatFiltering extends PropertyCondition<Player> {
1818

0 commit comments

Comments
 (0)