GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 23:09:29 +00:00
Code Issues Releases Activity

Update mappings; remove unnecessary item workarounds

Browse Source
This commit is contained in:
Camotoy
2021-11-23 14:22:44 -05:00
parent e7ecda64f0
commit c200e3e6fa
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View File

@@ -225,10 +225,7 @@ public class ItemRegistryPopulator {
// This items has a mapping specifically for this version of the game // This items has a mapping specifically for this version of the game
mappingItem = entry.getValue(); mappingItem = entry.getValue();
} }
if (javaIdentifier.equals("minecraft:sculk_sensor")) { if (javaIdentifier.equals("minecraft:music_disc_otherside") && palette.getValue().protocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) {
// TODO fix in mappings
mappingItem.setBedrockIdentifier("minecraft:sculk_sensor");
} else if (javaIdentifier.equals("minecraft:music_disc_otherside") && palette.getValue().protocolVersion() <= Bedrock_v471.V471_CODEC.getProtocolVersion()) {
mappingItem.setBedrockIdentifier("minecraft:music_disc_pigstep"); mappingItem.setBedrockIdentifier("minecraft:music_disc_pigstep");
} }
@@ -402,7 +399,7 @@ public class ItemRegistryPopulator {
.count(1) .count(1)
.blockRuntimeId(mapping.getBedrockBlockId()) .blockRuntimeId(mapping.getBedrockBlockId())
.build()); .build());
} else if (javaIdentifier.startsWith("minecraft:music_disc_") && !javaIdentifier.equals("minecraft:music_disc_otherside")) { // TODO TEMPORARY } else if (javaIdentifier.startsWith("minecraft:music_disc_")) {
// The Java record level event uses the item ID as the "key" to play the record // The Java record level event uses the item ID as the "key" to play the record
Registries.RECORDS.register(itemIndex, SoundEvent.valueOf("RECORD_" + Registries.RECORDS.register(itemIndex, SoundEvent.valueOf("RECORD_" +
javaIdentifier.replace("minecraft:music_disc_", "").toUpperCase(Locale.ENGLISH))); javaIdentifier.replace("minecraft:music_disc_", "").toUpperCase(Locale.ENGLISH)));

2
core/src/main/resources/mappings

Submodule core/src/main/resources/mappings updated: 7ff1b6567b...82ad7ba279