-
-
Notifications
You must be signed in to change notification settings - Fork 193
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature: Personal Compactor Overlay (#1869)
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Co-authored-by: Cal <cwolfson58@gmail.com> Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Co-authored-by: ItsEmpa <itsempa@users.noreply.github.com>
- Loading branch information
5 people
authored
Sep 7, 2024
1 parent
e3b3975
commit f40863a
Showing
10 changed files
with
444 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/main/java/at/hannibal2/skyhanni/config/features/inventory/PersonalCompactorConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package at.hannibal2.skyhanni.config.features.inventory; | ||
|
|
||
| import at.hannibal2.skyhanni.config.FeatureToggle; | ||
| import com.google.gson.annotations.Expose; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; | ||
| import org.lwjgl.input.Keyboard; | ||
|
|
||
| public class PersonalCompactorConfig { | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Enabled", desc = "Enable showing what items are inside your personal compactor/deletor.") | ||
| @ConfigEditorBoolean | ||
| @FeatureToggle | ||
| public boolean enabled = true; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Visibility Mode", desc = "Choose when to show the overlay.") | ||
| @ConfigEditorDropdown | ||
| public VisibilityMode visibilityMode = VisibilityMode.EXCEPT_KEYBIND; | ||
|
|
||
| public enum VisibilityMode { | ||
| ALWAYS("Always"), | ||
| KEYBIND("Keybind Held"), | ||
| EXCEPT_KEYBIND("Except Keybind Held"), | ||
| ; | ||
|
|
||
| private final String name; | ||
|
|
||
| VisibilityMode(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return name; | ||
| } | ||
| } | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Keybind", desc = "The keybind to hold to show the overlay.") | ||
| @ConfigEditorKeybind(defaultKey = Keyboard.KEY_LSHIFT) | ||
| public int keybind = Keyboard.KEY_LSHIFT; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Show On/Off", desc = "Show whether the Personal Compactor/Deletor is currently turned on or off.") | ||
| @ConfigEditorBoolean | ||
| public boolean showToggle = true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
src/main/java/at/hannibal2/skyhanni/features/inventory/PersonalCompactorOverlay.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package at.hannibal2.skyhanni.features.inventory | ||
|
|
||
| import at.hannibal2.skyhanni.SkyHanniMod | ||
| import at.hannibal2.skyhanni.config.features.inventory.PersonalCompactorConfig | ||
| import at.hannibal2.skyhanni.events.InventoryCloseEvent | ||
| import at.hannibal2.skyhanni.events.InventoryUpdatedEvent | ||
| import at.hannibal2.skyhanni.events.LorenzToolTipEvent | ||
| import at.hannibal2.skyhanni.events.RenderItemTipEvent | ||
| import at.hannibal2.skyhanni.events.RenderObject | ||
| import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule | ||
| import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName | ||
| import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull | ||
| import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld | ||
| import at.hannibal2.skyhanni.utils.LorenzUtils | ||
| import at.hannibal2.skyhanni.utils.NEUItems.getInternalNameFromHypixelId | ||
| import at.hannibal2.skyhanni.utils.NEUItems.getItemStack | ||
| import at.hannibal2.skyhanni.utils.NumberUtil.formatInt | ||
| import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher | ||
| import at.hannibal2.skyhanni.utils.RegexUtils.matches | ||
| import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAttributeString | ||
| import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getItemUuid | ||
| import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPersonalCompactorActive | ||
| import at.hannibal2.skyhanni.utils.renderables.Renderable | ||
| import at.hannibal2.skyhanni.utils.renderables.RenderableInventory | ||
| import at.hannibal2.skyhanni.utils.renderables.RenderableTooltips | ||
| import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern | ||
| import net.minecraft.item.ItemStack | ||
| import net.minecraftforge.fml.common.eventhandler.SubscribeEvent | ||
|
|
||
| @SkyHanniModule | ||
| object PersonalCompactorOverlay { | ||
|
|
||
| private val config get() = SkyHanniMod.feature.inventory.personalCompactor | ||
|
|
||
| private val group = RepoPattern.group("inventory.personalcompactor") | ||
| private val internalNamePattern by group.pattern( | ||
| "internalname", | ||
| "PERSONAL_(?<type>[^_]+)_(?<tier>\\d+)", | ||
| ) | ||
|
|
||
| private val slotsMap = mapOf( | ||
| 7000 to 12, | ||
| 6000 to 7, | ||
| 5000 to 3, | ||
| 4000 to 1 | ||
| ) | ||
|
|
||
| private const val MAX_ITEMS_PER_ROW = 7 | ||
|
|
||
| private val compactorRenderableMap = mutableMapOf<String, Renderable>() | ||
| private val compactorEnabledMap = mutableMapOf<String, Boolean>() | ||
|
|
||
| @SubscribeEvent | ||
| fun onTooltip(event: LorenzToolTipEvent) { | ||
| if (!isEnabled()) return | ||
| if (!shouldShow()) return | ||
|
|
||
| val itemStack = event.itemStack | ||
| val internalName = itemStack.getInternalName() | ||
| val name = event.toolTip.firstOrNull() ?: return | ||
| val (type, tier) = internalNamePattern.matchMatcher(internalName.asString()) { | ||
| group("type") to group("tier").formatInt() | ||
| } ?: return | ||
|
|
||
| val prefix = when (type) { | ||
| "COMPACTOR" -> "personal_compact_" | ||
| "DELETOR" -> "personal_deletor_" | ||
| else -> return | ||
| } | ||
|
|
||
| val uuid = itemStack.getItemUuid() ?: return | ||
| val enabled = getPersonalCompactorEnabled(itemStack) ?: return | ||
|
|
||
| val fakeInventory = compactorRenderableMap.getOrPut(uuid) { | ||
| val slots = slotsMap[tier] ?: return | ||
| val itemList = (0 until slots).map { slot -> | ||
| val skyblockId = itemStack.getAttributeString(prefix + slot) | ||
| skyblockId?.let { getInternalNameFromHypixelId(it) }?.getItemStack() | ||
| } | ||
|
|
||
| RenderableInventory.fakeInventory(itemList, MAX_ITEMS_PER_ROW, 1.0) | ||
| } | ||
|
|
||
| val title = Renderable.string(name) | ||
| val status = Renderable.string( | ||
| "§7Status: " + if (enabled) "§aEnabled" else "§cDisabled" | ||
| ) | ||
|
|
||
| RenderableTooltips.setTooltipForRender(listOf(title, status, fakeInventory), spacedTitle = true) | ||
| event.cancel() | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| fun onInventoryClose(event: InventoryCloseEvent) { | ||
| compactorRenderableMap.clear() | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| fun onInventoryUpdate(event: InventoryUpdatedEvent) { | ||
| compactorEnabledMap.clear() | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| fun onRenderItemTip(event: RenderItemTipEvent) { | ||
| if (!LorenzUtils.inSkyBlock) return | ||
| if (!config.showToggle) return | ||
| val itemStack = event.stack | ||
| val internalName = itemStack.getInternalNameOrNull() ?: return | ||
| if (!internalNamePattern.matches(internalName.asString())) return | ||
|
|
||
| val enabled = getPersonalCompactorEnabled(itemStack) ?: return | ||
| val text = if (enabled) "§a✔" else "§c✖" | ||
| val renderObject = RenderObject( | ||
| text, | ||
| -8, | ||
| -10 | ||
| ) | ||
| event.renderObjects.add(renderObject) | ||
| } | ||
|
|
||
| private fun shouldShow() = when (config.visibilityMode) { | ||
| PersonalCompactorConfig.VisibilityMode.ALWAYS -> true | ||
| PersonalCompactorConfig.VisibilityMode.KEYBIND -> config.keybind.isKeyHeld() | ||
| PersonalCompactorConfig.VisibilityMode.EXCEPT_KEYBIND -> !config.keybind.isKeyHeld() | ||
| else -> false | ||
| } | ||
|
|
||
| private fun getPersonalCompactorEnabled(itemStack: ItemStack): Boolean? { | ||
| val uuid = itemStack.getItemUuid() ?: return null | ||
| return compactorEnabledMap.getOrPut(uuid) { itemStack.getPersonalCompactorActive() } | ||
| } | ||
|
|
||
| private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.