Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@SubAt0m1c
SubAt0m1c committed Dec 31, 2024
2 parents fca6783 + 531a0ff commit da914c9
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 28 deletions.
58 changes: 31 additions & 27 deletions src/main/kotlin/me/odinmain/features/impl/floor7/p3/TerminalSolver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import net.minecraft.network.play.server.S2FPacketSetSlot
import net.minecraftforge.event.entity.player.ItemTooltipEvent
import net.minecraftforge.fml.common.Loader
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
import org.lwjgl.input.Keyboard
import java.util.concurrent.CopyOnWriteArrayList

Expand Down Expand Up @@ -95,6 +94,7 @@ object TerminalSolver : Module(
val melodyCorrectRowColor by ColorSetting("Melody Correct Row Color", Color.WHITE.withAlpha(0.75f), true, description = "Color of the whole row for melody.").withDependency { showColors && !cancelMelodySolver }

data class Terminal(val type: TerminalTypes, val solution: CopyOnWriteArrayList<Int> = CopyOnWriteArrayList(), val items: Array<ItemStack?> = emptyArray(), val guiName: String = "", val timeOpened: Long = System.currentTimeMillis(), var clickedSlot: Pair<Int, Long>? = null)
private val terminalActivatedRegex = Regex("(.{1,16}) activated a terminal! \\((\\d)/(\\d)\\)")
var currentTerm = Terminal(TerminalTypes.NONE)
private set
var lastTermOpened = Terminal(TerminalTypes.NONE)
Expand Down Expand Up @@ -168,6 +168,14 @@ object TerminalSolver : Module(
onPacket(S2EPacketCloseWindow::class.java) {
leftTerm()
}

onMessage(terminalActivatedRegex) { message ->
if (terminalActivatedRegex.find(message)?.groupValues?.get(1) == mc.thePlayer.name) TerminalEvent.Solved(lastTermOpened).postAndCatch()
}

execute(50) {
if (enabled && currentTerm.clickedSlot?.second?.let { System.currentTimeMillis() - it > 600 } == true) currentTerm.clickedSlot = null
}
}

@SubscribeEvent
Expand Down Expand Up @@ -203,19 +211,26 @@ object TerminalSolver : Module(
@SubscribeEvent
fun drawSlot(event: GuiEvent.DrawSlot) {
if (!enabled || renderType == 3 || currentTerm.type == TerminalTypes.NONE || (currentTerm.type == TerminalTypes.MELODY && cancelMelodySolver)) return
if (event.slot.slotIndex !in currentTerm.solution && event.slot.slotIndex <= (event.gui.inventorySlots?.inventorySlots?.size ?: 0) - 37 && getShouldBlockWrong() && event.slot.inventory !is InventoryPlayer) event.isCanceled = true
if (event.slot.slotIndex !in currentTerm.solution || event.slot.slotIndex > (event.gui.inventorySlots?.inventorySlots?.size ?: 0) - 37 || event.slot.inventory is InventoryPlayer) return

val slotIndex = event.slot.slotIndex
val inventorySize = event.gui.inventorySlots?.inventorySlots?.size ?: 0

if (slotIndex !in currentTerm.solution && slotIndex <= inventorySize - 37 && getShouldBlockWrong() && event.slot.inventory !is InventoryPlayer) event.isCanceled = true
if (slotIndex !in currentTerm.solution || slotIndex > inventorySize - 37 || event.slot.inventory is InventoryPlayer) return

val zLevel = if (renderType == 2 && currentTerm.type.equalsOneOf(TerminalTypes.STARTS_WITH, TerminalTypes.SELECT)) 0f else 400f

translate(0f, 0f, zLevel)
GlStateManager.disableLighting()
GlStateManager.enableDepth()
val cancel = event.slot.slotIndex == currentTerm.clickedSlot?.first && hideClicked
when {
currentTerm.type == TerminalTypes.PANES && renderType != 1 && !cancel -> Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, panesColor.rgba)
currentTerm.type == TerminalTypes.RUBIX -> {
val needed = currentTerm.solution.count { it == event.slot.slotIndex }

val cancel = slotIndex == currentTerm.clickedSlot?.first && hideClicked

when (currentTerm.type) {
TerminalTypes.PANES -> if (renderType != 1 && !cancel) Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, panesColor.rgba)

TerminalTypes.RUBIX -> {
val needed = currentTerm.solution.count { it == slotIndex }
val realNeeded = if (!cancel) needed else when (needed) {
3 -> 4
4 -> 0
Expand All @@ -235,7 +250,7 @@ object TerminalSolver : Module(
mcText(text.toString(), event.x + 8f - getMCTextWidth(text.toString()) / 2, event.y + 4.5, 1, textColor, center = false)
}
}
currentTerm.type == TerminalTypes.ORDER -> {
TerminalTypes.ORDER -> {
val index = currentTerm.solution.indexOf(event.slot.slotIndex) + if (currentTerm.clickedSlot != null && hideClicked) -1 else 0
if (index != -1) {
if (index < 3) {
Expand All @@ -247,20 +262,22 @@ object TerminalSolver : Module(
Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, color)
event.isCanceled = true
}
val amount = event.slot.stack?.stackSize ?: 0
mcText(amount.toString(), event.x + 8.5f - getMCTextWidth(amount.toString()) / 2, event.y + 4.5f, 1, textColor, center = false)
val amount = event.slot.stack?.stackSize?.toString() ?: ""
mcText(amount, event.x + 8.5f - getMCTextWidth(amount) / 2, event.y + 4.5f, 1, textColor, center = false)
}
}
currentTerm.type == TerminalTypes.STARTS_WITH && !cancel && (renderType != 1 || (renderType == 1 && !removeWrong)) -> Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, startsWithColor.rgba)
currentTerm.type == TerminalTypes.SELECT && !cancel && (renderType != 1 || (renderType == 1 && !removeWrong)) -> Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, startsWithColor.rgba)
currentTerm.type == TerminalTypes.MELODY && (renderType != 1 || (renderType == 1 && !removeWrong)) -> {
TerminalTypes.STARTS_WITH, TerminalTypes.SELECT ->
if (!cancel && (renderType != 1 || (renderType == 1 && !removeWrong))) Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, startsWithColor.rgba)

TerminalTypes.MELODY -> if (renderType != 1 || (renderType == 1 && !removeWrong)) {
val colorMelody = when {
event.slot.stack?.metadata == 5 && Item.getIdFromItem(event.slot.stack.item) == 160 -> melodyRowColor
event.slot.stack?.metadata == 2 && Item.getIdFromItem(event.slot.stack.item) == 160 -> melodyColumColor
else -> melodyPressColor
}.rgba
Gui.drawRect(event.x, event.y, event.x + 16, event.y + 16, colorMelody)
}
else -> {}
}
GlStateManager.enableLighting()
translate(0f, 0f, -zLevel)
Expand Down Expand Up @@ -311,19 +328,6 @@ object TerminalSolver : Module(
if (enabled && currentTerm.type == TerminalTypes.ORDER && (event.stack?.item?.registryName ?: return) == "minecraft:stained_glass_pane") event.isCanceled = true
}

@SubscribeEvent
fun onTick(event: ClientTickEvent) {
if (enabled && currentTerm.clickedSlot?.second?.let { System.currentTimeMillis() - it > 600 } == true) currentTerm.clickedSlot = null
}

private val terminalActivatedRegex = Regex("(.{1,16}) activated a terminal! \\((\\d)/(\\d)\\)")

init {
onMessage(terminalActivatedRegex) { message ->
if (terminalActivatedRegex.find(message)?.groupValues?.get(1) == mc.thePlayer.name) TerminalEvent.Solved(lastTermOpened).postAndCatch()
}
}

private fun leftTerm() {
if (currentTerm.type == TerminalTypes.NONE) return
devMessage("§cLeft terminal: §6${currentTerm.type.name}")
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/me/odinmain/features/impl/floor7/p3/termGUI/OrderGui.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object OrderGui : TermGui() {
val col = pane % 9 - 2
val amount = currentTerm.items[pane]?.stackSize ?: return@forEach
val index = if (currentTerm.clickedSlot != null && hideClicked) currentTerm.solution.indexOf(pane) -1 else currentTerm.solution.indexOf(pane)
if (index > -1 && index < 3) {
if (index in 0 until 3) {
val color = when (index) {
0 -> orderColor
1 -> orderColor2
Expand Down

0 comments on commit da914c9

Please sign in to comment.