Skip to content

Commit 05f3256

Browse files
chore: render thread execution (#6836)
`RenderSystem.recordRenderCall` is going to be removed in 1.21.5. To execute task on render thread, use `mc.execute` as `MinecraftClient` is an implementation of `Executor`.
1 parent 59697e5 commit 05f3256

File tree

21 files changed

+52
-68
lines changed

21 files changed

+52
-68
lines changed

src/main/kotlin/net/ccbluex/liquidbounce/deeplearn/listener/OverlayTrainingListener.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ package net.ccbluex.liquidbounce.deeplearn.listener
2323
import ai.djl.training.Trainer
2424
import ai.djl.training.listener.TrainingListener
2525
import ai.djl.training.listener.TrainingListenerAdapter
26-
import com.mojang.blaze3d.systems.RenderSystem
2726
import net.ccbluex.liquidbounce.utils.client.asText
2827
import net.ccbluex.liquidbounce.utils.client.mc
2928
import net.ccbluex.liquidbounce.utils.client.regular
@@ -76,7 +75,7 @@ class OverlayTrainingListener(
7675
.append("".repeat(25 - progress / 4).asText().formatted(Formatting.DARK_GRAY))
7776
.append("]".asText().formatted(Formatting.GRAY))
7877

79-
RenderSystem.recordRenderCall {
78+
mc.execute {
8079
mc.inGameHud.setOverlayMessage(progressBar, false)
8180
}
8281
}

src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/client/client/CommandClientBrowserSubcommand.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package net.ccbluex.liquidbounce.features.command.commands.client.client
2020

21-
import com.mojang.blaze3d.systems.RenderSystem
2221
import net.ccbluex.liquidbounce.features.command.builder.CommandBuilder
2322
import net.ccbluex.liquidbounce.features.command.builder.ParameterBuilder
2423
import net.ccbluex.liquidbounce.integration.BrowserScreen
@@ -39,7 +38,7 @@ object CommandClientBrowserSubcommand {
3938
.build()
4039
).handler {
4140
chat(regular("Opening browser..."))
42-
RenderSystem.recordRenderCall {
41+
mc.execute {
4342
mc.setScreen(BrowserScreen(args[0] as String))
4443
}
4544
}.build()

src/main/kotlin/net/ccbluex/liquidbounce/features/command/commands/module/CommandInvsee.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package net.ccbluex.liquidbounce.features.command.commands.module
2020

21-
import com.mojang.blaze3d.systems.RenderSystem
2221
import net.ccbluex.liquidbounce.features.command.Command
2322
import net.ccbluex.liquidbounce.features.command.CommandException
2423
import net.ccbluex.liquidbounce.features.command.builder.CommandBuilder
@@ -60,7 +59,7 @@ object CommandInvsee : Command.Factory {
6059
throw CommandException(command.result("playerNotFound", inputName))
6160
}
6261

63-
RenderSystem.recordRenderCall {
62+
mc.execute {
6463
mc.setScreen(ViewedInventoryScreen(player))
6564
}
6665

src/main/kotlin/net/ccbluex/liquidbounce/features/misc/HideAppearance.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package net.ccbluex.liquidbounce.features.misc
2020

21-
import com.mojang.blaze3d.systems.RenderSystem
2221
import com.terraformersmc.modmenu.util.mod.Mod
2322
import kotlinx.coroutines.cancel
2423
import net.ccbluex.liquidbounce.api.core.scope
@@ -30,6 +29,7 @@ import net.ccbluex.liquidbounce.event.events.ClientShutdownEvent
3029
import net.ccbluex.liquidbounce.event.events.KeyboardKeyEvent
3130
import net.ccbluex.liquidbounce.event.handler
3231
import net.ccbluex.liquidbounce.features.command.CommandManager
32+
import net.ccbluex.liquidbounce.features.misc.HideAppearance.isHidingNow
3333
import net.ccbluex.liquidbounce.features.module.ModuleManager
3434
import net.ccbluex.liquidbounce.integration.IntegrationListener
3535
import net.ccbluex.liquidbounce.utils.client.Chronometer
@@ -73,7 +73,7 @@ object HideAppearance : EventListener {
7373
var isHidingNow = false
7474
set(value) {
7575
field = value
76-
RenderSystem.recordRenderCall(::updateClient)
76+
mc.execute(::updateClient)
7777

7878
if (modMenuPresent) {
7979
if (value) {

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/movement/ModuleTeleport.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.ccbluex.liquidbounce.features.module.modules.movement
22

3-
import com.mojang.blaze3d.systems.RenderSystem
43
import net.ccbluex.liquidbounce.config.types.NamedChoice
54
import net.ccbluex.liquidbounce.event.events.PacketEvent
65
import net.ccbluex.liquidbounce.event.handler
@@ -52,7 +51,7 @@ object ModuleTeleport : ClientModule("Teleport", Category.EXPLOIT, aliases = arr
5251
chat(warning(message("useCommand")))
5352

5453
// Disables module on next render tick
55-
RenderSystem.recordRenderCall {
54+
mc.execute {
5655
this.enabled = false
5756
}
5857
}

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleClickGui.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package net.ccbluex.liquidbounce.features.module.modules.render
2020

21-
import com.mojang.blaze3d.systems.RenderSystem
2221
import net.ccbluex.liquidbounce.config.types.nesting.ToggleableConfigurable
2322
import net.ccbluex.liquidbounce.event.EventManager
2423
import net.ccbluex.liquidbounce.event.events.*
@@ -58,7 +57,7 @@ object ModuleClickGui :
5857

5958
@Suppress("UnusedPrivateProperty")
6059
private val cache by boolean("Cache", true).onChanged { cache ->
61-
RenderSystem.recordRenderCall {
60+
mc.execute {
6261
if (cache) {
6362
open()
6463
} else {

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleXRay.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package net.ccbluex.liquidbounce.features.module.modules.render
2020

21-
import com.mojang.blaze3d.systems.RenderSystem
2221
import net.ccbluex.liquidbounce.features.command.commands.module.CommandXRay
2322
import net.ccbluex.liquidbounce.features.module.Category
2423
import net.ccbluex.liquidbounce.features.module.ClientModule
@@ -220,7 +219,7 @@ object ModuleXRay : ClientModule("XRay", Category.RENDER) {
220219

221220
@Suppress("UNUSED_PARAMETER")
222221
fun valueChangedReload(it: Any) {
223-
RenderSystem.recordRenderCall {
222+
mc.execute {
224223
// Reload world renderer on block list change
225224
mc.worldRenderer.reload()
226225
}

src/main/kotlin/net/ccbluex/liquidbounce/integration/VirtualScreenType.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
package net.ccbluex.liquidbounce.integration
2323

24-
import com.mojang.blaze3d.systems.RenderCall
25-
import com.mojang.blaze3d.systems.RenderSystem
24+
import com.google.common.base.Predicates
2625
import net.ccbluex.liquidbounce.utils.client.mc
2726
import net.ccbluex.liquidbounce.utils.client.openVfpProtocolSelection
2827
import net.minecraft.client.gui.screen.DisconnectedScreen
@@ -50,9 +49,9 @@ private val Screen.isLunar
5049

5150
enum class VirtualScreenType(
5251
val routeName: String,
53-
private val recognizer: Predicate<Screen> = Predicate { false },
52+
private val recognizer: Predicate<Screen> = Predicates.alwaysFalse(),
5453
val isInGame: Boolean = false,
55-
private val open: RenderCall = RenderCall {
54+
private val open: Runnable = Runnable {
5655
mc.setScreen(VirtualDisplayScreen(byName(routeName)!!))
5756
}
5857
) {
@@ -130,7 +129,7 @@ enum class VirtualScreenType(
130129
recognizer = { it is BrowserScreen }
131130
);
132131

133-
fun open() = RenderSystem.recordRenderCall(open)
132+
fun open() = mc.execute(open)
134133

135134
companion object {
136135
@JvmStatic

src/main/kotlin/net/ccbluex/liquidbounce/integration/backend/BrowserBackendManager.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import net.ccbluex.liquidbounce.integration.backend.browser.GlobalBrowserSetting
2929
import net.ccbluex.liquidbounce.integration.interop.persistant.PersistentLocalStorage
3030
import net.ccbluex.liquidbounce.integration.task.TaskManager
3131
import net.ccbluex.liquidbounce.utils.client.logger
32+
import net.ccbluex.liquidbounce.utils.client.mc
3233
import net.ccbluex.liquidbounce.utils.kotlin.EventPriorityConvention.FIRST_PRIORITY
3334

3435
object BrowserBackendManager : EventListener {
@@ -85,7 +86,7 @@ object BrowserBackendManager : EventListener {
8586
/**
8687
* Causes an update of every browser by re-setting their viewport.
8788
*/
88-
fun forceUpdate() = RenderSystem.recordRenderCall {
89+
fun forceUpdate() = mc.execute {
8990
for (browser in browserBackend.browsers) {
9091
try {
9192
browser.viewport = browser.viewport

src/main/kotlin/net/ccbluex/liquidbounce/integration/backend/backends/cef/CefBrowserBackend.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import net.ccbluex.liquidbounce.utils.client.error.QuickFix
3434
import net.ccbluex.liquidbounce.utils.client.error.errors.JcefIsntCompatible
3535
import net.ccbluex.liquidbounce.utils.client.formatAsCapacity
3636
import net.ccbluex.liquidbounce.utils.client.logger
37+
import net.ccbluex.liquidbounce.utils.client.mc
3738
import net.ccbluex.liquidbounce.utils.kotlin.sortedInsert
3839
import net.ccbluex.liquidbounce.utils.validation.HashValidator
3940
import net.minecraft.util.Util
@@ -97,7 +98,7 @@ class CefBrowserBackend : BrowserBackend, EventListener {
9798

9899
runCatching {
99100
resourceManager.downloadJcef()
100-
RenderSystem.recordRenderCall(whenAvailable)
101+
mc.execute(whenAvailable)
101102
}.onFailure {
102103
ErrorHandler.fatal(
103104
error = it,

0 commit comments

Comments
 (0)