Merge remote-tracking branch 'origin/master-26-lts' into master-26

Author: rubensworks

CHANGELOG-26.1.2.md

@@ -1,8 +1,14 @@
 # Changelog for Minecraft 26.1.2
 All notable changes to this project will be documented in this file.
 
+<a name="26.1.2-1.30.1"></a>
+## [26.1.2-1.30.1](https://github.com/CyclopsMC/CyclopsCore/compare/26.1.2-1.30.0...26.1.2-1.30.1) - 2026-06-28 14:08:16
+
+### Fixed
+* Fix capacity-based fluid capability not taking into account stack size
+
 <a name="26.1.2-1.30.0"></a>
-## [26.1.2-1.30.0](https://github.com/CyclopsMC/CyclopsCore/compare/26.1.2-1.29.9...26.1.2-1.30.0) - 2026-06-14 13:02:01
+## [26.1.2-1.30.0](https://github.com/CyclopsMC/CyclopsCore/compare/26.1.2-1.29.9...26.1.2-1.30.0) - 2026-06-14 13:02:01 +0200
 
 ### Added
 * Add SlotSingleIngredient

loader-neoforge/src/main/java/org/cyclops/cyclopscore/capability/fluid/FluidHandlerItemCapacity.java

@@ -63,7 +63,7 @@ public void setTankCapacity(int tank, int capacity, TransactionContext transacti
 
     @Override
     public int getTankCapacity(int tank) {
-        return itemAccess.getResource().getOrDefault(RegistryEntries.COMPONENT_CAPACITY, this.capacity);
+        return itemAccess.getAmount() * itemAccess.getResource().getOrDefault(RegistryEntries.COMPONENT_CAPACITY, this.capacity);
     }
 
     @Override
@@ -73,7 +73,7 @@ protected int getCapacity(int index, FluidResource resource) {
 
     @Override
     public long getCapacityAsLong(int index, FluidResource resource) {
-        return getTankCapacity(index);
+        return (long) itemAccess.getAmount() * itemAccess.getResource().getOrDefault(RegistryEntries.COMPONENT_CAPACITY, this.capacity);
     }
 
     @Override

resources/changelog/26.1.2-1.30.1.txt

@@ -0,0 +1,4 @@
+As always, don't forget to backup your world before updating!
+
+Fixes:
+* Fix capacity-based fluid capability not taking into account stack size