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

fix filler/architect table rendering regression

Browse source
This commit is contained in:
Adrian 2015-06-04 16:11:04 +02:00
parent 60613e74c7
commit cd8da741d5
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/buildcraft/builders/BuilderProxyClient.java
View file

@ -38,20 +38,25 @@ public class BuilderProxyClient extends BuilderProxy {
super.registerBlockRenderers(); super.registerBlockRenderers();
ClientRegistry.bindTileEntitySpecialRenderer(TileUrbanist.class, new RenderBoxProvider()); ClientRegistry.bindTileEntitySpecialRenderer(TileUrbanist.class, new RenderBoxProvider());
ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderArchitect());
ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderBuilder());
ClientRegistry.bindTileEntitySpecialRenderer(TileBuilder.class, new RenderBuilderTile()); ClientRegistry.bindTileEntitySpecialRenderer(TileBuilder.class, new RenderBuilderTile());
ClientRegistry.bindTileEntitySpecialRenderer(TilePathMarker.class, new RenderPathMarker()); ClientRegistry.bindTileEntitySpecialRenderer(TilePathMarker.class, new RenderPathMarker());
ClientRegistry.bindTileEntitySpecialRenderer(TileConstructionMarker.class, new RenderConstructionMarker()); ClientRegistry.bindTileEntitySpecialRenderer(TileConstructionMarker.class, new RenderConstructionMarker());
ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderLEDTile(BuildCraftBuilders.architectBlock)); ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderLEDTile(BuildCraftBuilders.fillerBlock)); new RenderLEDTile(BuildCraftBuilders.fillerBlock),
new RenderBuilder()
}));
ClientRegistry.bindTileEntitySpecialRenderer(TileQuarry.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] { ClientRegistry.bindTileEntitySpecialRenderer(TileQuarry.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
new RenderLEDTile(BuildCraftBuilders.quarryBlock), new RenderLEDTile(BuildCraftBuilders.quarryBlock),
new RenderBuilder() new RenderBuilder()
})); }));
ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
new RenderLEDTile(BuildCraftBuilders.architectBlock),
new RenderArchitect()
}));
RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid()); RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid());
} }

4
common/buildcraft/core/render/RenderBox.java
View file

@ -26,7 +26,7 @@ public final class RenderBox {
public static void doRender(TextureManager t, ResourceLocation texture, Box box) { public static void doRender(TextureManager t, ResourceLocation texture, Box box) {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glDisable(2896 /* GL_LIGHTING */); GL11.glDisable(GL11.GL_LIGHTING);
box.createLaserData(); box.createLaserData();
@ -38,7 +38,7 @@ public final class RenderBox {
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
GL11.glEnable(2896 /* GL_LIGHTING */); GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }

4
common/buildcraft/core/render/RenderBoxProvider.java
View file

@ -38,8 +38,6 @@ public class RenderBoxProvider extends TileEntitySpecialRenderer {
GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glPushMatrix();
GL11.glTranslated(-tileentity.xCoord, -tileentity.yCoord, -tileentity.zCoord); GL11.glTranslated(-tileentity.xCoord, -tileentity.yCoord, -tileentity.zCoord);
GL11.glTranslated(x, y, z); GL11.glTranslated(x, y, z);
@ -61,8 +59,6 @@ public class RenderBoxProvider extends TileEntitySpecialRenderer {
} }
} }
GL11.glPopMatrix();
GL11.glPopAttrib(); GL11.glPopAttrib();
GL11.glPopMatrix(); GL11.glPopMatrix();
} }