mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Fix incorrect argument passed to LootTableLoadEvent
This commit is contained in:
2 files changed
+1
-17
No files matched your search
+1
-1
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user