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 45d22bdd6..ac67fe3ef 100644 Binary files a/src/main/resources/assets/botania/textures/model/altar.png and b/src/main/resources/assets/botania/textures/model/altar.png differ 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 000000000..45d22bdd6 Binary files /dev/null and b/src/main/resources/assets/botania/textures/model/altarCopy.png differ