From 2a8404c6c215b39e2be8b81fbda7b6afcb67addc Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Sun, 9 Mar 2025 15:00:58 +0800 Subject: [PATCH] add an API to retrieve world instance from WorldSlice (#897) --- .../gtnewhorizons/angelica/api/IBlockAccessExtended.java | 8 ++++++++ .../jellysquid/mods/sodium/client/world/WorldSlice.java | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gtnewhorizons/angelica/api/IBlockAccessExtended.java diff --git a/src/main/java/com/gtnewhorizons/angelica/api/IBlockAccessExtended.java b/src/main/java/com/gtnewhorizons/angelica/api/IBlockAccessExtended.java new file mode 100644 index 000000000..32135cce4 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/api/IBlockAccessExtended.java @@ -0,0 +1,8 @@ +package com.gtnewhorizons.angelica.api; + +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public interface IBlockAccessExtended extends IBlockAccess { + World getWorld(); +} diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java index 684fa68c4..484282f7c 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java @@ -2,6 +2,7 @@ package me.jellysquid.mods.sodium.client.world; import java.util.Arrays; +import com.gtnewhorizons.angelica.api.IBlockAccessExtended; import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; import com.gtnewhorizons.angelica.compat.mojang.CompatMathHelper; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; @@ -34,7 +35,7 @@ import net.minecraftforge.common.util.ForgeDirection; * * Object pooling should be used to avoid huge allocations as this class contains many large arrays. */ -public class WorldSlice implements IBlockAccess { +public class WorldSlice implements IBlockAccessExtended { private static final EnumSkyBlock[] LIGHT_TYPES = EnumSkyBlock.values(); // The number of blocks on each axis in a section. @@ -406,6 +407,7 @@ public class WorldSlice implements IBlockAccess { }; } + @Override public World getWorld() { return this.world; }