make ParseException unchecked

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<String, Returnable.ReturnType> variableMap, Position start)
+    private WhileKeyword parseWhileLoop(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap, Position start) {
-    throws ParseException {
         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<Boolean>) first, start); // While loop
     }
     
-    private IfKeyword parseIfStatement(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap, Position start, boolean loop)
+    private IfKeyword parseIfStatement(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap, Position start, boolean loop) {
-    throws ParseException {
         Returnable<?> condition = parseExpression(tokens, true, variableMap);
         ParserUtil.checkReturnType(condition, Returnable.ReturnType.BOOLEAN);
         
@@ -146,8 +144,7 @@ public class Parser {
         return new IfKeyword(statement, (Returnable<Boolean>) condition, elseIf, elseBlock, start); // If statement
     }
     
-    private Block parseStatementBlock(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap, boolean loop)
+    private Block parseStatementBlock(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap, boolean loop) {
-    throws ParseException {
         
         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<String, Returnable.ReturnType> old, Position start) throws ParseException {
+    private ForKeyword parseForLoop(Tokenizer tokens, Map<String, Returnable.ReturnType> old, Position start) {
         Map<String, Returnable.ReturnType> 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<String, Returnable.ReturnType> variableMap)
+    private Returnable<?> parseExpression(Tokenizer tokens, boolean full, Map<String, Returnable.ReturnType> variableMap) {
-    throws ParseException {
         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<String, Returnable.ReturnType> variableMap) throws ParseException {
+    private Returnable<?> parseGroup(Tokenizer tokens, Map<String, Returnable.ReturnType> 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<String, Returnable.ReturnType> variableMap)
+    private BinaryOperation<?, ?> parseBinaryOperation(Returnable<?> left, Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap) {
-    throws ParseException {
         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<String, Returnable.ReturnType> variableMap)
+    private Declaration<?> parseVariableDeclaration(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap) {
-    throws ParseException {
         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<String, Returnable.ReturnType> superVars, boolean loop) throws ParseException {
+    private Block parseBlock(Tokenizer tokens, Map<String, Returnable.ReturnType> superVars, boolean loop) {
         List<Item<?>> parsedItems = new ArrayList<>();
         
         Map<String, Returnable.ReturnType> parsedVariables = new HashMap<>(
@@ -357,7 +351,7 @@ public class Parser {
         return new Block(parsedItems, first.getPosition());
     }
     
-    private Item<?> parseItem(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap, boolean loop) throws ParseException {
+    private Item<?> parseItem(Tokenizer tokens, Map<String, Returnable.ReturnType> 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<String, Returnable.ReturnType> variableMap) throws ParseException {
+    private Assignment<?> parseAssignment(Tokenizer tokens, Map<String, Returnable.ReturnType> 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<String, Returnable.ReturnType> variableMap)
+    private Function<?> parseFunction(Tokenizer tokens, boolean fullStatement, Map<String, Returnable.ReturnType> variableMap) {
-    throws ParseException {
         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<Returnable<?>> getArgs(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap) throws ParseException {
+    private List<Returnable<?>> getArgs(Tokenizer tokens, Map<String, Returnable.ReturnType> variableMap) {
         List<Returnable<?>> args = new ArrayList<>();
         
         while(!tokens.get().getType().equals(Token.Type.GROUP_END)) {

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;

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;
     

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 extends Function<?>> {
-    T build(List<Returnable<?>> argumentList, Position position) throws ParseException;
+    T build(List<Returnable<?>> argumentList, Position position);
     
     int argNumber();
     

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<Structure> registry, Registry<LootTable> lootRegistry,
-                           Registry<FunctionBuilder<?>> functionRegistry) throws ParseException {
+                           Registry<FunctionBuilder<?>> functionRegistry) {
         Parser parser;
         try {
             parser = new Parser(IOUtils.toString(inputStream, Charset.defaultCharset()));

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<BlockFunction> {
     
     @SuppressWarnings("unchecked")
     @Override
-    public BlockFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public BlockFunction build(List<Returnable<?>> argumentList, Position position) {
         if(argumentList.size() < 4) throw new ParseException("Expected data", position);
         Returnable<Boolean> booleanReturnable = new BooleanConstant(true, position);
         if(argumentList.size() == 5) booleanReturnable = (Returnable<Boolean>) argumentList.get(4);

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<CheckFunction> {
     
     @SuppressWarnings("unchecked")
     @Override
-    public CheckFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public CheckFunction build(List<Returnable<?>> argumentList, Position position) {
         return new CheckFunction(platform, (Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1),
                                  (Returnable<Number>) argumentList.get(2), position);
     }

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<EntityFunction> {
     
     @SuppressWarnings("unchecked")
     @Override
-    public EntityFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public EntityFunction build(List<Returnable<?>> argumentList, Position position) {
         return new EntityFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1),
                                   (Returnable<Number>) argumentList.get(2), (Returnable<String>) argumentList.get(3), platform, position);
     }

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<PullFunction> {
     
     @SuppressWarnings("unchecked")
     @Override
-    public PullFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public PullFunction build(List<Returnable<?>> argumentList, Position position) {
         return new PullFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1),
                                 (Returnable<Number>) argumentList.get(2), (Returnable<String>) argumentList.get(3), platform, position);
     }

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<RandomFunction> {
     @SuppressWarnings("unchecked")
     @Override
-    public RandomFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public RandomFunction build(List<Returnable<?>> argumentList, Position position) {
         return new RandomFunction((Returnable<Number>) argumentList.get(0), position);
     }
     

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<RecursionsFunction> {
     @Override
-    public RecursionsFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public RecursionsFunction build(List<Returnable<?>> argumentList, Position position) {
         return new RecursionsFunction(position);
     }
     

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<SetMarkFunction>
     
     @SuppressWarnings("unchecked")
     @Override
-    public SetMarkFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public SetMarkFunction build(List<Returnable<?>> argumentList, Position position) {
         return new SetMarkFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1),
                                    (Returnable<Number>) argumentList.get(2), (Returnable<String>) argumentList.get(3), position);
     }

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<StateFunction> {
     
     @SuppressWarnings("unchecked")
     @Override
-    public StateFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public StateFunction build(List<Returnable<?>> argumentList, Position position) {
         if(argumentList.size() < 4) throw new ParseException("Expected data", position);
         return new StateFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1),
                                  (Returnable<Number>) argumentList.get(2), (Returnable<String>) argumentList.get(3), platform, position);

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<StructureFuncti
     
     @SuppressWarnings("unchecked")
     @Override
-    public StructureFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
+    public StructureFunction build(List<Returnable<?>> argumentList, Position position) {
         if(argumentList.size() < 5) throw new ParseException("Expected rotations", position);
         
         return new StructureFunction((Returnable<Number>) argumentList.remove(0), (Returnable<Number>) argumentList.remove(0),

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<Void> {
     private final Platform platform;
     
     public EntityFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> 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());

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<Void> {
     private final Position position;
     
     public PullFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> 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());
         

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;