Skip to content

Commit 0f9f7a4

Browse files
quizhizhequizhizhe
committed
feat: adapt 1.21.93.1
1 parent 44c7e07 commit 0f9f7a4

File tree

8 files changed

+73
-55
lines changed

8 files changed

+73
-55
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.9.0] - 2025-07-17
11+
12+
### Changed
13+
14+
- Adapt to LeviLamina 1.4.1(BDS-1.21.93.1)
15+
1016
## [0.8.0] - 2025-06-11
1117

1218
### Changed
@@ -102,7 +108,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
102108

103109
- Release the first version
104110

105-
[Unreleased]: https://github.com/LiteLDev/MoreDimensions/compare/v0.8.0...HEAD
111+
[Unreleased]: https://github.com/LiteLDev/MoreDimensions/compare/v0.9.0...HEAD
112+
[0.9.0]: https://github.com/LiteLDev/MoreDimensions/compare/v0.8.0...v0.9.0
106113
[0.8.0]: https://github.com/LiteLDev/MoreDimensions/compare/v0.7.0...v0.8.0
107114
[0.7.0]: https://github.com/LiteLDev/MoreDimensions/compare/v0.6.1...v0.7.0
108115
[0.6.1]: https://github.com/LiteLDev/MoreDimensions/compare/v0.6.0...v0.6.1

