From 6153b6830260c72daf71013ddaa3ca40ba06c77d Mon Sep 17 00:00:00 2001 From: TomTheFurry Date: Sat, 20 Aug 2022 17:32:35 +0800 Subject: [PATCH] Fix forge build --- forge/src/main/java/com/seibel/lod/ForgeClientProxy.java | 6 ++++-- forge/src/main/java/com/seibel/lod/ForgeMain.java | 2 +- forge/src/main/java/com/seibel/lod/ForgeServerProxy.java | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java index b163967d8..82d552a09 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java @@ -80,7 +80,8 @@ public class ForgeClientProxy { if (event.getWorld() instanceof ClientLevel) { - IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld()); + ClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) event.getWorld()); + IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld(), wrappedLevel); ClientApi.INSTANCE.clientChunkLoadEvent(chunk, ClientLevelWrapper.getWrapper((ClientLevel) event.getWorld())); } } @@ -89,7 +90,8 @@ public class ForgeClientProxy { if (event.getWorld() instanceof ClientLevel) { - IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld()); + ClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) event.getWorld()); + IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld(), wrappedLevel); ClientApi.INSTANCE.clientChunkSaveEvent(chunk, ClientLevelWrapper.getWrapper((ClientLevel) event.getWorld())); } } diff --git a/forge/src/main/java/com/seibel/lod/ForgeMain.java b/forge/src/main/java/com/seibel/lod/ForgeMain.java index dd1c55eea..7f3b34c01 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/ForgeMain.java @@ -22,7 +22,7 @@ package com.seibel.lod; import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.common.forge.LodForgeMethodCaller; import com.seibel.lod.common.wrappers.DependencySetup; -import com.seibel.lod.common.wrappers.config.GetConfigScreen; +import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.api.external.methods.events.abstractEvents.DhApiAfterDhInitEvent; diff --git a/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java b/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java index e670bd232..94a670c24 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java +++ b/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java @@ -2,6 +2,7 @@ package com.seibel.lod; import com.seibel.lod.common.networking.Networking; import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; +import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; import com.seibel.lod.core.api.internal.a7.ClientApi; @@ -10,6 +11,7 @@ import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; @@ -91,7 +93,8 @@ public class ForgeServerProxy { { if (isValidTime()) { if (event.getWorld() instanceof ServerLevel) { - IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld()); + ServerLevelWrapper wrappedLevel = ServerLevelWrapper.getWrapper((ServerLevel) event.getWorld()); + IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld(), wrappedLevel); serverApi.serverChunkLoadEvent(chunk, getLevelWrapper((ServerLevel) event.getWorld())); } } @@ -101,7 +104,8 @@ public class ForgeServerProxy { { if (isValidTime()) { if (event.getWorld() instanceof ServerLevel) { - IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld()); + ServerLevelWrapper wrappedLevel = ServerLevelWrapper.getWrapper((ServerLevel) event.getWorld()); + IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), event.getWorld(), wrappedLevel); serverApi.serverChunkSaveEvent(chunk, getLevelWrapper((ServerLevel) event.getWorld())); } }