diff options
| author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-09-05 10:34:32 -0400 |
|---|---|---|
| committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-09-05 10:34:32 -0400 |
| commit | bbfc1021c48886e5d65c9f600858d7ca7ec46bb1 (patch) | |
| tree | 7491aab958a2810c1fc0cf4f9ad788bdeadb06d6 /src/main/java | |
| parent | 91a2bb9068a142c91e935f687885e8b1643bc934 (diff) | |
| download | Skyblocker-bbfc1021c48886e5d65c9f600858d7ca7ec46bb1.tar.gz Skyblocker-bbfc1021c48886e5d65c9f600858d7ca7ec46bb1.tar.bz2 Skyblocker-bbfc1021c48886e5d65c9f600858d7ca7ec46bb1.zip | |
Fix init merge conflicts
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java | 1 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java index 7fcbfac5..8fbeb6e0 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/bazaar/BazaarHelper.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock.bazaar; -import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.item.slottext.SimpleSlotTextAdder; import de.hysky.skyblocker.skyblock.item.slottext.SlotText; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java index 74acb0c3..d682884d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemPrice.java @@ -1,5 +1,6 @@ package de.hysky.skyblocker.skyblock.item; +import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; import de.hysky.skyblocker.skyblock.item.tooltip.info.DataTooltipInfoType; import de.hysky.skyblocker.skyblock.item.tooltip.info.TooltipInfoType; @@ -32,6 +33,7 @@ public class ItemPrice { "key.categories.skyblocker" )); + @Init public static void init() {} public static void itemPriceLookup(ClientPlayerEntity player, @NotNull Slot slot) { |