From ef772dcfdb9ffaa208074139111f463b1a336463 Mon Sep 17 00:00:00 2001 From: Eclipse Date: Tue, 9 Jul 2024 13:52:26 +0000 Subject: [PATCH] Renamed RegistryContext to RegistryEntryContext --- .../org/geysermc/geyser/inventory/recipe/TrimRecipe.java | 6 +++--- .../org/geysermc/geyser/item/enchantment/Enchantment.java | 4 ++-- .../main/java/org/geysermc/geyser/level/JavaDimension.java | 4 ++-- .../main/java/org/geysermc/geyser/level/JukeboxSong.java | 4 ++-- .../org/geysermc/geyser/session/cache/RegistryCache.java | 6 +++--- .../{RegistryContext.java => RegistryEntryContext.java} | 2 +- .../main/java/org/geysermc/geyser/text/TextDecoration.java | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) rename core/src/main/java/org/geysermc/geyser/session/cache/registry/{RegistryContext.java => RegistryEntryContext.java} (94%) diff --git a/core/src/main/java/org/geysermc/geyser/inventory/recipe/TrimRecipe.java b/core/src/main/java/org/geysermc/geyser/inventory/recipe/TrimRecipe.java index 3c162ca2f..b5e76a296 100644 --- a/core/src/main/java/org/geysermc/geyser/inventory/recipe/TrimRecipe.java +++ b/core/src/main/java/org/geysermc/geyser/inventory/recipe/TrimRecipe.java @@ -32,7 +32,7 @@ import org.cloudburstmc.protocol.bedrock.data.TrimPattern; import org.cloudburstmc.protocol.bedrock.data.inventory.descriptor.ItemDescriptorWithCount; import org.cloudburstmc.protocol.bedrock.data.inventory.descriptor.ItemTagDescriptor; import org.geysermc.geyser.registry.type.ItemMapping; -import org.geysermc.geyser.session.cache.registry.RegistryContext; +import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; import org.geysermc.geyser.translator.text.MessageTranslator; /** @@ -45,7 +45,7 @@ public final class TrimRecipe { public static final ItemDescriptorWithCount ADDITION = tagDescriptor("minecraft:trim_materials"); public static final ItemDescriptorWithCount TEMPLATE = tagDescriptor("minecraft:trim_templates"); - public static TrimMaterial readTrimMaterial(RegistryContext context) { + public static TrimMaterial readTrimMaterial(RegistryEntryContext context) { String key = context.id().asMinimalString(); // Color is used when hovering over the item @@ -65,7 +65,7 @@ public final class TrimRecipe { return new TrimMaterial(key, legacy.substring(2).trim(), itemMapping.getBedrockIdentifier()); } - public static TrimPattern readTrimPattern(RegistryContext context) { + public static TrimPattern readTrimPattern(RegistryEntryContext context) { String key = context.id().asMinimalString(); String itemIdentifier = context.data().getString("template_item"); diff --git a/core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java b/core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java index 4e11e3cba..3c0caa60c 100644 --- a/core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java +++ b/core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java @@ -33,7 +33,7 @@ import org.cloudburstmc.nbt.NbtMap; import org.geysermc.geyser.inventory.item.BedrockEnchantment; import org.geysermc.geyser.item.Items; import org.geysermc.geyser.registry.Registries; -import org.geysermc.geyser.session.cache.registry.RegistryContext; +import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; import org.geysermc.geyser.translator.text.MessageTranslator; import java.util.HashSet; @@ -54,7 +54,7 @@ public record Enchantment(String identifier, HolderSet exclusiveSet, @Nullable BedrockEnchantment bedrockEnchantment) { - public static Enchantment read(RegistryContext context) { + public static Enchantment read(RegistryEntryContext context) { NbtMap data = context.data(); Set effects = readEnchantmentComponents(data.getCompound("effects")); diff --git a/core/src/main/java/org/geysermc/geyser/level/JavaDimension.java b/core/src/main/java/org/geysermc/geyser/level/JavaDimension.java index 080871fe4..dd0f4215e 100644 --- a/core/src/main/java/org/geysermc/geyser/level/JavaDimension.java +++ b/core/src/main/java/org/geysermc/geyser/level/JavaDimension.java @@ -26,7 +26,7 @@ package org.geysermc.geyser.level; import org.cloudburstmc.nbt.NbtMap; -import org.geysermc.geyser.session.cache.registry.RegistryContext; +import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; /** * Represents the information we store from the current Java dimension @@ -35,7 +35,7 @@ import org.geysermc.geyser.session.cache.registry.RegistryContext; */ public record JavaDimension(int minY, int maxY, boolean piglinSafe, double worldCoordinateScale) { - public static JavaDimension read(RegistryContext entry) { + public static JavaDimension read(RegistryEntryContext entry) { NbtMap dimension = entry.data(); int minY = dimension.getInt("min_y"); int maxY = dimension.getInt("height"); diff --git a/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java b/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java index aaad158ac..b00dc9f98 100644 --- a/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java +++ b/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java @@ -27,12 +27,12 @@ package org.geysermc.geyser.level; import org.cloudburstmc.nbt.NbtMap; import org.geysermc.geyser.GeyserImpl; -import org.geysermc.geyser.session.cache.registry.RegistryContext; +import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; import org.geysermc.geyser.translator.text.MessageTranslator; public record JukeboxSong(String soundEvent, String description) { - public static JukeboxSong read(RegistryContext context) { + public static JukeboxSong read(RegistryEntryContext context) { NbtMap data = context.data(); Object soundEventObject = data.get("sound_event"); String soundEvent; diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java index 14ea2d6d6..de6dd7c4c 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/RegistryCache.java @@ -45,7 +45,7 @@ import org.geysermc.geyser.level.JukeboxSong; import org.geysermc.geyser.level.PaintingType; import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.session.cache.registry.JavaRegistry; -import org.geysermc.geyser.session.cache.registry.RegistryContext; +import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; import org.geysermc.geyser.session.cache.registry.SimpleJavaRegistry; import org.geysermc.geyser.text.TextDecoration; import org.geysermc.geyser.translator.level.BiomeTranslator; @@ -149,7 +149,7 @@ public final class RegistryCache { * @param reader converts the RegistryEntry NBT into a class file * @param the class that represents these entries. */ - private static void register(String registry, Function> localCacheFunction, Function reader) { + private static void register(String registry, Function> localCacheFunction, Function reader) { Key registryKey = MinecraftKey.key(registry); REGISTRIES.put(registryKey, (registryCache, entries) -> { Map localRegistry = null; @@ -175,7 +175,7 @@ public final class RegistryCache { entry = new RegistryEntry(entry.getId(), localRegistry.get(entry.getId())); } - RegistryContext context = new RegistryContext(entry, entryIdMap, registryCache.session); + RegistryEntryContext context = new RegistryEntryContext(entry, entryIdMap, registryCache.session); // This is what Geyser wants to keep as a value for this registry. T cacheEntry = reader.apply(context); builder.add(i, cacheEntry); diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/registry/RegistryContext.java b/core/src/main/java/org/geysermc/geyser/session/cache/registry/RegistryEntryContext.java similarity index 94% rename from core/src/main/java/org/geysermc/geyser/session/cache/registry/RegistryContext.java rename to core/src/main/java/org/geysermc/geyser/session/cache/registry/RegistryEntryContext.java index 34af7dea8..e895711a4 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/registry/RegistryContext.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/registry/RegistryEntryContext.java @@ -38,7 +38,7 @@ import org.geysermc.mcprotocollib.protocol.data.game.RegistryEntry; * @param keyIdMap a map for each of the resource location's in the registry and their respective network IDs. * @param session the Geyser session. */ -public record RegistryContext(RegistryEntry entry, Map keyIdMap, GeyserSession session) { +public record RegistryEntryContext(RegistryEntry entry, Map keyIdMap, GeyserSession session) { public int getNetworkId(Key registryKey) { return keyIdMap.getOrDefault(registryKey, 0); diff --git a/core/src/main/java/org/geysermc/geyser/text/TextDecoration.java b/core/src/main/java/org/geysermc/geyser/text/TextDecoration.java index 40fa1378b..94aec22ef 100644 --- a/core/src/main/java/org/geysermc/geyser/text/TextDecoration.java +++ b/core/src/main/java/org/geysermc/geyser/text/TextDecoration.java @@ -29,7 +29,7 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; import org.cloudburstmc.nbt.NbtMap; import org.cloudburstmc.nbt.NbtType; -import org.geysermc.geyser.session.cache.registry.RegistryContext; +import org.geysermc.geyser.session.cache.registry.RegistryEntryContext; import org.geysermc.mcprotocollib.protocol.data.game.chat.ChatType; import org.geysermc.mcprotocollib.protocol.data.game.chat.ChatTypeDecoration; @@ -43,7 +43,7 @@ public record TextDecoration(String translationKey, List parameters, throw new UnsupportedOperationException(); } - public static ChatType readChatType(RegistryContext context) { + public static ChatType readChatType(RegistryEntryContext context) { // Note: The ID is NOT ALWAYS THE SAME! ViaVersion as of 1.19 adds two registry entries that do NOT match vanilla. // (This note has been passed around through several classes and iterations. It stays as a warning // to anyone that dares to try and hardcode registry IDs.)