diff --git a/src/main/java/com/hbm/blocks/generic/BlockReeds.java b/src/main/java/com/hbm/blocks/generic/BlockReeds.java index 72fbaf49f..e03044112 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockReeds.java +++ b/src/main/java/com/hbm/blocks/generic/BlockReeds.java @@ -29,7 +29,7 @@ public class BlockReeds extends Block { public void registerBlockIcons(IIconRegister reg) { this.blockIcon = reg.registerIcon(RefStrings.MODID + ":reeds_top"); this.iconMid = reg.registerIcon(RefStrings.MODID + ":reeds_mid"); - this.iconMid = reg.registerIcon(RefStrings.MODID + ":reeds_bottom"); + this.iconBottom = reg.registerIcon(RefStrings.MODID + ":reeds_bottom"); } public IIcon getIcon(int height) { diff --git a/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java b/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java index c7514eb9b..8b76d904b 100644 --- a/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/AlloyFurnaceRecipeHandler.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import com.hbm.inventory.gui.GUITestDiFurnace; +import com.hbm.inventory.gui.GUIDiFurnace; import com.hbm.inventory.recipes.BlastFurnaceRecipes; import com.hbm.inventory.recipes.MachineRecipes; @@ -64,7 +64,7 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { @Override public String getGuiTexture() { - return GUITestDiFurnace.texture.toString(); + return GUIDiFurnace.texture.toString(); } @Override @@ -112,7 +112,7 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { @Override public Class getGuiClass() { - return GUITestDiFurnace.class; + return GUIDiFurnace.class; } @Override diff --git a/src/main/java/com/hbm/render/block/RenderReeds.java b/src/main/java/com/hbm/render/block/RenderReeds.java index f2fe85675..a237a79c8 100644 --- a/src/main/java/com/hbm/render/block/RenderReeds.java +++ b/src/main/java/com/hbm/render/block/RenderReeds.java @@ -22,22 +22,26 @@ public class RenderReeds implements ISimpleBlockRenderingHandler { float r = (float) (colorMult >> 16 & 255) / 255.0F; float g = (float) (colorMult >> 8 & 255) / 255.0F; float b = (float) (colorMult & 255) / 255.0F; - - int brightness = block.getMixedBrightnessForBlock(world, x, y, z); - tessellator.setBrightness(brightness); + float m = 0.75F; + + tessellator.setColorOpaque_F(r * m, g * m, b * m); int depth = 0; - for(int i = 1; i < 4; i++) { - Block water = world.getBlock(x, y - i, z); - depth = i; + for(int i = y - 1; i > 0 ; i--) { + Block water = world.getBlock(x, i, z); + depth = y - i; if(water != Blocks.water && water != Blocks.flowing_water) break; } BlockReeds reeds = (BlockReeds) block; for(int i = 0; i < depth; i++) { + + int brightness = block.getMixedBrightnessForBlock(world, x, y - i, z); + tessellator.setBrightness(brightness); + IIcon icon = reeds.getIcon(i == 0 ? 0 : i == depth - 1 ? 2 : 1); - renderer.drawCrossedSquares(icon, x, y, z, 1.0F); + renderer.drawCrossedSquares(icon, x, y - i, z, 1.0F); } return true; diff --git a/src/main/resources/assets/hbm/textures/blocks/reeds_bottom.png b/src/main/resources/assets/hbm/textures/blocks/reeds_bottom.png index bd52e377b..93c0c0b22 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/reeds_bottom.png and b/src/main/resources/assets/hbm/textures/blocks/reeds_bottom.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reeds_mid.png b/src/main/resources/assets/hbm/textures/blocks/reeds_mid.png index 1cb035e54..15fd55325 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/reeds_mid.png and b/src/main/resources/assets/hbm/textures/blocks/reeds_mid.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reeds_top.png b/src/main/resources/assets/hbm/textures/blocks/reeds_top.png index c026d3de5..a57d4f24d 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/reeds_top.png and b/src/main/resources/assets/hbm/textures/blocks/reeds_top.png differ