-
Notifications
You must be signed in to change notification settings - Fork 420
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix more custom ingredient implementation issues (#4287)
- Fix Ingredient.OPTIONAL_PACKET_CODEC not being modified to work with custom ingredients - Fix ShapelessRecipeMixin sometimes not collecting all non-empty item stacks - If client does not support certain custom ingredient, send CustomIngredientImpl#getCustomMatchingItems instead of dummy default (stone)
- Loading branch information
1 parent
b874120
commit 74b7397
Showing
5 changed files
with
119 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
.../java/net/fabricmc/fabric/impl/recipe/ingredient/OptionalCustomIngredientPacketCodec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.fabricmc.fabric.impl.recipe.ingredient; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import net.minecraft.network.RegistryByteBuf; | ||
| import net.minecraft.network.codec.PacketCodec; | ||
| import net.minecraft.recipe.Ingredient; | ||
| import net.minecraft.util.Identifier; | ||
|
|
||
| import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient; | ||
| import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer; | ||
|
|
||
| public class OptionalCustomIngredientPacketCodec implements PacketCodec<RegistryByteBuf, Optional<Ingredient>> { | ||
| private final PacketCodec<RegistryByteBuf, Optional<Ingredient>> fallback; | ||
|
|
||
| public OptionalCustomIngredientPacketCodec(PacketCodec<RegistryByteBuf, Optional<Ingredient>> fallback) { | ||
| this.fallback = fallback; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<Ingredient> decode(RegistryByteBuf buf) { | ||
| int index = buf.readerIndex(); | ||
|
|
||
| if (buf.readVarInt() != CustomIngredientPacketCodec.PACKET_MARKER) { | ||
| // Reset index for vanilla's normal deserialization logic. | ||
| buf.readerIndex(index); | ||
| return this.fallback.decode(buf); | ||
| } | ||
|
|
||
| Identifier type = buf.readIdentifier(); | ||
| CustomIngredientSerializer<?> serializer = CustomIngredientSerializer.get(type); | ||
|
|
||
| if (serializer == null) { | ||
| throw new IllegalArgumentException("Cannot deserialize custom ingredient of unknown type " + type); | ||
| } | ||
|
|
||
| return Optional.of(serializer.getPacketCodec().decode(buf).toVanilla()); | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| public void encode(RegistryByteBuf buf, Optional<Ingredient> value) { | ||
| if (value.isEmpty()) { | ||
| this.fallback.encode(buf, value); | ||
| return; | ||
| } | ||
|
|
||
| CustomIngredient customIngredient = value.get().getCustomIngredient(); | ||
|
|
||
| if (CustomIngredientPacketCodec.shouldEncodeFallback(customIngredient)) { | ||
| // The client doesn't support this custom ingredient, so we send the matching stacks as a regular ingredient. | ||
| this.fallback.encode(buf, value); | ||
| return; | ||
| } | ||
|
|
||
| // The client supports this custom ingredient, so we send it as a custom ingredient. | ||
| buf.writeVarInt(CustomIngredientPacketCodec.PACKET_MARKER); | ||
| buf.writeIdentifier(customIngredient.getSerializer().getIdentifier()); | ||
| PacketCodec<RegistryByteBuf, CustomIngredient> packetCodec = (PacketCodec<RegistryByteBuf, CustomIngredient>) customIngredient.getSerializer().getPacketCodec(); | ||
| packetCodec.encode(buf, customIngredient); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters