Skip to content

Add capacity to fluid tank data (1.21.x) #2239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: mc-1.21.x
Choose a base branch
from
Open

Add capacity to fluid tank data (1.21.x) #2239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions projects/fabric/src/main/java/dan200/computercraft/shared/details/FluidDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class FluidDetails {
public static void fillBasic(Map<? super String, Object> data, StorageView<FluidVariant> fluid) {
data.put("name", DetailHelpers.getId(BuiltInRegistries.FLUID, fluid.getResource().getFluid()));
data.put("amount", fluid.getAmount());
data.put("capacity", fluid.getCapacity());
}

public static void fill(Map<? super String, Object> data, StorageView<FluidVariant> fluid) {
Expand Down
2 changes: 2 additions & 0 deletions projects/forge/src/main/java/dan200/computercraft/shared/details/FluidData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public class FluidData {
public static void fillBasic(Map<? super String, Object> data, FluidStack stack) {
data.put("name", DetailHelpers.getId(BuiltInRegistries.FLUID, stack.getFluid()));
data.put("amount", stack.getAmount());
// "capacity" is added manually elsewhere since FluidStack does not contain a capacity.
// See: dan200.computercraft.shared.peripheral.generic.methods.FluidMethods#tanks
}

public static void fill(Map<? super String, Object> data, FluidStack stack) {
Expand Down
8 changes: 7 additions & 1 deletion ...ge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/FluidMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ public final class FluidMethods extends AbstractFluidMethods<IFluidHandler> {
var size = fluids.getTanks();
for (var i = 0; i < size; i++) {
var stack = fluids.getFluidInTank(i);
if (!stack.isEmpty()) result.put(i + 1, ForgeDetailRegistries.FLUID_STACK.getBasicDetails(stack));
if (!stack.isEmpty()) {
var data = ForgeDetailRegistries.FLUID_STACK.getBasicDetails(stack);
// FluidStacks do not keep capacity, meaning the DetailRegistry cannot add it by itself. We'll
// add it manually here instead.
data.put("capacity", fluids.getTankCapacity(i));
result.put(i + 1, data);
}
}

return result;
Expand Down
Loading