xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2311 from PewPewCricket/master

Browse Source 
Fix flow control pump oc compat (i forgot to add one line in the last commit)
This commit is contained in:
HbmMods 2025-07-25 17:51:38 +02:00 committed by GitHub
commit 66e0a0252b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/hbm/blocks/network/FluidPump.java
View File

@ -306,6 +306,7 @@ public class FluidPump extends BlockContainer implements INBTTransformable, ILoo
int input = args.checkInteger(0); int input = args.checkInteger(0);
if (input > 10000 || input < 0) if (input > 10000 || input < 0)
return new Object[] {null, "Number outside of bounds."}; return new Object[] {null, "Number outside of bounds."};
bufferSize = input;
return new Object[] {true}; return new Object[] {true};
} }

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java
View File

@ -236,7 +236,7 @@ public class TileEntityMachineTurbine extends TileEntityLoadedBase implements IS
} }
} }
nbt.setTag("items", list); nbt.setTag("items", list);
if (customName != null) { if (customName != null) {
nbt.setString("name", customName); nbt.setString("name", customName);
} }
@ -280,7 +280,7 @@ public class TileEntityMachineTurbine extends TileEntityLoadedBase implements IS
this.tryProvide(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir); this.tryProvide(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir);
tanks[0].setType(0, 1, slots); tanks[0].setType(0, 1, slots);
tanks[0].loadTank(2, 3, slots); tanks[0].loadTank(2, 3, slots);
power = Library.chargeItemsFromTE(slots, 4, power, maxPower); power = Library.chargeItemsFromTE(slots, 4, power, maxPower);
FluidType in = tanks[0].getTankType(); FluidType in = tanks[0].getTankType();