aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2023-06-25 20:36:44 +0200
committerGitHub <noreply@github.com>2023-06-25 20:36:44 +0200
commitb098e653a25423477bd20052739fea525489db5a (patch)
tree385afb61f176b3b50b881d3c77a2318d7c0ec85f /src
parent99a5940e339353cda6f1db845751d44bbea8e3f1 (diff)
parent22dc47339138945b60b1c417f6429d17cb2faea2 (diff)
downloadskyhanni-b098e653a25423477bd20052739fea525489db5a.tar.gz
skyhanni-b098e653a25423477bd20052739fea525489db5a.tar.bz2
skyhanni-b098e653a25423477bd20052739fea525489db5a.zip
Merge pull request #254
Add Enigma Soul Waypoints
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/EnigmaSoulWaypoints.kt177
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java19
3 files changed, 197 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index f6cd9389a..c033b886c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -310,6 +310,7 @@ class SkyHanniMod {
loadModule(VoltHighlighter())
loadModule(RiftOdonata())
loadModule(RiftAgaricusCap())
+ loadModule(EnigmaSoulWaypoints)
init()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/EnigmaSoulWaypoints.kt
new file mode 100644
index 000000000..08cfa0753
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/EnigmaSoulWaypoints.kt
@@ -0,0 +1,177 @@
+package at.hannibal2.skyhanni.features.rift
+
+import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
+import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
+import at.hannibal2.skyhanni.utils.LorenzColor
+import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzVec
+import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.RenderUtils.highlight
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.jsonobjects.EnigmaSoulsJson
+import io.github.moulberry.notenoughupdates.events.ReplaceItemEvent
+import io.github.moulberry.notenoughupdates.events.SlotClickEvent
+import io.github.moulberry.notenoughupdates.util.Utils
+import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraft.client.player.inventory.ContainerLocalMenu
+import net.minecraft.init.Blocks
+import net.minecraft.inventory.ContainerChest
+import net.minecraft.item.ItemStack
+import net.minecraftforge.client.event.RenderWorldLastEvent
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+object EnigmaSoulWaypoints {
+ private var inInventory = false
+ private val soulLocations = mutableMapOf<String, LorenzVec>()
+ private val trackedSouls = mutableListOf<String>()
+ private val inventoryUnfound = mutableListOf<String>()
+ private var adding = true
+
+ private val item by lazy {
+ val neuItem = NEUItems.getItemStackOrNull("SKYBLOCK_ENIGMA_SOUL")
+ ?: ItemStack(Blocks.obsidian) // can prob have a better fallback
+ Utils.createItemStack(
+ neuItem.item,
+ "§5Toggle Missing",
+ "§7Click here to toggle",
+ "§7the waypoints for each",
+ "§7missing souls on this page"
+ )
+ }
+
+ @SubscribeEvent
+ fun replaceItem(event: ReplaceItemEvent) {
+ if (inventoryUnfound.isEmpty()) return
+ if (event.inventory is ContainerLocalMenu && inInventory && event.slotNumber == 31) {
+ event.replaceWith(item)
+ }
+ }
+
+ @SubscribeEvent
+ fun onInventoryOpen(event: InventoryOpenEvent) {
+ inInventory = false
+ if (!event.inventoryName.contains("Enigma Souls")) return
+ inInventory = true
+
+ for (stack in event.inventoryItems.values) {
+ val split = stack.displayName.split("Enigma: ")
+ if (split.size == 2) {
+ if (stack.getLore().last() == "§8✖ Not completed yet!") {
+ inventoryUnfound.add(split.last())
+ }
+ }
+ }
+ }
+
+ @SubscribeEvent
+ fun onInventoryClose(event: InventoryCloseEvent) {
+ inInventory = false
+ inventoryUnfound.clear()
+ adding = true
+ }
+
+ @SubscribeEvent(priority = EventPriority.HIGH)
+ fun onSlotClick(event: SlotClickEvent) {
+ if (!inInventory || !RiftAPI.inRift()) return
+
+ if (event.slotId == 31 && inventoryUnfound.isNotEmpty()) {
+ event.usePickblockInstead()
+ if (adding) {
+ trackedSouls.addAll(inventoryUnfound)
+ adding = false
+ } else {
+ trackedSouls.removeAll(inventoryUnfound)
+ adding = true
+ }
+ }
+
+ val split = event.slot.stack.displayName.split("Enigma: ")
+ if (split.size == 2) {
+ event.usePickblockInstead()
+ if (soulLocations.contains(split.last())) {
+ if (!trackedSouls.contains(split.last())) {
+ LorenzUtils.chat("§5Tracking the ${split.last()} Enigma Soul!")
+ trackedSouls.add(split.last())
+ } else {
+ trackedSouls.remove(split.last())
+ LorenzUtils.chat("§5No longer tracking the ${split.last()} Enigma Soul!")
+ }
+ }
+ }
+ }
+
+ @SubscribeEvent(priority = EventPriority.LOWEST)
+ fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
+ if (!RiftAPI.inRift() || !inInventory) return
+
+ if (event.gui !is GuiChest) return
+ val guiChest = event.gui
+ val chest = guiChest.inventorySlots as ContainerChest
+
+ for (slot in chest.inventorySlots) {
+ if (slot == null) continue
+ val stack = slot.stack ?: continue
+
+ for (soul in trackedSouls) {
+ if (stack.displayName.removeColor().contains(soul)) {
+ slot highlight LorenzColor.DARK_PURPLE
+ }
+ }
+ }
+ if (!adding) {
+ chest.inventorySlots[31] highlight LorenzColor.DARK_PURPLE
+ }
+ }
+
+ @SubscribeEvent
+ fun onRenderWorld(event: RenderWorldLastEvent) {
+ if (!RiftAPI.inRift()) return
+ for (soul in trackedSouls) {
+ soulLocations[soul]?.let {
+ event.drawWaypointFilled(it, LorenzColor.DARK_PURPLE.toColor(), seeThroughBlocks = true, beacon = true)
+ event.drawDynamicText(it.add(0, 1, 0), "§5$soul Soul", 1.5)
+ }
+ }
+ }
+
+ @SubscribeEvent
+ fun onRepoReload(event: RepositoryReloadEvent) {
+ val data = event.getConstant<EnigmaSoulsJson>("EnigmaSouls") ?: return
+ val areas = data.areas ?: error("'areas' is null in EnigmaSouls!")
+ soulLocations.clear()
+ for ((area, locations) in areas) {
+ for (location in locations) {
+ soulLocations[location.name] = location.position
+ }
+ }
+ }
+
+ @SubscribeEvent
+ fun onChat(event: LorenzChatEvent) {
+ if (!RiftAPI.inRift()) return
+ val message = event.message.removeColor().trim()
+ if (message == "You have already found that Enigma Soul!" || message == "SOUL! You unlocked an Enigma Soul!") {
+ hideClosestSoul()
+ }
+ }
+
+ private fun hideClosestSoul() {
+ var closestSoul = ""
+ var closestDistance = 8.0
+
+ for ((soul, location) in soulLocations) {
+ if (location.distanceToPlayer() < closestDistance) {
+ closestSoul = soul
+ closestDistance = location.distanceToPlayer()
+ }
+ }
+ if (closestSoul in trackedSouls) {
+ trackedSouls.remove(closestSoul)
+ LorenzUtils.chat("§5Found the $closestSoul Enigma Soul!")
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java
new file mode 100644
index 000000000..23179f5df
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java
@@ -0,0 +1,19 @@
+package at.hannibal2.skyhanni.utils.jsonobjects;
+
+import at.hannibal2.skyhanni.utils.LorenzVec;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Map;
+
+public class EnigmaSoulsJson {
+ @Expose
+ public Map<String, List<EnigmaPosition>> areas;
+
+ public static class EnigmaPosition {
+ @Expose
+ public String name;
+ @Expose
+ public LorenzVec position;
+ }
+} \ No newline at end of file