Merge pull request #15 from SkriptDev/dev/patch

Dev/patch - Future patch release

Author: ShaneBeee

build.gradle.kts

@@ -26,7 +26,7 @@ repositories {
 dependencies {
     compileOnly("com.hypixel.hytale:Server:${hytaleVersion}")
     compileOnly("org.jetbrains:annotations:26.0.2")
-    implementation("com.github.SkriptDev:skript-parser:1.0.7") {
+    implementation("com.github.SkriptDev:skript-parser:1.0.8") {
         isTransitive = false
     }
     implementation("com.github.Zoltus:TinyMessage:2.0.1") {

src/main/java/com/github/skriptdev/skript/api/hytale/Direction.java

@@ -1,5 +1,6 @@
 package com.github.skriptdev.skript.api.hytale;
 
+import com.github.skriptdev.skript.api.hytale.utils.LocationUtils;
 import com.hypixel.hytale.math.vector.Location;
 import com.hypixel.hytale.math.vector.Vector3d;
 
@@ -33,11 +34,13 @@ public enum Direction {
     }
 
     public Location apply(Location location, Number offset) {
-        return function.apply(location, offset);
+        Location clone = LocationUtils.clone(location);
+        return function.apply(clone, offset);
     }
 
     public Location apply(Location location) {
-        return function.apply(location, 1);
+        Location clone = LocationUtils.clone(location);
+        return function.apply(clone, 1);
     }
 
     public String getName() {

…v/skript/api/hytale/AssetStoreUtils.java …pt/api/hytale/utils/AssetStoreUtils.javasrc/main/java/com/github/skriptdev/skript/api/hytale/AssetStoreUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/AssetStoreUtils.java src/main/java/com/github/skriptdev/skript/api/hytale/AssetStoreUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/AssetStoreUtils.java

@@ -1,4 +1,4 @@
-package com.github.skriptdev.skript.api.hytale;
+package com.github.skriptdev.skript.api.hytale.utils;
 
 import com.hypixel.hytale.server.core.asset.type.blocktype.config.BlockType;
 import com.hypixel.hytale.server.core.asset.type.item.config.Item;

…ptdev/skript/api/hytale/EntityUtils.java …skript/api/hytale/utils/EntityUtils.javasrc/main/java/com/github/skriptdev/skript/api/hytale/EntityUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/EntityUtils.java src/main/java/com/github/skriptdev/skript/api/hytale/EntityUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/EntityUtils.java

@@ -1,4 +1,4 @@
-package com.github.skriptdev.skript.api.hytale;
+package com.github.skriptdev.skript.api.hytale.utils;
 
 import com.hypixel.hytale.component.AddReason;
 import com.hypixel.hytale.component.Component;

src/main/java/com/github/skriptdev/skript/api/hytale/utils/LocationUtils.java

@@ -0,0 +1,23 @@
+package com.github.skriptdev.skript.api.hytale.utils;
+
+import com.hypixel.hytale.math.vector.Location;
+
+/**
+ * Untilities for {@link Location Locations}
+ */
+public class LocationUtils {
+
+    /**
+     * Clone a location.
+     * This prevents breaking references
+     *
+     * @param location Location to clone
+     * @return New location instance
+     */
+    public static Location clone(Location location) {
+        return new Location(location.getWorld(),
+            location.getPosition().clone(),
+            location.getRotation().clone());
+    }
+
+}

…ptdev/skript/api/hytale/PlayerUtils.java …skript/api/hytale/utils/PlayerUtils.javasrc/main/java/com/github/skriptdev/skript/api/hytale/PlayerUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/PlayerUtils.java src/main/java/com/github/skriptdev/skript/api/hytale/PlayerUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/PlayerUtils.java

@@ -1,4 +1,4 @@
-package com.github.skriptdev.skript.api.hytale;
+package com.github.skriptdev.skript.api.hytale.utils;
 
 import com.hypixel.hytale.server.core.entity.entities.Player;
 import com.hypixel.hytale.server.core.universe.Universe;

…iptdev/skript/api/hytale/StoreUtils.java …/skript/api/hytale/utils/StoreUtils.javasrc/main/java/com/github/skriptdev/skript/api/hytale/StoreUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/StoreUtils.java src/main/java/com/github/skriptdev/skript/api/hytale/StoreUtils.java renamed to src/main/java/com/github/skriptdev/skript/api/hytale/utils/StoreUtils.java

@@ -1,4 +1,4 @@
-package com.github.skriptdev.skript.api.hytale;
+package com.github.skriptdev.skript.api.hytale.utils;
 
 import com.hypixel.hytale.component.CommandBuffer;
 import com.hypixel.hytale.component.Store;

src/main/java/com/github/skriptdev/skript/api/skript/docs/JsonDocPrinter.java

@@ -470,6 +470,15 @@ private void printDocumentation(String type, BsonDocument syntaxDoc, SyntaxInfo<
         for (String s : documentation.getDescription()) {
             descriptionArray.add(new BsonString(s));
         }
+        // TEMP EXPERIMENTAL TODO
+        if (documentation.isExperimental()) {
+            descriptionArray.add(new BsonString(" "));
+            descriptionArray.add(new BsonString("**This feature is experimental and may change in future versions.**"));
+            String experimentalMessage = documentation.getExperimentalMessage();
+            if (experimentalMessage != null) {
+                descriptionArray.add(new BsonString(experimentalMessage));
+            }
+        }
         syntaxDoc.put("description", descriptionArray);
 
         // USAGE

src/main/java/com/github/skriptdev/skript/api/skript/registration/SkriptRegistration.java

@@ -92,7 +92,6 @@ public AssetStoreRegistrar(Class<C> assetClass, DefaultAssetMap<K, C> assetMap,
             this.supplier = () -> assetStoreValues.values().stream().iterator();
             this.literalParser = s -> this.assetStoreValues.get(s.toLowerCase(Locale.ROOT).replace(" ", "_"));
             this.toStringFunction = JsonAsset::getId;
-            this.toVariableNameFunction = c -> baseName + ":" + c.getId().toLowerCase(Locale.ROOT).replace(" ", "_");
         }
 
         /**
@@ -242,7 +241,6 @@ public EnumRegistrar(Class<E> enumClass, String name, String pattern) {
             this.supplier = () -> this.values.values().iterator();
             this.literalParser = s -> this.values.get(s.toLowerCase(Locale.ROOT).replace(" ", "_"));
             this.toStringFunction = e -> e.name().toLowerCase(Locale.ROOT);
-            this.toVariableNameFunction = e -> this.baseName + ":" + e.name().toLowerCase(Locale.ROOT).replace(" ", "_");
         }
 
 

src/main/java/com/github/skriptdev/skript/plugin/elements/conditions/CondPlayerIsCrouching.java

@@ -1,6 +1,6 @@
 package com.github.skriptdev.skript.plugin.elements.conditions;
 
-import com.github.skriptdev.skript.api.hytale.EntityUtils;
+import com.github.skriptdev.skript.api.hytale.utils.EntityUtils;
 import com.github.skriptdev.skript.api.skript.registration.SkriptRegistration;
 import com.hypixel.hytale.server.core.entity.entities.Player;
 import com.hypixel.hytale.server.core.entity.movement.MovementStatesComponent;