Skip to content

Commit

Permalink
feat!: add crystal hollows waypoint sharing
Browse files Browse the repository at this point in the history
  • Loading branch information
@My-Name-Is-Jeff
My-Name-Is-Jeff committed May 23, 2024
1 parent 86470ce commit 481ead6
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 19 deletions.
70 changes: 57 additions & 13 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,17 @@ import gg.skytils.skytilsmod.Skytils
import gg.skytils.skytilsmod.Skytils.Companion.mc
import gg.skytils.skytilsmod.Skytils.Companion.prefix
import gg.skytils.skytilsmod.core.structure.GuiElement
import gg.skytils.skytilsmod.events.impl.HypixelPacketEvent
import gg.skytils.skytilsmod.events.impl.PacketEvent
import gg.skytils.skytilsmod.features.impl.handlers.MayorInfo
import gg.skytils.skytilsmod.utils.*
import gg.skytils.skytilsmod.utils.graphics.colors.ColorFactory
import gg.skytils.skytilsws.client.WSClient
import gg.skytils.skytilsws.shared.packet.C2SPacketCHWaypoint
import gg.skytils.skytilsws.shared.packet.C2SPacketCHWaypointsSubscribe
import gg.skytils.skytilsws.shared.structs.CHWaypointType
import kotlinx.coroutines.launch
import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket
import net.minecraft.client.entity.EntityOtherPlayerMP
import net.minecraft.client.renderer.GlStateManager
import net.minecraft.client.renderer.vertex.DefaultVertexFormats
Expand All @@ -47,6 +54,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
import kotlin.jvm.optionals.getOrNull

