Lantern color correction

src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java

@@ -4,6 +4,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.color.block.BlockColorProvider;
 import net.minecraft.client.color.item.ItemColorProvider;
 import ru.betterend.interfaces.IColorProvider;
+import ru.betterend.util.MHelper;
 
 public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider {
 	public BulbVineLanternColoredBlock(FabricBlockSettings settings) {
@@ -13,17 +14,26 @@ public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements
 	@Override
 	public BlockColorProvider getProvider() {
 		return (state, world, pos, tintIndex) -> {
-			return this.getDefaultMaterialColor().color;
+			return getColor();
 		};
 	}
 
 	@Override
 	public ItemColorProvider getItemProvider() {
 		return (stack, tintIndex) -> {
-			return this.getDefaultMaterialColor().color;
+			return getColor();
 		};
 	}
 	
+	private int getColor() {
+		int color = this.getDefaultMaterialColor().color;
+		int b = (color & 255);
+		int g = ((color >> 8) & 255);
+		int r = ((color >> 16) & 255);
+		float[] hsv = MHelper.fromRGBtoHSB(r, g, b);
+		return MHelper.fromHSBtoRGB(hsv[0], hsv[1], hsv[1] > 0.2 ? 1 : hsv[2]);
+	}
+	
 	@Override
 	protected String getGlowTexture() {
 		return "bulb_vine_lantern_overlay";

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 1.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_black.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.1,
+  "green": 0.1,
+  "blue": 0.1,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_blue.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.0,
+  "green": 0.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_brown.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.32,
+  "green": 0.18,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_cyan.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.0,
+  "green": 1.0,
+  "blue": 0.5,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_gray.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.3,
+  "green": 0.3,
+  "blue": 0.3,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_green.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.0,
+  "green": 1.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_blue.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 0.5,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_gray.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 0.5,
+  "blue": 0.5,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_lime.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 1.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_magenta.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_orange.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.5,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_pink.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.5,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_purple.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 0.0,
+  "blue": 0.5,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_red.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_white.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 1.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_yellow.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 1.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 1.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_black.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.1,
+  "green": 0.1,
+  "blue": 0.1,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_blue.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.0,
+  "green": 0.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_brown.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.32,
+  "green": 0.18,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_cyan.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.0,
+  "green": 1.0,
+  "blue": 0.5,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_gray.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.3,
+  "green": 0.3,
+  "blue": 0.3,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_green.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.0,
+  "green": 1.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_blue.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 0.5,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_gray.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 0.5,
+  "blue": 0.5,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_lime.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 1.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_magenta.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_orange.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.5,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_pink.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.5,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_purple.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 0.5,
+  "green": 0.0,
+  "blue": 0.5,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_red.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 0.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_white.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 1.0,
+  "blue": 1.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_yellow.json

@@ -0,0 +1,7 @@
+{
+  "intensity": 0.5,
+  "red": 1.0,
+  "green": 1.0,
+  "blue": 0.0,
+  "worksInFluid": true
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_bulb",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_black.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_blue.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_brown.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_cyan.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_gray.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_green.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_blue.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_gray.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_lime.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_magenta.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_orange.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_pink.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_purple.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_red.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_white.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_yellow.json

@@ -0,0 +1,10 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/bulb_vine_lantern_overlay",
+				"material": "betterend:glow_all"
+			}
+		]
+	}
+}