Skip to content

Commit

Permalink
Prepare for release of 3.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ShaneBeee committed Jan 15, 2025
1 parent 8bc1426 commit 56f3d19
Show file tree
Hide file tree
Showing 42 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if (Classes.getExactClassInfo(Spellcaster.Spell.class) == null) {

## Syntax Docs:
- When using the since annotation, please use "INSERT VERISON" (this will be changed on release), ex:
`@Since("INSERT VERSION")`
`@Since("3.8.0")`
- Please provide detailed descriptions of what the syntax does.
You may also include required MC/Paper versions as well.
You may also insert wiki links in the following format:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Are you running an <ins>**outdated**</ins> version of Minecraft and looking for
Keep in mind, these <ins>**outdated**</ins> builds for <ins>**outdated**</ins> servers are not supported and you will not get support/bug fixes, because they're <ins>**outdated**</ins>!

### <ins>Skript 2.9.5 (and below)</ins>
Due to changes in Skript 2.10's API, SkBee INSERT VERSION+ will only work on Skript 2.10+
Due to changes in Skript 2.10's API, SkBee 3.8.0+ will only work on Skript 2.10+
If you need SkBee to work on an older version of Skript this is the last version that will work:
[**SkBee 3.7.0**](https://github.com/ShaneBeee/SkBee/releases/tag/3.7.0)
(Just like any other <ins>**outdated**</ins> build, this one is no longer supported)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ compileJava {
}

// SkBee version
version = '3.7.0'
version = '3.8.0'
def latestJava = 21
def oldestJava = 17

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@Name("Bound - Full State")
@Description("Get/set whether this bound is a full bound (reaches from lowest to highest points of a world).")
@Examples("set bound full state of bound with id \"home\" to true")
@Since("INSERT VERSION")
@Since("3.8.0")
public class ExprBoundFullState extends SimplePropertyExpression<Bound, Boolean> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Name("Bound - World")
@Description("Get the world of a bound.")
@Examples("set {world} to bound world of bound with id \"el-boundo\"")
@Since("INSERT VERSION")
@Since("3.8.0")
public class ExprBoundWorld extends SimplePropertyExpression<Bound, World> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@Examples({"set charged projectiles of player's tool to an arrow and a stick",
"delete charged projectiles component of player's tool",
"reset charged projectiles component of player's tool"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprChargedProjectilesComponent extends SimpleExpression<Object> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@Examples({"set enchantable component of player's tool to 10",
"delete enchantable component of player's tool",
"reset enchantable component of {_item}"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprEnchantableComponent extends SimplePropertyExpression<Object, Number> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"set glider component of player's tool to true",
"delete glider component of {_item}",
"reset glider component of {_item}"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprGliderComponent extends SimplePropertyExpression<Object, Boolean> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@Examples({"set intangible projectile component of player's tool to true",
"delete intangible projectile component of player's tool",
"reset intangible projectile component of player's tool"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprIntangibleProjectileComponent extends SimplePropertyExpression<Object, Boolean> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"set item model of {_item} to \"my_pack:some_cool_model\"",
"reset item model of player's tool",
"delete item model of {_item}"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprItemModel extends SimplePropertyExpression<Object, String> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"set repairable tag of player's tool to minecraft item tag \"diamond_tool_materials\"",
"delete repairable tag of player's tool",
"reset repairable tag of player's tool"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprRepairableComponent extends SimpleExpression<Object> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@Examples({"set tooltip style of {_item} to \"my_pack:some_style\"",
"delete tooltip style of player's tool",
"reset tooltip style of player's tool"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprTooltipStyleComponent extends SimplePropertyExpression<Object, String> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Examples({"set use remainder of player's tool to 1 of glass bottle",
"delete use remainder of {_item}",
"reset use remainder of {_item}"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprUseRemainderComponent extends SimplePropertyExpression<Object, ItemStack> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"",
"apply can place on adventure predicate to player's tool:",
"\tblocks: minecraft block tag \"minecraft:logs\""})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings({"UnstableApiUsage", "NullableProblems"})
public class SecAdventureComponent extends Section {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"\thas_consume_particles: false",
"\ton_consume_effects: {_effects}",
"give {_i} to player"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class SecConsumableComponent extends EffectSection {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"\tstrings: \"hello\", \"yippee\"",
"\tflags: true, true, true, false",
"\tcolors: blue, green, rgb(1,1,1)"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class SecCustomModelDataComponent extends Section {

private static final EntryValidator VALIDATOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"apply death protection component to {_i}:",
"\tdeath_effects: {_effects}",
"give {_i} to player"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class SecDeathProtectionComponent extends EffectSection {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"\tswappable: true",
"\tdamage_on_hurt: true",
"\tcamera_overlay: \"my_pack:some_overlay\""})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class SecEquippableComponent extends Section {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"\t\t\tcolors: red, white and blue",
"\t\t\thas_trail: false",
"\t\t\thas_twinkle: false"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class SecFireworkExplosionComponent extends Section {

private static final EntryValidator VALIDATOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"\t\t\tcolors: red, white and blue",
"\t\t\thas_trail: false",
"\t\t\thas_twinkle: false"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class SecFireworksComponent extends Section {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@Examples({"set {_i} to 1 of goat horn",
"apply instrument to {_i}:",
"\tinstrument: admire_goat_horn"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class SecInstrumentComponent extends Section {

private static final EntryValidator VALIDATOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"- `song` = A jukebox song to be played.",
"- `show_in_tooltip` = Whether this will show in the item's tooltip."})
@Examples("")
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class SecJukeboxPlayableComponent extends Section {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"\t\t\tspeed: 0.5",
"\t\t\tcorrect_for_drops: false",
"give {_i} to player"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class SecToolComponent extends Section {

public static class ToolComponentApplyRulesEvent extends Event {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"\t\t\tspeed: 0.5",
"\t\t\tcorrect_for_drops: false",
"give {_i} to player"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class SecToolRule extends Section {

private static final EntryValidator VALIDATOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@Examples({"apply use cooldown to {_item}:",
"\tseconds: 5 seconds",
"\tgroup: \"blah:special_apple\""})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class SecUseCooldownComponent extends Section {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public String toVariableNameString(ConsumeEffect consumeEffect) {
return toString(consumeEffect, 0);
}
})
.since("INSERT VERSION");
.since("3.8.0");
Classes.registerClass(CONSUME_EFFECT_INFO);

// Functions (ConsumeEffects)
Expand All @@ -79,7 +79,7 @@ public String toVariableNameString(ConsumeEffect consumeEffect) {
.examples("set {_p::1} to potion effect of night vision for 10 seconds",
"set {_p::2} to potion effect of slow mining for 5 seconds",
"set {_c} to apply_effects({_p::*}, 0.5)")
.since("INSERT VERSION"));
.since("3.8.0"));

Functions.registerFunction(new SimpleJavaFunction<>("remove_effects", new Parameter[]{
new Parameter<>("potion effect types", POTION_EFFECT_TYPE, false, null)
Expand All @@ -101,7 +101,7 @@ public String toVariableNameString(ConsumeEffect consumeEffect) {
"This will create a list of potion effect types to be removed when consumed.",
"This can be used in a death protection/consumable component.")
.examples("set {_c} to remove_effects(night vision, poison)")
.since("INSERT VERSION"));
.since("3.8.0"));

Functions.registerFunction(new SimpleJavaFunction<>("clear_all_effects", new Parameter[]{
}, CONSUME_EFFECT_INFO, true) {
Expand All @@ -114,7 +114,7 @@ public String toVariableNameString(ConsumeEffect consumeEffect) {
"This will clear all effects when consumed.",
"This can be used in a death protection/consumable component.")
.examples("set {_c} to clear_all_effects()")
.since("INSERT VERSION"));
.since("3.8.0"));

Functions.registerFunction(new SimpleJavaFunction<>("teleport_randomly", new Parameter[]{
new Parameter<>("diameter", DefaultClasses.NUMBER, true, null)
Expand All @@ -130,7 +130,7 @@ public String toVariableNameString(ConsumeEffect consumeEffect) {
"This will make the consumer teleport randomly when consumed.",
"This can be used in a death protection/consumable component.")
.examples("set {_c} to teleport_randomly(10)")
.since("INSERT VERSION"));
.since("3.8.0"));

Functions.registerFunction(new SimpleJavaFunction<>("play_sound", new Parameter[]{
new Parameter<>("sound", DefaultClasses.STRING, true, null)
Expand All @@ -149,7 +149,7 @@ public String toVariableNameString(ConsumeEffect consumeEffect) {
"Will play a sound when consumed.",
"This can be used in a death protection/consumable component.")
.examples("set {_c} to play_sound(\"minecraft:block.stone.break\")")
.since("INSERT VERSION"));
.since("3.8.0"));
}

private static String getConsumeEffectString(ConsumeEffect consumeEffect) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"See [**Criteria**](https://minecraft.wiki/w/Scoreboard#Criteria) on McWiki for more info."})
@Examples({"if the scores of {_objective} are modifiable:",
"if the scores of criteria with id \"some_criteria\" are modifiable:"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class CondObjModifiable extends Condition {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"# minecraft:wall_torch[facing=south]",
"# minecraft:wall_torch[facing=west]",
"# minecraft:wall_torch[facing=east]"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings("UnstableApiUsage")
public class ExprBlockDataAllStates extends SimpleExpression<BlockData> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ public boolean canParse(ParseContext context) {
.name("Potion Type")
.description("Represents the different types of potions (not potion effect types) used in vanilla potion items.")
.after("potioneffecttype")
.since("INSERT VERSION"));
.since("3.8.0"));

SkriptUtils.hackPotionEffectTypeClassInfoPattern();
} else {
Expand All @@ -551,7 +551,7 @@ public boolean canParse(ParseContext context) {
.name("Instrument")
.description("Represents the instruments used by goat horns.",
"NOTE: These are auto-generated and may differ between server versions.")
.since("INSERT VERSION"));
.since("3.8.0"));
} else {
Util.logLoading("It looks like another addon registered 'instrument' already.");
Util.logLoading("You may have to use their Instruments in SkBee's syntaxes.");
Expand All @@ -563,7 +563,7 @@ public boolean canParse(ParseContext context) {
.name("Instrument")
.description("Represents the songs for jukeboxes.",
"NOTE: These are auto-generated and may differ between server versions.")
.since("INSERT VERSION"));
.since("3.8.0"));
} else {
Util.logLoading("It looks like another addon registered 'jukeboxson' already.");
Util.logLoading("You may have to use their JukeboxSongs in SkBee's syntaxes.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@Examples({"set {_barrel} to crafting result of oak planks, oak slab, oak planks, oak planks, air, oak planks, oak planks, oak slab, oak planks",
"set {_carrotOnStick} to crafting result of fishing rod, air, air, carrot",
"set {_diamondSwordId} to crafting result id of air, diamond, air, air, diamond, air, air, stick, air"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class ExprCraftingResultFromItems extends SimpleExpression<Object> {

private static final World DEFAULT_WORLD = Bukkit.getWorlds().getFirst();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"\tresult: netherite sword",
"\tinput: minecraft item tag \"minecraft:swords\"",
"\tmaterial: netherite ingot"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class SecTransmuteRecipe extends Section {

private static EntryValidator VALIDATOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Examples({"set {_tagkey} to tag key \"minecraft:wool\" from block registry",
"set {_tagkey} to tag key \"my_pack:cool_enchantments\" from enchantment registry",
"set {_tagkey} to item registry tag key \"minecraft:swords\""})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings({"UnstableApiUsage", "rawtypes"})
public class ExprRegistryTagKeyFrom extends SimpleExpression<TagKey> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@Description("Get all the tag keys that belong to a registry.")
@Examples({"loop tag keys of block registry:",
"set {_keys::*} to tag keys of biome registry"})
@Since("INSERT VERSION")
@Since("3.8.0")
@SuppressWarnings({"UnstableApiUsage", "rawtypes"})
public class ExprRegistryTagKeys extends SimpleExpression<TagKey> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@Description("Get all values from a registry.")
@Examples({"set {_biomes::*} to registry values of biome registry",
"loop registry values of item registry:"})
@Since("INSERT VERSION")
@Since("3.8.0")
public class ExprRegistryValues extends SimpleExpression<Object> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Types {
"Registry names are auto-generated based on the Minecraft registry, these may change at any time.")
.parser(RegistryHolders.createParser())
.supplier(RegistryHolders.getSupplier())
.since("INSERT VERSION");
.since("3.8.0");
Classes.registerClass(registryKeyClassInfo);

// Run later to make sure SkBee's classes have loaded
Expand All @@ -34,7 +34,7 @@ public class Types {
.user("tag ?keys?")
.name("Registry - Tag Key")
.description("Represents a key for a Minecraft tag.")
.since("INSERT VERSION")
.since("3.8.0")
.parser(new Parser<>() {
@Override
public boolean canParse(ParseContext context) {
Expand All @@ -56,7 +56,7 @@ public String toVariableNameString(TagKey tagKey) {
.user("typed ?keys?")
.name("Registry - Typed Key")
.description("Represents the key for a value in a Minecraft registry.")
.since("INSERT VERSION")
.since("3.8.0")
.parser(new Parser<>() {
@Override
public boolean canParse(ParseContext context) {
Expand Down
Loading

0 comments on commit 56f3d19

Please sign in to comment.