From 5a4fb7ed02618575e7b19af507ae2047ebb2892e Mon Sep 17 00:00:00 2001 From: APickledWalrus Date: Wed, 1 Jan 2025 18:35:36 -0500 Subject: [PATCH] Prepare For Release (2.10.0-pre1) --- gradle.properties | 2 +- .../skript/classes/data/BukkitClasses.java | 20 +++++++++---------- .../skript/classes/data/DefaultFunctions.java | 8 ++++---- .../njol/skript/classes/data/JavaClasses.java | 2 +- .../skript/classes/data/SkriptClasses.java | 18 ++++++++--------- .../ch/njol/skript/conditions/CondCanSee.java | 2 +- .../skript/conditions/CondChatColors.java | 2 +- .../skript/conditions/CondChatFiltering.java | 2 +- .../skript/conditions/CondChatVisibility.java | 2 +- .../conditions/CondElytraBoostConsume.java | 2 +- .../skript/conditions/CondFromMobSpawner.java | 2 +- .../njol/skript/conditions/CondIsCharged.java | 2 +- .../CondIsCommandBlockConditional.java | 2 +- .../conditions/CondIsCustomNameVisible.java | 2 +- .../skript/conditions/CondIsDivisibleBy.java | 2 +- .../skript/conditions/CondIsInvulnerable.java | 2 +- .../njol/skript/conditions/CondIsLoaded.java | 2 +- .../njol/skript/conditions/CondIsSaddled.java | 2 +- .../njol/skript/conditions/CondIsTamed.java | 2 +- .../njol/skript/conditions/CondIsTicking.java | 2 +- .../njol/skript/conditions/CondIsValid.java | 2 +- .../conditions/CondItemEnchantmentGlint.java | 2 +- .../skript/conditions/CondLeashWillDrop.java | 2 +- .../njol/skript/conditions/CondLidState.java | 2 +- .../skript/conditions/CondPastFuture.java | 2 +- .../njol/skript/effects/EffBlockUpdate.java | 2 +- .../ch/njol/skript/effects/EffCharge.java | 2 +- .../effects/EffCommandBlockConditional.java | 2 +- .../ch/njol/skript/effects/EffConnect.java | 2 +- .../ch/njol/skript/effects/EffCustomName.java | 2 +- .../ch/njol/skript/effects/EffDetonate.java | 2 +- .../ch/njol/skript/effects/EffDropLeash.java | 2 +- .../skript/effects/EffElytraBoostConsume.java | 2 +- .../skript/effects/EffEntityVisibility.java | 2 +- .../java/ch/njol/skript/effects/EffEquip.java | 2 +- .../effects/EffForceEnchantmentGlint.java | 2 +- .../ch/njol/skript/effects/EffHealth.java | 2 +- .../java/ch/njol/skript/effects/EffKill.java | 2 +- .../ch/njol/skript/effects/EffLidState.java | 2 +- .../ch/njol/skript/effects/EffReplace.java | 2 +- .../java/ch/njol/skript/effects/EffRun.java | 2 +- .../ch/njol/skript/effects/EffScriptFile.java | 2 +- .../java/ch/njol/skript/effects/EffSort.java | 2 +- .../java/ch/njol/skript/effects/EffTame.java | 2 +- .../ch/njol/skript/effects/EffTeleport.java | 2 +- .../ch/njol/skript/effects/EffTransform.java | 2 +- .../njol/skript/events/EvtBeaconEffect.java | 2 +- .../njol/skript/events/EvtBeaconToggle.java | 2 +- .../java/ch/njol/skript/events/EvtBlock.java | 2 +- .../java/ch/njol/skript/events/EvtClick.java | 2 +- .../njol/skript/events/EvtEntityPotion.java | 2 +- .../java/ch/njol/skript/events/EvtLeash.java | 2 +- .../skript/events/EvtVehicleCollision.java | 2 +- .../ch/njol/skript/events/SimpleEvents.java | 12 +++++------ .../ch/njol/skript/expressions/ExprARGB.java | 2 +- .../ch/njol/skript/expressions/ExprAngle.java | 2 +- .../skript/expressions/ExprAppliedEffect.java | 2 +- .../skript/expressions/ExprArmorSlot.java | 2 +- .../skript/expressions/ExprBannerItem.java | 2 +- .../expressions/ExprBannerPatterns.java | 2 +- .../skript/expressions/ExprBarterDrops.java | 2 +- .../skript/expressions/ExprBarterInput.java | 2 +- .../skript/expressions/ExprBeaconValues.java | 2 +- .../skript/expressions/ExprBlockData.java | 2 +- .../skript/expressions/ExprBlockSound.java | 2 +- .../njol/skript/expressions/ExprColorOf.java | 2 +- .../expressions/ExprCommandBlockCommand.java | 2 +- .../njol/skript/expressions/ExprConfig.java | 2 +- .../skript/expressions/ExprDequeuedQueue.java | 2 +- .../skript/expressions/ExprDomestication.java | 2 +- .../njol/skript/expressions/ExprEntities.java | 2 +- .../expressions/ExprEntitySnapshot.java | 2 +- .../skript/expressions/ExprEntitySound.java | 2 +- .../skript/expressions/ExprExperience.java | 2 +- .../expressions/ExprExperienceCooldown.java | 2 +- .../ExprExperienceCooldownChangeReason.java | 2 +- .../njol/skript/expressions/ExprFilter.java | 2 +- .../skript/expressions/ExprFireTicks.java | 2 +- .../njol/skript/expressions/ExprFunction.java | 2 +- .../skript/expressions/ExprItemFlags.java | 2 +- .../ExprItemWithEnchantmentGlint.java | 2 +- .../skript/expressions/ExprJoinSplit.java | 2 +- .../expressions/ExprLastDeathLocation.java | 2 +- .../skript/expressions/ExprLoopValue.java | 2 +- .../njol/skript/expressions/ExprMaxStack.java | 2 +- .../njol/skript/expressions/ExprMessage.java | 2 +- .../njol/skript/expressions/ExprMetadata.java | 2 +- .../expressions/ExprNewBannerPattern.java | 2 +- .../ch/njol/skript/expressions/ExprNode.java | 2 +- .../skript/expressions/ExprNodeValue.java | 2 +- .../ExprPlayerChatCompletions.java | 2 +- .../ch/njol/skript/expressions/ExprQueue.java | 2 +- .../skript/expressions/ExprQueueStartEnd.java | 2 +- .../skript/expressions/ExprRandomNumber.java | 2 +- .../njol/skript/expressions/ExprResult.java | 2 +- .../njol/skript/expressions/ExprScripts.java | 2 +- .../skript/expressions/ExprSkullOwner.java | 2 +- .../expressions/ExprSpawnEggEntity.java | 2 +- .../skript/expressions/ExprTimeSince.java | 2 +- .../skript/expressions/ExprTransform.java | 2 +- .../skript/expressions/ExprUnleashReason.java | 2 +- .../skript/expressions/ExprVillagerLevel.java | 2 +- .../expressions/ExprVillagerProfession.java | 2 +- .../skript/expressions/ExprVillagerType.java | 2 +- .../skript/expressions/ExprWithItemFlags.java | 2 +- .../skript/expressions/ExprXYZComponent.java | 2 +- .../chat/expressions/ExprPrefixSuffix.java | 2 +- .../ch/njol/skript/sections/EffSecShoot.java | 2 +- .../ch/njol/skript/sections/EffSecSpawn.java | 2 +- .../ch/njol/skript/sections/SecFilter.java | 2 +- .../java/ch/njol/skript/sections/SecFor.java | 2 +- .../skript/test/runner/TestFunctions.java | 4 ++-- .../bukkit/breeding/BreedingModule.java | 2 +- .../bukkit/breeding/elements/CondCanAge.java | 2 +- .../breeding/elements/CondCanBreed.java | 2 +- .../bukkit/breeding/elements/CondIsAdult.java | 2 +- .../bukkit/breeding/elements/CondIsBaby.java | 2 +- .../breeding/elements/CondIsInLove.java | 2 +- .../breeding/elements/EffAllowAging.java | 2 +- .../breeding/elements/EffBreedable.java | 2 +- .../breeding/elements/EffMakeAdultOrBaby.java | 2 +- .../bukkit/breeding/elements/EvtBreed.java | 2 +- .../breeding/elements/ExprBreedingFamily.java | 2 +- .../breeding/elements/ExprLoveTime.java | 2 +- .../skript/bukkit/displays/DisplayModule.java | 8 ++++---- .../generic/ExprDisplayBillboard.java | 2 +- .../generic/ExprDisplayBrightness.java | 2 +- .../generic/ExprDisplayGlowOverride.java | 2 +- .../generic/ExprDisplayHeightWidth.java | 2 +- .../generic/ExprDisplayInterpolation.java | 2 +- .../displays/generic/ExprDisplayShadow.java | 2 +- .../generic/ExprDisplayTeleportDuration.java | 2 +- .../ExprDisplayTransformationRotation.java | 2 +- ...DisplayTransformationScaleTranslation.java | 2 +- .../generic/ExprDisplayViewRange.java | 2 +- .../item/ExprItemDisplayTransform.java | 2 +- .../text/CondTextDisplayHasDropShadow.java | 2 +- .../text/CondTextDisplaySeeThroughBlocks.java | 2 +- .../text/EffTextDisplayDropShadow.java | 2 +- .../text/EffTextDisplaySeeThroughBlocks.java | 2 +- .../text/ExprTextDisplayAlignment.java | 2 +- .../text/ExprTextDisplayLineWidth.java | 2 +- .../displays/text/ExprTextDisplayOpacity.java | 2 +- .../fishing/elements/CondFishingLure.java | 2 +- .../fishing/elements/CondIsInOpenWater.java | 2 +- .../fishing/elements/EffFishingLure.java | 2 +- .../fishing/elements/EffPullHookedEntity.java | 2 +- .../fishing/elements/EvtBucketEntity.java | 2 +- .../bukkit/fishing/elements/EvtFish.java | 2 +- .../elements/ExprFishingApproachAngle.java | 2 +- .../fishing/elements/ExprFishingBiteTime.java | 2 +- .../fishing/elements/ExprFishingHook.java | 2 +- .../elements/ExprFishingHookEntity.java | 2 +- .../fishing/elements/ExprFishingWaitTime.java | 2 +- .../bukkit/furnace/elements/EvtFurnace.java | 8 ++++---- .../elements/ExprFurnaceEventItems.java | 2 +- .../furnace/elements/ExprFurnaceTime.java | 2 +- .../skript/bukkit/input/InputModule.java | 2 +- .../conditions/CondIsPressingKey.java | 2 +- .../input/elements/events/EvtPlayerInput.java | 2 +- .../expressions/ExprCurrentInputKeys.java | 2 +- .../bukkit/loottables/LootTableModule.java | 4 ++-- .../elements/conditions/CondHasLootTable.java | 2 +- .../elements/conditions/CondIsLootable.java | 2 +- .../elements/effects/EffGenerateLoot.java | 2 +- .../elements/expressions/ExprLootContext.java | 2 +- .../expressions/ExprLootContextEntity.java | 2 +- .../expressions/ExprLootContextLocation.java | 2 +- .../expressions/ExprLootContextLooter.java | 2 +- .../expressions/ExprLootContextLuck.java | 2 +- .../elements/expressions/ExprLootItems.java | 2 +- .../elements/expressions/ExprLootTable.java | 2 +- .../expressions/ExprLootTableFromString.java | 2 +- .../expressions/ExprLootTableSeed.java | 2 +- .../expressions/ExprSecCreateLootContext.java | 2 +- .../skript/bukkit/misc/effects/EffRotate.java | 2 +- .../misc/expressions/ExprItemOfEntity.java | 2 +- .../expressions/ExprQuaternionAxisAngle.java | 2 +- .../bukkit/misc/expressions/ExprRotate.java | 2 +- .../bukkit/misc/expressions/ExprTextOf.java | 2 +- .../skript/bukkit/tags/TagModule.java | 2 +- .../bukkit/tags/elements/CondIsTagged.java | 2 +- .../bukkit/tags/elements/EffRegisterTag.java | 2 +- .../skript/bukkit/tags/elements/ExprTag.java | 2 +- .../bukkit/tags/elements/ExprTagContents.java | 2 +- .../bukkit/tags/elements/ExprTagKey.java | 2 +- .../bukkit/tags/elements/ExprTagsOf.java | 2 +- .../bukkit/tags/elements/ExprTagsOfType.java | 2 +- 188 files changed, 221 insertions(+), 221 deletions(-) diff --git a/gradle.properties b/gradle.properties index a00ca65cc8d..5e27c501c58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java index f14af8bb86d..c6c6fe3b86c 100644 --- a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java +++ b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java @@ -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")) { @@ -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 experience cooldown change event.") - .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") @@ -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) { @@ -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; @@ -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")) @@ -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")); } } 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 3450a1a1438..69a142d4827 100644 --- a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java +++ b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java @@ -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", new Parameter[] { new Parameter<>("nameOrUUID", DefaultClasses.STRING, true, null), @@ -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")) { @@ -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 @@ -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"); } } diff --git a/src/main/java/ch/njol/skript/classes/data/JavaClasses.java b/src/main/java/ch/njol/skript/classes/data/JavaClasses.java index 644004b8d3a..8d9bbea8603 100644 --- a/src/main/java/ch/njol/skript/classes/data/JavaClasses.java +++ b/src/main/java/ch/njol/skript/classes/data/JavaClasses.java @@ -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; diff --git a/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java b/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java index bdbb2cef61d..9f015bdc2ff 100644 --- a/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java +++ b/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java @@ -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) { @@ -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() { @Override @@ -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() { @Override @@ -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