From a56bcfe58dc12fbe1d43dd60930563c8b92b781d Mon Sep 17 00:00:00 2001 From: cola98765 Date: Mon, 13 Dec 2021 16:13:21 +0100 Subject: [PATCH 01/11] I hope I fixed what james broke --- .../com/seibel/lod/forge/wrappers/WrapperFactory.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/seibel/lod/forge/wrappers/WrapperFactory.java b/src/main/java/com/seibel/lod/forge/wrappers/WrapperFactory.java index 0ece9e04f..ae6cd4dcc 100644 --- a/src/main/java/com/seibel/lod/forge/wrappers/WrapperFactory.java +++ b/src/main/java/com/seibel/lod/forge/wrappers/WrapperFactory.java @@ -62,6 +62,15 @@ public class WrapperFactory implements IWrapperFactory return new ChunkPosWrapper(); } + @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); + } + @Override public AbstractChunkPosWrapper createChunkPos(int x, int z) { From 839d8fbfdb66927b5fcb9282fb010e9cdb4d8e08 Mon Sep 17 00:00:00 2001 From: Morippi Date: Mon, 13 Dec 2021 18:59:43 +0100 Subject: [PATCH 02/11] Changed the format --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8ef0d40f0..8efc7d54e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8ef0d40f0cca68b332eae5533486ffc24cf091ef +Subproject commit 8efc7d54e7249daa143927a59c1e16d51a9a78a5 From a67cd9769b2749ea67283cec63b708681f93a76c Mon Sep 17 00:00:00 2001 From: Morippi Date: Mon, 13 Dec 2021 21:03:55 +0100 Subject: [PATCH 03/11] Added methods for the merge in the LevelContainer, to be implemented --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8efc7d54e..a9e31b813 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8efc7d54e7249daa143927a59c1e16d51a9a78a5 +Subproject commit a9e31b8133139a39b5ed8839a7026278f009f3fe From 387e4c05987b3f501b7b71f215ce449b9a26cc95 Mon Sep 17 00:00:00 2001 From: Morippi Date: Mon, 13 Dec 2021 22:55:30 +0100 Subject: [PATCH 04/11] Added slice in mergeAndAddData --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index a9e31b813..27d9e6aeb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a9e31b8133139a39b5ed8839a7026278f009f3fe +Subproject commit 27d9e6aeb745507e0972cc33ec1d2cb0609ae170 From 019c83913e6a00386872d0767ac2bb752e5d3fb0 Mon Sep 17 00:00:00 2001 From: tom lee Date: Wed, 15 Dec 2021 00:05:11 +0800 Subject: [PATCH 05/11] Update core --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 27d9e6aeb..b5665a59c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 27d9e6aeb745507e0972cc33ec1d2cb0609ae170 +Subproject commit b5665a59c01728583978a0833f31c42deab7a64f From ff0761fe0e600c461cb9b7a583a16ef364a55f73 Mon Sep 17 00:00:00 2001 From: Morippi Date: Tue, 14 Dec 2021 21:22:33 +0100 Subject: [PATCH 06/11] small fixes --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index b5665a59c..cf2234118 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b5665a59c01728583978a0833f31c42deab7a64f +Subproject commit cf22341185fd5ce7e04effbf60554600ffc7b5a4 From d6a87c252b99fa00c5288024158ef1ee16e62ddc Mon Sep 17 00:00:00 2001 From: cola98765 Date: Tue, 14 Dec 2021 21:36:52 +0100 Subject: [PATCH 07/11] no longer using getMinimumWorldHeight() form version constants, added replacement in WorldWrapper. --- .../com/seibel/lod/forge/wrappers/world/WorldWrapper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java b/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java index 0d6f06c9a..4408370b2 100644 --- a/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java +++ b/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java @@ -146,5 +146,10 @@ public class WorldWrapper implements IWorldWrapper return world.getSeaLevel(); } + @Override + public short getMinHeight() + { + return 0; + } } From 5796b8b8141e3244723b1e8ca20aad81008fb524 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Tue, 14 Dec 2021 21:40:34 +0100 Subject: [PATCH 08/11] made getMinHeight() default, so when it's not implemented it just returns 0 --- .../com/seibel/lod/forge/wrappers/world/WorldWrapper.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java b/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java index 4408370b2..f4a3e3be6 100644 --- a/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java +++ b/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java @@ -145,11 +145,4 @@ public class WorldWrapper implements IWorldWrapper // TODO this is depreciated, what should we use instead? return world.getSeaLevel(); } - - @Override - public short getMinHeight() - { - return 0; - } - } From 3287ec0790390aa691a06ef82e558e0f6101f1ac Mon Sep 17 00:00:00 2001 From: Morippi Date: Tue, 14 Dec 2021 22:00:57 +0100 Subject: [PATCH 09/11] small fix --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index cf2234118..8737a828c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit cf22341185fd5ce7e04effbf60554600ffc7b5a4 +Subproject commit 8737a828c682880cb1b7d8e87689f78152af321c From 2992541390aa5a05d11213a3e4cd580e323d1833 Mon Sep 17 00:00:00 2001 From: Morippi Date: Tue, 14 Dec 2021 23:00:30 +0100 Subject: [PATCH 10/11] fixed new merge and data system --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8737a828c..ec51a6230 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8737a828c682880cb1b7d8e87689f78152af321c +Subproject commit ec51a623055b21a1cd583c25fa8124cbe559a3c7 From 174db2ede965be1085770af75b9a60fc265d3b26 Mon Sep 17 00:00:00 2001 From: tom lee Date: Wed, 15 Dec 2021 11:41:41 +0800 Subject: [PATCH 11/11] Updated core --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index ec51a6230..444bf3b8b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ec51a623055b21a1cd583c25fa8124cbe559a3c7 +Subproject commit 444bf3b8bc08da5c25d4462b46a167887125d20e