fix track categories by removing custom tracks option

PhilippvK · Sep 25, 2020 · 3a5eb35 · 3a5eb35
1 parent ef44cfa
commit 3a5eb35
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/client/src/main/java/agolf/lobby/LobbyPanel.java b/client/src/main/java/agolf/lobby/LobbyPanel.java
@@ -256,9 +256,9 @@ protected Choicer addChoicerTrackTypes(Panel container, int x, int y, int width,
             c.addItem("Only pend (A)");
         }
 
-        if(Launcher.isUsingCustomServer()) {
-            c.addItem("Only custom");
-        }
+        //if(Launcher.isUsingCustomServer()) {
+        //    c.addItem("Only custom");
+        //}
 
         c.select(1);
         c.setBounds(x, y, width, height);
@@ -336,7 +336,7 @@ protected Choicer addChoicerScoringEnd(Panel container, int x, int y, int width,
     protected Choicer addChoicerTrackCategory(Panel container, int x, int y, int width, int height) {
         Choicer c = new Choicer();
         c.addItem("Official");
-        c.addItem("Custom");
+        //c.addItem("Custom");
         c.select(0);
         c.setBounds(x, y, width, height);
         container.add(c);

diff --git a/server/src/main/java/org/moparforia/server/track/TrackCategory.java b/server/src/main/java/org/moparforia/server/track/TrackCategory.java
@@ -6,7 +6,8 @@
  */
 public enum TrackCategory {
 
-    UNKNOWN("?", -1), ALL("-", 0), BASIC("basic", 1), TRADITIONAL("traditional", 2), MODERN("modern", 3), HIO("hio", 4), SHORT("short", 5), LONG("long", 6), CUSTOM("custom", 7);
+    //UNKNOWN("?", -1), ALL("-", 0), BASIC("basic", 1), TRADITIONAL("traditional", 2), MODERN("modern", 3), HIO("hio", 4), SHORT("short", 5), LONG("long", 6), CUSTOM("custom", 7);
+    UNKNOWN("?", -1), ALL("-", 0), BASIC("basic", 1), TRADITIONAL("traditional", 2), MODERN("modern", 3), HIO("hio", 4), SHORT("short", 5), LONG("long", 6);
 
     private final String dir;
     private final int id;

diff --git a/server/src/main/java/org/moparforia/server/track/TrackManager.java b/server/src/main/java/org/moparforia/server/track/TrackManager.java
@@ -81,7 +81,8 @@ private static final void loadTracks() throws IOException {
         FileSystem fs = FileSystems.getDefault();
         int counter = 0;
         for (TrackCategory type : TrackCategory.values()) {
-            if (type == TrackCategory.ALL || type == TrackCategory.CUSTOM || type == TrackCategory.UNKNOWN) {
+            //if (type == TrackCategory.ALL || type == TrackCategory.CUSTOM || type == TrackCategory.UNKNOWN) {
+            if (type == TrackCategory.ALL || type == TrackCategory.UNKNOWN) {
                 continue;
             }
             Path tracksPath = fs.getPath("tracks", type.getDir());
@@ -173,7 +174,8 @@ public static final ArrayList<Track> getRandomTracks(int number, TrackCategory t
         }
         ArrayList<Track> usedTracks = new ArrayList<Track>();// horrible
         for (Track track : tracks) {
-            if (TrackCategory.getByTypeId(track.getCategory()) == TrackCategory.ALL || TrackCategory.getByTypeId(track.getCategory()) == type) {
+            //if (TrackCategory.getByTypeId(track.getCategory()) == TrackCategory.ALL || TrackCategory.getByTypeId(track.getCategory()) == type) {
+            if (type == TrackCategory.ALL || TrackCategory.getByTypeId(track.getCategory()) == type) {
                 usedTracks.add(track);
             }
         }

diff --git a/server/src/main/java/org/moparforia/server/util/StockTrackUploader.java b/server/src/main/java/org/moparforia/server/util/StockTrackUploader.java
@@ -34,7 +34,8 @@ private static void loadTracks() throws IOException {
         tracks = new ArrayList<Track>();
         FileSystem fs = FileSystems.getDefault();
         for (TrackCategory type : TrackCategory.values()) {
-            if (type == TrackCategory.ALL || type == TrackCategory.CUSTOM || type == TrackCategory.UNKNOWN) {
+            //if (type == TrackCategory.ALL || type == TrackCategory.CUSTOM || type == TrackCategory.UNKNOWN) {
+            if (type == TrackCategory.ALL || type == TrackCategory.UNKNOWN) {
                 continue;
             }
             Path tracksPath = fs.getPath("tracks", type.getDir());