From 72c5054b23aef4bceab04d08103fd7c8fcb049e3 Mon Sep 17 00:00:00 2001 From: SirSmurfy2 Date: Sat, 5 Jul 2025 01:12:54 -0400 Subject: [PATCH 1/4] Initial Commit --- .../skript/test/runner/LitDoubleMaxValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitDoubleMinValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitFloatMaxValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitFloatMinValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitIntMaxValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitIntMinValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitLongMaxValue.java | 36 +++++++++++++++++++ .../skript/test/runner/LitLongMinValue.java | 36 +++++++++++++++++++ 8 files changed, 288 insertions(+) create mode 100644 src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java create mode 100644 src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java diff --git a/src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java b/src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java new file mode 100644 index 00000000000..396572d890e --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitDoubleMaxValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitDoubleMaxValue.class, Double.class, ExpressionType.SIMPLE, "double max[imum] value"); + } + } + + public LitDoubleMaxValue() { + super(Double.MAX_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "double max value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java b/src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java new file mode 100644 index 00000000000..a7ba70e6747 --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitDoubleMinValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitDoubleMinValue.class, Double.class, ExpressionType.SIMPLE, "double min[imum] value"); + } + } + + public LitDoubleMinValue() { + super(Double.MIN_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "double min value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java b/src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java new file mode 100644 index 00000000000..ab66583de61 --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitFloatMaxValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitFloatMaxValue.class, Float.class, ExpressionType.SIMPLE, "float max[imum] value"); + } + } + + public LitFloatMaxValue() { + super(Float.MAX_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "float max value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java b/src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java new file mode 100644 index 00000000000..6b226008f77 --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitFloatMinValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitFloatMinValue.class, Float.class, ExpressionType.SIMPLE, "float min[imum] value"); + } + } + + public LitFloatMinValue() { + super(Float.MIN_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "float min value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java b/src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java new file mode 100644 index 00000000000..a5f6b4325f2 --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitIntMaxValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitIntMaxValue.class, Integer.class, ExpressionType.SIMPLE, "integer max[imum] value"); + } + } + + public LitIntMaxValue() { + super(Integer.MAX_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "integer max value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java b/src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java new file mode 100644 index 00000000000..f75b567b2cd --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitIntMinValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitIntMinValue.class, Integer.class, ExpressionType.SIMPLE, "integer min[imum] value"); + } + } + + public LitIntMinValue() { + super(Integer.MIN_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "integer min value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java b/src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java new file mode 100644 index 00000000000..3e32d460505 --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitLongMaxValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitLongMaxValue.class, Long.class, ExpressionType.SIMPLE, "long max[imum] value"); + } + } + + public LitLongMaxValue() { + super(Long.MAX_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "long max value"; + } + +} diff --git a/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java b/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java new file mode 100644 index 00000000000..cfa50f771ee --- /dev/null +++ b/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java @@ -0,0 +1,36 @@ +package ch.njol.skript.test.runner; + +import ch.njol.skript.Skript; +import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.lang.Expression; +import ch.njol.skript.lang.ExpressionType; +import ch.njol.skript.lang.SkriptParser.ParseResult; +import ch.njol.skript.lang.util.SimpleLiteral; +import ch.njol.util.Kleenean; +import org.bukkit.event.Event; +import org.jetbrains.annotations.Nullable; + +@NoDoc +public class LitLongMinValue extends SimpleLiteral { + + static { + if (TestMode.ENABLED) { + Skript.registerExpression(LitLongMinValue.class, Long.class, ExpressionType.SIMPLE, "long min[imum] value"); + } + } + + public LitLongMinValue() { + super(Long.MIN_VALUE, false); + } + + @Override + public boolean init(Expression[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + return true; + } + + @Override + public String toString(@Nullable Event event, boolean debug) { + return "long min value"; + } + +} From 9a0bb08ca6b956019d885d5155d18bd4bda0a71a Mon Sep 17 00:00:00 2001 From: SirSmurfy2 Date: Sat, 5 Jul 2025 01:26:46 -0400 Subject: [PATCH 2/4] Update Tests --- .../java/ch/njol/skript/test/runner/LitLongMinValue.java | 2 +- .../skript/tests/syntaxes/expressions/ExprDomestication.sk | 6 +++--- .../skript/tests/syntaxes/expressions/ExprLootTableSeed.sk | 4 ++-- .../skript/tests/syntaxes/expressions/ExprRemainingAir.sk | 2 +- .../tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk | 2 +- .../syntaxes/expressions/ExprWorldBorderWarningDistance.sk | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java b/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java index cfa50f771ee..95cf01dec3c 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java +++ b/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java @@ -32,5 +32,5 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is public String toString(@Nullable Event event, boolean debug) { return "long min value"; } - + } diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk b/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk index 005e8821dd0..6adc80aa65f 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk @@ -46,18 +46,18 @@ test "domestication": subtract infinity value from max domestication level of {_e} assert max domestication level of {_e} is 1 with "infinity value should result in 1 when subtracted from the max domestication level of a horse" set max domestication level of {_e} to infinity value # set is done last so the domestication level tests can also go to infinity - assert max domestication level of {_e} is 2147483647 with "infinity value should set the max domestication level of a horse to the max integer value" + assert max domestication level of {_e} is integer max value with "infinity value should set the max domestication level of a horse to the max integer value" add infinity value to domestication level of {_e} assert domestication level of {_e} is 1 with "infinity value shouldn't affect the domestication level of a horse when added" subtract infinity value from domestication level of {_e} assert domestication level of {_e} is 1 with "infinity value should result in 1 when subtracted from the domestication level of a horse" set domestication level of {_e} to infinity value - assert domestication level of {_e} is 2147483647 with "infinity value should set the domestication level of a horse to the max integer value" + assert domestication level of {_e} is integer max value with "infinity value should set the domestication level of a horse to the max integer value" # NaN values add NaN value to max domestication level of {_e} - assert max domestication level of {_e} is 2147483647 with "NaN value should result in 2147483647 when added to the max domestication level of a horse" + assert max domestication level of {_e} is integer max value with "NaN value should result in integer max value when added to the max domestication level of a horse" set max domestication level of {_e} to NaN value assert max domestication level of {_e} is 1 with "NaN value should result in 1 when used to set the max domestication level of a horse" subtract NaN value from max domestication level of {_e} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk b/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk index 639c7adf792..57891162cbe 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk @@ -17,7 +17,7 @@ test "loot table seed": set loot seed of {_pig} to NaN value assert the loot seed of {_pig} is 0 with "NaN value entity loot seed set failed" set loot seed of {_pig} to infinity value - assert the loot seed of {_pig} is 9223372036854775807 with "infinity value entity loot seed set failed" + assert the loot seed of {_pig} is long max value with "infinity value entity loot seed set failed" delete entity within {_pig} @@ -43,6 +43,6 @@ test "loot table seed": set loot seed of test-block to NaN value assert the loot seed of test-block is 0 with "NaN value block loot seed set failed" set loot seed of test-block to infinity value - assert the loot seed of test-block is 9223372036854775807 with "infinity value block loot seed set failed" + assert the loot seed of test-block is long max value with "infinity value block loot seed set failed" set test-block to {_pastBlock} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk b/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk index d927067ed14..dee2215c04a 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk @@ -13,6 +13,6 @@ test "remaining air": assert remaining air of {_e} is 0 seconds with "removing did not limit to 0 seconds" add 10 years to remaining air of {_e} - assert ticks of remaining air of {_e} is 2147483647 with "adding did not limit to max int value" + assert ticks of remaining air of {_e} is integer max value with "adding did not limit to max int value" delete the entity within {_e} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk index 9ccbcb296ec..71fc3e10464 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk @@ -28,6 +28,6 @@ test "line width": assert line width of {_td} is 200 with "failed to reset line width" set line width of {_td} to infinity value - assert line width of {_td} is 2147483647 with "failed to set line width" + assert line width of {_td} is integer max value with "failed to set line width" delete entity within {_td} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk b/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk index fdee1a98511..e7873817a76 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk @@ -1,5 +1,5 @@ test "worldborder warning distance": - set {_max} to 2147483647 + set {_max} to integer max value set {_border} to worldborder of world("world") reset worldborder of world("world") assert worldborder warning distance of {_border} is 5 with "Default worldborder warning distance is not 5" From 5625b26f2a9ada380a23b79c1b0b226ce78dcb15 Mon Sep 17 00:00:00 2001 From: SirSmurfy2 Date: Sat, 5 Jul 2025 01:54:52 -0400 Subject: [PATCH 3/4] literals package --- src/main/java/ch/njol/skript/Skript.java | 2 +- .../{expressions => literals}/LitAt.java | 2 +- .../{expressions => literals}/LitConsole.java | 2 +- .../runner => literals}/LitDoubleMaxValue.java | 18 +++++++++++------- .../runner => literals}/LitDoubleMinValue.java | 18 +++++++++++------- .../{expressions => literals}/LitEternity.java | 2 +- .../runner => literals}/LitFloatMaxValue.java | 18 +++++++++++------- .../runner => literals}/LitFloatMinValue.java | 18 +++++++++++------- .../{expressions => literals}/LitInfinity.java | 2 +- .../runner => literals}/LitIntMaxValue.java | 18 +++++++++++------- .../runner => literals}/LitIntMinValue.java | 18 +++++++++++------- .../runner => literals}/LitLongMaxValue.java | 18 +++++++++++------- .../runner => literals}/LitLongMinValue.java | 18 +++++++++++------- .../{expressions => literals}/LitNaN.java | 2 +- .../LitNegativeInfinity.java | 2 +- .../{expressions => literals}/LitNewLine.java | 2 +- .../{expressions => literals}/LitPi.java | 3 +-- .../7645-floating point timespan math.sk | 2 +- .../syntaxes/expressions/ExprDomestication.sk | 6 +++--- .../syntaxes/expressions/ExprLootTableSeed.sk | 4 ++-- .../syntaxes/expressions/ExprRemainingAir.sk | 2 +- .../expressions/ExprTextDisplayLineWidth.sk | 2 +- .../ExprWorldBorderWarningDistance.sk | 2 +- 23 files changed, 106 insertions(+), 75 deletions(-) rename src/main/java/ch/njol/skript/{expressions => literals}/LitAt.java (96%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitConsole.java (97%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitDoubleMaxValue.java (57%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitDoubleMinValue.java (57%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitEternity.java (97%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitFloatMaxValue.java (58%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitFloatMinValue.java (58%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitInfinity.java (97%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitIntMaxValue.java (57%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitIntMinValue.java (57%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitLongMaxValue.java (58%) rename src/main/java/ch/njol/skript/{test/runner => literals}/LitLongMinValue.java (58%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitNaN.java (97%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitNegativeInfinity.java (97%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitNewLine.java (96%) rename src/main/java/ch/njol/skript/{expressions => literals}/LitPi.java (93%) diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java index 00358e9ee60..7af3a0fb185 100644 --- a/src/main/java/ch/njol/skript/Skript.java +++ b/src/main/java/ch/njol/skript/Skript.java @@ -575,7 +575,7 @@ public void onEnable() { try { getAddonInstance().loadClasses("ch.njol.skript", - "conditions", "effects", "events", "expressions", "entity", "sections", "structures"); + "conditions", "effects", "events", "expressions", "entity", "literals", "sections", "structures"); getAddonInstance().loadClasses("org.skriptlang.skript.bukkit", "misc"); // todo: become proper module once registry api is merged FishingModule.load(); diff --git a/src/main/java/ch/njol/skript/expressions/LitAt.java b/src/main/java/ch/njol/skript/literals/LitAt.java similarity index 96% rename from src/main/java/ch/njol/skript/expressions/LitAt.java rename to src/main/java/ch/njol/skript/literals/LitAt.java index fba2b58b59c..e5f4efa6ae7 100644 --- a/src/main/java/ch/njol/skript/expressions/LitAt.java +++ b/src/main/java/ch/njol/skript/literals/LitAt.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/ch/njol/skript/expressions/LitConsole.java b/src/main/java/ch/njol/skript/literals/LitConsole.java similarity index 97% rename from src/main/java/ch/njol/skript/expressions/LitConsole.java rename to src/main/java/ch/njol/skript/literals/LitConsole.java index 23cac44ba93..9f9aa4a0461 100644 --- a/src/main/java/ch/njol/skript/expressions/LitConsole.java +++ b/src/main/java/ch/njol/skript/literals/LitConsole.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import org.bukkit.Bukkit; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java b/src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java similarity index 57% rename from src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java rename to src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java index 396572d890e..76bdd80b82a 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitDoubleMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Maximum Double Value") +@Description("A number representing the maximum value of a double number type.") +@Example("if {_number} >= maximum double value:") +@Since("INSERT VERSION") public class LitDoubleMaxValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitDoubleMaxValue.class, Double.class, ExpressionType.SIMPLE, "double max[imum] value"); - } + Skript.registerExpression(LitDoubleMaxValue.class, Double.class, ExpressionType.SIMPLE, "max[imum] double value"); } public LitDoubleMaxValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "double max value"; + return "max double value"; } } diff --git a/src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java b/src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java similarity index 57% rename from src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java rename to src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java index a7ba70e6747..ba86609809b 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitDoubleMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Minimum Double Value") +@Description("A number representing the minimum value of a double number type.") +@Example("if {_number} <= minimum double value:") +@Since("INSERT VERSION") public class LitDoubleMinValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitDoubleMinValue.class, Double.class, ExpressionType.SIMPLE, "double min[imum] value"); - } + Skript.registerExpression(LitDoubleMinValue.class, Double.class, ExpressionType.SIMPLE, "min[imum] double value"); } public LitDoubleMinValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "double min value"; + return "min double value"; } } diff --git a/src/main/java/ch/njol/skript/expressions/LitEternity.java b/src/main/java/ch/njol/skript/literals/LitEternity.java similarity index 97% rename from src/main/java/ch/njol/skript/expressions/LitEternity.java rename to src/main/java/ch/njol/skript/literals/LitEternity.java index 76f5acb48f0..ee1287090fc 100644 --- a/src/main/java/ch/njol/skript/expressions/LitEternity.java +++ b/src/main/java/ch/njol/skript/literals/LitEternity.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java b/src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java similarity index 58% rename from src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java rename to src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java index ab66583de61..4e9d17c4434 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitFloatMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Maximum Float Value") +@Description("A number representing the maximum value of a float number type.") +@Example("if {_number} >= maximum float value:") +@Since("INSERT VERSION") public class LitFloatMaxValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitFloatMaxValue.class, Float.class, ExpressionType.SIMPLE, "float max[imum] value"); - } + Skript.registerExpression(LitFloatMaxValue.class, Float.class, ExpressionType.SIMPLE, "max[imum] float value"); } public LitFloatMaxValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "float max value"; + return "max float value"; } } diff --git a/src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java b/src/main/java/ch/njol/skript/literals/LitFloatMinValue.java similarity index 58% rename from src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java rename to src/main/java/ch/njol/skript/literals/LitFloatMinValue.java index 6b226008f77..6eb6c5fe2ae 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitFloatMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitFloatMinValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Minimum Float Value") +@Description("A number representing the minimum value of a float number type.") +@Example("if {_number} <= minimum float value:") +@Since("INSERT VERSION") public class LitFloatMinValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitFloatMinValue.class, Float.class, ExpressionType.SIMPLE, "float min[imum] value"); - } + Skript.registerExpression(LitFloatMinValue.class, Float.class, ExpressionType.SIMPLE, "min[imum] float value"); } public LitFloatMinValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "float min value"; + return "min float value"; } } diff --git a/src/main/java/ch/njol/skript/expressions/LitInfinity.java b/src/main/java/ch/njol/skript/literals/LitInfinity.java similarity index 97% rename from src/main/java/ch/njol/skript/expressions/LitInfinity.java rename to src/main/java/ch/njol/skript/literals/LitInfinity.java index 2f9fae14674..4e3949be5ee 100644 --- a/src/main/java/ch/njol/skript/expressions/LitInfinity.java +++ b/src/main/java/ch/njol/skript/literals/LitInfinity.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java b/src/main/java/ch/njol/skript/literals/LitIntMaxValue.java similarity index 57% rename from src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java rename to src/main/java/ch/njol/skript/literals/LitIntMaxValue.java index a5f6b4325f2..75f57f8f40a 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitIntMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitIntMaxValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Maximum Integer Value") +@Description("A number representing the maximum value of an integer number type.") +@Example("if {_number} >= maximum integer value:") +@Since("INSERT VERSION") public class LitIntMaxValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitIntMaxValue.class, Integer.class, ExpressionType.SIMPLE, "integer max[imum] value"); - } + Skript.registerExpression(LitIntMaxValue.class, Integer.class, ExpressionType.SIMPLE, "max[imum] integer value"); } public LitIntMaxValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "integer max value"; + return "max integer value"; } } diff --git a/src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java b/src/main/java/ch/njol/skript/literals/LitIntMinValue.java similarity index 57% rename from src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java rename to src/main/java/ch/njol/skript/literals/LitIntMinValue.java index f75b567b2cd..ad82283618d 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitIntMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitIntMinValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Minimum Integer Value") +@Description("A number representing the minimum value of an integer number type.") +@Example("if {_number} <= minimum integer value:") +@Since("INSERT VERSION") public class LitIntMinValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitIntMinValue.class, Integer.class, ExpressionType.SIMPLE, "integer min[imum] value"); - } + Skript.registerExpression(LitIntMinValue.class, Integer.class, ExpressionType.SIMPLE, "min[imum] integer value"); } public LitIntMinValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "integer min value"; + return "min integer value"; } } diff --git a/src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java b/src/main/java/ch/njol/skript/literals/LitLongMaxValue.java similarity index 58% rename from src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java rename to src/main/java/ch/njol/skript/literals/LitLongMaxValue.java index 3e32d460505..f9a1a095c77 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitLongMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitLongMaxValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Maximum Long Value") +@Description("A number representing the maximum value of a long number type.") +@Example("if {_number} >= maximum long value:") +@Since("INSERT VERSION") public class LitLongMaxValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitLongMaxValue.class, Long.class, ExpressionType.SIMPLE, "long max[imum] value"); - } + Skript.registerExpression(LitLongMaxValue.class, Long.class, ExpressionType.SIMPLE, "max[imum] long value"); } public LitLongMaxValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "long max value"; + return "max long value"; } } diff --git a/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java b/src/main/java/ch/njol/skript/literals/LitLongMinValue.java similarity index 58% rename from src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java rename to src/main/java/ch/njol/skript/literals/LitLongMinValue.java index 95cf01dec3c..f102ec1e4be 100644 --- a/src/main/java/ch/njol/skript/test/runner/LitLongMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitLongMinValue.java @@ -1,7 +1,10 @@ -package ch.njol.skript.test.runner; +package ch.njol.skript.literals; import ch.njol.skript.Skript; -import ch.njol.skript.doc.NoDoc; +import ch.njol.skript.doc.Description; +import ch.njol.skript.doc.Example; +import ch.njol.skript.doc.Name; +import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; @@ -10,13 +13,14 @@ import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -@NoDoc +@Name("Minimum Long Value") +@Description("A number representing the minimum value of a long number type.") +@Example("if {_number} <= minimum long value:") +@Since("INSERT VERSION") public class LitLongMinValue extends SimpleLiteral { static { - if (TestMode.ENABLED) { - Skript.registerExpression(LitLongMinValue.class, Long.class, ExpressionType.SIMPLE, "long min[imum] value"); - } + Skript.registerExpression(LitLongMinValue.class, Long.class, ExpressionType.SIMPLE, "min[imum] long value"); } public LitLongMinValue() { @@ -30,7 +34,7 @@ public boolean init(Expression[] expressions, int matchedPattern, Kleenean is @Override public String toString(@Nullable Event event, boolean debug) { - return "long min value"; + return "min long value"; } } diff --git a/src/main/java/ch/njol/skript/expressions/LitNaN.java b/src/main/java/ch/njol/skript/literals/LitNaN.java similarity index 97% rename from src/main/java/ch/njol/skript/expressions/LitNaN.java rename to src/main/java/ch/njol/skript/literals/LitNaN.java index 11fd37167ef..ae70d8aafaf 100644 --- a/src/main/java/ch/njol/skript/expressions/LitNaN.java +++ b/src/main/java/ch/njol/skript/literals/LitNaN.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/ch/njol/skript/expressions/LitNegativeInfinity.java b/src/main/java/ch/njol/skript/literals/LitNegativeInfinity.java similarity index 97% rename from src/main/java/ch/njol/skript/expressions/LitNegativeInfinity.java rename to src/main/java/ch/njol/skript/literals/LitNegativeInfinity.java index f7d1bb13a63..0d0c6730252 100644 --- a/src/main/java/ch/njol/skript/expressions/LitNegativeInfinity.java +++ b/src/main/java/ch/njol/skript/literals/LitNegativeInfinity.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/ch/njol/skript/expressions/LitNewLine.java b/src/main/java/ch/njol/skript/literals/LitNewLine.java similarity index 96% rename from src/main/java/ch/njol/skript/expressions/LitNewLine.java rename to src/main/java/ch/njol/skript/literals/LitNewLine.java index 8281f216be7..ed3b3a26523 100644 --- a/src/main/java/ch/njol/skript/expressions/LitNewLine.java +++ b/src/main/java/ch/njol/skript/literals/LitNewLine.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import org.bukkit.event.Event; diff --git a/src/main/java/ch/njol/skript/expressions/LitPi.java b/src/main/java/ch/njol/skript/literals/LitPi.java similarity index 93% rename from src/main/java/ch/njol/skript/expressions/LitPi.java rename to src/main/java/ch/njol/skript/literals/LitPi.java index b4dfdf30f5b..ca790e2bd00 100644 --- a/src/main/java/ch/njol/skript/expressions/LitPi.java +++ b/src/main/java/ch/njol/skript/literals/LitPi.java @@ -1,4 +1,4 @@ -package ch.njol.skript.expressions; +package ch.njol.skript.literals; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,7 +7,6 @@ import ch.njol.skript.doc.Since; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; -import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleLiteral; import ch.njol.util.Kleenean; diff --git a/src/test/skript/tests/regressions/7645-floating point timespan math.sk b/src/test/skript/tests/regressions/7645-floating point timespan math.sk index 2a9ca54de24..dab3d8746a5 100644 --- a/src/test/skript/tests/regressions/7645-floating point timespan math.sk +++ b/src/test/skript/tests/regressions/7645-floating point timespan math.sk @@ -9,4 +9,4 @@ test "floating point timespan math": assert (5 seconds / 2.5) is 2 seconds with "failed floating point division" assert (5 seconds / infinity value) is 0 seconds with "Division by infinity didn't return 0 seconds" - assert (5 seconds * 10 ^ 308) is {@max-timespan} with "failed to clamp to the long max value" + assert (5 seconds * 10 ^ 308) is {@max-timespan} with "failed to clamp to the max long value" diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk b/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk index 6adc80aa65f..f49e2db101d 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk @@ -46,18 +46,18 @@ test "domestication": subtract infinity value from max domestication level of {_e} assert max domestication level of {_e} is 1 with "infinity value should result in 1 when subtracted from the max domestication level of a horse" set max domestication level of {_e} to infinity value # set is done last so the domestication level tests can also go to infinity - assert max domestication level of {_e} is integer max value with "infinity value should set the max domestication level of a horse to the max integer value" + assert max domestication level of {_e} is max integer value with "infinity value should set the max domestication level of a horse to the max integer value" add infinity value to domestication level of {_e} assert domestication level of {_e} is 1 with "infinity value shouldn't affect the domestication level of a horse when added" subtract infinity value from domestication level of {_e} assert domestication level of {_e} is 1 with "infinity value should result in 1 when subtracted from the domestication level of a horse" set domestication level of {_e} to infinity value - assert domestication level of {_e} is integer max value with "infinity value should set the domestication level of a horse to the max integer value" + assert domestication level of {_e} is max integer value with "infinity value should set the domestication level of a horse to the max integer value" # NaN values add NaN value to max domestication level of {_e} - assert max domestication level of {_e} is integer max value with "NaN value should result in integer max value when added to the max domestication level of a horse" + assert max domestication level of {_e} is max integer value with "NaN value should result in max integer value when added to the max domestication level of a horse" set max domestication level of {_e} to NaN value assert max domestication level of {_e} is 1 with "NaN value should result in 1 when used to set the max domestication level of a horse" subtract NaN value from max domestication level of {_e} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk b/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk index 57891162cbe..e69a249bcf7 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk @@ -17,7 +17,7 @@ test "loot table seed": set loot seed of {_pig} to NaN value assert the loot seed of {_pig} is 0 with "NaN value entity loot seed set failed" set loot seed of {_pig} to infinity value - assert the loot seed of {_pig} is long max value with "infinity value entity loot seed set failed" + assert the loot seed of {_pig} is max long value with "infinity value entity loot seed set failed" delete entity within {_pig} @@ -43,6 +43,6 @@ test "loot table seed": set loot seed of test-block to NaN value assert the loot seed of test-block is 0 with "NaN value block loot seed set failed" set loot seed of test-block to infinity value - assert the loot seed of test-block is long max value with "infinity value block loot seed set failed" + assert the loot seed of test-block is max long value with "infinity value block loot seed set failed" set test-block to {_pastBlock} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk b/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk index dee2215c04a..257d42a0974 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk @@ -13,6 +13,6 @@ test "remaining air": assert remaining air of {_e} is 0 seconds with "removing did not limit to 0 seconds" add 10 years to remaining air of {_e} - assert ticks of remaining air of {_e} is integer max value with "adding did not limit to max int value" + assert ticks of remaining air of {_e} is max integer value with "adding did not limit to max int value" delete the entity within {_e} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk index 71fc3e10464..92ac9ab36a6 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk @@ -28,6 +28,6 @@ test "line width": assert line width of {_td} is 200 with "failed to reset line width" set line width of {_td} to infinity value - assert line width of {_td} is integer max value with "failed to set line width" + assert line width of {_td} is max integer value with "failed to set line width" delete entity within {_td} diff --git a/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk b/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk index e7873817a76..a9052f65252 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprWorldBorderWarningDistance.sk @@ -1,5 +1,5 @@ test "worldborder warning distance": - set {_max} to integer max value + set {_max} to max integer value set {_border} to worldborder of world("world") reset worldborder of world("world") assert worldborder warning distance of {_border} is 5 with "Default worldborder warning distance is not 5" From 28022e34a8d275a21152599fbd0cb758c0dcd49f Mon Sep 17 00:00:00 2001 From: SirSmurfy2 Date: Mon, 7 Jul 2025 11:09:38 -0400 Subject: [PATCH 4/4] Add "[the] " --- src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitFloatMinValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitIntMaxValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitIntMinValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitLongMaxValue.java | 2 +- src/main/java/ch/njol/skript/literals/LitLongMinValue.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java b/src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java index 76bdd80b82a..168a79cf58b 100644 --- a/src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitDoubleMaxValue.java @@ -20,7 +20,7 @@ public class LitDoubleMaxValue extends SimpleLiteral { static { - Skript.registerExpression(LitDoubleMaxValue.class, Double.class, ExpressionType.SIMPLE, "max[imum] double value"); + Skript.registerExpression(LitDoubleMaxValue.class, Double.class, ExpressionType.SIMPLE, "[the] max[imum] double value"); } public LitDoubleMaxValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java b/src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java index ba86609809b..73f140d2885 100644 --- a/src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitDoubleMinValue.java @@ -20,7 +20,7 @@ public class LitDoubleMinValue extends SimpleLiteral { static { - Skript.registerExpression(LitDoubleMinValue.class, Double.class, ExpressionType.SIMPLE, "min[imum] double value"); + Skript.registerExpression(LitDoubleMinValue.class, Double.class, ExpressionType.SIMPLE, "[the] min[imum] double value"); } public LitDoubleMinValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java b/src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java index 4e9d17c4434..4402d14b9a5 100644 --- a/src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitFloatMaxValue.java @@ -20,7 +20,7 @@ public class LitFloatMaxValue extends SimpleLiteral { static { - Skript.registerExpression(LitFloatMaxValue.class, Float.class, ExpressionType.SIMPLE, "max[imum] float value"); + Skript.registerExpression(LitFloatMaxValue.class, Float.class, ExpressionType.SIMPLE, "[the] max[imum] float value"); } public LitFloatMaxValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitFloatMinValue.java b/src/main/java/ch/njol/skript/literals/LitFloatMinValue.java index 6eb6c5fe2ae..909b0c7cc41 100644 --- a/src/main/java/ch/njol/skript/literals/LitFloatMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitFloatMinValue.java @@ -20,7 +20,7 @@ public class LitFloatMinValue extends SimpleLiteral { static { - Skript.registerExpression(LitFloatMinValue.class, Float.class, ExpressionType.SIMPLE, "min[imum] float value"); + Skript.registerExpression(LitFloatMinValue.class, Float.class, ExpressionType.SIMPLE, "[the] min[imum] float value"); } public LitFloatMinValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitIntMaxValue.java b/src/main/java/ch/njol/skript/literals/LitIntMaxValue.java index 75f57f8f40a..ee4527a3096 100644 --- a/src/main/java/ch/njol/skript/literals/LitIntMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitIntMaxValue.java @@ -20,7 +20,7 @@ public class LitIntMaxValue extends SimpleLiteral { static { - Skript.registerExpression(LitIntMaxValue.class, Integer.class, ExpressionType.SIMPLE, "max[imum] integer value"); + Skript.registerExpression(LitIntMaxValue.class, Integer.class, ExpressionType.SIMPLE, "[the] max[imum] integer value"); } public LitIntMaxValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitIntMinValue.java b/src/main/java/ch/njol/skript/literals/LitIntMinValue.java index ad82283618d..d6574a55c81 100644 --- a/src/main/java/ch/njol/skript/literals/LitIntMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitIntMinValue.java @@ -20,7 +20,7 @@ public class LitIntMinValue extends SimpleLiteral { static { - Skript.registerExpression(LitIntMinValue.class, Integer.class, ExpressionType.SIMPLE, "min[imum] integer value"); + Skript.registerExpression(LitIntMinValue.class, Integer.class, ExpressionType.SIMPLE, "[the] min[imum] integer value"); } public LitIntMinValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitLongMaxValue.java b/src/main/java/ch/njol/skript/literals/LitLongMaxValue.java index f9a1a095c77..5e9f85e024f 100644 --- a/src/main/java/ch/njol/skript/literals/LitLongMaxValue.java +++ b/src/main/java/ch/njol/skript/literals/LitLongMaxValue.java @@ -20,7 +20,7 @@ public class LitLongMaxValue extends SimpleLiteral { static { - Skript.registerExpression(LitLongMaxValue.class, Long.class, ExpressionType.SIMPLE, "max[imum] long value"); + Skript.registerExpression(LitLongMaxValue.class, Long.class, ExpressionType.SIMPLE, "[the] max[imum] long value"); } public LitLongMaxValue() { diff --git a/src/main/java/ch/njol/skript/literals/LitLongMinValue.java b/src/main/java/ch/njol/skript/literals/LitLongMinValue.java index f102ec1e4be..ec485e4baf5 100644 --- a/src/main/java/ch/njol/skript/literals/LitLongMinValue.java +++ b/src/main/java/ch/njol/skript/literals/LitLongMinValue.java @@ -20,7 +20,7 @@ public class LitLongMinValue extends SimpleLiteral { static { - Skript.registerExpression(LitLongMinValue.class, Long.class, ExpressionType.SIMPLE, "min[imum] long value"); + Skript.registerExpression(LitLongMinValue.class, Long.class, ExpressionType.SIMPLE, "[the] min[imum] long value"); } public LitLongMinValue() {