From 7902d483ec1a48b15b85f87f0ee64f85a9cec3cc Mon Sep 17 00:00:00 2001
From: tom lee <tomlee92502@yahoo.com>
Date: Wed, 12 Jan 2022 18:02:02 +0800
Subject: [PATCH] Update core. Port back fix for onChunkLoad light issue

---
 .../seibel/lod/common/wrappers/WrapperFactory.java    |  5 +----
 .../lod/common/wrappers/chunk/ChunkPosWrapper.java    | 11 +++++++++++
 .../lod/common/wrappers/chunk/ChunkWrapper.java       |  9 ++++++---
 core                                                  |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java
index e6e6b571b..8e142f0c3 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java
@@ -57,10 +57,7 @@ public class WrapperFactory implements IWrapperFactory {
 
     @Override
     public AbstractChunkPosWrapper createChunkPos(long xAndZPositionCombined) {
-        int x = (int) (xAndZPositionCombined & Integer.MAX_VALUE);
-        int z = (int) (xAndZPositionCombined >> Long.SIZE / 2) & Integer.MAX_VALUE;
-
-        return new ChunkPosWrapper(x, z);
+        return new ChunkPosWrapper(xAndZPositionCombined);
     }
 
     @Override
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java
index a21d7e02e..7fad568f5 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java
@@ -42,6 +42,11 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
     {
         this.chunkPos = new ChunkPos(chunkX, chunkZ);
     }
+    
+    public ChunkPosWrapper(long l)
+    {
+        this.chunkPos = new ChunkPos(l);
+    }
 
 
     public ChunkPosWrapper(ChunkPos pos)
@@ -92,6 +97,11 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
     {
         return chunkPos;
     }
+    
+	@Override
+	public long getLong() {
+		return chunkPos.toLong();
+	}
 
     @Override
     public boolean equals(Object o)
@@ -122,4 +132,5 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
         return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
     }
 
+
 }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java
index d3b296f14..d7ef38413 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java
@@ -1,14 +1,11 @@
 package com.seibel.lod.common.wrappers.chunk;
 
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper;
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockShapeWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.lod.common.wrappers.WrapperUtil;
 import com.seibel.lod.common.wrappers.block.BlockColorWrapper;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.common.wrappers.block.BlockShapeWrapper;
 import com.seibel.lod.common.wrappers.world.BiomeWrapper;
 
@@ -22,6 +19,7 @@ import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.levelgen.Heightmap;
 
@@ -146,6 +144,11 @@ public class ChunkWrapper implements IChunkWrapper
         return chunk.getPos().getMinBlockZ();
     }
 
+	@Override
+	public long getLongChunkPos() {
+		return chunk.getPos().toLong();
+	}
+
     @Override
     public boolean isLightCorrect(){
         return chunk.isLightCorrect();
diff --git a/core b/core
index 02143d095..bb22ad58b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 02143d095169d8007ec881bd5d0d3c1ea9801719
+Subproject commit bb22ad58bcfe095be21b5c74d820a744175db763