Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/GT-IMPACT/ExtraCells2
Browse files Browse the repository at this point in the history
  • Loading branch information
aagrishankov committed Nov 19, 2020
2 parents d8ca2ae + 2fe4922 commit ee2172e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/main/scala/extracells/part/PartFluidInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public void writeToNBT(NBTTagCompound tagCompound) {
private IAEItemStack toExport = null;

private final Item encodedPattern = AEApi.instance().definitions().items().encodedPattern().maybeItem().orNull();
private FluidTank tank = new FluidTank(64000) {
private FluidTank tank = new FluidTank(1000) {
@Override
public FluidTank readFromNBT(NBTTagCompound nbt) {
if (!nbt.hasKey("Empty")) {
Expand Down Expand Up @@ -442,14 +442,14 @@ public List<String> getWailaBodey(NBTTagCompound tag, List<String> list) {
.translateToLocal("extracells.tooltip.empty1"));
list.add(StatCollector
.translateToLocal("extracells.tooltip.amount")
+ ": 0L / 64000L");
+ ": 0L / 1000L");
} else {
list.add(StatCollector.translateToLocal("extracells.tooltip.fluid")
+ ": " + fluid.getLocalizedName());
list.add(StatCollector
.translateToLocal("extracells.tooltip.amount")
+ ": "
+ fluid.amount + "L / 64000L");
+ fluid.amount + "L / 1000L");
}
return list;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public TileEntityFluidInterface() {
this.inventory = new FluidInterfaceInventory();
this.gridBlock = new ECFluidGridBlock(this);
for (int i = 0; i < this.tanks.length; i++) {
this.tanks[i] = new FluidTank(64000) {
this.tanks[i] = new FluidTank(1000) {
@Override
public FluidTank readFromNBT(NBTTagCompound nbt) {
if (!nbt.hasKey("Empty")) {
Expand Down Expand Up @@ -424,7 +424,7 @@ public List<String> getWailaBody(List<String> list, NBTTagCompound tag,
+ side.ordinal()));
FluidTank[] tanks = new FluidTank[6];
for (int i = 0; i < tanks.length; i++) {
tanks[i] = new FluidTank(64000) {
tanks[i] = new FluidTank(1000) {
@Override
public FluidTank readFromNBT(NBTTagCompound nbt) {
if (!nbt.hasKey("Empty")) {
Expand Down Expand Up @@ -452,14 +452,14 @@ public FluidTank readFromNBT(NBTTagCompound nbt) {
.translateToLocal("extracells.tooltip.empty1"));
list.add(StatCollector
.translateToLocal("extracells.tooltip.amount")
+ ": 0L / 64000L");
+ ": 0L / 1000L");
} else {
list.add(StatCollector.translateToLocal("extracells.tooltip.fluid")
+ ": " + tank.getFluid().getLocalizedName());
list.add(StatCollector
.translateToLocal("extracells.tooltip.amount")
+ ": "
+ tank.getFluidAmount() + "L / 64000L");
+ tank.getFluidAmount() + "L / 1000L");
}
return list;
}
Expand Down Expand Up @@ -1029,4 +1029,4 @@ public void writeToNBTWithoutExport(NBTTagCompound tag) {
this.inventory.writeToNBT(inventory);
tag.setTag("inventory", inventory);
}
}
}

0 comments on commit ee2172e

Please sign in to comment.