diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java index 68084fa7e..814d88886 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java @@ -78,7 +78,7 @@ public class Parser { * * @throws ParseException If parsing fails. */ - public Block parse() throws ParseException { + public Block parse() { Tokenizer tokens = new Tokenizer(data); // Parse ID @@ -108,8 +108,7 @@ public class Parser { }; } - private WhileKeyword parseWhileLoop(Tokenizer tokens, Map variableMap, Position start) - throws ParseException { + private WhileKeyword parseWhileLoop(Tokenizer tokens, Map variableMap, Position start) { Returnable first = parseExpression(tokens, true, variableMap); ParserUtil.checkReturnType(first, Returnable.ReturnType.BOOLEAN); @@ -118,8 +117,7 @@ public class Parser { return new WhileKeyword(parseStatementBlock(tokens, variableMap, true), (Returnable) first, start); // While loop } - private IfKeyword parseIfStatement(Tokenizer tokens, Map variableMap, Position start, boolean loop) - throws ParseException { + private IfKeyword parseIfStatement(Tokenizer tokens, Map variableMap, Position start, boolean loop) { Returnable condition = parseExpression(tokens, true, variableMap); ParserUtil.checkReturnType(condition, Returnable.ReturnType.BOOLEAN); @@ -146,8 +144,7 @@ public class Parser { return new IfKeyword(statement, (Returnable) condition, elseIf, elseBlock, start); // If statement } - private Block parseStatementBlock(Tokenizer tokens, Map variableMap, boolean loop) - throws ParseException { + private Block parseStatementBlock(Tokenizer tokens, Map variableMap, boolean loop) { if(tokens.get().getType().equals(Token.Type.BLOCK_BEGIN)) { ParserUtil.checkType(tokens.consume(), Token.Type.BLOCK_BEGIN); @@ -162,7 +159,7 @@ public class Parser { } } - private ForKeyword parseForLoop(Tokenizer tokens, Map old, Position start) throws ParseException { + private ForKeyword parseForLoop(Tokenizer tokens, Map old, Position start) { Map variableMap = new HashMap<>(old); // New scope Token f = tokens.get(); ParserUtil.checkType(f, Token.Type.NUMBER_VARIABLE, Token.Type.STRING_VARIABLE, Token.Type.BOOLEAN_VARIABLE, Token.Type.IDENTIFIER); @@ -191,8 +188,7 @@ public class Parser { start); } - private Returnable parseExpression(Tokenizer tokens, boolean full, Map variableMap) - throws ParseException { + private Returnable parseExpression(Tokenizer tokens, boolean full, Map variableMap) { boolean booleanInverted = false; // Check for boolean not operator boolean negate = false; if(tokens.get().getType().equals(Token.Type.BOOLEAN_NOT)) { @@ -235,7 +231,7 @@ public class Parser { return expression; } - private ConstantExpression parseConstantExpression(Tokenizer tokens) throws ParseException { + private ConstantExpression parseConstantExpression(Tokenizer tokens) { Token constantToken = tokens.consume(); Position position = constantToken.getPosition(); switch(constantToken.getType()) { @@ -252,15 +248,14 @@ public class Parser { } } - private Returnable parseGroup(Tokenizer tokens, Map variableMap) throws ParseException { + private Returnable parseGroup(Tokenizer tokens, Map variableMap) { ParserUtil.checkType(tokens.consume(), Token.Type.GROUP_BEGIN); Returnable expression = parseExpression(tokens, true, variableMap); // Parse inside of group as a separate expression ParserUtil.checkType(tokens.consume(), Token.Type.GROUP_END); return expression; } - private BinaryOperation parseBinaryOperation(Returnable left, Tokenizer tokens, Map variableMap) - throws ParseException { + private BinaryOperation parseBinaryOperation(Returnable left, Tokenizer tokens, Map variableMap) { Token binaryOperator = tokens.consume(); ParserUtil.checkBinaryOperator(binaryOperator); @@ -275,7 +270,7 @@ public class Parser { return assemble(left, right, binaryOperator); } - private BinaryOperation assemble(Returnable left, Returnable right, Token binaryOperator) throws ParseException { + private BinaryOperation assemble(Returnable left, Returnable right, Token binaryOperator) { if(binaryOperator.isStrictNumericOperator()) ParserUtil.checkArithmeticOperation(left, right, binaryOperator); // Numeric type checking if(binaryOperator.isStrictBooleanOperator()) ParserUtil.checkBooleanOperation(left, right, binaryOperator); // Boolean type checking @@ -315,8 +310,7 @@ public class Parser { } } - private Declaration parseVariableDeclaration(Tokenizer tokens, Map variableMap) - throws ParseException { + private Declaration parseVariableDeclaration(Tokenizer tokens, Map variableMap) { Token type = tokens.consume(); ParserUtil.checkType(type, Token.Type.STRING_VARIABLE, Token.Type.BOOLEAN_VARIABLE, Token.Type.NUMBER_VARIABLE); @@ -337,7 +331,7 @@ public class Parser { return new Declaration<>(tokens.get().getPosition(), identifier.getContent(), value, returnType); } - private Block parseBlock(Tokenizer tokens, Map superVars, boolean loop) throws ParseException { + private Block parseBlock(Tokenizer tokens, Map superVars, boolean loop) { List> parsedItems = new ArrayList<>(); Map parsedVariables = new HashMap<>( @@ -357,7 +351,7 @@ public class Parser { return new Block(parsedItems, first.getPosition()); } - private Item parseItem(Tokenizer tokens, Map variableMap, boolean loop) throws ParseException { + private Item parseItem(Tokenizer tokens, Map variableMap, boolean loop) { Token token = tokens.get(); if(loop) ParserUtil.checkType(token, Token.Type.IDENTIFIER, Token.Type.IF_STATEMENT, Token.Type.WHILE_LOOP, Token.Type.FOR_LOOP, Token.Type.NUMBER_VARIABLE, Token.Type.STRING_VARIABLE, Token.Type.BOOLEAN_VARIABLE, @@ -383,7 +377,7 @@ public class Parser { else throw new UnsupportedOperationException("Unexpected token " + token.getType() + ": " + token.getPosition()); } - private Assignment parseAssignment(Tokenizer tokens, Map variableMap) throws ParseException { + private Assignment parseAssignment(Tokenizer tokens, Map variableMap) { Token identifier = tokens.consume(); ParserUtil.checkType(identifier, Token.Type.IDENTIFIER); @@ -397,8 +391,7 @@ public class Parser { return new Assignment<>(value, identifier.getContent(), identifier.getPosition()); } - private Function parseFunction(Tokenizer tokens, boolean fullStatement, Map variableMap) - throws ParseException { + private Function parseFunction(Tokenizer tokens, boolean fullStatement, Map variableMap) { Token identifier = tokens.consume(); ParserUtil.checkType(identifier, Token.Type.IDENTIFIER); // First token must be identifier @@ -440,7 +433,7 @@ public class Parser { return id; } - private List> getArgs(Tokenizer tokens, Map variableMap) throws ParseException { + private List> getArgs(Tokenizer tokens, Map variableMap) { List> args = new ArrayList<>(); while(!tokens.get().getType().equals(Token.Type.GROUP_END)) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java index 11f89a8e2..3224c69ad 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java @@ -44,17 +44,17 @@ public class ParserUtil { PRECEDENCE.put(Token.Type.BOOLEAN_OR, booleanOps); } - public static void checkType(Token token, Token.Type... expected) throws ParseException { + public static void checkType(Token token, Token.Type... expected) { for(Token.Type type : expected) if(token.getType().equals(type)) return; throw new ParseException("Expected " + Arrays.toString(expected) + " but found " + token.getType(), token.getPosition()); } - public static void checkReturnType(Returnable returnable, Returnable.ReturnType... types) throws ParseException { + public static void checkReturnType(Returnable returnable, Returnable.ReturnType... types) { for(Returnable.ReturnType type : types) if(returnable.returnType().equals(type)) return; throw new ParseException("Expected " + Arrays.toString(types) + " but found " + returnable.returnType(), returnable.getPosition()); } - public static void checkArithmeticOperation(Returnable left, Returnable right, Token operation) throws ParseException { + public static void checkArithmeticOperation(Returnable left, Returnable right, Token operation) { if(!left.returnType().equals(Returnable.ReturnType.NUMBER) || !right.returnType().equals(Returnable.ReturnType.NUMBER)) { throw new ParseException( "Operation " + operation.getType() + " not supported between " + left.returnType() + " and " + right.returnType(), @@ -62,7 +62,7 @@ public class ParserUtil { } } - public static void checkBooleanOperation(Returnable left, Returnable right, Token operation) throws ParseException { + public static void checkBooleanOperation(Returnable left, Returnable right, Token operation) { if(!left.returnType().equals(Returnable.ReturnType.BOOLEAN) || !right.returnType().equals(Returnable.ReturnType.BOOLEAN)) { throw new ParseException( "Operation " + operation.getType() + " not supported between " + left.returnType() + " and " + right.returnType(), @@ -70,7 +70,7 @@ public class ParserUtil { } } - public static void checkVarType(Token token, Returnable.ReturnType returnType) throws ParseException { + public static void checkVarType(Token token, Returnable.ReturnType returnType) { if(returnType.equals(Returnable.ReturnType.STRING) && token.getType().equals(Token.Type.STRING_VARIABLE)) return; if(returnType.equals(Returnable.ReturnType.NUMBER) && token.getType().equals(Token.Type.NUMBER_VARIABLE)) return; if(returnType.equals(Returnable.ReturnType.BOOLEAN) && token.getType().equals(Token.Type.BOOLEAN_VARIABLE)) return; @@ -84,12 +84,12 @@ public class ParserUtil { * * @throws ParseException If token isn't a binary operator */ - public static void checkBinaryOperator(Token token) throws ParseException { + public static void checkBinaryOperator(Token token) { if(!token.isBinaryOperator()) throw new ParseException("Expected binary operator, found " + token.getType(), token.getPosition()); } - public static Returnable.ReturnType getVariableReturnType(Token varToken) throws ParseException { + public static Returnable.ReturnType getVariableReturnType(Token varToken) { return switch(varToken.getType()) { case NUMBER_VARIABLE -> Returnable.ReturnType.NUMBER; case STRING_VARIABLE -> Returnable.ReturnType.STRING; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java index f016b3700..b56340d0a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.terrascript.parser.exceptions; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -public class ParseException extends Exception { +public class ParseException extends RuntimeException { private static final long serialVersionUID = 6744390543046766386L; private final Position position; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java index 7c0fa41a8..a2916174b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java @@ -8,7 +8,7 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; public interface FunctionBuilder> { - T build(List> argumentList, Position position) throws ParseException; + T build(List> argumentList, Position position); int argNumber(); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index 7317ad726..c7b0fe221 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -56,7 +56,7 @@ public class StructureScript implements Structure { private String tempID; public StructureScript(InputStream inputStream, Platform platform, Registry registry, Registry lootRegistry, - Registry> functionRegistry) throws ParseException { + Registry> functionRegistry) { Parser parser; try { parser = new Parser(IOUtils.toString(inputStream, Charset.defaultCharset())); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index 543feb5a8..f99727389 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -21,7 +21,7 @@ public class BlockFunctionBuilder implements FunctionBuilder { @SuppressWarnings("unchecked") @Override - public BlockFunction build(List> argumentList, Position position) throws ParseException { + public BlockFunction build(List> argumentList, Position position) { if(argumentList.size() < 4) throw new ParseException("Expected data", position); Returnable booleanReturnable = new BooleanConstant(true, position); if(argumentList.size() == 5) booleanReturnable = (Returnable) argumentList.get(4); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java index f6e3eae13..483f98947 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java @@ -19,7 +19,7 @@ public class CheckFunctionBuilder implements FunctionBuilder { @SuppressWarnings("unchecked") @Override - public CheckFunction build(List> argumentList, Position position) throws ParseException { + public CheckFunction build(List> argumentList, Position position) { return new CheckFunction(platform, (Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java index 43546ee17..2c3d3c289 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java @@ -19,7 +19,7 @@ public class EntityFunctionBuilder implements FunctionBuilder { @SuppressWarnings("unchecked") @Override - public EntityFunction build(List> argumentList, Position position) throws ParseException { + public EntityFunction build(List> argumentList, Position position) { return new EntityFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java index 7cdaf8935..f2cd93cd8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java @@ -19,7 +19,7 @@ public class PullFunctionBuilder implements FunctionBuilder { @SuppressWarnings("unchecked") @Override - public PullFunction build(List> argumentList, Position position) throws ParseException { + public PullFunction build(List> argumentList, Position position) { return new PullFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java index a001051ce..bc0334f65 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java @@ -12,7 +12,7 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; public class RandomFunctionBuilder implements FunctionBuilder { @SuppressWarnings("unchecked") @Override - public RandomFunction build(List> argumentList, Position position) throws ParseException { + public RandomFunction build(List> argumentList, Position position) { return new RandomFunction((Returnable) argumentList.get(0), position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java index 8fe2815ca..793cd7cb2 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java @@ -11,7 +11,7 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; public class RecursionsFunctionBuilder implements FunctionBuilder { @Override - public RecursionsFunction build(List> argumentList, Position position) throws ParseException { + public RecursionsFunction build(List> argumentList, Position position) { return new RecursionsFunction(position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java index aaacf31ef..51d269133 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java @@ -16,7 +16,7 @@ public class SetMarkFunctionBuilder implements FunctionBuilder @SuppressWarnings("unchecked") @Override - public SetMarkFunction build(List> argumentList, Position position) throws ParseException { + public SetMarkFunction build(List> argumentList, Position position) { return new SetMarkFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), position); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java index e8f90bb77..e1b9b41a5 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java @@ -19,7 +19,7 @@ public class StateFunctionBuilder implements FunctionBuilder { @SuppressWarnings("unchecked") @Override - public StateFunction build(List> argumentList, Position position) throws ParseException { + public StateFunction build(List> argumentList, Position position) { if(argumentList.size() < 4) throw new ParseException("Expected data", position); return new StateFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), platform, position); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java index 51575849d..95c0a4164 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java @@ -24,7 +24,7 @@ public class StructureFunctionBuilder implements FunctionBuilder> argumentList, Position position) throws ParseException { + public StructureFunction build(List> argumentList, Position position) { if(argumentList.size() < 5) throw new ParseException("Expected rotations", position); return new StructureFunction((Returnable) argumentList.remove(0), (Returnable) argumentList.remove(0), diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java index 420601b11..cae74890e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java @@ -25,7 +25,7 @@ public class EntityFunction implements Function { private final Platform platform; public EntityFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform platform, - Position position) throws ParseException { + Position position) { this.position = position; this.platform = platform; if(!(data instanceof ConstantExpression)) throw new ParseException("Entity data must be constant", data.getPosition()); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index 8866c1edc..b80310839 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -26,7 +26,7 @@ public class PullFunction implements Function { private final Position position; public PullFunction(Returnable x, Returnable y, Returnable z, Returnable data, Platform platform, - Position position) throws ParseException { + Position position) { this.position = position; if(!(data instanceof ConstantExpression)) throw new ParseException("Block data must be constant", data.getPosition()); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java index 72438f3d4..566adc012 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java @@ -20,7 +20,7 @@ public class Tokenizer { private Token current; private Token last; - public Tokenizer(String data) throws ParseException { + public Tokenizer(String data) { reader = new Lookahead(new StringReader(data + '\0')); current = fetchCheck(); } @@ -32,7 +32,7 @@ public class Tokenizer { * * @throws ParseException If token does not exist */ - public Token get() throws ParseException { + public Token get() { if(!hasNext()) throw new ParseException("Unexpected end of input", last.getPosition()); return current; } @@ -44,14 +44,14 @@ public class Tokenizer { * * @throws ParseException If token does not exist */ - public Token consume() throws ParseException { + public Token consume() { if(!hasNext()) throw new ParseException("Unexpected end of input", last.getPosition()); Token temp = current; current = fetchCheck(); return temp; } - private Token fetchCheck() throws ParseException { + private Token fetchCheck() { Token fetch = fetch(); if(fetch != null) { last = fetch;