Skip to content

Commit e23b801

Browse files
AntonUdenAntonUden
committed
fix build errors
1 parent 486870b commit e23b801

File tree

7 files changed

+162
-122
lines changed

7 files changed

+162
-122
lines changed

‎NovaCore-GameEngine/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,23 @@
130130
<artifactId>spigot-api</artifactId>
131131
<version>1.8.8-R0.1-SNAPSHOT</version>
132132
<scope>provided</scope>
133+
<exclusions>
134+
<exclusion>
135+
<groupId>net.md-5</groupId>
136+
<artifactId>bungeecord-chat</artifactId>
137+
</exclusion>
138+
</exclusions>
133139
</dependency>
134140

141+
<!-- BungeeCord Chat API -->
142+
<dependency>
143+
<groupId>net.md-5</groupId>
144+
<artifactId>bungeecord-chat</artifactId>
145+
<version>1.16-R0.4</version>
146+
<scope>provided</scope>
147+
</dependency>
148+
149+
135150
<dependency>
136151
<groupId>commons-io</groupId>
137152
<artifactId>commons-io</artifactId>

‎NovaCore-GameMapDesignToolkit/pom.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,30 @@
9999
</repositories>
100100

101101
<dependencies>
102-
<!--Spigot API -->
102+
<!--Spigot
103+
API -->
103104
<dependency>
104105
<groupId>org.spigotmc</groupId>
105106
<artifactId>spigot-api</artifactId>
106107
<version>1.8.8-R0.1-SNAPSHOT</version>
107108
<scope>provided</scope>
109+
<exclusions>
110+
<exclusion>
111+
<groupId>net.md-5</groupId>
112+
<artifactId>bungeecord-chat</artifactId>
113+
</exclusion>
114+
</exclusions>
108115
</dependency>
109116

117+
<!-- BungeeCord Chat API -->
118+
<dependency>
119+
<groupId>net.md-5</groupId>
120+
<artifactId>bungeecord-chat</artifactId>
121+
<version>1.16-R0.4</version>
122+
<scope>provided</scope>
123+
</dependency>
124+
125+
110126
<dependency>
111127
<groupId>net.novauniverse.novacore</groupId>
112128
<artifactId>novacore-spigot</artifactId>

‎NovaCore-Spigot/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,22 @@
259259
<artifactId>spigot-api</artifactId>
260260
<version>1.8.8-R0.1-SNAPSHOT</version>
261261
<scope>provided</scope>
262+
<exclusions>
263+
<exclusion>
264+
<groupId>net.md-5</groupId>
265+
<artifactId>bungeecord-chat</artifactId>
266+
</exclusion>
267+
</exclusions>
268+
</dependency>
269+
270+
<!-- BungeeCord Chat API -->
271+
<dependency>
272+
<groupId>net.md-5</groupId>
273+
<artifactId>bungeecord-chat</artifactId>
274+
<version>1.16-R0.4</version>
275+
<scope>provided</scope>
262276
</dependency>
277+
263278
<!-- Mixed dependencies -->
264279
<dependency>
265280
<groupId>com.github.megavexnetwork.scoreboard-library</groupId>

‎NovaCore-Spigot/src/main/java/net/brunogamer/novacore/spigot/utils/ColorUtils.java‎

