diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 338e7841b..ff988f5bd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -12,8 +12,14 @@ package vazkii.botania.client.render.tile; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Quaternion; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.ModelRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; @@ -24,30 +30,47 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import javax.annotation.Nullable; public class RenderTileCorporeaIndex extends TileEntityRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); - public static boolean move = true; + private static final RenderType LAYER = RenderType.getEntityCutoutNoCull(new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX)); + private static final float ANGLE = (float) Math.sin(Math.toRadians(45)); + private final ModelRenderer ring; + private final ModelRenderer cube; public RenderTileCorporeaIndex(TileEntityRendererDispatcher manager) { super(manager); + this.ring = new ModelRenderer(64, 32, 0, 0); + this.ring.addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F); + this.cube = new ModelRenderer(64, 32, 32, 0); + this.cube.addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F); } @Override - public void render(@Nullable TileCorporeaIndex index, float partticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { - move = index != null; - + public void render(@Nullable TileCorporeaIndex index, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { ms.push(); - float translation = move ? (float) ((Math.cos((index.ticksWithCloseby + (index.hasCloseby ? partticks : 0)) / 10F) * 0.5 + 0.5) * 0.25) : 0F; - float rotation = move ? index.ticks * 2 + partticks : 0F; - float scale = 0.6F; - ms.scale(scale, scale, scale); - // todo 1.15 reimplement this - // crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F); - ms.scale(1F / scale, 1F / scale, 1F / scale); + ms.translate(0.5, 0, 0.5); + float translation = index != null ? (float) ((Math.cos((index.ticksWithCloseby + (index.hasCloseby ? partialTicks : 0)) / 10F) * 0.5 + 0.5) * 0.25) : 0F; + float rotation = index != null ? index.ticks * 2 + partialTicks : 0F; + IVertexBuilder buffer = buffers.getBuffer(LAYER); + ms.push(); + ms.translate(0.0D, -1, 0.0D); + + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); + ms.translate(0.0D, 1.5F + translation / 2.0F, 0.0D); + ms.multiply(new Quaternion(new Vector3f(ANGLE, 0.0F, ANGLE), 60.0F, true)); + this.ring.render(ms, buffer, light, overlay); + ms.scale(0.875F, 0.875F, 0.875F); + ms.multiply(new Quaternion(new Vector3f(ANGLE, 0.0F, ANGLE), 60.0F, true)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); + this.ring.render(ms, buffer, light, overlay); + ms.scale(0.875F, 0.875F, 0.875F); + ms.multiply(new Quaternion(new Vector3f(ANGLE, 0.0F, ANGLE), 60.0F, true)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); + this.cube.render(ms, buffer, light, overlay); + ms.pop(); if(index != null && index.closeby > 0F) { float starScale = 0.02F; - float starRadius = (float) TileCorporeaIndex.RADIUS * index.closeby + (index.closeby == 1F ? 0F : index.hasCloseby ? partticks : -partticks) * 0.2F; - double rads = (index.ticksWithCloseby + partticks) * 2 * Math.PI / 180; + float starRadius = (float) TileCorporeaIndex.RADIUS * index.closeby + (index.closeby == 1F ? 0F : index.hasCloseby ? partialTicks : -partialTicks) * 0.2F; + double rads = (index.ticksWithCloseby + partialTicks) * 2 * Math.PI / 180; double starX = Math.cos(rads) * starRadius; double starZ = Math.sin(rads) * starRadius; int color = 0xFF00FF;