Move to service locator

Author: lynxplay

paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java

@@ -0,0 +1,39 @@
+package io.papermc.paper;
+
+import net.kyori.adventure.util.Services;
+import org.bukkit.damage.DamageEffect;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Static bridge to the server internals.
+ * <p>
+ * Any and all methods in here are *not* to be called by plugin developers, may change at any time and may generally
+ * cause issues when called under unexpected circumstances.
+ */
+@ApiStatus.Internal
+@NullMarked
+public interface InternalAPIBridge {
+
+    /**
+     * Yields the instance of this API bridge by lazily requesting it from the java service loader API.
+     *
+     * @return the instance.
+     */
+    static InternalAPIBridge get() {
+        class Holder {
+            public static final InternalAPIBridge INSTANCE = Services.service(InternalAPIBridge.class).orElseThrow();
+        }
+
+        return Holder.INSTANCE;
+    }
+
+    /**
+     * Creates a damage effect instance for the passed key.
+     *
+     * @param mojangKey the string key.
+     * @return the damage effect.
+     */
+    DamageEffect createDamageEffectInstance(String mojangKey);
+}
+

paper-api/src/main/java/io/papermc/paper/StaticUnsafeValues.java

@@ -1,8 +1,7 @@
 package org.bukkit.damage;
 
 import com.google.common.base.Preconditions;
