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

fix facade item renderer crash

Browse source
This commit is contained in:
asiekierka 2015-10-03 16:23:51 +02:00
parent 6b49bb6513
commit b318943e8f
6 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
buildcraft_resources/changelog/7.1.8
View file

@ -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)

1
common/buildcraft/transport/PipeColoringRecipe.java
View file

@ -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;

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 && 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

3
common/buildcraft/transport/statements/TriggerLightSensor.java
View file

@ -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;

3
common/buildcraft/transport/stripes/PipeExtensionListener.java
View file

@ -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;

6
common/buildcraft/transport/stripes/StripesHandlerPipes.java
View file

@ -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);