WIP: Begin transitioning mana spreader to use baked models

This commit is contained in:
Vincent Lee committed 2020-02-26 00:37:14 -06:00
1 parent 7c9782a5c9
commit 944410603c
3 files changed
+149 -223

No files matched your search

@@ -1,90 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jan 25, 2014, 1:55:05 PM (GMT)]
*/
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.model.Model;
import net.minecraft.client.renderer.model.ModelRenderer;
public class ModelSpreader extends Model {
final ModelRenderer top;
final ModelRenderer sideL;
final ModelRenderer sideR;
final ModelRenderer bottom;
final ModelRenderer back;
final ModelRenderer holeT;
final ModelRenderer holeL;
final ModelRenderer holeR;
final ModelRenderer holeB;
final ModelRenderer inside;
public ModelSpreader() {
super(RenderType::getEntitySolid);
textureWidth = 64;
textureHeight = 64;
top = new ModelRenderer(this, 0, 0);
top.setRotationPoint(0.0F, 16.0F, 0.0F);
top.addCuboid(-7.0F, -7.0F, -7.0F, 14, 1, 14, 0.0F);
sideL = new ModelRenderer(this, 0, 30);
sideL.setRotationPoint(0.0F, 16.0F, 0.0F);
sideL.addCuboid(6.0F, -6.0F, -6.0F, 1, 12, 12, 0.0F);
sideR = new ModelRenderer(this, 0, 30);
sideR.setRotationPoint(0.0F, 16.0F, 0.0F);
sideR.addCuboid(-7.0F, -6.0F, -6.0F, 1, 12, 12, 0.0F);
back = new ModelRenderer(this, 0, 29);
back.setRotationPoint(0.0F, 16.0F, 0.0F);
back.addCuboid(-7.0F, -6.0F, -7.0F, 14, 12, 1, 0.0F);
bottom = new ModelRenderer(this, 0, 15);
bottom.setRotationPoint(0.0F, 16.0F, 0.0F);
bottom.addCuboid(-7.0F, 6.0F, -7.0F, 14, 1, 14, 0.0F);
holeT = new ModelRenderer(this, 0, 54);
holeT.setRotationPoint(0.0F, 10.0F, 6.0F);
holeT.addCuboid(-7.0F, 0.0F, 0.0F, 14, 4, 1, 0.0F);
holeL = new ModelRenderer(this, 30, 54);
holeL.setRotationPoint(2.0F, 10.0F, 6.0F);
holeL.addCuboid(0.0F, 4.0F, 0.0F, 5, 4, 1, 0.0F);
holeR = new ModelRenderer(this, 30, 59);
holeR.setRotationPoint(0.0F, 10.0F, 6.0F);
holeR.addCuboid(-7.0F, 4.0F, 0.0F, 5, 4, 1, 0.0F);
holeB = new ModelRenderer(this, 0, 59);
holeB.setRotationPoint(0.0F, 18.0F, 6.0F);
holeB.addCuboid(-7.0F, 0.0F, 0.0F, 14, 4, 1, 0.0F);
inside = new ModelRenderer(this, 30, 30);
inside.setRotationPoint(0.0F, 16.0F, 0.0F);
inside.addCuboid(-3.0F, -3.0F, -3.0F, 6, 6, 6, 0.0F);
}
@Override
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) {
top.render(ms, buffer, light, overlay, r, g, b, a);
sideL.render(ms, buffer, light, overlay, r, g, b, a);
sideR.render(ms, buffer, light, overlay, r, g, b, a);
back.render(ms, buffer, light, overlay, r, g, b, a);
bottom.render(ms, buffer, light, overlay, r, g, b, a);
holeT.render(ms, buffer, light, overlay, r, g, b, a);
holeL.render(ms, buffer, light, overlay, r, g, b, a);
holeR.render(ms, buffer, light, overlay, r, g, b, a);
holeB.render(ms, buffer, light, overlay, r, g, b, a);
}
public void renderCube(MatrixStack ms, IVertexBuilder buffer, int light, int overlay) {
inside.render(ms, buffer, light, overlay);
}
}
@@ -11,16 +11,16 @@
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.Atlases;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Quaternion;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.IBakedModel;
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;
@@ -30,7 +30,6 @@ import vazkii.botania.api.ColorHelper;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.ModelSpreader;
import vazkii.botania.common.block.tile.mana.TileSpreader;
import javax.annotation.Nonnull;
@@ -48,8 +47,6 @@ public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
private static final ResourceLocation textureDwHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_DREAMWOOD_HALLOWEEN);
private static final ResourceLocation textureGHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_GAIA_HALLOWEEN);
private static final ModelSpreader model = new ModelSpreader();
public RenderTileSpreader(TileEntityRendererDispatcher manager) {
super(manager);
}
@@ -58,17 +55,21 @@ public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
public void render(@Nonnull TileSpreader spreader, float ticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
ms.push();
ms.translate(0.5F, 1.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(spreader.rotationX + 90F));
ms.translate(0F, -1F, 0F);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(spreader.rotationY));
ms.translate(0F, 1F, 0F);
ms.translate(0.5F, 0.5, 0.5F);
Quaternion transform = Vector3f.POSITIVE_Y.getDegreesQuaternion(spreader.rotationX + 90F);
transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(spreader.rotationY));
ms.multiply(transform);
ms.translate(-0.5F, -0.5F, -0.5F);
//ms.translate(0F, -1F, 0F);
//ms.translate(0F, 1F, 0F);
ResourceLocation texture = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : spreader.isULTRA_SPREADER() ? textureG : RenderTileSpreader.texture;
if(ClientProxy.dootDoot)
texture = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : spreader.isULTRA_SPREADER() ? textureGHalloween : textureHalloween;
ms.scale(1F, -1F, -1F);
//ms.scale(1F, -1F, -1F);
double time = ClientTickHandler.ticksInGame + ticks;
@@ -79,16 +80,21 @@ public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
g = (color >> 8 & 0xFF) / 255F;
b = (color & 0xFF) / 255F;
}
IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture));
model.render(ms, buffer, light, overlay, r, g, b, 1);
IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid());
IBakedModel bakedModel = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(spreader.getBlockState());
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer()
.render(ms.peek(), buffer, spreader.getBlockState(),
bakedModel, r, g, b, light, overlay);
ms.push();
double worldTicks = spreader.getWorld() == null ? 0 : time;
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion((float) worldTicks % 360));
ms.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F);
model.renderCube(ms, buffer, light, overlay);
// model.renderCube(ms, buffer, light, overlay);
// todo 1.15 migrate the cube too
ms.pop();
ms.scale(1F, -1F, -1F);
ms.translate(0.5, 1.5, 0.5);
ItemStack stack = spreader.getItemHandler().getStackInSlot(0);
if(!stack.isEmpty()) {