diff --git a/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp index b93ac4d4a..4a9cd4096 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp @@ -342,9 +342,11 @@ void ItemRenderer::renderGuiItem(Font *font, Textures *textures, std::shared_ptr Tile *tile = Tile::tiles[itemId]; glPushMatrix(); // 4J - original code left here for reference -#if 0 + // 4jcraft: re-enable said original code to fix hotbar block rendering +#if 1 glTranslatef((float)(x), (float)(y), 0.0f); - glScalef(fScale, fScale, fScale); + //glScalef(fScale, fScale, fScale); + glScalef(fScaleX, fScaleY, 1.0f); // 4jcraft: tweaked to use the new variables glTranslatef(-2.0f,3.0f, -3.0f + blitOffset); glScalef(10.0f, 10.0f, 10.0f); glTranslatef(1.0f, 0.5f, 8.0f); diff --git a/Minecraft.Client/Rendering/GameRenderer.cpp b/Minecraft.Client/Rendering/GameRenderer.cpp index 4c9ce3b21..b3e5d437f 100644 --- a/Minecraft.Client/Rendering/GameRenderer.cpp +++ b/Minecraft.Client/Rendering/GameRenderer.cpp @@ -1763,7 +1763,8 @@ void GameRenderer::renderSnowAndRain(float a) t->color(br, br, br, ((1 - dd * dd) * 0.5f + 0.5f) * rainLevel); t->vertexUV(x - xa + 0.5, yy0, z - za + 0.5, 0 * s, yy0 * s / 4.0f + ra * s); t->vertexUV(x + xa + 0.5, yy0, z + za + 0.5, 1 * s, yy0 * s / 4.0f + ra * s); - t->color(br, br, br, 0.0f); // 4J - added to soften the top visible edge of the rain + // 4jcraft: this color call made rain invisible + // t->color(br, br, br, 0.0f); // 4J - added to soften the top visible edge of the rain t->vertexUV(x + xa + 0.5, yy1, z + za + 0.5, 1 * s, yy1 * s / 4.0f + ra * s); t->vertexUV(x - xa + 0.5, yy1, z - za + 0.5, 0 * s, yy1 * s / 4.0f + ra * s); #endif