-
Notifications
You must be signed in to change notification settings - Fork 405
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for partially synced client tags (#3118)
* Draft v1.1.0 * Resolve some comments * Add javadoc * Remove old behavior * Minor cleanup * Add test for partially synced tags * Address nitpick * Fix checkstyle * Hard fail when datapack fails to regsiter Co-authored-by: modmuss <modmuss50@gmail.com> * Fix missing import * Refactor Don't recurse through tag hierarchy * Add note for test * Adjustments to logic to handle server-missing nested tags * Restore recursive search, add tracking of checked tags * Cleanup --------- Co-authored-by: modmuss <modmuss50@gmail.com>
- Loading branch information
Showing
8 changed files
with
225 additions
and
86 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
124 changes: 124 additions & 0 deletions
124
...lient-tags-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsImpl.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,124 @@ | ||
| /* | ||
| * 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.tag.client; | ||
|
|
||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.registry.Registries; | ||
| import net.minecraft.registry.Registry; | ||
| import net.minecraft.registry.RegistryKey; | ||
| import net.minecraft.registry.entry.RegistryEntry; | ||
| import net.minecraft.registry.tag.TagKey; | ||
|
|
||
| public class ClientTagsImpl { | ||
| private static final Map<TagKey<?>, ClientTagsLoader.LoadedTag> LOCAL_TAG_HIERARCHY = new ConcurrentHashMap<>(); | ||
|
|
||
| public static <T> boolean isInWithLocalFallback(TagKey<T> tagKey, RegistryEntry<T> registryEntry) { | ||
| return isInWithLocalFallback(tagKey, registryEntry, new HashSet<>()); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static <T> boolean isInWithLocalFallback(TagKey<T> tagKey, RegistryEntry<T> registryEntry, Set<TagKey<T>> checked) { | ||
| if (checked.contains(tagKey)) { | ||
| return false; | ||
| } | ||
|
|
||
| checked.add(tagKey); | ||
|
|
||
| // Check if the tag exists in the dynamic registry first | ||
| Optional<? extends Registry<T>> maybeRegistry = ClientTagsImpl.getRegistry(tagKey); | ||
|
|
||
| if (maybeRegistry.isPresent()) { | ||
| // Check the synced tag exists and use that | ||
| if (maybeRegistry.get().getEntryList(tagKey).isPresent()) { | ||
| return registryEntry.isIn(tagKey); | ||
| } | ||
| } | ||
|
|
||
| if (registryEntry.getKey().isEmpty()) { | ||
| // No key? | ||
| return false; | ||
| } | ||
|
|
||
| // Recursively search the entries contained with the tag | ||
| ClientTagsLoader.LoadedTag wt = ClientTagsImpl.getOrCreatePartiallySyncedTag(tagKey); | ||
|
|
||
| if (wt.immediateChildIds().contains(registryEntry.getKey().get().getValue())) { | ||
| return true; | ||
| } | ||
|
|
||
| for (TagKey<?> key : wt.immediateChildTags()) { | ||
| if (isInWithLocalFallback((TagKey<T>) key, registryEntry, checked)) { | ||
| return true; | ||
| } | ||
|
|
||
| checked.add((TagKey<T>) key); | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public static <T> Optional<? extends Registry<T>> getRegistry(TagKey<T> tagKey) { | ||
| Objects.requireNonNull(tagKey); | ||
|
|
||
| // Check if the tag represents a dynamic registry | ||
| if (MinecraftClient.getInstance() != null) { | ||
| if (MinecraftClient.getInstance().world != null) { | ||
| if (MinecraftClient.getInstance().world.getRegistryManager() != null) { | ||
| Optional<? extends Registry<T>> maybeRegistry = MinecraftClient.getInstance().world | ||
| .getRegistryManager().getOptional(tagKey.registry()); | ||
| if (maybeRegistry.isPresent()) return maybeRegistry; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return (Optional<? extends Registry<T>>) Registries.REGISTRIES.getOrEmpty(tagKey.registry().getValue()); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public static <T> Optional<RegistryEntry<T>> getRegistryEntry(TagKey<T> tagKey, T entry) { | ||
| Optional<? extends Registry<?>> maybeRegistry = getRegistry(tagKey); | ||
|
|
||
| if (maybeRegistry.isEmpty() || !tagKey.isOf(maybeRegistry.get().getKey())) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| Registry<T> registry = (Registry<T>) maybeRegistry.get(); | ||
|
|
||
| Optional<RegistryKey<T>> maybeKey = registry.getKey(entry); | ||
|
|
||
| return maybeKey.map(registry::entryOf); | ||
| } | ||
|
|
||
| public static ClientTagsLoader.LoadedTag getOrCreatePartiallySyncedTag(TagKey<?> tagKey) { | ||
| ClientTagsLoader.LoadedTag loadedTag = LOCAL_TAG_HIERARCHY.get(tagKey); | ||
|
|
||
| if (loadedTag == null) { | ||
| loadedTag = ClientTagsLoader.loadTag(tagKey); | ||
| LOCAL_TAG_HIERARCHY.put(tagKey, loadedTag); | ||
| } | ||
|
|
||
| return loadedTag; | ||
| } | ||
| } |
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
Oops, something went wrong.