Skip to content

Commit

Permalink
Prepare for relase of 2.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ShaneBeee committed Mar 20, 2023
1 parent 3b04d86 commit 172e7cb
Show file tree
Hide file tree
Showing 36 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.shanebeestudios</groupId>
<artifactId>SkBee</artifactId>
<version>2.7.8</version>
<version>2.8.0</version>

<properties>
<maven.compiler.source>16</maven.compiler.source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"NOTE: This is a TEMPORARY solution until Skript adds these entities."})
@Examples({"le spawn item display entity at player",
"set item display of last spawned entity to diamond"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class EffTempSpawn extends Effect {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Name("DisplayEntity - Block Display Blockdata")
@Description({"Represents the block data of a Block Display Entity.", Types.McWIKI})
@Examples("set display block data of {_display} to oak_stairs[facing=south]")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprBlockDisplayBlock extends SimplePropertyExpression<Entity, BlockData> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Description({"Represents the block type of a Block Display Entity.",
"I HIGHLY recommend not using this, use the block data method instead.", Types.McWIKI})
@Examples("set display block item type of {_omgPleaseStopUsingItemTypesForThisPleaseUseBlockDataInstead} to diamond ore")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprBlockDisplayItemType extends SimplePropertyExpression<Entity, ItemType> {

private static final BlockData STONE = Material.STONE.createBlockData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Name("DisplayEntity - Billboard")
@Description({"Represents the billboard of a Display Entity.", Types.McWIKI})
@Examples("set display billboard of {_display} to horizontal")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayBillboard extends SimplePropertyExpression<Entity, Billboard> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@Description({"Represents the brightness attributes of a Display Entity.",
"NOTE: If this is not set in the first place, it will return nothing!", Types.McWIKI})
@Examples("set display brightness of {_display} to displayBrightness(10,10)")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayBrightness extends SimplePropertyExpression<Entity, Brightness> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Name("DisplayEntity - Glow Color Override")
@Description({"Represents the glow color override of a Display Entity.", Types.McWIKI})
@Examples("set glow color override of {_display} to bukkitColor(255,1,1,100)")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayGlowColor extends SimplePropertyExpression<Entity, Color> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"NOTE: Due to how these work, you will need to use integers as ticks instead of time spans.", Types.McWIKI})
@Examples({"set interpolation start of {_display} to -1",
"set interpolation delay of {_display} to 200"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayInterpolation extends SimplePropertyExpression<Entity, Integer> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@Description({"Represents the transformation left/right rotation of a Display Entity.", Types.McWIKI})
@Examples({"set display left rotation of {_display} to vector4(0,1,1,0)",
"set display right rotation of {_display} to vector4(1,0,0,5)"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayRotation extends SimplePropertyExpression<Entity, Quaternionf> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Name("DisplayEntity - Scale")
@Description({"Represents the transformation scale of a Display Entity.", Types.McWIKI})
@Examples("set display scale of {_display} to vector(5,5,5)")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayScale extends SimplePropertyExpression<Entity, Vector> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Description({"Represents the shadow radius/strength of a Display Entity.", Types.McWIKI})
@Examples({"set shadow strength of {_display} to 3",
"set shadow radius of {_display} to 10"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayShadow extends SimplePropertyExpression<Entity, Float> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Name("DisplayEntity - Transformation")
@Description({"Represents the transformation of a Display Entity.", Types.McWIKI})
@Examples("set display transformation of {_display} to {_transformation}")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayTransformation extends SimplePropertyExpression<Entity, Transformation> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Name("DisplayEntity - Translation")
@Description({"Represents the transformation translation of a Display Entity.", Types.McWIKI})
@Examples("set display translation of {_display} to vector(0,2,0)")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayTranslation extends SimplePropertyExpression<Entity, Vector> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Name("DisplayEntity - View Range")
@Description({"Represents the view range of a Display Entity.", Types.McWIKI})
@Examples("set view range of {_display} to 500")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayViewRange extends SimplePropertyExpression<Entity, Float> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@Name("DisplayEntity - Display Width/Height")
@Description({"Represents the width/height of a display entity.", Types.McWIKI})
@Examples("set display width of {_display} to 3")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprDisplayWidthHeight extends SimplePropertyExpression<Entity, Float> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Examples({"set display item of {_display} to diamond sword",
"set display item of {_display} to air",
"delete display item of {_display}"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprItemDisplayItem extends SimplePropertyExpression<Entity, ItemType> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@Description({"Represents the item display transform of an Item Display Entity.", Types.McWIKI})
@Examples({"set item display transform of {_display} to ground transform",
"set item display transform of {_display} to fixed transform"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprItemDisplayTransform extends SimplePropertyExpression<Entity, ItemDisplayTransform> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Name("DisplayEntity - Text Alignment")
@Description({"Represents the text alignment of a Text Display Entity.", Types.McWIKI})
@Examples("set text alignment of {_display} to left aligned")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayAlignment extends SimplePropertyExpression<Entity, TextAligment> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@Description({"Represents the text background color of a Text Display Entity.",
"NOTE: Due to Skript Color missing the alpha channel, you must use Bukkit Colors here.", Types.McWIKI})
@Examples("set text background color of {_display} to bukkitColor(55,100,0,150)")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayBackgroundColor extends SimplePropertyExpression<Entity, Color> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Name("DisplayEntity - Text Default Background")
@Description({"Represents if a Text Display Entity should use a default background.", Types.McWIKI})
@Examples("set default text background of {_display} to true")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayDefaultBackground extends SimplePropertyExpression<Entity, Boolean> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Name("DisplayEntity - Text Line Width")
@Description({"Represents the line width of a Text Display Entity.", Types.McWIKI})
@Examples("set line width of {_display} to 100")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayLineWidth extends SimplePropertyExpression<Entity, Integer> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Name("DisplayEntity - Text Opacity")
@Description({"Represents the text opacity of a Text Display Entity.", Types.McWIKI})
@Examples("set text opacity of {_display} to 50")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayOpacity extends SimplePropertyExpression<Entity, Integer> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Name("DisplayEntity - See Through")
@Description({"Represents the see through state of a Text Display Entity.", Types.McWIKI})
@Examples("set see thru state of {_display} to true")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplaySeeThru extends SimplePropertyExpression<Entity, Boolean> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Name("DisplayEntity - Text Shadowed")
@Description({"Represents the shadowed state of a Text Display Entity.", Types.McWIKI})
@Examples("set text shadowed of {_display} to true")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayShadowed extends SimplePropertyExpression<Entity, Boolean> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@Description({"Represents the display text of a Text Display Entity.",
"NOTE: Supports multiple lines.", Types.McWIKI})
@Examples("set display text of {_display} to \"Line 1\", \"Line 2\" and \"Line 3\"")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayText extends SimplePropertyExpression<Entity, String> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@Name("DisplayEntity - Text Component")
@Description({"Represents the text component of a Text Display Entity.", Types.McWIKI})
@Examples("set display component of {_display} to mini message from \"<rainbow>OOO A RAINBOW\"")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprTextDisplayTextComponent extends SimplePropertyExpression<Entity, BeeComponent> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ public class Types {
.user("display ?brightness(es)?")
.name("DisplayEntity - Display Brightness")
.description("Represents the brightness attributes of a Display Entity.", McWIKI)
.since("INSERT VERSION"));
.since("2.8.0"));

EnumUtils<Billboard> BILLBOARD_ENUM = new EnumUtils<>(Billboard.class);
Classes.registerClass(new ClassInfo<>(Billboard.class, "displaybillboard")
.user("display ?billboards?")
.name("DisplayEntity - Billboard")
.description("Represents the Billboard of a Display Entity.", McWIKI)
.usage(BILLBOARD_ENUM.getAllNames())
.since("INSERT VERSION")
.since("2.8.0")
.parser(BILLBOARD_ENUM.getParser()));

EnumUtils<TextAligment> TEXT_ALIGNMENT_ENUM = new EnumUtils<>(TextAligment.class, "", "aligned");
Expand All @@ -54,7 +54,7 @@ public class Types {
"NOTE: While I understand these names do not directly align with Minecraft,",
"I had to suffix them to deal with conflict issues.", McWIKI)
.usage(TEXT_ALIGNMENT_ENUM.getAllNames())
.since("INSERT VERSION")
.since("2.8.0")
.parser(TEXT_ALIGNMENT_ENUM.getParser()));

EnumUtils<ItemDisplayTransform> TRANSFORM_ENUM = new EnumUtils<>(ItemDisplayTransform.class, "", "transform");
Expand All @@ -63,28 +63,28 @@ public class Types {
.name("DisplayEntity - Item Display Transform")
.description("Represents the item display transform of an Item Display Entity.", McWIKI)
.usage(TRANSFORM_ENUM.getAllNames())
.since("INSERT VERSION")
.since("2.8.0")
.parser(TRANSFORM_ENUM.getParser()));

TRANSFORMATION = new ClassInfo<>(Transformation.class, "transformation")
.user("transformations?")
.name("DisplayEntity - Transformation")
.description("Represents a transformation of a Display Entity.", McWIKI)
.since("INSERT VERSION");
.since("2.8.0");
Classes.registerClass(TRANSFORMATION);

Classes.registerClass(new ClassInfo<>(Color.class, "bukkitcolor")
.user("bukkit ?colors?")
.name("Bukkit Color")
.description("Represents a Bukkit color. This is different than a Skript color",
"as it adds an alpha channel.")
.since("INSERT VERSION"));
.since("2.8.0"));

VECTOR4 = new ClassInfo<>(Quaternionf.class, "vector4")
.user("vector4s?")
.name("Vector4")
.description("Represents a Quaternion (like a vector but with 4 values).")
.since("INSERT VERSION")
.since("2.8.0")
.parser(new Parser<>() {

@SuppressWarnings("NullableProblems")
Expand Down Expand Up @@ -134,7 +134,7 @@ public boolean canParse(ParseContext context) {
.description("Creates a new display brightness object for use on a Display Entity.",
"Number values must be between 0 and 15.", McWIKI)
.examples("set {_db} to displayBrightness(10,10)")
.since("INSERT VERSION"));
.since("2.8.0"));

//noinspection DataFlowIssue
Functions.registerFunction(new SimpleJavaFunction<>("bukkitColor", new Parameter[]{
Expand All @@ -160,7 +160,7 @@ public boolean canParse(ParseContext context) {
.description("Creates a new Bukkit Color using alpha, red, green and blue channels.",
"Number values must be between 0 and 255.")
.examples("set {_color} to bukkitColor(50,155,100,10)")
.since("INSERT VERSION"));
.since("2.8.0"));

Functions.registerFunction(new SimpleJavaFunction<>("vector4", new Parameter[]{
new Parameter<>("x", DefaultClasses.NUMBER, true, null),
Expand All @@ -180,7 +180,7 @@ public boolean canParse(ParseContext context) {
}
.description("Creates a new Vector4(Quaternion).")
.examples("set {_v} to vector4(1,0,0,0)")
.since("INSERT VERSION"));
.since("2.8.0"));

Functions.registerFunction(new SimpleJavaFunction<>("transformation", new Parameter[]{
new Parameter<>("translation", DefaultClasses.VECTOR, true, null),
Expand All @@ -205,7 +205,7 @@ public Transformation[] executeSimple(Object[][] params) {
"\tset {_lr} to vector4(1,1,1,1)",
"\tset {_rr} to vector4(2,2,2,2)",
"\tset {_transform} to transformation({_trans}, {_scale}, {_lr}, {_rr})")
.since("INSERT VERSION"));
.since("2.8.0"));
}

public static Vector3f converToVector3f(Vector vector) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Open water is defined by a 5x4x5 area of water, air and lily pads.",
"If in open water, treasure items may be caught."})
@Examples("if fish hook is in open water:")
@Since("INSERT VERSION")
@Since("2.8.0")
public class CondFishHookInOpenWater extends PropertyCondition<Entity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Name("Fish Hook - Pull In")
@Description("Pulls in the entity hooked to this fish hook.")
@Examples("pull in hooked entity of {_fishHook}")
@Since("INSERT VERSION")
@Since("2.8.0")
public class EffFishHookPullIn extends Effect {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Examples({"on fish:",
"\tif fish state = caught entity:",
"\t\tdelete hooked entity of fish event hook"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprFishHookHookedEntity extends SimplePropertyExpression<FishHook, Entity> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@Name("Fish Hook - Hooked State")
@Description("Represents the hooked state of a fish hook.")
@Examples("if hook state of fish hook = bobbing:")
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprFishHookState extends SimplePropertyExpression<Entity, HookState> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"\tif fish state = fishing:",
"\t\tset min wait time of fish hook to 1 second",
"\t\tset max wait time of fish hook to 2 seconds"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprFishHookWaitTime extends SimplePropertyExpression<Entity, Timespan> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Examples({"set puff state of target entity to 1",
"add 1 to puff state of target entity",
"reset puff state of target entity"})
@Since("INSERT VERSION")
@Since("2.8.0")
public class ExprPufferFishState extends SimplePropertyExpression<Entity,Integer> {

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Types {
.user("fish ?hook ?states?")
.name("Fish Hook State")
.usage(FISH_HOOK_STATE_ENUM.getAllNames())
.since("INSERT VERSION")
.since("2.8.0")
.parser(FISH_HOOK_STATE_ENUM.getParser()));
} else {
Util.logLoading("It looks like another addon registered 'fishhookstate' already.");
Expand Down
Loading

0 comments on commit 172e7cb

Please sign in to comment.