diff options
Diffstat (limited to 'src')
4 files changed, 49 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 9477fbed..cff06d32 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -213,6 +213,9 @@ public class SkyblockerConfig { public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay(); @SerialEntry + public ItemProtection itemProtection = new ItemProtection(); + + @SerialEntry public WikiLookup wikiLookup = new WikiLookup(); @SerialEntry @@ -551,6 +554,30 @@ public class SkyblockerConfig { } } + public static class ItemProtection { + @SerialEntry + public SlotLockStyle slotLockStyle = SlotLockStyle.FANCY; + } + + public enum SlotLockStyle { + CLASSIC(new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png")), + FANCY(new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/fancy_slot_lock.png")); + + public final Identifier tex; + + SlotLockStyle(Identifier tex) { + this.tex = tex; + } + + @Override + public String toString() { + return switch (this) { + case CLASSIC -> "Classic"; + case FANCY -> "FANCY"; + }; + } + } + public static class WikiLookup { @SerialEntry public boolean enableWikiLookup = true; 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 406dd885..808b3c2c 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -457,6 +457,20 @@ public class GeneralCategory { .build()) .build()) + //Item Protection + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.itemProtection")) + .collapsed(true) + .option(Option.<SkyblockerConfig.SlotLockStyle>createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle.@Tooltip"))) + .binding(defaults.general.itemProtection.slotLockStyle, + () -> config.general.itemProtection.slotLockStyle, + newValue -> config.general.itemProtection.slotLockStyle = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .build()) + //Wiki Lookup .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup")) diff --git a/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java index 25288ed2..c8f6f272 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java @@ -3,7 +3,6 @@ package de.hysky.skyblocker.mixin; 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.skyblock.FancyStatusBars; import de.hysky.skyblocker.skyblock.dungeon.DungeonMap; @@ -21,6 +20,9 @@ import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; + +import java.util.function.Supplier; + import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -33,7 +35,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(InGameHud.class) public abstract class InGameHudMixin { @Unique - private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png"); + private static final Supplier<Identifier> SLOT_LOCK_ICON = () -> SkyblockerConfigManager.get().general.itemProtection.slotLockStyle.tex; @Unique private final FancyStatusBars statusBars = new FancyStatusBars(); @@ -52,7 +54,7 @@ public abstract class InGameHudMixin { if (SkyblockerConfigManager.get().general.itemInfoDisplay.itemRarityBackgrounds) ItemRarityBackgrounds.tryDraw(player.getInventory().main.get(index), context, x, y); if (HotbarSlotLock.isLocked(index)) { RenderSystem.enableBlend(); - context.drawTexture(SLOT_LOCK, x, y, 0, 0, 16, 16, 16, 16); + context.drawTexture(SLOT_LOCK_ICON.get(), x, y, 0, 0, 16, 16, 16, 16); RenderSystem.disableBlend(); } } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 1360f5f1..7afe4196 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -95,6 +95,9 @@ "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundStyle": "Item Rarity Background Style", "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundStyle.@Tooltip": "Choose between a circular or a square background style!", "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundsOpacity": "Item Rarity Backgrounds Opacity", + "text.autoconfig.skyblocker.option.general.itemProtection": "Item Protection", + "text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle": "Slot Lock Icon Style", + "text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle.@Tooltip": "Choose between the fancy or the classic slot lock icon.", "text.autoconfig.skyblocker.option.general.wikiLookup": "Wiki Lookup", "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup": "Enable Wiki Lookup", "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup.@Tooltip": "Opens the wiki page of the hovered item with the F4 key.", |