Skip to content

Commit 131cbd3

Browse files
committed
Gruvbox theme
1 parent c237f29 commit 131cbd3

4 files changed

Lines changed: 18 additions & 19 deletions

File tree

src/main/java/me/eldodebug/soar/management/color/ColorManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ public ColorManager() {
4949
add("Amethyst", new Color(157, 80, 187), new Color(110, 72, 170));
5050
add("Blush", new Color(178, 69, 146), new Color(241, 95, 121));
5151
add("Mocha Rose", new Color(245, 194, 231), new Color(243, 139, 168));
52+
add("Muted Ocean", new Color(131, 165, 152), new Color(69, 133, 136));
53+
add("Algae", new Color(142, 192, 124), new Color(104, 157, 106));
5254

5355
currentColor = getColorByName("Default");
5456
}

src/main/java/me/eldodebug/soar/management/color/Theme.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public enum Theme {
1919
CALIFORNIA(10, "California", new Color(22, 22, 25), new Color(0, 0, 0), new Color(230,230,230), new Color(130,130,130)),
2020
LAVENDER(11, "Lavender", new Color(228, 229, 241), new Color(250, 250, 250), new Color(72,75,105), new Color(147,148,165)),
2121
CAMELLIA(12, "Camellia", new Color(30, 31, 36), new Color(23, 24, 28), new Color(228, 229, 231), new Color(250, 56, 103)),
22-
TERMINAL(13, "Terminal", new Color(7, 7, 7), new Color(12, 12, 12), new Color(89, 156, 58), new Color(60, 81, 6)),
23-
NORD(14, "Nord", new Color(59, 66, 82), new Color(46, 52, 64), new Color(236, 239, 244), new Color(216, 222, 233));
22+
TERMINAL(13, "Terminal", new Color(7, 7, 7), new Color(12, 12, 12), new Color(32, 96, 7), new Color(54, 73, 0)),
23+
NORD(14, "Nord", new Color(59, 66, 82), new Color(46, 52, 64), new Color(236, 239, 244), new Color(216, 222, 233)),
24+
GRUVBOX(15, "Gruvbox Dark Med", new Color(0x3C3836), new Color(0x282828), new Color(0xEBDBB2), new Color(0xA89984));
2425

2526
private SimpleAnimation animation = new SimpleAnimation();
2627

src/main/java/me/eldodebug/soar/management/mods/RestrictedMod.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public boolean checkAllowed(Mod m) {
2525
}
2626
return true; // Mod is allowed
2727
}
28+
2829
public void joinServer(String ip) {
2930
blm.check();
3031
}

src/main/java/me/eldodebug/soar/management/remote/blacklists/BlacklistManager.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import me.eldodebug.soar.utils.Multithreading;
99
import me.eldodebug.soar.utils.network.HttpUtils;
1010

11-
import java.util.Iterator;
1211
import java.util.concurrent.CopyOnWriteArrayList;
1312

1413
public class BlacklistManager {
1514

16-
private final CopyOnWriteArrayList<Server> blacklist = new CopyOnWriteArrayList<Server>();
15+
private final CopyOnWriteArrayList<Server> blacklist = new CopyOnWriteArrayList<>();
1716

1817
public BlacklistManager() {
1918
check();
@@ -33,27 +32,23 @@ private void loadBlacklists() {
3332

3433
if(jsonArray != null) {
3534

36-
Iterator<JsonElement> iterator = jsonArray.iterator();
35+
for (JsonElement jsonElement : jsonArray) {
3736

38-
while(iterator.hasNext()) {
39-
40-
41-
JsonElement jsonElement = (JsonElement) iterator.next();
4237
Gson gson = new Gson();
4338
JsonObject serverJsonObject = gson.fromJson(jsonElement, JsonObject.class);
4439

45-
String serverIp = JsonUtils.getStringProperty(serverJsonObject, "serverip", "null");
46-
JsonArray modsArray = JsonUtils.getArrayProperty(serverJsonObject, "mods");
47-
CopyOnWriteArrayList<String> modsList = new CopyOnWriteArrayList<>();
40+
String serverIp = JsonUtils.getStringProperty(serverJsonObject, "serverip", "null");
41+
JsonArray modsArray = JsonUtils.getArrayProperty(serverJsonObject, "mods");
42+
CopyOnWriteArrayList<String> modsList = new CopyOnWriteArrayList<>();
4843

49-
if (modsArray != null) {
50-
for (JsonElement modElement : modsArray) {
51-
modsList.add(modElement.getAsString());
52-
}
53-
}
44+
if (modsArray != null) {
45+
for (JsonElement modElement : modsArray) {
46+
modsList.add(modElement.getAsString());
47+
}
48+
}
5449

55-
blacklist.add(new Server(serverIp, modsList));
56-
}
50+
blacklist.add(new Server(serverIp, modsList));
51+
}
5752
}
5853
}
5954
}

0 commit comments

Comments
 (0)