Skip to content

Commit 6c20dcd

Browse files
committed
Fix build on 1.20.1
1 parent cdca0a2 commit 6c20dcd

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer_SkipRendering.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ private Iterable<Entity> skipRenderEntities(ClientLevel instance, Operation<Iter
6565
}
6666
}
6767

68-
@Redirect(method = "renderLevel", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderChunksInFrustum:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;"))
69-
private ObjectArrayList<LevelRenderer.RenderChunkInfo> skipLocalBlockEntities(LevelRenderer instance, Operation<ObjectArrayList<SectionRenderDispatcher.RenderSection>> original) {
68+
@WrapOperation(method = "renderLevel", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderChunksInFrustum:Lit/unimi/dsi/fastutil/objects/ObjectArrayList;"))
69+
private ObjectArrayList<LevelRenderer.RenderChunkInfo> skipLocalBlockEntities(LevelRenderer instance, Operation<ObjectArrayList<LevelRenderer.RenderChunkInfo>> original) {
7070
if (Iris.getPipelineManager().getPipelineNullable() instanceof IrisRenderingPipeline pipeline && pipeline.skipAllRendering()) {
7171
return EMPTY_LIST;
7272
} else {

src/main/java/net/irisshaders/iris/mixin/MixinQuickPlayDev.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import net.fabricmc.loader.api.FabricLoader;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.client.gui.screens.DisconnectedScreen;
6+
import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
67
import net.minecraft.client.gui.screens.Screen;
78
import net.minecraft.client.gui.screens.TitleScreen;
89
import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
910
import net.minecraft.client.quickplay.QuickPlay;
11+
import net.minecraft.network.chat.Component;
1012
import net.minecraft.world.Difficulty;
1113
import net.minecraft.world.level.GameRules;
1214
import net.minecraft.world.level.GameType;
@@ -28,9 +30,10 @@ public class MixinQuickPlayDev {
2830

2931
if (!minecraft.getLevelSource().levelExists(string)) {
3032
minecraft.createWorldOpenFlows().createFreshLevel(string, new LevelSettings(string, GameType.CREATIVE, false, Difficulty.HARD, true, new GameRules(), WorldDataConfiguration.DEFAULT),
31-
WorldOptions.defaultWithRandomSeed(), WorldPresets::createNormalWorldDimensions, Minecraft.getInstance().screen);
33+
WorldOptions.defaultWithRandomSeed(), WorldPresets::createNormalWorldDimensions);
3234
} else {
33-
minecraft.createWorldOpenFlows().checkForBackupAndLoad(string, () -> minecraft.setScreen(new TitleScreen()));
35+
minecraft.forceSetScreen(new GenericDirtMessageScreen(Component.translatable("selectWorld.data_read")));
36+
minecraft.createWorldOpenFlows().loadLevel(new TitleScreen(), string);
3437
}
3538
}
3639
}

0 commit comments

Comments
 (0)