diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 429411b66..4ba31213b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -112,12 +112,14 @@ public final class BaubleRenderHandler implements LayerRenderer { Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS) != null; GlStateManager.rotate(90, 0, 1, 0); - GlStateManager.rotate(90, 1, 0, 0); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(0, -0.6, 0); + GlStateManager.scale(0.55, 0.55, 0.55); if (renderedOne) - GlStateManager.translate(0F, armor ? 0.20F : 0.18F, -0.25F); + GlStateManager.translate(0F, 0F, armor ? 0.55F : 0.5F); else - GlStateManager.translate(0F, armor ? -0.39F : -0.35F, -0.25F); + GlStateManager.translate(0F, 0F, armor ? -0.55F : -0.5F); GlStateManager.scale(0.75F, 0.75F, 0.75F); @@ -126,7 +128,7 @@ public final class BaubleRenderHandler implements LayerRenderer { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); // todo 1.9 GlStateManager.popMatrix(); if(renderedOne) diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 30f9dbdc7..350a60d02 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -208,7 +208,7 @@ public final class MultiblockRenderHandler { } else { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); - GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? + GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); GlStateManager.color(1, 1, 1, 1); brd.renderBlockBrightness(state, 1.0F); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 24c18b64c..7868001cc 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -153,10 +153,10 @@ public class FXSparkle extends EntityFX { ySpeed *= 0.908000001907348633D; zSpeed *= 0.908000001907348633D; - /*if (onGround) { todo 1.9 + if (isCollided) { xSpeed *= 0.69999998807907104D; zSpeed *= 0.69999998807907104D; - }*/ + } } if(fake && particleAge > 1)