diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-09-10 15:53:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-10 15:53:09 -0400 |
| commit | 91e8fb49daec672e166399450274607306a0836a (patch) | |
| tree | bb864671b44113a06efdf8534cef83e702450c48 /src/main/java/me/xmrvizzy/skyblocker/skyblock/item | |
| parent | 0bcd6f3554c1ba93ed235c36a118d6ea00c0601a (diff) | |
| parent | c2462cc25998262dc5ab87176a2d67a14a933e21 (diff) | |
| download | Skyblocker-91e8fb49daec672e166399450274607306a0836a.tar.gz Skyblocker-91e8fb49daec672e166399450274607306a0836a.tar.bz2 Skyblocker-91e8fb49daec672e166399450274607306a0836a.zip | |
Merge pull request #290 from msg-programs/cleanup
Cleanup
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/item')
3 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java index 0f106cdf..8f71e7b9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java @@ -4,7 +4,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; public class AttributeShards { private static final Object2ObjectOpenHashMap<String, String> ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>(); - + static { //Weapons ID_2_SHORT_NAME.put("arachno", "A"); @@ -18,11 +18,11 @@ public class AttributeShards { 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"); @@ -40,7 +40,7 @@ public class AttributeShards { 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"); @@ -50,9 +50,9 @@ public class AttributeShards { ID_2_SHORT_NAME.put("fishing_speed", "FS"); ID_2_SHORT_NAME.put("hunter", "H"); ID_2_SHORT_NAME.put("trophy_hunter", "TH"); - + } - + public static String getShortName(String id) { return ID_2_SHORT_NAME.getOrDefault(id, ""); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java index c744144a..8c160456 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java @@ -53,11 +53,11 @@ public class CustomItemNames { } } else { //If the text is provided then set the item's custom name to it - + //Set italic to false if it hasn't been changed (or was already false) Style currentStyle = text.getStyle(); ((MutableText) text).setStyle(currentStyle.withItalic((currentStyle.isItalic() ? true : false))); - + customItemNames.put(itemUuid, text); SkyblockerConfig.save(); source.sendFeedback(Text.translatable("skyblocker.customItemNames.added")); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index 84325042..fd06a48b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -320,7 +320,6 @@ public class PriceInfoTooltip { return message; } - private static Text getMotesMessage(int price, int count) { float motesMultiplier = SkyblockerConfig.get().locations.rift.mcGrubberStacks * 0.05f + 1; |