mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor terrascript

Browse Source
This commit is contained in:
dfsek 2021-07-05 01:29:19 -07:00
parent d4d1a4434e
commit fb63e38862
114 changed files with 671 additions and 668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/Item.java
View File

@ -1,12 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.Map;
public interface Item<T> {
T apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap);
Position getPosition();
}

4
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/Keyword.java
View File

@ -1,4 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang;
public interface Keyword<T> extends Returnable<T> {
}

4
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/Statement.java
View File

@ -1,4 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang;
public interface Statement extends Item<Boolean> {
}

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/constants/NumericConstant.java
View File

@ -1,14 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.constants;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public class NumericConstant extends ConstantExpression<Number> {
public NumericConstant(Number constant, Position position) {
super(constant, position);
}
@Override
public ReturnType returnType() {
return ReturnType.NUMBER;
}
}

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/constants/StringConstant.java
View File

@ -1,14 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.constants;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public class StringConstant extends ConstantExpression<String> {
public StringConstant(String constant, Position position) {
super(constant, position);
}
@Override
public ReturnType returnType() {
return ReturnType.STRING;
}
}

15
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/functions/FunctionBuilder.java
View File

@ -1,15 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.functions;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.List;
public interface FunctionBuilder<T extends Function<?>> {
T build(List<Returnable<?>> argumentList, Position position) throws ParseException;
int argNumber();
Returnable.ReturnType getArgument(int position);
}

22
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/statements/GreaterThanStatement.java
View File

@ -1,22 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public class GreaterThanStatement extends BinaryOperation<Number, Boolean> {
public GreaterThanStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Number left, Number right) {
return left.doubleValue() > right.doubleValue();
}
@Override
public ReturnType returnType() {
return ReturnType.BOOLEAN;
}
}

22
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/statements/LessThanOrEqualsStatement.java
View File

@ -1,22 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public class LessThanOrEqualsStatement extends BinaryOperation<Number, Boolean> {
public LessThanOrEqualsStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Number left, Number right) {
return left.doubleValue() <= right.doubleValue();
}
@Override
public ReturnType returnType() {
return ReturnType.BOOLEAN;
}
}

22
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/statements/LessThanStatement.java
View File

@ -1,22 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public class LessThanStatement extends BinaryOperation<Number, Boolean> {
public LessThanStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Number left, Number right) {
return left.doubleValue() < right.doubleValue();
}
@Override
public ReturnType returnType() {
return ReturnType.BOOLEAN;
}
}

22
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/statements/NotEqualsStatement.java
View File

@ -1,22 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public class NotEqualsStatement extends BinaryOperation<Object, Boolean> {
public NotEqualsStatement(Returnable<Object> left, Returnable<Object> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Object left, Object right) {
return !left.equals(right);
}
@Override
public ReturnType returnType() {
return ReturnType.BOOLEAN;
}
}

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/Variable.java
View File

@ -1,14 +0,0 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
public interface Variable<T> {
T getValue();
void setValue(T value);
Returnable.ReturnType getType();
Position getPosition();
}

26
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/RecursionsFunctionBuilder.java
View File

@ -1,26 +0,0 @@
package com.dfsek.terra.addons.structure.structures.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.RecursionsFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.List;
public class RecursionsFunctionBuilder implements FunctionBuilder<RecursionsFunction> {
@Override
public RecursionsFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
return new RecursionsFunction(position);
}
@Override
public int argNumber() {
return 0;
}
@Override
public Returnable.ReturnType getArgument(int position) {
return null;
}
}

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/Cell.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/Cell.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer; package com.dfsek.terra.addons.terrascript.buffer;
import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.BufferedItem;
import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.GlueList;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/DirectBuffer.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/DirectBuffer.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer; package com.dfsek.terra.addons.terrascript.buffer;
import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.BufferedItem;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/IntermediateBuffer.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer; package com.dfsek.terra.addons.terrascript.buffer;
import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.BufferedItem;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/StructureBuffer.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/StructureBuffer.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer; package com.dfsek.terra.addons.terrascript.buffer;
import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.BufferedItem;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/items/BufferedBlock.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer.items; package com.dfsek.terra.addons.terrascript.buffer.items;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/items/BufferedEntity.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer.items; package com.dfsek.terra.addons.terrascript.buffer.items;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.Entity;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/items/BufferedLootApplication.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer.items; package com.dfsek.terra.addons.terrascript.buffer.items;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.entity.BlockEntity;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/items/BufferedPulledBlock.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer.items; package com.dfsek.terra.addons.terrascript.buffer.items;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.BufferedItem;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/structure/buffer/items/BufferedStateManipulator.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.structure.buffer.items; package com.dfsek.terra.addons.terrascript.buffer.items;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.entity.BlockEntity;

