MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pedestals item render fix

Browse source
This commit is contained in:
Aleksey 2020-11-02 17:08:53 +03:00
parent 97eacdff1c
commit 5f01be7b38
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java
View file

@ -2,6 +2,7 @@ package ru.betterend.blocks.entities.render;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
@ -9,6 +10,7 @@ import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.util.math.Vector3f;
@ -17,6 +19,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DyeColor; import net.minecraft.util.DyeColor;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import ru.betterend.blocks.BlockProperties.PedestalState; import ru.betterend.blocks.BlockProperties.PedestalState;
import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.EternalPedestal;
import ru.betterend.blocks.basis.BlockPedestal; import ru.betterend.blocks.basis.BlockPedestal;
@ -41,6 +44,10 @@ public class PedestalItemRenderer extends BlockEntityRenderer<PedestalBlockEntit
BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos()); BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos());
ItemStack activeItem = blockEntity.getStack(0); ItemStack activeItem = blockEntity.getStack(0);
matrices.push(); matrices.push();
MinecraftClient minecraft = MinecraftClient.getInstance();
BakedModel model = minecraft.getItemRenderer().getHeldItemModel(activeItem, blockEntity.getWorld(), null);
Vector3f translate = model.getTransformation().ground.translation;
matrices.translate(translate.getX(), translate.getY(), translate.getZ());
if (state.get(BlockPedestal.STATE) == PedestalState.DEFAULT) { if (state.get(BlockPedestal.STATE) == PedestalState.DEFAULT) {
matrices.translate(0.5, 1.0, 0.5); matrices.translate(0.5, 1.0, 0.5);
} else { } else {
@ -49,12 +56,11 @@ public class PedestalItemRenderer extends BlockEntityRenderer<PedestalBlockEntit
if (activeItem.getItem() instanceof BlockItem) { if (activeItem.getItem() instanceof BlockItem) {
matrices.scale(1.5F, 1.5F, 1.5F); matrices.scale(1.5F, 1.5F, 1.5F);
} else { } else {
matrices.scale(1.15F, 1.15F, 1.15F); matrices.scale(1.25F, 1.25F, 1.25F);
} }
float rotation = (blockEntity.getAge() + tickDelta) / 25.0F + 6.0F; float rotation = (blockEntity.getAge() + tickDelta) / 25.0F + 6.0F;
matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion(rotation)); matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion(rotation));
MinecraftClient minecraft = MinecraftClient.getInstance();
if (state.isOf(EndBlocks.ETERNAL_PEDESTAL) && state.get(EternalPedestal.ACTIVATED)) { if (state.isOf(EndBlocks.ETERNAL_PEDESTAL) && state.get(EternalPedestal.ACTIVATED)) {
float altitude = MathHelper.sin((blockEntity.getAge() + tickDelta) / 10.0F) * 0.1F + 0.1F; float altitude = MathHelper.sin((blockEntity.getAge() + tickDelta) / 10.0F) * 0.1F + 0.1F;
matrices.translate(0.0D, altitude, 0.0D); matrices.translate(0.0D, altitude, 0.0D);
@ -63,7 +69,8 @@ public class PedestalItemRenderer extends BlockEntityRenderer<PedestalBlockEntit
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(BEAM_TEXTURE, true)); VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(BEAM_TEXTURE, true));
BeamRenderer.renderLightBeam(matrices, vertexConsumer, tickDelta, -y, 1024 - y, colors, 0.25F, 0.15F, 0.2F); BeamRenderer.renderLightBeam(matrices, vertexConsumer, tickDelta, -y, 1024 - y, colors, 0.25F, 0.15F, 0.2F);
} }
minecraft.getItemRenderer().renderItem(activeItem, ModelTransformation.Mode.GROUND, light, overlay, matrices, vertexConsumers);
minecraft.getItemRenderer().renderItem(activeItem, ModelTransformation.Mode.GROUND, false, matrices, vertexConsumers, light, overlay, model);
matrices.pop(); matrices.pop();
} }
} }