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 e0ab41ac4..0d13b347b 100644 Binary files a/src/main/resources/assets/botania/textures/model/cocoon.png and b/src/main/resources/assets/botania/textures/model/cocoon.png differ