diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock')
14 files changed, 20 insertions, 35 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java index d89a18e0..767d3dd1 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java @@ -11,7 +11,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.network.PlayerListEntry; -import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; @@ -156,7 +155,6 @@ public class BackpackPreview { RenderSystem.enableDepthTest(); MatrixStack matrices = context.getMatrices(); - ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; for (int i = 9; i < storage[index].size(); ++i) { int itemX = x + (i - 9) % 9 * 18 + 8; 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; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java index 04dc6820..4fc24e6c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java @@ -6,8 +6,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.util.math.MatrixStack; @@ -16,7 +14,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; @Environment(value = EnvType.CLIENT) -public class ItemListWidget extends RecipeBookWidget implements Drawable, Selectable { +public class ItemListWidget extends RecipeBookWidget { private int parentWidth; private int parentHeight; private int leftOffset; 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..19f656e5 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -1,19 +1,13 @@ package me.xmrvizzy.skyblocker.skyblock.itemlist; import java.util.List; -import java.util.function.Function; import java.util.ArrayList; -import com.google.common.collect.Lists; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.text.OrderedText; @@ -55,17 +49,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/QuickNav.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java index 351cef48..749e26e9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java @@ -18,7 +18,7 @@ public class QuickNav { private static final String dungeonHubIconNbt = "{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}}"; public static void init() { - ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> { + ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> { if (Utils.isOnSkyblock() && SkyblockerConfig.get().quickNav.enableQuickNav && screen instanceof HandledScreen<?> && client.player != null && !client.player.isCreative()) { String screenTitle = screen.getTitle().getString().trim(); List<QuickNavButton> buttons = QuickNav.init(screenTitle); 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/screenbuilder/ScreenBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java index 084a6ffd..f02c7dc6 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java @@ -99,8 +99,6 @@ public class ScreenBuilder { } // reflect something together for the "normal" ones. - // TODO don't get package list for every widget; do it once and cache. - // fine for now, as this would only shorten the load time anyways // list all packages that might contain widget classes // using Package isn't reliable, as some classes might not be loaded yet, diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java index 5eb575c3..078927ef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java @@ -94,7 +94,6 @@ public class StackStage extends PipelineStage { } public void stackWidgetsHoriz(int screenW) { - // TODO not centered (?) int compWidth = -ScreenConst.WIDGET_PAD; for (Widget wid : primary) { compWidth += wid.getWidth() + ScreenConst.WIDGET_PAD; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java index b7f58763..1d056e0c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java @@ -10,7 +10,6 @@ import java.util.Arrays; import java.util.Comparator; // this widget shows a list of obtained dungeon buffs -// TODO: could be more pretty, can't be arsed atm public class DungeonBuffWidget extends Widget { 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(); |