1.1.2

Author: Nekiplay

.github/workflows/dev_build.yml

@@ -2,7 +2,7 @@ name: Development Build
 on: push
 
 env:
-  APP_VERSION: "1.1.1"
+  APP_VERSION: "1.1.2"
   MC: "1.21.8"
 
 jobs:

gradle.properties

@@ -6,7 +6,7 @@ yarn_mappings=1.21.8+build.1
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.21.8_1.1.0
+mod_version=1.21.8_1.1.2
 maven_group=com.nekiplay.hypixelcry
 archives_base_name=hypixel-cry
 

src/main/java/com/nekiplay/hypixelcry/HypixelCry.java

@@ -29,6 +29,7 @@
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.util.ArrayList;
 
 public class HypixelCry implements ClientModInitializer {
     public static final String MOD_ID = "hypixelcry";
@@ -122,16 +123,24 @@ public void onInitializeClient() {
         loadStartupScripts(scriptsDir);
     }
 
+    private ArrayList<String> startUpScriptNames = new ArrayList<String>() {{
+        add("autoload.lua");
+        add("startup.lua");
+        add("init.lua");
+    }};
+
     private void loadStartupScripts(File dir) {
         // Автозагрузка скриптов при старте
-        File autoLoadScript = new File(dir, "autoload.lua");
-        if (autoLoadScript.exists()) {
-            try {
-                LUA_MANAGER.executeScript(autoLoadScript);
-                System.out.println("Autoload script executed successfully");
-            } catch (Exception e) {
-                System.out.println("Error executing autoload script: " + e.getMessage());
-                e.printStackTrace();
+        for (String name : startUpScriptNames) {
+            File autoLoadScript = new File(dir, name);
+            if (autoLoadScript.exists()) {
+                try {
+                    LUA_MANAGER.executeScript(autoLoadScript);
+                    System.out.println("Autoload script executed successfully");
+                } catch (Exception e) {
+                    System.out.println("Error executing autoload script: " + e.getMessage());
+                    e.printStackTrace();
+                }
             }
         }
     }

src/main/java/com/nekiplay/hypixelcry/config/NEUConfig.java

@@ -18,7 +18,7 @@
 public class NEUConfig extends Config {
     @Override
     public StructuredText getTitle() {
-        return StructuredText.of("§6Hypixel Cry §7v" + "1.1.1");
+        return StructuredText.of("§6Hypixel Cry §7v" + "1.1.2");
     }
 
     @Override

src/main/kotlin/com/nekiplay/hypixelcry/features/lua/LuaManager.kt

@@ -52,7 +52,8 @@ class LuaManager() {
         "libs/",
         "lib/",
         configDir.resolve("hypixelcry/scripts/libs/").toString() + "/",
-        configDir.resolve("hypixelcry/scripts/lib/").toString() + "/"
+        configDir.resolve("hypixelcry/scripts/lib/").toString() + "/",
+        configDir.resolve("hypixelcry/scripts/").toString() + "/"
     )
 
     private val moduleSearchPaths = CopyOnWriteArrayList<String>().apply {
@@ -206,17 +207,6 @@ class LuaManager() {
                     return file
                 }
             }
-
-            // Check module/init.* structure
-            val moduleDir = File("$path$baseName/")
-            if (moduleDir.exists() && moduleDir.isDirectory) {
-                for (ext in luaExtensions) {
-                    val initFile = File(moduleDir, "init$ext")
-                    if (initFile.exists() && initFile.isFile) {
-                        return initFile
-                    }
-                }
-            }
         }
         return null
     }
@@ -225,17 +215,15 @@ class LuaManager() {
     fun addClientTickCallback(callback: LuaValue): Boolean {
         if (!callback.isfunction()) return false
         synchronized(callbacksLock) {
-            clientTickCallbacks.add(callback)
+            return clientTickCallbacks.add(callback)
         }
-        return true
     }
 
     fun addWorldRendererCallback(callback: LuaValue): Boolean {
         if (!callback.isfunction()) return false
         synchronized(callbacksLock) {
-            renderWorldCallbacks.add(callback)
+            return renderWorldCallbacks.add(callback)
         }
-        return false
     }
 
     fun addKeyEventCallback(callback: LuaValue): Boolean {
@@ -252,18 +240,24 @@ class LuaManager() {
         }
     }
     fun removeWorldRendererCallback(callback: LuaValue): Boolean {
-        return renderWorldCallbacks.remove(callback)
+        synchronized(callbacksLock) {
+            return renderWorldCallbacks.remove(callback)
+        }
     }
 
     fun removeKeyEventCallback(callback: LuaValue): Boolean {
-        return keyEventCallbacks.remove(callback)
+        synchronized(callbacksLock) {
+            return keyEventCallbacks.remove(callback)
+        }
     }
 
     // Methods to clear all callbacks
     fun clearAllCallbacks() {
-        clientTickCallbacks.clear()
-        renderWorldCallbacks.clear()
-        keyEventCallbacks.clear()
+        synchronized(callbacksLock) {
+            clientTickCallbacks.clear()
+            renderWorldCallbacks.clear()
+            keyEventCallbacks.clear()
+        }
     }
 
     // Callback methods
@@ -311,20 +305,6 @@ class LuaManager() {
         }
     }
 
-    fun addModuleSearchPath(path: String) {
-        val normalizedPath = if (path.endsWith("/")) path else "$path/"
-        moduleSearchPaths.add(normalizedPath)
-    }
-
-    fun removeModuleSearchPath(path: String) {
-        val normalizedPath = if (path.endsWith("/")) path else "$path/"
-        moduleSearchPaths.remove(normalizedPath)
-    }
-
-    fun getModuleSearchPaths(): List<String> {
-        return moduleSearchPaths.toList()
-    }
-
     fun executeScript(file: File): Any {
         if (!file.exists() || !file.isFile) {
             throw FileNotFoundException("Script file not found: ${file.path}")
@@ -416,7 +396,7 @@ class LuaManager() {
         return scriptCallbacks.keys.toList()
     }
 
-    public fun restoreGlobals() {
+    fun restoreGlobals() {
         persistentGlobals.forEach { (name, value) ->
             globals.set(name, value)
         }