FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix client crash introduced in the 23w42a port

Browse source
This commit is contained in:
modmuss50 2023-10-18 18:13:34 +01:00
parent 2148f3b922
commit 77996a0c10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MinecraftClientMixin.java
View file

@ -86,7 +86,7 @@ abstract class MinecraftClientMixin {
// The LevelLoadingScreen is the odd screen that isn't ticked by the main tick loop, so we fire events for this screen.
// We Coerce the package-private inner class representing the world load action so we don't need an access widener.
@Inject(method = "startIntegratedServer(Ljava/lang/String;Lnet/minecraft/world/level/storage/LevelStorage$Session;Lnet/minecraft/resource/ResourcePackManager;Lnet/minecraft/server/SaveLoader;Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/LevelLoadingScreen;tick()V"))
@Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/LevelLoadingScreen;tick()V"))
private void beforeLoadingScreenTick(CallbackInfo ci) {
// Store the screen in a variable in case someone tries to change the screen during this before tick event.
// If someone changes the screen, the after tick event will likely have class cast exceptions or throw a NPE.
@ -94,7 +94,7 @@ abstract class MinecraftClientMixin {
ScreenEvents.beforeTick(this.tickingScreen).invoker().beforeTick(this.tickingScreen);
}
@Inject(method = "startIntegratedServer(Ljava/lang/String;Lnet/minecraft/world/level/storage/LevelStorage$Session;Lnet/minecraft/resource/ResourcePackManager;Lnet/minecraft/server/SaveLoader;Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;render(Z)V"))
@Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;render(Z)V"))
private void afterLoadingScreenTick(CallbackInfo ci) {
ScreenEvents.afterTick(this.tickingScreen).invoker().afterTick(this.tickingScreen);
// Finally set the currently ticking screen to null

4
gradle.properties
View file

@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true
version=0.90.2
version=0.90.3
minecraft_version=23w42a
yarn_version=+build.1
loader_version=0.14.23
@ -55,7 +55,7 @@ fabric-rendering-v0-version=1.1.51
fabric-rendering-v1-version=3.0.10
fabric-resource-conditions-api-v1-version=2.3.10
fabric-resource-loader-v0-version=0.11.12
fabric-screen-api-v1-version=2.0.11
fabric-screen-api-v1-version=2.0.12
fabric-screen-handler-api-v1-version=1.3.42
fabric-sound-api-v1-version=1.0.14
fabric-transfer-api-v1-version=4.0.1