From f26ac1e5a63d47d73995e22b12ebdcbc0e26a57f Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Fri, 21 Jun 2024 07:47:26 +0300 Subject: Oops, missed a few --- .../skyblock/item/slottext/SimpleSlotTextAdder.java | 4 ++-- .../skyblock/item/slottext/SlotTextManager.java | 10 +++++----- .../skyblock/item/tooltip/SimpleTooltipAdder.java | 4 ++-- .../skyblock/item/tooltip/TooltipManager.java | 12 ++++++------ .../utils/container/AbstractSlotTextAdder.java | 21 --------------------- .../utils/container/AbstractTooltipAdder.java | 18 ------------------ .../skyblocker/utils/container/SlotTextAdder.java | 21 +++++++++++++++++++++ .../skyblocker/utils/container/TooltipAdder.java | 18 ++++++++++++++++++ 8 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/de/hysky/skyblocker/utils/container/AbstractSlotTextAdder.java delete mode 100644 src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java create mode 100644 src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java create mode 100644 src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SimpleSlotTextAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SimpleSlotTextAdder.java index 068640e4..1eb3e5c2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SimpleSlotTextAdder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SimpleSlotTextAdder.java @@ -1,7 +1,7 @@ package de.hysky.skyblocker.skyblock.item.slottext; import de.hysky.skyblocker.config.SkyblockerConfigManager; -import de.hysky.skyblocker.utils.container.AbstractSlotTextAdder; +import de.hysky.skyblocker.utils.container.SlotTextAdder; import de.hysky.skyblocker.utils.container.RegexContainerMatcher; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; @@ -12,7 +12,7 @@ import java.util.regex.Pattern; * Simple implementation of a slot text adder. * Extend this class and add it to {@link SlotTextManager#adders} to add text to any arbitrary slot. */ -public abstract class SimpleSlotTextAdder extends RegexContainerMatcher implements AbstractSlotTextAdder { +public abstract class SimpleSlotTextAdder extends RegexContainerMatcher implements SlotTextAdder { /** * Utility constructor that will compile the given string into a pattern. * diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java index a13bc28a..fa7036c2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java @@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.item.slottext; import de.hysky.skyblocker.skyblock.bazaar.BazaarHelper; import de.hysky.skyblocker.skyblock.item.slottext.adders.*; import de.hysky.skyblocker.utils.Utils; -import de.hysky.skyblocker.utils.container.AbstractSlotTextAdder; +import de.hysky.skyblocker.utils.container.SlotTextAdder; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; public class SlotTextManager { - private static final AbstractSlotTextAdder[] adders = new AbstractSlotTextAdder[]{ + private static final SlotTextAdder[] adders = new SlotTextAdder[]{ new EssenceShopAdder(), new EnchantmentLevelAdder(), new MinionLevelAdder(), @@ -38,7 +38,7 @@ public class SlotTextManager { new BazaarHelper(), new StatsTuningAdder() }; - private static final ArrayList currentScreenAdders = new ArrayList<>(); + private static final ArrayList currentScreenAdders = new ArrayList<>(); private SlotTextManager() { } @@ -53,7 +53,7 @@ public class SlotTextManager { } private static void onScreenChange(HandledScreen screen) { - for (AbstractSlotTextAdder adder : adders) { + for (SlotTextAdder adder : adders) { if (!adder.isEnabled()) continue; if (adder.test(screen)) { currentScreenAdders.add(adder); @@ -71,7 +71,7 @@ public class SlotTextManager { @NotNull public static List getText(@NotNull ItemStack itemStack, int slotId) { if (currentScreenAdders.isEmpty()) return List.of(); - for (AbstractSlotTextAdder adder : currentScreenAdders) { + for (SlotTextAdder adder : currentScreenAdders) { List text = adder.getText(itemStack, slotId); if (!text.isEmpty()) return text; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/SimpleTooltipAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/SimpleTooltipAdder.java index d9533da3..565fecbb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/SimpleTooltipAdder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/SimpleTooltipAdder.java @@ -1,7 +1,7 @@ package de.hysky.skyblocker.skyblock.item.tooltip; import de.hysky.skyblocker.utils.container.RegexContainerMatcher; -import de.hysky.skyblocker.utils.container.AbstractTooltipAdder; +import de.hysky.skyblocker.utils.container.TooltipAdder; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; @@ -11,7 +11,7 @@ import java.util.regex.Pattern; * Simple implementation of a tooltip adder. * Extend this class and add it to {@link TooltipManager#adders} to add additional text to tooltips. */ -public abstract class SimpleTooltipAdder extends RegexContainerMatcher implements AbstractTooltipAdder { +public abstract class SimpleTooltipAdder extends RegexContainerMatcher implements TooltipAdder { /** * The priority of this adder. Lower priority means it will be applied first. * @apiNote Consider adding this as a parameter to your class' constructor and diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java index 2c81cff4..e89a1995 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java @@ -6,7 +6,7 @@ import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver; import de.hysky.skyblocker.skyblock.item.tooltip.adders.*; import de.hysky.skyblocker.skyblock.item.tooltip.adders.CraftPriceTooltip; import de.hysky.skyblocker.utils.Utils; -import de.hysky.skyblocker.utils.container.AbstractTooltipAdder; +import de.hysky.skyblocker.utils.container.TooltipAdder; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; import net.minecraft.client.MinecraftClient; @@ -21,7 +21,7 @@ import java.util.Comparator; import java.util.List; public class TooltipManager { - private static final AbstractTooltipAdder[] adders = new AbstractTooltipAdder[]{ + private static final TooltipAdder[] adders = new TooltipAdder[]{ new LineSmoothener(), // Applies before anything else new SupercraftReminder(), new ChocolateFactorySolver.Tooltip(), @@ -39,7 +39,7 @@ public class TooltipManager { new ColorTooltip(11), new AccessoryTooltip(12), }; - private static final ArrayList currentScreenAdders = new ArrayList<>(); + private static final ArrayList currentScreenAdders = new ArrayList<>(); private TooltipManager() { } @@ -62,12 +62,12 @@ public class TooltipManager { private static void onScreenChange(HandledScreen screen) { currentScreenAdders.clear(); - for (AbstractTooltipAdder adder : adders) { + for (TooltipAdder adder : adders) { if (adder.isEnabled() && adder.test(screen)) { currentScreenAdders.add(adder); } } - currentScreenAdders.sort(Comparator.comparingInt(AbstractTooltipAdder::getPriority)); + currentScreenAdders.sort(Comparator.comparingInt(TooltipAdder::getPriority)); } /** @@ -85,7 +85,7 @@ public class TooltipManager { @Deprecated public static List addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List lines) { if (!Utils.isOnSkyblock()) return lines; - for (AbstractTooltipAdder adder : currentScreenAdders) { + for (TooltipAdder adder : currentScreenAdders) { adder.addToTooltip(focusedSlot, stack, lines); } return lines; diff --git a/src/main/java/de/hysky/skyblocker/utils/container/AbstractSlotTextAdder.java b/src/main/java/de/hysky/skyblocker/utils/container/AbstractSlotTextAdder.java deleted file mode 100644 index 5e13c644..00000000 --- a/src/main/java/de/hysky/skyblocker/utils/container/AbstractSlotTextAdder.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.hysky.skyblocker.utils.container; - -import de.hysky.skyblocker.skyblock.item.slottext.SlotText; -import net.minecraft.item.ItemStack; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -public interface AbstractSlotTextAdder extends ContainerMatcher { - - /** - * This method will be called for each rendered slot. Consider using a switch statement on {@code slotId} if you wish to limit the text to specific slots. - * - * @return A list of positioned text to be rendered. Return {@link List#of()} if no text should be rendered. - * @implNote By minecraft's design, scaled text inexplicably moves around. - * It's also not anti-aliased, so it looks horribly jagged and unreadable when scaled down too much. - * So, limit your text to 3 characters (or roughly less than 20 width) if you want it to not look horrible. - */ - @NotNull - List getText(@NotNull ItemStack itemStack, int slotId); -} diff --git a/src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java b/src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java deleted file mode 100644 index 5da64f52..00000000 --- a/src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.hysky.skyblocker.utils.container; - -import net.minecraft.item.ItemStack; -import net.minecraft.screen.slot.Slot; -import net.minecraft.text.Text; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public interface AbstractTooltipAdder extends ContainerMatcher { - /** - * @implNote The first element of the lines list holds the item's display name, - * as it's a list of all lines that will be displayed in the tooltip. - */ - void addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List lines); - - int getPriority(); -} diff --git a/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java b/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java new file mode 100644 index 00000000..c0e4bc1c --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java @@ -0,0 +1,21 @@ +package de.hysky.skyblocker.utils.container; + +import de.hysky.skyblocker.skyblock.item.slottext.SlotText; +import net.minecraft.item.ItemStack; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public interface SlotTextAdder extends ContainerMatcher { + + /** + * This method will be called for each rendered slot. Consider using a switch statement on {@code slotId} if you wish to limit the text to specific slots. + * + * @return A list of positioned text to be rendered. Return {@link List#of()} if no text should be rendered. + * @implNote By minecraft's design, scaled text inexplicably moves around. + * It's also not anti-aliased, so it looks horribly jagged and unreadable when scaled down too much. + * So, limit your text to 3 characters (or roughly less than 20 width) if you want it to not look horrible. + */ + @NotNull + List getText(@NotNull ItemStack itemStack, int slotId); +} diff --git a/src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java b/src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java new file mode 100644 index 00000000..2ff3fdf1 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java @@ -0,0 +1,18 @@ +package de.hysky.skyblocker.utils.container; + +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public interface TooltipAdder extends ContainerMatcher { + /** + * @implNote The first element of the lines list holds the item's display name, + * as it's a list of all lines that will be displayed in the tooltip. + */ + void addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List lines); + + int getPriority(); +} -- cgit