‎src/more_dimensions/api/dimension/SimpleCustomDimension.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ namespace more_dimensions {
5151
namespace {
5252
using namespace ll::memory_literals;
5353

54-
DWORD overworld_addStructureFeatures_rva = 0x044F390;
55-
DWORD nethrer_addStructureFeatures_rva = 0x044DC00;
54+
DWORD overworld_addStructureFeatures_rva = 0x0478550;
55+
DWORD nethrer_addStructureFeatures_rva = 0x0477110;
5656

5757
HMODULE hModule = GetModuleHandle(L"bedrock_server_mod.exe");
5858

‎src/more_dimensions/core/dimension/FakeDimensionId.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "mc/deps/core/utility/AutomaticID.h"
4-
#include "mc/network/packet/Packet.h"
4+
#include "mc/client/renderer/rendergraph/Packet.h"
55
#include "mc/platform/UUID.h"
66

77

‎src/more_dimensions/core/dimension/MoreDimensionsPatch.h‎

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,51 @@ struct AddressAndReg {
1717
// 0~26 VanillaDimensions::toSerializedInt
1818
// 27~39 VanillaDimensions::fromSerializedInt(int)
1919
std::vector<AddressAndReg> data = {
20-
{0x08440f0, 0x08443cf, 0x08443fa, {0x89, 0xc8} },
21-
{0x262a500, 0x262a5f5, 0x262a617, {0x89, 0xc3} },
22-
{0x104de80, 0x104deb7, 0x104dee0, {0x89, 0xc2} },
23-
{0x10a4f60, 0x10a4fee, 0x10a5017, {0x89, 0xc2} },
24-
{0x1089720, 0x1089770, 0x1089799, {0x89, 0xc2} },
25-
{0x108a620, 0x108a655, 0x108a67e, {0x89, 0xc2} },
26-
{0x0d018e0, 0x0d01ed2, 0x0d01efb, {0x89, 0xc3} },
27-
{0x1062410, 0x10625e3, 0x1062606, {0x89, 0xc3} },
28-
{0x0d93460, 0x0d9347f, 0x0d934a8, {0x89, 0xc2} },
29-
{0x0d71150, 0x0d711a4, 0x0d711cd, {0x89, 0xc2} },
30-
{0x197e0f0, 0x197e4ab, 0x197e4d3, {0x41, 0x88, 0xc9} },
31-
{0x197e670, 0x197e76b, 0x197e78e, {0x88, 0xc8} },
32-
{0x171f790, 0x171fab7, 0x171fadf, {0x41, 0x88, 0xc9} },
33-
{0x25c0140, 0x25c09c7, 0x25c09f2, {0x89, 0xc3} },
34-
{0x2569f20, 0x256a388, 0x256a3b3, {0x89, 0xc3} },
35-
{0x2569f20, 0x256a834, 0x256a860, {0x89, 0xdf} },
36-
{0x2567090, 0x2567841, 0x2567867, {0x41, 0x89, 0xc6} },
37-
{0x2582d50, 0x2582e80, 0x2582ea9, {0x89, 0xc3} },
38-
{0x25825e0, 0x25825f0, 0x258261b, {0x89, 0xd3} },
39-
{0x2d2ca90, 0x2d2ccb2, 0x2d2cce0, {0x41, 0x89, 0xc6} },
40-
{0x2d2faf0, 0x2d2fc40, 0x2d2fc64, {0x89, 0xc7} },
41-
{0x2d3e700, 0x2d3e75e, 0x2d3e781, {0x88, 0xd8} },
42-
{0x2984bf0, 0x2984cb3, 0x2984cd6, {0x89, 0xc3} },
43-
{0x30e4420, 0x30e4432, 0x30e4460, {0x41, 0x89, 0xc3} },
44-
{0x31f7d10, 0x31f7e35, 0x31f7e59, {0x89, 0xcb} },
45-
{0x31f8e10, 0x31f8e8e, 0x31f8eb3, {0x89, 0xdf} },
46-
{0x336cb80, 0x336cccd, 0x336ccf5, {0x40, 0x88, 0xc7} },
47-
{0x25c22a0, 0x25c33dd, 0x25c340d, {0x41, 0x89, 0xc8} },
48-
{0x25e02f0, 0x25e04bc, 0x25e04e8, {0x89, 0xc8} },
49-
{0x0b92a60, 0x0b92d10, 0x0b92d60, {0x89, 0x8e, 0x3c, 0x0, 0x0, 0x0}},
50-
{0x0cbde50, 0x0cbdfc9, 0x0cbdff5, {0x89, 0xcb} },
51-
{0x0d013f0, 0x0d01657, 0x0d01683, {0x89, 0xcf} },
52-
{0x10fef90, 0x10ff015, 0x10ff04d, {0x89, 0xc8} },
53-
{0x25824e0, 0x2582560, 0x25825c2, {0x89, 0xc8} },
54-
{0x25681d0, 0x25687a5, 0x25687ea, {0x89, 0x8e, 0xe0, 0xa, 0x0, 0x0}},
55-
{0x2d2c450, 0x2d2c5c1, 0x2d2c5ed, {0x89, 0xc8} },
56-
{0x2d2fcd0, 0x2d2fe6e, 0x2d2fe9a, {0x89, 0xc8} },
57-
{0x31ff0b0, 0x31ff164, 0x31ff190, {0x89, 0xc8} },
58-
{0x336e8e0, 0x336e998, 0x336e9c7, {} },
20+
{0x08544d0, 0x08547af, 0x08547da, {0x89, 0xc8} },
21+
{0x08d7c20, 0x08d7d2f, 0x08d7d52, {0x89, 0xcb} },
22+
{0x08d7f40, 0x08d805e, 0x08d8081, {0x89, 0xcb} },
23+
{0x08d8270, 0x08d838c, 0x08d83af, {0x89, 0xcb} },
24+
{0x08debc0, 0x08def3e, 0x08def61, {0x89, 0xc3} },
25+
{0x0c3b740, 0x0c3b9f0, 0x0c3ba1a, {0x89, 0x4e, 0x3c} },
26+
{0x0c83ad0, 0x0c83d37, 0x0c83d53, {0x89, 0xcf} },
27+
{0x0c83fc0, 0x0c845b2, 0x0c845db, {0x89, 0xc3} },
28+
{0x1046ae0, 0x1046c6b, 0x1046ca4, {0x89, 0xcb} },
29+
{0x1087090, 0x10870e4, 0x108710d, {0x89, 0xc2} },
30+
{0x10a9b20, 0x10a9b3f, 0x10a9b68, {0x89, 0xc2} },
31+
{0x10ec410, 0x10ec447, 0x10ec470, {0x89, 0xc2} },
32+
{0x1104c80, 0x1104e53, 0x1104e76, {0x89, 0xc3} },
33+
{0x112d310, 0x112d360, 0x112d389, {0x89, 0xc2} },
34+
{0x112e670, 0x112e6a5, 0x112e6ce, {0x89, 0xc2} },
35+
{0x1149d90, 0x1149e1e, 0x1149e47, {0x89, 0xc2} },
36+
{0x17880d0, 0x1788609, 0x1788631, {0x41, 0x89, 0xc9} },
37+
{0x1788800, 0x17888ef, 0x1788917, {0x41, 0x89, 0xc9} },
38+
{0x20df6c0, 0x20df745, 0x20df768, {0x41, 0x89, 0x0a} },
39+
{0x2391820, 0x2391cc4, 0x2391cec, {0x41, 0x89, 0xc9} },
40+
{0x25a4b80, 0x25a5407, 0x25a5432, {0x89, 0xc3} },
41+
{0x25a6ce0, 0x25a7e32, 0x25a7e50, {0x41, 0x89, 0xc8} },
42+
{0x260b9c0, 0x260bba0, 0x260bbbc, {0x89, 0xc8} },
43+
{0x26657d0, 0x26658c5, 0x26658e7, {0x89, 0xc3} },
44+
{0x28da340, 0x28daaf1, 0x28dab17, {0x41, 0x89, 0xc6} },
45+
{0x28db480, 0x28dba57, 0x28dba86, {0x89, 0x8e, 0xe0, 0x0a, 0x00, 0x00}},
46+
{0x28dd290, 0x28dd6ce, 0x28dd6f9, {0x89, 0xc3} },
47+
{0x28dd290, 0x28ddb7a, 0x28ddba6, {0x89, 0xdf} },
48+
{0x28f5690, 0x28f5710, 0x28f5740, {0x89, 0x0b} },
49+
{0x28f5790, 0x28f57a0, 0x28f57cb, {0x89, 0xd3} },
50+
{0x28f5ac0, 0x28f5e44, 0x28f5e60, {0x89, 0xcb} },
51+
{0x28f5f00, 0x28f6030, 0x28f6059, {0x89, 0xc3} },
52+
{0x2f554e0, 0x2f55551, 0x2f55579, {0x41, 0x89, 0xd9} },
53+
{0x2f63520, 0x2f635e3, 0x2f63606, {0x89, 0xc3} },
54+
{0x30e3ca0, 0x30e3e11, 0x30e3e2d, {0x89, 0xc8} },
55+
{0x30e42e0, 0x30e4512, 0x30e4540, {0x41, 0x89, 0xc6} },
56+
{0x30e72e0, 0x30e7430, 0x30e7454, {0x89, 0xc7} },
57+
{0x30e74c0, 0x30e765e, 0x30e767a, {0x89, 0xc8} },
58+
{0x3159430, 0x3159430, 0x3159452, {0x89, 0x11} },
59+
{0x3254240, 0x3254252, 0x3254280, {0x41, 0x89, 0xc3} },
60+
{0x35967d0, 0x3596884, 0x35968a0, {0x89, 0xc8} },
61+
{0x363c0c0, 0x363c198, 0x363c1c0, {0x89, 0xc7} },
62+
{0x363dc30, 0x363dcf8, 0x363dd14, {} },
63+
{0x36965d0, 0x36966f5, 0x3696719, {0x89, 0xcb} },
64+
{0x36976d0, 0x369774e, 0x3697773, {0x89, 0xdf} },
5965
};
6066

6167
bool PatchFunction(HMODULE hModule, DWORD faddress_start, DWORD faddress_end, const std::vector<BYTE>& native_code) {

‎src/test/mc/FixedBiomeSource.h‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// auto generated inclusion list
66
#include "mc/world/level/biome/source/BiomeSource.h"
7+
#include "mc/world/level/biome/source/BiomeSourceType.h"
78

89
// auto generated forward declare list
910
// clang-format off
@@ -37,7 +38,9 @@ class FixedBiomeSource : public ::BiomeSource {
3738
virtual ::Biome const* getBiome(::BlockPos const& blockPos) const /*override*/;
3839

3940
// vIndex: 6
40-
virtual ::Biome const* getBiome(::GetBiomeOptions const& getBiomeOptions) const /*override*/;
41+
virtual ::Biome const* getBiome(::GetBiomeOptions const& getBiomeOptions) const /*override*/{
42+
return &mFixedBiome;
43+
};
4144

4245
// vIndex: 5
4346
virtual ::Biome const* getBiome(int blockX, int blockY, int blockZ) const /*override*/;
@@ -50,10 +53,10 @@ class FixedBiomeSource : public ::BiomeSource {
5053
getBiomeArea(::BoundingBox const& area, uint scale, ::GetBiomeOptions const& getBiomeOptions) const /*override*/;
5154

5255
// vIndex: 8
53-
virtual bool has(uint64 id) const /*override*/;
56+
virtual bool hasBiomeById(ushort id) const /*override*/;
5457

5558
// vIndex: 9
56-
virtual bool hasByHashId(uint64 id) const /*override*/;
59+
virtual bool hasBiomeByNameHash(uint64 hash) const /*override*/;
5760

5861
// vIndex: 10
5962
virtual ::BiomeSourceType const getType() const /*override*/;
@@ -87,14 +90,16 @@ class FixedBiomeSource : public ::BiomeSource {
8790
MCAPI ::BiomeArea
8891
$getBiomeArea(::BoundingBox const& area, uint scale, ::GetBiomeOptions const& getBiomeOptions) const;
8992

90-
MCAPI bool $has(uint64 id) const;
93+
MCAPI bool $hasBiomeById(ushort id) const;
9194

92-
MCAPI bool $hasByHashId(uint64 id) const;
95+
MCAPI bool $hasBiomeByNameHash(uint64 hash) const;
96+
97+
MCFOLD ::BiomeSourceType const $getType() const;
9398
// NOLINTEND
9499

95100
public:
96101
// vftables
97102
// NOLINTBEGIN
98-
MCAPI static void** $vftable();
103+
MCNAPI static void** $vftable();
99104
// NOLINTEND
100-
};
105+
};

‎src/test/mc/StructurePoolBlockPredicateBlockMatchRandom.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ class StructurePoolBlockPredicateBlockMatchRandom : public ::IStructurePoolBlock
6969
public:
7070
// vftables
7171
// NOLINTBEGIN
72-
MCAPI static void** $vftable();
72+
MCNAPI static void** $vftable();
7373
// NOLINTEND
7474
};

‎tooth.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"format_version": 3,
33
"format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
44
"tooth": "github.com/LiteLDev/MoreDimensions",
5-
"version": "0.8.0",
5+
"version": "0.9.0",
66
"info": {
77
"name": "MoreDimensions",
88
"description": "More than three dimensions on BDS!",
@@ -23,7 +23,7 @@
2323
"https://{{tooth}}/releases/download/v{{version}}/more-dimensions-windows-x64-v{{version}}.zip"
2424
],
2525
"dependencies": {
26-
"github.com/LiteLDev/LeviLamina": "1.3.*"
26+
"github.com/LiteLDev/LeviLamina": "1.4.*"
2727
},
2828
"placements": [
2929
{

‎xmake.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ add_rules("mode.debug", "mode.release")
33
add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
44

55
if is_config("target_type", "server") then
6-
add_requires("levilamina 1.3.0", {configs = {target_type = "server"}})
6+
add_requires("levilamina 1.4.1", {configs = {target_type = "server"}})
77
else
8-
add_requires("levilamina 1.3.0", {configs = {target_type = "client"}})
8+
add_requires("levilamina 1.4.1", {configs = {target_type = "client"}})
99
end
1010

1111
add_requires("levibuildscript")

0 commit comments

Comments
 (0)