From ee6811ccd288f9c18b34f69995369f0a8d4618c0 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Fri, 11 Apr 2025 08:34:52 +0700
Subject: [PATCH] refactor: increase 10MB download & REMOVE AUTO NBS INSTRUMENT
 SUBTITLES COMPLETIONS IT BREAKS SO MUCH

---
 build-number.txt                              |  2 +-
 .../chomens_bot/song/NBSConverter.java        | 37 +------------------
 .../chomens_bot/song/SongLoaderThread.java    |  2 +-
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index f9147d24..e711e35d 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-2622
\ No newline at end of file
+2624
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java
index 5e4fa4cc..2d8f262a 100644
--- a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java
+++ b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java
@@ -4,8 +4,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import me.chayapak1.chomens_bot.Bot;
-import me.chayapak1.chomens_bot.util.ComponentUtilities;
-import me.chayapak1.chomens_bot.util.LevenshteinUtilities;
 import me.chayapak1.chomens_bot.util.StringUtilities;
 
 import java.io.BufferedReader;
@@ -226,32 +224,11 @@ public class NBSConverter implements Converter {
                 if (file.endsWith(".ogg")) file = file.substring(0, file.length() - ".ogg".length());
 
                 if (!sounds.contains(name) && !sounds.contains(file) && !isTempoChanger) {
-                    boolean replaced = false;
-
                     final String replacedName = StringUtilities.replaceAllWithMap(name.toLowerCase(), CUSTOM_INSTRUMENT_REPLACEMENTS);
                     final String replacedFile = StringUtilities.replaceAllWithMap(file.toLowerCase(), CUSTOM_INSTRUMENT_REPLACEMENTS);
 
-                    if (!file.equals(replacedFile)) {
-                        file = replacedFile;
-                        replaced = true;
-                    } else if (!name.equals(replacedName)) {
-                        name = replacedName;
-                        replaced = true;
-                    }
-
-                    if (!replaced) {
-                        final List<String> outputTitles = LevenshteinUtilities.searchTitles(name, subtitles.values());
-
-                        final String bestMatch = outputTitles.isEmpty() ? "" : outputTitles.getFirst();
-
-                        for (final Map.Entry<String, String> entry : subtitles.entrySet()) {
-                            if (!entry.getValue().equals(bestMatch)) continue;
-
-                            name = entry.getKey().substring("subtitles.".length());
-
-                            break;
-                        }
-                    }
+                    if (!file.equals(replacedFile)) file = replacedFile;
+                    else if (!name.equals(replacedName)) name = replacedName;
                 }
 
                 if (!sounds.contains(name) && sounds.contains(file)) name = file;
@@ -301,16 +278,6 @@ public class NBSConverter implements Converter {
         return (long) (1000L * tick * 100 / tempo);
     }
 
-    private static final Map<String, String> subtitles = new HashMap<>();
-
-    static {
-        for (final Map.Entry<String, String> entry : ComponentUtilities.LANGUAGE.entrySet()) {
-            if (!entry.getKey().startsWith("subtitles.")) continue;
-
-            subtitles.put(entry.getKey(), entry.getValue());
-        }
-    }
-
     private static final List<String> sounds = loadJsonStringArray("sounds.json");
 
     private static List<String> loadJsonStringArray (final String name) {
diff --git a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java
index 150e1157..c8baaf37 100644
--- a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java
+++ b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java
@@ -98,7 +98,7 @@ public class SongLoaderThread extends Thread {
         final String name;
         try {
             if (isUrl) {
-                bytes = DownloadUtilities.DownloadToByteArray(songUrl, 5 * 1024 * 1024);
+                bytes = DownloadUtilities.DownloadToByteArray(songUrl, 10 * 1024 * 1024);
                 final Path fileName = Paths.get(songUrl.toURI().getPath()).getFileName();
 
                 name = fileName == null ? "(root)" : fileName.toString();