diff options
19 files changed, 23 insertions, 27 deletions
diff --git a/build.gradle b/build.gradle index c09af710..375f80e1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' - id "me.modmuss50.mod-publish-plugin" version "0.7.2" + id "me.modmuss50.mod-publish-plugin" version "0.7.4" id "de.hysky.skyblocker.annotation-processor" } diff --git a/gradle.properties b/gradle.properties index 2e2e4773..a7d7e7ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ fabric_api_version=0.106.0+1.21.2 # Minecraft Mods ## YACL (https://github.com/isXander/YetAnotherConfigLib) -yacl_version=3.5.0+1.21 +yacl_version=3.6.0+1.21.2 ## HM API (https://github.com/AzureAaron/hm-api) hm_api_version=1.0.1+1.21.1 ## Mod Menu (https://modrinth.com/mod/modmenu/versions) diff --git a/src/main/java/de/hysky/skyblocker/config/ConfigUtils.java b/src/main/java/de/hysky/skyblocker/config/ConfigUtils.java index 00c09e6f..d61bac84 100644 --- a/src/main/java/de/hysky/skyblocker/config/ConfigUtils.java +++ b/src/main/java/de/hysky/skyblocker/config/ConfigUtils.java @@ -31,7 +31,7 @@ public class ConfigUtils { @SuppressWarnings("unchecked") public static <E extends Enum<E>> EnumControllerBuilder<E> createEnumCyclingListController(Option<E> opt) { - return EnumControllerBuilder.create(opt).enumClass((Class<E>) opt.binding().defaultValue().getClass()); + return EnumControllerBuilder.create(opt).enumClass((Class<E>) opt.stateManager().get().getClass()); } /** diff --git a/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java index ae4882f2..8cb5deca 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java @@ -37,13 +37,15 @@ public class EventNotificationsCategory { sound -> config.eventNotifications.reminderSound = sound) .controller(ConfigUtils::createEnumCyclingListController) .name(Text.translatable("skyblocker.config.eventNotifications.notificationSound")) - .listener((soundOption, sound) -> { - if (!shouldPlaySound) { - shouldPlaySound = true; - return; - } - if (sound.getSoundEvent() != null) - MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(sound.getSoundEvent(), 1f, 1f)); + .addListener((soundOption, event) -> { + if (event == OptionEventListener.Event.STATE_CHANGE) { + if (!shouldPlaySound) { + shouldPlaySound = true; + return; + } + if (soundOption.pendingValue().getSoundEvent() != null) + MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(soundOption.pendingValue().getSoundEvent(), 1f, 1f)); + } }) .build()) .groups(createGroups(config)) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index 12a669de..58abfa90 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -186,7 +186,9 @@ public class GeneralCategory { .binding(defaults.general.itemTooltip.enableCraftingCost, () -> config.general.itemTooltip.enableCraftingCost, newValue -> config.general.itemTooltip.enableCraftingCost = newValue) - .listener((Option<GeneralConfig.Craft> ignored, GeneralConfig.Craft ignored2) -> CraftPriceTooltip.clearCache()) + .addListener((ignored, event) -> { + if (event == OptionEventListener.Event.STATE_CHANGE) CraftPriceTooltip.clearCache(); + }) .controller(ConfigUtils::createEnumCyclingListController) .build()) .option(Option.<Boolean>createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java index 361ca6f0..46e91c9c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java @@ -3,7 +3,6 @@ package de.hysky.skyblocker.mixins; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.systems.RenderSystem; -import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.events.HudRenderEvents; import de.hysky.skyblocker.skyblock.dwarven.GlaciteColdOverlay; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java b/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java index 01c7fada..e9bd1e40 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/PetCache.java @@ -16,7 +16,6 @@ import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.screen.slot.Slot; -import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java b/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java index cf08fedb..32fe9ade 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/WarpAutocomplete.java @@ -3,7 +3,6 @@ package de.hysky.skyblocker.skyblock; import com.google.gson.JsonParser; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.tree.LiteralCommandNode; -import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.annotations.Init; import com.mojang.serialization.Codec; import com.mojang.serialization.JsonOps; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java index f0908918..342b9f8a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock.auction; -import com.google.gson.JsonElement; import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.auction.widgets.AuctionTypeWidget; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java index 29350e31..80a3f232 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java @@ -17,7 +17,6 @@ import net.minecraft.util.math.RotationAxis; import org.joml.Vector2i; import org.joml.Vector2ic; -import java.awt.*; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java index 71accd78..72763bca 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java @@ -6,7 +6,6 @@ import de.hysky.skyblocker.utils.Constants; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.render.RenderHelper; import de.hysky.skyblocker.utils.waypoint.NamedWaypoint; -import de.hysky.skyblocker.utils.waypoint.Waypoint; import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java index 9711a5df..4350800e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java @@ -173,7 +173,8 @@ public class WishingCompassSolver { return ZONE_BOUNDING_BOXES.get(startingZone).expand(100, 0, 100).contains(pos); } - public static void onParticle(ParticleS2CPacket packet) { + @SuppressWarnings("incomplete-switch") + public static void onParticle(ParticleS2CPacket packet) { if (!Utils.isInCrystalHollows() || !ParticleTypes.HAPPY_VILLAGER.equals(packet.getParameters().getType())) { return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java index bbdca95e..f5ef1425 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java @@ -53,6 +53,7 @@ public final class ChronomatronSolver extends ExperimentSolver { return experimentsConfig.enableChronomatronSolver; } + @SuppressWarnings("incomplete-switch") @Override protected void tick(GenericContainerScreen screen) { switch (getState()) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java index c75d2fd8..918fc84f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java @@ -51,7 +51,7 @@ public final class UltrasequencerSolver extends ExperimentSolver { /** * Saves the shown items to {@link #slots the slot map}. */ - @SuppressWarnings("JavadocReference") + @SuppressWarnings({ "JavadocReference", "incomplete-switch" }) @Override protected void tick(GenericContainerScreen screen) { switch (getState()) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java index 28ae37fb..46685468 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java @@ -52,7 +52,8 @@ public class FancyStatusBars { return experience.anchor != null || experience.inMouse; } - @Init + @SuppressWarnings("deprecation") + @Init public static void init() { statusBars.put("health", new StatusBar(Identifier.of(SkyblockerMod.NAMESPACE, "bars/icons/health"), new Color[]{new Color(255, 0, 0), new Color(255, 220, 0)}, @@ -73,7 +74,6 @@ public class FancyStatusBars { // Fetch from old status bar config int[] counts = new int[3]; // counts for RIGHT, LAYER1, LAYER2 StatusBar health = statusBars.get("health"); - @SuppressWarnings("deprecation") UIAndVisualsConfig.LegacyBarPositions barPositions = SkyblockerConfigManager.get().uiAndVisuals.bars.barPositions; initBarPosition(health, counts, barPositions.healthBarPosition); StatusBar intelligence = statusBars.get("intelligence"); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerEntitiesGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerEntitiesGlow.java index 88ae51df..cf3ee209 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerEntitiesGlow.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/slayers/SlayerEntitiesGlow.java @@ -4,8 +4,6 @@ import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.utils.SlayerUtils; import de.hysky.skyblocker.utils.render.RenderHelper; import de.hysky.skyblocker.utils.scheduler.Scheduler; -import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java index f182a949..94b98354 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java @@ -1,11 +1,8 @@ package de.hysky.skyblocker.skyblock.tabhud.util; -import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import static net.minecraft.enchantment.Enchantments.PROTECTION; - /** * Stores convenient shorthands for common ItemStack definitions */ diff --git a/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/blockpos/ClientBlockPosArgumentType.java b/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/blockpos/ClientBlockPosArgumentType.java index 3a226414..c8b34c09 100644 --- a/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/blockpos/ClientBlockPosArgumentType.java +++ b/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/blockpos/ClientBlockPosArgumentType.java @@ -32,6 +32,7 @@ public class ClientBlockPosArgumentType implements ArgumentType<ClientPosArgumen public static BlockPos getLoadedBlockPos(CommandContext<FabricClientCommandSource> context, ClientWorld world, String name) throws CommandSyntaxException { BlockPos blockPos = getBlockPos(context, name); + //FIXME Vanilla still uses this deprecated method, watch out in future updates in case this changes if (!world.isChunkLoaded(blockPos)) throw UNLOADED_EXCEPTION.create(); if (!world.isInBuildLimit(blockPos)) throw OUT_OF_WORLD_EXCEPTION.create(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0785f03d..e8af5d6c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -42,7 +42,7 @@ "depends": { "fabricloader": ">=0.16.7", "fabric-api": ">=0.106.0+1.21.2", - "yet_another_config_lib_v3": ">=3.5.0+1.21", + "yet_another_config_lib_v3": ">=3.6.0+1.21.2", "hm-api": ">=1.0.1+1.21.1", "minecraft": "~1.21.2-rc.1", "java": ">=21" |