Merge branch '1.18'

# Conflicts: # build.gradle.kts # buildSrc/src/main/kotlin/Dependencies.kt # module-compat/modern-dynamics/src/main/java/lol/bai/megane/module/moderndynamics/provider/PipeFluidProvider.java # settings.gradle.kts
badasintended · Jul 17, 2022 · 1c1344d · 1c1344d
2 parents c25a317 + 1c6bb69
commit 1c1344d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...namics/src/main/java/lol/bai/megane/module/moderndynamics/provider/PipeFluidProvider.java b/...namics/src/main/java/lol/bai/megane/module/moderndynamics/provider/PipeFluidProvider.java
@@ -4,6 +4,7 @@
 import dev.technici4n.moderndynamics.pipe.FluidPipeBlockEntity;
 import lol.bai.megane.api.provider.FluidProvider;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.nbt.NbtCompound;
 import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings("UnstableApiUsage")
@@ -26,6 +27,11 @@ public int getSlotCount() {
         return host.getVariant().getFluid();
     }
 
+    @Override
+    public @Nullable NbtCompound getNbt(int slot) {
+        return host.getVariant().getNbt();
+    }
+
     @Override
     public double getStored(int slot) {
         return droplets(host.getAmount());