From c726a198016d395ecc962fcd8f16b6952e94ea8c Mon Sep 17 00:00:00 2001 From: ILike2WatchMemes Date: Sat, 6 Jul 2024 03:13:53 +0200 Subject: [PATCH] updated support for lower experiments --- .../inventory/ExperimentationTableConfig.java | 21 +++++++++++-------- .../ExperimentsDisplay.kt | 11 ++++++---- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ExperimentationTableConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ExperimentationTableConfig.java index c1eaf2a46332..f3c3cd7cd745 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ExperimentationTableConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ExperimentationTableConfig.java @@ -2,7 +2,6 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; -import at.hannibal2.skyhanni.config.features.garden.pests.PestProfitTrackerConfig; import com.google.gson.annotations.Expose; import io.github.notenoughupdates.moulconfig.annotations.Accordion; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; @@ -89,23 +88,27 @@ public static class ExperimentsDryStreakConfig { public boolean ultraRareBookAlert = false; public enum Experiments { - NONE("", 0, 0), - BEGINNER("Beginner", 14, 18), - HIGH("High", 20, 9), - GRAND("Grand", 20, 9), - SUPREME("Supreme", 28, 9), - TRANSCENDENT("Transcendent", 28, 9), - METAPHYSICAL("Metaphysical", 28, 9), + NONE("", 0, 0, 0, 0), + BEGINNER("Beginner", 14, 18, 35, 1), + HIGH("High", 20, 10, 43, 2), + GRAND("Grand", 20, 10, 43, 2), + SUPREME("Supreme", 28, 9, 44, 1), + TRANSCENDENT("Transcendent", 28, 9, 44, 1), + METAPHYSICAL("Metaphysical", 28, 9, 44, 1), ; public final String name; public final int gridSize; public final int startSlot; + public final int endSlot; + public final int sideSpace; - Experiments(String name, int gridSize, int startSlot) { + Experiments(String name, int gridSize, int startSlot, int endSlot, int sideSpace) { this.name = name; this.gridSize = gridSize; this.startSlot = startSlot; + this.endSlot = endSlot; + this.sideSpace = sideSpace; } @Override diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDisplay.kt index 024bc36b3aea..7c10d33bd327 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsDisplay.kt @@ -259,10 +259,13 @@ object ExperimentsDisplay { return if (lastIndex != -1) list.size - 1 - lastIndex else -1 } - private fun isOutOfBounds(slot: Int, experiment: Experiments) = - slot <= experiment.startSlot || - slot >= experiment.startSlot + experiment.gridSize + 7 || - listOf(17, 18, 26, 27, 35, 36).contains(slot) + private fun isOutOfBounds(slot: Int, experiment: Experiments): Boolean { + val sideSpaces1 = listOf(17, 18, 26, 27, 35, 36) + val sideSpaces2 = listOf(16, 17, 18, 19, 25, 26, 27, 28, 34, 35, 36, 37) + return slot <= experiment.startSlot || + slot >= experiment.endSlot || + (if (experiment.sideSpace == 1) slot in sideSpaces1 else slot in sideSpaces2) + } private fun isEnabled() = config.experimentationTableDisplay && LorenzUtils.inSkyBlock && InventoryUtils.openInventoryName().startsWith("Superpairs (")