Skip to content

Commit

Permalink
I think this fixes it but idk
Browse files Browse the repository at this point in the history
  • Loading branch information
@TakoTheDev
TakoTheDev committed Sep 24, 2024
1 parent 08300da commit 9b0acf1
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 93 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gg/skytils/skytilsmod/tweaker/EssentialPlatformSetup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import static gg.skytils.skytilsmod.tweaker.TweakerUtil.*;

public class EssentialPlatformSetup {
private static final String[] dataURLCandidates = {System.getProperty("skytils.dataURL"), Reference.dataUrl, "https://skytilsmod-data.pages.dev/", "https://cdn.jsdelivr.net/gh/Skytils/SkytilsMod-Data@main/", "https://mirror.ghproxy.com/https://raw.githubusercontent.com/Skytils/SkytilsMod-Data/main/"};
private static final String[] dataURLCandidates = {"https://cdn.jsdelivr.net/gh/TakoTheDev/SkytilsMod-Data@main/", System.getProperty("skytils.dataURL"), Reference.dataUrl, "https://skytilsmod-data.pages.dev/", "https://cdn.jsdelivr.net/gh/Skytils/SkytilsMod-Data@main/", "https://mirror.ghproxy.com/https://raw.githubusercontent.com/Skytils/SkytilsMod-Data/main/"};

private static boolean trySetDataUrl(String url) {
if (url == null) return false;
Expand Down
166 changes: 74 additions & 92 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/TriviaSolver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,9 @@ import gg.skytils.skytilsmod.core.DataFetcher
import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
import gg.skytils.skytilsmod.features.impl.dungeons.DungeonTimer
import gg.skytils.skytilsmod.features.impl.funny.Funny
import gg.skytils.skytilsmod.utils.SuperSecretSettings
import gg.skytils.skytilsmod.utils.Utils
import gg.skytils.skytilsmod.utils.startsWithAny
import gg.skytils.skytilsmod.utils.stripControlCodes
import net.minecraft.block.BlockButtonStone
import gg.skytils.skytilsmod.listeners.DungeonListener
import gg.skytils.skytilsmod.utils.*
import net.minecraft.entity.item.EntityArmorStand
import net.minecraft.init.Blocks
import net.minecraft.util.BlockPos
import net.minecraft.util.ChatComponentText
import net.minecraft.util.EnumFacing
import net.minecraftforge.client.event.ClientChatReceivedEvent
Expand All @@ -45,118 +40,105 @@ import org.lwjgl.input.Keyboard
import kotlin.math.floor

object TriviaSolver {
private val questionStartRegex = Regex("§r§f {32}§r§6§lQuestion #\\d§r")
private val answerRegex = Regex("§r§6 (?<type>[ⓐⓑⓒ]) §a(?<answer>[\\w ]+)§r")

val triviaSolutions = hashMapOf<String, List<String>>()
var triviaAnswers: List<String>? = null
var triviaAnswer: String? = null

private var lines = mutableListOf<String>()
private var trackLines = false
private var fullQuestion: String? = null
private var correctAnswers = mutableListOf<String>()
private var correctAnswer: String? = null

@SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
fun onChat(event: ClientChatReceivedEvent) {
if (event.type == 2.toByte()) return
val unformatted = event.message.unformattedText.stripControlCodes()
if (event.type == 2.toByte() || !Skytils.config.triviaSolver || !Utils.inDungeons || !DungeonListener.missingPuzzles.contains(
"Quiz"
)
) return
val formatted = event.message.formattedText
if (Skytils.config.triviaSolver && Utils.inDungeons) {
if (unformatted.startsWith("[STATUE] Oruo the Omniscient: ") && unformatted.contains("answered Question #") && unformatted.endsWith(
"correctly!"
)
) triviaAnswer = null
if (unformatted == "[STATUE] Oruo the Omniscient: I am Oruo the Omniscient. I have lived many lives. I have learned all there is to know." && triviaSolutions.size == 0) {
UChat.chat("$failPrefix §cSkytils failed to load solutions for Trivia.")
DataFetcher.reloadData()
}
if (unformatted.trim() == "What SkyBlock year is it?") {
val currentTime =
(if (DungeonTimer.dungeonStartTime > 0L) DungeonTimer.dungeonStartTime else System.currentTimeMillis()) / 1000.0
val diff = floor(currentTime - 1560276000)
val year = (diff / 446400 + 1).toInt()
triviaAnswers = listOf("Year $year")
} else {
triviaSolutions.entries.find {
unformatted.contains(it.key)
}?.let {
triviaAnswers = it.value
}
}

if (triviaAnswers != null && formatted.trim().startsWithAny("§r§6 ⓐ", "§r§6 ⓑ", "§r§6 ⓒ")) {
triviaAnswers!!.find {
formatted.endsWith("§a$it§r") && (!SuperSecretSettings.bennettArthur || Funny.ticks % 2 == 0)
}.also {
if (it == null) {
event.message = ChatComponentText(formatted.replace("§a", "§c"))
if (formatted == "§r§4[STATUE] Oruo the Omniscient§r§f: §r§fI am §r§4Oruo the Omniscient§r§f. I have lived many lives. I have learned all there is to know.§r" && triviaSolutions.size == 0) {
UChat.chat("$failPrefix §cSkytils failed to load solutions for Quiz.")
DataFetcher.reloadData()
}

if (questionStartRegex.matches(formatted)) {
println("XDX: NEW QUESTION DETECTED, CLEARING DATA AND TRACKING LINES")
reset(trackLines = true)
}

if (trackLines) {
println("XDX: TRACKED LINE")
lines.add(formatted)

answerRegex.find(formatted)?.destructured?.let { (type, answer) ->
println("XDX: TRACKED ANSWER")
if (type == "ⓐ") {
fullQuestion = lines.subList(1, lines.size - 2).joinToString(" ") { it.stripControlCodes().trim() }
println("XDX: FULL QUESTION IS: \"${fullQuestion}\"")

if (fullQuestion == "What SkyBlock year is it?") {
val currentTime =
(if (DungeonTimer.dungeonStartTime > 0L) DungeonTimer.dungeonStartTime else System.currentTimeMillis()) / 1000.0
val diff = floor(currentTime - 1560276000)
val year = (diff / 446400 + 1).toInt()
correctAnswers.add("Year $year")
} else {
triviaAnswer = it
triviaSolutions.entries.find {
fullQuestion == it.key
}?.let {
println("XDX: FOUND ANSWERS: ${it.value.joinToString(", ")}")
correctAnswers.addAll(it.value)
}
}
}
}
}
}

//@SubscribeEvent
fun onPlayerInteract(event: PlayerInteractEvent) {
if (!Utils.inDungeons || !Skytils.config.triviaSolver || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK && event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) return
val block = event.world.getBlockState(event.pos)
if (block.block === Blocks.stone_button) {
if (triviaAnswer != null) {
var answerLabel: EntityArmorStand? = null
for (e in mc.theWorld.loadedEntityList) {
if (e !is EntityArmorStand) continue
if (!e.hasCustomName()) continue
val name = e.customNameTag
if (name.contains(triviaAnswer!!) && (name.contains("ⓐ") || name.contains("ⓑ") || name.contains("ⓒ"))) {
answerLabel = e
break
}
if (!SuperSecretSettings.bennettArthur || Funny.ticks % 2 == 0) {
if (!correctAnswers.any { it == answer }) {
println("XDX: REPLACED WRONG ANSWER COLOR")
event.message = ChatComponentText(formatted.replace("§a", "§c"))
} else correctAnswer = answer
}
if (answerLabel != null) {
println("Found Answer Marker " + answerLabel.customNameTag + " at " + answerLabel.posX + ", " + answerLabel.posY + ", " + answerLabel.posZ)
val buttonBlock = BlockPos(answerLabel.posX, 70.0, answerLabel.posZ)
val blockBehind = BlockPos(event.pos.offset(block.getValue(BlockButtonStone.FACING).opposite))
if (mc.theWorld.getBlockState(buttonBlock).block === Blocks.double_stone_slab && mc.theWorld.getBlockState(
blockBehind
).block === Blocks.double_stone_slab && buttonBlock != blockBehind
) {
var isRight = false
for (dir in EnumFacing.HORIZONTALS) {
if (buttonBlock.offset(dir) == event.pos) {
isRight = true
break
}
}
if (!isRight) {
println("Wrong button clicked, position: " + event.pos.x + ", " + event.pos.y + ", " + event.pos.z)
if (!(Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL))) {
event.isCanceled = true
}
}
}

if (type == "ⓒ") {
println("XDX: STOPPED TRACKING LINES")
trackLines = false
}
}
}
}

@SubscribeEvent
fun onRenderArmorStandPre(event: RenderLivingEvent.Pre<EntityArmorStand?>) {
if (Skytils.config.triviaSolver && triviaAnswer != null) {
if (event.entity is EntityArmorStand) {
val name = event.entity.customNameTag
if (name.isNotEmpty() && name.contains("ⓐ") || name.contains("ⓑ") || name.contains("ⓒ")) {
if (!name.contains(triviaAnswer!!)) {
event.isCanceled = true
}
}
}
fun onRenderArmorStandPre(event: RenderLivingEvent.Pre<EntityArmorStand>) {
val answer = correctAnswer ?: return
if (!Skytils.config.triviaSolver || !DungeonListener.missingPuzzles.contains("Quiz") || event.entity !is EntityArmorStand) return

val name = event.entity.customNameTag

//TODO: Maybe make this a bit better idk
if (name.isNotEmpty() && name.containsAny("ⓐ", "ⓑ", "ⓒ") && !name.contains(answer)) {
event.isCanceled = true
}
}

@SubscribeEvent
fun onWorldChange(event: WorldEvent.Unload) {
triviaAnswer = null
reset()
}

@SubscribeEvent
fun onPuzzleReset(event: DungeonEvent.PuzzleEvent.Reset) {
if (event.puzzle == "Quiz") {
triviaAnswer = null
reset()
}
}

private fun reset(trackLines: Boolean = false) {
lines.clear()
this.trackLines = trackLines
fullQuestion = null
correctAnswers.clear()
}
}

0 comments on commit 9b0acf1

Please sign in to comment.