From 781f586d1986a74a84dd076ff7d97c1a0d596249 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 21:55:32 -0600 Subject: [PATCH] Upload some files so I can use modelcreator in windows >.> --- altar | 12 +++++ .../client/render/tile/RenderTileAltar.java | 15 +----- .../botania/models/block/petalApothecary.json | 47 ++++++++++++++++++ .../assets/botania/textures/model/altar.png | Bin 2683 -> 4243 bytes .../botania/textures/model/altarCopy.png | Bin 0 -> 2683 bytes 5 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 altar create mode 100644 src/main/resources/assets/botania/models/block/petalApothecary.json create mode 100644 src/main/resources/assets/botania/textures/model/altarCopy.png diff --git a/altar b/altar new file mode 100644 index 000000000..d11cb75ae --- /dev/null +++ b/altar @@ -0,0 +1,12 @@ +altar +up-down +west-south-east-north + +base textures pillar tex + + + + northsouth face cup (1 always faces south) + eastwest face cup (blue always faces east) + cupbase 2 + cubbase \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 6f707b3ad..c739e8702 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -122,19 +123,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// IIcon icon = stack.getItem().getIcon(stack, 0); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// GlStateManager.color(1F, 1F, 1F); -// } - + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } diff --git a/src/main/resources/assets/botania/models/block/petalApothecary.json b/src/main/resources/assets/botania/models/block/petalApothecary.json new file mode 100644 index 000000000..0d731159b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/petalApothecary.json @@ -0,0 +1,47 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Base 1", + "from": [ 0, 0, 0 ], + "to": [ 16, 1, 0 ], + "faces": { + "down": { "texture": "#all", "uv": [ 16, 0, 31, 15 ], "cullface": "down" }, + "up": { "texture": "#all", "uv": [ 32, 0, 47, 15 ] }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] } + } + }, + { + "name": "Base 2" + }, + { + "name": "Base 3" + }, + { + "name": "Column" + }, + { + "name": "Cup Base 1" + }, + { + "name": "Cup Base 2" + }, + { + "name": "Cup North" + }, + { + "name": "Cup South" + }, + { + "name": "Cup West" + }, + { + "name": "Cup East" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar.png index 45d22bdd62b271e6b407fca8902422257d454dd6..ac67fe3ef9ad265d0eb8e62a069b47b34bc352e7 100644 GIT binary patch literal 4243 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 literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% diff --git a/src/main/resources/assets/botania/textures/model/altarCopy.png b/src/main/resources/assets/botania/textures/model/altarCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..45d22bdd62b271e6b407fca8902422257d454dd6 GIT binary patch literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% literal 0 HcmV?d00001