84
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/Parser.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java
View File

@ -1,46 +1,46 @@
package com.dfsek.terra.addons.structure.structures.parser; package com.dfsek.terra.addons.terrascript.parser;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Item;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.BooleanConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.ConstantExpression; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.NumericConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.NumericConstant;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.StringConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow.BreakKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.BreakKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow.ContinueKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.ContinueKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow.FailKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.FailKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow.ReturnKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.ReturnKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.looplike.ForKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike.ForKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.looplike.IfKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike.IfKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.keywords.looplike.WhileKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike.WhileKeyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BooleanAndOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BooleanAndOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BooleanNotOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BooleanNotOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BooleanOrOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BooleanOrOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.ConcatenationOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.ConcatenationOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.DivisionOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.DivisionOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.ModuloOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.ModuloOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.MultiplicationOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.MultiplicationOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.NegationOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.NegationOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.NumberAdditionOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.NumberAdditionOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.SubtractionOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.SubtractionOperation;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements.EqualsStatement; import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.EqualsStatement;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements.GreaterOrEqualsThanStatement; import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.GreaterOrEqualsThanStatement;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements.GreaterThanStatement; import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.GreaterThanStatement;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements.LessThanOrEqualsStatement; import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.LessThanOrEqualsStatement;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements.LessThanStatement; import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.LessThanStatement;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements.NotEqualsStatement; import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.NotEqualsStatement;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Assignment; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Assignment;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Declaration; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Declaration;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Getter; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Getter;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.structure.structures.tokenizer.Token; import com.dfsek.terra.addons.terrascript.tokenizer.Token;
import com.dfsek.terra.addons.structure.structures.tokenizer.Tokenizer; import com.dfsek.terra.addons.terrascript.tokenizer.Tokenizer;
import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.GlueList;
import java.util.Collections; import java.util.Collections;

8
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/ParserUtil.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.addons.structure.structures.parser; package com.dfsek.terra.addons.terrascript.parser;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Token; import com.dfsek.terra.addons.terrascript.tokenizer.Token;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;

