From 0d59f9b90a4aebe0a6181b507f2d8e484817fdec Mon Sep 17 00:00:00 2001 From: makeo Date: Wed, 28 Oct 2015 11:57:10 +0100 Subject: [PATCH] added colored cubes to manipulator --- .../client/models/ModelSmallCube.java | 42 +++++++++++++ .../block/BlockNodeManipulatorRenderer.java | 59 +++++++++++++----- .../tile/RenderTileNodeManipulator.java | 32 +++++++++- .../blocks/manipulator_focus_side.png | Bin 257 -> 218 bytes .../textures/blocks/manipulator_focus_top.png | Bin 372 -> 317 bytes .../textures/blocks/manipulator_side.png | Bin 679 -> 601 bytes .../textures/blocks/manipulator_side_old.png | Bin 606 -> 0 bytes .../gadomancy/textures/models/small_cube.png | Bin 0 -> 157 bytes 8 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java delete mode 100644 src/main/resources/assets/gadomancy/textures/blocks/manipulator_side_old.png create mode 100644 src/main/resources/assets/gadomancy/textures/models/small_cube.png diff --git a/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java b/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java new file mode 100644 index 0000000..869066c --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/models/ModelSmallCube.java @@ -0,0 +1,42 @@ +package makeo.gadomancy.client.models; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 27.10.2015 23:40 + */ +public class ModelSmallCube extends ModelBase { + //fields + ModelRenderer shape1; + + public ModelSmallCube() { + textureWidth = 8; + textureHeight = 4; + + shape1 = new ModelRenderer(this, 0, 0); + shape1.addBox(-1F, -3F, -1F, 2, 2, 2); + shape1.setRotationPoint(0F, 0F, 0F); + shape1.setTextureSize(8, 4); + shape1.mirror = true; + setRotation(shape1, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + shape1.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java index ac50d23..dbbf781 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/BlockNodeManipulatorRenderer.java @@ -1,12 +1,12 @@ package makeo.gadomancy.client.renderers.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import makeo.gadomancy.client.renderers.tile.RenderTileNodeManipulator; import makeo.gadomancy.common.registration.RegisteredBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import thaumcraft.client.renderers.block.BlockStoneDeviceRenderer; +import thaumcraft.common.blocks.BlockStoneDevice; /** * This class is part of the Gadomancy Mod @@ -16,30 +16,61 @@ import thaumcraft.client.renderers.block.BlockStoneDeviceRenderer; *

* Created by makeo @ 27.10.2015 13:46 */ -public class BlockNodeManipulatorRenderer implements ISimpleBlockRenderingHandler { - public static final BlockStoneDeviceRenderer PARENT_RENDERER = new BlockStoneDeviceRenderer(); - +public class BlockNodeManipulatorRenderer extends BlockStoneDeviceRenderer { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { GL11.glPushMatrix(); GL11.glTranslatef(0, -0.1f, 0); GL11.glScalef(0.85f, 0.85f, 0.85f); - PARENT_RENDERER.renderInventoryBlock(block, 5, modelId, renderer); + super.renderInventoryBlock(block, 5, modelId, renderer); GL11.glTranslatef(0, 1f, 0); - PARENT_RENDERER.renderInventoryBlock(block, 8, modelId, renderer); + + renderWandPedestalFocus(block, renderer); + RenderTileNodeManipulator.renderColorCubes(1, 1, 1, 1); + GL11.glPopMatrix(); } - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return PARENT_RENDERER.renderWorldBlock(world, x, y, z, block, modelId, renderer); - } + public static void renderWandPedestalFocus(Block block, RenderBlocks renderer) { + block.setBlockBounds(W5, 0.0F, W5, W11, W1, W11); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; + block.setBlockBounds(W1, 0.0F, W7, W5, W1, W9); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + block.setBlockBounds(W11, 0.0F, W7, W15, W1, W9); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + block.setBlockBounds(W7, 0.0F, W1, W9, W1, W5); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + block.setBlockBounds(W7, 0.0F, W11, W9, W1, W15); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + float height = W7 - (2/16f); + + block.setBlockBounds(W1, W1, W7, W3, height, W9); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + block.setBlockBounds(W7, W1, W1, W9, height, W3); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + block.setBlockBounds(W13, W1, W7, W15, height, W9); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); + + block.setBlockBounds(W7, W1, W13, W9, height, W15); + renderer.setRenderBoundsFromBlock(block); + drawFaces(renderer, block, ((BlockStoneDevice) block).iconWandPedestalFocus[2], ((BlockStoneDevice) block).iconWandPedestalFocus[1], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], ((BlockStoneDevice) block).iconWandPedestalFocus[0], true); } @Override diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java index 333f74b..606974f 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java @@ -1,10 +1,14 @@ package makeo.gadomancy.client.renderers.tile; +import makeo.gadomancy.client.models.ModelSmallCube; import makeo.gadomancy.client.renderers.block.BlockNodeManipulatorRenderer; import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.SimpleResourceLocation; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import thaumcraft.client.renderers.tile.TileWandPedestalRenderer; @@ -17,6 +21,9 @@ import thaumcraft.client.renderers.tile.TileWandPedestalRenderer; * Created by makeo @ 27.10.2015 15:19 */ public class RenderTileNodeManipulator extends TileWandPedestalRenderer { + private static final ModelSmallCube MODEL = new ModelSmallCube(); + private static final SimpleResourceLocation TEXTURE = new SimpleResourceLocation("models/small_cube.png"); + @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partitalTicks) { super.renderTileEntityAt(tile, x, y, z, partitalTicks); @@ -27,8 +34,31 @@ public class RenderTileNodeManipulator extends TileWandPedestalRenderer { GL11.glTranslatef(0.5f, 1.5f, 0.5f); bindTexture(TextureMap.locationBlocksTexture); - BlockNodeManipulatorRenderer.PARENT_RENDERER.renderInventoryBlock(RegisteredBlocks.blockNodeManipulator, 8, 0, RenderBlocks.getInstance()); + BlockNodeManipulatorRenderer.renderWandPedestalFocus(RegisteredBlocks.blockNodeManipulator, RenderBlocks.getInstance()); + + //TODO: add color + renderColorCubes(1, 0.5f, 0, 1); GL11.glPopMatrix(); } + + public static void renderColorCubes(float r, float g, float b, float a) { + GL11.glPushMatrix(); + GL11.glColor4f(r, g, b, a); + + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + + for(int i = 0; i < 4; i++) { + GL11.glPushMatrix(); + + ForgeDirection dir = ForgeDirection.getOrientation(i + 2); + GL11.glTranslatef(dir.offsetX * (-6/16f), 0, dir.offsetZ * (-6/16f)); + + MODEL.render(null, 0, 0, 0, 0, 0, 0.0625f); + GL11.glPopMatrix(); + } + + GL11.glColor4f(1, 1, 1, 1); + GL11.glPopMatrix(); + } } diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_side.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_focus_side.png index b793664a8635bab75eaba070797c5c9154dc78d6..02eadab614fb1678be64b4e953430bd484cca6f1 100644 GIT binary patch delta 122 zcmV-=0EPd70@?wPIa`cLL_t(I%VYfi|33pIfQf-ZFlxZ40n{_VN4xaDihvzPn#LzC z%VY2##RXq~zris5)AzSn#ovB@it2(--`_HDvx;CStDMpGSMx2R( zfq_9>T%3WMn;XM)qQw9I|Igs9Rq|h%-}e9i|Nj|~F+On_ZvFrN|NlpX!Pnn!Fl_qt z{Vi7Ux1XP)hQX)rZyC5*MKBcdaSCG<7v_~_U}xb&7{JFVi~}`C|)#jZUn{8Aaq1PB@ znUmC~RR7}pYM#xV)=2K^j^r{hR6EPAX&Sn&bKmR(U{)=z&D&xIPHQCbDx`9uV_h~0 zVh=Z*GGD&@jX}H$@t1D^xZxClWc#rjmWb@_$Ig?qYY&pADZGOu^$)*;^LnNqRtbT} U=3$OR00000Ne4wvM6N<$f`c`Hz5oCK delta 325 zcmV-L0lNOZ0`vlqIDY{qNklvaIO*WI`p?gRB z?bevpnu|8~!w&Jp!?E)8X!9`*=jzOF+Da*IuAg{~9y!~q5l=i4o9}!k$E*!@0jQQ6 z(hJ(0Toh1B(QG!2#4K&c%KzM+N~N%En}bpXfNUnmR(9u?elCM*xgpUgAf2?yt(Wkl zE}fvo%kchh3_hY!fH!;wpcAwJh^K?)aN|e{ XPl>%#6#zK#00000NkvXXu0mjf`+J>0 diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_side.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_side.png index 031e614464b1cc92197d4928bdec6f774d097fd6..f8b0a9a43bd07249b8cf7e6c65ee4b0302c97224 100644 GIT binary patch delta 558 zcmV+}0@3}a1=$3UB#}WCe+x-OK~y-)g_1jO6HyRG&wcE!*9*Z;yiSNfG(kdiP^96X z)6wt;kkU}lAelJvYaQ?2y-x}Y2uUP=1Rlp zk*gu!S6{^ae$9hC%WD99Fl_9M5G_JTY}j!=di${bF(9SHn~yC@e<-BV)T0wpjJO#1 z`uXZGVCQbRcy+;D=P<^gRKg=Lt>vl6hlMJeFkfzHyB>hmrejbHuzgRVj}8NR-*8$_ z&>|qEAOy>NK4+JD>{_JEFvk2{ z;pF%TAHbRY8lCMh#;|P+T5CmCDo~2Wrr~T_v);B81C7oqqW7dE&?-Sukd>eeSm*IR zppA`~-cw}-tL+_aYwcU@1eBo&L*3g`Fd7O;2W9i1`!22}ki{^N7YlmGw#07*qoM6N<$g7IbvmjD0& delta 634 zcmV-=0)_qA1g8a%BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%m=JV``BR5(v< zQ_GIiFcdwu^Jtpsw9{z@7(lS-0*%B17PCR(!`ZQ6jfBJoiHCTErqf4~Hn9^Y<|d6g zohe7M?Bw2id>_Zm5O9D;{uNx|qc$2N_bDnXRk9N5a5C%7!6_S8f9JK!@C83Za#LNI~--O zEpIS=a*1F(hVS+u1o3kQDT~hIE{+I%dxB^gBg<9$y^3@6h^SBsu65e}JH!!z(g_{} z6IiUG#xYb?fhdYF8V=g*?&FA{L6RoeWEsjzp^z2&o=?k#qDJ0-$A1aJa7Gr6Fj_-b z8nbzXA7R*8?_xiNH`gz4aT!1ufrl3Xmg_a8Z%}Iu-*-VcO&M91=%Nk?WU1kB3%M#Opl%8Ko zjf=Ah5+Z1HFQvpbldvt|e0;hqLn=r*t1XkuqNYY^7^-HKZt(T{Z$$G|8!Y1usjq;dMNa{`G++?B zQZnjOK@%badwKQT^t>LbS|KOVIK(_ACAv1Jpc)QcZA^ty@7^4>YS#;0BDz`OAHzl` UQXq0J!vFvP07*qoM6N<$g14g^J^%m! diff --git a/src/main/resources/assets/gadomancy/textures/blocks/manipulator_side_old.png b/src/main/resources/assets/gadomancy/textures/blocks/manipulator_side_old.png deleted file mode 100644 index a3d1076eae403d4b551fff3d89031113c528e390..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 606 zcmV-k0-^nhP)t5nXJhkDt(&y{INS(sF>i8-(yrf6MInlaxN zpVY&B%OgE2TL2_FR(?uM9;GxsZn>DeeZ0O8ICwK{Nb1^0cxIfpSBLE$=2Sr&T${dnL-n9Wyo{Q$sX)ibI__+emh;b}lthO_nrt0Gz} zV)V>rGbS&dBO?Fdpc`0k*4%d;Ar5#K8P^Ttx?()8p6(z<&vbgjXk0U$EosV1AUstCh?lSqn!wPwEq7lcw<`XL}OArcwaB_Y9Ty&-F`T4QuU2x%Xn z738GZY&!~Vu-2form1Vr+LjQ6uI~}=NiqKI;OfI=KAcRbn}XBB6V}@ftqYuUeRTOiBqGLSVJrGM~@sU8FRYqxOVK s!F@kaTEpF9L6F_K73{i@K<^yC0Ow;a_i(|{jQ{`u07*qoM6N<$f{TX({r~^~ diff --git a/src/main/resources/assets/gadomancy/textures/models/small_cube.png b/src/main/resources/assets/gadomancy/textures/models/small_cube.png new file mode 100644 index 0000000000000000000000000000000000000000..53c358e1c51590b2e59806d954d8f61365b3e1b3 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^96-#%!3HEZpRM};b!1@J z*w6hZkrl}2EbxddW?X?_wfUrhf<~S$jv*4^$vk{~|JJWqaiZY=zgo5&lgT@F ySTLKLn=|XpdinJ9be{PAb*Tqjg$){KGcp)3sr=56taJwIX7F_Nb6Mw<&;$U$BrGcc literal 0 HcmV?d00001