diff --git a/changelog.md b/changelog.md index 2bb809ba..04b80d9d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,9 @@ -## Ex Deorum 1.15 +## Ex Deorum 1.16 - Added Mechanical Hammer, a machine that uses FE to hammer blocks automatically. Uses 20 FE a tick by default and takes 200 ticks (10 seconds) to hammer an item with a hammer that has no efficiency. + +## Ex Deorum 1.15 - Fixed not being able to enchant sieve meshes in the Enchanting Table. +- Improved appearance of witch water to better match water so that the transformation animation looks smoother. ## Ex Deorum 1.14 - Added Mechanical Sieve, a machine that uses FE to sift blocks automatically. Uses 40 FE a tick by default and takes 100 ticks to sift an item with no efficiency enchantment. diff --git a/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java b/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java index a3113fe5..8313740e 100644 --- a/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java +++ b/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java @@ -81,10 +81,10 @@ public class BarrelRenderer implements BlockEntityRenderer { if (barrel.isBrewing()) { float progress = barrel.progress; - // Transition between water color and witch water color (1F0C4C) - r = (int) Mth.lerp(progress, r, 31); - g = (int) Mth.lerp(progress, g, 12); - b = (int) Mth.lerp(progress, b, 76); + // Transition between water color and witch water color (200B41) + r = (int) Mth.lerp(progress, r, 32); + g = (int) Mth.lerp(progress, g, 11); + b = (int) Mth.lerp(progress, b, 65); } RenderUtil.renderFlatFluidSprite(buffers, stack, level, pos, y, 2.0f, light, r, g, b, fluid); diff --git a/src/main/resources/assets/exdeorum/textures/block/witch_water_flowing.png b/src/main/resources/assets/exdeorum/textures/block/witch_water_flowing.png index 0f2c4f08..61281c73 100644 Binary files a/src/main/resources/assets/exdeorum/textures/block/witch_water_flowing.png and b/src/main/resources/assets/exdeorum/textures/block/witch_water_flowing.png differ diff --git a/src/main/resources/assets/exdeorum/textures/block/witch_water_still.png b/src/main/resources/assets/exdeorum/textures/block/witch_water_still.png index 1fc70ed8..f209b319 100644 Binary files a/src/main/resources/assets/exdeorum/textures/block/witch_water_still.png and b/src/main/resources/assets/exdeorum/textures/block/witch_water_still.png differ