Skip to content

Commit 2b5b325

Browse files
committed
profiler compilation error
Signed-off-by: Octol1ttle <[email protected]>
1 parent df647f4 commit 2b5b325

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistant.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ import ru.octol1ttle.flightassistant.impl.display.HudDisplayHost
1818
object FlightAssistant {
1919
const val MOD_ID: String = "flightassistant"
2020
internal val mc: Minecraft = Minecraft.getInstance()
21+
//? if >=1.21.4 {
22+
/*internal val profiler = net.minecraft.util.profiling.Profiler.get()
23+
*///?} else
24+
internal val profiler = mc.profiler
2125
internal val logger: Logger = LoggerFactory.getLogger("FlightAssistant")
2226
internal var initComplete: Boolean = false
2327

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/ComputerHost.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ru.octol1ttle.flightassistant.impl.computer
33
import net.minecraft.resources.ResourceLocation
44
import ru.octol1ttle.flightassistant.FlightAssistant
55
import ru.octol1ttle.flightassistant.FlightAssistant.mc
6+
import ru.octol1ttle.flightassistant.FlightAssistant.profiler
67
import ru.octol1ttle.flightassistant.api.ModuleController
78
import ru.octol1ttle.flightassistant.api.computer.*
89
import ru.octol1ttle.flightassistant.api.util.FATickCounter
@@ -118,9 +119,9 @@ internal object ComputerHost : ModuleController<Computer>, ComputerBus {
118119
return
119120
}
120121

121-
mc.profiler.push("flightassistant:computer_host")
122+
profiler.push("flightassistant:computer_host")
122123
for ((id: ResourceLocation, computer: Computer) in computers) {
123-
mc.profiler.push(id.toString())
124+
profiler.push(id.toString())
124125
if (!computer.isDisabledOrFaulted()) {
125126
try {
126127
repeat(FATickCounter.ticksPassed) {
@@ -133,9 +134,9 @@ internal object ComputerHost : ModuleController<Computer>, ComputerBus {
133134
FlightAssistant.logger.error("Exception ticking computer with identifier: $id", t)
134135
}
135136
}
136-
mc.profiler.pop()
137+
profiler.pop()
137138
}
138-
mc.profiler.pop()
139+
profiler.pop()
139140
}
140141

141142
@Deprecated("Will be private")

src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/HudDisplayHost.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import net.minecraft.client.gui.GuiGraphics
44
import net.minecraft.network.chat.Component
55
import net.minecraft.resources.ResourceLocation
66
import ru.octol1ttle.flightassistant.FlightAssistant
7-
import ru.octol1ttle.flightassistant.FlightAssistant.mc
7+
import ru.octol1ttle.flightassistant.FlightAssistant.profiler
88
import ru.octol1ttle.flightassistant.api.ModuleController
99
import ru.octol1ttle.flightassistant.api.computer.ComputerBus
1010
import ru.octol1ttle.flightassistant.api.display.Display
@@ -104,7 +104,7 @@ internal object HudDisplayHost: ModuleController<Display> {
104104
return
105105
}
106106

107-
mc.profiler.push("flightassistant:hud_display_host")
107+
profiler.push("flightassistant:hud_display_host")
108108

109109
HudFrame.updateDimensions()
110110
ScreenSpace.updateViewport()
@@ -118,7 +118,7 @@ internal object HudDisplayHost: ModuleController<Display> {
118118
return
119119
}
120120

121-
mc.profiler.push(id.toString())
121+
profiler.push(id.toString())
122122
if (!display.enabled || !RenderMatrices.ready) {
123123
try {
124124
display.renderFaulted(guiGraphics)
@@ -137,8 +137,8 @@ internal object HudDisplayHost: ModuleController<Display> {
137137
display.enabled = false
138138
FlightAssistant.logger.error("Exception rendering display with identifier: $id", t)
139139
}
140-
mc.profiler.pop()
140+
profiler.pop()
141141
}
142-
mc.profiler.pop()
142+
profiler.pop()
143143
}
144144
}

0 commit comments

Comments
 (0)