Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support color to filled map item #2504

Merged
merged 6 commits into from
Jul 14, 2023
Merged

support color to filled map item #2504

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86e0b7c
support color to filled map item
pobab Jul 11, 2023
4274ed5
add condition to check filled map item doesn't have color
pobab Jul 11, 2023
cf1f6f6
add mapMeta to getPropertyString
pobab Jul 13, 2023
012726e
return null if filled_map doesn't have color
pobab Jul 14, 2023
5fc27b7
tidy up parentheses
pobab Jul 14, 2023
2925c54
clean up parentheses
pobab Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.inventory.meta.MapMeta;
import org.bukkit.inventory.meta.PotionMeta;

public class ItemColor implements Property {
Expand All @@ -19,15 +20,16 @@ public static boolean describes(ObjectTag item) {
return false;
}
Material mat = ((ItemTag) item).getBukkitMaterial();
// Leather armor and potions
// Leather armor, potions, and filled map
return mat == Material.LEATHER_BOOTS
|| mat == Material.LEATHER_CHESTPLATE
|| mat == Material.LEATHER_HELMET
|| mat == Material.LEATHER_LEGGINGS
|| mat == Material.LEATHER_HORSE_ARMOR
|| mat == Material.POTION
|| mat == Material.SPLASH_POTION
|| mat == Material.LINGERING_POTION;
|| mat == Material.LINGERING_POTION
|| mat == Material.FILLED_MAP;
}

public static ItemColor getFrom(ObjectTag _item) {
Expand Down Expand Up @@ -66,7 +68,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// @mechanism ItemTag.color
// @group properties
// @description
// Returns the color of the leather armor item or potion item.
// Returns the color of the leather armor item, potion item, or filled map item.
// -->
if (attribute.startsWith("color") || attribute.startsWith("dye_color")) {
Material mat = item.getBukkitMaterial();
Expand All @@ -79,6 +81,13 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
}
return BukkitColorExtensions.fromColor(pm.getColor()).getObjectAttribute(attribute.fulfill((1)));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i thought it was correct because i follow on this line.... but, i realize and didn't get how getObjectAttribute work. should i change this line too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this whole file is weird and needs cleaning up, but not really required for your PR to fix pre-existing issues (it'd be really handy if you did tho! - check #2355 if you're interested in helping cleanup the codebase)

}
if (mat == Material.FILLED_MAP) {
MapMeta mapMeta = (MapMeta) item.getItemMeta();
if (!mapMeta.hasColor()) {
return BukkitColorExtensions.fromColor(Color.WHITE).getObjectAttribute(attribute.fulfill(1));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is returning WHITE here correct? Seems like it should probably be null?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh... i dont know which default color of filled_map 😅, that why i put white color. i'll change it asap, thanks for remind me to using null

}
return BukkitColorExtensions.fromColor((mapMeta.getColor())).getObjectAttribute(attribute.fulfill(1));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor format - too many parens here

}
return BukkitColorExtensions.fromColor(((LeatherArmorMeta) item.getItemMeta()).getColor()).getObjectAttribute(attribute.fulfill(1));
}

Expand All @@ -97,6 +106,13 @@ public String getPropertyString() {
}
return BukkitColorExtensions.fromColor(pm.getColor()).identify();
}
if (mat == Material.FILLED_MAP) {
MapMeta mapMeta = (MapMeta) item.getItemMeta();
if (!mapMeta.hasColor()) {
return null;
}
return BukkitColorExtensions.fromColor(mapMeta.getColor()).identify();
}
return BukkitColorExtensions.fromColor(((LeatherArmorMeta) item.getItemMeta()).getColor()).identify();
}

Expand All @@ -113,7 +129,7 @@ public void adjust(Mechanism mechanism) {
// @name color
// @input ColorTag
// @description
// Sets the leather armor item's dye color or the potion item's color.
// Sets the leather armor item's dye color, potion item's color, or filled map item's color.
// @tags
// <ItemTag.color>
// -->
Expand All @@ -127,6 +143,12 @@ public void adjust(Mechanism mechanism) {
item.setItemMeta(meta);
return;
}
if (mat == Material.FILLED_MAP) {
MapMeta meta = (MapMeta) item.getItemMeta();
meta.setColor(BukkitColorExtensions.getColor(color));
item.setItemMeta(meta);
return;
}
LeatherArmorMeta meta = (LeatherArmorMeta) item.getItemMeta();
meta.setColor(BukkitColorExtensions.getColor(color));
item.setItemMeta(meta);
Expand Down