Change the name of Kitten Thoughts to Catculator

build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/mod_resources_gen/data/ModIcon.java

@@ -10,7 +10,7 @@ public enum ModIcon {
     KIT_TUNES(),
     KIT_TUNES_API(),
     KITTEN_HEART(),
-    KITTEN_THOUGHTS(),
+    CATCULATOR(),
     KITTEN_SQUARE(),
     KITTEN_SOUNDS();
 

build.gradle.kts

@@ -14,7 +14,7 @@ mod {
 dependencies {
     include(project(":projects:kit-tunes-api"))
     include(project(":projects:kitten-heart"))
-    include(project(":projects:kitten-thoughts"))
+    include(project(":projects:catculator"))
 
     include(project(":projects:kitten-sounds:r1.17.0"))
     include(project(":projects:kitten-sounds:r1.20.3"))

projects/kitten-thoughts/Cargo.toml → projects/catculator/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "kitten_thoughts"
+name = "catculator"
 version = "0.1.0"
 edition = "2021"
 

projects/kitten-thoughts/gradle.properties → projects/catculator/gradle.properties

@@ -1,4 +1,4 @@
 # Mod properties
-mod_id = kitten_thoughts
+mod_id = catculator
 
 description = A Rust library to add some features, such as a HTTP server for scrobbler setup and music file parsing

projects/catculator/src/main/java/net/pixaurora/catculator/impl/Catculator.java

@@ -0,0 +1,9 @@
+package net.pixaurora.catculator.impl;
+
+import net.pixaurora.catculator.impl.util.NativeUtil;
+
+public class Catculator {
+    public static void init() {
+        NativeUtil.load();
+    }
+}

projects/kitten-thoughts/src/main/java/net/pixaurora/kitten_thoughts/impl/Constants.java → projects/catculator/src/main/java/net/pixaurora/catculator/impl/Constants.java

@@ -1,14 +1,14 @@
-package net.pixaurora.kitten_thoughts.impl;
+package net.pixaurora.catculator.impl;
 
 import org.quiltmc.loader.api.QuiltLoader;
 
 import java.nio.file.Path;
 
 public class Constants {
-    public static final String MOD_ID = "kitten_thoughts";
+    public static final String MOD_ID = "catculator";
 
     public static final String NATIVES_VERSION = "0.1.0";
-    public static final String NATIVES_DIRECTORY_PROPERTY = "kitten_thoughts.natives_path";
+    public static final String NATIVES_DIRECTORY_PROPERTY = "catculator.natives_path";
 
     public static final Path NATIVES_CACHE_DIR = QuiltLoader.getCacheDir().resolve(MOD_ID);
 }

projects/kitten-thoughts/src/main/java/net/pixaurora/kitten_thoughts/impl/error/LibraryLoadError.java → projects/catculator/src/main/java/net/pixaurora/catculator/impl/error/LibraryLoadError.java

@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_thoughts.impl.error;
+package net.pixaurora.catculator.impl.error;
 
 public class LibraryLoadError extends Error {
     public LibraryLoadError(String message) {

projects/kitten-thoughts/src/main/java/net/pixaurora/kitten_thoughts/impl/http/server/Server.java → projects/catculator/src/main/java/net/pixaurora/catculator/impl/http/server/Server.java

@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_thoughts.impl.http.server;
+package net.pixaurora.catculator.impl.http.server;
 
 import java.io.Closeable;
 import java.io.IOException;

projects/kitten-thoughts/src/main/java/net/pixaurora/kitten_thoughts/impl/http/server/ServerImpl.java → projects/catculator/src/main/java/net/pixaurora/catculator/impl/http/server/ServerImpl.java

@@ -1,4 +1,4 @@
-package net.pixaurora.kitten_thoughts.impl.http.server;
+package net.pixaurora.catculator.impl.http.server;
 
 public class ServerImpl implements Server {
     private final long pointer;

projects/catculator/src/main/java/net/pixaurora/catculator/impl/util/CryptoUtil.java

@@ -0,0 +1,39 @@
+package net.pixaurora.catculator.impl.util;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class CryptoUtil {
+    public static String sha512(Path path) throws IOException {
+        return sha512(Files.readAllBytes(path));
+    }
+
+    public static String sha512(byte[] data) {
+        MessageDigest digest;
+
+        try {
+            digest = MessageDigest.getInstance("SHA-512");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("No SHA512 algorithm found.", e);
+        }
+
+        digest.update(data);
+        return toHex(digest.digest());
+    }
+
+    public static String toHex(byte[] data) {
+        StringBuilder builder = new StringBuilder(data.length * 2);
+
+        for (byte value : data) {
+            int number = Byte.toUnsignedInt(value);
+
+            builder.append(Integer.toHexString(number >> 0b100)); // Former four bits
+            builder.append(Integer.toHexString(number & 0b1111)); // Latter four bits
+        }
+
+        return builder.toString();
+    }
+}

projects/catculator/src/main/java/net/pixaurora/catculator/impl/util/HttpUtil.java

@@ -0,0 +1,65 @@
+package net.pixaurora.catculator.impl.util;
+
+import org.quiltmc.loader.api.ModMetadata;
+import org.quiltmc.loader.api.QuiltLoader;
+
+import net.pixaurora.catculator.impl.Constants;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+public class HttpUtil {
+    private static final Duration TIMEOUT = Duration.of(2, ChronoUnit.MINUTES);
+
+    public static void download(URL url, Path into) throws IOException {
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+        connection.setReadTimeout((int) TIMEOUT.toMillis());
+        connection.setRequestProperty("User-Agent", buildUserAgent());
+
+        connection.connect();
+        int status = connection.getResponseCode();
+
+        if (status != 200) {
+            throw new IOException("Library download error: " + status);
+        }
+
+        int size;
+        String length = connection.getHeaderField("Content-Length");
+
+        try {
+            size = Integer.parseInt(length);
+        } catch (NumberFormatException e) {
+            throw new IOException("Received invalid Content-Length header!");
+        }
+
+        try (InputStream stream = connection.getInputStream()) {
+            int input;
+            int index = 0;
+
+            byte[] data = new byte[size];
+
+            while ((input = stream.read()) != -1) {
+                data[index] = (byte) input;
+                index++;
+            }
+
+            Files.write(into, data);
+        }
+    }
+
+    private static String buildUserAgent() {
+        ModMetadata metadata = QuiltLoader.getModContainer(Constants.MOD_ID).get().metadata();
+
+        String version = metadata.version().raw();
+        String homepage = metadata.getContactInfo("homepage");
+
+        return String.format("Kit Tunes/%s (+%s)", version, homepage);
+    }
+}

projects/kitten-thoughts/src/main/java/net/pixaurora/kitten_thoughts/impl/util/NativeUtil.java → projects/catculator/src/main/java/net/pixaurora/catculator/impl/util/NativeUtil.java

@@ -1,7 +1,4 @@
-package net.pixaurora.kitten_thoughts.impl.util;
-
-import net.pixaurora.kitten_thoughts.impl.Constants;
-import net.pixaurora.kitten_thoughts.impl.error.LibraryLoadError;
+package net.pixaurora.catculator.impl.util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,11 +8,15 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 
+import net.pixaurora.catculator.impl.Constants;
+import net.pixaurora.catculator.impl.error.LibraryLoadError;
+
 public class NativeUtil {
     private static boolean isLoaded = false;
 
     private static final String METADATA = "/kitten_thoughts.natives.properties";
-    private static final String BASE_URL = "https://files.lostluma.net/kitten-thoughts-jni/" + Constants.NATIVES_VERSION + "/";
+    private static final String BASE_URL = "https://files.lostluma.net/kitten-thoughts-jni/" + Constants.NATIVES_VERSION
+            + "/";
 
     public static void load() throws LibraryLoadError {
         if (isLoaded) {
@@ -55,11 +56,11 @@ private static String getDevLibraryName() {
         String name = System.getProperty("os.name").toLowerCase();
 
         if (name.contains("win")) {
-            return "kitten_thoughts.dll";
+            return "catculator.dll";
         } else if (name.contains("mac")) {
-            return "libkitten_thoughts.dylib";
+            return "libcatculator.dylib";
         } else {
-            return "libkitten_thoughts.so";
+            return "libcatculator.so";
         }
     }
 

projects/kitten-thoughts/src/main/rust/bridge/http/server.rs → projects/catculator/src/main/rust/bridge/http/server.rs

@@ -37,17 +37,15 @@ fn drop<'local>(object: &JObject<'local>, env: &mut JNIEnv<'local>) -> Result<()
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_kitten_1thoughts_impl_http_server_ServerImpl_create<
-    'local,
->(
+pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl_create<'local>(
     mut _env: JNIEnv<'local>,
     _class: JClass<'local>,
 ) -> jlong {
     create()
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_kitten_1thoughts_impl_http_server_ServerImpl_runServer0<
+pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl_runServer0<
     'local,
 >(
     mut env: JNIEnv<'local>,
@@ -63,9 +61,7 @@ pub extern "system" fn Java_net_pixaurora_kitten_1thoughts_impl_http_server_Serv
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_kitten_1thoughts_impl_http_server_ServerImpl_drop<
-    'local,
->(
+pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl_drop<'local>(
     mut env: JNIEnv<'local>,
     object: JObject<'local>,
 ) -> () {

projects/kitten-heart/build.gradle.kts

@@ -16,13 +16,13 @@ mod {
         required("kit_tunes_api")
         required("kitten_square")
         required("kitten_sounds")
-        required("kitten_thoughts")
+        required("catculator")
     }
 }
 
 dependencies {
     implementation(project(":projects:kit-tunes-api"))
-    implementation(project(":projects:kitten-thoughts"))
+    implementation(project(":projects:catculator"))
 
     implementation(libs.annotations)
     implementation(libs.quilt.loader)

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/KitTunes.java

@@ -18,7 +18,7 @@
 import net.pixaurora.kitten_heart.impl.resource.ResourcePathImpl;
 import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat;
 import net.pixaurora.kitten_heart.impl.service.ServiceLoading;
-import net.pixaurora.kitten_thoughts.impl.KittenThoughts;
+import net.pixaurora.catculator.impl.Catculator;
 
 public class KitTunes {
     public static final Logger LOGGER = LoggerFactory.getLogger(Constants.MOD_ID);
@@ -43,7 +43,7 @@ public static void init() {
         MusicMetadata.init(MusicMetadataLoader.albumFiles(), MusicMetadataLoader.artistFiles(),
                 MusicMetadataLoader.trackFiles());
 
-        KittenThoughts.init();
+        Catculator.init();
     }
 
     public static void tick() {

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/network/Encryption.java

@@ -1,11 +1,11 @@
 package net.pixaurora.kitten_heart.impl.network;
 
-import net.pixaurora.kitten_thoughts.impl.util.CryptoUtil;
-
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import net.pixaurora.catculator.impl.util.CryptoUtil;
+
 public class Encryption {
     public static String signMd5(String input) {
         return CryptoUtil.toHex(getMd5Digest(input));

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerSetup.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import net.pixaurora.kitten_thoughts.impl.http.server.Server;
+import net.pixaurora.catculator.impl.http.server.Server;
 
 public class ScrobblerSetup<T extends Scrobbler> implements Closeable {
     private final Server server;

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerType.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
+import net.pixaurora.catculator.impl.http.server.Server;
 import net.pixaurora.kitten_heart.impl.config.dispatch.DispatchType;
 import net.pixaurora.kitten_heart.impl.error.KitTunesException;
-import net.pixaurora.kitten_thoughts.impl.http.server.Server;
 
 public class ScrobblerType<T extends Scrobbler> implements DispatchType<Scrobbler> {
     private final String name;