4
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/exceptions/ParseException.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.addons.structure.structures.parser.exceptions; package com.dfsek.terra.addons.terrascript.parser.exceptions;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class ParseException extends Exception { public class ParseException extends Exception {
private static final long serialVersionUID = 6744390543046766386L; private static final long serialVersionUID = 6744390543046766386L;

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/Block.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang; package com.dfsek.terra.addons.terrascript.parser.lang;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/ImplementationArguments.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/ImplementationArguments.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.parser.lang; package com.dfsek.terra.addons.terrascript.parser.lang;
/** /**
* Arguments passed to {@link Item}s by the implementation * Arguments passed to {@link Item}s by the implementation

12
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Item.java Normal file
View File

@ -0,0 +1,12 @@
package com.dfsek.terra.addons.terrascript.parser.lang;
import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map;
public interface Item<T> {
T apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap);
Position getPosition();
}

4
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java Normal file
View File

@ -0,0 +1,4 @@
package com.dfsek.terra.addons.terrascript.parser.lang;
public interface Keyword<T> extends Returnable<T> {
}

2
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/Returnable.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Returnable.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.addons.structure.structures.parser.lang; package com.dfsek.terra.addons.terrascript.parser.lang;
public interface Returnable<T> extends Item<T> { public interface Returnable<T> extends Item<T> {
ReturnType returnType(); ReturnType returnType();

4
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java Normal file
View File

@ -0,0 +1,4 @@
package com.dfsek.terra.addons.terrascript.parser.lang;
public interface Statement extends Item<Boolean> {
}

4
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/constants/BooleanConstant.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/BooleanConstant.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.constants; package com.dfsek.terra.addons.terrascript.parser.lang.constants;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class BooleanConstant extends ConstantExpression<Boolean> { public class BooleanConstant extends ConstantExpression<Boolean> {
public BooleanConstant(Boolean constant, Position position) { public BooleanConstant(Boolean constant, Position position) {

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/constants/ConstantExpression.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.constants; package com.dfsek.terra.addons.terrascript.parser.lang.constants;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

15
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java Normal file
View File

@ -0,0 +1,15 @@
package com.dfsek.terra.addons.terrascript.parser.lang.constants;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
public class NumericConstant extends ConstantExpression<Number> {
public NumericConstant(Number constant, Position position) {
super(constant, position);
}
@Override
public Returnable.ReturnType returnType() {
return Returnable.ReturnType.NUMBER;
}
}

15
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java Normal file
View File

@ -0,0 +1,15 @@
package com.dfsek.terra.addons.terrascript.parser.lang.constants;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
public class StringConstant extends ConstantExpression<String> {
public StringConstant(String constant, Position position) {
super(constant, position);
}
@Override
public Returnable.ReturnType returnType() {
return Returnable.ReturnType.STRING;
}
}

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/functions/Function.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/Function.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.functions; package com.dfsek.terra.addons.terrascript.parser.lang.functions;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

15
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java Normal file
View File

@ -0,0 +1,15 @@
package com.dfsek.terra.addons.terrascript.parser.lang.functions;
import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List;
public interface FunctionBuilder<T extends Function<?>> {
T build(List<Returnable<?>> argumentList, Position position) throws ParseException;
int argNumber();
Returnable.ReturnType getArgument(int position);
}

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/functions/def/FunctionBlock.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.functions.def; package com.dfsek.terra.addons.terrascript.parser.lang.functions.def;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Item;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/flow/BreakKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/flow/ContinueKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/flow/FailKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/flow/ReturnKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.flow; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

16
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/looplike/ForKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java
View File

@ -1,12 +1,12 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.looplike; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Item;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/looplike/IfKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.looplike; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/keywords/looplike/WhileKeyword.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.keywords.looplike; package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block; import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/BinaryOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/BooleanAndOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class BooleanAndOperation extends BinaryOperation<Boolean, Boolean> { public class BooleanAndOperation extends BinaryOperation<Boolean, Boolean> {
public BooleanAndOperation(Returnable<Boolean> left, Returnable<Boolean> right, Position start) { public BooleanAndOperation(Returnable<Boolean> left, Returnable<Boolean> right, Position start) {

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/BooleanNotOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class BooleanNotOperation extends UnaryOperation<Boolean> { public class BooleanNotOperation extends UnaryOperation<Boolean> {
public BooleanNotOperation(Returnable<Boolean> input, Position position) { public BooleanNotOperation(Returnable<Boolean> input, Position position) {

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/BooleanOrOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class BooleanOrOperation extends BinaryOperation<Boolean, Boolean> { public class BooleanOrOperation extends BinaryOperation<Boolean, Boolean> {
public BooleanOrOperation(Returnable<Boolean> left, Returnable<Boolean> right, Position start) { public BooleanOrOperation(Returnable<Boolean> left, Returnable<Boolean> right, Position start) {

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/ConcatenationOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class ConcatenationOperation extends BinaryOperation<Object, Object> { public class ConcatenationOperation extends BinaryOperation<Object, Object> {
public ConcatenationOperation(Returnable<Object> left, Returnable<Object> right, Position position) { public ConcatenationOperation(Returnable<Object> left, Returnable<Object> right, Position position) {
@ -14,7 +14,7 @@ public class ConcatenationOperation extends BinaryOperation<Object, Object> {
} }
@Override @Override
public ReturnType returnType() { public Returnable.ReturnType returnType() {
return ReturnType.STRING; return Returnable.ReturnType.STRING;
} }
} }

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/DivisionOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class DivisionOperation extends BinaryOperation<Number, Number> { public class DivisionOperation extends BinaryOperation<Number, Number> {
public DivisionOperation(Returnable<Number> left, Returnable<Number> right, Position position) { public DivisionOperation(Returnable<Number> left, Returnable<Number> right, Position position) {
@ -14,7 +14,7 @@ public class DivisionOperation extends BinaryOperation<Number, Number> {
} }
@Override @Override
public ReturnType returnType() { public Returnable.ReturnType returnType() {
return ReturnType.NUMBER; return Returnable.ReturnType.NUMBER;
} }
} }

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/ModuloOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class ModuloOperation extends BinaryOperation<Number, Number> { public class ModuloOperation extends BinaryOperation<Number, Number> {
public ModuloOperation(Returnable<Number> left, Returnable<Number> right, Position start) { public ModuloOperation(Returnable<Number> left, Returnable<Number> right, Position start) {

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/MultiplicationOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class MultiplicationOperation extends BinaryOperation<Number, Number> { public class MultiplicationOperation extends BinaryOperation<Number, Number> {
public MultiplicationOperation(Returnable<Number> left, Returnable<Number> right, Position position) { public MultiplicationOperation(Returnable<Number> left, Returnable<Number> right, Position position) {

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/NegationOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class NegationOperation extends UnaryOperation<Number> { public class NegationOperation extends UnaryOperation<Number> {
public NegationOperation(Returnable<Number> input, Position position) { public NegationOperation(Returnable<Number> input, Position position) {

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/NumberAdditionOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class NumberAdditionOperation extends BinaryOperation<Number, Number> { public class NumberAdditionOperation extends BinaryOperation<Number, Number> {
public NumberAdditionOperation(Returnable<Number> left, Returnable<Number> right, Position position) { public NumberAdditionOperation(Returnable<Number> left, Returnable<Number> right, Position position) {

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/SubtractionOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class SubtractionOperation extends BinaryOperation<Number, Number> { public class SubtractionOperation extends BinaryOperation<Number, Number> {
public SubtractionOperation(Returnable<Number> left, Returnable<Number> right, Position position) { public SubtractionOperation(Returnable<Number> left, Returnable<Number> right, Position position) {

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/UnaryOperation.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations; package com.dfsek.terra.addons.terrascript.parser.lang.operations;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/statements/EqualsStatement.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements; package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import net.jafama.FastMath; import net.jafama.FastMath;
public class EqualsStatement extends BinaryOperation<Object, Boolean> { public class EqualsStatement extends BinaryOperation<Object, Boolean> {
@ -23,7 +23,7 @@ public class EqualsStatement extends BinaryOperation<Object, Boolean> {
@Override @Override
public ReturnType returnType() { public Returnable.ReturnType returnType() {
return ReturnType.BOOLEAN; return Returnable.ReturnType.BOOLEAN;
} }
} }

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.operations.statements; package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class GreaterOrEqualsThanStatement extends BinaryOperation<Number, Boolean> { public class GreaterOrEqualsThanStatement extends BinaryOperation<Number, Boolean> {
public GreaterOrEqualsThanStatement(Returnable<Number> left, Returnable<Number> right, Position position) { public GreaterOrEqualsThanStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
@ -16,7 +16,7 @@ public class GreaterOrEqualsThanStatement extends BinaryOperation<Number, Boolea
@Override @Override
public ReturnType returnType() { public Returnable.ReturnType returnType() {
return ReturnType.BOOLEAN; return Returnable.ReturnType.BOOLEAN;
} }
} }

22
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java Normal file
View File

@ -0,0 +1,22 @@
package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class GreaterThanStatement extends BinaryOperation<Number, Boolean> {
public GreaterThanStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Number left, Number right) {
return left.doubleValue() > right.doubleValue();
}
@Override
public Returnable.ReturnType returnType() {
return Returnable.ReturnType.BOOLEAN;
}
}

22
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java Normal file
View File

@ -0,0 +1,22 @@
package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class LessThanOrEqualsStatement extends BinaryOperation<Number, Boolean> {
public LessThanOrEqualsStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Number left, Number right) {
return left.doubleValue() <= right.doubleValue();
}
@Override
public Returnable.ReturnType returnType() {
return Returnable.ReturnType.BOOLEAN;
}
}

22
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java Normal file
View File

@ -0,0 +1,22 @@
package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class LessThanStatement extends BinaryOperation<Number, Boolean> {
public LessThanStatement(Returnable<Number> left, Returnable<Number> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Number left, Number right) {
return left.doubleValue() < right.doubleValue();
}
@Override
public Returnable.ReturnType returnType() {
return Returnable.ReturnType.BOOLEAN;
}
}

22
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java Normal file
View File

@ -0,0 +1,22 @@
package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class NotEqualsStatement extends BinaryOperation<Object, Boolean> {
public NotEqualsStatement(Returnable<Object> left, Returnable<Object> right, Position position) {
super(left, right, position);
}
@Override
public Boolean apply(Object left, Object right) {
return !left.equals(right);
}
@Override
public Returnable.ReturnType returnType() {
return Returnable.ReturnType.BOOLEAN;
}
}

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/Assignment.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables; package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Item;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/BooleanVariable.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables; package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class BooleanVariable implements Variable<Boolean> { public class BooleanVariable implements Variable<Boolean> {
private final Position position; private final Position position;

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/Declaration.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables; package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Item; import com.dfsek.terra.addons.terrascript.parser.lang.Item;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

8
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/Getter.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables; package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/NumberVariable.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables; package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class NumberVariable implements Variable<Number> { public class NumberVariable implements Variable<Number> {
private final Position position; private final Position position;

6
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/parser/lang/variables/StringVariable.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.structure.structures.parser.lang.variables; package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public class StringVariable implements Variable<String> { public class StringVariable implements Variable<String> {
private final Position position; private final Position position;

14
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Variable.java Normal file
View File

@ -0,0 +1,14 @@
package com.dfsek.terra.addons.terrascript.parser.lang.variables;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
public interface Variable<T> {
T getValue();
void setValue(T value);
Returnable.ReturnType getType();
Position getPosition();
}

52
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/StructureScript.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java
View File

@ -1,5 +1,30 @@
package com.dfsek.terra.addons.structure.structures.script; package com.dfsek.terra.addons.terrascript.script;
import com.dfsek.terra.addons.terrascript.buffer.DirectBuffer;
import com.dfsek.terra.addons.terrascript.buffer.StructureBuffer;
import com.dfsek.terra.addons.terrascript.parser.Parser;
import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.terrascript.parser.lang.Block;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.BinaryNumberFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.BiomeFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.BlockFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.CheckBlockFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.CheckFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.EntityFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.GetMarkFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.LootFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.PullFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.RandomFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.RecursionsFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.SetMarkFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.StateFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.StructureFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.UnaryBooleanFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.UnaryNumberFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.UnaryStringFunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.builders.ZeroArgFunctionBuilder;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.profiler.ProfileFrame;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
@ -7,31 +32,6 @@ import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structure.rotation.Rotation;
import com.dfsek.terra.addons.structure.structures.parser.Parser;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Block;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.BinaryNumberFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.BiomeFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.BlockFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.CheckBlockFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.CheckFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.EntityFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.GetMarkFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.LootFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.PullFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.RandomFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.RecursionsFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.SetMarkFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.StateFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.StructureFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.UnaryBooleanFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.UnaryNumberFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.UnaryStringFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.builders.ZeroArgFunctionBuilder;
import com.dfsek.terra.addons.structure.structures.structure.buffer.DirectBuffer;
import com.dfsek.terra.addons.structure.structures.structure.buffer.StructureBuffer;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;

4
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/TerraImplementationArguments.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.addons.structure.structures.script; package com.dfsek.terra.addons.terrascript.script;
import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structure.rotation.Rotation;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import java.util.Random; import java.util.Random;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/BinaryNumberFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/BiomeFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.BiomeFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.List; import java.util.List;

18
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/BlockFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java
View File

@ -1,14 +1,14 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.BooleanConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.AbstractBlockFunction; import com.dfsek.terra.addons.terrascript.script.functions.AbstractBlockFunction;
import com.dfsek.terra.addons.structure.structures.script.functions.BlockFunction; import com.dfsek.terra.addons.terrascript.script.functions.BlockFunction;
import com.dfsek.terra.addons.structure.structures.script.functions.DynamicBlockFunction; import com.dfsek.terra.addons.terrascript.script.functions.DynamicBlockFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/CheckBlockFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.CheckBlockFunction; import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/CheckFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.CheckFunction; import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/EntityFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.EntityFunction; import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

10
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/GetMarkFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.GetMarkFunction; import com.dfsek.terra.addons.terrascript.script.functions.GetMarkFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/LootFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java
View File

@ -1,13 +1,13 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.script.StructureScript;
import com.dfsek.terra.addons.terrascript.script.functions.LootFunction;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.StructureScript;
import com.dfsek.terra.addons.structure.structures.script.functions.LootFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/PullFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.PullFunction; import com.dfsek.terra.addons.terrascript.script.functions.PullFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/RandomFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.RandomFunction; import com.dfsek.terra.addons.terrascript.script.functions.RandomFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

26
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java Normal file
View File

@ -0,0 +1,26 @@
package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.terrascript.script.functions.RecursionsFunction;
import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List;
public class RecursionsFunctionBuilder implements FunctionBuilder<RecursionsFunction> {
@Override
public RecursionsFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
return new RecursionsFunction(position);
}
@Override
public int argNumber() {
return 0;
}
@Override
public Returnable.ReturnType getArgument(int position) {
return null;
}
}

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/SetMarkFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java
View File

@ -1,10 +1,10 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.SetMarkFunction; import com.dfsek.terra.addons.terrascript.script.functions.SetMarkFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/StateFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.StateFunction; import com.dfsek.terra.addons.terrascript.script.functions.StateFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/StructureFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java
View File

@ -1,13 +1,13 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.script.functions.StructureFunction; import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

16
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/UnaryBooleanFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java
View File

@ -1,12 +1,12 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/UnaryNumberFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/UnaryStringFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

16
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/builders/ZeroArgFunctionBuilder.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java
View File

@ -1,12 +1,12 @@
package com.dfsek.terra.addons.structure.structures.script.builders; package com.dfsek.terra.addons.terrascript.script.builders;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/AbstractBlockFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/AbstractBlockFunction.java
View File

@ -1,14 +1,14 @@
package com.dfsek.terra.addons.structure.structures.script.functions; 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.variables.Variable;
import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedBlock; import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedBlock;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/BiomeFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java
View File

@ -1,12 +1,12 @@
package com.dfsek.terra.addons.structure.structures.script.functions; 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.variables.Variable;
import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;

16
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/BlockFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java
View File

@ -1,14 +1,14 @@
package com.dfsek.terra.addons.structure.structures.script.functions; package com.dfsek.terra.addons.terrascript.script.functions;
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;
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.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.Map; import java.util.Map;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/CheckBlockFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java
View File

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

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/CheckFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java
View File

@ -1,12 +1,12 @@
package com.dfsek.terra.addons.structure.structures.script.functions; 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.variables.Variable;
import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;

12
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/DynamicBlockFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/DynamicBlockFunction.java
View File

@ -1,12 +1,12 @@
package com.dfsek.terra.addons.structure.structures.script.functions; 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.variables.Variable;
import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

18
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/EntityFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java
View File

@ -1,16 +1,16 @@
package com.dfsek.terra.addons.structure.structures.script.functions; package com.dfsek.terra.addons.terrascript.script.functions;
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;
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.api.TerraPlugin;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedEntity; import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedEntity;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/GetMarkFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java
View File

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

16
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/LootFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java
View File

@ -1,16 +1,16 @@
package com.dfsek.terra.addons.structure.structures.script.functions; 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.variables.Variable;
import com.dfsek.terra.addons.terrascript.script.StructureScript;
import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.StructureScript;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedLootApplication; import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedLootApplication;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;

18
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/PullFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java
View File

@ -1,16 +1,16 @@
package com.dfsek.terra.addons.structure.structures.script.functions; package com.dfsek.terra.addons.terrascript.script.functions;
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;
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.api.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.addons.structure.structures.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedPulledBlock; import com.dfsek.terra.addons.structure.structures.structure.buffer.items.BufferedPulledBlock;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;

14
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/structures/script/functions/RandomFunction.java → common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.structure.structures.script.functions; package com.dfsek.terra.addons.terrascript.script.functions;
import com.dfsek.terra.addons.structure.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
import com.dfsek.terra.addons.structure.structures.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
import com.dfsek.terra.addons.structure.structures.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
import com.dfsek.terra.addons.structure.structures.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
import com.dfsek.terra.addons.structure.structures.tokenizer.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Position;
import java.util.Map; import java.util.Map;

Some files were not shown because too many files have changed in this diff Show More