From 201c619915827626f3d103f4d24474e86f9860db Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 28 Sep 2024 08:33:30 -0500 Subject: [PATCH] Add Api world load/unload events and DhApiWorldProxy.get/setReadOnly() --- .../common/wrappers/world/ClientLevelWrapper.java | 6 +++--- .../common/wrappers/world/ServerLevelWrapper.java | 11 +++-------- coreSubProjects | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java index 883388b1b..533c35f82 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java @@ -124,6 +124,8 @@ public class ClientLevelWrapper implements IClientLevelWrapper } } + + //====================// // base level methods // //====================// @@ -238,9 +240,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper @Override public IBlockStateWrapper getBlockState(DhBlockPos pos) - { - return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this); - } + { return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this); } @Override public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java index ca2ac0ca1..2a8b99ca9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java @@ -49,9 +49,6 @@ import net.minecraft.world.level.chunk.status.ChunkStatus; import org.apache.logging.log4j.Logger; -/** - * @version 2022-9-16 - */ public class ServerLevelWrapper implements IServerLevelWrapper { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); @@ -67,12 +64,10 @@ public class ServerLevelWrapper implements IServerLevelWrapper // constructors // //==============// - public static ServerLevelWrapper getWrapper(ServerLevel level) { return LEVEL_WRAPPER_BY_SERVER_LEVEL.computeIfAbsent(level, ServerLevelWrapper::new); } + public static ServerLevelWrapper getWrapper(ServerLevel level) + { return LEVEL_WRAPPER_BY_SERVER_LEVEL.computeIfAbsent(level, ServerLevelWrapper::new); } - public ServerLevelWrapper(ServerLevel level) - { - this.level = level; - } + public ServerLevelWrapper(ServerLevel level) { this.level = level; } diff --git a/coreSubProjects b/coreSubProjects index d89d99f12..566b536c8 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit d89d99f126159cd8593979abcf4eeaa485a8a53b +Subproject commit 566b536c8db750950c058bec7940e483d4d6b74c