aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-06-21 07:47:26 +0300
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-07-22 14:22:58 +0800
commitf26ac1e5a63d47d73995e22b12ebdcbc0e26a57f (patch)
treea1c166f0da20d44098b51cc3ef09fcda0bb74990
parent99dd2eb4e024c6b5d6355eef342af63649d9fb08 (diff)
downloadSkyblocker-f26ac1e5a63d47d73995e22b12ebdcbc0e26a57f.tar.gz
Skyblocker-f26ac1e5a63d47d73995e22b12ebdcbc0e26a57f.tar.bz2
Skyblocker-f26ac1e5a63d47d73995e22b12ebdcbc0e26a57f.zip
Oops, missed a few
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SimpleSlotTextAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/slottext/SlotTextManager.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/SimpleTooltipAdder.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java (renamed from src/main/java/de/hysky/skyblocker/utils/container/AbstractSlotTextAdder.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java (renamed from src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java)2
6 files changed, 17 insertions, 17 deletions
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<AbstractSlotTextAdder> currentScreenAdders = new ArrayList<>();
+ private static final ArrayList<SlotTextAdder> 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<SlotText> getText(@NotNull ItemStack itemStack, int slotId) {
if (currentScreenAdders.isEmpty()) return List.of();
- for (AbstractSlotTextAdder adder : currentScreenAdders) {
+ for (SlotTextAdder adder : currentScreenAdders) {
List<SlotText> 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<AbstractTooltipAdder> currentScreenAdders = new ArrayList<>();
+ private static final ArrayList<TooltipAdder> 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<Text> addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List<Text> 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/SlotTextAdder.java
index 5e13c644..c0e4bc1c 100644
--- a/src/main/java/de/hysky/skyblocker/utils/container/AbstractSlotTextAdder.java
+++ b/src/main/java/de/hysky/skyblocker/utils/container/SlotTextAdder.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
-public interface AbstractSlotTextAdder extends ContainerMatcher {
+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.
diff --git a/src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java b/src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java
index 5da64f52..2ff3fdf1 100644
--- a/src/main/java/de/hysky/skyblocker/utils/container/AbstractTooltipAdder.java
+++ b/src/main/java/de/hysky/skyblocker/utils/container/TooltipAdder.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
-public interface AbstractTooltipAdder extends ContainerMatcher {
+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.