Skip to content

Config option for distillation tower output rate #190

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
C4to wants to merge 3 commits into
base: 1.12.2
Choose a base branch
from
Open

Config option for distillation tower output rate #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bef1f69
Update Config.java
C4to Dec 11, 2020
93f6d55
add config option for tower output rate
C4to Dec 11, 2020
f0f4001
Merge pull request #1 from C4to/C4to-patch-1
C4to Dec 11, 2020
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
3 changes: 3 additions & 0 deletions src/main/java/flaxbeard/immersivepetroleum/common/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ public static class Refining
public static String[] towerByproduct = new String[]{
"immersivepetroleum:material, 1, 0, 7"
};
@Comment({"Output rate of the Distillation tower in mB/tick, default=80"})
public static int distillationTower_outputRate = 80
};
}

public static Generation generation;
Expand Down
8 changes: 5 additions & 3 deletions ...in/java/flaxbeard/immersivepetroleum/common/blocks/metal/TileEntityDistillationTower.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.google.common.collect.Lists;
import flaxbeard.immersivepetroleum.api.crafting.DistillationRecipe;
import flaxbeard.immersivepetroleum.common.blocks.multiblocks.MultiblockDistillationTower;
import flaxbeard.immersivepetroleum.common.Config;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
Expand Down Expand Up @@ -81,6 +82,7 @@ public void readCustomNBT(NBTTagCompound nbt, boolean descPacket)

private int cooldownTicks = 0;
private boolean operated = false;
private int outputRate = flaxbeard.immersivepetroleum.common.Config.distillationTower_outputRate;

@Override
public void writeCustomNBT(NBTTagCompound nbt, boolean descPacket)
Expand Down Expand Up @@ -212,7 +214,7 @@ else if (inventory.get(3).isEmpty())
lastFluidOut = null;
if (targetFluidStack != null)
{
FluidStack out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, 80), false);
FluidStack out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, outputRate), false);
int accepted = output.fill(out, false);
if (accepted > 0)
{
Expand All @@ -227,7 +229,7 @@ else if (inventory.get(3).isEmpty())
while (iterator.hasNext())
{
targetFluidStack = iterator.next();
out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, 80), false);
out = Utils.copyFluidStackWithAmount(targetFluidStack, Math.min(targetFluidStack.amount, outputRate), false);
accepted = output.fill(out, false);
if (accepted > 0)
{
Expand Down Expand Up @@ -667,4 +669,4 @@ public TileEntityDistillationTower getTileForPos(int targetPos)
TileEntity tile = world.getTileEntity(target);
return tile instanceof TileEntityDistillationTower ? (TileEntityDistillationTower) tile : null;
}
}
}