Merge branch 'master' into dev

# Conflicts:
#	dependencies.gradle
This commit is contained in:
Martin Robertz committed 2025-03-20 15:25:17 +01:00
commit f851109f4e
2 files changed
+7 -9

No files matched your search

+1 -1
View File
@@ -48,7 +48,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.5:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.9.4:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.178:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.181:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
}
@@ -56,14 +56,12 @@ public class CreativeFluidCellInventory extends FluidCellInventory {
IInventory inv = this.cellType.getConfigInventory(this.cellItem);
for (int i = 0; i < inv.getSizeInventory(); i++) {
ItemStack is = inv.getStackInSlot(i);
if (Util.FluidUtil.isFluidContainer(is)) {
FluidStack fs = Util.getFluidFromItem(is);
if (fs == null) continue;
IAEFluidStack iaeFluidStack = Util.FluidUtil.createAEFluidStack(fs);
if (this.cellFluids.findPrecise(iaeFluidStack) == null) {
iaeFluidStack.setStackSize(Integer.MAX_VALUE * 1_000_000L);
this.cellFluids.add(iaeFluidStack);
}
FluidStack fs = Util.getFluidFromItem(is);
if (fs == null) continue;
IAEFluidStack iaeFluidStack = Util.FluidUtil.createAEFluidStack(fs);
if (this.cellFluids.findPrecise(iaeFluidStack) == null) {
iaeFluidStack.setStackSize(Integer.MAX_VALUE * 1_000_000L);
this.cellFluids.add(iaeFluidStack);
}
}
}