mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-16 01:55:15 +00:00
Pass through some rendering. This is gonna take a while.
This commit is contained in:
1 parent
24e777cab5
commit
0ae8c3acf8
7 files changed
+99
-132
No files matched your search
@@ -90,7 +90,7 @@ public final class ModelHandler {
|
||||
|
||||
RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower();
|
||||
RenderTilePylon renderTilePylon = new RenderTilePylon();
|
||||
ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, new RenderTileAltar());
|
||||
ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderTileAltar::new);
|
||||
ClientRegistry.bindTileEntityRenderer(TileSpreader.TYPE, new RenderTileSpreader());
|
||||
ClientRegistry.bindTileEntityRenderer(TilePool.TYPE, new RenderTilePool());
|
||||
ClientRegistry.bindTileEntityRenderer(TileRuneAltar.TYPE, new RenderTileRuneAltar());
|
||||
@@ -118,20 +118,20 @@ public final class ModelHandler {
|
||||
ClientRegistry.bindTileEntityRenderer(TileGaiaHead.TYPE, new RenderTileGaiaHead());
|
||||
ClientRegistry.bindTileEntityRenderer(TileTeruTeruBozu.TYPE, new RenderTileTeruTeruBozu());
|
||||
ClientRegistry.bindTileEntityRenderer(TileAvatar.TYPE, new RenderTileAvatar());
|
||||
ClientRegistry.bindTileEntityRenderer(TileAnimatedTorch.TYPE, new RenderTileAnimatedTorch());
|
||||
ClientRegistry.bindTileEntityRenderer(TileAnimatedTorch.TYPE, RenderTileAnimatedTorch::new);
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPixie.TYPE, RenderPixie::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.TYPE, RenderDoppleganger::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntitySpark.TYPE, RenderSpark::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.TYPE, RenderCorporeaSpark::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.TYPE, RenderPoolMinecart::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.TYPE, RenderPinkWither::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.TYPE, RenderManaStorm::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.TYPE, RenderBabylonWeapon::new);
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.TYPE, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.TYPE, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.TYPE, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
|
||||
}
|
||||
|
||||
private static void registerSubtiles() {
|
||||
|
||||
@@ -10,13 +10,14 @@
|
||||
*/
|
||||
package vazkii.botania.client.model;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.renderer.entity.model.EntityModel;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import vazkii.botania.common.entity.EntityPixie;
|
||||
|
||||
public class ModelPixie extends EntityModel<EntityPixie> {
|
||||
|
||||
public ModelRenderer body;
|
||||
public ModelRenderer leftWingT;
|
||||
public ModelRenderer leftWingB;
|
||||
@@ -24,7 +25,6 @@ public class ModelPixie extends EntityModel<EntityPixie> {
|
||||
public ModelRenderer rightWingB;
|
||||
|
||||
public ModelPixie() {
|
||||
|
||||
textureWidth = 32;
|
||||
textureHeight = 32;
|
||||
|
||||
@@ -51,17 +51,13 @@ public class ModelPixie extends EntityModel<EntityPixie> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(EntityPixie entity, float f, float f1, float f2, float f3, float f4, float f5) {
|
||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||
|
||||
setAngles(entity, f, f1, f2, f3, f4);
|
||||
|
||||
body.render(f5);
|
||||
|
||||
leftWingT.render(f5);
|
||||
leftWingB.render(f5);
|
||||
rightWingT.render(f5);
|
||||
rightWingB.render(f5);
|
||||
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float red, float green, float blue, float alpha) {
|
||||
body.render(ms, buffer, light, overlay);
|
||||
|
||||
leftWingT.render(ms, buffer, light, overlay);
|
||||
leftWingB.render(ms, buffer, light, overlay);
|
||||
rightWingT.render(ms, buffer, light, overlay);
|
||||
rightWingB.render(ms, buffer, light, overlay);
|
||||
}
|
||||
|
||||
public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.renderer.entity.BipedRenderer;
|
||||
@@ -35,30 +36,30 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
|
||||
public static final ShaderCallback callback = shader -> {
|
||||
// Frag Uniforms
|
||||
int disfigurationUniform = GLX.glGetUniformLocation(shader, "disfiguration");
|
||||
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, disfiguration);
|
||||
GLX.glUniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF);
|
||||
GlStateManager.uniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF);
|
||||
|
||||
// Vert Uniforms
|
||||
int grainIntensityUniform = GLX.glGetUniformLocation(shader, "grainIntensity");
|
||||
int grainIntensityUniform = GlStateManager.getUniformLocation(shader, "grainIntensity");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, grainIntensity);
|
||||
GLX.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
|
||||
GlStateManager.uniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
|
||||
};
|
||||
|
||||
public static final ShaderCallback defaultCallback = shader -> {
|
||||
// Frag Uniforms
|
||||
int disfigurationUniform = GLX.glGetUniformLocation(shader, "disfiguration");
|
||||
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, DEFAULT_DISFIGURATION);
|
||||
GLX.glUniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF);
|
||||
GlStateManager.uniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF);
|
||||
|
||||
// Vert Uniforms
|
||||
int grainIntensityUniform = GLX.glGetUniformLocation(shader, "grainIntensity");
|
||||
int grainIntensityUniform = GlStateManager.getUniformLocation(shader, "grainIntensity");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, DEFAULT_GRAIN_INTENSITY);
|
||||
GLX.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
|
||||
GlStateManager.uniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
|
||||
};
|
||||
|
||||
public RenderDoppleganger(EntityRendererManager renderManager) {
|
||||
@@ -83,7 +84,7 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger entity) {
|
||||
public ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger entity) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
|
||||
if(!(mc.getRenderViewEntity() instanceof AbstractClientPlayerEntity))
|
||||
|
||||
@@ -28,22 +28,20 @@ public class RenderPixie extends MobRenderer<EntityPixie, ModelPixie> {
|
||||
|
||||
private final ShaderCallback callback = shader -> {
|
||||
// Frag Uniforms
|
||||
int disfigurationUniform = GLX.glGetUniformLocation(shader, "disfiguration");
|
||||
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, 0.025F);
|
||||
GLX.glUniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF);
|
||||
GlStateManager.uniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF);
|
||||
|
||||
// Vert Uniforms
|
||||
int grainIntensityUniform = GLX.glGetUniformLocation(shader, "grainIntensity");
|
||||
int grainIntensityUniform = GlStateManager.getUniformLocation(shader, "grainIntensity");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
ShaderHelper.FLOAT_BUF.put(0, 0.05F);
|
||||
GLX.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
|
||||
GlStateManager.uniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
|
||||
};
|
||||
|
||||
public RenderPixie(EntityRendererManager renderManager) {
|
||||
super(renderManager, new ModelPixie(), 0.25F);
|
||||
//setRenderPassModel(new ModelPixie());
|
||||
shadowSize = 0.0F;
|
||||
super(renderManager, new ModelPixie(), 0.0F);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -60,34 +58,4 @@ public class RenderPixie extends MobRenderer<EntityPixie, ModelPixie> {
|
||||
if(pixie.getPixieType() == 1)
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
|
||||
protected int setPixieBrightness(EntityPixie par1EntityPixie, int par2, float par3) {
|
||||
if (par2 != 0)
|
||||
return -1;
|
||||
else {
|
||||
bindTexture(getEntityTexture(par1EntityPixie));
|
||||
float f1 = 1.0F;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.blendFunc(GL11.GL_ONE, GL11.GL_ONE);
|
||||
|
||||
if (par1EntityPixie.isInvisible())
|
||||
GlStateManager.depthMask(false);
|
||||
else
|
||||
GlStateManager.depthMask(true);
|
||||
|
||||
char c0 = 61680;
|
||||
int j = c0 % 65536;
|
||||
int k = c0 / 65536;
|
||||
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, j / 1.0F, k / 1.0F);
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, f1);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/*@Override
|
||||
protected int shouldRenderPass(LivingEntity par1EntityLivingBase, int par2, float par3) {
|
||||
return setPixieBrightness((EntityPixie)par1EntityLivingBase, par2, par3);
|
||||
}*/
|
||||
}
|
||||
@@ -10,9 +10,12 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.entity.MinecartRenderer;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.render.tile.RenderTilePool;
|
||||
@@ -23,16 +26,17 @@ import vazkii.botania.common.entity.EntityPoolMinecart;
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderPoolMinecart extends MinecartRenderer<EntityPoolMinecart> {
|
||||
private static final TilePool DUMMY = new TilePool();
|
||||
|
||||
public RenderPoolMinecart(EntityRendererManager manager) {
|
||||
super(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull BlockState state) {
|
||||
super.renderCartContents(poolCart, partialTicks, state);
|
||||
protected void renderBlock(EntityPoolMinecart poolCart, float partialTicks, @Nonnull BlockState state, MatrixStack ms, IRenderTypeBuffer buffers, int light) {
|
||||
super.renderBlock(poolCart, partialTicks, state, ms, buffers, light);
|
||||
RenderTilePool.cartMana = poolCart.getMana();
|
||||
TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.getX(), poolCart.getY(), poolCart.getZ(), ClientTickHandler.partialTicks, -1);
|
||||
TileEntityRendererDispatcher.instance.getRenderer(DUMMY).render(null, ClientTickHandler.partialTicks, ms, buffers, light, OverlayTexture.DEFAULT_UV);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -10,14 +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.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
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.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -29,22 +36,22 @@ import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileAltar extends TileEntityRenderer<TileAltar> {
|
||||
|
||||
public RenderTileAltar(TileEntityRendererDispatcher manager) {
|
||||
super(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) {
|
||||
public void render(@Nonnull TileAltar altar, float pticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
if(!altar.getWorld().isBlockLoaded(altar.getPos()))
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
GlStateManager.translated(d0 + 0.5, d1 + 1.5, d2 + 0.5);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
ms.push();
|
||||
ms.translate(0.5, 1.5, 0.5);
|
||||
|
||||
boolean water = altar.getFluid() == Fluids.WATER;
|
||||
boolean lava = altar.getFluid() == Fluids.LAVA;
|
||||
if(water || lava) {
|
||||
GlStateManager.pushMatrix();
|
||||
ms.push();
|
||||
float s = 1F / 256F * 10F;
|
||||
float v = 1F / 8F;
|
||||
float w = -v * 2.5F;
|
||||
@@ -65,9 +72,9 @@ public class RenderTileAltar extends TileEntityRenderer<TileAltar> {
|
||||
double ticks = (ClientTickHandler.ticksInGame + pticks) * 0.5;
|
||||
float offsetPerPetal = 360 / petals;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translatef(-0.05F, -0.5F, 0F);
|
||||
GlStateManager.scalef(v, v, v);
|
||||
ms.push();
|
||||
ms.translate(-0.05F, -0.5F, 0F);
|
||||
ms.scale(v, v, v);
|
||||
for(int i = 0; i < petals; i++) {
|
||||
float offset = offsetPerPetal * i;
|
||||
float deg = (int) (ticks / rotationModifier % 360F + offset);
|
||||
@@ -78,69 +85,53 @@ public class RenderTileAltar extends TileEntityRenderer<TileAltar> {
|
||||
float z = (float) (radiusZ * Math.sin(rad));
|
||||
float y = (float) Math.cos((ticks + 50 * i) / 5F) / 10F;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translatef(x, y, z);
|
||||
ms.push();
|
||||
ms.translate(x, y, z);
|
||||
float xRotate = (float) Math.sin(ticks * rotationModifier) / 2F;
|
||||
float yRotate = (float) Math.max(0.6F, Math.sin(ticks * 0.1F) / 2F + 0.5F);
|
||||
float zRotate = (float) Math.cos(ticks * rotationModifier) / 2F;
|
||||
|
||||
v /= 2F;
|
||||
GlStateManager.translatef(v, v, v);
|
||||
GlStateManager.rotatef(deg, xRotate, yRotate, zRotate);
|
||||
GlStateManager.translatef(-v, -v, -v);
|
||||
ms.translate(v, v, v);
|
||||
ms.multiply(new Vector3f(xRotate, yRotate, zRotate).getDegreesQuaternion(deg));
|
||||
ms.translate(-v, -v, -v);
|
||||
v *= 2F;
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
ItemStack stack = altar.getItemHandler().getStackInSlot(i);
|
||||
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.popMatrix();
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers);
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
ms.pop();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
float alpha = lava ? 1F : 0.7F;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlphaTest();
|
||||
if(lava)
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translatef(w, -0.3F, w);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
ms.translate(w, -0.3F, w);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90));
|
||||
ms.scale(s, s, s);
|
||||
|
||||
TextureAtlasSprite sprite = lava ? Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.LAVA.getDefaultState()).getParticleTexture()
|
||||
: Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.WATER.getDefaultState()).getParticleTexture();
|
||||
int color = lava ? Fluids.LAVA.getAttributes().getColor(altar.getWorld(), altar.getPos())
|
||||
: Fluids.WATER.getAttributes().getColor(altar.getWorld(), altar.getPos());
|
||||
renderIcon(sprite, color, alpha);
|
||||
if(lava)
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityTranslucent());
|
||||
renderIcon(buffer, sprite, color, alpha, overlay, lava ? 0xF000F0 : light);
|
||||
ms.pop();
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
private void renderIcon(TextureAtlasSprite sprite, int color, float alpha) {
|
||||
private void renderIcon(IVertexBuilder builder, TextureAtlasSprite sprite, int color, float alpha, int overlay, int light) {
|
||||
int red = ((color >> 16) & 0xFF);
|
||||
int green = ((color >> 8) & 0xFF);
|
||||
int blue = (color & 0xFF);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||
tessellator.getBuffer().pos(0, 16, 0).tex(sprite.getMinU(), sprite.getMaxV()).color(red, green, blue, (int) (alpha * 255F)).endVertex();
|
||||
tessellator.getBuffer().pos(16, 16, 0).tex(sprite.getMaxU(), sprite.getMaxV()).color(red, green, blue, (int) (alpha * 255F)).endVertex();
|
||||
tessellator.getBuffer().pos(16, 0, 0).tex(sprite.getMaxU(), sprite.getMinV()).color(red, green, blue, (int) (alpha * 255F)).endVertex();
|
||||
tessellator.getBuffer().pos(0, 0, 0).tex(sprite.getMinU(), sprite.getMinV()).color(red, green, blue, (int) (alpha * 255F)).endVertex();
|
||||
tessellator.draw();
|
||||
// todo 1.15 check the normals
|
||||
builder.vertex(0, 16, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMinU(), sprite.getMaxV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex();
|
||||
builder.vertex(16, 16, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMaxU(), sprite.getMaxV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex();
|
||||
builder.vertex(16, 0, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMaxU(), sprite.getMinV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex();
|
||||
builder.vertex(0, 0, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMinU(), sprite.getMinV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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.block.Blocks;
|
||||
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.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.common.block.tile.TileAnimatedTorch;
|
||||
@@ -23,11 +27,14 @@ import java.util.Random;
|
||||
|
||||
public class RenderTileAnimatedTorch extends TileEntityRenderer<TileAnimatedTorch> {
|
||||
|
||||
public RenderTileAnimatedTorch(TileEntityRendererDispatcher manager) {
|
||||
super(manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage) {
|
||||
public void render(TileAnimatedTorch te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translated(x, y, z);
|
||||
ms.push();
|
||||
|
||||
boolean hasWorld = te != null && te.getWorld() != null;
|
||||
int wtime = !hasWorld ? 0 : ClientTickHandler.ticksInGame;
|
||||
@@ -38,17 +45,17 @@ public class RenderTileAnimatedTorch extends TileEntityRenderer<TileAnimatedTorc
|
||||
float xt = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F;
|
||||
float yt = 0.1F + (float) (Math.sin(time * 0.04F) + 1F) * 0.05F;
|
||||
float zt = 0.5F + (float) Math.sin(time * 0.05F) * 0.025F;
|
||||
GlStateManager.translatef(xt, yt, zt);
|
||||
ms.translate(xt, yt, zt);
|
||||
|
||||
GlStateManager.scalef(2F, 2F, 2F);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
ms.scale(2, 2, 2);
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90));
|
||||
float rotation = (float) te.rotation;
|
||||
if(te.rotating)
|
||||
rotation += te.anglePerTick * partialTicks;
|
||||
|
||||
GlStateManager.rotatef(rotation, 0F, 0F, 1F);
|
||||
mc.getItemRenderer().renderItem(new ItemStack(Blocks.REDSTONE_TORCH), ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.popMatrix();
|
||||
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rotation));
|
||||
mc.getItemRenderer().renderItem(new ItemStack(Blocks.REDSTONE_TORCH), ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers);
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user