From 6c9a01978a73d1e47fd92c3cab60e7e0864b0627 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Jan 2016 15:04:08 -0600 Subject: [PATCH] Cocoon of caprice model --- .../client/core/handler/ModelHandler.java | 1 + .../client/render/tile/RenderTileCocoon.java | 17 +++++++++------ .../assets/botania/blockstates/cocoon.json | 14 ++++++++++++ .../assets/botania/models/block/cocoon.json | 20 ++++++++++++++++++ .../assets/botania/textures/model/cocoon.png | Bin 16468 -> 1435 bytes 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/cocoon.json create mode 100644 src/main/resources/assets/botania/models/block/cocoon.json diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index ea4d8760a..43b7232a8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -352,6 +352,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.cacophonium); registerItemModel(ModBlocks.cellBlock); registerItemModel(ModBlocks.conjurationCatalyst); + registerItemModel(ModBlocks.cocoon); registerItemModel(ModBlocks.corporeaFunnel); registerItemModel(ModBlocks.corporeaInterceptor); registerItemModel(ModBlocks.corporeaRetainer); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index 0ee6aafc0..fc9eada26 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -10,9 +10,12 @@ */ package vazkii.botania.client.render.tile; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -41,12 +44,14 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.translate(0.5F, -0.5F - 3F / 16F, -0.5F + 1F / 16F); - GlStateManager.rotate(rot, 0F, 1F, 0F); - model.render(); + GlStateManager.translate(d0, d1, d2 + 1); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.translate(0.5F, 0, 0F); + GlStateManager.rotate(rot, 1F, 0F, 0F); // todo 1.8 fixme looks a little weird compared to 1.7 + GlStateManager.translate(-0.5F, 0, 0F); + IBlockState state = cocoon.getWorld().getBlockState(cocoon.getPos()); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); GlStateManager.color(1F, 1F, 1F); GlStateManager.enableRescaleNormal(); GlStateManager.popMatrix(); diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json new file mode 100644 index 000000000..74599fbed --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:cocoon", + "textures": { + "all": "botania:model/cocoon" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json new file mode 100644 index 000000000..ef26fab47 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3.0, 0.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 1.0, 0.0, 3.5, 3.5 ] }, + "north": { "texture": "#all", "uv": [ 3.5, 0.0, 6.0, 3.5 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 0.0, 8.5, 3.5 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 0.0, 11.0, 3.5 ] }, + "up": { "texture": "#all", "uv": [ 3.5, 3.5, 6.0, 6.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 3.5, 8.5, 6.0 ], "cullface": "down" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/cocoon.png b/src/main/resources/assets/botania/textures/model/cocoon.png index e0ab41ac4f6f6ef4cbd38809f8dd6f9abab3d822..0d13b347b0d980e65eee25705a917f36756c2fc1 100644 GIT binary patch delta 1431 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