diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/AddTelemetry.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/AddTelemetry.java index fbedf14..3ee1895 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/AddTelemetry.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/AddTelemetry.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class AddTelemetry extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ClampOnPixel.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ClampOnPixel.java index 866d245..6a562f3 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ClampOnPixel.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ClampOnPixel.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class ClampOnPixel extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DriveFieldRelative.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DriveFieldRelative.java index 001eda3..bd55761 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DriveFieldRelative.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DriveFieldRelative.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class DriveFieldRelative extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DroneRelease.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DroneRelease.java index e95c758..c932d78 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DroneRelease.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/DroneRelease.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class DroneRelease extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ExtendSlides.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ExtendSlides.java index cd2e1af..53eb81b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ExtendSlides.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ExtendSlides.java @@ -1,9 +1,7 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; -import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.Lift; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; -import org.firstinspires.ftc.teamcode.ftc16072.Robot; public class ExtendSlides extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeFastDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeFastDrive.java index d132d77..0f14c3e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeFastDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeFastDrive.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class MakeFastDrive extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeNormalDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeNormalDrive.java index 78a3677..f1ec85b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeNormalDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeNormalDrive.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class MakeNormalDrive extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeSlowDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeSlowDrive.java index 0dfe5cc..8363c3c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeSlowDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MakeSlowDrive.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class MakeSlowDrive extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveArmAndLift.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveArmAndLift.java index 7271727..4aec8ca 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveArmAndLift.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveArmAndLift.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.Lift; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToIntakePosition.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToIntakePosition.java index 70962b9..090c857 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToIntakePosition.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToIntakePosition.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class MoveLiftToIntakePosition extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToPixelGrabPosition.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToPixelGrabPosition.java index 9534ad4..a07e69e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToPixelGrabPosition.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/MoveLiftToPixelGrabPosition.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class MoveLiftToPixelGrabPosition extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels.java index f920d0d..526a6c7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class PlacePixels extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels2.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels2.java index 8488949..7abc746 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels2.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePixels2.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class PlacePixels2 extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePurplePixel.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePurplePixel.java index 28dbec0..c3bc111 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePurplePixel.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/PlacePurplePixel.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class PlacePurplePixel extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ReleaseAutoPixel.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ReleaseAutoPixel.java index e8d26ee..66a1a75 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ReleaseAutoPixel.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ReleaseAutoPixel.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class ReleaseAutoPixel extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ResetGyro.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ResetGyro.java index 9e30183..6019f98 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ResetGyro.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/ResetGyro.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class ResetGyro extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/RumbleGamepad.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/RumbleGamepad.java index 31bbe46..54952d3 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/RumbleGamepad.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/RumbleGamepad.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class RumbleGamepad extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetBackboardFromSpikeTrajectory.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetBackboardFromSpikeTrajectory.java index 17c5a72..fc73955 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetBackboardFromSpikeTrajectory.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetBackboardFromSpikeTrajectory.java @@ -1,8 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import com.acmerobotics.roadrunner.trajectory.Trajectory; - -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; import org.firstinspires.ftc.teamcode.ftc16072.Util.Alliance; import org.firstinspires.ftc.teamcode.ftc16072.Util.SpikePosition; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetLiftPosition.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetLiftPosition.java index c49eddc..b689599 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetLiftPosition.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SetLiftPosition.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.Lift; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SpikeLocationTelemetry.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SpikeLocationTelemetry.java index 8a94bc9..14982d7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SpikeLocationTelemetry.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/SpikeLocationTelemetry.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class SpikeLocationTelemetry extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateArmAndLift.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateArmAndLift.java index 1c9bfa4..39ce1e5 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateArmAndLift.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateArmAndLift.java @@ -1,5 +1,5 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; import org.firstinspires.ftc.teamcode.ftc16072.Util.ArmControl; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateClimber.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateClimber.java index 74b3edb..987e444 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateClimber.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateClimber.java @@ -1,5 +1,5 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class UpdateClimber extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateGrabber.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateGrabber.java index 8281c5d..cf49a67 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateGrabber.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateGrabber.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class UpdateGrabber extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateIntake.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateIntake.java index cc61343..1f7e474 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateIntake.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/UpdateIntake.java @@ -1,5 +1,5 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class UpdateIntake extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/delayAction.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/delayAction.java index 16419de..87fb484 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/delayAction.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Actions/delayAction.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Actions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class delayAction extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Failover.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Failover.java similarity index 91% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Failover.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Failover.java index 61c062a..38d2db8 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Failover.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Failover.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees; +package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Node.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Node.java similarity index 82% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Node.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Node.java index 3329d70..aec51f1 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Node.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Node.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees; +package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Not.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Not.java similarity index 76% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Not.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Not.java index 4d9d17a..82457ec 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Not.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Not.java @@ -1,11 +1,8 @@ -package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees; +package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - //Not reverses a value public class Not extends Node { Node child; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Parallel.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Parallel.java similarity index 88% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Parallel.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Parallel.java index 2b8e730..2cede93 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Parallel.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Parallel.java @@ -1,5 +1,6 @@ -package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees; +package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; import java.util.Arrays; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Sequence.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Sequence.java similarity index 83% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Sequence.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Sequence.java index 693f871..5e0ad5d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Sequence.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/BaseNodes/Sequence.java @@ -1,5 +1,6 @@ -package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees; +package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; import java.util.Arrays; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreNotSlidesExtended.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreNotSlidesExtended.java index 38138fd..b26861a 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreNotSlidesExtended.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreNotSlidesExtended.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class AreNotSlidesExtended extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreSlidesExtended.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreSlidesExtended.java index 568a016..6062889 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreSlidesExtended.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/AreSlidesExtended.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class AreSlidesExtended extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/EnoughTimeForCycle.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/EnoughTimeForCycle.java index 345158a..82c3f5c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/EnoughTimeForCycle.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/EnoughTimeForCycle.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class EnoughTimeForCycle extends Node{ diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1Pixel.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1Pixel.java index 492f3ef..c11e8cc 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1Pixel.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1Pixel.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class Has1Pixel extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1or2Pixels.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1or2Pixels.java index 25e5e36..2293748 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1or2Pixels.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has1or2Pixels.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class Has1or2Pixels extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has2Pixels.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has2Pixels.java index dd7a592..6c6e5d1 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has2Pixels.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/Has2Pixels.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class Has2Pixels extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/HasLessThan2Pixels.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/HasLessThan2Pixels.java index ff28a00..9f2bb1b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/HasLessThan2Pixels.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/HasLessThan2Pixels.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class HasLessThan2Pixels extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfExtendSlideButtonPressed.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfExtendSlideButtonPressed.java index 0c93807..84774f7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfExtendSlideButtonPressed.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfExtendSlideButtonPressed.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class IfExtendSlideButtonPressed extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLeftTriggerPressed.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLeftTriggerPressed.java index 91c3380..0b5c615 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLeftTriggerPressed.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLeftTriggerPressed.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class IfLeftTriggerPressed extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftAtBottom.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftAtBottom.java index d695098..fe4b49d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftAtBottom.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftAtBottom.java @@ -1,6 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class IfLiftAtBottom extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftToPixelGrabPosButtonPressed.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftToPixelGrabPosButtonPressed.java index 5b87adf..49eb146 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftToPixelGrabPosButtonPressed.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IfLiftToPixelGrabPosButtonPressed.java @@ -1,7 +1,6 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Failover; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class IfLiftToPixelGrabPosButtonPressed extends Node { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IsBackboardInRange.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IsBackboardInRange.java index e73db35..cf3de7c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IsBackboardInRange.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/BehaviorTrees/Conditions/IsBackboardInRange.java @@ -1,10 +1,10 @@ package org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Conditions; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import org.firstinspires.ftc.teamcode.ftc16072.OpModes.QQOpMode; public class IsBackboardInRange extends Node { - public double BACKBOARD_RANGE_CM = 15; + public double BACKBOARD_RANGE_CM = 18; @Override public State tick(QQOpMode opmode) { if (opmode.robot.backDistanceSensor.distanceToBackboard() SAFE_POSITION){ diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/Util/DebugTree.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/Util/DebugTree.java index 816baaa..1217a3c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/Util/DebugTree.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/Util/DebugTree.java @@ -2,7 +2,7 @@ import androidx.annotation.NonNull; -import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.Node; +import org.firstinspires.ftc.teamcode.ftc16072.BehaviorTrees.BaseNodes.Node; import java.util.LinkedList; import java.util.List;