From c8f74029a4995ce87cde08d15318761d70daefb3 Mon Sep 17 00:00:00 2001 From: ganymedes01 Date: Fri, 14 Nov 2014 13:40:51 -0200 Subject: [PATCH 1/2] Made blood look more like blood --- .../textures/blocks/lifeEssenceFlowing.png | Bin 576 -> 6171 bytes .../blocks/lifeEssenceFlowing.png.mcmeta | 5 ++ .../textures/blocks/lifeEssenceStill.png | Bin 507 -> 5471 bytes .../blocks/lifeEssenceStill.png.mcmeta | 45 ++++++++++++++++++ .../textures/models/blood.png | Bin 576 -> 397 bytes 5 files changed, 50 insertions(+) create mode 100644 src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceFlowing.png.mcmeta create mode 100644 src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceStill.png.mcmeta diff --git a/src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceFlowing.png b/src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceFlowing.png index 05cfdd4e85dfb8e2f646d98e518acf8529bb1e5f..12241ce00242cad68cc05be3f44c757bcb7930b2 100644 GIT binary patch literal 6171 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 V`gCv6z>fd`002ovPDHLkV1ip$K+FID delta 495 zcmV>ECT8Nh-=bN^g$1oV}6T&uAF z0c;BPhOwXt7~q~o2z&-u0Dub|E8k6F?C?^7NfsJ_LbJR)6=oHnbsjeeK+^yRn!*Uc zp%+?T(8$hnfqw_IYG4c6gs$(R6{*W3ySLh#q$jp=ohzlG3CwnNl|n1MJY`+9uY<_P z0n;j&k?5v{P;y+VNPahmG}m;4S7q;%ghF$v1mbSuPj&*X4u3p{qsiU*NfWtaY#03h zbfjor#zd~@qcCc~;^Dz1P0LM_boiREDKMlWteDS$p=dX&Okq9TFUnIgnQMlgXb{HGUU|fTwH9Vg0zThZ1L+_M&#cbOu4^|r23)PF2 lYyK1G^&QX^rop+x>j!M+!f6LpXzc(1002ovPDHLkV1f{{(n$aS diff --git a/src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceStill.png.mcmeta b/src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceStill.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/textures/blocks/lifeEssenceStill.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/textures/models/blood.png b/src/main/resources/assets/alchemicalwizardry/textures/models/blood.png index 05cfdd4e85dfb8e2f646d98e518acf8529bb1e5f..d05ce9ac4971d8bf03280c2958179a14b90d959b 100644 GIT binary patch delta 298 zcmV+_0oDG%1dRib83+OZ005AYXf}}{Fbdua4Hh6aBhOIEky|T&0P#sgK~yNuWzkD+ z#4rp4(C1GwKzoPY|0X?4_bmqb*XUDl zc-=s!v(tId!Go2$^218Gw2tD4dvG?M1F&+CgP}yz_-s+<0oVdi*huU&CJtKMg^7ha zc!$dzMT(*a!zea?>Zme>6moNP92daBMn1yje8D72jBM=j-l=;4Ue3mLmvm~8NU^0c z>4*?cK)Sa{Vfw{oyYo-fvEUrtV@A5fcaEQ!PDy7pXH)yc$bH@n?6{Pt)21wICA^=_~h>o`})Gy6;Xw8 z1ORua6@~$MdqbX|K?DF92GaXG$~j3W*)xLU1-1=xhLqyQoMR9|O)1A7Ko#a0WnJNV z#Y+kQ?m=P}fN=~3`yNEw7H3aS__CnXdYA0(NJ=qm1|o<%ZWjAaQY-8`e!ZgoCJ_l{ zk;7-s2e6dL0T8nY^mZe8DPV@TWXT!HIeg|Es}W!p7Me1D%uq_f&5#}z;5{gJxZMtL zZ>O(XQGWnR&iK9~BJmcs?WnJ3l~T-$KuRR(kEZ+0`N#lpGrYfp7Az1%rxOZ9eL2H0 z1h5nK7P{mPY+#ut(*3Z#Kv6xKXbN~FXqIJ~nu2{t9(}3C8itq!y!k~W8WKTHC*<`N zMfDyW5dFG6BjXtLHbA%3EqF?BKBMFuHv&u(q8fpv6nU&GG7M3*Nc`F@GdZ962mfLv UX49uEivR!s07*qoM6N<$f(2;RKmY&$ From 02db97e5a5a665096168b28bdf31e40099b74861 Mon Sep 17 00:00:00 2001 From: ganymedes01 Date: Fri, 14 Nov 2014 21:04:54 -0200 Subject: [PATCH 2/2] Animated the blood on altars --- .../renderer/model/ModelBloodAltar.java | 59 +++++++++------- .../alchemicalwizardry/models/bloodlevel.obj | 64 ------------------ .../textures/models/blood.png | Bin 397 -> 0 bytes 3 files changed, 33 insertions(+), 90 deletions(-) delete mode 100644 src/main/resources/assets/alchemicalwizardry/models/bloodlevel.obj delete mode 100644 src/main/resources/assets/alchemicalwizardry/textures/models/blood.png diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java index a9e72f60..b8a1679f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/model/ModelBloodAltar.java @@ -1,22 +1,28 @@ package WayofTime.alchemicalWizardry.common.renderer.model; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; + import org.lwjgl.opengl.GL11; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import cpw.mods.fml.client.FMLClientHandler; + public class ModelBloodAltar extends ModelBase { + private static final ResourceLocation altar_texture = new ResourceLocation("alchemicalwizardry:textures/models/altar.png"); + private IModelCustom modelBloodAltar; - private IModelCustom modelBloodLevel; //TODO public ModelBloodAltar() { modelBloodAltar = AdvancedModelLoader.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodaltar-fixeUV.obj")); - modelBloodLevel = AdvancedModelLoader.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodlevel.obj")); } public void renderBloodAltar() @@ -24,11 +30,6 @@ public class ModelBloodAltar extends ModelBase modelBloodAltar.renderAll(); } - public void renderBloodLevel() - { - modelBloodLevel.renderAll(); - } - public void renderBloodAltar(TEAltar altar, double x, double y, double z) { float scale = 0.1f; @@ -39,9 +40,7 @@ public class ModelBloodAltar extends ModelBase // Scale our object to about half-size in all directions (the OBJ file is a little large) GL11.glScalef(scale, scale, scale); // Bind the texture, so that OpenGL properly textures our block. - ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/altar.png"); - //FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/alchemicalwizardry/textures/models/altar.png"); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(altar_texture); // Render the object, using modelTutBox.renderAll(); this.renderBloodAltar(); // Pop this matrix from the stack. @@ -50,21 +49,29 @@ public class ModelBloodAltar extends ModelBase public void renderBloodLevel(TEAltar altar, double x, double y, double z) { - float scale = 0.1f; - // Push a blank matrix onto the stack GL11.glPushMatrix(); float level = altar.getFluidAmount(); - // Move the object into the correct position on the block (because the OBJ's origin is the center of the object) - GL11.glTranslatef((float) x + 0.5f, (float) y + 0.6499f + 0.12f * (level / altar.getCapacity()), (float) z + 0.5f); - // Scale our object to about half-size in all directions (the OBJ file is a little large) - GL11.glScalef(scale, scale, scale); - // Bind the texture, so that OpenGL properly textures our block. - ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/blood.png"); - //FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/alchemicalwizardry/textures/models/altar.png"); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); - // Render the object, using modelTutBox.renderAll(); - this.renderBloodLevel(); - // Pop this matrix from the stack. + GL11.glTranslatef((float) x , (float) y + 0.6499f + 0.12f * (level / altar.getCapacity()), (float) z); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + renderBloodLevel(AlchemicalWizardry.lifeEssenceFluid.getStillIcon()); GL11.glPopMatrix(); } -} + + public void renderBloodLevel(IIcon icon) + { + Tessellator tessellator = Tessellator.instance; + + double minU = (double) icon.getInterpolatedU(0); + double maxU = (double) icon.getInterpolatedU(16); + double minV = (double) icon.getInterpolatedV(0); + double maxV = (double) icon.getInterpolatedV(16); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0, 1, 0); + tessellator.addVertexWithUV(1, 0, 1, maxU, maxV); + tessellator.addVertexWithUV(1, 0, 0, maxU, minV); + tessellator.addVertexWithUV(0, 0, 0, minU, minV); + tessellator.addVertexWithUV(0, 0, 1, minU, maxV); + tessellator.draw(); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/bloodlevel.obj b/src/main/resources/assets/alchemicalwizardry/models/bloodlevel.obj deleted file mode 100644 index f301ee48..00000000 --- a/src/main/resources/assets/alchemicalwizardry/models/bloodlevel.obj +++ /dev/null @@ -1,64 +0,0 @@ -# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware -# File Created: 07.08.2013 20:12:01 - -mtllib bloodlevel.mtl - -# -# object headusOBJexport001 -# - -v -1.2846 0.0000 2.0630 -v -1.2890 0.0000 -2.0628 -v -2.0627 0.0000 -1.2993 -v -2.0628 0.0000 1.2848 -v 1.2845 0.0000 2.0630 -v -1.7911 0.0000 3.2857 -v 1.7911 0.0000 3.2857 -v 2.0628 0.0000 1.2848 -v 3.2856 0.0000 1.7912 -v 2.0628 0.0000 -1.2845 -v 3.2856 0.0000 -1.7910 -v 1.2846 0.0000 -2.0627 -v 1.7911 0.0000 -3.2855 -v -1.7907 0.0000 -3.2857 -v -3.2854 0.0000 -1.8107 -v -3.2856 0.0000 1.7912 -# 16 vertices - -vn 0.0000 1.0000 -0.0000 -# 1 vertex normals - -vt 0.3045 0.1861 0.0000 -vt 0.3038 0.8139 0.0000 -vt 0.1861 0.6977 0.0000 -vt 0.1861 0.3045 0.0000 -vt 0.6955 0.1861 0.0000 -vt 0.2274 -0.0000 0.0000 -vt 0.7726 -0.0000 0.0000 -vt 0.8139 0.3045 0.0000 -vt 1.0000 0.2274 0.0000 -vt 0.8139 0.6955 0.0000 -vt 1.0000 0.7725 0.0000 -vt 0.6955 0.8139 0.0000 -vt 0.7726 1.0000 0.0000 -vt 0.2275 1.0000 0.0000 -vt 0.0000 0.7755 0.0000 -vt 0.0000 0.2274 0.0000 -# 16 texture coords - -g headusOBJexport001 -usemtl Material__46 -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/1 1/1/1 6/6/1 7/7/1 -f 8/8/1 5/5/1 7/7/1 9/9/1 -f 10/10/1 8/8/1 9/9/1 11/11/1 -f 12/12/1 10/10/1 11/11/1 13/13/1 -f 2/2/1 12/12/1 13/13/1 14/14/1 -f 3/3/1 2/2/1 14/14/1 15/15/1 -f 4/4/1 3/3/1 15/15/1 16/16/1 -f 1/1/1 4/4/1 16/16/1 6/6/1 -f 12/12/1 5/5/1 8/8/1 10/10/1 -f 5/5/1 12/12/1 2/2/1 1/1/1 -# 11 polygons - diff --git a/src/main/resources/assets/alchemicalwizardry/textures/models/blood.png b/src/main/resources/assets/alchemicalwizardry/textures/models/blood.png deleted file mode 100644 index d05ce9ac4971d8bf03280c2958179a14b90d959b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqH?Nq2nezF7Q$Qiv%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dDE`sY#W6(VeCkE-ydwrY%om>f8#z?B-}|p->-}Aq?dQ$d z9bA)Einl%LP|{rHFShT-NuLE5SMD+XZQaWMYI6Rxin|WWH(##2aIksmu1|-(c5dl= z)KOhvHjjBj(S+uOE|-7g1U_fH!4z=Ae&C>+-Jz#72UWa!a^8Hrx3Zcc?%c7m=_OecJvJ^ieAyx3=df$LXX3A;sk=Y> zU)lIT=5Dgvt|R4r^Jn;ZrkkV(|9+mks7K}#YkOrC6>FVdQ&MBb@0RP6ItN;K2