diff --git a/buildcraft_resources/changelog/7.1.8 b/buildcraft_resources/changelog/7.1.8 index 7991af79..99bf25e4 100644 --- a/buildcraft_resources/changelog/7.1.8 +++ b/buildcraft_resources/changelog/7.1.8 @@ -6,4 +6,5 @@ Bugs fixed: * [#3050] Oil biome configs not changing from defaults (asie) * Rare crash with engines (asie) +* Rare crash with facade rendering (asie) * Very rare rendering glitch with items in BC pipes (asie) diff --git a/common/buildcraft/transport/PipeColoringRecipe.java b/common/buildcraft/transport/PipeColoringRecipe.java index 6cfaf760..e7fab8f5 100644 --- a/common/buildcraft/transport/PipeColoringRecipe.java +++ b/common/buildcraft/transport/PipeColoringRecipe.java @@ -9,7 +9,6 @@ import net.minecraft.world.World; import buildcraft.core.lib.utils.ColorUtils; public class PipeColoringRecipe implements IRecipe { - private ItemStack getResult(InventoryCrafting crafting) { ItemStack oneColorPipeStack = null; ItemStack pipeStack = null; diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index 8f373ce4..4d197636 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -170,7 +170,7 @@ public class FacadeItemRenderer implements IItemRenderer { RenderUtils.setGLColorFromInt(0xFFFFFF); // Render StructurePipe - if (!hollow && block.getMaterial().isOpaque()) { + if (!hollow && block != null && (block.getMaterial() == null || block.getMaterial().isOpaque())) { block = BuildCraftTransport.genericPipeBlock; IIcon textureID = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeStructureCobblestone.ordinal()); // Structure pipe diff --git a/common/buildcraft/transport/statements/TriggerLightSensor.java b/common/buildcraft/transport/statements/TriggerLightSensor.java index 28fabbf7..ac69e62e 100644 --- a/common/buildcraft/transport/statements/TriggerLightSensor.java +++ b/common/buildcraft/transport/statements/TriggerLightSensor.java @@ -14,9 +14,6 @@ import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.statements.BCStatement; -/** - * Created by asie on 3/14/15. - */ public class TriggerLightSensor extends BCStatement implements ITriggerInternal { private final boolean bright; diff --git a/common/buildcraft/transport/stripes/PipeExtensionListener.java b/common/buildcraft/transport/stripes/PipeExtensionListener.java index 533d2bb7..51ae3954 100644 --- a/common/buildcraft/transport/stripes/PipeExtensionListener.java +++ b/common/buildcraft/transport/stripes/PipeExtensionListener.java @@ -26,9 +26,6 @@ import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TravelingItem; import buildcraft.transport.utils.TransportUtils; -/** - * Created by asie on 3/20/15. - */ public class PipeExtensionListener { private class PipeExtensionRequest { public ItemStack stack; diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java index 1f320179..b6e4dc76 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipes.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -50,12 +50,12 @@ public class StripesHandlerPipes implements IStripesHandler { p.moveBackwards(1.0D); Pipe pipe = BlockGenericPipe.createPipe(stack.getItem()); + if (pipe.transport instanceof PipeTransportItems) { - // Checks done, request extension + // Item pipe: request extending on end of tick BuildCraftTransport.pipeExtensionListener.requestPipeExtension(stack, world, (int) p.x, (int) p.y, (int) p.z, direction, activator); } else { - // Fluid/power pipe, place in front instead - + // Non-item pipe: place in front of stripes (item) pipe stack.getItem().onItemUse(stack, CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world, (int) p.x, (int) p.y, (int) p.z).get(), world, x, y, z, 1, 0, 0, 0);