Expose chemical registries as defaulted registries so that they provide better nullability markers for things like get

Author: pupnewfster

src/api/java/mekanism/api/MekanismAPI.java

@@ -17,6 +17,7 @@
 import mekanism.api.recipes.ingredients.chemical.IPigmentIngredient;
 import mekanism.api.recipes.ingredients.chemical.ISlurryIngredient;
 import mekanism.api.robit.RobitSkin;
+import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -59,6 +60,13 @@ private static <T> ResourceKey<Registry<MapCodec<? extends T>>> codecRegistryKey
         return ResourceKey.createRegistryKey(rl(path));
     }
 
+    /**
+     * Constant location representing the name all empty chemicals will be registered under.
+     *
+     * @since 10.6.0
+     */
+    public static final ResourceLocation EMPTY_CHEMICAL_NAME = rl("empty");
+
     /**
      * Gets the {@link ResourceKey} representing the name of the Registry for {@link Gas gases}.
      *
@@ -143,8 +151,8 @@ private static <T> ResourceKey<Registry<MapCodec<? extends T>>> codecRegistryKey
      * @see #GAS_REGISTRY_NAME
      * @since 10.5.0
      */
-    public static final Registry<Gas> GAS_REGISTRY = new RegistryBuilder<>(GAS_REGISTRY_NAME)
-          .defaultKey(rl("empty"))
+    public static final DefaultedRegistry<Gas> GAS_REGISTRY = (DefaultedRegistry<Gas>) new RegistryBuilder<>(GAS_REGISTRY_NAME)
+          .defaultKey(EMPTY_CHEMICAL_NAME)
           .sync(true)
           .create();
     /**
@@ -162,8 +170,8 @@ private static <T> ResourceKey<Registry<MapCodec<? extends T>>> codecRegistryKey
      * @see #INFUSE_TYPE_REGISTRY_NAME
      * @since 10.5.0
      */
-    public static final Registry<InfuseType> INFUSE_TYPE_REGISTRY = new RegistryBuilder<>(INFUSE_TYPE_REGISTRY_NAME)
-          .defaultKey(rl("empty"))
+    public static final DefaultedRegistry<InfuseType> INFUSE_TYPE_REGISTRY = (DefaultedRegistry<InfuseType>) new RegistryBuilder<>(INFUSE_TYPE_REGISTRY_NAME)
+          .defaultKey(EMPTY_CHEMICAL_NAME)
           .sync(true)
           .create();
     /**
@@ -181,8 +189,8 @@ private static <T> ResourceKey<Registry<MapCodec<? extends T>>> codecRegistryKey
      * @see #PIGMENT_REGISTRY_NAME
      * @since 10.5.0
      */
-    public static final Registry<Pigment> PIGMENT_REGISTRY = new RegistryBuilder<>(PIGMENT_REGISTRY_NAME)
-          .defaultKey(rl("empty"))
+    public static final DefaultedRegistry<Pigment> PIGMENT_REGISTRY = (DefaultedRegistry<Pigment>) new RegistryBuilder<>(PIGMENT_REGISTRY_NAME)
+          .defaultKey(EMPTY_CHEMICAL_NAME)
           .sync(true)
           .create();
     /**
@@ -200,8 +208,8 @@ private static <T> ResourceKey<Registry<MapCodec<? extends T>>> codecRegistryKey
      * @see #SLURRY_REGISTRY_NAME
      * @since 10.5.0
      */
-    public static final Registry<Slurry> SLURRY_REGISTRY = new RegistryBuilder<>(SLURRY_REGISTRY_NAME)
-          .defaultKey(rl("empty"))
+    public static final DefaultedRegistry<Slurry> SLURRY_REGISTRY = (DefaultedRegistry<Slurry>) new RegistryBuilder<>(SLURRY_REGISTRY_NAME)
+          .defaultKey(EMPTY_CHEMICAL_NAME)
           .sync(true)
           .create();
     /**
@@ -228,14 +236,8 @@ private static <T> ResourceKey<Registry<MapCodec<? extends T>>> codecRegistryKey
      * @see #ROBIT_SKIN_SERIALIZER_REGISTRY_NAME
      * @since 10.5.0
      */
-    public static final Registry<MapCodec<? extends RobitSkin>> ROBIT_SKIN_SERIALIZER_REGISTRY = new RegistryBuilder<>(ROBIT_SKIN_SERIALIZER_REGISTRY_NAME).create();
-
-    /**
-     * Constant location representing the name all empty chemicals will be registered under.
-     *
-     * @since 10.6.0
-     */
-    public static final ResourceLocation EMPTY_CHEMICAL_NAME = new ResourceLocation(MEKANISM_MODID, "empty");
+    public static final Registry<MapCodec<? extends RobitSkin>> ROBIT_SKIN_SERIALIZER_REGISTRY = new RegistryBuilder<>(ROBIT_SKIN_SERIALIZER_REGISTRY_NAME)
+          .create();
 
     //TODO: Potentially define these with DeferredHolder for purposes of fully defining them outside of the API
     // would have some minor issues with how the empty stacks are declared

src/api/java/mekanism/api/chemical/Chemical.java

@@ -20,8 +20,8 @@
 import mekanism.api.chemical.slurry.Slurry;
 import mekanism.api.providers.IChemicalProvider;
 import mekanism.api.text.TextComponentUtil;
