diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java
index 1913badef..7df50f06b 100644
--- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java
+++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java
@@ -11,7 +11,9 @@ import org.apache.commons.collections4.CollectionUtils;
import vg.civcraft.mc.civmodcore.utilities.CivLogger;
/**
- * Reference
+ * This is a mapped version of NMS class {@link MaterialMapColor} to make setting pixel colours easier.
+ *
+ * Read more.
*/
public enum MapColours {
@@ -74,6 +76,7 @@ public enum MapColours {
WARPED_STEM(MaterialMapColor.af),
WARPED_HYPHAE(MaterialMapColor.ag),
WARPED_WART_BLOCK(MaterialMapColor.ah);
+ // TODO: Add the new map colours after they're added to the fandom wiki
private final MaterialMapColor nms;
@@ -86,17 +89,18 @@ public enum MapColours {
}
public static void init() {
- final Set coreMapColours = Set.of(Stream.of(values())
+ final Set cmcMapColours = Stream.of(values())
.map(MapColours::asNMS)
- .toArray(MaterialMapColor[]::new));
- final Set baseMapColours = Set.of(Stream.of(MaterialMapColor.a)
+ .collect(Collectors.toSet());
+ final Set nmsMapColours = Stream.of(MaterialMapColor.a)
.filter(Objects::nonNull)
- .toArray(MaterialMapColor[]::new));
- final Collection missing = CollectionUtils.disjunction(coreMapColours, baseMapColours);
- if (!missing.isEmpty()) {
+ .collect(Collectors.toSet());
+ final Collection missingColours = CollectionUtils.disjunction(cmcMapColours, nmsMapColours);
+ if (!missingColours.isEmpty()) {
final CivLogger logger = CivLogger.getLogger(MapColours.class);
- logger.warning("The following map colours are missing: " + missing.stream()
- .map(e -> Integer.toString(e.am))
+ logger.warning("The following map colours are missing: " + missingColours.stream()
+ /** {@link MaterialMapColor#MaterialMapColor(int, int)} "id" parameter */
+ .map(colour -> Integer.toString(colour.am))
.collect(Collectors.joining(",")));
}
}