diff --git a/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch b/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch index 89c04a4f80..83fe9b302e 100644 --- a/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch +++ b/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch @@ -23,7 +23,7 @@ + continue; + } + codec.parse(ops, json).ifSuccess(parsed -> { -+ parsed = net.minecraftforge.common.ForgeHooks.onJsonDataParsed(codec, location, parsed); ++ parsed = net.minecraftforge.common.ForgeHooks.onJsonDataParsed(codec, id, parsed); + if (parsed == null) return; if (result.putIfAbsent(id, (T)parsed) != null) { throw new IllegalStateException("Duplicate data file ignored with ID " + id); diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 65ae1fe6eb..2ddc9c1e61 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -735,22 +735,6 @@ public class ForgeHooksClient { return font.split(text, maxWidth).stream().map(ClientTooltipComponent::create); } - public static void createWorldConfirmationScreen(Runnable doConfirmedWorldLoad) { - Component title = Component.translatable("selectWorld.backupQuestion.experimental"); - Component msg = Component.translatable("selectWorld.backupWarning.experimental") - .append("\n\n") - .append(Component.translatable("forge.selectWorld.backupWarning.experimental.additional")); - - Screen screen = new ConfirmScreen(confirmed -> { - if (confirmed) - doConfirmedWorldLoad.run(); - else - Minecraft.getInstance().setScreen(null); - }, title, msg, CommonComponents.GUI_PROCEED, CommonComponents.GUI_CANCEL); - - Minecraft.getInstance().setScreen(screen); - } - public static boolean renderFireOverlay(Player player, PoseStack mat) { return renderBlockOverlay(player, mat, RenderBlockScreenEffectEvent.OverlayType.FIRE, Blocks.FIRE.defaultBlockState(), player.blockPosition()); }