Fix #5089 and made Registries instance based

GeyserMC · Oct 21, 2024 · 0eee91f · 0eee91f
1 parent d64c0b3
commit 0eee91f
Show file tree

Hide file tree

Showing 56 changed files with 1,473 additions and 707 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -34,6 +34,30 @@
 import io.netty.util.NettyRuntime;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import io.netty.util.internal.SystemPropertyUtil;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.nio.file.Path;
+import java.security.Key;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -103,31 +127,6 @@
 import org.geysermc.geyser.util.WebUtils;
 import org.geysermc.mcprotocollib.network.tcp.TcpSession;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.nio.file.Path;
-import java.security.Key;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Consumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 @Getter
 public class GeyserImpl implements GeyserApi, EventRegistrar {
     public static final ObjectMapper JSON_MAPPER = new ObjectMapper()
@@ -297,7 +296,7 @@ private void startInstance() {
 
         SkinProvider.registerCacheImageTask(this);
 
-        Registries.RESOURCE_PACKS.load();
+        Registries.resourcePacks().load();
 
         String geyserUdpPort = System.getProperty("geyserUdpPort", "");
         String pluginUdpPort = geyserUdpPort.isEmpty() ? System.getProperty("pluginUdpPort", "") : geyserUdpPort;
@@ -723,7 +722,7 @@ public void disable() {
         runIfNonNull(newsHandler, NewsHandler::shutdown);
         runIfNonNull(erosionUnixListener, UnixSocketClientListener::close);
 
-        Registries.RESOURCE_PACKS.get().clear();
+        Registries.resourcePacks().get().clear();
 
         this.setEnabled(false);
     }
@@ -781,7 +780,7 @@ public CommandRegistry commandRegistry() {
     @Override
     @SuppressWarnings("unchecked")
     public <R extends T, T> @NonNull R provider(@NonNull Class<T> apiClass, @Nullable Object... args) {
-        ProviderSupplier provider = Registries.PROVIDERS.get(apiClass);
+        ProviderSupplier provider = Registries.providers().get(apiClass);
         if (provider == null) {
             throw new IllegalArgumentException("No provider found for " + apiClass);
         }

diff --git a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinition.java
@@ -37,7 +37,6 @@
 import org.geysermc.geyser.entity.type.Entity;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.translator.entity.EntityMetadataTranslator;
-import org.geysermc.geyser.util.EnvironmentUtils;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
@@ -146,13 +145,8 @@ public Builder<T> addTranslator(EntityMetadataTranslator<T, ?, ?> translator) {
             return this;
         }
 
-        /**
-         * Build the given entity. If a testing environment has been discovered the entity is not registered,
-         * otherwise it is. This is to prevent all the registries from loading, which will fail (and should
-         * not be loaded) while testing
-         */
         public EntityDefinition<T> build() {
-            return build(!EnvironmentUtils.isUnitTesting);
+            return build(true);
         }
 
         /**
@@ -165,10 +159,10 @@ public EntityDefinition<T> build(boolean register) {
             }
             EntityDefinition<T> definition = new EntityDefinition<>(factory, type, identifier, width, height, offset, registeredProperties, translators);
             if (register && definition.entityType() != null) {
-                Registries.ENTITY_DEFINITIONS.get().putIfAbsent(definition.entityType(), definition);
-                Registries.JAVA_ENTITY_IDENTIFIERS.get().putIfAbsent("minecraft:" + type.name().toLowerCase(Locale.ROOT), definition);
+                Registries.entityDefinitions().get().putIfAbsent(definition.entityType(), definition);
+                Registries.javaEntityIdentifiers().get().putIfAbsent("minecraft:" + type.name().toLowerCase(Locale.ROOT), definition);
                 if (definition.registeredProperties() != null) {
-                    Registries.BEDROCK_ENTITY_PROPERTIES.get().add(definition.registeredProperties().toNbtMap(identifier));
+                    Registries.bedrockEntityProperties().get().add(definition.registeredProperties().toNbtMap(identifier));
                 }
             }
             return definition;

diff --git a/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java b/core/src/main/java/org/geysermc/geyser/entity/EntityDefinitions.java
@@ -145,7 +145,6 @@
 import org.geysermc.geyser.entity.type.player.PlayerEntity;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.translator.text.MessageTranslator;
-import org.geysermc.geyser.util.EnvironmentUtils;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
@@ -1122,10 +1121,7 @@ public final class EntityDefinitions {
                 .identifier("minecraft:armor_stand") // Emulated
                 .build(false); // Never sent over the network
 
-        // causes the registries to load
-        if (!EnvironmentUtils.isUnitTesting) {
-            Registries.JAVA_ENTITY_IDENTIFIERS.get().put("minecraft:marker", null); // We don't need an entity definition for this as it is never sent over the network
-        }
+        Registries.javaEntityIdentifiers().get().put("minecraft:marker", null); // We don't need an entity definition for this as it is never sent over the network
     }
 
     public static void init() {

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/AreaEffectCloudEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/AreaEffectCloudEntity.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.entity.type;
 
+import java.util.UUID;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.data.ParticleType;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
@@ -38,8 +39,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.EntityEffectParticleData;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
 
-import java.util.UUID;
-
 public class AreaEffectCloudEntity extends Entity {
 
     public AreaEffectCloudEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
@@ -69,7 +68,7 @@ public void setRadius(FloatEntityMetadata entityMetadata) {
 
     public void setParticle(EntityMetadata<Particle, ?> entityMetadata) {
         Particle particle = entityMetadata.getValue();
-        Registries.PARTICLES.map(particle.getType(), p -> p.levelEventType() instanceof ParticleType particleType ? particleType : null).ifPresent(type ->
+        Registries.particles().map(particle.getType(), p -> p.levelEventType() instanceof ParticleType particleType ? particleType : null).ifPresent(type ->
                 dirtyMetadata.put(EntityDataTypes.AREA_EFFECT_CLOUD_PARTICLE, type));
 
         if (particle.getData() instanceof EntityEffectParticleData effectParticleData) {

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/ThrownPotionEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/ThrownPotionEntity.java
@@ -25,6 +25,8 @@
 
 package org.geysermc.geyser.entity.type;
 
+import java.util.EnumSet;
+import java.util.UUID;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
@@ -40,9 +42,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.PotionContents;
 
-import java.util.EnumSet;
-import java.util.UUID;
-
 public class ThrownPotionEntity extends ThrowableItemEntity {
     private static final EnumSet<Potion> NON_ENCHANTED_POTIONS = EnumSet.of(Potion.WATER, Potion.MUNDANE, Potion.THICK, Potion.AWKWARD);
 
@@ -73,7 +72,7 @@ public void setItem(EntityMetadata<ItemStack, ?> entityMetadata) {
                     }
                 }
 
-                boolean isLingering = Registries.JAVA_ITEMS.get().get(itemStack.getId()) == Items.LINGERING_POTION;
+                boolean isLingering = Registries.javaItems().get().get(itemStack.getId()) == Items.LINGERING_POTION;
                 setFlag(EntityFlag.LINGERING, isLingering);
             }
         }

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java
@@ -25,8 +25,11 @@
 
 package org.geysermc.geyser.entity.type.living;
 
+import java.util.Optional;
+import java.util.UUID;
 import lombok.Getter;
 import net.kyori.adventure.text.Component;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataType;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
@@ -36,6 +39,7 @@
 import org.geysermc.geyser.entity.EntityDefinitions;
 import org.geysermc.geyser.entity.type.LivingEntity;
 import org.geysermc.geyser.item.Items;
+import org.geysermc.geyser.scoreboard.Team;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.util.InteractionResult;
 import org.geysermc.geyser.util.MathUtils;
@@ -45,9 +49,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
 
-import java.util.Optional;
-import java.util.UUID;
-
 public class ArmorStandEntity extends LivingEntity {
 
     // These are used to store the state of the armour stand for use when handling invisibility
@@ -123,6 +124,12 @@ public void moveAbsolute(Vector3f position, float yaw, float pitch, float headYa
         this.position = position;
     }
 
+    @Override
+    public void updateNametag(@Nullable Team team) {
+        // unlike all other LivingEntities, armor stands are not affected by team nametag visibility
+        super.updateNametag(team, true);
+    }
+
     @Override
     public void setDisplayName(EntityMetadata<Optional<Component>, ?> entityMetadata) {
         super.setDisplayName(entityMetadata);

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java
@@ -43,7 +43,6 @@
 import org.cloudburstmc.protocol.bedrock.data.GameType;
 import org.cloudburstmc.protocol.bedrock.data.PlayerPermission;
 import org.cloudburstmc.protocol.bedrock.data.command.CommandPermission;
-import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataMap;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityLinkData;
@@ -112,20 +111,6 @@ public PlayerEntity(GeyserSession session, int entityId, long geyserId, UUID uui
         this.texturesProperty = texturesProperty;
     }
 
-    /**
-     * Do not use! For testing purposes only
-     */
-    public PlayerEntity(GeyserSession session, long geyserId, UUID uuid, String username) {
-        super(session, -1, geyserId, uuid, EntityDefinitions.PLAYER, Vector3f.ZERO, Vector3f.ZERO, 0, 0, 0);
-        this.username = username;
-        this.nametag = username;
-        this.texturesProperty = null;
-
-        // clear initial metadata
-        dirtyMetadata.apply(new EntityDataMap());
-        setFlagsDirty(false);
-    }
-
     @Override
     protected void initializeMetadata() {
         super.initializeMetadata();
@@ -193,11 +178,7 @@ public void sendPlayer() {
         if (session.getEntityCache().getPlayerEntity(uuid) == null)
             return;
 
-        if (session.getEntityCache().getEntityByGeyserId(geyserId) == null) {
-            session.getEntityCache().spawnEntity(this);
-        } else {
-            spawnEntity();
-        }
+        session.getEntityCache().spawnEntity(this);
     }
 
     @Override

diff --git a/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java b/core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java
@@ -25,7 +25,12 @@
 
 package org.geysermc.geyser.inventory;
 
-import lombok.*;
+import java.util.HashMap;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
@@ -39,8 +44,6 @@
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
 import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
 
-import java.util.HashMap;
-
 @Data
 public class GeyserItemStack {
     public static final GeyserItemStack EMPTY = new GeyserItemStack(Items.AIR_ID, 0, null);
@@ -165,7 +168,7 @@ public ItemMapping getMapping(GeyserSession session) {
 
     public Item asItem() {
         if (item == null) {
-            return (item = Registries.JAVA_ITEMS.get().get(javaId));
+            return (item = Registries.javaItems().get().get(javaId));
         }
         return item;
     }

diff --git a/core/src/main/java/org/geysermc/geyser/item/Items.java b/core/src/main/java/org/geysermc/geyser/item/Items.java
@@ -25,14 +25,46 @@
 
 package org.geysermc.geyser.item;
 
+import static org.geysermc.geyser.item.type.Item.builder;
+
 import org.geysermc.geyser.item.components.Rarity;
 import org.geysermc.geyser.item.components.ToolTier;
-import org.geysermc.geyser.item.type.*;
+import org.geysermc.geyser.item.type.ArmorItem;
+import org.geysermc.geyser.item.type.ArrowItem;
+import org.geysermc.geyser.item.type.AxolotlBucketItem;
+import org.geysermc.geyser.item.type.BannerItem;
+import org.geysermc.geyser.item.type.BlockItem;
+import org.geysermc.geyser.item.type.BoatItem;
+import org.geysermc.geyser.item.type.CompassItem;
+import org.geysermc.geyser.item.type.CrossbowItem;
+import org.geysermc.geyser.item.type.DecoratedPotItem;
+import org.geysermc.geyser.item.type.DyeItem;
+import org.geysermc.geyser.item.type.DyeableArmorItem;
+import org.geysermc.geyser.item.type.ElytraItem;
+import org.geysermc.geyser.item.type.EnchantedBookItem;
+import org.geysermc.geyser.item.type.FilledMapItem;
+import org.geysermc.geyser.item.type.FireworkRocketItem;
+import org.geysermc.geyser.item.type.FireworkStarItem;
+import org.geysermc.geyser.item.type.FishingRodItem;
+import org.geysermc.geyser.item.type.GoatHornItem;
+import org.geysermc.geyser.item.type.Item;
+import org.geysermc.geyser.item.type.MaceItem;
+import org.geysermc.geyser.item.type.MapItem;
+import org.geysermc.geyser.item.type.OminousBottleItem;
+import org.geysermc.geyser.item.type.PlayerHeadItem;
+import org.geysermc.geyser.item.type.PotionItem;
+import org.geysermc.geyser.item.type.ShieldItem;
+import org.geysermc.geyser.item.type.ShulkerBoxItem;
+import org.geysermc.geyser.item.type.SpawnEggItem;
+import org.geysermc.geyser.item.type.TieredItem;
+import org.geysermc.geyser.item.type.TippedArrowItem;
+import org.geysermc.geyser.item.type.TropicalFishBucketItem;
+import org.geysermc.geyser.item.type.WolfArmorItem;
+import org.geysermc.geyser.item.type.WritableBookItem;
+import org.geysermc.geyser.item.type.WrittenBookItem;
 import org.geysermc.geyser.level.block.Blocks;
 import org.geysermc.geyser.registry.Registries;
 
-import static org.geysermc.geyser.item.type.Item.builder;
-
 /**
  * A list, in order, of all Java items.
  */
@@ -1375,13 +1407,13 @@ public final class Items {
     public static final int AIR_ID = AIR.javaId();
 
     private static <T extends Item> T register(T item) {
-        return register(item, Registries.JAVA_ITEMS.get().size());
+        return register(item, Registries.javaItems().get().size());
     }
 
     public static <T extends Item> T register(T item, int id) {
         item.setJavaId(id);
-        Registries.JAVA_ITEMS.registerWithAnyIndex(id, item, AIR);
-        Registries.JAVA_ITEM_IDENTIFIERS.register(item.javaIdentifier(), item);
+        Registries.javaItems().registerWithAnyIndex(id, item, AIR);
+        Registries.javaItemIdentifiers().register(item.javaIdentifier(), item);
         return item;
     }