From 853ce88eb68c95bcf941c75977f67f530d6439a2 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 15 Nov 2023 21:12:19 +0000 Subject: [PATCH] Remove MapColours It's a deobfuscation class, which is redundant now with userdev. --- .../mc/civmodcore/CivModCorePlugin.java | 2 - .../mc/civmodcore/maps/MapColours.java | 111 ------------------ 2 files changed, 113 deletions(-) delete mode 100644 plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java b/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java index b42c25470..040849a56 100644 --- a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java +++ b/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java @@ -16,7 +16,6 @@ import vg.civcraft.mc.civmodcore.inventory.items.EnchantUtils; import vg.civcraft.mc.civmodcore.inventory.items.MoreTags; import vg.civcraft.mc.civmodcore.inventory.items.SpawnEggUtils; import vg.civcraft.mc.civmodcore.inventory.items.TreeTypeUtils; -import vg.civcraft.mc.civmodcore.maps.MapColours; import vg.civcraft.mc.civmodcore.players.scoreboard.bottom.BottomLineAPI; import vg.civcraft.mc.civmodcore.players.scoreboard.side.ScoreBoardAPI; import vg.civcraft.mc.civmodcore.players.scoreboard.side.ScoreBoardListener; @@ -92,7 +91,6 @@ public final class CivModCorePlugin extends ACivMod { SpawnEggUtils.init(); TreeTypeUtils.init(); BottomLineAPI.init(); - MapColours.init(); this.skinCache = new SkinCache(this, this.config.getSkinCacheThreads()); if (this.config.getChunkLoadingStatistics()) diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java b/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java deleted file mode 100644 index e188f37d7..000000000 --- a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/maps/MapColours.java +++ /dev/null @@ -1,111 +0,0 @@ -package vg.civcraft.mc.civmodcore.maps; - -import java.util.Collection; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import javax.annotation.Nonnull; -import net.minecraft.world.level.material.MaterialColor; -import org.apache.commons.collections4.CollectionUtils; -import vg.civcraft.mc.civmodcore.utilities.CivLogger; - -/** - * This is a mapped version of NMS class {@link MaterialColor} to make setting pixel colours easier. - * - * Read more. - * - * Deobf path: net.minecraft.world.level.material.MaterialColor - */ -public enum MapColours { - - NONE(MaterialColor.NONE), - GRASS(MaterialColor.GRASS), - SAND(MaterialColor.SAND), - WOOL(MaterialColor.WOOL), // White wool - FIRE(MaterialColor.FIRE), - ICE(MaterialColor.ICE), - METAL(MaterialColor.METAL), - PLANT(MaterialColor.PLANT), - SNOW(MaterialColor.SNOW), - CLAY(MaterialColor.CLAY), - DIRT(MaterialColor.DIRT), - STONE(MaterialColor.STONE), - WATER(MaterialColor.WATER), - WOOD(MaterialColor.WOOD), - QUARTZ(MaterialColor.QUARTZ), - COLOR_ORANGE(MaterialColor.COLOR_ORANGE), - COLOR_MAGENTA(MaterialColor.COLOR_MAGENTA), - COLOR_LIGHT_BLUE(MaterialColor.COLOR_LIGHT_BLUE), - COLOR_YELLOW(MaterialColor.COLOR_YELLOW), - COLOR_LIGHT_GREEN(MaterialColor.COLOR_LIGHT_GREEN), - COLOR_PINK(MaterialColor.COLOR_PINK), - COLOR_GRAY(MaterialColor.COLOR_GRAY), - COLOR_LIGHT_GRAY(MaterialColor.COLOR_LIGHT_GRAY), - COLOR_CYAN(MaterialColor.COLOR_CYAN), - COLOR_PURPLE(MaterialColor.COLOR_PURPLE), - COLOR_BLUE(MaterialColor.COLOR_BLUE), - COLOR_BROWN(MaterialColor.COLOR_BROWN), - COLOR_GREEN(MaterialColor.COLOR_GREEN), - COLOR_RED(MaterialColor.COLOR_RED), - COLOR_BLACK(MaterialColor.COLOR_BLACK), - GOLD(MaterialColor.GOLD), - DIAMOND(MaterialColor.DIAMOND), - LAPIS(MaterialColor.LAPIS), - EMERALD(MaterialColor.EMERALD), - PODZOL(MaterialColor.PODZOL), - NETHER(MaterialColor.NETHER), - TERRACOTTA_WHITE(MaterialColor.TERRACOTTA_WHITE), - TERRACOTTA_ORANGE(MaterialColor.TERRACOTTA_ORANGE), - TERRACOTTA_MAGENTA(MaterialColor.TERRACOTTA_MAGENTA), - TERRACOTTA_LIGHT_BLUE(MaterialColor.TERRACOTTA_LIGHT_BLUE), - TERRACOTTA_YELLOW(MaterialColor.TERRACOTTA_YELLOW), - TERRACOTTA_LIGHT_GREEN(MaterialColor.TERRACOTTA_LIGHT_GREEN), - TERRACOTTA_PINK(MaterialColor.TERRACOTTA_PINK), - TERRACOTTA_GRAY(MaterialColor.TERRACOTTA_GRAY), - TERRACOTTA_LIGHT_GRAY(MaterialColor.TERRACOTTA_LIGHT_GRAY), - TERRACOTTA_CYAN(MaterialColor.TERRACOTTA_CYAN), - TERRACOTTA_PURPLE(MaterialColor.TERRACOTTA_PURPLE), - TERRACOTTA_BLUE(MaterialColor.TERRACOTTA_BLUE), - TERRACOTTA_BROWN(MaterialColor.TERRACOTTA_BROWN), - TERRACOTTA_GREEN(MaterialColor.TERRACOTTA_GREEN), - TERRACOTTA_RED(MaterialColor.TERRACOTTA_RED), - TERRACOTTA_BLACK(MaterialColor.TERRACOTTA_BLACK), - CRIMSON_NYLIUM(MaterialColor.CRIMSON_NYLIUM), - CRIMSON_STEM(MaterialColor.CRIMSON_STEM), - CRIMSON_HYPHAE(MaterialColor.CRIMSON_HYPHAE), - WARPED_NYLIUM(MaterialColor.WARPED_NYLIUM), - WARPED_STEM(MaterialColor.WARPED_STEM), - WARPED_HYPHAE(MaterialColor.WARPED_HYPHAE), - WARPED_WART_BLOCK(MaterialColor.WARPED_WART_BLOCK), - DEEPSLATE(MaterialColor.DEEPSLATE), - RAW_IRON(MaterialColor.RAW_IRON); - - private final MaterialColor nms; - - MapColours(@Nonnull final MaterialColor nms) { - this.nms = Objects.requireNonNull(nms); - } - - public MaterialColor asNMS() { - return this.nms; - } - - public static void init() { - final Set cmcMapColours = Stream.of(values()) - .map(MapColours::asNMS) - .collect(Collectors.toSet()); - final Set nmsMapColours = Stream.of(MaterialColor.MATERIAL_COLORS) - .filter(Objects::nonNull) - .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: " + missingColours.stream() - /** {@link MaterialMapColor#MaterialMapColor(int, int)} "id" parameter */ - .map(colour -> Integer.toString(colour.col)) - .collect(Collectors.joining(","))); - } - } - -}