From 3f7a446e79574897e1038406ba747a4fe1e54df7 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 26 Oct 2022 00:40:36 +0200 Subject: [PATCH] yeah whatever --- .../com/hbm/blocks/generic/BlockReeds.java | 2 +- .../nei/AlloyFurnaceRecipeHandler.java | 6 +++--- .../com/hbm/render/block/RenderReeds.java | 18 +++++++++++------- .../hbm/textures/blocks/reeds_bottom.png | Bin 194 -> 340 bytes .../assets/hbm/textures/blocks/reeds_mid.png | Bin 165 -> 254 bytes .../assets/hbm/textures/blocks/reeds_top.png | Bin 155 -> 350 bytes 6 files changed, 15 insertions(+), 11 deletions(-) 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 bd52e377b422bc96776dd36b39468e84c813879a..93c0c0b226ad389113c78992e7e133f19cfb4a04 100644 GIT binary patch delta 298 zcmV+_0oDG(0n`GJGk*aKNkl&e)D@7V^3{>=J5kuZ+AU{WnkM5NhS=U9MUFo|Q^Qs&Sy!89HU zm4x6w!{oX|Cix-dYxm@F8f^If`3Uo-sARGay&hahpOEG z8!r$SX?>rj@lZrWEf%BdweEiscwz~lB-&(|qk w?o9@=m`3pB-XqXDM><~{a=|1%%m0G$51!fiLQqE`DF6Tf07*qoM6N<$f?)cMaR2}S delta 151 zcmV;I0BHZz0>S~1Gk*YiNklrz03}$Og*^fp`_3sn zvbrPw#FR)X#Mm1##8f|MCCX37b*rDpTTI%+kw7E^Tpm0iSP;&Bxl;fD002ovPDHLk FV1lCHK6n5C 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 1cb035e54db2c2841b52dc6ff7cfd843d0c834f1..15fd5532588a3cb72380529cba186806a930a413 100644 GIT binary patch delta 210 zcmV;@04@Ke0saAyG=H^8L_t(Ijh&N03WG2ZMSsMN6a)_vdX}uchR5hNy7nyAZQCmp z0^&;2MVTvjdL5E^@ipO0H(DI0PuQjXZ?N# z@29+&Go(vv0C3iu6s=Th2Ha30A?ivq(C|}QkziW8aBV(C&r68}{KhoYpj{pDw delta 120 zcmeyzxRh~%Nnwnqi(`mIZ*oFH!jJwINeLjh@=7tML`piL@lwwY5dkKjCs{7$3`e<_ zFo>~n&EYp@xS2MI*O`xbQw)=F!=ng^9S$i@n`Y{WD^xe;h#MI2lmxZi^b537kY-@; XTP+~CbP0l+XkK;!7wP 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 c026d3de51148bba9ce59b51c669f2e0c270fa73..a57d4f24d889e053f282ea0ee4f80e57c1be0eb1 100644 GIT binary patch delta 308 zcmV-40n7fI0p0?TGk*aUNkl3PAz^Nfp*YW-~jP^{eL3cfXmP10q_#-Z?FnN;E^B zrEd8-_c@OxG$BKtr5<9-0(RE)W;<)*>89=bd_V#K!M4TZK1_^ zmO5J&SXR{z(3>m_K?o>CHS+W(3*!NrG>Fzy0YoQt24kN~aCC#K=kFjtd-#eDz;x4a z0C3+raXja7w}0#aVDwfGJP81N%(uZ*%6WWxQ45ArU46p!`P$GVsrPalN@h$imEQq1#G|>i-