include envcolor check

dev-hydrogen · Jan 27, 2022 · 8da27e2 · 8da27e2
1 parent d34e70a
commit 8da27e2
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/com/ilm9001/nightclub/beatmap/BeatmapParser.java b/src/main/java/com/ilm9001/nightclub/beatmap/BeatmapParser.java
@@ -57,17 +57,26 @@ public class BeatmapParser {
             JsonArray suggestions;
             JsonObject colorLeft;
             JsonObject colorRight;
+            JsonObject envColorLeft;
+            JsonObject envColorRight;
             if (customData != null) {
                 JsonObject customDataObject = customData.getAsJsonObject();
                 requirements = (JsonArray) customDataObject.get("_requirements");
                 suggestions = (JsonArray) customDataObject.get("_suggestions");
                 colorLeft = (JsonObject) customDataObject.get("_colorLeft");
                 colorRight = (JsonObject) customDataObject.get("_colorRight");
+                envColorLeft = (JsonObject) customDataObject.get("_envColorLeft");
+                envColorRight = (JsonObject) customDataObject.get("_envColorRight");
                 if (colorLeft != null && colorRight != null) {
                     primaryColor = new Color(colorLeft.get("r").getAsFloat(), colorLeft.get("g").getAsFloat(), colorLeft.get("b").getAsFloat());
                     secondaryColor = new Color(colorRight.get("r").getAsFloat(), colorRight.get("g").getAsFloat(), colorRight.get("b").getAsFloat());
                     isChroma = true;
                 }
+                if (envColorLeft != null && envColorRight != null && !isChroma) {
+                    primaryColor = new Color(envColorLeft.get("r").getAsFloat(), envColorLeft.get("g").getAsFloat(), envColorLeft.get("b").getAsFloat());
+                    secondaryColor = new Color(envColorLeft.get("r").getAsFloat(), envColorRight.get("g").getAsFloat(), envColorRight.get("b").getAsFloat());
+                    isChroma = true;
+                }
                 if (requirements != null && !isChroma) {
                     isChroma = requirements.contains(new JsonPrimitive("Chroma"))
                             || requirements.contains(new JsonPrimitive("Chroma Lighting Events"))