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

BuildCraft 6.3.3

Browse source
This commit is contained in:
asiekierka 2015-01-23 09:18:07 +01:00
parent f8ae10e2f2
commit 3fca102985
7 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'maven' // for uploading to a maven repo
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
version = "6.3.2" version = "6.3.3"
group= "com.mod-buildcraft" group= "com.mod-buildcraft"
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]

4
buildcraft_resources/changelog/6.3.3 Normal file
View file

@ -0,0 +1,4 @@
Bugfixes:
[#2407] Crash with blocks NPEing on getSubBlocks (asie)
Crash with null-block facades and/or pipe plugs (asie)
Removed facade debug code (asie)

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2 1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16 1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:6.3.2 1.7.10:BuildCraft:6.3.3

18
common/buildcraft/transport/ItemFacade.java
View file

@ -242,14 +242,18 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug
private void registerValidFacades(Block block, Item item) { private void registerValidFacades(Block block, Item item) {
ArrayList<ItemStack> stacks = new ArrayList<ItemStack>(16); ArrayList<ItemStack> stacks = new ArrayList<ItemStack>(16);
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { try {
for (CreativeTabs ct : item.getCreativeTabs()) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
block.getSubBlocks(item, ct, stacks); for (CreativeTabs ct : item.getCreativeTabs()) {
} block.getSubBlocks(item, ct, stacks);
} else { }
for (int i = 0; i < 16; i++) { } else {
stacks.add(new ItemStack(item, 1, i)); for (int i = 0; i < 16; i++) {
stacks.add(new ItemStack(item, 1, i));
}
} }
} catch (Exception e) {
e.printStackTrace();
} }
for (ItemStack stack : stacks) { for (ItemStack stack : stacks) {
try { try {

8
common/buildcraft/transport/render/FacadeBlockAccess.java
View file

@ -22,12 +22,12 @@ public class FacadeBlockAccess implements IBlockAccess {
@Override @Override
public Block getBlock(int x, int y, int z) { public Block getBlock(int x, int y, int z) {
System.out.println("Querying block at " + x + ", " + y + ", " + z); //System.out.println("Querying block at " + x + ", " + y + ", " + z);
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileGenericPipe) { if (tile instanceof TileGenericPipe) {
PipePluggable p = ((TileGenericPipe) tile).getPipePluggable(side); PipePluggable p = ((TileGenericPipe) tile).getPipePluggable(side);
if (p instanceof FacadePluggable) { if (p instanceof FacadePluggable) {
System.out.println("Found facade"); //System.out.println("Found facade");
return ((FacadePluggable) p).getRenderingBlock(); return ((FacadePluggable) p).getRenderingBlock();
} }
} }
@ -46,12 +46,12 @@ public class FacadeBlockAccess implements IBlockAccess {
@Override @Override
public int getBlockMetadata(int x, int y, int z) { public int getBlockMetadata(int x, int y, int z) {
System.out.println("Querying block metadata at " + x + ", " + y + ", " + z); //System.out.println("Querying block metadata at " + x + ", " + y + ", " + z);
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileGenericPipe) { if (tile instanceof TileGenericPipe) {
PipePluggable p = ((TileGenericPipe) tile).getPipePluggable(side); PipePluggable p = ((TileGenericPipe) tile).getPipePluggable(side);
if (p instanceof FacadePluggable) { if (p instanceof FacadePluggable) {
System.out.println("Found facade " + ((FacadePluggable) p).getRenderingMeta()); //System.out.println("Found facade " + ((FacadePluggable) p).getRenderingMeta());
return ((FacadePluggable) p).getRenderingMeta(); return ((FacadePluggable) p).getRenderingMeta();
} }
} }

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

@ -158,13 +158,16 @@ public class FacadeItemRenderer implements IItemRenderer {
GL11.glPushMatrix(); GL11.glPushMatrix();
// Enable glBlending for transparency // Enable glBlending for transparency
if (block != null && block.getRenderBlockPass() > 0) { if (block != null) {
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); if (block.getRenderBlockPass() > 0) {
GL11.glEnable(GL11.GL_BLEND); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
}
RenderUtils.setGLColorFromInt(block.getRenderColor(decodedMeta));
} }
RenderUtils.setGLColorFromInt(block.getRenderColor(decodedMeta));
if (hollow) { if (hollow) {
GL11.glTranslatef(translateX, translateY, translateZ); GL11.glTranslatef(translateX, translateY, translateZ);
drawHollowCube(tessellator, render, block, decodedMeta); drawHollowCube(tessellator, render, block, decodedMeta);

1
common/buildcraft/transport/render/FakeBlock.java
View file

@ -21,7 +21,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.core.render.ITextureStates; import buildcraft.api.core.render.ITextureStates;
import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.BlockGenericPipe;
/* /*
* This is fake block to render pluggables and pipes without altering host state * This is fake block to render pluggables and pipes without altering host state
* May prove useful if we will make API for roboports, pipes, plugs and facades * May prove useful if we will make API for roboports, pipes, plugs and facades