1.1.0

KessokuTeaTime · Aug 18, 2023 · 13e9a03 · 13e9a03
1 parent 228fb9f
commit 13e9a03
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version = 1.19.3
 yarn_mappings = 1.19.3+build.5
 loader_version = 0.14.21
 
-mod_version = 1.0.0
+mod_version = 1.1.0
 maven_group = net.krlite
 archives_base_name = tapestop
 

diff --git a/src/main/java/net/krlite/tapestop/TapeStop.java b/src/main/java/net/krlite/tapestop/TapeStop.java
@@ -16,6 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.awt.*;
 import java.util.Arrays;
 import java.util.Random;
 
@@ -42,7 +43,7 @@ public class TapeStop implements ModInitializer {
 	};
 
 	private static long lastActionTime = 0, tapeStopTime;
-	private static int color;
+	private static int blockColor, color;
 	private static @Nullable RotatingCubeMapRenderer cubeMapRenderer;
 
 	@Override
@@ -63,18 +64,43 @@ public static boolean shouldTapeStop(@Nullable Screen screen) {
 					&& CONFIG.afterGUITimeout() && isTimeout()) return true;
 
 		tapeStopTime = Util.getMeasuringTimeMs();
-		color = 0xFF000000 | randomColorBits() << 16 | randomColorBits() << 8 | randomColorBits();
+		updateColors();
 		return false;
 	}
 
+	private static void updateColors() {
+		blockColor = randomColorBits() << 16 | randomColorBits() << 8 | randomColorBits();
+		color = brighten(blockColor);
+	}
+
 	private static int randomColorBits() {
-		return new Random().nextInt(0x3C) | 0x10;
+		int color = new Random().nextInt(0x10, 0x3C);
+		return color <= 0x10 ? 0 : color;
+	}
+
+	private static int brighten(int color) {
+		if (color <= 0) return 0;
+
+		Color hslColor = new Color(color);
+		float[] hsl = Color.RGBtoHSB(hslColor.getRed(), hslColor.getGreen(), hslColor.getBlue(), null);
+
+		float[] factors = new float[]{ 1, new Random().nextFloat(1.9F, 2.2F), new Random().nextFloat(2.3F, 3.1F) };
+		for (int i = 0; i < 3; i++) {
+			hsl[i] *= factors[i];
+			hsl[i] = Math.max(0, Math.min(1, hsl[i]));
+		}
+
+		return Color.HSBtoRGB(hsl[0], hsl[1], hsl[2]);
 	}
 
 	public static long tapeStopTime() {
 		return tapeStopTime;
 	}
 
+	public static int blockColor() {
+		return blockColor;
+	}
+
 	public static int color() {
 		return color;
 	}

diff --git a/src/main/java/net/krlite/tapestop/config/TapeStopConfig.java b/src/main/java/net/krlite/tapestop/config/TapeStopConfig.java
@@ -9,8 +9,7 @@
 import java.io.File;
 
 public class TapeStopConfig extends Pierced {
-	@Silent
-	private static final File file = FabricLoader.getInstance().getConfigDir().resolve("tapestop.toml").toFile();
+	private static @Silent final File file = FabricLoader.getInstance().getConfigDir().resolve("tapestop.toml").toFile();
 
 	public TapeStopConfig() {
 		super(TapeStopConfig.class, file);

diff --git a/src/main/java/net/krlite/tapestop/mixin/GameRendererMixin.java b/src/main/java/net/krlite/tapestop/mixin/GameRendererMixin.java
@@ -99,9 +99,9 @@ private boolean skipGameRender(MinecraftClient client) {
 					VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers();
 
 					float
-							red = (float) (TapeStop.color() >> 16 & 0xFF) / 255.0F,
-							green = (float) (TapeStop.color() >> 8 & 0xFF) / 255.0F,
-							blue = (float) (TapeStop.color() & 0xFF) / 255.0F;
+							red = (float) (TapeStop.blockColor() >> 16 & 0xFF) / 255.0F,
+							green = (float) (TapeStop.blockColor() >> 8 & 0xFF) / 255.0F,
+							blue = (float) (TapeStop.blockColor() & 0xFF) / 255.0F;
 
 					new BlockModelRenderer(MinecraftClient.getInstance().getBlockColors()).render(
 							modelMatrixStack.peek(), immediate.getBuffer(RenderLayers.getBlockLayer(blockState)), blockState,
@@ -118,7 +118,7 @@ private boolean skipGameRender(MinecraftClient client) {
 				}
 
 				if (!skipped) {
-					TapeStop.LOGGER.info("Tape stopped. Rendering overlay with background color 0x" + Integer.toHexString(TapeStop.color()).toUpperCase(Locale.ROOT));
+					TapeStop.LOGGER.info("Tape stopped. Rendering overlay with background color " + String.format("$%06x", TapeStop.color() & 0xFFFFFF).toUpperCase(Locale.ROOT));
 				}
 			}