Plexus
/
Plex
mirror of https://github.com/plexusorg/Plex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taah 2022-02-21 22:56:14 -08:00
parent 355a930c89 c64d04b9a3
commit 28fba133b7
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build.gradle
View File

@ -67,12 +67,10 @@ publishing {
from(components.java)
repositories {
maven {
if (System.getenv("plex_repo_user") != null && System.getenv("plex_repo_pass") != null) {
url("https://nexus.telesphoreo.me/repository/plex-releases/")
credentials {
username = System.getenv("plex_repo_user")
password = System.getenv("plex_repo_pass")
}
uri("https://nexus.telesphoreo.me/repository/plex-releases/")
credentials {
username = System.getenv("plex_repo_user")
password = System.getenv("plex_repo_pass")
}
}
}
@ -81,12 +79,10 @@ publishing {
from(components.java)
repositories {
maven {
if (System.getenv("plex_repo_user") != null && System.getenv("plex_repo_pass") != null) {
url("https://nexus.telesphoreo.me/repository/plex-snapshots/")
credentials {
username = System.getenv("plex_repo_user")
password = System.getenv("plex_repo_pass")
}
uri("https://nexus.telesphoreo.me/repository/plex-snapshots/")
credentials {
username = System.getenv("plex_repo_user")
password = System.getenv("plex_repo_pass")
}
}
}
@ -101,8 +97,10 @@ tasks.withType(JavaCompile) {
tasks {
build {
dependsOn(shadowJar)
if (getVersion().toString().toLowerCase().endsWith("-snapshot")) {
dependsOn(publishPlexSnapshotsPublicationToMaven2Repository)
if (System.getenv("plex_repo_user") != null && System.getenv("plex_repo_pass") != null) {
if (getVersion().toString().toLowerCase().endsWith("-snapshot")) {
dependsOn(publishPlexSnapshotsPublicationToMaven2Repository)
}
}
}

2
src/main/java/dev/plex/rank/enums/Rank.java
View File

@ -16,7 +16,7 @@ public enum Rank
{
IMPOSTOR(-1, ChatColor.AQUA + "an " + ChatColor.YELLOW + "Impostor", "Impostor", "&8[&eImp&8]"),
NONOP(0, "a " + ChatColor.WHITE + "Non-Op", "Non-Op", ""),
OP(1, "an " + ChatColor.GREEN + "Operator", "Operator", "&8[&aOp&8]"),
OP(1, "an " + ChatColor.GREEN + "Operator", "Operator", "&8[&aOP&8]"),
ADMIN(2, "an " + ChatColor.DARK_GREEN + "Admin", "Admin", "&8[&2Admin&8]"),
SENIOR_ADMIN(3, "a " + ChatColor.GOLD + "Senior Admin", "Senior Admin", "&8[&6SrA&8]"),
EXECUTIVE(4, "an " + ChatColor.RED + "Executive", "Executive", "&8[&cExec&8]");