Improve Lua api

Nekiplay · Nekiplay · commit 43bc24a485e5 · 2025-09-12T06:55:59.000+05:00
diff --git a/src/main/java/com/nekiplay/hypixelcry/mixins/gui/AbstractSignEditScreenAccessor.java b/src/main/java/com/nekiplay/hypixelcry/mixins/gui/AbstractSignEditScreenAccessor.java
@@ -0,0 +1,12 @@
+package com.nekiplay.hypixelcry.mixins.gui;
+
+
+import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(AbstractSignEditScreen.class)
+public interface AbstractSignEditScreenAccessor {
+    @Accessor("messages")
+    String[] getMessages();
+}
diff --git a/src/main/java/com/nekiplay/hypixelcry/utils/ItemUtils.java b/src/main/java/com/nekiplay/hypixelcry/utils/ItemUtils.java
@@ -1,17 +1,21 @@
 package com.nekiplay.hypixelcry.utils;
 
+import com.mojang.authlib.properties.Property;
 import net.minecraft.component.ComponentHolder;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.AttributeModifierSlot;
+import net.minecraft.component.type.LoreComponent;
 import net.minecraft.component.type.NbtComponent;
+import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 public class ItemUtils {
     public static final String ID = "id";
@@ -22,10 +26,59 @@ public class ItemUtils {
      * @param stack the item stack to get the internal name from
      * @return the Skyblock item id of the item stack, or an empty string if the item stack does not have a Skyblock id
      */
+    public static @NotNull String getItemUuid(@NotNull ComponentHolder stack) {
+        return getCustomData(stack).getString("uuid", "");
+    }
+
     public static @NotNull String getItemId(@NotNull ComponentHolder stack) {
         return getCustomData(stack).getString(ID, "");
     }
 
+    public static @NotNull Boolean isRecombobulated(@NotNull ComponentHolder stack) {
+        return getCustomData(stack).getInt("rarity_upgrades", 0) > 0;
+    }
+
+    public static @NotNull Boolean isMuseumDonated(@NotNull ComponentHolder stack) {
+        return getCustomData(stack).getBoolean("donated_museum", false);
+    }
+
+    public static @NotNull String getReforgeModifier(@NotNull ComponentHolder stack) {
+        return getCustomData(stack).getString("modifier", "");
+    }
+
+    public static @NotNull String getHeadTexture(@NotNull ItemStack stack) {
+        if (!stack.isOf(Items.PLAYER_HEAD) || !stack.contains(DataComponentTypes.PROFILE)) return "";
+
+        ProfileComponent profile = stack.get(DataComponentTypes.PROFILE);
+        if (profile == null) return "";
+
+        return profile.properties().get("textures").stream().filter(Objects::nonNull)
+                .map(Property::value)
+                .findFirst()
+                .orElse("");
+    }
+
+    public static @NotNull List<Text> getLore(ItemStack stack) {
+        return stack.getOrDefault(DataComponentTypes.LORE, LoreComponent.DEFAULT).styledLines();
+    }
+
+    public static @NotNull Map<String, Integer> getHypixelEnchantments(ItemStack itemStack) {
+        Map<String, Integer> result = new HashMap<>();
+        NbtCompound extraAttributes = getCustomData(itemStack);
+
+        Optional<NbtCompound> enchantmentsOpt = extraAttributes.getCompound("enchantments");
+        if (enchantmentsOpt.isEmpty()) {
+            return result;
+        }
+
+        NbtCompound enchantments = enchantmentsOpt.get();
+
+        for (String key : enchantments.getKeys()) {
+            result.put(key, enchantments.getInt(key, 0));
+        }
+
+        return result;
+    }
 
     /**
      * Gets the nbt in the custom data component of the item stack.
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/lua/LuaManager.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/lua/LuaManager.kt
@@ -11,6 +11,8 @@ import com.nekiplay.hypixelcry.utils.misc.input.KeyAction
 import kotlinx.io.files.FileNotFoundException
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext
 import net.fabricmc.loader.api.FabricLoader
+import net.minecraft.network.message.SignedMessage
+import net.minecraft.text.Text
 import org.luaj.vm2.Globals
 import org.luaj.vm2.LuaValue
 import org.luaj.vm2.lib.jse.JsePlatform
@@ -33,6 +35,7 @@ class LuaManager() {
     private val clientTickCallbacks = ArrayList<LuaValue>()
     private val renderWorldCallbacks = ArrayList<LuaValue>()
     private val keyEventCallbacks = ArrayList<LuaValue>()
+    private val messageEventCallbacks = ArrayList<LuaValue>()
 
     // Synchronize only when needed
     @Volatile private var callbacksLock = Any()
@@ -107,6 +110,12 @@ class LuaManager() {
             }
         })
 
+        globals.set("registerMessageEvent", object : OneArgFunction() {
+            override fun call(callback: LuaValue): LuaValue {
+                return LuaValue.valueOf(addMessageCallback(callback))
+            }
+        })
+
         globals.set("unregisterClientTick", object : OneArgFunction() {
             override fun call(callback: LuaValue): LuaValue {
                 return LuaValue.valueOf(removeClientTickCallback(callback))
@@ -123,6 +132,12 @@ class LuaManager() {
             }
         })
 
+        globals.set("unregisterMessageEvent", object : OneArgFunction() {
+            override fun call(callback: LuaValue): LuaValue {
+                return LuaValue.valueOf(removeMessageEventCallback(callback))
+            }
+        })
+
         globals.set("require", object : OneArgFunction() {
             override fun call(modname: LuaValue): LuaValue {
                 val moduleName = modname.checkjstring()
@@ -233,6 +248,13 @@ class LuaManager() {
         }
     }
 
+    fun addMessageCallback(callback: LuaValue): Boolean {
+        if (!callback.isfunction()) return false
+        synchronized(callbacksLock) {
+            return messageEventCallbacks.add(callback)
+        }
+    }
+
     // Methods for removing callbacks
     fun removeClientTickCallback(callback: LuaValue): Boolean {
         synchronized(callbacksLock) {
@@ -251,12 +273,19 @@ class LuaManager() {
         }
     }
 
+    fun removeMessageEventCallback(callback: LuaValue): Boolean {
+        synchronized(callbacksLock) {
+            return messageEventCallbacks.remove(callback)
+        }
+    }
+
     // Methods to clear all callbacks
     fun clearAllCallbacks() {
         synchronized(callbacksLock) {
             clientTickCallbacks.clear()
             renderWorldCallbacks.clear()
             keyEventCallbacks.clear()
+            messageEventCallbacks.clear()
         }
     }
 
@@ -305,6 +334,20 @@ class LuaManager() {
         }
     }
 
+    fun onChatMessageEvent(text: Text, message: SignedMessage?) {
+        val callbacks = synchronized(callbacksLock) {
+            messageEventCallbacks.toTypedArray()
+        }
+
+        for (callback in callbacks) {
+            try {
+                callback.call(LuaValue.valueOf(text.string), LuaValue.valueOf(message?.content?.string))
+            } catch (e: Exception) {
+                HypixelCry.LOGGER.error("Error in message callback: ${e.message}")
+            }
+        }
+    }
+
     fun executeScript(file: File): Any {
         if (!file.exists() || !file.isFile) {
             throw FileNotFoundException("Script file not found: ${file.path}")
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/lua/objects/player/InventoryObject.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/lua/objects/player/InventoryObject.kt
@@ -1,11 +1,15 @@
 package com.nekiplay.hypixelcry.features.lua.objects.player
 
+import com.nekiplay.hypixelcry.HypixelCry
 import com.nekiplay.hypixelcry.features.lua.utils.ItemStackUtils
+import com.nekiplay.hypixelcry.mixins.gui.AbstractSignEditScreenAccessor
 import com.nekiplay.hypixelcry.pathfinder.utils.mc
 import com.nekiplay.hypixelcry.utils.InventoryUtils
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen
+import net.minecraft.client.gui.screen.ingame.SignEditScreen
 import org.luaj.vm2.LuaValue
 import org.luaj.vm2.lib.OneArgFunction
+import org.luaj.vm2.lib.TwoArgFunction
 import org.luaj.vm2.lib.ZeroArgFunction
 
 class InventoryObject: LuaValue() {
@@ -15,18 +19,72 @@ class InventoryObject: LuaValue() {
 
     override fun get(key: LuaValue): LuaValue {
         return when (key.tojstring()) {
+            "isSignOpened" -> IsSignOpenedFunction()
             "isChestOpened" -> IsChestOpenedFunction()
             "isDoubleChestOpened" -> IsDoubleChestOpenedFunction()
             "getChestTitle" -> GetChestTitleFunction()
 
             "getStack" -> GetStackFunction()
+            "getSignText" -> GetSignTextFunction()
+            "setSignText" -> SetSignTextFunction()
 
             "leftClick" -> LeftClickFunction()
             "rightClick" -> RightClickFunction()
+
+            "closeScreen" -> CloseScreenFunction()
             else -> NIL
         } as LuaValue
     }
 
+    private inner class SetSignTextFunction : TwoArgFunction() {
+        override fun call(arg: LuaValue, arg2: LuaValue): LuaValue {
+            if (arg.isnumber() && arg2.isstring()) {
+                val screen = mc.currentScreen
+                if (screen is SignEditScreen) {
+                    val sign = screen as AbstractSignEditScreenAccessor
+                    sign.messages[arg.toint()] = arg2.tojstring()
+                    return TRUE
+                } else {
+                    return FALSE
+                }
+            }
+            return NIL
+        }
+    }
+
+    private inner class GetSignTextFunction : OneArgFunction() {
+        override fun call(arg: LuaValue): LuaValue {
+            if (arg.isnumber()) {
+                val screen = mc.currentScreen
+                if (screen is SignEditScreen) {
+                    val sign = screen as AbstractSignEditScreenAccessor
+                    return valueOf(sign.messages[arg.toint()])
+                } else {
+                    return FALSE
+                }
+            }
+            return NIL
+        }
+    }
+
+    private inner class CloseScreenFunction : ZeroArgFunction() {
+        override fun call(): LuaValue {
+            mc.player?.closeHandledScreen()
+            return TRUE
+        }
+    }
+
+    private inner class IsSignOpenedFunction : ZeroArgFunction() {
+        override fun call(): LuaValue {
+            val screen = mc.currentScreen
+            return if (screen is SignEditScreen) {
+                TRUE
+            } else {
+                FALSE
+            }
+        }
+    }
+
     private inner class GetChestTitleFunction : ZeroArgFunction() {
         override fun call(): LuaValue {
             val screen = mc.currentScreen
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/lua/utils/ItemStackUtils.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/lua/utils/ItemStackUtils.kt
@@ -18,18 +18,37 @@ object ItemStackUtils {
         table.set("count", LuaValue.valueOf(itemStack.count.toDouble()))
         table.set("max_count", LuaValue.valueOf(itemStack.maxCount.toDouble()))
         table.set("name", LuaValue.valueOf(itemStack.item.name.string))
+        table.set("name", LuaValue.valueOf(itemStack.item.name.string))
+
+        table.set("head_texture", LuaValue.valueOf(ItemUtils.getHeadTexture(itemStack)))
         table.set("skyblock_id", LuaValue.valueOf(ItemUtils.getItemId(itemStack)))
 
+        table.set("reforge_modifier", LuaValue.valueOf(ItemUtils.getReforgeModifier(itemStack)))
+
         // Дополнительные свойства
-        table.set("is_damageable", LuaValue.valueOf(itemStack.isDamageable))
         table.set("is_stackable", LuaValue.valueOf(itemStack.isStackable))
-        table.set("is_enchantable", LuaValue.valueOf(itemStack.isEnchantable))
+        table.set("is_recombobulated", LuaValue.valueOf(ItemUtils.isRecombobulated(itemStack)))
+        table.set("is_museum_donated", LuaValue.valueOf(ItemUtils.isMuseumDonated(itemStack)))
+
+        val loreTable = LuaValue.tableOf();
+        val loreList = ItemUtils.getLore(itemStack)
+        loreList.forEachIndexed { index, line ->
+            loreTable.set(index + 1, line.string)
+        }
+        table.set("lore",loreTable )
+
+        val enchantsTable = LuaValue.tableOf();
+        val enchantmentsList = ItemUtils.getHypixelEnchantments(itemStack)
+        var index = 1
+        enchantmentsList.forEach { (id, level) ->
+            val enchantTable = LuaValue.tableOf();
+            enchantTable.set("name", id)
+            enchantTable.set("level", level)
 
-        // Если предмет имеет повреждения
-        if (itemStack.isDamageable) {
-            table.set("damage", LuaValue.valueOf(itemStack.damage.toDouble()))
-            table.set("max_damage", LuaValue.valueOf(itemStack.maxDamage.toDouble()))
+            enchantsTable.set(index, enchantTable)
+            index++
         }
+        table.set("enchantmets", enchantsTable)
         return table
     }
 }
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/ModuleManager.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/ModuleManager.kt
@@ -18,11 +18,11 @@ object ModuleManager {
     fun registerInbuilt() {
         val modules = arrayOf(
             /* Macros */
-            AspectOfTheTeleport,
-            HealingWands,
-            RogueSword,
-            WitherCloak,
-            ZombieSword,
+            AspectOfTheTeleport(),
+            HealingWands(),
+            RogueSword(),
+            WitherCloak(),
+            ZombieSword(),
 
             /* Misc */
             LuaEvents
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/AspectOfTheTeleport.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/AspectOfTheTeleport.kt
@@ -8,7 +8,7 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 import net.minecraft.client.MinecraftClient
 import net.minecraft.component.ComponentHolder
 
-object AspectOfTheTeleport : BindableClientModule() {
+class AspectOfTheTeleport : BindableClientModule() {
     private val WAND_IDS = setOf(
         "ASPECT_OF_THE_VOID",
         "ASPECT_OF_THE_END"
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/HealingWands.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/HealingWands.kt
@@ -6,7 +6,7 @@ import com.nekiplay.hypixelcry.sugar.silentUse
 import com.nekiplay.hypixelcry.utils.ItemUtils
 import net.minecraft.component.ComponentHolder
 
-object HealingWands : BindableClientModule() {
+class HealingWands : BindableClientModule() {
     private val WAND_IDS = setOf(
         "WAND_OF_ATONEMENT",
         "WAND_OF_RESTORATION",
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/RogueSword.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/RogueSword.kt
@@ -6,7 +6,7 @@ import com.nekiplay.hypixelcry.sugar.silentUse
 import com.nekiplay.hypixelcry.utils.ItemUtils
 import net.minecraft.component.ComponentHolder
 
-object RogueSword : BindableClientModule() {
+class RogueSword : BindableClientModule() {
     private val WAND_IDS = setOf(
         "ROGUE_SWORD"
     )
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/WitherCloak.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/WitherCloak.kt
@@ -6,7 +6,7 @@ import com.nekiplay.hypixelcry.sugar.silentUse
 import com.nekiplay.hypixelcry.utils.ItemUtils
 import net.minecraft.component.ComponentHolder
 
-object WitherCloak : BindableClientModule() {
+class WitherCloak : BindableClientModule() {
     private val WAND_IDS = setOf(
         "WITHER_CLOAK"
     )
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/ZombieSword.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/macros/ZombieSword.kt
@@ -6,7 +6,7 @@ import com.nekiplay.hypixelcry.sugar.silentUse
 import com.nekiplay.hypixelcry.utils.ItemUtils
 import net.minecraft.component.ComponentHolder
 
-object ZombieSword : BindableClientModule() {
+class ZombieSword : BindableClientModule() {
     private val WAND_IDS = setOf(
         "ZOMBIE_SWORD"
     )
diff --git a/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/misc/LuaEvents.kt b/src/main/kotlin/com/nekiplay/hypixelcry/features/modules/impl/misc/LuaEvents.kt
diff --git a/src/main/resources/mixins.hypixelcry.json b/src/main/resources/mixins.hypixelcry.json

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import com.nekiplay.hypixelcry.sugar.silentUse`
`6`	`6`	`import com.nekiplay.hypixelcry.utils.ItemUtils`
`7`	`7`	`import net.minecraft.component.ComponentHolder`
`8`	`8`
`9`		`-object RogueSword : BindableClientModule() {`
	`9`	`+class RogueSword : BindableClientModule() {`
`10`	`10`	`private val WAND_IDS = setOf(`
`11`	`11`	`"ROGUE_SWORD"`
`12`	`12`	`)`