use getUngeneratedBlock for trees

common/src/main/java/com/dfsek/terra/api/GenericLoaders.java

@@ -45,11 +45,11 @@ public class GenericLoaders implements LoaderRegistrar {
                 .registerLoader(GridSpawn.class, new GridSpawnLoader())
                 .registerLoader(PaletteHolder.class, new PaletteHolderLoader())
                 .registerLoader(PaletteLayer.class, new PaletteLayerLoader())
-                .registerLoader(FloraLayer.class, new FloraLayerLoader())
+                .registerLoader(FloraLayer.class, new FloraLayerLoader(main))
                 .registerLoader(Ore.Type.class, (t, o, l) -> Ore.Type.valueOf(o.toString()))
                 .registerLoader(OreConfig.class, new OreConfigLoader())
                 .registerLoader(NoiseBuilder.class, new NoiseBuilderLoader())
-                .registerLoader(TreeLayer.class, new TreeLayerLoader())
+                .registerLoader(TreeLayer.class, new TreeLayerLoader(main))
                 .registerLoader(MaterialSet.class, new MaterialSetLoader())
                 .registerLoader(OreHolder.class, new OreHolderLoader())
                 .registerLoader(TerraFlora.Search.class, (t, o, l) -> TerraFlora.Search.valueOf(o.toString()))

common/src/main/java/com/dfsek/terra/api/math/vector/Vector2.java

@@ -186,6 +186,10 @@ public class Vector2 implements Cloneable {
         return FastMath.floorToInt(z);
     }
 
+    public Vector3 toVector3(double y) {
+        return new Vector3(x, y, z);
+    }
+
     @Override
     public String toString() {
         return "(" + x + ", " + z + ")";

common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java

@@ -68,7 +68,7 @@ public class StructureScript {
                 .registerFunction("loot", new LootFunctionBuilder(main, lootRegistry))
                 .registerFunction("entity", new EntityFunctionBuilder(main))
                 .registerFunction("getBiome", new BiomeFunctionBuilder(main))
-                .registerFunction("getBlock", new CheckBlockFunctionBuilder())
+                .registerFunction("getBlock", new CheckBlockFunctionBuilder(main))
                 .registerFunction("state", new StateFunctionBuilder(main))
                 .registerFunction("originX", new ZeroArgFunctionBuilder<Number>(arguments -> arguments.getBuffer().getOrigin().getX(), Returnable.ReturnType.NUMBER))
                 .registerFunction("originY", new ZeroArgFunctionBuilder<Number>(arguments -> arguments.getBuffer().getOrigin().getY(), Returnable.ReturnType.NUMBER))

common/src/main/java/com/dfsek/terra/api/structures/script/builders/CheckBlockFunctionBuilder.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
+import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.api.structures.script.functions.CheckBlockFunction;
@@ -8,10 +9,16 @@ import com.dfsek.terra.api.structures.tokenizer.Position;
 import java.util.List;
 
 public class CheckBlockFunctionBuilder implements FunctionBuilder<CheckBlockFunction> {
+    private final TerraPlugin main;
+
+    public CheckBlockFunctionBuilder(TerraPlugin main) {
+        this.main = main;
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public CheckBlockFunction build(List<Returnable<?>> argumentList, Position position) {
-        return new CheckBlockFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), position);
+        return new CheckBlockFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), position, main);
     }
 
     @Override

common/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java

@@ -1,7 +1,10 @@
 package com.dfsek.terra.api.structures.script.functions;
 
+import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
+import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
@@ -13,12 +16,14 @@ import net.jafama.FastMath;
 public class CheckBlockFunction implements Function<String> {
     private final Returnable<Number> x, y, z;
     private final Position position;
+    private final TerraPlugin main;
 
-    public CheckBlockFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Position position) {
+    public CheckBlockFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Position position, TerraPlugin main) {
         this.x = x;
         this.y = y;
         this.z = z;
         this.position = position;
+        this.main = main;
     }
 
 
@@ -30,7 +35,11 @@ public class CheckBlockFunction implements Function<String> {
 
         RotationUtil.rotateVector(xz, arguments.getRotation());
 
-        String data = arguments.getBuffer().getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments).doubleValue(), FastMath.roundToInt(xz.getZ()))).getBlock().getBlockData().getAsString();
+        TerraWorld world = main.getWorld(arguments.getBuffer().getOrigin().getWorld());
+
+        BlockData blockData = world.getUngeneratedBlock(arguments.getBuffer().getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments).doubleValue(), FastMath.roundToInt(xz.getZ()))));
+
+        String data = blockData.getAsString();
         if(data.contains("[")) return data.substring(0, data.indexOf('[')); // Strip properties
         else return data;
     }