object CHWaypoints {
var lastTPLoc: BlockPos? = null
Expand All @@ -58,6 +66,22 @@ object CHWaypoints {
Regex(".*?(?<user>[a-zA-Z0-9_]{3,16}):.*?(?<x>[0-9]{1,3}),? (?:y: )?(?<y>[0-9]{1,3}),? (?:z: )?(?<z>[0-9]{1,3}).*?")
private val xzPattern =
Regex(".*(?<user>[a-zA-Z0-9_]{3,16}):.* (?<x>[0-9]{1,3}),? (?<z>[0-9]{1,3}).*")
val chWaypointsList = hashMapOf<String, CHInstance>()
class CHInstance {
val waypoints = hashMapOf<CHWaypointType, BlockPos>()
}


@SubscribeEvent
fun onHypixelPacket(event: HypixelPacketEvent.ReceiveEvent) {
if (event.packet is ClientboundLocationPacket) {
if (event.packet.mode.getOrNull() == SkyblockIsland.CrystalHollows.mode) {
Skytils.IO.launch {
WSClient.sendPacket(C2SPacketCHWaypointsSubscribe(event.packet.serverName))
}
}
}
}

@SubscribeEvent
fun onReceivePacket(event: PacketEvent.ReceiveEvent) {
Expand Down Expand Up @@ -187,7 +211,14 @@ object CHWaypoints {
mc.thePlayer.canEntityBeSeen(event.entity) &&
event.entity.baseMaxHealth == if (MayorInfo.mayorPerks.contains("DOUBLE MOBS HP!!!")) 2_000_000.0 else 1_000_000.0
) {
waypoints["Corleone"] = event.entity.position
if (!CrystalHollowsMap.Locations.Corleone.loc.exists()) {
CrystalHollowsMap.Locations.Corleone.apply {
loc.set()
Skytils.IO.launch {
WSClient.sendPacket(C2SPacketCHWaypoint(serverId = SBInfo.location, serverTime = mc.theWorld.worldTime, packetType, loc.locX!!.toInt(), loc.locY!!.toInt(), loc.locZ!!.toInt()))
}
}
} else CrystalHollowsMap.Locations.Corleone.loc.set()
}
}

Expand All @@ -197,30 +228,43 @@ object CHWaypoints {
if ((Skytils.config.crystalHollowWaypoints || Skytils.config.crystalHollowMapPlaces) && SBInfo.mode == SkyblockIsland.CrystalHollows.mode
&& waypointDelayTicks == 0 && mc.thePlayer != null
) {
CrystalHollowsMap.Locations.cleanNameToLocation[SBInfo.location]?.loc?.set()
CrystalHollowsMap.Locations.cleanNameToLocation[SBInfo.location]?.let {
if (!it.loc.exists()) {
it.loc.set()
Skytils.IO.launch {
WSClient.sendPacket(C2SPacketCHWaypoint(serverId = SBInfo.location, serverTime = mc.theWorld.worldTime, it.packetType, it.loc.locX!!.toInt(), it.loc.locY!!.toInt(), it.loc.locZ!!.toInt()))
}
} else it.loc.set()
}
} else if (waypointDelayTicks > 0)
waypointDelayTicks--
}

@SubscribeEvent
@SubscribeEvent(priority = EventPriority.HIGHEST)
fun onWorldChange(event: WorldEvent.Unload) {
CrystalHollowsMap.Locations.entries.forEach { it.loc.reset() }
val instance = chWaypointsList.getOrPut(SBInfo.server ?: "") { CHInstance() }
CrystalHollowsMap.Locations.entries.forEach {
if (it.loc.exists()) {
instance.waypoints[it.packetType] = BlockPos(it.loc.locX!!, it.loc.locY!!, it.loc.locZ!!)
}
it.loc.reset()
}
waypoints.clear()
}


class CrystalHollowsMap : GuiElement(name = "Crystal Hollows Map", x = 0, y = 0) {
val mapLocation = ResourceLocation("skytils", "crystalhollowsmap.png")

enum class Locations(val displayName: String, val id: String, val color: Int, val size: Int = 50) {
LostPrecursorCity("§fLost Precursor City", "internal_city", ColorFactory.WHITE.rgb),
JungleTemple("§aJungle Temple", "internal_temple", ColorFactory.GREEN.rgb),
GoblinQueensDen("§eGoblin Queen's Den", "internal_den", ColorFactory.YELLOW.rgb),
MinesOfDivan("§9Mines of Divan", "internal_mines", ColorFactory.BLUE.rgb),
KingYolkar("§6King Yolkar", "internal_king", ColorFactory.ORANGE.rgb, 25),
KhazadDum("§cKhazad-dûm", "internal_bal", ColorFactory.RED.rgb),
FairyGrotto("§dFairy Grotto", "internal_fairy", ColorFactory.PINK.rgb, 26),
Corleone("§bCorleone", "internal_corleone", ColorFactory.AQUA.rgb, 26);
enum class Locations(val displayName: String, val id: String, val color: Int, val packetType: CHWaypointType, val size: Int = 50) {
LostPrecursorCity("§fLost Precursor City", "internal_city", ColorFactory.WHITE.rgb, CHWaypointType.LostPrecursorCity),
JungleTemple("§aJungle Temple", "internal_temple", ColorFactory.GREEN.rgb, CHWaypointType.JungleTemple),
GoblinQueensDen("§eGoblin Queen's Den", "internal_den", ColorFactory.YELLOW.rgb, CHWaypointType.GoblinQueensDen),
MinesOfDivan("§9Mines of Divan", "internal_mines", ColorFactory.BLUE.rgb, CHWaypointType.MinesOfDivan),
KingYolkar("§6King Yolkar", "internal_king", ColorFactory.ORANGE.rgb, CHWaypointType.KingYolkar,25),
KhazadDum("§cKhazad-dûm", "internal_bal", ColorFactory.RED.rgb, CHWaypointType.KhazadDum),
FairyGrotto("§dFairy Grotto", "internal_fairy", ColorFactory.PINK.rgb, CHWaypointType.FairyGrotto, 26),
Corleone("§bCorleone", "internal_corleone", ColorFactory.AQUA.rgb, CHWaypointType.Corleone, 26);

val loc = LocationObject()
val cleanName = displayName.stripControlCodes()
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/gg/skytils/skytilsmod/listeners/DungeonListener.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import gg.skytils.skytilsws.client.WSClient
import gg.skytils.skytilsws.shared.packet.C2SPacketDungeonEnd
import gg.skytils.skytilsws.shared.packet.C2SPacketDungeonRoom
import gg.skytils.skytilsws.shared.packet.C2SPacketDungeonRoomSecret
import gg.skytils.skytilsws.shared.packet.C2SPacketStartDungeon
import gg.skytils.skytilsws.shared.packet.C2SPacketDungeonStart
import kotlinx.coroutines.async
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -212,7 +212,7 @@ object DungeonListener {
}
val partyMembers = party.await().members.ifEmpty { setOf(mc.thePlayer.uniqueID) }.mapTo(hashSetOf()) { it.toString() }
val entrance = DungeonInfo.uniqueRooms.first { it.mainRoom.data.type == RoomType.ENTRANCE }
WSClient.sendPacket(C2SPacketStartDungeon(
WSClient.sendPacket(C2SPacketDungeonStart(
serverId = SBInfo.server ?: return@launch,
floor = DungeonFeatures.dungeonFloor!!,
members = partyMembers,
Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializable
import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import net.hypixel.modapi.HypixelModAPI
import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket
import net.minecraft.client.gui.inventory.GuiChest
import net.minecraft.inventory.ContainerChest
Expand Down Expand Up @@ -84,7 +83,7 @@ object SBInfo {
lastLocationPacket = null
}

@SubscribeEvent
@SubscribeEvent(priority = EventPriority.HIGH)
fun onHypixelPacket(event: HypixelPacketEvent.ReceiveEvent) {
if (event.packet is ClientboundLocationPacket) {
Utils.checkThreadAndQueue {
Expand Down
26 changes: 26 additions & 0 deletions src/main/kotlin/gg/skytils/skytilsws/client/PacketHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@ import gg.skytils.skytilsmod.features.impl.dungeons.catlas.core.map.Room
import gg.skytils.skytilsmod.features.impl.dungeons.catlas.core.map.Unknown
import gg.skytils.skytilsmod.features.impl.dungeons.catlas.handlers.DungeonInfo
import gg.skytils.skytilsmod.features.impl.dungeons.catlas.utils.ScanUtils
import gg.skytils.skytilsmod.features.impl.mining.CHWaypoints
import gg.skytils.skytilsmod.features.impl.mining.CHWaypoints.CHInstance
import gg.skytils.skytilsmod.features.impl.mining.CHWaypoints.chWaypointsList
import gg.skytils.skytilsmod.utils.SBInfo
import gg.skytils.skytilsws.shared.IPacketHandler
import gg.skytils.skytilsws.shared.SkytilsWS
import gg.skytils.skytilsws.shared.packet.*
import io.ktor.websocket.*
import kotlinx.coroutines.coroutineScope
import net.minecraft.util.BlockPos
import java.util.*

object PacketHandler : IPacketHandler {
Expand Down Expand Up @@ -68,6 +73,27 @@ object PacketHandler : IPacketHandler {
}
}
}
is S2CPacketCHReset -> {
CHWaypoints.waypoints.remove(packet.serverId)
}
is S2CPacketCHWaypoint -> {
if (SBInfo.server == packet.serverId) {
if (mc.theWorld.worldTime < packet.serverTime) {
WSClient.sendPacket(C2SPacketCHReset(packet.serverId))
} else {
CHWaypoints.CrystalHollowsMap.Locations.entries.find { it.packetType == packet.type }?.let {
if (!it.loc.exists()) {
it.loc.locX = packet.x.toDouble()
it.loc.locY = packet.y.toDouble()
it.loc.locZ = packet.z.toDouble()
}
}
}
} else {
val instance = chWaypointsList.getOrPut(SBInfo.server ?: "") { CHInstance() }
instance.waypoints[packet.type] = BlockPos(packet.x, packet.y, packet.z)
}
}
else -> {
session.close(CloseReason(CloseReason.Codes.CANNOT_ACCEPT, "Unknown packet type"))
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gg/skytils/skytilsws/client/WSClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ object WSClient {
suspend fun openConnection() {
if (session != null) error("Session already open")

client.webSocketSession("wss://ws.skytils.gg/ws").apply {
wsClient.webSocketSession("ws://localhost:9998/ws").apply {
session = this
try {
sendSerialized<Packet>(C2SPacketConnect(SkytilsWS.version, Skytils.VERSION))
Expand Down
2 changes: 1 addition & 1 deletion ws-shared
Submodule ws-shared updated 9 files
+0 −2 build.gradle.kts
+1 −1 src/main/kotlin/gg/skytils/skytilsws/shared/SkytilsWS.kt
+24 −0 src/main/kotlin/gg/skytils/skytilsws/shared/packet/C2SPacketCHReset.kt
+25 −0 src/main/kotlin/gg/skytils/skytilsws/shared/packet/C2SPacketCHWaypoint.kt
+24 −0 src/main/kotlin/gg/skytils/skytilsws/shared/packet/C2SPacketCHWaypointsSubscribe.kt
+1 −1 src/main/kotlin/gg/skytils/skytilsws/shared/packet/C2SPacketDungeonStart.kt
+24 −0 src/main/kotlin/gg/skytils/skytilsws/shared/packet/S2CPacketCHReset.kt
+25 −0 src/main/kotlin/gg/skytils/skytilsws/shared/packet/S2CPacketCHWaypoint.kt
+30 −0 src/main/kotlin/gg/skytils/skytilsws/shared/structs/CHWaypointType.kt

0 comments on commit 481ead6

Please sign in to comment.