From cc6bdc3078d1123bc668f816c028a42eecc91a78 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:30:15 +1100 Subject: [PATCH 01/18] Reverse Durability --- .../skript/expressions/ExprDamagedItem.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 2e7f7a58ad2..975eb5df932 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -1,6 +1,9 @@ package ch.njol.skript.expressions; +import ch.njol.skript.aliases.ItemData; +import ch.njol.skript.bukkitutil.ItemUtils; import org.bukkit.event.Event; +import org.bukkit.inventory.meta.Damageable; import org.jetbrains.annotations.Nullable; import ch.njol.skript.Skript; @@ -16,28 +19,37 @@ import ch.njol.util.Kleenean; @Name("Damaged Item") -@Description("Directly damages an item. In MC versions 1.12.2 and lower, this can be used to apply data values to items/blocks") +@Description({"Directly changes the durability of an item. In MC versions 1.12.2 and lower, this can be used to apply data values to items/blocks", + "Damage is used to remove the specified number from the base durability of an item. E.g 400 - damage", + "Durability is used to modify the total durability"}) + @Examples({"give player diamond sword with damage value 100", "set player's tool to diamond hoe damaged by 250", "give player diamond sword with damage 700 named \"BROKEN SWORD\"", "set {_item} to diamond hoe with damage value 50 named \"SAD HOE\"", - "set target block of player to wool with data value 1", "set target block of player to potato plant with data value 7"}) + "set target block of player to wool with data value 1", "set target block of player to potato plant with data value 7", + "give player wooden sword with 1 durability named \"VERY BROKEN SWORD\"", + "set player's tool to diamond hoe with durability 500"}) @Since("2.4") public class ExprDamagedItem extends PropertyExpression { static { Skript.registerExpression(ExprDamagedItem.class, ItemType.class, ExpressionType.COMBINED, "%itemtype% with (damage|data) [value] %number%", - "%itemtype% damaged by %number%"); + "%itemtype% damaged by %number%", + "%itemtype% with durability %number%", + "%itemtype% with %number% durability"); } @SuppressWarnings("null") private Expression damage; + private int pattern; @SuppressWarnings({"unchecked", "null"}) @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { setExpr((Expression) exprs[0]); damage = (Expression) exprs[1]; + pattern = matchedPattern; return true; } @@ -47,7 +59,11 @@ protected ItemType[] get(Event e, ItemType[] source) { if (damage == null) return source; return get(source.clone(), item -> { - item.iterator().forEachRemaining(i -> i.setDurability(damage.intValue())); + if (pattern > 1){ + ItemUtils.setDamage(item, (ItemUtils.getMaxDamage(item) - damage.intValue())); + }else{ + item.iterator().forEachRemaining(i -> i.setDurability(damage.intValue())); + } return item; }); } @@ -59,7 +75,8 @@ public Class getReturnType() { @Override public String toString(final @Nullable Event e, boolean debug) { - return getExpr().toString(e, debug) + " with damage value " + damage.toString(e, debug); + if (pattern > 1){ + return getExpr().toString(e, debug) + " with durability " + damage.toString(e, debug); + }else return getExpr().toString(e, debug) + " with damage value " + damage.toString(e, debug); } - } From f648738f4c3161e40d4a4875878507f7e3765947 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:52:33 +1100 Subject: [PATCH 02/18] Update Description Co-authored-by: Fusezion --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 975eb5df932..f745cb08712 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -21,8 +21,8 @@ @Name("Damaged Item") @Description({"Directly changes the durability of an item. In MC versions 1.12.2 and lower, this can be used to apply data values to items/blocks", "Damage is used to remove the specified number from the base durability of an item. E.g 400 - damage", - "Durability is used to modify the total durability"}) - + "Durability is used to modify the total durability" +}) @Examples({"give player diamond sword with damage value 100", "set player's tool to diamond hoe damaged by 250", "give player diamond sword with damage 700 named \"BROKEN SWORD\"", "set {_item} to diamond hoe with damage value 50 named \"SAD HOE\"", From 56345fe52e681874069a1d215e064099df7ff687 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:19:42 +1100 Subject: [PATCH 03/18] Update Description Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index f745cb08712..f2d91206e88 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -19,7 +19,8 @@ import ch.njol.util.Kleenean; @Name("Damaged Item") -@Description({"Directly changes the durability of an item. In MC versions 1.12.2 and lower, this can be used to apply data values to items/blocks", +@Description({ + "Directly changes the durability of an item.", "Damage is used to remove the specified number from the base durability of an item. E.g 400 - damage", "Durability is used to modify the total durability" }) From 1f494dc37598aa3cb1c506dbfd4c700742d75706 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:24:23 +1100 Subject: [PATCH 04/18] Look Nicer Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index f2d91206e88..4959030e1ab 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -62,7 +62,7 @@ protected ItemType[] get(Event e, ItemType[] source) { return get(source.clone(), item -> { if (pattern > 1){ ItemUtils.setDamage(item, (ItemUtils.getMaxDamage(item) - damage.intValue())); - }else{ + } else { item.iterator().forEachRemaining(i -> i.setDurability(damage.intValue())); } return item; From 2ab41b5a60a1058a0790c6766ca9054b8bee6a39 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:24:32 +1100 Subject: [PATCH 05/18] Look Nicer Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 4959030e1ab..72c756c3f58 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -60,7 +60,7 @@ protected ItemType[] get(Event e, ItemType[] source) { if (damage == null) return source; return get(source.clone(), item -> { - if (pattern > 1){ + if (pattern > 1) { ItemUtils.setDamage(item, (ItemUtils.getMaxDamage(item) - damage.intValue())); } else { item.iterator().forEachRemaining(i -> i.setDurability(damage.intValue())); From 063e35cc1ed8d2383b95f8cd975de5b8c844cf9c Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:24:51 +1100 Subject: [PATCH 06/18] Look Nicer Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 72c756c3f58..c37a23d68d0 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -61,7 +61,7 @@ protected ItemType[] get(Event e, ItemType[] source) { return source; return get(source.clone(), item -> { if (pattern > 1) { - ItemUtils.setDamage(item, (ItemUtils.getMaxDamage(item) - damage.intValue())); + ItemUtils.setDamage(item, ItemUtils.getMaxDamage(item) - damage.intValue()); } else { item.iterator().forEachRemaining(i -> i.setDurability(damage.intValue())); } From 2341aefc10386574cf672f0f15af6263c81a96fd Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:25:03 +1100 Subject: [PATCH 07/18] Look Nicer Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index c37a23d68d0..fc1648bdfa7 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -45,8 +45,8 @@ public class ExprDamagedItem extends PropertyExpression { private Expression damage; private int pattern; - @SuppressWarnings({"unchecked", "null"}) @Override + @SuppressWarnings({"unchecked", "null"}) public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { setExpr((Expression) exprs[0]); damage = (Expression) exprs[1]; From 9df590f357eddeaed16138023341788ef8664392 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:25:24 +1100 Subject: [PATCH 08/18] Look Nicer? Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index fc1648bdfa7..f829d2d0880 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -47,7 +47,7 @@ public class ExprDamagedItem extends PropertyExpression { @Override @SuppressWarnings({"unchecked", "null"}) - public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { + public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { setExpr((Expression) exprs[0]); damage = (Expression) exprs[1]; pattern = matchedPattern; From 840dd10808fc910cf798143248c95c2434f57946 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:26:08 +1100 Subject: [PATCH 09/18] Look Nicer Why remove the '@'? Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index f829d2d0880..cf18cc9f534 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -75,7 +75,7 @@ public Class getReturnType() { } @Override - public String toString(final @Nullable Event e, boolean debug) { + public String toString(Nullable Event event, boolean debug) { if (pattern > 1){ return getExpr().toString(e, debug) + " with durability " + damage.toString(e, debug); }else return getExpr().toString(e, debug) + " with damage value " + damage.toString(e, debug); From 2321cde3271bd1ec3667063882993c9a1b807b35 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:26:50 +1100 Subject: [PATCH 10/18] Update src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- .../java/ch/njol/skript/expressions/ExprDamagedItem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index cf18cc9f534..3e6776c0e21 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -76,8 +76,9 @@ public Class getReturnType() { @Override public String toString(Nullable Event event, boolean debug) { - if (pattern > 1){ - return getExpr().toString(e, debug) + " with durability " + damage.toString(e, debug); - }else return getExpr().toString(e, debug) + " with damage value " + damage.toString(e, debug); + if (pattern > 1) + return getExpr().toString(event, debug) + " with durability " + damage.toString(event, debug); + + return getExpr().toString(event, debug) + " with damage value " + damage.toString(event, debug); } } From 08d7a5b3026a07fbe9db901025f793251506d24a Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:37:11 +1100 Subject: [PATCH 11/18] Fix Issues --- .../skript/expressions/ExprDamagedItem.java | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 3e6776c0e21..a429a29843b 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -1,9 +1,8 @@ package ch.njol.skript.expressions; -import ch.njol.skript.aliases.ItemData; import ch.njol.skript.bukkitutil.ItemUtils; +import ch.njol.skript.lang.SkriptParser; import org.bukkit.event.Event; -import org.bukkit.inventory.meta.Damageable; import org.jetbrains.annotations.Nullable; import ch.njol.skript.Skript; @@ -15,24 +14,23 @@ import ch.njol.skript.expressions.base.PropertyExpression; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ExpressionType; -import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; @Name("Damaged Item") @Description({ - "Directly changes the durability of an item.", - "Damage is used to remove the specified number from the base durability of an item. E.g 400 - damage", - "Durability is used to modify the total durability" + "Directly changes the durability of an item.", + "Damage is used to remove the specified number from the base durability of an item. E.g 400 - damage", + "Durability is used to modify the total durability" }) @Examples({"give player diamond sword with damage value 100", "set player's tool to diamond hoe damaged by 250", - "give player diamond sword with damage 700 named \"BROKEN SWORD\"", - "set {_item} to diamond hoe with damage value 50 named \"SAD HOE\"", - "set target block of player to wool with data value 1", "set target block of player to potato plant with data value 7", - "give player wooden sword with 1 durability named \"VERY BROKEN SWORD\"", - "set player's tool to diamond hoe with durability 500"}) -@Since("2.4") + "give player diamond sword with damage 700 named \"BROKEN SWORD\"", + "set {_item} to diamond hoe with damage value 50 named \"SAD HOE\"", + "set target block of player to wool with data value 1", "set target block of player to potato plant with data value 7", + "give player wooden sword with 1 durability named \"VERY BROKEN SWORD\"", + "set player's tool to diamond hoe with durability 500"}) +@Since("2.4, 2.10 (with durability)") public class ExprDamagedItem extends PropertyExpression { - + static { Skript.registerExpression(ExprDamagedItem.class, ItemType.class, ExpressionType.COMBINED, "%itemtype% with (damage|data) [value] %number%", @@ -40,27 +38,30 @@ public class ExprDamagedItem extends PropertyExpression { "%itemtype% with durability %number%", "%itemtype% with %number% durability"); } - + @SuppressWarnings("null") private Expression damage; - private int pattern; - + private boolean hasDurability; + @Override @SuppressWarnings({"unchecked", "null"}) - public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { + public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { setExpr((Expression) exprs[0]); damage = (Expression) exprs[1]; - pattern = matchedPattern; + hasDurability = matchedPattern > 1 ? true : false; + if (matchedPattern == 0) { + Skript.warning("Data value is deprecated and is only used in older Minecraft versions that do not support this Skript version."); + } return true; } - + @Override protected ItemType[] get(Event e, ItemType[] source) { Number damage = this.damage.getSingle(e); if (damage == null) return source; return get(source.clone(), item -> { - if (pattern > 1) { + if (hasDurability == true) { ItemUtils.setDamage(item, ItemUtils.getMaxDamage(item) - damage.intValue()); } else { item.iterator().forEachRemaining(i -> i.setDurability(damage.intValue())); @@ -68,15 +69,15 @@ protected ItemType[] get(Event e, ItemType[] source) { return item; }); } - + @Override public Class getReturnType() { return ItemType.class; } - + @Override - public String toString(Nullable Event event, boolean debug) { - if (pattern > 1) + public String toString(@Nullable Event event, boolean debug) { + if (hasDurability == true) return getExpr().toString(event, debug) + " with durability " + damage.toString(event, debug); return getExpr().toString(event, debug) + " with damage value " + damage.toString(event, debug); From 36f67df44ef94a8bd37c705b789c5a8f1a489470 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:40:00 +1100 Subject: [PATCH 12/18] e -> event --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index a429a29843b..115d00a828e 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -56,7 +56,7 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye } @Override - protected ItemType[] get(Event e, ItemType[] source) { + protected ItemType[] get(Event event, ItemType[] source) { Number damage = this.damage.getSingle(e); if (damage == null) return source; From 8f36484977ededa18e9428e7e659855a013c4e49 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:42:39 +1100 Subject: [PATCH 13/18] Added plurals --- .../java/ch/njol/skript/expressions/ExprDamagedItem.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 115d00a828e..4a461951427 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -33,10 +33,10 @@ public class ExprDamagedItem extends PropertyExpression { static { Skript.registerExpression(ExprDamagedItem.class, ItemType.class, ExpressionType.COMBINED, - "%itemtype% with (damage|data) [value] %number%", - "%itemtype% damaged by %number%", - "%itemtype% with durability %number%", - "%itemtype% with %number% durability"); + "%itemtypes% with (damage|data) [value] %number%", + "%itemtypes% damaged by %number%", + "%itemtypes% with durability %number%", + "%itemtypes% with %number% durability"); } @SuppressWarnings("null") From 7b28dc6d0cd68c94958f77d716ad7918a18b7daf Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:24:13 +1100 Subject: [PATCH 14/18] Update src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 4a461951427..0b94cc98b3b 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -45,7 +45,7 @@ public class ExprDamagedItem extends PropertyExpression { @Override @SuppressWarnings({"unchecked", "null"}) - public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) { + public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { setExpr((Expression) exprs[0]); damage = (Expression) exprs[1]; hasDurability = matchedPattern > 1 ? true : false; From ad582bdae6d383c159abd7e118a0c71ce76f94e7 Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:24:33 +1100 Subject: [PATCH 15/18] Update src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 0b94cc98b3b..bd8aa35421f 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -28,7 +28,7 @@ "set target block of player to wool with data value 1", "set target block of player to potato plant with data value 7", "give player wooden sword with 1 durability named \"VERY BROKEN SWORD\"", "set player's tool to diamond hoe with durability 500"}) -@Since("2.4, 2.10 (with durability)") +@Since("2.4, INSERT VERSION (with durability)") public class ExprDamagedItem extends PropertyExpression { static { From 059f750e5428fb0bd48577d8b15382cba8eb7d5e Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:24:51 +1100 Subject: [PATCH 16/18] Update src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com> --- .../java/ch/njol/skript/expressions/ExprDamagedItem.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index bd8aa35421f..a0beda67862 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -18,9 +18,9 @@ @Name("Damaged Item") @Description({ - "Directly changes the durability of an item.", - "Damage is used to remove the specified number from the base durability of an item. E.g 400 - damage", - "Durability is used to modify the total durability" + "Changes the durability of an item.", + "Damage is used to remove the specified number from the base durability of an item, e.g. 400 - damage. " + + "Durability is used to modify the total durability." }) @Examples({"give player diamond sword with damage value 100", "set player's tool to diamond hoe damaged by 250", "give player diamond sword with damage 700 named \"BROKEN SWORD\"", From 98d4b636ec1e1a3477cd420659c8e931c86ba47f Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:25:10 +1100 Subject: [PATCH 17/18] Update src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com> --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index a0beda67862..3c4c70e257d 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -82,4 +82,5 @@ public String toString(@Nullable Event event, boolean debug) { return getExpr().toString(event, debug) + " with damage value " + damage.toString(event, debug); } + } From 3a4efdd3a6fafffd9f05e5a0fb7e5b2953a4784a Mon Sep 17 00:00:00 2001 From: NagasonicDev <153145285+NagasonicDev@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:27:07 +1100 Subject: [PATCH 18/18] Update ExprDamagedItem.java --- src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java index 3c4c70e257d..0182b7e7e40 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java +++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java @@ -57,7 +57,7 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye @Override protected ItemType[] get(Event event, ItemType[] source) { - Number damage = this.damage.getSingle(e); + Number damage = this.damage.getSingle(event); if (damage == null) return source; return get(source.clone(), item -> {