fixed wooden pipe connection with wooden fluid pipe

Author: NikolaySavenko

dev/machine/pipes/PipeRegistry.js

@@ -167,6 +167,7 @@ function setupFluidPipeRender(id, texture, connectionType){
     var width = 0.5;
     var group = ICRender.getGroup("bc-liquid-pipes");
     var group2 = ICRender.getGroup("bc-liquid-pipes-machine");
+    var group3 = ICRender.getGroup("bc-liquid-wooden");
     group.add(id, -1);
 
     /* render */
@@ -190,6 +191,7 @@ function setupFluidPipeRender(id, texture, connectionType){
 
         render.addEntry(model).asCondition(box.side[0], box.side[1], box.side[2], group, 0);
         render.addEntry(model).asCondition(box.side[0], box.side[1], box.side[2], group2, 0);
+        render.addEntry(model).asCondition(box.side[0], box.side[1], box.side[2], group3, 0);
     }
 
     var model = BlockRenderer.createModel();
@@ -208,7 +210,8 @@ function setupWoodenFluidPipeRender(id, texture,texture1, connectionType){
 
     var width = 0.5;
     var group = ICRender.getGroup("bc-liquid-pipes");
-    group.add(id, -1);
+    var group1 = ICRender.getGroup("bc-liquid-wooden");
+    group1.add(id, -1);
 
     var groupMachines = ICRender.getGroup("bc-liquid-pipes-machine");
 

dev/machine/pump.js

@@ -19,27 +19,27 @@ TileEntity.registerPrototype(BlockID.bcPump, {
     },
 
     created: function() {
-        this.data.pumpY = this.y - 1;
+        this.data.pumpY = this.y - 1;  
     },
+    
+    init:function(){this.liquidStorage.setLimit(null, 16)},
 
     MJEnergyDeploy: function(amount, generator, params) {
         if (this.data.energy < 20) this.data.energy += Math.min(amount, amount - this.data.energy);
     },
 
     getTransportLiquid:function(){
-        return {output: ["water"]};
+        return {output: ["water","lava"]};
     },
 
     tick: function() {
-        this.liquidStorage.setLimit(null, 16);
-
         if (World.getThreadTime() % 20 == 0 && this.data.energy > 1) {
             var te = World.getTileEntity(this.x, this.y - 1, this.z);
             if (te) {
                 this.pullFromTileEntity(te);
             } else {
                 var coords = this.getPumpingCoords();
-                if (coords) {
+                if (coords){
                     var tile = World.getBlock(coords.x, coords.y, coords.z);
                     if (tile.id == 9 || tile.id == 11) {
                         World.setBlock(coords.x, coords.y, coords.z, 0);
@@ -53,7 +53,7 @@ TileEntity.registerPrototype(BlockID.bcPump, {
     },
 
     pullFromTileEntity: function(tileEntity) {
-        var transportableLiquid = tileEntity.getTransportLiquids;
+        var transportableLiquid = tileEntity.getTransportLiquid;
         var outputLiquids;
         if (transportableLiquid) outputLiquids = transportableLiquid().output;
 

main.js

@@ -2678,6 +2678,7 @@ function setupFluidPipeRender(id, texture, connectionType){
     var width = 0.5;
     var group = ICRender.getGroup("bc-liquid-pipes");
     var group2 = ICRender.getGroup("bc-liquid-pipes-machine");
+    var group3 = ICRender.getGroup("bc-liquid-wooden");
     group.add(id, -1);
 
     /* render */
@@ -2701,6 +2702,7 @@ function setupFluidPipeRender(id, texture, connectionType){
 
         render.addEntry(model).asCondition(box.side[0], box.side[1], box.side[2], group, 0);
         render.addEntry(model).asCondition(box.side[0], box.side[1], box.side[2], group2, 0);
+        render.addEntry(model).asCondition(box.side[0], box.side[1], box.side[2], group3, 0);
     }
 
     var model = BlockRenderer.createModel();
@@ -2719,7 +2721,8 @@ function setupWoodenFluidPipeRender(id, texture,texture1, connectionType){
 
     var width = 0.5;
     var group = ICRender.getGroup("bc-liquid-pipes");
-    group.add(id, -1);
+    var group1 = ICRender.getGroup("bc-liquid-wooden");
+    group1.add(id, -1);
 
     var groupMachines = ICRender.getGroup("bc-liquid-pipes-machine");
 
@@ -3832,27 +3835,27 @@ TileEntity.registerPrototype(BlockID.bcPump, {
     },
 
     created: function() {
-        this.data.pumpY = this.y - 1;
+        this.data.pumpY = this.y - 1;  
     },
+    
+    init:function(){this.liquidStorage.setLimit(null, 16)},
 
     MJEnergyDeploy: function(amount, generator, params) {
         if (this.data.energy < 20) this.data.energy += Math.min(amount, amount - this.data.energy);
     },
 
     getTransportLiquid:function(){
-        return {output: ["water"]};
+        return {output: ["water","lava"]};
     },
 
     tick: function() {
-        this.liquidStorage.setLimit(null, 16);
-
         if (World.getThreadTime() % 20 == 0 && this.data.energy > 1) {
             var te = World.getTileEntity(this.x, this.y - 1, this.z);
             if (te) {
                 this.pullFromTileEntity(te);
             } else {
                 var coords = this.getPumpingCoords();
-                if (coords) {
+                if (coords){
                     var tile = World.getBlock(coords.x, coords.y, coords.z);
                     if (tile.id == 9 || tile.id == 11) {
                         World.setBlock(coords.x, coords.y, coords.z, 0);
@@ -3866,7 +3869,7 @@ TileEntity.registerPrototype(BlockID.bcPump, {
     },
 
     pullFromTileEntity: function(tileEntity) {
-        var transportableLiquid = tileEntity.getTransportLiquids;
+        var transportableLiquid = tileEntity.getTransportLiquid;
         var outputLiquids;
         if (transportableLiquid) outputLiquids = transportableLiquid().output;