Dev/patch - Future Patch Release

build.gradle.kts

@@ -25,7 +25,7 @@ repositories {
 dependencies {
     compileOnly("com.hypixel.hytale:Server:${hytaleVersion}")
     compileOnly("org.jetbrains:annotations:26.0.2")
-    implementation("com.github.SkriptDev:skript-parser:master-SNAPSHOT") {
+    implementation("com.github.SkriptDev:skript-parser:dev~patch-SNAPSHOT") { // TODO (change after release)
         isTransitive = false
     }
     implementation("com.github.Zoltus:TinyMessage:2.0.1") {

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

@@ -1,10 +1,21 @@
 package com.github.skriptdev.skript.api.hytale;
 
+import com.hypixel.hytale.component.Ref;
+import com.hypixel.hytale.component.Store;
+import com.hypixel.hytale.math.util.ChunkUtil;
+import com.hypixel.hytale.math.vector.Location;
 import com.hypixel.hytale.math.vector.Vector3i;
 import com.hypixel.hytale.server.core.asset.type.blocktype.config.BlockType;
+import com.hypixel.hytale.server.core.asset.type.fluid.Fluid;
+import com.hypixel.hytale.server.core.universe.Universe;
 import com.hypixel.hytale.server.core.universe.world.World;
+import com.hypixel.hytale.server.core.universe.world.chunk.ChunkColumn;
+import com.hypixel.hytale.server.core.universe.world.chunk.section.FluidSection;
+import com.hypixel.hytale.server.core.universe.world.storage.ChunkStore;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 /**
  * Represents a block in a world.
  * Hytale doesn't appear to have a representation of a block in a world.
@@ -18,12 +29,28 @@ public class Block {
     private @NotNull BlockType type;
     private final @NotNull Vector3i pos;
 
+    public Block(@NotNull World world, @NotNull Vector3i pos) {
+        this.world = world;
+        this.pos = pos;
+        this.type = Objects.requireNonNull(world.getBlockType(pos));
+    }
+
     public Block(@NotNull World world, @NotNull Vector3i pos, @NotNull BlockType type) {
         this.world = world;
         this.pos = pos;
         this.type = type;
     }
 
+    public Block(@NotNull Location location) {
+        World world = Universe.get().getWorld(location.getWorld());
+        if (world == null) {
+            throw new IllegalArgumentException("World '" + location.getWorld() + "' not found.");
+        }
+        BlockType blockType = world.getBlockType(location.getPosition().toVector3i());
+        assert blockType != null;
+        this(world, location.getPosition().toVector3i(), blockType);
+    }
+
     public @NotNull BlockType getType() {
         return this.type;
     }
@@ -33,6 +60,80 @@ public void setType(@NotNull BlockType type) {
         this.world.setBlock(this.pos.getX(), this.pos.getY(), this.pos.getZ(), type.getId());
     }
 
+    public byte getFluidLevel() {
+        long index = ChunkUtil.indexChunkFromBlock(this.pos.getX(), this.pos.getZ());
+        Ref<ChunkStore> columnRef = this.world.getChunk(index).getReference();
+        Store<ChunkStore> store = columnRef.getStore();
+        ChunkColumn column = store.getComponent(columnRef, ChunkColumn.getComponentType());
+        Ref<ChunkStore> section = column.getSection(ChunkUtil.chunkCoordinate(this.pos.getY()));
+        if (section == null) {
+            return 0;
+        } else {
+            FluidSection fluidSection = store.getComponent(section, FluidSection.getComponentType());
+            return fluidSection.getFluidLevel(this.pos.getX(), this.pos.getY(), this.pos.getZ());
+        }
+    }
+
+    public void setFluidLevel(byte level) {
+        long index = ChunkUtil.indexChunkFromBlock(this.pos.getX(), this.pos.getZ());
+        this.world.getChunkAsync(index).thenApply((chunk) -> {
+            Ref<ChunkStore> columnRef = chunk.getReference();
+            Store<ChunkStore> store = columnRef.getStore();
+            ChunkColumn column = store.getComponent(columnRef, ChunkColumn.getComponentType());
+            if (column == null) return null;
+
+            Ref<ChunkStore> section = column.getSection(ChunkUtil.chunkCoordinate(this.pos.getY()));
+            if (section == null) {
+                return null;
+            } else {
+                FluidSection fluidSection = store.getComponent(section, FluidSection.getComponentType());
+                if (fluidSection == null) {
+                    return null;
+                }
+
+
+                Fluid fluid = fluidSection.getFluid(this.pos.getX(), this.pos.getY(), this.pos.getZ());
+                if (fluid == null) return null;
+                fluidSection.setFluid(this.pos.getX(), this.pos.getY(), this.pos.getZ(), fluid, level);
+            }
+            return chunk;
+        });
+    }
+
+    public Fluid getFluid() {
+        int fluidId = this.world.getFluidId(this.pos.getX(), this.pos.getY(), this.pos.getZ());
+        if (fluidId == -1) {
+            return null;
+        }
+        return Fluid.getAssetMap().getAsset(fluidId);
+    }
+
+    public void setFluid(@NotNull Fluid fluid) {
+        long index = ChunkUtil.indexChunkFromBlock(this.pos.getX(), this.pos.getZ());
+        this.world.getChunkAsync(index).thenApply((chunk) -> {
+            Ref<ChunkStore> columnRef = chunk.getReference();
+            Store<ChunkStore> store = columnRef.getStore();
+            ChunkColumn column = store.getComponent(columnRef, ChunkColumn.getComponentType());
+            if (column == null) return null;
+
+            Ref<ChunkStore> section = column.getSection(ChunkUtil.chunkCoordinate(this.pos.getY()));
+            if (section == null) {
+                return null;
+            } else {
+                FluidSection fluidSection = store.getComponent(section, FluidSection.getComponentType());
+                if (fluidSection == null) {
+                    return null;
+                }
+
+
+                byte level = fluidSection.getFluidLevel(this.pos.getX(), this.pos.getY(), this.pos.getZ());
+                if (level <= 0) level = 8;
+                fluidSection.setFluid(this.pos.getX(), this.pos.getY(), this.pos.getZ(), fluid, level);
+            }
+            return chunk;
+        });
+    }
+
     public void breakBlock() {
         int setting = 0; // TODO not sure what to actually use here
         this.world.breakBlock(this.pos.getX(), this.pos.getY(), this.pos.getZ(), setting);
@@ -46,6 +147,10 @@ public void breakBlock() {
         return this.pos;
     }
 
+    public @NotNull Location getLocation() {
+        return new Location(this.world.getName(), this.pos.getX(), this.pos.getY(), this.pos.getZ());
+    }
+
     public String toTypeString() {
         return String.format("[%s] block at (%s,%s,%s) in '%s'",
             this.type.getId(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), this.world.getName());

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

@@ -1,17 +1,30 @@
 package com.github.skriptdev.skript.api.hytale;
 
+import com.hypixel.hytale.component.AddReason;
+import com.hypixel.hytale.component.Holder;
 import com.hypixel.hytale.component.Ref;
 import com.hypixel.hytale.component.Store;
+import com.hypixel.hytale.math.vector.Location;
+import com.hypixel.hytale.math.vector.Vector3d;
+import com.hypixel.hytale.math.vector.Vector3f;
+import com.hypixel.hytale.server.core.entity.Entity;
+import com.hypixel.hytale.server.core.entity.EntityUtils;
 import com.hypixel.hytale.server.core.entity.LivingEntity;
+import com.hypixel.hytale.server.core.entity.movement.MovementStatesComponent;
+import com.hypixel.hytale.server.core.inventory.ItemStack;
+import com.hypixel.hytale.server.core.modules.entity.item.ItemComponent;
 import com.hypixel.hytale.server.core.modules.entitystats.EntityStatMap;
 import com.hypixel.hytale.server.core.modules.entitystats.EntityStatsModule;
 import com.hypixel.hytale.server.core.universe.world.World;
 import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
+import io.github.syst3ms.skriptparser.util.Pair;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Quick utility class for accessing entity components.
  */
+@SuppressWarnings("UnusedReturnValue")
 public class EntityComponentUtils {
 
     /**
@@ -31,4 +44,43 @@ public class EntityComponentUtils {
         return store.getComponent(reference, EntityStatsModule.get().getEntityStatMapComponentType());
     }
 
+    /**
+     * Get the MovementStatesComponent of an entity.
+     *
+     * @param entity Entity to get component from
+     * @return MovementStatesComponent of the entity, or null if not found
+     */
+    public static @Nullable MovementStatesComponent getMovementStatesComponent(Entity entity) {
+        Ref<EntityStore> reference = entity.getReference();
+        if (reference == null) return null;
+
+        Store<EntityStore> store = reference.getStore();
+        return store.getComponent(reference, MovementStatesComponent.getComponentType());
+    }
+
+    @SuppressWarnings({"DataFlowIssue", "deprecation"})
+    public static @NotNull Pair<Entity, ItemComponent> dropItem(Store<EntityStore> store, ItemStack itemStack, Location location, Vector3f velocity, float pickupDelay) {
+        if (itemStack.isEmpty() || !itemStack.isValid()) {
+            return new Pair<>(null, null);
+        }
+
+        Vector3d position = location.getPosition();
+        Vector3f rotation = location.getRotation();
+
+        Holder<EntityStore> itemEntityHolder = ItemComponent.generateItemDrop(store, itemStack, position, rotation, velocity.getX(), velocity.getY(), velocity.getZ());
+        if (itemEntityHolder == null) {
+            return new Pair<>(null, null);
+        }
+        ;
+
+        ItemComponent itemComponent = itemEntityHolder.getComponent(ItemComponent.getComponentType());
+        if (itemComponent != null) {
+            itemComponent.setPickupDelay(pickupDelay);
+        }
+
+        store.addEntity(itemEntityHolder, AddReason.SPAWN);
+
+        return new Pair<>(EntityUtils.getEntity(itemEntityHolder), itemComponent);
+    }
+
 }