Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix pipe connection bans

Browse source
This commit is contained in:
Adrian 2015-07-15 13:01:15 +02:00
parent 17b8dce6df
commit 4255bba4d7
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
buildcraft_resources/assets/buildcraft/lang/en_US.lang
View file

@ -442,12 +442,13 @@ tip.gate.wires.diamond=Red, Blue, Green, Yellow
tip.gate.wires.emerald=Red, Blue, Green, Yellow tip.gate.wires.emerald=Red, Blue, Green, Yellow
tip.gate.expansions=§9§oInstalled Expansions: tip.gate.expansions=§9§oInstalled Expansions:
tip.PipeFluidsCobblestone=Won't connect to Stone tip.PipeFluidsCobblestone=Won't connect to Stone or Quartz
tip.PipeFluidsDiamond=Sorts fluids tip.PipeFluidsDiamond=Sorts fluids
tip.PipeFluidsEmerald=Extraction pipe tip.PipeFluidsEmerald=Extraction pipe
tip.PipeFluidsIron=Valve pipe tip.PipeFluidsIron=Valve pipe
tip.PipeFluidsQuartz=Won't connect to Cobblestone or Stone
tip.PipeFluidsSandstone=Only connects to other pipes tip.PipeFluidsSandstone=Only connects to other pipes
tip.PipeFluidsStone=Won't connect to Cobblestone tip.PipeFluidsStone=Won't connect to Cobblestone or Quartz
tip.PipeFluidsVoid=Destroys fluids tip.PipeFluidsVoid=Destroys fluids
tip.PipeFluidsWood=Extraction pipe tip.PipeFluidsWood=Extraction pipe
tip.PipeItemsClay=Insertion pipe tip.PipeItemsClay=Insertion pipe

4
buildcraft_resources/changelog/7.1.0
View file

@ -1,3 +1,7 @@
BREAKING CHANGES!
* Quartz Fluid Pipes no longer connect to Cobblestone or Stone Fluid Pipes. This might break existing builds! (asie)
Additions: Additions:
* Clay fluid pipe! The power of insertion applied to liquids. (asie) * Clay fluid pipe! The power of insertion applied to liquids. (asie)

5
common/buildcraft/transport/PipeConnectionBans.java
View file

@ -13,6 +13,7 @@ import com.google.common.collect.SetMultimap;
import buildcraft.transport.pipes.PipeFluidsCobblestone; import buildcraft.transport.pipes.PipeFluidsCobblestone;
import buildcraft.transport.pipes.PipeFluidsEmerald; import buildcraft.transport.pipes.PipeFluidsEmerald;
import buildcraft.transport.pipes.PipeFluidsQuartz;
import buildcraft.transport.pipes.PipeFluidsStone; import buildcraft.transport.pipes.PipeFluidsStone;
import buildcraft.transport.pipes.PipeFluidsWood; import buildcraft.transport.pipes.PipeFluidsWood;
import buildcraft.transport.pipes.PipeItemsCobblestone; import buildcraft.transport.pipes.PipeItemsCobblestone;
@ -34,11 +35,10 @@ public final class PipeConnectionBans {
static { static {
// Fluid pipes // Fluid pipes
banConnection(PipeFluidsStone.class, PipeFluidsCobblestone.class); banConnection(PipeFluidsStone.class, PipeFluidsCobblestone.class, PipeFluidsQuartz.class);
banConnection(PipeFluidsWood.class); banConnection(PipeFluidsWood.class);
banConnection(PipeFluidsEmerald.class); banConnection(PipeFluidsEmerald.class);
banConnection(PipeFluidsWood.class, PipeFluidsEmerald.class); banConnection(PipeFluidsWood.class, PipeFluidsEmerald.class);
banConnection(PipeFluidsEmerald.class);
// Item Pipes // Item Pipes
banConnection(PipeItemsStone.class, PipeItemsCobblestone.class, PipeItemsQuartz.class); banConnection(PipeItemsStone.class, PipeItemsCobblestone.class, PipeItemsQuartz.class);
@ -51,6 +51,7 @@ public final class PipeConnectionBans {
// Power Pipes // Power Pipes
banConnection(PipePowerWood.class); banConnection(PipePowerWood.class);
banConnection(PipePowerEmerald.class); banConnection(PipePowerEmerald.class);
banConnection(PipePowerWood.class, PipePowerEmerald.class);
} }
private PipeConnectionBans() { private PipeConnectionBans() {