+import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.Holder;
-import net.minecraft.core.Registry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.StreamCodec;
@@ -273,9 +273,8 @@ public Holder<CHEMICAL> getAsHolder() {
     public abstract boolean isEmptyType();
 
     @Override
-    @SuppressWarnings({"ConstantConditions", "unchecked"})
+    @SuppressWarnings("unchecked")
     public ResourceLocation getRegistryName() {
-        //May be null if called before the object is registered
         return getRegistry().getKey((CHEMICAL) this);
     }
 
@@ -286,5 +285,5 @@ public ResourceLocation getRegistryName() {
      *
      * @since 10.5.0
      */
-    protected abstract Registry<CHEMICAL> getRegistry();
+    protected abstract DefaultedRegistry<CHEMICAL> getRegistry();
 }

src/api/java/mekanism/api/chemical/ChemicalStack.java

@@ -231,11 +231,6 @@ protected ChemicalStack(@Nullable Void unused) {
         this.chemical = null;
     }
 
-    /**
-     * Registry the chemical is a part of.
-     */
-    protected abstract Registry<CHEMICAL> getRegistry();
-
     /**
      * Helper ot get the empty version of this chemical.
      */

src/api/java/mekanism/api/chemical/gas/Gas.java

@@ -6,7 +6,7 @@
 import mekanism.api.chemical.Chemical;
 import mekanism.api.providers.IGasProvider;
 import net.minecraft.Util;
-import net.minecraft.core.Registry;
+import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
@@ -47,7 +47,7 @@ public final boolean isEmptyType() {
     }
 
     @Override
-    protected final Registry<Gas> getRegistry() {
+    protected final DefaultedRegistry<Gas> getRegistry() {
         return MekanismAPI.GAS_REGISTRY;
     }
 

src/api/java/mekanism/api/chemical/gas/GasStack.java

@@ -10,7 +10,6 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderLookup.Provider;
-import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
@@ -136,11 +135,6 @@ public static GasStack parseOptional(HolderLookup.Provider lookupProvider, Compo
         return tag.isEmpty() ? EMPTY : parse(lookupProvider, tag).orElse(EMPTY);
     }
 
-    @Override
-    protected Registry<Gas> getRegistry() {
-        return MekanismAPI.GAS_REGISTRY;
-    }
-
     @Override
     protected Gas getEmptyChemical() {
         return MekanismAPI.EMPTY_GAS;

src/api/java/mekanism/api/chemical/infuse/InfuseType.java

@@ -6,7 +6,7 @@
 import mekanism.api.chemical.Chemical;
 import mekanism.api.providers.IInfuseTypeProvider;
 import net.minecraft.Util;
-import net.minecraft.core.Registry;
+import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
@@ -42,7 +42,7 @@ public final boolean isEmptyType() {
     }
 
     @Override
-    protected final Registry<InfuseType> getRegistry() {
+    protected final DefaultedRegistry<InfuseType> getRegistry() {
         return MekanismAPI.INFUSE_TYPE_REGISTRY;
     }
 

src/api/java/mekanism/api/chemical/infuse/InfusionStack.java

@@ -10,7 +10,6 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderLookup.Provider;
-import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
@@ -131,11 +130,6 @@ public static InfusionStack parseOptional(HolderLookup.Provider lookupProvider,
         return tag.isEmpty() ? EMPTY : parse(lookupProvider, tag).orElse(EMPTY);
     }
 
-    @Override
-    protected Registry<InfuseType> getRegistry() {
-        return MekanismAPI.INFUSE_TYPE_REGISTRY;
-    }
-
     @Override
     protected InfuseType getEmptyChemical() {
         return MekanismAPI.EMPTY_INFUSE_TYPE;

src/api/java/mekanism/api/chemical/pigment/Pigment.java

@@ -6,7 +6,7 @@
 import mekanism.api.chemical.Chemical;
 import mekanism.api.providers.IPigmentProvider;
 import net.minecraft.Util;
-import net.minecraft.core.Registry;
+import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
@@ -45,7 +45,7 @@ public final boolean isEmptyType() {
     }
 
     @Override
-    protected final Registry<Pigment> getRegistry() {
+    protected final DefaultedRegistry<Pigment> getRegistry() {
         return MekanismAPI.PIGMENT_REGISTRY;
     }
 

src/api/java/mekanism/api/chemical/pigment/PigmentStack.java

@@ -10,7 +10,6 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderLookup.Provider;
-import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
@@ -131,11 +130,6 @@ public static PigmentStack parseOptional(HolderLookup.Provider lookupProvider, C
         return tag.isEmpty() ? EMPTY : parse(lookupProvider, tag).orElse(EMPTY);
     }
 
-    @Override
-    protected Registry<Pigment> getRegistry() {
-        return MekanismAPI.PIGMENT_REGISTRY;
-    }
-
     @Override
     protected Pigment getEmptyChemical() {
         return MekanismAPI.EMPTY_PIGMENT;

src/api/java/mekanism/api/chemical/slurry/Slurry.java

@@ -6,7 +6,7 @@
 import mekanism.api.chemical.Chemical;
 import mekanism.api.providers.ISlurryProvider;
 import net.minecraft.Util;
-import net.minecraft.core.Registry;
+import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
@@ -52,7 +52,7 @@ public final boolean isEmptyType() {
     }
 
     @Override
-    protected final Registry<Slurry> getRegistry() {
+    protected final DefaultedRegistry<Slurry> getRegistry() {
         return MekanismAPI.SLURRY_REGISTRY;
     }