Apply suggestions from code review

Co-authored-by: LimeGlass <[email protected]>
SkriptLang · Jun 16, 2024 · 038e77e · 038e77e
1 parent 444d6a8
commit 038e77e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/ch/njol/skript/conditions/CondTooltip.java b/src/main/java/ch/njol/skript/conditions/CondTooltip.java
@@ -44,8 +44,8 @@
 	"send true if entire tooltip of player's tool is shown",
 	"if additional tooltip of {_item} is hidden:"
 })
+@RequiredPlugins("Spigot 1.20.5+")
 @Since("INSERT VERSION")
-@RequiredPlugins("MC 1.20.5+")
 public class CondTooltip extends Condition {
 
 	static {
@@ -61,8 +61,8 @@ public class CondTooltip extends Condition {
 	private Expression<ItemType> items;
 	private boolean entire;
 
-	@SuppressWarnings("unchecked")
 	@Override
+	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		items = (Expression<ItemType>) exprs[0];
 		entire = !parseResult.hasTag("additional");
@@ -79,7 +79,7 @@ public boolean check(Event event) {
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "the " + (entire ? "entire" : "additional") + " tooltip of " + items.toString(event, debug) + " is " + (isNegated() ? "hidden" : "shown");
+		return (entire ? "entire" : "additional") + " tooltip of " + items.toString(event, debug) + " is " + (isNegated() ? "hidden" : "shown");
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffTooltip.java b/src/main/java/ch/njol/skript/effects/EffTooltip.java
@@ -44,8 +44,8 @@
 	"hide the entire tooltip of player's tool",
 	"hide {_item}'s additional tool tip"
 })
+@RequiredPlugins("Spigot 1.20.5+")
 @Since("INSERT VERSION")
-@RequiredPlugins("MC 1.20.5+")
 public class EffTooltip extends Effect {
 
 	static {
@@ -59,8 +59,8 @@ public class EffTooltip extends Effect {
 	private Expression<ItemType> items;
 	private boolean show, entire;
 
-	@SuppressWarnings("unchecked")
 	@Override
+	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		items = (Expression<ItemType>) exprs[0];
 		show = parseResult.hasTag("show");

diff --git a/src/test/skript/tests/syntaxes/conditions/CondTooltip.sk b/src/test/skript/tests/syntaxes/conditions/CondTooltip.sk
@@ -1,15 +1,15 @@
 test "tooltip" when running minecraft "1.20.5":
 
-	set {_item} to diamond
+	set {_item} to a diamond
 	assert entire tooltip of {_item} is shown with "item unexpectedly doesn't have entire tooltip"
 	assert additional tooltip of {_item} is shown with "item unexpectedly doesn't have additional tooltip"
 
 	hide entire tooltip of {_item}
-	hide additional tooltip of {_item}
 	assert entire tooltip of {_item} is hidden with "item unexpectedly has entire tooltip"
-	assert entire tooltip of {_item} is hidden with "item unexpectedly has additional tooltip"
+	hide additional tooltip of {_item}
+	assert additional tooltip of {_item} is hidden with "item unexpectedly has additional tooltip"
 
 	show entire tooltip of {_item}
-	show additional tooltip of {_item}
 	assert entire tooltip of {_item} is shown with "item unexpectedly doesn't have entire tooltip"
+	show additional tooltip of {_item}
 	assert additional tooltip of {_item} is shown with "item unexpectedly doesn't have additional tooltip"