From 0f6b089d26bc7cd2749da6ef512a88e66dbed44b Mon Sep 17 00:00:00 2001 From: Adrian Date: Sun, 7 Jun 2015 12:34:26 +0200 Subject: [PATCH] BuildCraft 7.0.8 --- build.gradle | 2 +- buildcraft_resources/changelog/7.0.8 | 3 +++ buildcraft_resources/versions.txt | 2 +- common/buildcraft/transport/Pipe.java | 6 ++++-- common/buildcraft/transport/TileGenericPipe.java | 1 + common/buildcraft/transport/pipes/PipeFluidsIron.java | 4 ++-- common/buildcraft/transport/pipes/PipeFluidsWood.java | 4 ++-- common/buildcraft/transport/pipes/PipeItemsIron.java | 4 ++-- common/buildcraft/transport/pipes/PipeItemsWood.java | 4 ++-- 9 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 buildcraft_resources/changelog/7.0.8 diff --git a/build.gradle b/build.gradle index c3c8751c..b4484b48 100755 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'checkstyle' -version = "7.0.7" +version = "7.0.8" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] diff --git a/buildcraft_resources/changelog/7.0.8 b/buildcraft_resources/changelog/7.0.8 new file mode 100644 index 00000000..68b91f4e --- /dev/null +++ b/buildcraft_resources/changelog/7.0.8 @@ -0,0 +1,3 @@ +Bugs fixed: + +* Fix compatibility with BC 7.0.x addons (asie) diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt index 66eb8534..f8fa65d9 100755 --- a/buildcraft_resources/versions.txt +++ b/buildcraft_resources/versions.txt @@ -1,3 +1,3 @@ 1.6.4:BuildCraft:4.2.2 1.7.2:BuildCraft:6.0.16 -1.7.10:BuildCraft:7.0.7 +1.7.10:BuildCraft:7.0.8 diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 3bb9353d..393c9543 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -88,8 +88,10 @@ public abstract class Pipe implements IDropControlInven public void onBlockPlacedBy(EntityLivingBase placer) { } - public void onNeighborChange(ForgeDirection direction) { - transport.onNeighborChange(direction); + public void onNeighborBlockChange(int blockId) { + for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { + transport.onNeighborChange(d); + } } public boolean canPipeConnect(TileEntity tile, ForgeDirection side) { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 098ac119..78ff4b14 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -406,6 +406,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, computeConnection(ForgeDirection.getOrientation(i)); } } + pipe.onNeighborBlockChange(0); blockNeighborChange = false; refreshRenderState = true; } diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 99fd5b77..262659d9 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -61,9 +61,9 @@ public class PipeFluidsIron extends Pipe { } @Override - public void onNeighborChange(ForgeDirection direction) { + public void onNeighborBlockChange(int blockId) { logic.switchOnRedstone(); - super.onNeighborChange(direction); + super.onNeighborBlockChange(blockId); } @Override diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 05bf1781..8f5090cb 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -63,9 +63,9 @@ public class PipeFluidsWood extends Pipe implements IEnergy } @Override - public void onNeighborChange(ForgeDirection direction) { + public void onNeighborBlockChange(int blockId) { logic.onNeighborBlockChange(); - super.onNeighborChange(direction); + super.onNeighborBlockChange(blockId); } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index ce9cdcbb..b7218425 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -65,9 +65,9 @@ public class PipeItemsIron extends Pipe { } @Override - public void onNeighborChange(ForgeDirection direction) { + public void onNeighborBlockChange(int blockId) { logic.switchOnRedstone(); - super.onNeighborChange(direction); + super.onNeighborBlockChange(blockId); } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 1c4c0c90..a451e508 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -63,9 +63,9 @@ public class PipeItemsWood extends Pipe implements IEnergyHa } @Override - public void onNeighborChange(ForgeDirection direction) { + public void onNeighborBlockChange(int blockId) { logic.onNeighborBlockChange(); - super.onNeighborChange(direction); + super.onNeighborBlockChange(blockId); } @Override