From eecc0192a9fc9bd4e327d3321e15474d96978f96 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jan 2020 22:34:59 -0600 Subject: [PATCH] More misc work --- .../client/core/handler/ModelHandler.java | 2 +- .../botania/client/model/ModelBrewery.java | 88 ++++++++++++------- .../client/render/tile/RenderTileBrewery.java | 49 ++++------- .../botania/common/item/ItemCraftingHalo.java | 88 ++++++++++--------- 4 files changed, 119 insertions(+), 108 deletions(-) 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 5d2e59cd7..ab469cf2c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -108,7 +108,7 @@ public final class ModelHandler { ClientRegistry.bindTileEntityRenderer(TileEntitySpecialFlower.class, renderTileFloatingFlower); ClientRegistry.bindTileEntityRenderer(TileTinyPotato.TYPE, new RenderTileTinyPotato()); ClientRegistry.bindTileEntityRenderer(TileStarfield.TYPE, new RenderTileStarfield()); - ClientRegistry.bindTileEntityRenderer(TileBrewery.TYPE, new RenderTileBrewery()); + ClientRegistry.bindTileEntityRenderer(TileBrewery.TYPE, RenderTileBrewery::new); ClientRegistry.bindTileEntityRenderer(TileTerraPlate.TYPE, new RenderTileTerraPlate()); ClientRegistry.bindTileEntityRenderer(TileRedStringComparator.TYPE, RenderTileRedString::new); ClientRegistry.bindTileEntityRenderer(TileRedStringContainer.TYPE, RenderTileRedString::new); diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 7eaaa8c92..8a233d400 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -10,11 +10,21 @@ */ package vazkii.botania.client.model; +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.RenderType; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; +import net.minecraft.item.ItemStack; import vazkii.botania.client.render.tile.RenderTileBrewery; +import vazkii.botania.common.block.tile.TileBrewery; + +import javax.annotation.Nullable; public class ModelBrewery extends Model { @@ -43,34 +53,32 @@ public class ModelBrewery extends Model { plate = new ModelRenderer(this, 8, 5); plate.setRotationPoint(0.0F, 17.0F, 0.0F); plate.addCuboid(5.0F, 0.0F, -2.0F, 4, 1, 4, 0.0F); - } - public void render(RenderTileBrewery render, double time) { - float f = 1F / 16F; + public void render(@Nullable TileBrewery brewery, double time, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + float f = 1F / 16F; // todo 1.15 float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F; - boolean hasTile = render.brewery != null; - int plates = hasTile ? render.brewery.getSizeInventory() - 1 : 7; + boolean hasTile = brewery != null; + int plates = hasTile ? brewery.getSizeInventory() - 1 : 7; float deg = (float) time / 16F; float polerot = -deg * 25F; - GlStateManager.translatef(0F, offset, 0F); - GlStateManager.rotatef(polerot, 0F, 1F, 0F); - if(hasTile && !render.brewery.getItemHandler().getStackInSlot(0).isEmpty()) { - GlStateManager.rotatef(180F, 1F, 0F, 0F); - GlStateManager.translatef(0, -0.45F, 0); - //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); - render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(0)); - //GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); - GlStateManager.translatef(0, 0.45F, 0); - GlStateManager.rotatef(-180F, 1F, 0F, 0F); + ms.translate(0F, offset, 0F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(polerot)); + if(hasTile && !brewery.getItemHandler().getStackInSlot(0).isEmpty()) { + ms.push(); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); + ms.translate(0, -0.45F, 0); + renderItemStack(brewery.getItemHandler().getStackInSlot(0), ms, buffers, light, overlay); + ms.pop(); } - pole.render(f); - top.render(f); - bottom.render(f); - GlStateManager.rotatef(-polerot, 0F, 1F, 0F); + IVertexBuilder buffer = buffers.getBuffer(getLayer(RenderTileBrewery.TEXTURE)); + pole.render(ms, buffer, light, overlay); + top.render(ms, buffer, light, overlay); + bottom.render(ms, buffer, light, overlay); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-polerot)); float degper = (float) (2F * Math.PI) / plates; for(int i = 0; i < plates; i++) { @@ -79,28 +87,42 @@ public class ModelBrewery extends Model { if(time == -1) offset1 = 0F; - GlStateManager.translatef(0F, offset1, 0F); - if(hasTile && !render.brewery.getItemHandler().getStackInSlot(i + 1).isEmpty()) { + ms.translate(0F, offset1, 0F); + if(hasTile && !brewery.getItemHandler().getStackInSlot(i + 1).isEmpty()) { float rot = plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; float transZ = 0.1245F; - GlStateManager.rotatef(rot, 0F, 1F, 0F); - GlStateManager.translatef(transX, transY, transZ); - GlStateManager.rotatef(-90F, 1F, 0F, 0F); - GlStateManager.translatef(0.125F, 0.125F, 0); - render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(i + 1)); - GlStateManager.translatef(-0.125F, -0.125F, 0); - GlStateManager.rotatef(90F, 1F, 0F, 0F); - GlStateManager.translatef(-transX, -transY, -transZ); - GlStateManager.rotatef(-rot, 0F, 1F, 0F); + ms.push(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rot)); + ms.translate(transX, transY, transZ); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(-90F)); + ms.translate(0.125F, 0.125F, 0); + renderItemStack(brewery.getItemHandler().getStackInSlot(i + 1), ms, buffers, light, overlay); + ms.pop(); } - plate.render(f); - GlStateManager.translatef(0F, -offset1, 0F); + plate.render(ms, buffer, light, overlay); + ms.translate(0F, -offset1, 0F); deg += degper; } - GlStateManager.translatef(0F, -offset, 0F); + ms.translate(0F, -offset, 0F); } + private void renderItemStack(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + if(!stack.isEmpty()) { + Minecraft mc = Minecraft.getInstance(); + ms.push(); + + float s = 0.25F; + ms.scale(s, s, s); + mc.getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers); + ms.pop(); + } + } + + @Override + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { + throw new UnsupportedOperationException("unimplemented, call using other render method"); + } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index ec1663dce..1111e68a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -10,11 +10,11 @@ */ package vazkii.botania.client.render.tile; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -25,42 +25,27 @@ import vazkii.botania.common.block.tile.TileBrewery; import javax.annotation.Nullable; public class RenderTileBrewery extends TileEntityRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); + public static final ResourceLocation TEXTURE = new ResourceLocation(LibResources.MODEL_BREWERY); final ModelBrewery model = new ModelBrewery(); public TileBrewery brewery; - @Override - public void render(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { - this.brewery = brewery; - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.translated(d0, d1, d2); + public RenderTileBrewery(TileEntityRendererDispatcher manager) { + super(manager); + } - Minecraft.getInstance().textureManager.bindTexture(texture); - GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.translatef(0.5F, -1.5F, -0.5F); + @Override + public void render(@Nullable TileBrewery brewery, float f, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + this.brewery = brewery; + ms.push(); + + Minecraft.getInstance().textureManager.bindTexture(TEXTURE); + ms.scale(1F, -1F, -1F); + ms.translate(0.5F, -1.5F, -0.5F); double time = ClientTickHandler.ticksInGame + f; - model.render(this, time); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); - } - - public void renderItemStack(ItemStack stack) { - if(!stack.isEmpty()) { - Minecraft mc = Minecraft.getInstance(); - GlStateManager.pushMatrix(); - mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - - float s = 0.25F; - GlStateManager.scalef(s, s, s); - mc.getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); - GlStateManager.scalef(1F / s, 1F / s, 1F / s); - GlStateManager.popMatrix(); - Minecraft.getInstance().textureManager.bindTexture(texture); - } + model.render(brewery, time, ms, buffers, light, overlay); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 616c10ccc..ff37364c6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -10,14 +10,20 @@ */ package vazkii.botania.common.item; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; @@ -400,28 +406,29 @@ public class ItemCraftingHalo extends ItemMod { PlayerEntity player = Minecraft.getInstance().player; ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemCraftingHalo.class); if(!stack.isEmpty()) - render(stack, player, event.getPartialTicks()); + render(stack, player, event.getMatrixStack(), event.getPartialTicks()); } @OnlyIn(Dist.CLIENT) - public void render(ItemStack stack, PlayerEntity player, float partialTicks) { + public void render(ItemStack stack, PlayerEntity player, MatrixStack ms, float partialTicks) { Minecraft mc = Minecraft.getInstance(); Tessellator tess = Tessellator.getInstance(); + IRenderTypeBuffer.Impl buffers = mc.getBufferBuilders().getEntityVertexConsumers(); - double renderPosX = mc.getRenderManager().renderPosX; - double renderPosY = mc.getRenderManager().renderPosY; - double renderPosZ = mc.getRenderManager().renderPosZ; + double renderPosX = mc.getRenderManager().info.getProjectedView().getX(); + double renderPosY = mc.getRenderManager().info.getProjectedView().getY(); + double renderPosZ = mc.getRenderManager().info.getProjectedView().getZ(); - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + ms.push(); + RenderSystem.enableBlend(); + RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float alpha = ((float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.2F) * 0.5F + 0.5F) * 0.4F + 0.3F; double posX = player.prevPosX + (player.getX() - player.prevPosX) * partialTicks; - double posY = player.prevPosY + (player.getY() - player.prevPosY) * partialTicks; + double posY = player.prevPosY + (player.getY() - player.prevPosY) * partialTicks + player.getEyeHeight(); double posZ = player.prevPosZ + (player.getZ() - player.prevPosZ) * partialTicks; - GlStateManager.translated(posX - renderPosX, posY - renderPosY + player.getEyeHeight(), posZ - renderPosZ); + ms.translate(posX - renderPosX, posY - renderPosY, posZ - renderPosZ); float base = getRotationBase(stack); @@ -442,67 +449,66 @@ public class ItemCraftingHalo extends ItemMod { for(int seg = 0; seg < SEGMENTS; seg++) { boolean inside = false; float rotationAngle = (seg + 0.5F) * segAngles + shift; - GlStateManager.pushMatrix(); - GlStateManager.rotatef(rotationAngle, 0F, 1F, 0F); - GlStateManager.translatef(s * m, -0.75F, 0F); + ms.push(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotationAngle)); + ms.translate(s * m, -0.75F, 0F); if(segmentLookedAt == seg) inside = true; ItemStack slotStack = getItemForSlot(stack, seg); if(!slotStack.isEmpty()) { - mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - RenderHelper.enableStandardItemLighting(); float scale = seg == 0 ? 0.9F : 0.8F; - GlStateManager.scalef(scale, scale, scale); - GlStateManager.rotatef(180F, 0F, 1F, 0F); - GlStateManager.translatef(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); + ms.scale(scale, scale, scale); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); - GlStateManager.rotatef(90.0F, 0.0F, 1.0F, 0.0F); - Minecraft.getInstance().getItemRenderer().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); - RenderHelper.disableStandardItemLighting(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F)); + Minecraft.getInstance().getItemRenderer().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI, 0xF000F0, OverlayTexture.DEFAULT_UV, ms, buffers); } - GlStateManager.popMatrix(); + ms.pop(); - GlStateManager.pushMatrix(); - GlStateManager.rotatef(180F, 1F, 0F, 0F); + ms.push(); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); float a = alpha; if(inside) { a += 0.3F; y0 = -y; } - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderSystem.enableBlend(); + RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(seg % 2 == 0) - GlStateManager.color4f(0.6F, 0.6F, 0.6F, a); - else GlStateManager.color4f(1F, 1F, 1F, a); + RenderSystem.color4f(0.6F, 0.6F, 0.6F, a); + else RenderSystem.color4f(1F, 1F, 1F, a); - GlStateManager.disableCull(); + RenderSystem.disableCull(); ItemCraftingHalo item = (ItemCraftingHalo) stack.getItem(); mc.textureManager.bindTexture(item.getGlowResource()); tess.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < segAngles; i++) { + Matrix4f mat = ms.peek().getModel(); float ang = i + seg * segAngles + shift; - double xp = Math.cos(ang * Math.PI / 180F) * s; - double zp = Math.sin(ang * Math.PI / 180F) * s; + float xp = (float) Math.cos(ang * Math.PI / 180F) * s; + float zp = (float) Math.sin(ang * Math.PI / 180F) * s; - tess.getBuffer().pos(xp * m, y, zp * m).tex(u, v).endVertex(); - tess.getBuffer().pos(xp, y0, zp).tex(u, 0).endVertex(); + tess.getBuffer().vertex(mat, xp * m, y, zp * m).texture(u, v).endVertex(); + tess.getBuffer().vertex(mat, xp, y0, zp).texture(u, 0).endVertex(); - xp = Math.cos((ang + 1) * Math.PI / 180F) * s; - zp = Math.sin((ang + 1) * Math.PI / 180F) * s; + xp = (float) Math.cos((ang + 1) * Math.PI / 180F) * s; + zp = (float) Math.sin((ang + 1) * Math.PI / 180F) * s; - tess.getBuffer().pos(xp, y0, zp).tex(0, 0).endVertex(); - tess.getBuffer().pos(xp * m, y, zp * m).tex(0, v).endVertex(); + tess.getBuffer().vertex(mat, xp, y0, zp).texture(0, 0).endVertex(); + tess.getBuffer().vertex(mat, xp * m, y, zp * m).texture(0, v).endVertex(); } y0 = 0; tess.draw(); - GlStateManager.enableCull(); - GlStateManager.popMatrix(); + RenderSystem.enableCull(); + ms.pop(); } - GlStateManager.popMatrix(); + ms.pop(); + buffers.draw(); } @OnlyIn(Dist.CLIENT) @@ -514,8 +520,6 @@ public class ItemCraftingHalo extends ItemMod { public static void renderHUD(PlayerEntity player, ItemStack stack) { Minecraft mc = Minecraft.getInstance(); int slot = getSegmentLookedAt(stack, player); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(slot == 0) { String name = craftingTable.getDisplayName().getString();