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

fix FacadePluggable crash, remove plugs for glass facades

Browse source
This commit is contained in:
asiekierka 2015-09-20 13:29:29 +02:00
parent 7edc5a9308
commit c8ca9aeaf9
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildcraft_resources/changelog/7.1.3
View file

@ -3,6 +3,7 @@ NOTE: This changelog takes off from BuildCraft 7.0.23!
BREAKING CHANGES!
* Cobblestone Structure Pipes have a new recipe. (asie)
* Electronic Libraries have a new recipe matching the looks better. (asie)
* Quartz Fluid Pipes no longer connect to Cobblestone or Stone Fluid Pipes. This might break existing builds! (asie)
NON-BREAKING CHANGES BUT STILL IMPORTANT!
@ -38,6 +39,7 @@ Improvements:
* Add events for robot interaction and removal (asie)
* Transport:
* Filtered Buffers now support the Comparator (asie)
* Glass Facades no longer render the "plug" (asie)
* Lenses do not require Iron Ingots anymore (asie)
* New power beam display algorithm (asie)
* Rewritten pipe wires - should now propagate more or less instantly. (asie)

9
common/buildcraft/transport/FacadePluggable.java
View file

@ -178,7 +178,7 @@ public class FacadePluggable extends PipePluggable implements IFacadePluggable {
}
private void prepareStates() {
if (states.length > 1) {
if (states != null && states.length > 1) {
if (pipe == null || pipe.getPipe() == null) {
activeState = states[0];
return;
@ -205,11 +205,4 @@ public class FacadePluggable extends PipePluggable implements IFacadePluggable {
activeState = states != null && states.length > 0 ? states[0] : null;
}
}
@Override
public void update(IPipeTile pipe, ForgeDirection direction) {
if (states.length > 1) {
// Iterate over all states and activate first proper
}
}
}

2
common/buildcraft/transport/render/FacadeItemRenderer.java
View file

@ -170,7 +170,7 @@ public class FacadeItemRenderer implements IItemRenderer {
RenderUtils.setGLColorFromInt(0xFFFFFF);
// Render StructurePipe
if (!hollow) {
if (!hollow && block.getMaterial().isOpaque()) {
block = BuildCraftTransport.genericPipeBlock;
IIcon textureID = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeStructureCobblestone.ordinal()); // Structure pipe

2
common/buildcraft/transport/render/FacadeRenderHelper.java
View file

@ -201,7 +201,7 @@ public final class FacadeRenderHelper {
textureManager.getTextureState().set(BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeStructureCobblestone.ordinal())); // Structure Pipe
// Always render connectors in pass 0
if (renderPass == 0 && !pluggable.isHollow()) {
if (renderPass == 0 && !pluggable.isHollow() && renderBlock.getMaterial().isOpaque()) {
float[][] rotated = MatrixTranformations.deepClone(zeroStateSupport);
MatrixTranformations.transform(rotated, direction);