diff options
18 files changed, 25 insertions, 25 deletions
diff --git a/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockCategory.java b/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockCategory.java index dfc6e871..1474c8be 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockCategory.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockCategory.java @@ -74,7 +74,7 @@ public class SkyblockCategory implements DisplayCategory<SkyblockCraftingDisplay slots.get(i).entries(input.get(i)).markInput(); } out.addAll(slots); - out.add(Widgets.createSlot(resultPoint).entries(display.getOutputEntries().get(0)).disableBackground().markOutput()); + out.add(Widgets.createSlot(resultPoint).entries(display.getOutputEntries().getFirst()).disableBackground().markOutput()); // Add craftingText Label Label craftTextLabel = Widgets.createLabel(new Point(bounds.getCenterX(), startPoint.y + 55), Text.of(display.getCraftText())); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java index dc1eade5..fd69d886 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java @@ -351,7 +351,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI<AuctionHouseS assert client != null; try { List<Text> tooltip = ItemUtils.getLore(stack); - String str = tooltip.get(0).getString().trim(); + String str = tooltip.getFirst().getString().trim(); str = str.substring(1, str.length() - 1); // remove parentheses String[] parts = str.split("/"); // split the string currentPage = Integer.parseInt(parts[0].replace(",", "")); // parse current page diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java index a9ffafec..588e2431 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java @@ -67,7 +67,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> { //System.out.println(tooltips); MinecraftClient client = MinecraftClient.getInstance(); - Text title = tooltips.get(0); + Text title = tooltips.getFirst(); String partyHost = title.getString().split("'s")[0]; int membersIndex = -1; @@ -106,7 +106,7 @@ public class PartyEntry extends ElementListWidget.Entry<PartyEntry> { } else if (lowerCase.contains("dungeon:")) { dungeon = tooltipText.split(":")[1].trim(); - } else if (!text.getSiblings().isEmpty() && Objects.equals(text.getSiblings().get(0).getStyle().getColor(), TextColor.fromRgb(Formatting.RED.getColorValue())) && !lowerCase.startsWith(" ")) { + } else if (!text.getSiblings().isEmpty() && Objects.equals(text.getSiblings().getFirst().getStyle().getColor(), TextColor.fromRgb(Formatting.RED.getColorValue())) && !lowerCase.startsWith(" ")) { isLocked = true; lockReason = text; } else if (lowerCase.contains("note:")) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java index fc66ab06..d22084f2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java @@ -276,7 +276,7 @@ public class PartyFinderScreen extends Screen { ClientPlayNetworkHandler networkHandler = this.client.getNetworkHandler(); if (networkHandler != null && sign != null) { List<String> originalText = Arrays.stream(sign.getText(signFront).getMessages(true)).map(Text::getString).toList(); - networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), signFront, originalText.get(0), originalText.get(1), originalText.get(2), originalText.get(3))); + networkHandler.sendPacket(new UpdateSignC2SPacket(sign.getPos(), signFront, originalText.getFirst(), originalText.get(1), originalText.get(2), originalText.get(3))); } } super.close(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java index 42aec035..3fd24f8e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java @@ -157,12 +157,12 @@ public class CreeperBeams extends DungeonPuzzle { allLines.sort(Comparator.comparingDouble(ObjectDoublePair::rightDouble)); while (result.size() < 5 && !allLines.isEmpty()) { - Beam solution = allLines.get(0).left(); + Beam solution = allLines.getFirst().left(); result.add(solution); // remove the line we just added and other lines that use blocks we're using for // that line - allLines.remove(0); + allLines.removeFirst(); allLines.removeIf(beam -> solution.containsComponentOf(beam.left())); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java index 5c0e8437..cd3508c1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java @@ -93,7 +93,7 @@ public class DungeonBlaze extends DungeonPuzzle { */ private static void updateBlazeEntities(List<ObjectIntPair<ArmorStandEntity>> blazes) { if (!blazes.isEmpty()) { - lowestBlaze = blazes.get(0).left(); + lowestBlaze = blazes.getFirst().left(); int highestIndex = blazes.size() - 1; highestBlaze = blazes.get(highestIndex).left(); if (blazes.size() > 1) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java index 3f1708f1..6c2d56b3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java @@ -54,7 +54,7 @@ public class IceFill extends DungeonPuzzle { context.getSource().sendFeedback(Constants.PREFIX.get().append(boardToString(INSTANCE.iceFillBoards[2]))); return Command.SINGLE_SUCCESS; })).then(literal("printPath1").executes(context -> { - context.getSource().sendFeedback(Constants.PREFIX.get().append(INSTANCE.iceFillPaths.get(0).toString())); + context.getSource().sendFeedback(Constants.PREFIX.get().append(INSTANCE.iceFillPaths.getFirst().toString())); return Command.SINGLE_SUCCESS; })).then(literal("printPath2").executes(context -> { context.getSource().sendFeedback(Constants.PREFIX.get().append(INSTANCE.iceFillPaths.get(1).toString())); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java index f3ac927f..eed291c2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java @@ -86,7 +86,7 @@ public class Silverfish extends DungeonPuzzle { if (entities.isEmpty()) { return; } - BlockPos newSilverfishBlockPos = room.actualToRelative(entities.get(0).getBlockPos()); + BlockPos newSilverfishBlockPos = room.actualToRelative(entities.getFirst().getBlockPos()); Vector2ic newSilverfishPos = new Vector2i(24 - newSilverfishBlockPos.getZ(), 23 - newSilverfishBlockPos.getX()); if (newSilverfishPos.x() < 0 || newSilverfishPos.x() >= 17 || newSilverfishPos.y() < 0 || newSilverfishPos.y() >= 17) { return; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index 3e9c1861..a8f641a3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -43,13 +43,13 @@ public class DwarvenHudConfigScreen extends HudConfigScreen { @Override protected void renderWidget(DrawContext context, List<Widget> widgets) { - DwarvenHud.render(HudCommsWidget.INSTANCE_CFG, HudPowderWidget.INSTANCE_CFG, context, widgets.get(0).getX(), widgets.get(0).getY(), widgets.get(1).getX(), widgets.get(1).getY(), CFG_COMMS); + DwarvenHud.render(HudCommsWidget.INSTANCE_CFG, HudPowderWidget.INSTANCE_CFG, context, widgets.getFirst().getX(), widgets.getFirst().getY(), widgets.get(1).getX(), widgets.get(1).getY(), CFG_COMMS); } @Override protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) { - configManager.mining.dwarvenHud.x = widgets.get(0).getX(); - configManager.mining.dwarvenHud.y = widgets.get(0).getY(); + configManager.mining.dwarvenHud.x = widgets.getFirst().getX(); + configManager.mining.dwarvenHud.y = widgets.getFirst().getY(); configManager.mining.dwarvenHud.powderX = widgets.get(1).getX(); configManager.mining.dwarvenHud.powderY = widgets.get(1).getY(); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java index fa36b185..ac961dd8 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java @@ -183,7 +183,7 @@ public class TheEnd { if (entities.isEmpty()) { return false; } - return entities.get(0).getName().getString().toLowerCase().contains("zealot"); + return entities.getFirst().getName().getString().toLowerCase().contains("zealot"); } public static boolean isSpecialZealot(EndermanEntity enderman) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java index 4fd0f8cd..5ac0ba8d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java @@ -71,7 +71,7 @@ public class ItemRepository { } List<String> info = item.getInfo(); - String wikiLink0 = info.get(0); + String wikiLink0 = info.getFirst(); String wikiLink1 = info.size() > 1 ? info.get(1) : ""; String wikiDomain = SkyblockerConfigManager.get().general.wikiLookup.officialWiki ? "https://wiki.hypixel.net" : "https://hypixel-skyblock.fandom.com"; if (wikiLink0.startsWith(wikiDomain)) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/SearchResultsWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/SearchResultsWidget.java index 961a2cc2..1ef352e3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/SearchResultsWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/SearchResultsWidget.java @@ -93,7 +93,7 @@ public class SearchResultsWidget implements Drawable { SkyblockCraftingRecipe recipe = this.recipeResults.get(this.currentPage); for (ResultButtonWidget button : resultButtons) button.clearItemStack(); - resultButtons.get(5).setItemStack(recipe.getGrid().get(0)); + resultButtons.get(5).setItemStack(recipe.getGrid().getFirst()); resultButtons.get(6).setItemStack(recipe.getGrid().get(1)); resultButtons.get(7).setItemStack(recipe.getGrid().get(2)); resultButtons.get(10).setItemStack(recipe.getGrid().get(3)); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java index f2831b0d..ea0c5176 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java @@ -41,7 +41,7 @@ public class EffigyWaypoints { List<Text> prefixAndSuffix = Utils.TEXT_SCOREBOARD.get(i).getSiblings(); //Add contents of prefix and suffix to list - effigiesText.addAll(prefixAndSuffix.get(0).getSiblings()); + effigiesText.addAll(prefixAndSuffix.getFirst().getSiblings()); effigiesText.addAll(prefixAndSuffix.get(1).getSiblings()); for (int i2 = 1; i2 < effigiesText.size(); i2++) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java index 2e509c35..917a6aa0 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java @@ -269,14 +269,14 @@ public class SearchOverManager { UIAndVisualsConfig.SearchOverlay config = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay; if (isAuction) { if (config.auctionHistory.isEmpty() || !config.auctionHistory.getFirst().equals(search)) { - config.auctionHistory.add(0, search); + config.auctionHistory.addFirst(search); if (config.auctionHistory.size() > config.historyLength) { config.auctionHistory = config.auctionHistory.subList(0, config.historyLength); } } } else { - if (config.bazaarHistory.isEmpty() || !config.bazaarHistory.get(0).equals(search)) { - config.bazaarHistory.add(0, search); + if (config.bazaarHistory.isEmpty() || !config.bazaarHistory.getFirst().equals(search)) { + config.bazaarHistory.addFirst(search); if (config.bazaarHistory.size() > config.historyLength) { config.bazaarHistory = config.bazaarHistory.subList(0, config.historyLength); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java index 7d57305b..1e6cdf22 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java @@ -51,7 +51,7 @@ public class PlaceStage extends PipelineStage { } public void run(int screenW, int screenH) { - Widget wid = primary.get(0); + Widget wid = primary.getFirst(); switch (where) { case CENTER -> { wid.setX((screenW - wid.getWidth()) / 2); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java index 208b0131..8b7c08b4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java @@ -33,7 +33,7 @@ public class GardenServerWidget extends Widget { this.addSimpleIcoText(Ico.EMERALD, "Gems:", Formatting.GREEN, 43); Text copperText = Widget.simpleEntryText(44, "Copper:", Formatting.WHITE); - ((MutableText) copperText.getSiblings().get(0)).withColor(COPPER_COLOR); + ((MutableText) copperText.getSiblings().getFirst()).withColor(COPPER_COLOR); this.addComponent(new IcoTextComponent(Ico.COPPER, copperText)); diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index dc13b61d..70dbdac6 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -224,7 +224,7 @@ public class Utils { if (!isOnHypixel) { isOnHypixel = true; } - if (fabricLoader.isDevelopmentEnvironment() || sidebar.get(0).contains("SKYBLOCK") || sidebar.get(0).contains("SKIBLOCK")) { + if (fabricLoader.isDevelopmentEnvironment() || sidebar.getFirst().contains("SKYBLOCK") || sidebar.getFirst().contains("SKIBLOCK")) { if (!isOnSkyblock) { if (!isInjected) { isInjected = true; diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetectorTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetectorTest.java index 2566c88a..2f1e6559 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetectorTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetectorTest.java @@ -18,7 +18,7 @@ public class MetalDetectorTest { Assertions.assertEquals(MetalDetector.possibleBlocks.size(), 2); MetalDetector.updatePossibleBlocks(10.0, new Vec3d(10, 0, 10)); - Assertions.assertEquals(MetalDetector.possibleBlocks.get(0), new Vec3i(0, 0, 10)); + Assertions.assertEquals(MetalDetector.possibleBlocks.getFirst(), new Vec3i(0, 0, 10)); //test while knowing the middle location MetalDetector.possibleBlocks = new ArrayList<>(); @@ -27,6 +27,6 @@ public class MetalDetectorTest { MetalDetector.updatePossibleBlocks(24.9, new Vec3d(10, 1, 10)); Assertions.assertEquals(MetalDetector.possibleBlocks.size(), 1); - Assertions.assertEquals(MetalDetector.possibleBlocks.get(0), new Vec3i(1, -20, 20)); + Assertions.assertEquals(MetalDetector.possibleBlocks.getFirst(), new Vec3i(1, -20, 20)); } } |