diff options
| author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-07-22 14:55:03 +0800 |
|---|---|---|
| committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-07-22 14:55:03 +0800 |
| commit | a846b52122422887e464d83ca01f0b771f3882f5 (patch) | |
| tree | 62e62aa64d7baec12d41fabdc4ba45decebd835a /src/main/java/de/hysky/skyblocker/utils/container | |
| parent | e316a165d8f7f812afa6d3c9f2f0f576fd1e6f93 (diff) | |
| download | Skyblocker-a846b52122422887e464d83ca01f0b771f3882f5.tar.gz Skyblocker-a846b52122422887e464d83ca01f0b771f3882f5.tar.bz2 Skyblocker-a846b52122422887e464d83ca01f0b771f3882f5.zip | |
Clean up rebased code
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/utils/container')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/container/ContainerSolverManager.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolverManager.java b/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolverManager.java index 6194852b..b67b9edf 100644 --- a/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolverManager.java +++ b/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolverManager.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor; import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakeBagHelper; import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakesHelper; +import de.hysky.skyblocker.skyblock.bazaar.ReorderHelper; import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver; import de.hysky.skyblocker.skyblock.dungeon.CroesusHelper; import de.hysky.skyblocker.skyblock.dungeon.CroesusProfit; @@ -55,7 +56,8 @@ public class ContainerSolverManager { UltrasequencerSolver.INSTANCE, new NewYearCakeBagHelper(), NewYearCakesHelper.INSTANCE, - new ChocolateFactorySolver() + new ChocolateFactorySolver(), + new ReorderHelper() }; } diff --git a/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java b/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java index 2ee41820..4caf8cea 100644 --- a/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java +++ b/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java @@ -4,7 +4,9 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.item.slottext.SlotText; import de.hysky.skyblocker.skyblock.item.slottext.SlotTextState; import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.List; @@ -19,7 +21,7 @@ public interface SlotTextAdder extends ContainerMatcher { * So, limit your text to 3 characters (or roughly less than 20 width) if you want it to not look horrible. */ @NotNull - List<SlotText> getText(@NotNull ItemStack itemStack, int slotId); + List<SlotText> getText(@Nullable Slot slot, @NotNull ItemStack stack, int slotId); @Override default boolean isEnabled() { |