From 3bd588279171d1f59b0433d2b94da29f5db4a740 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Wed, 25 Jun 2025 22:34:52 -0400 Subject: Remove Attribute Shard Slot Text --- .../skyblock/item/slottext/SlotTextManager.java | 1 - .../item/slottext/adders/AttributeShardAdder.java | 94 ---------------------- 2 files changed, 95 deletions(-) delete mode 100644 src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java (limited to 'src/main/java') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java index 6c6b19ab..d537650e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java @@ -46,7 +46,6 @@ public class SlotTextManager { new CatacombsLevelAdder.DungeonClasses(), new CatacombsLevelAdder.ReadyUp(), new RancherBootsSpeedAdder(), - new AttributeShardAdder(), new PrehistoricEggAdder(), new PotionLevelAdder(), new CollectionAdder(), diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java deleted file mode 100644 index 2ac4940f..00000000 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/adders/AttributeShardAdder.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.hysky.skyblocker.skyblock.item.slottext.adders; - -import de.hysky.skyblocker.skyblock.item.slottext.SlotText; -import de.hysky.skyblocker.skyblock.item.slottext.SimpleSlotTextAdder; -import de.hysky.skyblocker.utils.ItemUtils; -import it.unimi.dsi.fastutil.objects.Object2ObjectMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.screen.slot.Slot; -import net.minecraft.text.Text; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class AttributeShardAdder extends SimpleSlotTextAdder { - private static final Object2ObjectMap ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>(); - private static final ConfigInformation CONFIG_INFORMATION = new ConfigInformation( - "attribute_shard", - "skyblocker.config.uiAndVisuals.slotText.attributeShard", - "skyblocker.config.uiAndVisuals.slotText.attributeShard.@Tooltip"); - - static { - //Weapons - ID_2_SHORT_NAME.put("arachno", "A"); - ID_2_SHORT_NAME.put("attack_speed", "AS"); - ID_2_SHORT_NAME.put("blazing", "BL"); - ID_2_SHORT_NAME.put("combo", "C"); - ID_2_SHORT_NAME.put("elite", "E"); - ID_2_SHORT_NAME.put("ender", "EN"); - ID_2_SHORT_NAME.put("ignition", "I"); - ID_2_SHORT_NAME.put("life_recovery", "HE"); //HE for Healing since LR should go to Life regen since thats more useful - ID_2_SHORT_NAME.put("mana_steal", "MS"); - ID_2_SHORT_NAME.put("midas_touch", "MT"); - ID_2_SHORT_NAME.put("undead", "U"); - - //Swords & Bows - ID_2_SHORT_NAME.put("warrior", "W"); - ID_2_SHORT_NAME.put("deadeye", "DE"); - - //Armor or Equipment - ID_2_SHORT_NAME.put("arachno_resistance", "AR"); - ID_2_SHORT_NAME.put("blazing_resistance", "BR"); - ID_2_SHORT_NAME.put("breeze", "B"); - ID_2_SHORT_NAME.put("dominance", "D"); - ID_2_SHORT_NAME.put("ender_resistance", "ER"); - ID_2_SHORT_NAME.put("experience", "XP"); - ID_2_SHORT_NAME.put("fortitude", "F"); - ID_2_SHORT_NAME.put("life_regeneration", "LR"); - ID_2_SHORT_NAME.put("lifeline", "L"); - ID_2_SHORT_NAME.put("magic_find", "MF"); - ID_2_SHORT_NAME.put("mana_pool", "MP"); - ID_2_SHORT_NAME.put("mana_regeneration", "MR"); - ID_2_SHORT_NAME.put("mending", "VI"); //Vitality - ID_2_SHORT_NAME.put("speed", "S"); - ID_2_SHORT_NAME.put("undead_resistance", "UR"); - ID_2_SHORT_NAME.put("veteran", "V"); - - //Fishing Gear - ID_2_SHORT_NAME.put("blazing_fortune", "BF"); - ID_2_SHORT_NAME.put("fishing_experience", "FE"); - ID_2_SHORT_NAME.put("infection", "IF"); - ID_2_SHORT_NAME.put("double_hook", "DH"); - ID_2_SHORT_NAME.put("fisherman", "FM"); - ID_2_SHORT_NAME.put("fishing_speed", "FS"); - ID_2_SHORT_NAME.put("hunter", "H"); - ID_2_SHORT_NAME.put("trophy_hunter", "TH"); - } - - public AttributeShardAdder() { - super(CONFIG_INFORMATION); - } - - @Override - public @NotNull List getText(@Nullable Slot slot, @NotNull ItemStack stack, int slotId) { - NbtCompound customData = ItemUtils.getCustomData(stack); - - if (!ItemUtils.getItemId(stack).equals("ATTRIBUTE_SHARD")) return List.of(); - - NbtCompound attributesTag = customData.getCompoundOrEmpty("attributes"); - String[] attributes = attributesTag.getKeys().toArray(String[]::new); - - if (attributes.length != 1) return List.of(); - String attributeId = attributes[0]; - int attributeLevel = attributesTag.getInt(attributeId, 0); - String attributeInitials = ID_2_SHORT_NAME.getOrDefault(attributeId, ""); - - return List.of( - SlotText.bottomRight(Text.literal(String.valueOf(attributeLevel)).withColor(SlotText.CREAM)), - SlotText.topLeft(Text.literal(attributeInitials).withColor(SlotText.LIGHT_BLUE)) - ); - } -} -- cgit