new API methods, scripting language upgrade

Author: Zergatul

.github/workflows/build.yaml

@@ -6,6 +6,7 @@ on:
       - '1.21'
       - '1.21.[1-9]'
       - '1.21.1[0-9]'
+      - '1.21.11-dev'
 
 jobs:
   build:

common/gradle.properties

@@ -1 +1 @@
-mod_version=3.15.1
+mod_version=3.15.2

common/java/com/zergatul/cheatutils/scripting/modules/GameApi.java

@@ -351,6 +351,23 @@ public int findClosestEntityByClass(String className) {
             return target == null ? Integer.MIN_VALUE : target.getId();
         }
 
+        @MethodDescription("""
+                Returns integer entity id by its UUID
+                """)
+        public int findByUuid(UUIDWrapper uuid) {
+            if (mc.level == null || mc.player == null) {
+                return Integer.MIN_VALUE;
+            }
+
+            for (Entity entity : mc.level.entitiesForRendering()) {
+                if (entity.getUUID().equals(uuid.getRaw())) {
+                    return entity.getId();
+                }
+            }
+
+            return Integer.MIN_VALUE;
+        }
+
         public Position3d getPosition(int entityId) {
             return getValue(
                     entityId,

common/java/com/zergatul/cheatutils/scripting/types/StyleWrapper.java

@@ -10,6 +10,9 @@
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextColor;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.UUID;
 
 @CustomType(name = "TextStyle")
 public class StyleWrapper {
@@ -94,12 +97,37 @@ public ComponentWrapper getHoverText() {
         if (event == null) {
             return ComponentWrapper.EMPTY;
         }
-        if (event.action() == HoverEvent.Action.SHOW_TEXT) {
-            HoverEvent.ShowText showText = (HoverEvent.ShowText) event;
-            return new ComponentWrapper(showText.value());
-        } else {
-            return ComponentWrapper.EMPTY;
+
+        return switch (event.action()) {
+            case SHOW_TEXT -> new ComponentWrapper(((HoverEvent.ShowText) event).value());
+            default -> ComponentWrapper.EMPTY;
+        };
+    }
+
+    @Getter(name = "hoverItem")
+    public ItemStackWrapper getHoverItem() {
+        HoverEvent event = inner.getHoverEvent();
+        if (event == null) {
+            return new ItemStackWrapper(ItemStack.EMPTY);
+        }
+
+        return switch (event.action()) {
+            case SHOW_ITEM -> new ItemStackWrapper(((HoverEvent.ShowItem) event).item());
+            default -> new ItemStackWrapper(ItemStack.EMPTY);
+        };
+    }
+
+    @Getter(name = "hoverEntity")
+    public UUIDWrapper getHoverEntity() {
+        HoverEvent event = inner.getHoverEvent();
+        if (event == null) {
+            return null;
         }
+
+        return switch (event.action()) {
+            case SHOW_ENTITY -> new UUIDWrapper(((HoverEvent.ShowEntity) event).entity().uuid);
+            default -> null;
+        };
     }
 
     @Getter(name = "clickCommand")
@@ -110,8 +138,11 @@ public String getClickCommand() {
         }
 
         return switch (event.action()) {
+            case OPEN_URL -> ((ClickEvent.OpenUrl) event).uri().toString();
+            case OPEN_FILE -> ((ClickEvent.OpenFile) event).path();
             case RUN_COMMAND -> ((ClickEvent.RunCommand) event).command();
             case SUGGEST_COMMAND -> ((ClickEvent.SuggestCommand) event).command();
+            case COPY_TO_CLIPBOARD -> ((ClickEvent.CopyToClipboard) event).value();
             default -> "";
         };
     }

common/java/com/zergatul/cheatutils/scripting/types/UUIDWrapper.java

@@ -1,5 +1,6 @@
 package com.zergatul.cheatutils.scripting.types;
 
+import com.zergatul.cheatutils.scripting.HiddenMethod;
 import com.zergatul.scripting.type.CustomType;
 
 import java.util.UUID;
@@ -13,6 +14,11 @@ public UUIDWrapper(UUID id) {
         this.id = id;
     }
 
+    @HiddenMethod
+    public UUID getRaw() {
+        return id;
+    }
+
     @Override
     public String toString() {
         return id.toString();

common/java/com/zergatul/cheatutils/webui/ApiGenHandler.java

@@ -145,7 +145,7 @@ private void buildType(List<String> lines, SType type) {
                         baseClass != null && baseClass != Object.class ? " : " + formatType(SType.fromJavaType(type.getJavaClass().getSuperclass())) : ""));
 
         for (PropertyReference property : type.getStaticProperties()) {
-            lines.add(String.format("\tstatic %s %s { %s%s }", property.getType(), property.getName(), property.canGet() ? "get;" : "", property.canSet() ? "set;" : ""));
+            lines.add(String.format("\tstatic %s %s { %s%s }", property.getType(), property.getName(), property.canLoad() ? "get;" : "", property.canStore() ? "set;" : ""));
         }
         for (MethodReference method : type.getStaticMethods()) {
             formatMethod(lines, "static ", method);
@@ -154,7 +154,7 @@ private void buildType(List<String> lines, SType type) {
             lines.add(String.format("\tconstructor(%s);", formatParameters(constructor.getParameters())));
         }
         for (PropertyReference property : type.getInstanceProperties()) {
-            lines.add(String.format("\t%s %s { %s%s }", formatType(property.getType()), property.getName(), property.canGet() ? "get;" : "", property.canSet() ? "set;" : ""));
+            lines.add(String.format("\t%s %s { %s%s }", formatType(property.getType()), property.getName(), property.canLoad() ? "get;" : "", property.canStore() ? "set;" : ""));
         }
         for (MethodReference method : type.getDeclaredInstanceMethods()) {
             formatMethod(lines, "", method);