fix #2174
This commit is contained in:
parent
68512ed479
commit
8535f295d9
11 changed files with 39 additions and 16 deletions
|
@ -27,6 +27,10 @@ public final class PipeToolTipManager {
|
||||||
for (Map.Entry<Class<? extends Pipe<?>>, Integer> pipe : PipeTransportPower.powerCapacities.entrySet()) {
|
for (Map.Entry<Class<? extends Pipe<?>>, Integer> pipe : PipeTransportPower.powerCapacities.entrySet()) {
|
||||||
PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d RF/t", pipe.getValue()));
|
PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d RF/t", pipe.getValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (Map.Entry<Class<? extends Pipe<?>>, Integer> pipe : PipeTransportFluids.fluidCapacities.entrySet()) {
|
||||||
|
PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d mB/t", pipe.getValue()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -47,8 +51,8 @@ public final class PipeToolTipManager {
|
||||||
if (localized != null) {
|
if (localized != null) {
|
||||||
List<String> lines = StringUtils.newLineSplitter.splitToList(localized);
|
List<String> lines = StringUtils.newLineSplitter.splitToList(localized);
|
||||||
tips.addAll(lines);
|
tips.addAll(lines);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String tip = toolTips.get(pipe);
|
String tip = toolTips.get(pipe);
|
||||||
if (tip != null) {
|
if (tip != null) {
|
||||||
tips.add(tip);
|
tips.add(tip);
|
||||||
|
|
|
@ -9,7 +9,10 @@
|
||||||
package buildcraft.transport;
|
package buildcraft.transport;
|
||||||
|
|
||||||
import java.util.BitSet;
|
import java.util.BitSet;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import buildcraft.transport.pipes.*;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
@ -27,6 +30,7 @@ import buildcraft.core.DefaultProps;
|
||||||
import buildcraft.transport.network.PacketFluidUpdate;
|
import buildcraft.transport.network.PacketFluidUpdate;
|
||||||
|
|
||||||
public class PipeTransportFluids extends PipeTransport implements IFluidHandler {
|
public class PipeTransportFluids extends PipeTransport implements IFluidHandler {
|
||||||
|
public static final Map<Class<? extends Pipe<?>>, Integer> fluidCapacities = new HashMap<Class<? extends Pipe<?>>, Integer>();
|
||||||
|
|
||||||
public class PipeSection extends FluidTank {
|
public class PipeSection extends FluidTank {
|
||||||
|
|
||||||
|
@ -153,7 +157,7 @@ public class PipeTransportFluids extends PipeTransport implements IFluidHandler
|
||||||
private final SafeTimeTracker tracker = new SafeTimeTracker(BuildCraftCore.updateFactor);
|
private final SafeTimeTracker tracker = new SafeTimeTracker(BuildCraftCore.updateFactor);
|
||||||
private int clientSyncCounter = 0;
|
private int clientSyncCounter = 0;
|
||||||
|
|
||||||
public PipeTransportFluids() {
|
public PipeTransportFluids() {
|
||||||
for (ForgeDirection direction : orientations) {
|
for (ForgeDirection direction : orientations) {
|
||||||
internalTanks[direction.ordinal()] = new PipeSection(getCapacity());
|
internalTanks[direction.ordinal()] = new PipeSection(getCapacity());
|
||||||
if (direction != ForgeDirection.UNKNOWN) {
|
if (direction != ForgeDirection.UNKNOWN) {
|
||||||
|
@ -162,6 +166,10 @@ public class PipeTransportFluids extends PipeTransport implements IFluidHandler
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void initFromPipe(Class<? extends Pipe> pipeClass) {
|
||||||
|
flowRate = fluidCapacities.get(pipeClass);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PipeType getPipeType() {
|
public PipeType getPipeType() {
|
||||||
return PipeType.FLUID;
|
return PipeType.FLUID;
|
||||||
|
@ -580,4 +588,16 @@ public class PipeTransportFluids extends PipeTransport implements IFluidHandler
|
||||||
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
|
public FluidTankInfo[] getTankInfo(ForgeDirection from) {
|
||||||
return new FluidTankInfo[]{new FluidTankInfo(internalTanks[from.ordinal()])};
|
return new FluidTankInfo[]{new FluidTankInfo(internalTanks[from.ordinal()])};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
fluidCapacities.put(PipeFluidsCobblestone.class, 1 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsEmerald.class, 4 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsGold.class, 4 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsIron.class, 2 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsQuartz.class, 2 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsSandstone.class, 1 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsStone.class, 1 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsVoid.class, 1 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
fluidCapacities.put(PipeFluidsWood.class, 1 * BuildCraftTransport.pipeFluidsBaseFlowRate);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,9 +24,8 @@ import buildcraft.transport.PipeTransportFluids;
|
||||||
public class PipeFluidsCobblestone extends Pipe<PipeTransportFluids> {
|
public class PipeFluidsCobblestone extends Pipe<PipeTransportFluids> {
|
||||||
|
|
||||||
public PipeFluidsCobblestone(Item item) {
|
public PipeFluidsCobblestone(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
transport.initFromPipe(getClass());
|
||||||
transport.flowRate = BuildCraftTransport.pipeFluidsBaseFlowRate;
|
|
||||||
transport.travelDelay = 12;
|
transport.travelDelay = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ public class PipeFluidsEmerald extends PipeFluidsWood {
|
||||||
standardIconIndex = PipeIconProvider.TYPE.PipeFluidsEmerald_Standard.ordinal();
|
standardIconIndex = PipeIconProvider.TYPE.PipeFluidsEmerald_Standard.ordinal();
|
||||||
solidIconIndex = PipeIconProvider.TYPE.PipeAllEmerald_Solid.ordinal();
|
solidIconIndex = PipeIconProvider.TYPE.PipeAllEmerald_Solid.ordinal();
|
||||||
|
|
||||||
transport.flowRate = 4 * BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 4;
|
transport.travelDelay = 4;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,9 +24,9 @@ import buildcraft.transport.PipeTransportFluids;
|
||||||
public class PipeFluidsGold extends Pipe<PipeTransportFluids> {
|
public class PipeFluidsGold extends Pipe<PipeTransportFluids> {
|
||||||
|
|
||||||
public PipeFluidsGold(Item item) {
|
public PipeFluidsGold(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = 4 * BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 4;
|
transport.travelDelay = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,8 +51,8 @@ public class PipeFluidsIron extends Pipe<PipeTransportFluids> {
|
||||||
public PipeFluidsIron(Item item) {
|
public PipeFluidsIron(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 12;
|
transport.travelDelay = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -26,7 +26,7 @@ public class PipeFluidsQuartz extends Pipe<PipeTransportFluids> {
|
||||||
public PipeFluidsQuartz(Item item) {
|
public PipeFluidsQuartz(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = 2 * BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 8;
|
transport.travelDelay = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class PipeFluidsSandstone extends Pipe<PipeTransportFluids> implements IP
|
||||||
public PipeFluidsSandstone(Item item) {
|
public PipeFluidsSandstone(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 12;
|
transport.travelDelay = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ public class PipeFluidsStone extends Pipe<PipeTransportFluids> {
|
||||||
public PipeFluidsStone(Item item) {
|
public PipeFluidsStone(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 12;
|
transport.travelDelay = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ public class PipeFluidsVoid extends Pipe<PipeTransportFluids> implements IPipeTr
|
||||||
public PipeFluidsVoid(Item item) {
|
public PipeFluidsVoid(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 12;
|
transport.travelDelay = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class PipeFluidsWood extends Pipe<PipeTransportFluids> implements IEnergy
|
||||||
public PipeFluidsWood(Item item) {
|
public PipeFluidsWood(Item item) {
|
||||||
super(new PipeTransportFluids(), item);
|
super(new PipeTransportFluids(), item);
|
||||||
|
|
||||||
transport.flowRate = BuildCraftTransport.pipeFluidsBaseFlowRate;
|
transport.initFromPipe(getClass());
|
||||||
transport.travelDelay = 12;
|
transport.travelDelay = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue