Merge remote-tracking branch 'origin/dev/master' into dev/26.1

Author: deirn

src/apiPlatformStub/java/net/minecraftforge/fluids/FluidStack.java

@@ -3,12 +3,18 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.material.Fluid;
 
-public interface FluidStack {
+public final class FluidStack {
 
-    Fluid getFluid();
+    public Fluid getFluid() {
+        throw new AssertionError("stub");
+    }
 
-    CompoundTag getTag();
+    public CompoundTag getTag() {
+        throw new AssertionError("stub");
+    }
 
-    int getAmount();
+    public int getAmount() {
+        throw new AssertionError("stub");
+    }
 
 }

src/apiPlatformStub/java/net/neoforged/neoforge/transfer/fluid/FluidResource.java

@@ -3,10 +3,14 @@
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.world.level.material.Fluid;
 
-public interface FluidResource {
+public final class FluidResource {
 
-    Fluid getFluid();
+    public Fluid getFluid() {
+        throw new AssertionError("stub");
+    }
 
-    DataComponentPatch getComponentsPatch();
+    public DataComponentPatch getComponentsPatch() {
+        throw new AssertionError("stub");
+    }
 
 }