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 ed07c34c1..b3561294d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -61,6 +61,12 @@ import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.block.tile.string.TileRedString; +import vazkii.botania.common.block.tile.string.TileRedStringComparator; +import vazkii.botania.common.block.tile.string.TileRedStringContainer; +import vazkii.botania.common.block.tile.string.TileRedStringDispenser; +import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; +import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; +import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.entity.EntityDoppleganger; @@ -96,7 +102,7 @@ public final class ModelHandler { ClientRegistry.bindTileEntityRenderer(TileRuneAltar.TYPE, new RenderTileRuneAltar()); ClientRegistry.bindTileEntityRenderer(TilePylon.TYPE, renderTilePylon); ClientRegistry.bindTileEntityRenderer(TileEnchanter.TYPE, new RenderTileEnchanter()); - ClientRegistry.bindTileEntityRenderer(TileAlfPortal.TYPE, new RenderTileAlfPortal()); + ClientRegistry.bindTileEntityRenderer(TileAlfPortal.TYPE, RenderTileAlfPortal::new); ClientRegistry.bindTileEntityRenderer(TileFloatingFlower.TYPE, renderTileFloatingFlower); // TODO 1.14 this seems highly questionable. ClientRegistry.bindTileEntityRenderer(TileEntitySpecialFlower.class, renderTileFloatingFlower); @@ -104,20 +110,25 @@ public final class ModelHandler { ClientRegistry.bindTileEntityRenderer(TileStarfield.TYPE, new RenderTileStarfield()); ClientRegistry.bindTileEntityRenderer(TileBrewery.TYPE, new RenderTileBrewery()); ClientRegistry.bindTileEntityRenderer(TileTerraPlate.TYPE, new RenderTileTerraPlate()); - ClientRegistry.bindTileEntityRenderer(TileRedString.TYPE, new RenderTileRedString()); - ClientRegistry.bindTileEntityRenderer(TilePrism.TYPE, new RenderTilePrism()); + ClientRegistry.bindTileEntityRenderer(TileRedStringComparator.TYPE, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(TileRedStringContainer.TYPE, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(TileRedStringDispenser.TYPE, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(TileRedStringFertilizer.TYPE, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(TileRedStringInterceptor.TYPE, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(TileRedStringRelay.TYPE, RenderTileRedString::new); + ClientRegistry.bindTileEntityRenderer(TilePrism.TYPE, RenderTilePrism::new); ClientRegistry.bindTileEntityRenderer(TileCorporeaIndex.TYPE, new RenderTileCorporeaIndex()); - ClientRegistry.bindTileEntityRenderer(TilePump.TYPE, new RenderTilePump()); - ClientRegistry.bindTileEntityRenderer(TileCorporeaCrystalCube.TYPE, new RenderTileCorporeaCrystalCube()); - ClientRegistry.bindTileEntityRenderer(TileIncensePlate.TYPE, new RenderTileIncensePlate()); - ClientRegistry.bindTileEntityRenderer(TileHourglass.TYPE, new RenderTileHourglass()); - ClientRegistry.bindTileEntityRenderer(TileSparkChanger.TYPE, new RenderTileSparkChanger()); - ClientRegistry.bindTileEntityRenderer(TileCocoon.TYPE, new RenderTileCocoon()); + ClientRegistry.bindTileEntityRenderer(TilePump.TYPE, RenderTilePump::new); + ClientRegistry.bindTileEntityRenderer(TileCorporeaCrystalCube.TYPE, RenderTileCorporeaCrystalCube::new); + ClientRegistry.bindTileEntityRenderer(TileIncensePlate.TYPE, RenderTileIncensePlate::new); + ClientRegistry.bindTileEntityRenderer(TileHourglass.TYPE, RenderTileHourglass::new); + ClientRegistry.bindTileEntityRenderer(TileSparkChanger.TYPE, RenderTileSparkChanger::new); + ClientRegistry.bindTileEntityRenderer(TileCocoon.TYPE, RenderTileCocoon::new); ClientRegistry.bindTileEntityRenderer(TileLightRelay.TYPE, new RenderTileLightRelay()); - ClientRegistry.bindTileEntityRenderer(TileBellows.TYPE, new RenderTileBellows()); + ClientRegistry.bindTileEntityRenderer(TileBellows.TYPE, RenderTileBellows::new); ClientRegistry.bindTileEntityRenderer(TileGaiaHead.TYPE, new RenderTileGaiaHead()); - ClientRegistry.bindTileEntityRenderer(TileTeruTeruBozu.TYPE, new RenderTileTeruTeruBozu()); - ClientRegistry.bindTileEntityRenderer(TileAvatar.TYPE, new RenderTileAvatar()); + ClientRegistry.bindTileEntityRenderer(TileTeruTeruBozu.TYPE, RenderTileTeruTeruBozu::new); + ClientRegistry.bindTileEntityRenderer(TileAvatar.TYPE, RenderTileAvatar::new); ClientRegistry.bindTileEntityRenderer(TileAnimatedTorch.TYPE, RenderTileAnimatedTorch::new); RenderingRegistry.registerEntityRenderingHandler(EntityPixie.TYPE, RenderPixie::new); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 4af7a6589..7466f44be 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -73,14 +73,14 @@ public class ClientProxy implements IProxy { new VertexFormat(ImmutableList.builder() .add(DefaultVertexFormats.POSITION_3F) .add(DefaultVertexFormats.TEX_2F) - .add(DefaultVertexFormats.TEX_2S) + .add(DefaultVertexFormats.LIGHT_ELEMENT) .add(DefaultVertexFormats.NORMAL_3B) .build()); public static final VertexFormat POSITION_TEX_LMAP = new VertexFormat(ImmutableList.builder() .add(DefaultVertexFormats.POSITION_3F) .add(DefaultVertexFormats.TEX_2F) - .add(DefaultVertexFormats.TEX_2S) + .add(DefaultVertexFormats.LIGHT_ELEMENT) .build()); public static boolean jingleTheBells = false; public static boolean dootDoot = false; diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index b20108acf..5b7dca414 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -10,6 +10,10 @@ */ package vazkii.botania.client.model; +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; @@ -23,6 +27,7 @@ public class ModelAvatar extends Model { public final ModelRenderer head; public ModelAvatar() { + super(RenderType::getEntitySolid); textureWidth = 32; textureHeight = 32; leftleg = new ModelRenderer(this, 0, 20); @@ -49,14 +54,15 @@ public class ModelAvatar extends Model { body.addCuboid(-3.0F, 0.0F, -2.0F, 6, 4, 4, 0.0F); } - public void render() { - float f5 = 1F / 15F; - leftleg.render(f5); - rightarm.render(f5); - leftarm.render(f5); - head.render(f5); - rightleg.render(f5); - body.render(f5); + @Override + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { + float scale = 1F / 15F; // todo 1.15 check this? + leftleg.render(ms, buffer, light, overlay, r, g, b, a); + rightarm.render(ms, buffer, light, overlay, r, g, b, a); + leftarm.render(ms, buffer, light, overlay, r, g, b, a); + head.render(ms, buffer, light, overlay, r, g, b, a); + rightleg.render(ms, buffer, light, overlay, r, g, b, a); + body.render(ms, buffer, light, overlay, r, g, b, a); } public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 673b7db84..300891745 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -10,7 +10,11 @@ */ 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.renderer.RenderType; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; @@ -22,6 +26,7 @@ public class ModelBellows extends Model { final ModelRenderer funnel; public ModelBellows() { + super(RenderType::getEntityCutout); textureWidth = 64; textureHeight = 32; @@ -40,23 +45,27 @@ public class ModelBellows extends Model { funnel.addCuboid(0.0F, 0.0F, 0.0F, 6, 7, 6, 0.0F); } - public void render(float fract) { - float f5 = 1F / 16F; - base.render(f5); - pipe.render(f5); + @Override + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { + render(ms, buffer, light, overlay, r, g, b, a, 1); + } + + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float alpha, float fract) { + float f5 = 1F / 16F; // todo 1.15 check this + base.render(ms, buffer, light, overlay, r, g, b, alpha); + pipe.render(ms, buffer, light, overlay, r, g, b, alpha); - //float fract = Math.max(0.1F, (float) (Math.sin(((double) ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.5F); float mov = (1F - fract) * 0.5F; - GlStateManager.translatef(0F, mov, 0F); - top.render(f5); - GlStateManager.translatef(0F, -mov, 0F); + ms.translate(0F, mov, 0F); + top.render(ms, buffer, light, overlay, r, g, b, alpha); + ms.translate(0F, -mov, 0F); - GlStateManager.rotatef(180F, 1F, 0F, 0F); - GlStateManager.translatef(-0.19F, -1.375F, -0.19F); - GlStateManager.scalef(1F, fract, 1F); - funnel.render(f5); - GlStateManager.scalef(1F, 1F / fract, 1F); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); + ms.translate(-0.19F, -1.375F, -0.19F); + ms.scale(1F, fract, 1F); + funnel.render(ms, buffer, light, overlay, r, g, b, alpha); + ms.scale(1F, 1F / fract, 1F); } diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 40dae7cac..296b8197f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -10,7 +10,11 @@ */ 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.renderer.RenderType; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; import org.lwjgl.opengl.GL11; @@ -29,6 +33,7 @@ public class ModelHourglass extends Model { public ModelRenderer sandB; public ModelHourglass() { + super(RenderType::getEntityTranslucent); textureWidth = 64; textureHeight = 32; @@ -57,55 +62,51 @@ public class ModelHourglass extends Model { sandB.addCuboid(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, 1.0F, -2.05F } - public void render(float fract1, float fract2, boolean flip, int color) { + @Override + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { + render(ms, buffer, light, overlay, r, g, b, a, 0, 1, false); + } + + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a, float fract1, float fract2, boolean flip) { if(flip) { - float fract3 = fract1; + float tmp = fract1; fract1 = fract2; - fract2 = fract3; + fract2 = tmp; } - float f = 1F / 16F; - ring.render(f); - top.render(f); - bottom.render(f); - Color c = new Color(color); - GlStateManager.color3f(c.getRed() / 255F, c.getGreen() / 255F, c.getBlue() / 255F); - - GL11.glPushAttrib(GL11.GL_TRANSFORM_BIT); - GlStateManager.disableRescaleNormal(); - GlStateManager.enableNormalize(); + float f = 1F / 16F; //todo 1.15 check + ring.render(ms, buffer, light, overlay, 1, 1, 1, a); + top.render(ms, buffer, light, overlay, 1, 1, 1, a); + bottom.render(ms, buffer, light, overlay, 1, 1, 1, a); if(fract1 > 0) { - GlStateManager.pushMatrix(); + ms.push(); if(flip) - GlStateManager.translatef(-2.0F * f, 1.0F * f, -2.0F * f); + ms.translate(-2.0F * f, 1.0F * f, -2.0F * f); else { - GlStateManager.rotatef(180F, 0F, 0F, 1F); - GlStateManager.translatef(-2.0F * f, -5.0F * f, -2.0F * f); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.translate(-2.0F * f, -5.0F * f, -2.0F * f); } - GlStateManager.scalef(1F, fract1, 1F); - sandT.render(f); - GlStateManager.popMatrix(); + ms.scale(1F, fract1, 1F); + sandT.render(ms, buffer, light, overlay, r, g, b, a); + ms.pop(); } if(fract2 > 0) { - GlStateManager.pushMatrix(); + ms.push(); if(flip) - GlStateManager.translatef(-2.0F * f, -5.0F * f, -2.0F * f); + ms.translate(-2.0F * f, -5.0F * f, -2.0F * f); else { - GlStateManager.rotatef(180F, 0F, 0F, 1F); - GlStateManager.translatef(-2.0F * f, 1.0F * f, -2.0F * f); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.translate(-2.0F * f, 1.0F * f, -2.0F * f); } - GlStateManager.scalef(1F, fract2, 1F); - sandB.render(f); - GlStateManager.popMatrix(); + ms.scale(1F, fract2, 1F); + sandB.render(ms, buffer, light, overlay, r, g, b, a); + ms.pop(); } - GL11.glPopAttrib(); - - GlStateManager.color3f(1, 1, 1); - glassT.render(f); - glassB.render(f); + glassT.render(ms, buffer, light, overlay, 1, 1, 1, a); + glassB.render(ms, buffer, light, overlay, 1, 1, 1, a); } } diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 1bd683804..974aa7e27 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -10,7 +10,10 @@ */ package vazkii.botania.client.model; +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; @@ -22,6 +25,7 @@ public class ModelTeruTeruBozu extends Model { public final ModelRenderer sadFace; public ModelTeruTeruBozu() { + super(RenderType::getEntityCutoutNoCull); // todo 1.15 check if this is the appropriate layer textureWidth = 64; textureHeight = 32; sadFace = new ModelRenderer(this, 32, 0); @@ -41,13 +45,14 @@ public class ModelTeruTeruBozu extends Model { setRotateAngle(cloth, 0.7853981633974483F, 2.2689280275926285F, 1.5707963267948966F); } - public void render() { - float f5 = 1F / 16F; + @Override + public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) { + float f5 = 1F / 16F; // todo 1.15 check this if(Minecraft.getInstance().world.isRaining()) - sadFace.render(f5); - else happyFace.render(f5); - thread.render(f5); - cloth.render(f5); + sadFace.render(ms, buffer, light, overlay, r, g, b, a); + else happyFace.render(ms, buffer, light, overlay, r, g, b, a); + thread.render(ms, buffer, light, overlay, r, g, b, a); + cloth.render(ms, buffer, light, overlay, r, g, b, a); } public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 1d579af40..285cf44df 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -10,12 +10,20 @@ */ 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.Atlases; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Matrix3f; +import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; @@ -29,60 +37,42 @@ import javax.annotation.Nonnull; public class RenderTileAlfPortal extends TileEntityRenderer { + public RenderTileAlfPortal(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { - if (!portal.getWorld().isBlockLoaded(portal.getPos()) - || portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal) - return; - - AlfPortalState state = portal.getWorld().getBlockState(portal.getPos()).get(BotaniaStateProps.ALFPORTAL_STATE); - + public void render(@Nonnull TileAlfPortal portal, float f, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + AlfPortalState state = portal.getBlockState().get(BotaniaStateProps.ALFPORTAL_STATE); if(state == AlfPortalState.OFF) return; - GlStateManager.pushMatrix(); - GlStateManager.translated(d0, d1, d2); - GlStateManager.translatef(-1F, 1F, 0.25F); + ms.push(); + ms.translate(-1F, 1F, 0.25F); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.disableAlphaTest(); - GlStateManager.enableCull(); float alpha = (float) Math.min(1F, (Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 7D + 0.6D) * (Math.min(60, portal.ticksOpen) / 60F) * 0.5F; - GlStateManager.color4f(1F, 1F, 1F, alpha); - - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); if(state == AlfPortalState.ON_X) { - GlStateManager.translatef(1.25F, 0F, 1.75F); - GlStateManager.rotatef(90F, 0F, 1F, 0F); + ms.translate(1.25F, 0F, 1.75F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); } - GlStateManager.disableCull(); - GlStateManager.disableLighting(); - renderIcon(0, 0, MiscellaneousIcons.INSTANCE.alfPortalTex, 3, 3, 240); + renderIcon(ms, buffers, MiscellaneousIcons.INSTANCE.alfPortalTex, 0, 0, 3, 3, alpha, overlay); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.translatef(0F, 0F, 0.5F); - renderIcon(0, 0, MiscellaneousIcons.INSTANCE.alfPortalTex, 3, 3, 240); - - GlStateManager.enableCull(); - GlStateManager.enableAlphaTest(); - GlStateManager.disableBlend(); - GlStateManager.enableLighting(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.popMatrix(); + ms.translate(0F, 0F, 0.5F); + renderIcon(ms, buffers, MiscellaneousIcons.INSTANCE.alfPortalTex, 0, 0, 3, 3, alpha, overlay); + ms.pop(); } - public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.getInstance(); - tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP); - tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); - tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); - tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex(); - tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex(); - tessellator.draw(); + public void renderIcon(MatrixStack ms, IRenderTypeBuffer buffers, TextureAtlasSprite icon, int x, int y, int width, int height, float alpha, int overlay) { + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityTranslucent()); + Matrix4f model = ms.peek().getModel(); + Matrix3f normal = ms.peek().getNormal(); + // todo 1.15 these normals are 100% wrong lol + buffer.vertex(model, x, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMaxV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); + buffer.vertex(model, x + width, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMaxV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); + buffer.vertex(model, x + width, y, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMinV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); + buffer.vertex(model, x, y, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMinV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 40447df28..0956a3382 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -10,12 +10,18 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GLX; 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.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; @@ -39,69 +45,52 @@ public class RenderTileAvatar extends TileEntityRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_AVATAR); private static final ModelAvatar model = new ModelAvatar(); + public RenderTileAvatar(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { + public void render(@Nullable TileAvatar avatar, float pticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { if (avatar != null) if (!avatar.getWorld().isBlockLoaded(avatar.getPos()) || avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar) return; - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.translated(d0, d1, d2); + Direction facing = avatar != null && avatar.getWorld() != null ? avatar.getWorld().getBlockState(avatar.getPos()).get(BotaniaStateProps.CARDINALS) : Direction.SOUTH; - Minecraft.getInstance().textureManager.bindTexture(texture); - Direction facing = avatar != null && avatar.getWorld() != null - ? avatar.getWorld().getBlockState(avatar.getPos()).get(BotaniaStateProps.CARDINALS) - : Direction.SOUTH; + ms.translate(0.5F, 1.6F, 0.5F); + ms.scale(1F, -1F, -1F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)])); + IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); + model.render(ms, buffer, light, overlay, 1, 1, 1, 1); - GlStateManager.translatef(0.5F, 1.6F, 0.5F); - GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.rotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); - model.render(); + if (avatar == null) { + ms.pop(); + return; + } - if (avatar == null) { - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); - return; - } + ItemStack stack = avatar.getItemHandler().getStackInSlot(0); + if(!stack.isEmpty()) { + ms.push(); + float s = 0.6F; + ms.scale(s, s, s); + ms.translate(-0.5F, 2F, -0.25F); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(-70)); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, light, overlay, ms, buffers); + ms.pop(); - ItemStack stack = avatar.getItemHandler().getStackInSlot(0); - if(!stack.isEmpty()) { - GlStateManager.pushMatrix(); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - float s = 0.6F; - GlStateManager.scalef(s, s, s); - GlStateManager.translatef(-0.5F, 2F, -0.25F); - GlStateManager.rotatef(-70, 1, 0, 0); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); - GlStateManager.popMatrix(); + IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); + buffer = buffers.getBuffer(RenderType.getEntityTranslucent(wieldable.getOverlayResource(avatar, stack))); + s = 1.01F; - IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); - Minecraft.getInstance().textureManager.bindTexture(wieldable.getOverlayResource(avatar, stack)); - s = 1.01F; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.scalef(s, s, s); - GlStateManager.translatef(0F, -0.01F, 0F); - int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY); - float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F; - GlStateManager.color4f(1F, 1F, 1F, alpha + 0.183F); - model.render(); - GlStateManager.popMatrix(); - } - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); + ms.push(); + ms.scale(s, s, s); + ms.translate(0F, -0.01F, 0F); + float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F; + model.render(ms, buffer, 0xF000F0, overlay, 1, 1, 1, alpha + 0.183F); + ms.pop(); + } + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 458e8d2e1..bca339e8d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -10,9 +10,15 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; @@ -26,22 +32,15 @@ public class RenderTileBellows extends TileEntityRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BELLOWS); private static final ModelBellows model = new ModelBellows(); + public RenderTileBellows(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { - if (bellows != null) - if (!bellows.getWorld().isBlockLoaded(bellows.getPos()) - || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) - return; - - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.translated(d0, d1, d2); - - Minecraft.getInstance().textureManager.bindTexture(texture); - - GlStateManager.translatef(0.5F, 1.5F, 0.5F); - GlStateManager.scalef(1F, -1F, -1F); + public void render(@Nullable TileBellows bellows, float f, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + ms.push(); + ms.translate(0.5F, 1.5F, 0.5F); + ms.scale(1F, -1F, -1F); float angle = 0; if(bellows != null) { switch(bellows.getBlockState().get(BotaniaStateProps.CARDINALS)) { @@ -51,12 +50,11 @@ public class RenderTileBellows extends TileEntityRenderer { case WEST: angle = 90F; break; } } - GlStateManager.rotatef(angle, 0F, 1F, 0F); - model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : bellows.movePos + bellows.moving * f + 0.1F))); - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angle)); + float fract = Math.max(0.1F, 1F - (bellows == null ? 0 : bellows.movePos + bellows.moving * f + 0.1F)); + IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); + model.render(ms, buffer, light, overlay, 1, 1, 1, 1, fract); + ms.pop(); } } 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 e97b0ed6e..2479783bc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -10,44 +10,50 @@ */ 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.block.BlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderTypeLookup; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileCocoon; import javax.annotation.Nonnull; +import java.util.Random; public class RenderTileCocoon extends TileEntityRenderer { + public RenderTileCocoon(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { + public void render(@Nonnull TileCocoon cocoon, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { float rot = 0F; float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F; if(cocoon.timePassed % modval < 10) { - float mod = (cocoon.timePassed + f) % modval; + float mod = (cocoon.timePassed + partialTicks) % modval; float v = mod / 5 * (float) Math.PI * 2; - rot = (float) Math.sin(v) * (float) Math.log(cocoon.timePassed + f); + rot = (float) Math.sin(v) * (float) Math.log(cocoon.timePassed + partialTicks); } - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.translated(d0, d1, d2 + 1); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - GlStateManager.translatef(0.5F, 0, 0F); - GlStateManager.rotatef(rot, 1F, 0F, 0F); - GlStateManager.translatef(-0.5F, 0, 0F); - BlockState state = cocoon.getWorld().getBlockState(cocoon.getPos()); + ms.push(); + ms.translate(0, 0, 1); + ms.translate(0.5, 0, 0); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rot)); + ms.translate(-0.5, 0, 0); + BlockState state = cocoon.getBlockState(); IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(state); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getBlockLayer(state)); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, state, model, 1, 1, 1, light, overlay); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 6cef54f67..6472f4d3d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -10,13 +10,19 @@ */ 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.block.Blocks; 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.entity.ItemRenderer; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; @@ -31,8 +37,12 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer> 2 | color & -16777216; float s = 1F / 64F; - GlStateManager.scalef(s, s, s); - GlStateManager.disableLighting(); + ms.scale(s, s, s); int l = mc.fontRenderer.getStringWidth(countStr); - GlStateManager.translatef(0F, 55F, 0F); + ms.translate(0F, 55F, 0F); float tr = -16.5F; for(int i = 0; i < 4; i++) { - GlStateManager.rotatef(90F, 0F, 1F, 0F); - GlStateManager.translatef(0F, 0F, tr); - mc.fontRenderer.drawString(countStr, -l / 2, 0, color); - GlStateManager.translatef(0F, 0F, 0.1F); - mc.fontRenderer.drawString(countStr, -l / 2 + 1, 1, colorShade); - GlStateManager.translatef(0F, 0F, -tr - 0.1F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.translate(0F, 0F, tr); + mc.fontRenderer.draw(countStr, -l / 2, 0, color, false, ms.peek().getModel(), buffers, false, 0, light); + ms.translate(0F, 0F, 0.1F); + mc.fontRenderer.draw(countStr, -l / 2 + 1, 1, colorShade, false, ms.peek().getModel(), buffers, false, 0, light); + ms.translate(0F, 0F, -tr - 0.1F); } - GlStateManager.enableLighting(); } - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 0be6c6d4f..518f44e22 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -10,9 +10,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.Vector3f; 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 org.lwjgl.opengl.GL11; @@ -29,14 +34,13 @@ public class RenderTileHourglass extends TileEntityRenderer { final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); final ModelHourglass model = new ModelHourglass(); + public RenderTileHourglass(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nullable TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) { - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.translated(d0, d1, d2); - Minecraft.getInstance().textureManager.bindTexture(texture); + public void render(@Nullable TileHourglass hourglass, float ticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + ms.push(); boolean hasWorld = hourglass != null && hourglass.getWorld() != null; int wtime = !hasWorld ? 0 : ClientTickHandler.ticksInGame; if(wtime != 0) @@ -51,17 +55,21 @@ public class RenderTileHourglass extends TileEntityRenderer { float activeFraction = stack.isEmpty() ? 0 : hourglass.lastFraction + (hourglass.timeFraction - hourglass.lastFraction) * ticks; float fract1 = stack.isEmpty() ? 0 : activeFraction; float fract2 = stack.isEmpty() ? 0 : 1F - activeFraction; - GlStateManager.translatef(x, y, z); + ms.translate(x, y, z); float rot = hasWorld && hourglass.flip ? 180F : 1F; if(hasWorld && hourglass.flipTicks > 0) rot += (hourglass.flipTicks - ticks) * (180F / 4F); - GlStateManager.rotatef(rot, 0F, 0F, 1F); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rot)); - GlStateManager.scalef(1F, -1F, -1F); - model.render(fract1, fract2, hasWorld && hourglass.flip, hasWorld ? hourglass.getColor() : 0); - GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.popMatrix(); + ms.scale(1F, -1F, -1F); + int color = hasWorld ? hourglass.getColor() : 0; + float r = (color >> 16) / 255.0F; + float g = (color >> 8) / 255.0F; + float b = (color & 0xFF) / 255.0F; + IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); + model.render(ms, buffer, light, overlay, r, g, b, 1, fract1, fract2, hasWorld && hourglass.flip); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index f00682acf..edbdaadce 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -11,11 +11,15 @@ package vazkii.botania.client.render.tile; import com.google.common.collect.ImmutableMap; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +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.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import vazkii.botania.api.state.BotaniaStateProps; @@ -29,32 +33,27 @@ public class RenderTileIncensePlate extends TileEntityRenderer private static final Map ROTATIONS = ImmutableMap.of(Direction.NORTH, 180, Direction.SOUTH, 0, Direction.WEST, 270, Direction.EAST, 90); + public RenderTileIncensePlate(TileEntityRendererDispatcher manager) { + super(manager); + } + @SuppressWarnings("deprecation") @Override - public void render(@Nonnull TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress) { - if(!plate.getWorld().isBlockLoaded(plate.getPos()) - || plate.getWorld().getBlockState(plate.getPos()).getBlock() != ModBlocks.incensePlate) - return; - + public void render(@Nonnull TileIncensePlate plate, float ticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { ItemStack stack = plate.getItemHandler().getStackInSlot(0); if(stack.isEmpty()) return; - Direction facing = plate.getWorld().getBlockState(plate.getPos()).get(BotaniaStateProps.CARDINALS); + Direction facing = plate.getBlockState().get(BotaniaStateProps.CARDINALS); - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.translated(d0, d1, d2); - GlStateManager.translatef(0.5F, 1.5F, 0.5F); - GlStateManager.rotatef(ROTATIONS.get(facing), 0F, 1F, 0F); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + ms.push(); + ms.translate(0.5F, 1.5F, 0.5F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ROTATIONS.get(facing))); float s = 0.6F; - GlStateManager.translatef(-0.11F, -1.35F, 0F); - GlStateManager.scalef(s, s, s); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); + ms.translate(-0.11F, -1.35F, 0F); + ms.scale(s, s, s); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index df3b42a6a..2889eaba3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -10,11 +10,15 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +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.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -24,10 +28,12 @@ import javax.annotation.Nonnull; public class RenderTilePrism extends TileEntityRenderer { + public RenderTilePrism(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress) { - GlStateManager.pushMatrix(); - GlStateManager.translated(x, y, z); + public void render(@Nonnull TilePrism prism, float partTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; ItemStack stack = prism.getItemHandler().getStackInSlot(0); @@ -35,14 +41,13 @@ public class RenderTilePrism extends TileEntityRenderer { if(!stack.isEmpty()) { Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); if(stack.getItem() instanceof ILens) { - GlStateManager.pushMatrix(); - GlStateManager.rotatef(90F, 1F, 0F, 0F); - GlStateManager.translatef(0.5F, 0.5F, pos); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE); - GlStateManager.popMatrix(); + ms.push(); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.translate(0.5F, 0.5F, pos); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, overlay, ms, buffers); + ms.pop(); } } - GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 44a9c18da..7fce85b70 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -1,40 +1,50 @@ 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.RenderType; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.mana.TilePump; public class RenderTilePump extends TileEntityRenderer { public static IBakedModel headModel = null; + public RenderTilePump(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(TilePump pump, double x, double y, double z, float partialTicks, int destroyStage) { - GlStateManager.pushMatrix(); - GlStateManager.translated(x, y, z); - GlStateManager.translated(0.5, 0, 0.5); + public void render(TilePump pump, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + ms.push(); + ms.translate(0.5, 0, 0.5); + float angle = 0; switch (pump.getBlockState().get(BotaniaStateProps.CARDINALS)) { default: case NORTH: break; case SOUTH: - GlStateManager.rotatef(180, 0, 1, 0); + angle = 180; break; case EAST: - GlStateManager.rotatef(-90, 0, 1, 0); + angle = -90; break; case WEST: - GlStateManager.rotatef(90, 0, 1, 0); + angle = 90; break; } - GlStateManager.translated(-0.5, 0, -0.5); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angle)); + ms.translate(-0.5, 0, -0.5); double diff = Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * partialTicks)); - GlStateManager.translated(0, 0, diff / 14); - GlStateManager.color4f(1, 1, 1, 1); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(headModel, 1, 1, 1, 1); - GlStateManager.popMatrix(); + ms.translate(0, 0, diff / 14); + IVertexBuilder buffer = buffers.getBuffer(RenderType.getSolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, null, headModel, 1, 1, 1, light, overlay); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 57175965a..31b7d4941 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -10,14 +10,22 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import vazkii.botania.client.core.handler.RedStringRenderer; import vazkii.botania.common.block.tile.string.TileRedString; public class RenderTileRedString extends TileEntityRenderer { + public RenderTileRedString(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileRedString trs, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + // todo 1.15 move from RSR into the TESR itself RedStringRenderer.redStringTiles.add(trs); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index f51e28205..f76fe985e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -10,11 +10,15 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +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.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.tile.TileSparkChanger; @@ -22,26 +26,22 @@ import javax.annotation.Nonnull; public class RenderTileSparkChanger extends TileEntityRenderer { + public RenderTileSparkChanger(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) { - GlStateManager.pushMatrix(); - GlStateManager.translated(d0, d1, d2); - GlStateManager.rotatef(90F, 1F, 0F, 0F); - GlStateManager.translatef(1.0F, -0.125F, -0.25F); - GlStateManager.color4f(1F, 1F, 1F, 1F); + public void render(@Nonnull TileSparkChanger tileentity, float pticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + ms.push(); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.translate(1.0F, -0.125F, -0.25F); ItemStack stack = tileentity.getItemHandler().getStackInSlot(0); if(!stack.isEmpty()) { - GlStateManager.pushMatrix(); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - float s = 1.0F; - GlStateManager.scalef(s, s, s); - GlStateManager.rotatef(180F, 0F, 1F, 0F); - GlStateManager.translatef(0.5F, 0.5F, 0); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); - GlStateManager.popMatrix(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); + ms.translate(0.5F, 0.5F, 0); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers); } - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.popMatrix(); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 54d84b5ea..c5b4dd0aa 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -10,15 +10,21 @@ */ 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.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import javax.annotation.Nullable; @@ -28,37 +34,32 @@ public class RenderTileTeruTeruBozu extends TileEntityRenderer private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU); private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU_HALLOWEEN); - final ModelTeruTeruBozu model = new ModelTeruTeruBozu(); + private final ModelTeruTeruBozu model = new ModelTeruTeruBozu(); + + public RenderTileTeruTeruBozu(TileEntityRendererDispatcher manager) { + super(manager); + } @Override - public void render(@Nullable TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress) { - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.enableBlend(); - GlStateManager.disableCull(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.translated(d0, d1, d2); - Minecraft.getInstance().textureManager.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); - GlStateManager.rotatef(180F, 1F, 0F, 0F); - double time = Botania.proxy.getWorldElapsedTicks() + f; + public void render(@Nullable TileTeruTeruBozu tileentity, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + ms.push(); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); + double time = Botania.proxy.getWorldElapsedTicks() + partialTicks; boolean hasWorld = tileentity != null && tileentity.getWorld() != null; if(hasWorld) time += new Random(tileentity.getPos().hashCode()).nextInt(1000); - GlStateManager.translatef(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); + ms.translate(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); if(hasWorld) { - GlStateManager.rotatef((float) (time * 0.3), 0F, 1F, 0F); - GlStateManager.rotatef(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion((float) (time * 0.3))); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(4F * (float) Math.sin(time * 0.05F))); float s = 0.75F; - GlStateManager.scalef(s, s, s); + ms.scale(s, s, s); } - model.render(); - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.enableCull(); - GlStateManager.popMatrix(); + IVertexBuilder buffer = buffers.getBuffer(model.getLayer(ClientProxy.dootDoot ? textureHalloween : texture)); + model.render(ms, buffer, light, overlay, 1, 1, 1, 1); + ms.pop(); } }