Fix build on 1.20.1

IrisShaders · Jun 29, 2024 · 6c20dcd · 6c20dcd
1 parent cdca0a2
commit 6c20dcd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer_SkipRendering.java b/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer_SkipRendering.java
@@ -65,8 +65,8 @@ private Iterable<Entity> skipRenderEntities(ClientLevel instance, Operation<Iter
 		}
 	}
 
-	@Redirect(method = "renderLevel", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderChunksInFrustum:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;"))
-	private ObjectArrayList<LevelRenderer.RenderChunkInfo> skipLocalBlockEntities(LevelRenderer instance, Operation<ObjectArrayList<SectionRenderDispatcher.RenderSection>> original) {
+	@WrapOperation(method = "renderLevel", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderChunksInFrustum:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;"))
+	private ObjectArrayList<LevelRenderer.RenderChunkInfo> skipLocalBlockEntities(LevelRenderer instance, Operation<ObjectArrayList<LevelRenderer.RenderChunkInfo>> original) {
 		if (Iris.getPipelineManager().getPipelineNullable() instanceof IrisRenderingPipeline pipeline && pipeline.skipAllRendering()) {
 			return EMPTY_LIST;
 		} else {

diff --git a/src/main/java/net/irisshaders/iris/mixin/MixinQuickPlayDev.java b/src/main/java/net/irisshaders/iris/mixin/MixinQuickPlayDev.java
@@ -3,10 +3,12 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.DisconnectedScreen;
+import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
 import net.minecraft.client.quickplay.QuickPlay;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.GameType;
@@ -28,9 +30,10 @@ public class MixinQuickPlayDev {
 
 			if (!minecraft.getLevelSource().levelExists(string)) {
 				minecraft.createWorldOpenFlows().createFreshLevel(string, new LevelSettings(string, GameType.CREATIVE, false, Difficulty.HARD, true, new GameRules(), WorldDataConfiguration.DEFAULT),
-					WorldOptions.defaultWithRandomSeed(), WorldPresets::createNormalWorldDimensions, Minecraft.getInstance().screen);
+					WorldOptions.defaultWithRandomSeed(), WorldPresets::createNormalWorldDimensions);
 			} else {
-				minecraft.createWorldOpenFlows().checkForBackupAndLoad(string, () -> minecraft.setScreen(new TitleScreen()));
+				minecraft.forceSetScreen(new GenericDirtMessageScreen(Component.translatable("selectWorld.data_read")));
+				minecraft.createWorldOpenFlows().loadLevel(new TitleScreen(), string);
 			}
 		}
 	}