Remove references to ForgeRegistries left

architectury · Dec 8, 2023 · f63dc5d · f63dc5d
1 parent 38c3e8e
commit f63dc5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ain/java/dev/architectury/core/fluid/forge/imitator/ArchitecturyFluidAttributesForge.java b/...ain/java/dev/architectury/core/fluid/forge/imitator/ArchitecturyFluidAttributesForge.java
@@ -24,6 +24,7 @@
 import dev.architectury.hooks.fluid.forge.FluidStackHooksForge;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
@@ -40,7 +41,6 @@
 import net.minecraftforge.common.SoundAction;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidType;
-import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
@@ -55,7 +55,7 @@ class ArchitecturyFluidAttributesForge extends FluidType {
     public ArchitecturyFluidAttributesForge(Properties builder, Fluid fluid, ArchitecturyFluidAttributes attributes) {
         super(addArchIntoBuilder(builder, attributes));
         this.attributes = attributes;
-        this.defaultTranslationKey = Util.makeDescriptionId("fluid", ForgeRegistries.FLUIDS.getKey(fluid));
+        this.defaultTranslationKey = Util.makeDescriptionId("fluid", BuiltInRegistries.FLUID.getKey(fluid));
     }
 
     private static Properties addArchIntoBuilder(Properties builder, ArchitecturyFluidAttributes attributes) {

diff --git a/forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java b/forge/src/main/java/dev/architectury/fluid/forge/FluidStackImpl.java
@@ -19,10 +19,10 @@
 
 package dev.architectury.fluid.forge;
 
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.function.Function;
@@ -54,7 +54,7 @@ public FluidStack create(Supplier<Fluid> fluid, long amount, CompoundTag tag) {
 
     @Override
     public Supplier<Fluid> getRawFluidSupplier(FluidStack object) {
-        return ForgeRegistries.FLUIDS.getDelegateOrThrow(object.getRawFluid());
+        return BuiltInRegistries.FLUID.getHolderOrThrow(BuiltInRegistries.FLUID.getResourceKey(object.getRawFluid()).orElseThrow());
     }
 
     @Override