-
-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Partially implement mapped item handling
- Loading branch information
Showing
7 changed files
with
157 additions
and
113 deletions.
There are no files selected for viewing
129 changes: 129 additions & 0 deletions
129
.../main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.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,129 @@ | ||
| /* | ||
| * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards | ||
| * Copyright (C) 2016-2024 ViaVersion and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.viaversion.viabackwards.api.rewriters; | ||
|
|
||
| import com.viaversion.viabackwards.api.BackwardsProtocol; | ||
| import com.viaversion.viabackwards.api.data.BackwardsMappings; | ||
| import com.viaversion.viabackwards.api.data.MappedItem; | ||
| import com.viaversion.viaversion.api.minecraft.data.StructuredData; | ||
| import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer; | ||
| import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey; | ||
| import com.viaversion.viaversion.api.minecraft.item.Item; | ||
| import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; | ||
| import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; | ||
| import com.viaversion.viaversion.api.type.Type; | ||
| import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; | ||
| import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; | ||
| import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag; | ||
| import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType, | ||
| T extends BackwardsProtocol<C, ?, ?, S>> extends ItemRewriter<C, S, T> { | ||
|
|
||
| public BackwardsStructuredItemRewriter(final T protocol, final Type<Item> itemType, final Type<Item[]> itemArrayType) { | ||
| super(protocol, itemType, itemArrayType); | ||
| } | ||
|
|
||
| public BackwardsStructuredItemRewriter(final T protocol, final Type<Item> itemType, final Type<Item[]> itemArrayType, final Type<Item> mappedItemType, final Type<Item[]> mappedItemArrayType) { | ||
| super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType); | ||
| } | ||
|
|
||
| @Override | ||
| public @Nullable Item handleItemToClient(@Nullable final Item item) { | ||
| if (item == null) { | ||
| return null; | ||
| } | ||
|
|
||
| final StructuredDataContainer data = item.structuredData(); | ||
| data.setIdLookup(protocol, true); | ||
|
|
||
| // TODO Translatable rewriter on name and lore | ||
|
|
||
| final BackwardsMappings mappingData = protocol.getMappingData(); | ||
| final MappedItem mappedItem = mappingData != null ? mappingData.getMappedItem(item.identifier()) : null; | ||
| if (mappedItem == null) { | ||
| // Just rewrite the id | ||
| if (mappingData != null && mappingData.getItemMappings() != null) { | ||
| item.setIdentifier(mappingData.getNewItemId(item.identifier())); | ||
| } | ||
| return item; | ||
| } | ||
|
|
||
| // Save original id, set remapped id | ||
| final CompoundTag tag = createCustomTag(item); | ||
| tag.putInt(nbtTagName + "|id", item.identifier()); | ||
| item.setIdentifier(mappedItem.getId()); | ||
|
|
||
| // Add custom model data | ||
| if (mappedItem.customModelData() != null && !data.contains(StructuredDataKey.CUSTOM_MODEL_DATA)) { | ||
| data.add(StructuredDataKey.CUSTOM_MODEL_DATA, mappedItem.customModelData()); | ||
| } | ||
|
|
||
| // TODO custom name | ||
| return item; | ||
| } | ||
|
|
||
| @Override | ||
| public @Nullable Item handleItemToServer(@Nullable final Item item) { | ||
| if (item == null) { | ||
| return null; | ||
| } | ||
|
|
||
| final BackwardsMappings mappingData = protocol.getMappingData(); | ||
| if (mappingData != null && mappingData.getItemMappings() != null) { | ||
| item.setIdentifier(mappingData.getOldItemId(item.identifier())); | ||
| } | ||
|
|
||
| final StructuredDataContainer data = item.structuredData(); | ||
| data.setIdLookup(protocol, false); | ||
|
|
||
| final CompoundTag tag = customTag(item); | ||
| if (tag != null) { | ||
| final Tag originalId = tag.remove(nbtTagName + "|id"); | ||
| if (originalId instanceof IntTag) { | ||
| item.setIdentifier(((NumberTag) originalId).asInt()); | ||
| } | ||
| } | ||
|
|
||
| restoreDisplayTag(item); | ||
| return item; | ||
| } | ||
|
|
||
| protected @Nullable CompoundTag customTag(final Item item) { | ||
| final StructuredData<CompoundTag> customData = item.structuredData().getNonEmpty(StructuredDataKey.CUSTOM_DATA); | ||
| return customData != null ? customData.value() : null; | ||
| } | ||
|
|
||
| protected CompoundTag createCustomTag(final Item item) { | ||
| final StructuredDataContainer data = item.structuredData(); | ||
| final StructuredData<CompoundTag> customData = data.getNonEmpty(StructuredDataKey.CUSTOM_DATA); | ||
| if (customData != null) { | ||
| return customData.value(); | ||
| } | ||
|
|
||
| final CompoundTag tag = new CompoundTag(); | ||
| data.add(StructuredDataKey.CUSTOM_DATA, tag); | ||
| return tag; | ||
| } | ||
|
|
||
| @Override | ||
| protected void restoreDisplayTag(final Item item) { | ||
| // TODO | ||
| } | ||
| } |
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
79 changes: 0 additions & 79 deletions
79
common/src/main/java/com/viaversion/viabackwards/api/rewriters/StructuredItemRewriter.java
This file was deleted.
Oops, something went wrong.
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
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