Minor refactor

This commit is contained in:
YHDiamond 2024-06-14 19:38:43 -04:00
parent ca37ac2bf7
commit 4657c79882

View file

@ -66,6 +66,12 @@ public final class ItemTranslator {
* The order of these slots is their display order on Java Edition clients * The order of these slots is their display order on Java Edition clients
*/ */
private static final EnumMap<ItemAttributeModifiers.EquipmentSlotGroup, String> SLOT_NAMES; private static final EnumMap<ItemAttributeModifiers.EquipmentSlotGroup, String> SLOT_NAMES;
private static final ItemAttributeModifiers.EquipmentSlotGroup[] ARMOR_SLOT_NAMES = new ItemAttributeModifiers.EquipmentSlotGroup[] {
ItemAttributeModifiers.EquipmentSlotGroup.HEAD,
ItemAttributeModifiers.EquipmentSlotGroup.CHEST,
ItemAttributeModifiers.EquipmentSlotGroup.LEGS,
ItemAttributeModifiers.EquipmentSlotGroup.FEET
};
private static final DecimalFormat ATTRIBUTE_FORMAT = new DecimalFormat("0.#####"); private static final DecimalFormat ATTRIBUTE_FORMAT = new DecimalFormat("0.#####");
static { static {
@ -216,10 +222,9 @@ public final class ItemTranslator {
ItemAttributeModifiers.EquipmentSlotGroup slotGroup = entry.getSlot(); ItemAttributeModifiers.EquipmentSlotGroup slotGroup = entry.getSlot();
if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ARMOR) { if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ARMOR) {
// modifier applies to all armor slots // modifier applies to all armor slots
slotsToModifiers.computeIfAbsent(ItemAttributeModifiers.EquipmentSlotGroup.HEAD, s -> new ArrayList<>()).add(loreEntry); for (ItemAttributeModifiers.EquipmentSlotGroup slot : ARMOR_SLOT_NAMES) {
slotsToModifiers.computeIfAbsent(ItemAttributeModifiers.EquipmentSlotGroup.CHEST, s -> new ArrayList<>()).add(loreEntry); slotsToModifiers.computeIfAbsent(slot, s -> new ArrayList<>()).add(loreEntry);
slotsToModifiers.computeIfAbsent(ItemAttributeModifiers.EquipmentSlotGroup.LEGS, s -> new ArrayList<>()).add(loreEntry); }
slotsToModifiers.computeIfAbsent(ItemAttributeModifiers.EquipmentSlotGroup.FEET, s -> new ArrayList<>()).add(loreEntry);
} else if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ANY) { } else if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ANY) {
// modifier applies to all slots implicitly // modifier applies to all slots implicitly
for (var slot : SLOT_NAMES.keySet()) { for (var slot : SLOT_NAMES.keySet()) {