compile terrascript

2026-06-17 06:11:24 +00:00 · 2021-07-05 01:36:24 -07:00
parent fb63e38862
commit 8213d23d72
13 changed files with 26 additions and 29 deletions
@@ -1,14 +1,14 @@
 package com.dfsek.terra.addons.terrascript.buffer;

 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

+import java.util.ArrayList;
 import java.util.List;

 public class Cell implements BufferedItem {
-    private final List<BufferedItem> items = new GlueList<>();
+    private final List<BufferedItem> items = new ArrayList<>();
    private String mark = null;

    @Override
@@ -1,16 +1,17 @@
 package com.dfsek.terra.addons.terrascript.buffer.items;

+import com.dfsek.terra.addons.terrascript.script.StructureScript;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.entity.Container;
 import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.addons.structure.structures.script.StructureScript;
-import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

+import java.util.Random;
+
 public class BufferedLootApplication implements BufferedItem {
    private final LootTable table;
    private final TerraPlugin main;
@@ -36,7 +37,7 @@ public class BufferedLootApplication implements BufferedItem {
            main.getEventManager().callEvent(event);
            if(event.isCancelled()) return;

-            event.getTable().fillInventory(container.getInventory(), new FastRandom(origin.hashCode()));
+            event.getTable().fillInventory(container.getInventory(), new Random(origin.hashCode()));
            data.update(false);
        } catch(Exception e) {
            main.logger().warning("Could not apply loot at " + origin + ": " + e.getMessage());
@@ -41,8 +41,8 @@ import com.dfsek.terra.addons.terrascript.parser.lang.variables.Getter;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.addons.terrascript.tokenizer.Token;
 import com.dfsek.terra.addons.terrascript.tokenizer.Tokenizer;
-import com.dfsek.terra.api.util.GlueList;

+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -52,7 +52,7 @@ import java.util.Map;
 public class Parser {
    private final String data;
    private final Map<String, FunctionBuilder<? extends Function<?>>> functions = new HashMap<>();
-    private final List<String> ignoredFunctions = new GlueList<>();
+    private final List<String> ignoredFunctions = new ArrayList<>();

    private String id;

@@ -132,7 +132,7 @@ public class Parser {
        Block elseBlock = null;
        Block statement = parseStatementBlock(tokens, variableMap, loop);

-        List<IfKeyword.Pair<Returnable<Boolean>, Block>> elseIf = new GlueList<>();
+        List<IfKeyword.Pair<Returnable<Boolean>, Block>> elseIf = new ArrayList<>();

        while(tokens.hasNext() && tokens.get().getType().equals(Token.Type.ELSE)) {
            tokens.consume(); // Consume else.
@@ -336,7 +336,7 @@ public class Parser {
    }

    private Block parseBlock(Tokenizer tokens, Map<String, Returnable.ReturnType> superVars, boolean loop) throws ParseException {
-        List<Item<?>> parsedItems = new GlueList<>();
+        List<Item<?>> parsedItems = new ArrayList<>();

        Map<String, Returnable.ReturnType> parsedVariables = new HashMap<>(superVars); // New hashmap as to not mutate parent scope's declarations.

@@ -431,7 +431,7 @@ public class Parser {


    private List<Returnable<?>> getArgs(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap) throws ParseException {
-        List<Returnable<?>> args = new GlueList<>();
+        List<Returnable<?>> args = new ArrayList<>();

        while(!tokens.get().getType().equals(Token.Type.GROUP_END)) {
            args.add(parseExpression(tokens, true, variableMap));
@@ -1,14 +1,14 @@
 package com.dfsek.terra.addons.terrascript.script.functions;

+import com.dfsek.terra.addons.terrascript.buffer.items.BufferedBlock;
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedBlock;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
@@ -2,20 +2,17 @@ package com.dfsek.terra.addons.terrascript.script.functions;

 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.biome.UserDefinedBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.SamplerCache;
-import com.dfsek.terra.config.templates.BiomeTemplate;
 import net.jafama.FastMath;

 import java.util.Map;
@@ -57,11 +54,10 @@ public class CheckFunction implements Function<String> {

        if(comp > 0) return "LAND"; // If noise val is greater than zero, location will always be land.

-        BiomeProvider provider = tw.getBiomeProvider();
-        UserDefinedBiome b = (UserDefinedBiome) provider.getBiome(vector.getBlockX(), vector.getBlockZ());
-        BiomeTemplate c = b.getConfig();
+        //BiomeProvider provider = tw.getBiomeProvider();
+        //TerraBiome b = provider.getBiome(vector.getBlockX(), vector.getBlockZ());

-        if(vector.getY() > c.getSeaLevel()) return "AIR"; // Above sea level
+        //if(vector.getY() > c.getSeaLevel()) return "AIR"; // Above sea level
        return "OCEAN"; // Below sea level
    }

@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.terrascript.script.functions;

+import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
@@ -9,7 +10,6 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedEntity;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.terrascript.script.functions;

+import com.dfsek.terra.addons.terrascript.buffer.items.BufferedLootApplication;
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
@@ -9,7 +10,6 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedLootApplication;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.terrascript.script.functions;

+import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
@@ -9,7 +10,6 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedPulledBlock;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
@@ -1,12 +1,12 @@
 package com.dfsek.terra.addons.terrascript.script.functions;

+import com.dfsek.terra.addons.terrascript.buffer.items.BufferedStateManipulator;
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedStateManipulator;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.terrascript.script.functions;

+import com.dfsek.terra.addons.terrascript.buffer.IntermediateBuffer;
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
@@ -9,7 +10,6 @@ import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.structure.structures.structure.buffer.IntermediateBuffer;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
@@ -1,16 +1,16 @@
 package com.dfsek.terra.addons.terrascript.tokenizer;

-import com.dfsek.terra.api.util.GlueList;

 import java.io.IOException;
 import java.io.Reader;
+import java.util.ArrayList;
 import java.util.List;

 /**
 * Stream-like data structure that allows viewing future elements without consuming current.
 */
 public class Lookahead {
-    private final List<Char> buffer = new GlueList<>();
+    private final List<Char> buffer = new ArrayList<>();
    private final Reader input;
    private int index = 0;
    private int line = 0;
@@ -0,0 +1,99 @@
+id "testScript";
+
+bool thing1 = 2 > (2+2) || false;
+
+if(2 > 2 || 3 + 4 <= 2 && 4 + 5 > 2 / 3) {
+    test("ok", 2);
+}
+
+test("minecraft:green_w" + "ool", (2 * (3+1) * (2 * (1+1))));
+//
+
+num testVar = 3.4;
+bool boolean = true;
+str stringVar = "hello!";
+
+num precedence = 3 + 2 * 2 + 3;
+test("precedence: " + precedence, 2);
+num precedence2 = 3 * 2 + 2 * 3;
+test("precedence 2: " + precedence2, 2);
+
+bool iftest = false;
+
+bool truetest = false;
+
+num iterator = 0;
+num thing = 4 - 2-2+2-2+2;
+test("4 - 2 = " + thing, 2);
+
+thing = -2;
+test("-2 = " + thing, 2);
+thing = -thing;
+test("--2 = " + thing, 2);
+
+
+
+for(num i = 0; i < 5; i = i + 1) {
+    test("i = " + i, iterator);
+    if(i > 1 + 1) {
+        test("more than 2", iterator);
+        continue;
+    }
+}
+
+for(num i = 0; i < 5; i = i + 1) {
+    test("i = " + i, iterator);
+}
+
+for(num j = 0; j < 5; j = j + 1) test("single statement j = " + j, iterator);
+
+if(4 + 2 == 2 + 4) {
+    test("new thing " + 2, iterator);
+}
+
+while(iterator < 5) {
+    test("always, even after " + 2, iterator);
+    iterator = iterator + 1;
+    if(iterator > 2) {
+        continue;
+    }
+    test("not after " + 2, iterator);
+}
+
+if(true) test("single statement" + 2, iterator);
+else if(true) test("another single statement" + 2, iterator);
+
+if(true) {
+    test("true!" + 2, iterator);
+} else {
+     test("false!" + 2, iterator);
+ }
+
+if(false) {
+    test("true!" + 2, iterator);
+} else {
+    test("false!" + 2, iterator);
+}
+
+if(false) {
+    test("true again!" + 2, iterator);
+} else if(true == true) {
+   test("false again!" + 2, iterator);
+} else {
+   test("not logged!" + 2, iterator);
+}
+
+
+
+// comment
+
+/*
+fsdfsd
+*/
+
+test("fdsgdf" + 2, 1 + testVar);
+
+if(true && !(boolean && false) && true) {
+    num scopedVar = 2;
+    test("if statement" + 2 + stringVar, 1 + testVar + scopedVar);
+}