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

minor fixes

Browse source
This commit is contained in:
SpaceToad 2014-03-16 14:15:00 +01:00
parent 73c2b3ec28
commit 5f50418382
6 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/buildcraft/BuildCraftTransport.java
View file

@ -162,7 +162,6 @@ public class BuildCraftTransport extends BuildCraftMod {
public static Item plugItem;
public static Item robotStationItem;
public static BlockFilteredBuffer filteredBufferBlock;
// public static Item pipeItemsStipes;
public static Item pipeStructureCobblestone;
public static int groupItemsTrigger;
public static String[] facadeBlacklist;

2
common/buildcraft/builders/RenderBuilder.java
View file

@ -43,7 +43,7 @@ public class RenderBuilder extends RenderBoxProvider {
RenderLaser
.doRenderLaser(
TileEntityRendererDispatcher.instance.field_147553_e,
laser, EntityLaser.LASER_TEXTURES[3]);
laser, EntityLaser.LASER_TEXTURES[4]);
GL11.glPopMatrix();
}
}

9
common/buildcraft/builders/TileBuilder.java
View file

@ -654,7 +654,14 @@ public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IM
@Override
public AxisAlignedBB getRenderBoundingBox() {
return new Box (this).extendToEncompass(box).getBoundingBox();
Box renderBox = new Box (this).extendToEncompass(box);
for (LaserData l : pathLasers) {
renderBox = renderBox.extendToEncompass(l.head);
renderBox = renderBox.extendToEncompass(l.tail);
}
return renderBox.getBoundingBox();
}
public void debugForceBlueprintCompletion () {

28
common/buildcraft/core/Box.java
View file

@ -321,4 +321,32 @@ public class Box implements IBox {
return AxisAlignedBB.getBoundingBox(xMin, yMin, zMin,
xMax, yMax, zMax);
}
public Box extendToEncompass(Position toBeContained) {
if (toBeContained.x < xMin) {
xMin = (int) toBeContained.x - 1;
}
if (toBeContained.y < yMin) {
yMin = (int) toBeContained.y - 1;
}
if (toBeContained.z < zMin) {
zMin = (int) toBeContained.z - 1;
}
if (toBeContained.x > xMax) {
xMax = (int) toBeContained.x + 1;
}
if (toBeContained.y > yMax) {
yMax = (int) toBeContained.y + 1;
}
if (toBeContained.z > zMax) {
zMax = (int) toBeContained.z + 1;
}
return this;
}
}

6
common/buildcraft/core/EntityLaser.java
View file

@ -20,7 +20,8 @@ public abstract class EntityLaser extends Entity {
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_1.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_2.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png")};
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png"),
new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png")};
public LaserData data = new LaserData();
@ -63,8 +64,9 @@ public abstract class EntityLaser extends Entity {
@Override
public void onUpdate() {
if (data.head == null || data.tail == null)
if (data.head == null || data.tail == null) {
return;
}
if (!worldObj.isRemote && needsUpdate) {
updateDataServer();

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

@ -53,6 +53,7 @@ public class TransportProxyClient extends TransportProxy {
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsLapis, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsDaizuli, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsEmzuli, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeItemsStripes, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeFluidsWood, pipeItemRenderer);
MinecraftForgeClient.registerItemRenderer(BuildCraftTransport.pipeFluidsCobblestone, pipeItemRenderer);