upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 08:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.19.x] Fix experimental confirmation screen (#8727)

Browse Source 
Signed-off-by: SizableShrimp <sizableshrimp@sizableshrimp.me>
This commit is contained in:
SizableShrimp authored and GitHub committed 2022-06-13 17:20:50 +01:00
1 parent db225ed04a
commit 2818984f6c
4 files changed
+24 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/client/ForgeHooksClient.java
+2 -12
View File
@@ -28,8 +28,6 @@ import net.minecraft.locale.Language;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.*;
import net.minecraft.network.protocol.status.ServerStatus;
import net.minecraft.server.WorldStem;
import net.minecraft.server.packs.repository.PackRepository;
import net.minecraft.util.RandomSource;
import net.minecraft.util.Mth;
import net.minecraft.world.effect.MobEffectInstance;
@@ -78,8 +76,6 @@ import net.minecraft.client.player.Input;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.material.FogType;
import net.minecraft.world.level.storage.LevelStorageSource;
import net.minecraft.world.level.storage.PrimaryLevelData;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
@@ -1059,9 +1055,7 @@ public class ForgeHooksClient
return ItemBlockRenderTypes.canRenderInLayer(state, RenderType.solid());
}
public static void createWorldConfirmationScreen(
String worldName, LevelStorageSource.LevelStorageAccess levelStorageAccess,
PackRepository packRepository, WorldStem worldStem)
public static void createWorldConfirmationScreen(Runnable doConfirmedWorldLoad)
{
Component title = Component.translatable("selectWorld.backupQuestion.experimental");
Component msg = Component.translatable("selectWorld.backupWarning.experimental")
@@ -1072,11 +1066,7 @@ public class ForgeHooksClient
{
if (confirmed)
{
if (worldStem.worldData() instanceof PrimaryLevelData pld)
{
pld.withConfirmedWarning(true);
}
Minecraft.getInstance().doWorldLoad(worldName, levelStorageAccess, packRepository, worldStem);
doConfirmedWorldLoad.run();
}
else
{