Skip to content

Apply item attribute key fix to base_v1_21_4 #1525

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

Open
JToTl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Apply item attribute key fix to base_v1_21_4 #1525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 36 additions & 3 deletions ...n/java/com/elmakers/mine/bukkit/utility/platform/base_v1_21_4/CompatibilityUtilsBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.inventory.EquipmentSlotGroup;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.loot.Lootable;

import com.elmakers.mine.bukkit.utility.platform.Platform;
Expand Down Expand Up @@ -74,12 +75,44 @@ public float getStrafeMovement(LivingEntity entity) {
return 0.0f;
}

@Override
protected AttributeModifier createAttributeModifier(UUID attributeUUID, double value, AttributeModifier.Operation operation, EquipmentSlotGroup equipmentSlotGroup) {
NamespacedKey namespacedKey = new NamespacedKey(platform.getPlugin(), "modifier");
protected AttributeModifier createAttributeModifier(String key, double value, AttributeModifier.Operation operation, EquipmentSlotGroup equipmentSlotGroup) {
NamespacedKey namespacedKey = new NamespacedKey(platform.getPlugin(), key);
return new AttributeModifier(namespacedKey, value, operation, equipmentSlotGroup);
}

@Override
public boolean setItemAttribute(ItemStack item, Attribute attribute, double value, String slot, String attributeOperation, UUID attributeUUID, String attributeKey) {
if (item == null) return false;
ItemMeta meta = item.getItemMeta();
if (meta == null) return false;
try {
AttributeModifier.Operation operation = AttributeModifier.Operation.ADD_NUMBER;
if (attributeOperation != null && !attributeOperation.isEmpty()) {
try {
int operationIndex = Integer.parseInt(attributeOperation);
operation = AttributeModifier.Operation.values()[operationIndex];
} catch (Throwable ignore) {
try {
operation = AttributeModifier.Operation.valueOf(attributeOperation.toUpperCase());
} catch (Throwable ex) {
platform.getLogger().warning("Invalid operation " + attributeOperation);
}
}
}
EquipmentSlotGroup equipmentSlotGroup = parseEquipmentSlotGroup(slot);
if (attributeKey == null || attributeKey.isEmpty()) {
attributeKey = "modifier_" + attribute.name() + "_" + slot;
}
AttributeModifier modifier = createAttributeModifier(attributeKey, value, operation, equipmentSlotGroup);
meta.addAttributeModifier(attribute, modifier);
item.setItemMeta(meta);
} catch (Exception ex) {
ex.printStackTrace();
return false;
}
return true;
}

@Override
public Object getTileEntity(Location location) {
throw new UnsupportedOperationException("The getTileEntity method is no longer supported");
Expand Down