Clean up some goal constructors

src/main/java/baritone/bot/pathing/goals/Goal.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import baritone.bot.pathing.actions.ActionCosts;

src/main/java/baritone/bot/pathing/goals/GoalBlock.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;
@@ -13,7 +8,7 @@ import net.minecraft.util.math.BlockPos;
  */
 public class GoalBlock implements Goal {
 
-    final int x, y, z;
+    private final int x, y, z;
 
     public GoalBlock(BlockPos pos) {
         this(pos.getX(), pos.getY(), pos.getZ());
@@ -25,10 +20,6 @@ public class GoalBlock implements Goal {
         this.z = z;
     }
 
-    public BlockPos pos() {
-        return new BlockPos(x, y, z);
-    }
-
     @Override
     public boolean isInGoal(BlockPos pos) {
         return pos.getX() == this.x && pos.getY() == this.y && pos.getZ() == this.z;
@@ -48,6 +39,11 @@ public class GoalBlock implements Goal {
         return calculate(xDiff, yDiff, zDiff);
     }
     
+    @Override
+    public String toString() {
+        return "Goal{x=" + x + ",y=" + y + ",z=" + z + "}";
+    }
+
     public static double calculate(double xDiff, double yDiff, double zDiff) {
         double pythaDist = Math.sqrt(xDiff * xDiff + zDiff * zDiff);
         double heuristic = 0;
@@ -70,8 +66,7 @@ public class GoalBlock implements Goal {
         return heuristic;
     }
 
-    @Override
+    public BlockPos getGoalPos() {
-    public String toString() {
+        return new BlockPos(x, y, z);
-        return "Goal{x=" + x + ",y=" + y + ",z=" + z + "}";
     }
 }

src/main/java/baritone/bot/pathing/goals/GoalComposite.java

@@ -24,19 +24,11 @@ public class GoalComposite implements Goal {
     }
 
     public GoalComposite(BlockPos... blocks) {
-        goals = new Goal[blocks.length];
+        this(Arrays.asList(blocks));
-        for (int i = 0; i < blocks.length; i++) {
-            goals[i] = new GoalBlock(blocks[i]);
-        }
     }
 
     public GoalComposite(Collection<BlockPos> blocks) {
-        goals = new Goal[blocks.size()];
+        this(blocks.stream().map(GoalBlock::new).toArray(Goal[]::new));
-        int i = 0;
-        for (BlockPos pos : blocks) {
-            goals[i] = new GoalBlock(pos);
-            i++;
-        }
     }
 
     public Goal[] goals() {

src/main/java/baritone/bot/pathing/goals/GoalGetToBlock.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import net.minecraft.util.EnumFacing;

src/main/java/baritone/bot/pathing/goals/GoalRunAway.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import java.util.Arrays;

src/main/java/baritone/bot/pathing/goals/GoalTwoBlocks.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;

src/main/java/baritone/bot/pathing/goals/GoalXZ.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;

src/main/java/baritone/bot/pathing/goals/GoalYLevel.java

@@ -1,8 +1,3 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package baritone.bot.pathing.goals;
 
 import net.minecraft.util.math.BlockPos;