Skip to content

Commit 390e9d4

Browse files
Cleanup code as well
1 parent b7b5d3f commit 390e9d4

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/data/BackwardsMappingData1_19.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030

3131
public final class BackwardsMappingData1_19 extends BackwardsMappingData {
3232

33-
private final boolean sculkShriekerToCryingObsidian = ViaBackwards.getConfig().sculkShriekerToCryingObsidian();
34-
3533
private final Int2ObjectMap<CompoundTag> defaultChatTypes = new Int2ObjectOpenHashMap<>();
3634

3735
public BackwardsMappingData1_19() {
@@ -40,29 +38,22 @@ public BackwardsMappingData1_19() {
4038

4139
@Override
4240
protected void loadExtras(final CompoundTag data) {
43-
super.loadExtras(data);
44-
45-
if (sculkShriekerToCryingObsidian) {
41+
if (ViaBackwards.getConfig().sculkShriekerToCryingObsidian()) {
4642
for (int i = 18900; i <= 18907; i++) {
4743
blockStateMappings.setNewId(i, 16082);
4844
}
45+
itemMappings.setNewId(329, 1065);
4946
}
5047

48+
super.loadExtras(data);
49+
5150
final ListTag<CompoundTag> chatTypes = BackwardsMappingDataLoader.INSTANCE.loadNBT("chat-types-1.19.1.nbt").getListTag("values", CompoundTag.class);
5251
for (final CompoundTag chatType : chatTypes) {
5352
final NumberTag idTag = chatType.getNumberTag("id");
5453
defaultChatTypes.put(idTag.asInt(), chatType);
5554
}
5655
}
5756

58-
@Override
59-
public int getNewItemId(final int id) {
60-
if (sculkShriekerToCryingObsidian && id == 329) {
61-
return 1065;
62-
}
63-
return super.getNewItemId(id);
64-
}
65-
6657
public @Nullable CompoundTag chatType(final int id) {
6758
return defaultChatTypes.get(id);
6859
}

0 commit comments

Comments
 (0)