From dca8dd4c4f99115ededa9c82a1af8e3fd760b182 Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 3 Aug 2021 12:56:52 -0700 Subject: [PATCH] organize language API --- .../com/dfsek/terra/addons/terrascript/api/Function.java | 3 +++ .../dfsek/terra/addons/terrascript/api/FunctionBuilder.java | 2 ++ .../addons/terrascript/api/ImplementationArguments.java | 2 ++ .../dfsek/terra/addons/terrascript/api/{ => lang}/Item.java | 5 ++++- .../terra/addons/terrascript/api/{ => lang}/Returnable.java | 2 +- .../terra/addons/terrascript/api/{ => lang}/Variable.java | 4 +++- .../com/dfsek/terra/addons/terrascript/parser/Parser.java | 4 ++-- .../dfsek/terra/addons/terrascript/parser/ParserUtil.java | 2 +- .../dfsek/terra/addons/terrascript/parser/lang/Block.java | 4 ++-- .../dfsek/terra/addons/terrascript/parser/lang/Keyword.java | 2 +- .../terra/addons/terrascript/parser/lang/Statement.java | 2 +- .../parser/lang/constants/ConstantExpression.java | 4 ++-- .../terrascript/parser/lang/constants/NumericConstant.java | 2 +- .../terrascript/parser/lang/constants/StringConstant.java | 2 +- .../parser/lang/functions/def/FunctionBlock.java | 4 ++-- .../terrascript/parser/lang/keywords/flow/BreakKeyword.java | 2 +- .../parser/lang/keywords/flow/ContinueKeyword.java | 2 +- .../terrascript/parser/lang/keywords/flow/FailKeyword.java | 2 +- .../parser/lang/keywords/flow/ReturnKeyword.java | 2 +- .../parser/lang/keywords/looplike/ForKeyword.java | 6 +++--- .../parser/lang/keywords/looplike/IfKeyword.java | 4 ++-- .../parser/lang/keywords/looplike/WhileKeyword.java | 4 ++-- .../terrascript/parser/lang/operations/BinaryOperation.java | 4 ++-- .../parser/lang/operations/BooleanAndOperation.java | 2 +- .../parser/lang/operations/BooleanNotOperation.java | 2 +- .../parser/lang/operations/BooleanOrOperation.java | 2 +- .../parser/lang/operations/ConcatenationOperation.java | 2 +- .../parser/lang/operations/DivisionOperation.java | 2 +- .../terrascript/parser/lang/operations/ModuloOperation.java | 2 +- .../parser/lang/operations/MultiplicationOperation.java | 2 +- .../parser/lang/operations/NegationOperation.java | 2 +- .../parser/lang/operations/NumberAdditionOperation.java | 2 +- .../parser/lang/operations/SubtractionOperation.java | 2 +- .../terrascript/parser/lang/operations/UnaryOperation.java | 4 ++-- .../parser/lang/operations/statements/EqualsStatement.java | 2 +- .../operations/statements/GreaterOrEqualsThanStatement.java | 2 +- .../lang/operations/statements/GreaterThanStatement.java | 2 +- .../operations/statements/LessThanOrEqualsStatement.java | 2 +- .../lang/operations/statements/LessThanStatement.java | 2 +- .../lang/operations/statements/NotEqualsStatement.java | 2 +- .../terrascript/parser/lang/variables/Assignment.java | 6 +++--- .../terrascript/parser/lang/variables/BooleanVariable.java | 4 ++-- .../terrascript/parser/lang/variables/Declaration.java | 6 +++--- .../addons/terrascript/parser/lang/variables/Getter.java | 4 ++-- .../terrascript/parser/lang/variables/NumberVariable.java | 4 ++-- .../terrascript/parser/lang/variables/StringVariable.java | 4 ++-- .../terra/addons/terrascript/script/StructureScript.java | 2 +- .../script/builders/BinaryNumberFunctionBuilder.java | 4 ++-- .../terrascript/script/builders/BiomeFunctionBuilder.java | 2 +- .../terrascript/script/builders/BlockFunctionBuilder.java | 2 +- .../script/builders/CheckBlockFunctionBuilder.java | 2 +- .../terrascript/script/builders/CheckFunctionBuilder.java | 2 +- .../terrascript/script/builders/EntityFunctionBuilder.java | 2 +- .../terrascript/script/builders/GetMarkFunctionBuilder.java | 2 +- .../terrascript/script/builders/LootFunctionBuilder.java | 2 +- .../terrascript/script/builders/PullFunctionBuilder.java | 2 +- .../terrascript/script/builders/RandomFunctionBuilder.java | 2 +- .../script/builders/RecursionsFunctionBuilder.java | 2 +- .../terrascript/script/builders/SetMarkFunctionBuilder.java | 2 +- .../terrascript/script/builders/StateFunctionBuilder.java | 2 +- .../script/builders/StructureFunctionBuilder.java | 2 +- .../script/builders/UnaryBooleanFunctionBuilder.java | 4 ++-- .../script/builders/UnaryNumberFunctionBuilder.java | 4 ++-- .../script/builders/UnaryStringFunctionBuilder.java | 4 ++-- .../terrascript/script/builders/ZeroArgFunctionBuilder.java | 4 ++-- .../addons/terrascript/script/functions/BiomeFunction.java | 4 ++-- .../addons/terrascript/script/functions/BlockFunction.java | 4 ++-- .../terrascript/script/functions/CheckBlockFunction.java | 4 ++-- .../addons/terrascript/script/functions/CheckFunction.java | 4 ++-- .../addons/terrascript/script/functions/EntityFunction.java | 4 ++-- .../terrascript/script/functions/GetMarkFunction.java | 4 ++-- .../addons/terrascript/script/functions/LootFunction.java | 4 ++-- .../addons/terrascript/script/functions/PullFunction.java | 4 ++-- .../addons/terrascript/script/functions/RandomFunction.java | 4 ++-- .../terrascript/script/functions/RecursionsFunction.java | 2 +- .../terrascript/script/functions/SetMarkFunction.java | 4 ++-- .../addons/terrascript/script/functions/StateFunction.java | 4 ++-- .../terrascript/script/functions/StructureFunction.java | 4 ++-- .../src/test/java/structure/ParserTest.java | 4 ++-- 79 files changed, 124 insertions(+), 112 deletions(-) rename common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/{ => lang}/Item.java (50%) rename common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/{ => lang}/Returnable.java (88%) rename common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/{ => lang}/Variable.java (57%) diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Function.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Function.java index 555986182..31b5077e7 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Function.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Function.java @@ -1,5 +1,8 @@ package com.dfsek.terra.addons.terrascript.api; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; + import java.util.Map; public interface Function extends Returnable { diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java index 7dd18f8f0..82411417e 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.terrascript.api; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; + import java.util.List; public interface FunctionBuilder> { diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ImplementationArguments.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ImplementationArguments.java index 8d3be2fc2..748c2dbdc 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ImplementationArguments.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ImplementationArguments.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.terrascript.api; +import com.dfsek.terra.addons.terrascript.api.lang.Item; + /** * Arguments passed to {@link Item}s by the implementation */ diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Item.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Item.java similarity index 50% rename from common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Item.java rename to common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Item.java index 58179cbc0..8bc53049c 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Item.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Item.java @@ -1,4 +1,7 @@ -package com.dfsek.terra.addons.terrascript.api; +package com.dfsek.terra.addons.terrascript.api.lang; + +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Returnable.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Returnable.java similarity index 88% rename from common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Returnable.java rename to common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Returnable.java index b7985f8f2..7562fb31b 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Returnable.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Returnable.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.terrascript.api; +package com.dfsek.terra.addons.terrascript.api.lang; public interface Returnable extends Item { ReturnType returnType(); diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Variable.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Variable.java similarity index 57% rename from common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Variable.java rename to common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Variable.java index 0c2db142b..70372c29b 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/Variable.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Variable.java @@ -1,4 +1,6 @@ -package com.dfsek.terra.addons.terrascript.api; +package com.dfsek.terra.addons.terrascript.api.lang; + +import com.dfsek.terra.addons.terrascript.api.Position; public interface Variable { T getValue(); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java index 5b33b389c..e2d80c23e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java @@ -2,9 +2,9 @@ package com.dfsek.terra.addons.terrascript.parser; import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.Block; -import com.dfsek.terra.addons.terrascript.api.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; import com.dfsek.terra.addons.terrascript.parser.lang.constants.NumericConstant; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java index 208743378..e8b3afdd4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Token; import java.util.Arrays; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java index 3e99f77e0..08f651035 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Item; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.HashMap; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java index 48b49fd00..6c82d4ee6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; public interface Keyword extends Returnable { } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java index 5336d35f3..1727358f9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang; -import com.dfsek.terra.addons.terrascript.api.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Item; public interface Statement extends Item { } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java index 77536246a..05f9b06d5 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.constants; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java index dffe5122b..a502b4e90 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.constants; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class NumericConstant extends ConstantExpression { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java index 2bb84ac60..acb941e4a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.constants; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class StringConstant extends ConstantExpression { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java index 10ed9a5db..35f2a4a22 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.functions.def; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Item; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.HashMap; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java index 10d772de6..d3860c85a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java index 1496054a8..877d99acd 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java index 006a335a2..5fd1c810c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java index 19e3a39db..c57549481 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java index f10a1c4ae..d7280d222 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java @@ -2,10 +2,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Returnable; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java index 18e5faf5c..5042b0907 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java @@ -3,8 +3,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Returnable; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import org.jetbrains.annotations.Nullable; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java index ab1c7fddf..0f3379cc6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java @@ -3,8 +3,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.Returnable; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java index 98bce7c68..4f45eed02 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java index 86ddb20cc..4558ad879 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class BooleanAndOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java index 17c4fa4da..bdde2fd4a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class BooleanNotOperation extends UnaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java index c5cdcbef6..9fcdd0142 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class BooleanOrOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java index d0f0cb138..50727261e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class ConcatenationOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java index 7dbf7bddd..ddb66753b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class DivisionOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java index c54d6dd2c..9f5fe1e91 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class ModuloOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java index 677c8270c..28a760c98 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class MultiplicationOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java index 7b9fde296..285dfda11 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class NegationOperation extends UnaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java index c986b7c20..9740606e0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class NumberAdditionOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java index 62c38c2ff..32dc1c0f6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; public class SubtractionOperation extends BinaryOperation { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java index 960f43d00..c66138693 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java index fd4209383..b3df670dc 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.api.Position; import net.jafama.FastMath; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java index 8872695b4..4d37033bf 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java index cf1ca1acd..56dc6a96f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java index 9bb58f0aa..6c25992b0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java index 4b987cd2d..e49212e32 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java index c1b29a335..d238f4a70 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java index 32eb5fade..11ddbacc4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Item; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java index 73377098d..4bf7f64f9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; public class BooleanVariable implements Variable { private final Position position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java index a5468f257..647a7afa4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Item; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Item; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java index 53c5069c8..4d7b8b8a9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java index f39176038..985d71b15 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; public class NumberVariable implements Variable { private final Position position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java index 166d54198..cdefd79dc 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; public class StringVariable implements Variable { private final Position position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index 9ed9fb5be..4e8085df9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -5,7 +5,7 @@ import com.dfsek.terra.addons.terrascript.buffer.StructureBuffer; import com.dfsek.terra.addons.terrascript.parser.Parser; import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.Block; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.builders.BinaryNumberFunctionBuilder; import com.dfsek.terra.addons.terrascript.script.builders.BiomeFunctionBuilder; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java index e9fe34898..bee8117e1 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java index 874f9bf8f..096f40966 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index 774c7955d..312bc3e8a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java index 725113482..aefb1ee52 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java index 41055829e..ca2adedaf 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java index e92bf783f..2a9177c2f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java index fddedf1e2..af3e5a550 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.GetMarkFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java index 131e2ea32..b7ca27303 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.StructureScript; import com.dfsek.terra.addons.terrascript.script.functions.LootFunction; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java index fd9cd2933..a16f78df8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.PullFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java index 5b538aa10..a7584faab 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.RandomFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java index 1927d4434..da630cc16 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.RecursionsFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java index 493e0c506..788e56bde 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.SetMarkFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java index 70041bb09..3c04b3382 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.StateFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java index fe6c2e1ff..bbf85f75a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java index 3b54a551f..13f6182d2 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java index 011479e25..887472994 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java index be36b6b6a..fc7e6faee 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java index 2e6809dc4..64922754c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java index 2071ff733..277b7d36b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 85f501882..36d48535e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -2,10 +2,10 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.buffer.items.BufferedBlock; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java index e272fe5e7..43fd7bf0a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.util.RotationUtil; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java index 886065a50..ed38c99b6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java index d34dfc1a9..3b2b5ba49 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java @@ -3,10 +3,10 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity; import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java index 3e7221462..9d138b78d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.util.RotationUtil; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java index 8c7668016..1477f9a31 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java @@ -2,9 +2,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.buffer.items.BufferedLootApplication; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.StructureScript; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index 911ac4969..1c1ec641d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -3,10 +3,10 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock; import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java index 2b4ee9759..b6259c0a6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java index bea603561..549390fe2 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java @@ -2,7 +2,7 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java index 52c435715..7322f84e2 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.util.RotationUtil; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java index 5ee1327f3..95e2ecb21 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java @@ -2,9 +2,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.buffer.items.BufferedStateManipulator; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java index f729efa1d..266ba103c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java @@ -2,9 +2,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.terra.addons.terrascript.buffer.IntermediateBuffer; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; diff --git a/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java b/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java index 1950df020..80d4a982d 100644 --- a/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java +++ b/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java @@ -5,10 +5,10 @@ import com.dfsek.terra.addons.terrascript.parser.Parser; import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.Variable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test;