From 313c72377182a26ab216d9ba020fa8dfdb2f49a2 Mon Sep 17 00:00:00 2001
From: vicisacat <victor.branchu@gmail.com>
Date: Fri, 12 Jan 2024 19:23:46 +0100
Subject: Fix party finder parsing top left item in your inventory
---
.../skyblock/dungeon/partyfinder/FinderSettingsContainer.java | 6 +++---
.../skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src/main/java/de')
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java
index 18cebff7..e9a1d6da 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java
@@ -59,7 +59,7 @@ public class FinderSettingsContainer extends ContainerWidget{
isInitialized = true;
//System.out.println("initializing");
for (Slot slot : handler.slots) {
- if (slot.id > handler.getRows() * 9) break;
+ if (slot.id > handler.getRows() * 9 - 1) break;
if (!slot.hasStack()) continue;
ItemStack stack = slot.getStack();
//System.out.println(stack.toString());
@@ -225,7 +225,7 @@ public class FinderSettingsContainer extends ContainerWidget{
private void updateDropdownOptionWidget(GenericContainerScreenHandler handler, OptionDropdownWidget dropdownWidget) {
List<OptionDropdownWidget.Option> entries = new ArrayList<>();
for (Slot slot : handler.slots) {
- if (slot.id > (handler.getRows() - 1) * 9) break;
+ if (slot.id > (handler.getRows() - 1) * 9 - 1) break;
if (slot.hasStack() && !slot.getStack().isOf(Items.BLACK_STAINED_GLASS_PANE)) {
entries.add(dropdownWidget.new Option(slot.getStack().getName().getString(), slot.getStack(), slot.id));
}
@@ -239,7 +239,7 @@ public class FinderSettingsContainer extends ContainerWidget{
int min = -1;
int max = -1;
for (Slot slot : handler.slots) {
- if (slot.id > (handler.getRows() - 1) * 9) break;
+ if (slot.id > (handler.getRows() - 1) * 9 - 1) break;
if (slot.hasStack() && slot.getStack().getName().getString().toLowerCase().contains("min")) {
min = slot.id;
} else if (slot.hasStack() && slot.getStack().getName().getString().toLowerCase().contains("max")) {
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 9273f32e..e6556d15 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
@@ -337,7 +337,7 @@ public class PartyFinderScreen extends Screen {
parties.add(new PartyEntry.NoParties());
}else {
for (Slot slot : handler.slots) {
- if (slot.id > handler.getRows() * 9 || !slot.hasStack()) continue;
+ if (slot.id > handler.getRows() * 9 - 1 || !slot.hasStack()) continue;
if (slot.getStack().isOf(Items.PLAYER_HEAD)) {
assert this.client != null;
parties.add(new PartyEntry(slot.getStack().getTooltip(this.client.player, TooltipContext.BASIC), this, slot.id));
@@ -348,7 +348,7 @@ public class PartyFinderScreen extends Screen {
}
}
}
- for (int i = (handler.getRows()-1) * 9; i < handler.getRows() * 9; i++) {
+ for (int i = (handler.getRows()-1) * 9; i < handler.getRows() * 9 - 1; i++) {
Slot slot = handler.slots.get(i);
int done = 0;
if (slot.hasStack() && slot.getStack().isOf(Items.EMERALD_BLOCK)) {
--
cgit