Lines changed: 64 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -40,39 +40,36 @@ public static DyeColor getDyeColorByColor(Color color) {
4040
}
4141
}
4242
public static DyeColor getDyeColorByChatColor(ChatColor color) {
43-
switch (color) {
44-
case BLACK:
45-
return DyeColor.BLACK;
46-
case DARK_BLUE:
47-
case BLUE:
48-
return DyeColor.BLUE;
49-
case DARK_GREEN:
50-
return DyeColor.GREEN;
51-
case DARK_AQUA:
52-
return DyeColor.CYAN;
53-
case DARK_RED:
54-
case RED:
55-
return DyeColor.RED;
56-
case DARK_PURPLE:
57-
return DyeColor.PURPLE;
58-
case GOLD:
59-
return DyeColor.ORANGE;
60-
case GRAY:
61-
return DyeColor.SILVER;
62-
case DARK_GRAY:
63-
return DyeColor.GRAY;
64-
case GREEN:
65-
return DyeColor.LIME;
66-
case AQUA:
67-
return DyeColor.LIGHT_BLUE;
68-
case LIGHT_PURPLE:
69-
return DyeColor.PINK;
70-
case YELLOW:
71-
return DyeColor.YELLOW;
72-
case WHITE:
73-
return DyeColor.WHITE;
74-
default:
75-
return DyeColor.WHITE;
43+
if (color == ChatColor.BLACK) {
44+
return DyeColor.BLACK;
45+
} else if (color == ChatColor.DARK_BLUE || color == ChatColor.BLUE) {
46+
return DyeColor.BLUE;
47+
} else if (color == ChatColor.DARK_GREEN) {
48+
return DyeColor.GREEN;
49+
} else if (color == ChatColor.DARK_AQUA) {
50+
return DyeColor.CYAN;
51+
} else if (color == ChatColor.DARK_RED || color == ChatColor.RED) {
52+
return DyeColor.RED;
53+
} else if (color == ChatColor.DARK_PURPLE) {
54+
return DyeColor.PURPLE;
55+
} else if (color == ChatColor.GOLD) {
56+
return DyeColor.ORANGE;
57+
} else if (color == ChatColor.GRAY) {
58+
return DyeColor.SILVER;
59+
} else if (color == ChatColor.DARK_GRAY) {
60+
return DyeColor.GRAY;
61+
} else if (color == ChatColor.GREEN) {
62+
return DyeColor.LIME;
63+
} else if (color == ChatColor.AQUA) {
64+
return DyeColor.LIGHT_BLUE;
65+
} else if (color == ChatColor.LIGHT_PURPLE) {
66+
return DyeColor.PINK;
67+
} else if (color == ChatColor.YELLOW) {
68+
return DyeColor.YELLOW;
69+
} else if (color == ChatColor.WHITE) {
70+
return DyeColor.WHITE;
71+
} else {
72+
return DyeColor.WHITE;
7673
}
7774
}
7875
public static Color getColorByDyeColor(DyeColor color) {
@@ -111,41 +108,40 @@ public static Color getColorByDyeColor(DyeColor color) {
111108
}
112109
}
113110
public static Color getColorByChatColor(ChatColor color) {
114-
switch (color) {
115-
case BLACK:
116-
return Color.BLACK;
117-
case DARK_BLUE:
118-
return Color.NAVY;
119-
case BLUE:
120-
return Color.BLUE;
121-
case DARK_GREEN:
122-
return Color.GREEN;
123-
case DARK_AQUA:
124-
return Color.TEAL;
125-
case DARK_RED:
126-
return Color.MAROON;
127-
case RED:
128-
return Color.RED;
129-
case DARK_PURPLE:
130-
return Color.PURPLE;
131-
case GOLD:
132-
return Color.ORANGE;
133-
case GRAY:
134-
return Color.SILVER;
135-
case DARK_GRAY:
136-
return Color.GRAY;
137-
case GREEN:
138-
return Color.LIME;
139-
case AQUA:
140-
return Color.AQUA;
141-
case LIGHT_PURPLE:
142-
return Color.FUCHSIA;
143-
case YELLOW:
144-
return Color.YELLOW;
145-
case WHITE:
146-
return Color.WHITE;
147-
default:
148-
return Color.WHITE;
111+
if (color == ChatColor.BLACK) {
112+
return Color.BLACK;
113+
} else if (color == ChatColor.DARK_BLUE) {
114+
return Color.NAVY;
115+
} else if (color == ChatColor.BLUE) {
116+
return Color.BLUE;
117+
} else if (color == ChatColor.DARK_GREEN) {
118+
return Color.GREEN;
119+
} else if (color == ChatColor.DARK_AQUA) {
120+
return Color.TEAL;
121+
} else if (color == ChatColor.DARK_RED) {
122+
return Color.MAROON;
123+
} else if (color == ChatColor.RED) {
124+
return Color.RED;
125+
} else if (color == ChatColor.DARK_PURPLE) {
126+
return Color.PURPLE;
127+
} else if (color == ChatColor.GOLD) {
128+
return Color.ORANGE;
129+
} else if (color == ChatColor.GRAY) {
130+
return Color.SILVER;
131+
} else if (color == ChatColor.DARK_GRAY) {
132+
return Color.GRAY;
133+
} else if (color == ChatColor.GREEN) {
134+
return Color.LIME;
135+
} else if (color == ChatColor.AQUA) {
136+
return Color.AQUA;
137+
} else if (color == ChatColor.LIGHT_PURPLE) {
138+
return Color.FUCHSIA;
139+
} else if (color == ChatColor.YELLOW) {
140+
return Color.YELLOW;
141+
} else if (color == ChatColor.WHITE) {
142+
return Color.WHITE;
143+
} else {
144+
return Color.WHITE;
149145
}
150146
}
151147

‎NovaCore-Spigot/src/main/java/net/zeeraa/novacore/spigot/module/modules/scoreboard/NovaScoreboardManager.java‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -293,56 +293,39 @@ public void onPlayerQuit(PlayerQuitEvent e) {
293293

294294
public static class Utils {
295295
public static NamedTextColor ChatColorToNamedTextColor(ChatColor color) {
296-
switch (color) {
297-
case AQUA:
296+
if (color == ChatColor.AQUA) {
298297
return NamedTextColor.AQUA;
299-
300-
case BLACK:
298+
} else if (color == ChatColor.BLACK) {
301299
return NamedTextColor.BLACK;
302-
303-
case BLUE:
300+
} else if (color == ChatColor.BLUE) {
304301
return NamedTextColor.BLUE;
305-
306-
case DARK_AQUA:
302+
} else if (color == ChatColor.DARK_AQUA) {
307303
return NamedTextColor.DARK_AQUA;
308-
309-
case DARK_BLUE:
304+
} else if (color == ChatColor.DARK_BLUE) {
310305
return NamedTextColor.DARK_BLUE;
311-
312-
case DARK_GRAY:
306+
} else if (color == ChatColor.DARK_GRAY) {
313307
return NamedTextColor.DARK_GRAY;
314-
315-
case DARK_GREEN:
308+
} else if (color == ChatColor.DARK_GREEN) {
316309
return NamedTextColor.DARK_GREEN;
317-
318-
case DARK_PURPLE:
310+
} else if (color == ChatColor.DARK_PURPLE) {
319311
return NamedTextColor.DARK_PURPLE;
320-
321-
case DARK_RED:
312+
} else if (color == ChatColor.DARK_RED) {
322313
return NamedTextColor.DARK_RED;
323-
324-
case GOLD:
314+
} else if (color == ChatColor.GOLD) {
325315
return NamedTextColor.GOLD;
326-
327-
case GRAY:
316+
} else if (color == ChatColor.GRAY) {
328317
return NamedTextColor.GRAY;
329-
330-
case GREEN:
318+
} else if (color == ChatColor.GREEN) {
331319
return NamedTextColor.GREEN;
332-
333-
case LIGHT_PURPLE:
320+
} else if (color == ChatColor.LIGHT_PURPLE) {
334321
return NamedTextColor.LIGHT_PURPLE;
335-
336-
case RED:
322+
} else if (color == ChatColor.RED) {
337323
return NamedTextColor.RED;
338-
339-
case WHITE:
324+
} else if (color == ChatColor.WHITE) {
340325
return NamedTextColor.WHITE;
341-
342-
case YELLOW:
326+
} else if (color == ChatColor.YELLOW) {
343327
return NamedTextColor.YELLOW;
344-
345-
default:
328+
} else {
346329
Log.warn("NovaScoreboardManager", "Invalid color selected: " + color.name());
347330
return NamedTextColor.WHITE;
348331
}

‎NovaCore-Spigot/src/main/java/net/zeeraa/novacore/spigot/utils/RGBColorData.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,40 +96,39 @@ public java.awt.Color toAWTColor() {
9696
}
9797

9898
public Color getColorByChatColor(@Nonnull net.md_5.bungee.api.ChatColor color) {
99-
switch (color) {
100-
case BLACK:
99+
if (color == net.md_5.bungee.api.ChatColor.BLACK) {
101100
return Color.BLACK;
102-
case DARK_BLUE:
101+
} else if (color == net.md_5.bungee.api.ChatColor.DARK_BLUE) {
103102
return Color.NAVY;
104-
case DARK_GREEN:
103+
} else if (color == net.md_5.bungee.api.ChatColor.DARK_GREEN) {
105104
return Color.GREEN;
106-
case DARK_AQUA:
105+
} else if (color == net.md_5.bungee.api.ChatColor.DARK_AQUA) {
107106
return Color.TEAL;
108-
case DARK_RED:
107+
} else if (color == net.md_5.bungee.api.ChatColor.DARK_RED) {
109108
return Color.MAROON;
110-
case DARK_PURPLE:
109+
} else if (color == net.md_5.bungee.api.ChatColor.DARK_PURPLE) {
111110
return Color.PURPLE;
112-
case GOLD:
111+
} else if (color == net.md_5.bungee.api.ChatColor.GOLD) {
113112
return Color.ORANGE;
114-
case GRAY:
113+
} else if (color == net.md_5.bungee.api.ChatColor.GRAY) {
115114
return Color.SILVER;
116-
case DARK_GRAY:
115+
} else if (color == net.md_5.bungee.api.ChatColor.DARK_GRAY) {
117116
return Color.GRAY;
118-
case BLUE:
117+
} else if (color == net.md_5.bungee.api.ChatColor.BLUE) {
119118
return Color.BLUE;
120-
case GREEN:
119+
} else if (color == net.md_5.bungee.api.ChatColor.GREEN) {
121120
return Color.LIME;
122-
case AQUA:
121+
} else if (color == net.md_5.bungee.api.ChatColor.AQUA) {
123122
return Color.AQUA;
124-
case RED:
123+
} else if (color == net.md_5.bungee.api.ChatColor.RED) {
125124
return Color.RED;
126-
case LIGHT_PURPLE:
125+
} else if (color == net.md_5.bungee.api.ChatColor.LIGHT_PURPLE) {
127126
return Color.FUCHSIA;
128-
case YELLOW:
127+
} else if (color == net.md_5.bungee.api.ChatColor.YELLOW) {
129128
return Color.YELLOW;
130-
case WHITE:
129+
} else if (color == net.md_5.bungee.api.ChatColor.WHITE) {
131130
return Color.WHITE;
132-
default:
131+
} else {
133132
return Color.WHITE;
134133
}
135134
}

‎NovaUtils/pom.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,30 @@
4545
</repositories>
4646

4747
<dependencies>
48-
<!--Spigot API -->
48+
<!--Spigot
49+
API -->
4950
<dependency>
5051
<groupId>org.spigotmc</groupId>
5152
<artifactId>spigot-api</artifactId>
5253
<version>1.8.8-R0.1-SNAPSHOT</version>
5354
<scope>provided</scope>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>net.md-5</groupId>
58+
<artifactId>bungeecord-chat</artifactId>
59+
</exclusion>
60+
</exclusions>
5461
</dependency>
5562

63+
<!-- BungeeCord Chat API -->
64+
<dependency>
65+
<groupId>net.md-5</groupId>
66+
<artifactId>bungeecord-chat</artifactId>
67+
<version>1.16-R0.4</version>
68+
<scope>provided</scope>
69+
</dependency>
70+
71+
5672
<dependency>
5773
<groupId>net.novauniverse.novacore</groupId>
5874
<artifactId>novacore-commons</artifactId>

0 commit comments

Comments
 (0)