Skip to content

Commit 70734e4

Browse files
Honey bottle and all banner patterns are no longer replaced
1 parent 9fa45f6 commit 70734e4

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Click the link above to see the future.
1717
it will now be converted as 248:0 (minecraft:info_update) instead of 1:15 (stone with invalid data)
1818
- sweet_berries and shield are no longer replaced, they are obtainable in Nukkit 1.X now
1919
- Updated [Region-Manipulator to `2.0.0`][Region 2.0.0] from `1.1.0`.
20+
- Honey bottle and all banner patterns are no longer replaced, they aren't obtainable in Nukkit 1.X but
21+
the server won't break if you have these items in your inventory anymore.
2022

2123
### Fixes
2224
- [#78] Error parsing sign text: IllegalStateException: component must not be null

REPLACEMENTS.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ See also [the list of missing features](MISSING_FEATURES.md).
77

88
| Name | Replacement | Unsupported by |
99
| ---------------------- | ------------- | --------------- |
10-
| flower_banner_pattern | air | Nukkit 1.X |
11-
| creeper_banner_pattern | air | Nukkit 1.X |
12-
| skull_banner_pattern | air | Nukkit 1.X |
13-
| mojang_banner_pattern | air | Nukkit 1.X |
14-
| globe_banner_pattern | air | Bedrock Edition |
1510
| spruce_sign | oak_sign | Nukkit 1.X |
1611
| birch_sign | oak_sign | Nukkit 1.X |
1712
| jungle_sign | oak_sign | Nukkit 1.X |
@@ -24,7 +19,6 @@ See also [the list of missing features](MISSING_FEATURES.md).
2419
| Arrow of Slowness IV | Arrow of Slowness I | Bedrock Edition |
2520
| Arrow of Lucky | Regular Arrow | Bedrock Edition |
2621
| Spectral Arrow | Regular Arrow | Bedrock Edition |
27-
| honey_bottle | mushroom_stew | Nukkit 1.X |
2822

2923
## Blocks
3024

src/main/kotlin/br/com/gamemods/j2nwc/internal/integrity-check.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,12 @@ internal fun checkIds() {
8484
}
8585

8686
if (type == "I") {
87-
if (nukkitItemId.toInt() !in nukkitItemNames) {
87+
88+
val itemId = nukkitItemId.toInt()
89+
if (itemId !in setOf(434, 736, 737) && itemId !in nukkitItemNames) {
8890
println("The item $type,$nukkitItemId,$nukkitItemData is unsupported by Nukkit!\nItem: $item")
8991
}
92+
9093
} else {
9194
if (nukkitItemId.toInt() !in nukkitBlockNames) {
9295
println("The item-block $type,$nukkitItemId,$nukkitItemData is unsupported by Nukkit!\nItem: $item")

src/main/resources/bedrock-2-nukkit.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,17 +1094,17 @@ I,475,~=323,0
10941094
I,476,~=323,0
10951095

10961096
#globe_banner_pattern -> flower_banner_pattern (when supported by Nukkit, currently replace it to air)
1097-
#I,434,4=434,2
1097+
I,434,4=434,2
10981098

10991099
#banner_pattern -> air
1100-
I,434,0=0,0
1101-
I,434,1=0,0
1102-
I,434,2=0,0
1103-
I,434,3=0,0
1104-
I,434,4=0,0
1100+
#I,434,0=0,0
1101+
#I,434,1=0,0
1102+
#I,434,2=0,0
1103+
#I,434,3=0,0
1104+
#I,434,4=0,0
11051105

11061106
#honeycomb -> air
11071107
#I,736,~=0,0
11081108

11091109
#honey_bottle -> mushroom_stew
1110-
I,737,~=282,0
1110+
#I,737,~=282,0

0 commit comments

Comments
 (0)