-import io.papermc.paper.StaticUnsafeValues;
-import org.bukkit.Bukkit;
+import io.papermc.paper.InternalAPIBridge;
 import org.bukkit.Sound;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -41,7 +40,7 @@ public interface DamageEffect {
 
     @NotNull
     private static DamageEffect getDamageEffect(@NotNull String key) {
-        return Preconditions.checkNotNull(StaticUnsafeValues.getProvider().getDamageEffect(key), "No DamageEffect found for %s. This is a bug.", key);
+        return Preconditions.checkNotNull(InternalAPIBridge.getProvider().getDamageEffect(key), "No DamageEffect found for %s. This is a bug.", key);
     }
 
     /**

paper-api/src/main/java/org/bukkit/damage/DamageEffect.java

@@ -1,15 +1,15 @@
 package io.papermc.paper;
 
-import com.google.common.base.Preconditions;
 import org.bukkit.craftbukkit.damage.CraftDamageEffect;
 import org.bukkit.damage.DamageEffect;
+import org.jspecify.annotations.NullMarked;
 
-public class PaperUnsafeValuesProvider implements StaticUnsafeValues.UnsafeValuesProvider {
+@NullMarked
+public class PaperUnsafeValuesProvider implements InternalAPIBridge {
     public static final PaperUnsafeValuesProvider INSTANCE = new PaperUnsafeValuesProvider();
 
     @Override
-    public DamageEffect getDamageEffect(String key) {
-        Preconditions.checkArgument(key != null, "key cannot be null");
-        return CraftDamageEffect.getById(key);
+    public DamageEffect createDamageEffectInstance(final String mojangKey) {
+        return CraftDamageEffect.getById(mojangKey);
     }
 }

paper-server/src/main/java/io/papermc/paper/PaperUnsafeValuesProvider.java

@@ -1,17 +1,14 @@
 package io.papermc.paper.plugin.entrypoint;
 
-import io.papermc.paper.PaperUnsafeValuesProvider;
-import io.papermc.paper.StaticUnsafeValues;
 import io.papermc.paper.plugin.provider.PluginProvider;
 import io.papermc.paper.plugin.storage.BootstrapProviderStorage;
 import io.papermc.paper.plugin.storage.ProviderStorage;
 import io.papermc.paper.plugin.storage.ServerPluginProviderStorage;
 import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
-import org.jetbrains.annotations.ApiStatus;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.jetbrains.annotations.ApiStatus;
 
 /**
  * Used by the server to register/load plugin bootstrappers and plugins.
@@ -34,7 +31,6 @@ public static void enterBootstrappers() {
 
     @Override
     public void enter(Entrypoint<?> entrypoint) {
-        StaticUnsafeValues.setProvider(PaperUnsafeValuesProvider.INSTANCE);
         ProviderStorage<?> storage = this.storage.get(entrypoint);
         if (storage == null) {
             throw new IllegalArgumentException("No storage registered for entrypoint %s.".formatted(entrypoint));

paper-server/src/main/java/io/papermc/paper/plugin/entrypoint/LaunchEntryPointHandler.java

@@ -2,7 +2,10 @@
 
 import io.papermc.paper.registry.PaperRegistryBuilder;
 import io.papermc.paper.registry.data.util.Conversions;
-import net.minecraft.world.damagesource.*;
+import net.minecraft.world.damagesource.DamageEffects;
+import net.minecraft.world.damagesource.DamageScaling;
+import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.world.damagesource.DeathMessageType;
 import org.bukkit.craftbukkit.damage.CraftDamageEffect;
 import org.bukkit.craftbukkit.damage.CraftDamageType;
 import org.bukkit.damage.DamageEffect;
@@ -11,24 +14,21 @@
 import static io.papermc.paper.registry.data.util.Checks.asConfigured;
 
 public class PaperDamageTypeRegistryEntry implements DamageTypeRegistryEntry {
+
     protected @Nullable String messageId;
     protected @Nullable Float exhaustion;
     protected @Nullable DamageScaling damageScaling;
-    protected DamageEffects damageEffects;
-    protected DeathMessageType deathMessageType;
+    protected DamageEffects damageEffects = DamageEffects.HURT;
+    protected DeathMessageType deathMessageType = DeathMessageType.DEFAULT;
 
     protected final Conversions conversions;
 
     public PaperDamageTypeRegistryEntry(
-            final Conversions conversions,
-            final @Nullable DamageType internal
+        final Conversions conversions,
+        final @Nullable DamageType internal
     ) {
         this.conversions = conversions;
-        if (internal == null) {
-            this.damageEffects = DamageEffects.HURT;
-            this.deathMessageType = DeathMessageType.DEFAULT;
-            return;
-        }
+        if (internal == null) return;
 
         this.messageId = internal.msgId();
         this.exhaustion = internal.exhaustion();
@@ -69,43 +69,44 @@ public PaperBuilder(final Conversions conversions, final @Nullable DamageType in
         }
 
         @Override
-        public Builder messageId(String messageId) {
+        public Builder messageId(final String messageId) {
             this.messageId = messageId;
             return this;
         }
 
         @Override
-        public Builder exhaustion(float exhaustion) {
+        public Builder exhaustion(final float exhaustion) {
             this.exhaustion = exhaustion;
             return this;
         }
 
         @Override
-        public Builder damageScaling(org.bukkit.damage.DamageScaling scaling) {
+        public Builder damageScaling(final org.bukkit.damage.DamageScaling scaling) {
             this.damageScaling = CraftDamageType.damageScalingToNMS(scaling);
             return this;
         }
 
         @Override
-        public Builder damageEffect(DamageEffect effect) {
+        public Builder damageEffect(final DamageEffect effect) {
             this.damageEffects = ((CraftDamageEffect) effect).getHandle();
             return this;
         }
 
         @Override
-        public Builder deathMessageType(org.bukkit.damage.DeathMessageType deathMessageType) {
+        public Builder deathMessageType(final org.bukkit.damage.DeathMessageType deathMessageType) {
             this.deathMessageType = CraftDamageType.deathMessageTypeToNMS(deathMessageType);
             return this;
         }
 
         @Override
         public DamageType build() {
             return new DamageType(
-                    asConfigured(this.messageId, "messsageId"),
-                    asConfigured(this.damageScaling, "scaling"),
-                    asConfigured(this.exhaustion, "exhaustion"),
-                    this.damageEffects,
-                    this.deathMessageType);
+                asConfigured(this.messageId, "messsageId"),
+                asConfigured(this.damageScaling, "scaling"),
+                asConfigured(this.exhaustion, "exhaustion"),
+                this.damageEffects,
+                this.deathMessageType
+            );
         }
     }
 }

paper-server/src/main/java/io/papermc/paper/registry/data/PaperDamageTypeRegistryEntry.java

@@ -0,0 +1 @@
+io.papermc.paper.PaperUnsafeValuesProvider