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

Recipes are fixed in 1.19.80

Browse source
This commit is contained in:
Camotoy 2023-04-23 14:09:51 -04:00
parent 2ac7eb83c0
commit 365dd622bb
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/main/java/org/geysermc/geyser/registry/populator/CreativeItemRegistryPopulator.java
View file

@ -81,6 +81,14 @@ public class CreativeItemRegistryPopulator {
int damage = 0; int damage = 0;
int bedrockBlockRuntimeId = -1; int bedrockBlockRuntimeId = -1;
NbtMap tag = null; NbtMap tag = null;
String identifier = itemNode.get("id").textValue();
for (BiPredicate<String, Integer> predicate : JAVA_ONLY_ITEM_FILTER) {
if (predicate.test(identifier, damage)) {
return null;
}
}
JsonNode damageNode = itemNode.get("damage"); JsonNode damageNode = itemNode.get("damage");
if (damageNode != null) { if (damageNode != null) {
damage = damageNode.asInt(); damage = damageNode.asInt();
@ -94,6 +102,9 @@ public class CreativeItemRegistryPopulator {
JsonNode blockRuntimeIdNode = itemNode.get("blockRuntimeId"); JsonNode blockRuntimeIdNode = itemNode.get("blockRuntimeId");
if (blockRuntimeIdNode != null) { if (blockRuntimeIdNode != null) {
bedrockBlockRuntimeId = blockRuntimeIdNode.asInt(); bedrockBlockRuntimeId = blockRuntimeIdNode.asInt();
if (bedrockBlockRuntimeId == 0 && !identifier.equals("minecraft:blue_candle")) { // FIXME
bedrockBlockRuntimeId = -1;
}
} }
JsonNode nbtNode = itemNode.get("nbt_b64"); JsonNode nbtNode = itemNode.get("nbt_b64");
@ -107,13 +118,6 @@ public class CreativeItemRegistryPopulator {
} }
} }
String identifier = itemNode.get("id").textValue();
for (BiPredicate<String, Integer> predicate : JAVA_ONLY_ITEM_FILTER) {
if (predicate.test(identifier, damage)) {
return null;
}
}
ItemDefinition definition = definitions.get(identifier); ItemDefinition definition = definitions.get(identifier);
if (definition == null) { if (definition == null) {
GeyserImpl.getInstance().getLogger().debug("Unknown item definition with identifier " + identifier + " when loading creative items!"); GeyserImpl.getInstance().getLogger().debug("Unknown item definition with identifier " + identifier + " when loading creative items!");

2
core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
View file

@ -158,7 +158,7 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
if (GameProtocol.supports1_19_60(session)) { if (GameProtocol.supports1_19_60(session)) {
// Note: vanilla inputs use aux value of Short.MAX_VALUE // Note: vanilla inputs use aux value of Short.MAX_VALUE
craftingDataPacket.getCraftingData().add(SmithingTransformRecipeData.of(recipe.getIdentifier(), craftingDataPacket.getCraftingData().add(SmithingTransformRecipeData.of(recipe.getIdentifier(),
bedrockBase, bedrockAddition, output, "smithing_table", netId++)); ItemDescriptorWithCount.EMPTY, bedrockBase, bedrockAddition, output, "smithing_table", netId++));
} else { } else {
UUID uuid = UUID.randomUUID(); UUID uuid = UUID.randomUUID();
craftingDataPacket.getCraftingData().add(org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.ShapelessRecipeData.shapeless(uuid.toString(), craftingDataPacket.getCraftingData().add(org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.ShapelessRecipeData.shapeless(uuid.toString(),