GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Remove goat horn from creative menu; use proper sculk sensor item

Browse source
This commit is contained in:
Camotoy 2021-07-16 12:28:11 -04:00
parent 7972f089d9
commit f03a2dd317
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java
View file

@ -235,10 +235,13 @@ public class ItemRegistryPopulator {
Set<String> javaOnlyItems = new ObjectOpenHashSet<>(); Set<String> javaOnlyItems = new ObjectOpenHashSet<>();
Collections.addAll(javaOnlyItems, "minecraft:spectral_arrow", "minecraft:debug_stick", Collections.addAll(javaOnlyItems, "minecraft:spectral_arrow", "minecraft:debug_stick",
"minecraft:knowledge_book", "minecraft:tipped_arrow", "minecraft:trader_llama_spawn_egg", "minecraft:knowledge_book", "minecraft:tipped_arrow", "minecraft:trader_llama_spawn_egg",
"minecraft:bundle", "minecraft:sculk_sensor"); "minecraft:bundle");
if (!usingFurnaceMinecart) { if (!usingFurnaceMinecart) {
javaOnlyItems.add("minecraft:furnace_minecart"); javaOnlyItems.add("minecraft:furnace_minecart");
} }
if (!GeyserConnector.getInstance().getConfig().isExtendedWorldHeight()) {
javaOnlyItems.add("minecraft:sculk_sensor");
}
// Java-only items for this version // Java-only items for this version
javaOnlyItems.addAll(palette.getValue().getAdditionalTranslatedItems().keySet()); javaOnlyItems.addAll(palette.getValue().getAdditionalTranslatedItems().keySet());
@ -251,6 +254,9 @@ 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 (entry.getKey().equals("minecraft:sculk_sensor") && GeyserConnector.getInstance().getConfig().isExtendedWorldHeight()) {
mappingItem.setBedrockIdentifier("minecraft:sculk_sensor");
}
if (usingFurnaceMinecart && entry.getKey().equals("minecraft:furnace_minecart")) { if (usingFurnaceMinecart && entry.getKey().equals("minecraft:furnace_minecart")) {
javaFurnaceMinecartId = itemIndex; javaFurnaceMinecartId = itemIndex;

3
connector/src/main/resources/bedrock/creative_items.1_17_10.caves_and_cliffs.json
View file

@ -3137,9 +3137,6 @@
{ {
"id" : "minecraft:saddle" "id" : "minecraft:saddle"
}, },
{
"id" : "minecraft:goat_horn"
},
{ {
"id" : "minecraft:leather_horse_armor" "id" : "minecraft:leather_horse_armor"
}, },