From 369c6501d5aff74d039ca7e9db2872f89a9c873d Mon Sep 17 00:00:00 2001 From: Xel'Bayria <12866666+Xelbayria@users.noreply.github.com> Date: Sat, 1 Feb 2025 03:27:03 -0700 Subject: [PATCH] ChippedModule: Another tweaks on palette codes --- .../modules/chipped/ChippedModule.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/mehvahdjukaar/every_compat/modules/chipped/ChippedModule.java b/common/src/main/java/net/mehvahdjukaar/every_compat/modules/chipped/ChippedModule.java index 1159259b0..1957a10d6 100644 --- a/common/src/main/java/net/mehvahdjukaar/every_compat/modules/chipped/ChippedModule.java +++ b/common/src/main/java/net/mehvahdjukaar/every_compat/modules/chipped/ChippedModule.java @@ -506,7 +506,10 @@ public ChippedModule(String modId) { p.reduceDown(); PaletteColor darker = p.getDarkest(); // 2nd darkest after 1st darkest p.reduceDown(); - p.matchLuminanceStep(0.03F); + p.reduceDown(); + PaletteColor dark = p.getDarkest(); + p.reduceDown(); + p.reduceUp(); if (p.size() < 11) { while (p.size() <= 11) { p.increaseInner(); @@ -517,6 +520,7 @@ public ChippedModule(String modId) { p.reduce(); } } + p.add(dark); p.add(darker); }) .setTabKey(tab) @@ -1888,9 +1892,6 @@ private void dullerPalette(Palette p) { } private void matchSizeAndModifyLuminance(Palette p) { - p.remove(p.getDarkest(2)); - p.remove(p.getDarkest(2)); - p.remove(p.getDarkest(2)); p.changeSizeMatchingLuminanceSpan(0.25F); } @@ -1900,6 +1901,11 @@ private void darkerPalette(Palette p) { } private void darkPalette(Palette p) { + if (p.size() > 25) { + while (p.size() > 6) { + p.reduce(); + } + } p.increaseInner(); p.increaseInner(); p.increaseInner();