diff --git a/src/main/java/com/wildfire/main/contributors/Contributor.java b/src/main/java/com/wildfire/main/contributors/Contributor.java index 4724c081..668227a9 100644 --- a/src/main/java/com/wildfire/main/contributors/Contributor.java +++ b/src/main/java/com/wildfire/main/contributors/Contributor.java @@ -70,31 +70,31 @@ public int getColor() { } public enum Role { - // New entries should be added at the bottom of this enum, as otherwise existing bitmasks will - // reference the wrong entries - MOD_CREATOR(ChatFormatting.LIGHT_PURPLE.getColor()), - // TODO should this have a special color as well? this is currently set to an light blue/purple-ish color - FABRIC_MAINTAINER(0xA78FFF), - NEOFORGE_MAINTAINER(0xA78FFF), - DEVELOPER, - TRANSLATOR(0x66CCFF), - MASCOT, - VOICE_ACTOR_FEMALE, - GENERIC, + MOD_CREATOR(0, ChatFormatting.LIGHT_PURPLE.getColor()), + FABRIC_MAINTAINER(1, 0xA78FFF), + NEOFORGE_MAINTAINER(2, 0xA78FFF), + CI_MAINTAINER(8, 0x50C878), + DEVELOPER(3), + TRANSLATOR(4, 0x66CCFF), + MASCOT(5), + VOICE_ACTOR_FEMALE(6), + GENERIC(7), ; + private final int bit; private final @Nullable Integer color; - Role(@Nullable Integer color) { + Role(int bit, @Nullable Integer color) { + this.bit = 1 << bit; this.color = color; } - Role() { - this(null); + Role(int bit) { + this(bit, null); } public int bit() { - return 1 << ordinal(); + return bit; } public boolean isIn(int bitmask) { diff --git a/src/main/java/com/wildfire/main/contributors/Contributors.java b/src/main/java/com/wildfire/main/contributors/Contributors.java index a9ac8f00..31fca36e 100644 --- a/src/main/java/com/wildfire/main/contributors/Contributors.java +++ b/src/main/java/com/wildfire/main/contributors/Contributors.java @@ -52,11 +52,11 @@ private Contributors() { addContributor("23b6feed-2dfe-4f2e-9429-863fd4adb946", "WildfireFGM", Contributor.Role.MOD_CREATOR); addContributor("70336328-0de7-430e-8cba-2779e2a05ab5", "celeste", Contributor.Role.FABRIC_MAINTAINER); addContributor("64e57307-72e5-4f43-be9c-181e8e35cc9b", "pupnewfster", Contributor.Role.NEOFORGE_MAINTAINER); - addContributor("9a60e979-c890-4b43-a4c0-32d8a9f6b6b9", "SavLeftUs", Contributor.Role.VOICE_ACTOR_FEMALE); - addContributor("618a8390-51b1-43b2-a53a-ab72c1bbd8bd", "Kichura", Contributor.Role.DEVELOPER); + addContributor("618a8390-51b1-43b2-a53a-ab72c1bbd8bd", "Kichura", Contributor.Role.CI_MAINTAINER); addContributor("ad8ee68c-0aa1-47f9-b29f-f92fa1ef66dc", "DiaDemiEmi", Contributor.Role.DEVELOPER); addContributor("3f36f7e9-7459-43fe-87ce-4e8a5d47da80", "IzzyBizzy45", Contributor.Role.DEVELOPER); addContributor("ad3cb52d-524b-41b4-b9d6-b91ec440811d", "RacoonDog", Contributor.Role.DEVELOPER); + addContributor("9a60e979-c890-4b43-a4c0-32d8a9f6b6b9", "SavLeftUs", Contributor.Role.VOICE_ACTOR_FEMALE); addContributor("525b0455-15e9-49b7-b61d-f291e8ee6c5b", "Powerless001", Contributor.Role.GENERIC); addContributor("33feda66-c706-4725-8983-f62e5e6cbee7", "Bluelight", Contributor.Role.TRANSLATOR); diff --git a/src/main/resources/assets/wildfire_gender/lang/en_us.json b/src/main/resources/assets/wildfire_gender/lang/en_us.json index fa95d906..38302e89 100644 --- a/src/main/resources/assets/wildfire_gender/lang/en_us.json +++ b/src/main/resources/assets/wildfire_gender/lang/en_us.json @@ -165,6 +165,8 @@ "wildfire_gender.contributor.role.fabric_maintainer.short": "Maintainer (Fabric)", "wildfire_gender.contributor.role.neoforge_maintainer": "Female Gender Mod Maintainer", "wildfire_gender.contributor.role.neoforge_maintainer.short": "Maintainer (NeoForge)", + "wildfire_gender.contributor.role.ci_maintainer": "Female Gender Mod Contributor", + "wildfire_gender.contributor.role.ci_maintainer.short": "CI/CD Maintainer", "wildfire_gender.contributor.role.developer": "Female Gender Mod Contributor", "wildfire_gender.contributor.role.developer.short": "Programmer", "wildfire_gender.contributor.role.translator": "Female Gender Mod Translator",