From a770eb740122a528174af6ad06dcf95fa6622a0d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 26 Nov 2014 19:50:14 +0800 Subject: [PATCH] Allowed fused quartz and quite clear glass to be used as facades. Tweaked new quite clear glass texture. --- .../textures/blocks/fusedGlassFrame.png | Bin 1166 -> 404 bytes .../enderio/textures/blocks/fusedGlassItem.png | Bin 214 -> 381 bytes .../enderio/conduit/facade/FacadeRenderer.java | 5 +++++ .../conduit/facade/ItemConduitFacade.java | 3 +++ 4 files changed, 8 insertions(+) diff --git a/resources/assets/enderio/textures/blocks/fusedGlassFrame.png b/resources/assets/enderio/textures/blocks/fusedGlassFrame.png index 1e9364d9ee5c4a7949223b73f85c0deeda3d23a8..9bcfeaf1e11d1398317e7563d0da94545abff502 100644 GIT binary patch delta 377 zcmeC5jgR3=A9lx&I`x0{NT;9+AZi419Y*n9=?B zgtb6H_7YEDSN40{!lDL@$p)2)Kq09T*NBqf{Irtt#G+J&fW*wa5hJyShH z1A{L`3xTRWc)B=-SoklU{JO7ML7?^d#oaHD)qf4z!=SaIWBRuBm1Qr^^K#C<_N2SL zK*H_egczA$R}be%pD8?Gly=`RNA8rR$z)g4ZyHiaL?XHnW!5{tMsU zc*o0?oBE`KTKrDh%B^|aCUW}kIo5gp*9x7xHduyN?r;A2gwO70=QoRk$1OGk)xDVN zuNdA{dZ%c@qhsG2*Ewwfiq&+Bm1uf{wM^T$il0lQ@<)sG>m79*-|OGmrK`2a9@5b9=qw? Vo(Ylb{{Vf@;OXk;vd$@?2>{*Go z27vT3k#99bCkwg(Fdyw@_zjkFVFU#mZh+zfQZ<8&MR5TmBO`9BaLAyz0EZg9!lMSD z#R9g_+VlSxSlF3?6-=YY6y882q#0}?C_Q7dnHVvUUc4?K#t@3L^D7?>9w+{gqae#X MUHx3vIVCg!0BQ0^c>n+a diff --git a/resources/assets/enderio/textures/blocks/fusedGlassItem.png b/resources/assets/enderio/textures/blocks/fusedGlassItem.png index ff1fb99ebaa1ad39463657f7297b786edb1ba978..b2a8e3dd8ddf10c7a49b60b96df47a5e42cbf0d4 100644 GIT binary patch delta 301 zcmV+|0n+}~0sR7yJPN%401mwYNBfYikwzhZFfjCTp#T5?`AI}UR5(wilk1LyAP|Ll zbT@5WFI6j`qJns9pQ2B;f6fA-O`7aBTlPyP1i~B!hC`@SXeJFY&k*a1-h@~dw6g|N z3f0gf?;50>BcTkL8S}11+4rDw1QE*&5=f&bkYU?`1#G26T`o@o@Z9j_!Y}`b+;<~? zaJ@b@`P@GxTioGtf3Dyi#?4glpGWLh^M0-sf$+(6Az>_7;AH*-ITS^(z_B=kL|GOr z;Br6m*8=yJ-to(hC{64YPQMDgO14B<3i4T-djxVQOAzZaKYyE;QV?rbrlhkjR})&T zVO_?}ydDP>qC?6!Y^8BkAwHX^YiH{iLNxdWsIuZ}+mqOR00000NkvXXu0mjf-K&Q| delta 132 zcmV-~0DJ%a0@eYLJPN)501mzZ>O!%=kwzhJF-P-4Hvj+tQb|NXR5(v#_)j4K8^Ay& zpp5|_J_zjj{|k(v!dL-F9f|=UHV6=-83aITQ4Amzj2b{M17J}K15jZw0Q1oWkpVu< mAOIG_CP6Hqo&n^8|Nj9bO)Q|*Fk3YM0000^DABe diff --git a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java index 77515d78..c2d6a2c9 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -56,6 +56,11 @@ public class FacadeRenderer implements IItemRenderer { // Render the facade block RenderUtil.bindBlockTexture(); + if(!block.isOpaqueCube()) { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } + if("appeng.block.solids.BlockSkyStone".equals(block.getClass().getName())) { //Yes, this is a horrible hack, but stumped as to why it is rendered invisible if this isn't done. renderBlocks.setOverrideBlockTexture(block.getIcon(0, PainterUtil.getSourceBlockMetadata(item))); diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index ba4f2975..0205070f 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -151,6 +151,9 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider if(!Config.allowTileEntitiesAsPaintSource && block instanceof ITileEntityProvider) { return false; } + if(block == EnderIO.blockFusedQuartz && paintSource.getItemDamage() < 2) { + return true; + } return block.getRenderType() == 0 || block.isOpaqueCube() || block.isNormalCube(); }