diff options
13 files changed, 42 insertions, 42 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/compatibility/MixinPlugin.java b/src/main/java/me/xmrvizzy/skyblocker/compatibility/MixinPlugin.java index c6fc1924..6fb62ea0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/compatibility/MixinPlugin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/compatibility/MixinPlugin.java @@ -26,7 +26,7 @@ public class MixinPlugin implements IMixinConfigPlugin { public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { //OptiFabric Compatibility if (mixinClassName.endsWith("WorldRendererMixin") && OPTIFABRIC_LOADED) return false; - + return true; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 127bc601..12978cdb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -185,7 +185,7 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("itemTooltip") @ConfigEntry.Gui.CollapsibleObject() public ItemTooltip itemTooltip = new ItemTooltip(); - + @ConfigEntry.Category("itemInfoDisplay") @ConfigEntry.Gui.CollapsibleObject public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay(); @@ -401,7 +401,7 @@ public class SkyblockerConfig implements ConfigData { public boolean enableBazaarPrice = true; public boolean enableMuseumDate = true; } - + public static class ItemInfoDisplay { @ConfigEntry.Gui.Tooltip public boolean attributeShardInfo = true; diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java index 0a1084cf..cfe979d0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java @@ -36,7 +36,7 @@ public abstract class DrawContextMixin { @Shadow public abstract void fill(RenderLayer layer, int x1, int x2, int y1, int y2, int color); - + @Shadow public abstract int drawText(TextRenderer textRenderer, @Nullable String text, int x, int y, int color, boolean shadow); @@ -96,35 +96,35 @@ public abstract class DrawContextMixin { matrices.pop(); RenderSystem.enableDepthTest(); } - + @Inject(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At("HEAD")) private void skyblocker$renderAttributeShardDisplay(@Arg TextRenderer textRenderer, @Arg ItemStack stack, @Arg(ordinal = 0) int x, @Arg(ordinal = 1) int y, @Local(argsOnly = true) LocalRef<String> countOverride) { if (!SkyblockerConfig.get().general.itemInfoDisplay.attributeShardInfo) return; - + NbtCompound nbt = stack.getNbt(); - + if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes")) { NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes"); - + if (extraAttributes.getString("id").equals("ATTRIBUTE_SHARD")) { NbtCompound attributesTag = extraAttributes.getCompound("attributes"); String[] attributes = attributesTag.getKeys().toArray(String[]::new); - + if (attributes.length != 0) { String attributeId = attributes[0]; int attributeLevel = attributesTag.getInt(attributeId); - + //Set item count countOverride.set(Integer.toString(attributeLevel)); - + //Draw the attribute name this.matrices.push(); this.matrices.translate(0f, 0f, 200f); - + String attributeInitials = AttributeShards.getShortName(attributeId); - + this.drawText(textRenderer, attributeInitials, x, y, Formatting.AQUA.getColorValue(), true); - + this.matrices.pop(); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java index 3b796c38..53dd57a7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java @@ -16,16 +16,16 @@ import net.minecraft.entity.Entity; @Mixin(WorldRenderer.class) public class WorldRendererMixin { - + @ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;hasOutline(Lnet/minecraft/entity/Entity;)Z")) private boolean skyblocker$shouldStarredMobGlow(boolean original, @Local Entity entity, @Share("isGlowingStarredMob") LocalBooleanRef isGlowingStarredMob) { boolean isAStarredMobThatShouldGlow = SkyblockerConfig.get().locations.dungeons.starredMobGlow && StarredMobGlow.shouldMobGlow(entity); - + isGlowingStarredMob.set(isAStarredMobThatShouldGlow); - + return original || isAStarredMobThatShouldGlow; } - + @ModifyVariable(method = "render", at = @At("STORE"), ordinal = 0) private int skyblocker$modifyGlowColor(int color, @Local Entity entity, @Share("isGlowingStarredMob") LocalBooleanRef isGlowingStarredMob) { return isGlowingStarredMob.get() ? StarredMobGlow.getGlowColor(entity) : color; 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 dc2a89f8..53d603eb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -64,7 +64,7 @@ public class PriceInfoTooltip { .append(getCoinsMessage(npcPricesJson.get(name).getAsDouble(), count))); } } - + if (SkyblockerConfig.get().general.itemTooltip.enableMotesPrice && Utils.isInTheRift()) { if(motesPricesJson == null) { nullWarning(); @@ -191,7 +191,7 @@ public class PriceInfoTooltip { } } } - + private static void nullWarning() { if (!nullMsgSend && client.player != null) { client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); @@ -301,7 +301,7 @@ public class PriceInfoTooltip { return priceTextTotal.append(priceTextEach); } } - + private static Text getMotesMessage(int price, int count) { float motesMultiplier = SkyblockerConfig.get().locations.rift.mcGrubberStacks * 0.05f + 1; if (count == 1) { @@ -355,7 +355,7 @@ public class PriceInfoTooltip { if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && isMuseumJson == null) futureList.add(CompletableFuture.runAsync(() -> isMuseumJson = downloadPrices("museum"))); - + if (SkyblockerConfig.get().general.itemTooltip.enableMotesPrice && motesPricesJson == null) futureList.add(CompletableFuture.runAsync(() -> motesPricesJson = downloadPrices("motes"))); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 12636ce1..915f91bc 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -55,17 +55,17 @@ public class ResultButtonWidget extends ClickableWidget { MinecraftClient client = MinecraftClient.getInstance(); List<Text> tooltip = Screen.getTooltipFromItem(client, this.itemStack); List<OrderedText> orderedTooltip = new ArrayList<>(); - + for(int i = 0; i < tooltip.size(); i++) { orderedTooltip.add(tooltip.get(i).asOrderedText()); } - + client.currentScreen.setTooltip(orderedTooltip); } @Override protected void appendClickableNarrations(NarrationMessageBuilder builder) { // TODO Auto-generated method stub - + } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java index 7f628a19..feb7f30b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java @@ -126,7 +126,7 @@ public class SearchResultsWidget implements Drawable { craftText = textRenderer.trimToWidth(craftText, MAX_TEXT_WIDTH) + ELLIPSIS; } context.drawTextWithShadow(textRenderer, craftText, this.parentX + 11, this.parentY + 31, 0xffffffff); - + //Item name Text resultText = this.recipeResults.get(this.currentPage).result.getName(); if (textRenderer.getWidth(Formatting.strip(resultText.getString())) > MAX_TEXT_WIDTH) { @@ -134,7 +134,7 @@ public class SearchResultsWidget implements Drawable { resultText = Text.literal(getLegacyFormatting(resultText.getString()) + textRenderer.trimToWidth(Formatting.strip(resultText.getString()), MAX_TEXT_WIDTH) + ELLIPSIS).setStyle(resultText.getStyle()); } context.drawTextWithShadow(textRenderer, resultText, this.parentX + 11, this.parentY + 43, 0xffffffff); - + //Arrow pointing to result item from the recipe context.drawTextWithShadow(textRenderer, "▶", this.parentX + 96, this.parentY + 90, 0xaaffffff); } @@ -149,7 +149,7 @@ public class SearchResultsWidget implements Drawable { if (this.nextPageButton.active) this.nextPageButton.render(context, mouseX, mouseY, delta); RenderSystem.enableDepthTest(); } - + /** * Used for drawing tooltips over truncated text */ @@ -160,7 +160,7 @@ public class SearchResultsWidget implements Drawable { } RenderSystem.enableDepthTest(); } - + /** * @see #drawTooltip(TextRenderer, DrawContext, Text, int, int, int, int) */ diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index d9e97976..fe229a44 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -102,6 +102,6 @@ public class QuickNavButton extends ClickableWidget { @Override protected void appendClickableNarrations(NarrationMessageBuilder builder) { // TODO Auto-generated method stub - + } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java index 2e8e2c40..afa883be 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java @@ -60,7 +60,7 @@ public class IslandOwnersWidget extends Widget { PlainTextComponent ptc = new PlainTextComponent(entry); this.addComponent(ptc); } - + } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java index 1be6adda..9f60ed34 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java @@ -19,7 +19,7 @@ public class PlayerComponent extends Component { private final Identifier tex; public PlayerComponent(PlayerListEntry ple) { - + boolean plainNames = SkyblockerConfig.get().general.tabHud.plainPlayerNames; Team team = ple.getScoreboardTeam(); String username = ple.getProfile().getName(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index 839e0dae..69279936 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -154,12 +154,12 @@ public class Utils { leaveSkyblock(); } } - + private static boolean isConnectedToHypixel(MinecraftClient client) { String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : ""; String serverBrand = (client.player != null && client.player.getServerBrand() != null) ? client.player.getServerBrand() : ""; boolean isOnHypixel = (serverAddress.equalsIgnoreCase(ALTERNATE_HYPIXEL_ADDRESS) || serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io") || serverBrand.contains("Hypixel BungeeCord")); - + return isOnHypixel; } |