Generate stair blockstates, also fix avatar tesr stack underflow

This commit is contained in:
Vincent Lee committed 2020-01-17 17:36:40 -06:00
1 parent 3f43b02686
commit 01e80c0f54
78 files changed
+7973 -1700

No files matched your search

@@ -53,10 +53,11 @@ public class RenderTileAvatar extends TileEntityRenderer<TileAvatar> {
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)
|| avatar.getBlockState().getBlock() != ModBlocks.avatar)
return;
Direction facing = avatar != null && avatar.getWorld() != null ? avatar.getWorld().getBlockState(avatar.getPos()).get(BotaniaStateProps.CARDINALS) : Direction.SOUTH;
ms.push();
Direction facing = avatar != null && avatar.getWorld() != null ? avatar.getBlockState().get(BotaniaStateProps.CARDINALS) : Direction.SOUTH;
ms.translate(0.5F, 1.6F, 0.5F);
ms.scale(1F, -1F, -1F);
@@ -64,31 +65,28 @@ public class RenderTileAvatar extends TileEntityRenderer<TileAvatar> {
IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture));
model.render(ms, buffer, light, overlay, 1, 1, 1, 1);
if (avatar == null) {
ms.pop();
return;
}
if (avatar != null) {
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()) {
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();
IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem();
buffer = buffers.getBuffer(RenderType.getEntityTranslucent(wieldable.getOverlayResource(avatar, stack)));
s = 1.01F;
IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem();
buffer = buffers.getBuffer(RenderType.getEntityTranslucent(wieldable.getOverlayResource(avatar, stack)));
s = 1.01F;
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.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();
}
@@ -47,16 +47,21 @@ public class BlockstateProvider extends BlockStateProvider {
Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()))
.forEach(b -> {
if (b instanceof FenceBlock || b instanceof FenceGateBlock || b instanceof PaneBlock
|| b instanceof SlabBlock || b instanceof StairsBlock || b instanceof WallBlock
|| b instanceof SlabBlock || b instanceof WallBlock
|| b instanceof FlowerBlock || b instanceof BlockAltar || b == ModBlocks.tinyPotato
|| b instanceof BlockRedString || b instanceof BlockFloatingFlower || b instanceof BlockModMushroom
|| b instanceof BlockModDoubleFlower || b.getRegistryName().getPath().contains("quartz")
|| b.getRegistryName().getPath().contains("metamorphic")
|| (b.getRegistryName().getPath().contains("metamorphic") && !b.getRegistryName().getPath().contains("stairs"))
|| b == ModBlocks.craftCrate || b == ModBlocks.ghostRail
|| b == ModBlocks.pump || b == ModBlocks.incensePlate || b == ModBlocks.felPumpkin || b == ModBlocks.solidVines)
return;
if (b instanceof BlockAltGrass) {
if (b instanceof StairsBlock) {
ModelFile stair = models().getExistingFile(prefix("block/stairs/" + b.getRegistryName().getPath()));
ModelFile inner = models().getExistingFile(prefix("block/stairs/" + b.getRegistryName().getPath() + "_inner"));
ModelFile outer = models().getExistingFile(prefix("block/stairs/" + b.getRegistryName().getPath() + "_outer"));
stairsBlock((StairsBlock) b, stair, inner, outer);
} else if (b instanceof BlockAltGrass) {
ModelFile model = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath()));
getVariantBuilder(b).partialState().setModels(new ConfiguredModel(model),
new ConfiguredModel(model, 0, 90, false),