Fix arcane initialization order error that breaks creative search

f-raZ0R · Oct 12, 2024 · 05e2a2d · 05e2a2d
1 parent d85286c
commit 05e2a2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumFluids.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumFluids.java
@@ -8,15 +8,12 @@
 import net.fabricmc.api.*;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.*;
 import net.fabricmc.fabric.api.client.render.fluid.v1.*;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
 import net.minecraft.client.render.*;
 import net.minecraft.fluid.*;
 import net.minecraft.registry.*;
 import net.minecraft.util.*;
 import org.joml.*;
-@SuppressWarnings("UnstableApiUsage")
+
 public class SpectrumFluids {
 
 	// RenderHandler storage for compatibility purposes
@@ -59,8 +56,7 @@ public static void register() {
 		registerFluid("mud", MUD, FLOWING_MUD, DyeColor.BROWN);
 		registerFluid("midnight_solution", MIDNIGHT_SOLUTION, FLOWING_MIDNIGHT_SOLUTION, DyeColor.GRAY);
 		registerFluid("dragonrot", DRAGONROT, FLOWING_DRAGONROT, DyeColor.GRAY);
-		FluidStorage.combinedItemApiProvider(SpectrumItems.MERMAIDS_GEM).register(context ->
-				new RemainderlessItemFluidStorage(context, FluidVariant.of(Fluids.WATER), FluidConstants.BUCKET));
+
 	}
 
 	private static void registerFluid(String name, Fluid stillFluid, Fluid flowingFluid, DyeColor dyeColor) {

diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java
@@ -6,6 +6,7 @@
 import de.dafuqs.spectrum.api.item.*;
 import de.dafuqs.spectrum.blocks.bottomless_bundle.*;
 import de.dafuqs.spectrum.blocks.conditional.*;
+import de.dafuqs.spectrum.blocks.fluid.RemainderlessItemFluidStorage;
 import de.dafuqs.spectrum.blocks.gravity.*;
 import de.dafuqs.spectrum.blocks.jade_vines.*;
 import de.dafuqs.spectrum.blocks.rock_candy.*;
@@ -28,6 +29,9 @@
 import de.dafuqs.spectrum.recipe.pedestal.*;
 import net.fabricmc.fabric.api.item.v1.*;
 import net.fabricmc.fabric.api.registry.*;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
 import net.minecraft.enchantment.*;
 import net.minecraft.fluid.*;
 import net.minecraft.item.*;
@@ -40,6 +44,7 @@
 
 import static de.dafuqs.spectrum.registries.SpectrumFluids.*;
 
+@SuppressWarnings("UnstableApiUsage")
 public class SpectrumItems {
 
 	public static class IS {
@@ -546,7 +551,7 @@ public static void register() {
 		registerInkStorage();
 		registerTrinkets();
 		registerMagicalTools();
-		registerFluidBuckets();
+		registerFluidContainers();
 		registerBannerPatterns();
 		registerPureClusters();
 		registerStructurePlacers();
@@ -962,11 +967,13 @@ public static void registerTrinkets() {
 		register("aether_graced_nectar_gloves", AETHER_GRACED_NECTAR_GLOVES, DyeColor.PURPLE);
 	}
 
-	public static void registerFluidBuckets() {
+	public static void registerFluidContainers() {
 		register("liquid_crystal_bucket", LIQUID_CRYSTAL_BUCKET, DyeColor.LIGHT_GRAY);
 		register("mud_bucket", MUD_BUCKET, DyeColor.BROWN);
 		register("midnight_solution_bucket", MIDNIGHT_SOLUTION_BUCKET, DyeColor.GRAY);
 		register("dragonrot_bucket", DRAGONROT_BUCKET, DyeColor.LIGHT_GRAY);
+		FluidStorage.combinedItemApiProvider(SpectrumItems.MERMAIDS_GEM).register(context ->
+				new RemainderlessItemFluidStorage(context, FluidVariant.of(Fluids.WATER), FluidConstants.BUCKET));
 	}
 
 	public static void registerTechnicalItems() {