diff --git a/src/generated/resources/data/minecraft/tags/fluids/lava.json b/src/generated/resources/data/minecraft/tags/fluids/lava.json
new file mode 100644
index 00000000..4d4a7b77
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/fluids/lava.json
@@ -0,0 +1,10 @@
+{
+  "values": [
+    "theaurorian:molten_aurorian_steel_still",
+    "theaurorian:molten_aurorian_steel_flowing",
+    "theaurorian:molten_cerulean_still",
+    "theaurorian:molten_cerulean_flowing",
+    "theaurorian:molten_moonstone_still",
+    "theaurorian:molten_moonstone_flowing"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/fluids/water.json b/src/generated/resources/data/minecraft/tags/fluids/water.json
new file mode 100644
index 00000000..7640b707
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/fluids/water.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "theaurorian:moon_water_still",
+    "theaurorian:moon_water_flowing"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/java/cn/teampancake/theaurorian/data/TADataGenerator.java b/src/main/java/cn/teampancake/theaurorian/data/TADataGenerator.java
index 0b62c340..dffd00ce 100644
--- a/src/main/java/cn/teampancake/theaurorian/data/TADataGenerator.java
+++ b/src/main/java/cn/teampancake/theaurorian/data/TADataGenerator.java
@@ -4,10 +4,7 @@
 import cn.teampancake.theaurorian.data.provider.*;
 import cn.teampancake.theaurorian.data.provider.lang.TALanguageProviderENUS;
 import cn.teampancake.theaurorian.data.provider.lang.TALanguageProviderZHCN;
-import cn.teampancake.theaurorian.data.provider.tag.TABlockTagsProvider;
-import cn.teampancake.theaurorian.data.provider.tag.TAEntityTagsProvider;
-import cn.teampancake.theaurorian.data.provider.tag.TAItemTagsProvider;
-import cn.teampancake.theaurorian.data.provider.tag.TAPaintingVariantTagsProvider;
+import cn.teampancake.theaurorian.data.provider.tag.*;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
@@ -33,6 +30,7 @@ public static void onGatherData(GatherDataEvent event) {
                 output, provider, blockTagsProvider.contentsGetter(), existingFileHelper));
         generator.addProvider(event.includeServer(), new TAPaintingVariantTagsProvider(output, provider, existingFileHelper));
         generator.addProvider(event.includeServer(), new TAEntityTagsProvider(output, provider, existingFileHelper));
+        generator.addProvider(event.includeServer(), new TAFluidTagsProvider(output, provider, existingFileHelper));
         generator.addProvider(event.includeClient(), new TABlockStateProvider(output, existingFileHelper));
         generator.addProvider(event.includeClient(), new TAItemModelProvider(output, existingFileHelper));
         generator.addProvider(event.includeServer(), new TASoundProvider(output, existingFileHelper));
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/TABlockStateProvider.java b/src/main/java/cn/teampancake/theaurorian/data/provider/TABlockStateProvider.java
index b93489e9..84142e8c 100644
--- a/src/main/java/cn/teampancake/theaurorian/data/provider/TABlockStateProvider.java
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/TABlockStateProvider.java
@@ -315,6 +315,9 @@ private void registerLiquidStates() {
         this.simpleBlock(TABlocks.MOLTEN_MOONSTONE.get(), this.models()
                 .getBuilder(TABlocks.MOLTEN_MOONSTONE.getId().getPath())
                 .texture("particle", this.modLoc("block/molten_moonstone")));
+        this.simpleBlock(TABlocks.MOON_WATER.get(), this.models()
+                .getBuilder(TABlocks.MOON_WATER.getId().getPath())
+                .texture("particle", this.modLoc("block/moon_water")));
     }
 
     private void registerScrapperState() {
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TABlockTagsProvider.java b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TABlockTagsProvider.java
index 528475a3..b83362a8 100644
--- a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TABlockTagsProvider.java
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TABlockTagsProvider.java
@@ -12,11 +12,9 @@
 import net.minecraftforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.concurrent.CompletableFuture;
 
 @SuppressWarnings("deprecation")
-@ParametersAreNonnullByDefault
 public class TABlockTagsProvider extends BlockTagsProvider {
 
     public TABlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAEntityTagsProvider.java b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAEntityTagsProvider.java
index 002ddb74..f2f2eda7 100644
--- a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAEntityTagsProvider.java
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAEntityTagsProvider.java
@@ -8,7 +8,6 @@
 import net.minecraft.data.tags.EntityTypeTagsProvider;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.data.ExistingFileHelper;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CompletableFuture;
@@ -20,7 +19,7 @@ public TAEntityTagsProvider(PackOutput packOutput, CompletableFuture<HolderLooku
     }
 
     @Override
-    protected void addTags(HolderLookup.@NotNull Provider provider) {
+    protected void addTags(HolderLookup.Provider provider) {
         this.tag(Tags.EntityTypes.BOSSES)
                 .add(TAEntityTypes.RUNESTONE_KEEPER.get())
                 .add(TAEntityTypes.SPIDER_MOTHER.get())
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAFluidTagsProvider.java b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAFluidTagsProvider.java
new file mode 100644
index 00000000..bc999c86
--- /dev/null
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAFluidTagsProvider.java
@@ -0,0 +1,34 @@
+package cn.teampancake.theaurorian.data.provider.tag;
+
+import cn.teampancake.theaurorian.AurorianMod;
+import cn.teampancake.theaurorian.registry.TAFluids;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.data.tags.FluidTagsProvider;
+import net.minecraft.tags.FluidTags;
+import net.minecraftforge.common.data.ExistingFileHelper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.CompletableFuture;
+
+public class TAFluidTagsProvider extends FluidTagsProvider {
+
+    public TAFluidTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, @Nullable ExistingFileHelper existingFileHelper) {
+        super(output, provider, AurorianMod.MOD_ID, existingFileHelper);
+    }
+
+    @Override
+    protected void addTags(HolderLookup.Provider provider) {
+        this.tag(FluidTags.LAVA).add(
+                TAFluids.MOLTEN_AURORIAN_STEEL_STILL.get(),
+                TAFluids.MOLTEN_AURORIAN_STEEL_FLOWING.get(),
+                TAFluids.MOLTEN_CERULEAN_STILL.get(),
+                TAFluids.MOLTEN_CERULEAN_FLOWING.get(),
+                TAFluids.MOLTEN_MOONSTONE_STILL.get(),
+                TAFluids.MOLTEN_MOONSTONE_FLOWING.get());
+        this.tag(FluidTags.WATER).add(
+                TAFluids.MOON_WATER_STILL.get(),
+                TAFluids.MOON_WATER_FLOWING.get());
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAItemTagsProvider.java b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAItemTagsProvider.java
index f272afac..34890cc8 100644
--- a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAItemTagsProvider.java
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAItemTagsProvider.java
@@ -16,7 +16,6 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.concurrent.CompletableFuture;
 
-@ParametersAreNonnullByDefault
 public class TAItemTagsProvider extends ItemTagsProvider {
 
     public TAItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTags, @Nullable ExistingFileHelper existingFileHelper) {
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAPaintingVariantTagsProvider.java b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAPaintingVariantTagsProvider.java
index 6ef70148..fac3b06b 100644
--- a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAPaintingVariantTagsProvider.java
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/TAPaintingVariantTagsProvider.java
@@ -9,10 +9,8 @@
 import net.minecraftforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.concurrent.CompletableFuture;
 
-@ParametersAreNonnullByDefault
 public class TAPaintingVariantTagsProvider extends PaintingVariantTagsProvider {
 
     public TAPaintingVariantTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, @Nullable ExistingFileHelper existingFileHelper) {
diff --git a/src/main/java/cn/teampancake/theaurorian/data/provider/tag/package-info.java b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/package-info.java
new file mode 100644
index 00000000..35646154
--- /dev/null
+++ b/src/main/java/cn/teampancake/theaurorian/data/provider/tag/package-info.java
@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package cn.teampancake.theaurorian.data.provider.tag;
+
+import net.minecraft.FieldsAreNonnullByDefault;
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file