From 55e8382e18673af7ca8ab506a8735e71c270faa0 Mon Sep 17 00:00:00 2001 From: Evan Grinnell Date: Thu, 2 Oct 2025 17:46:23 -0700 Subject: [PATCH] Replaced 'with' with 'w' --- ...epNetWithCoral.java => PrepNetWCoral.java} | 4 +-- ...ithCoral.java => PrepProcessorWCoral.java} | 4 +-- ...ralWithAlgae.java => PrepCoralWAlgae.java} | 4 +-- ...WithCoral.java => AlgaeScoringWCoral.java} | 4 +-- ...WithAlgae.java => ScoringCoralWAlgae.java} | 4 +-- ...ighWithCoral.java => CleanHighWCoral.java} | 4 +-- ...nLowWithCoral.java => CleanLowWCoral.java} | 4 +-- ...oral.java => IntakeAlgaeGroundWCoral.java} | 4 +-- ...lgae.java => IntakeCoralGroundWAlgae.java} | 4 +-- ...gae.java => IntakeCoralStationWAlgae.java} | 4 +-- .../frc/robot/subsystems/StateMachine.java | 26 +++++++++---------- 11 files changed, 33 insertions(+), 33 deletions(-) rename src/main/java/frc/robot/commands/States/prep_algae/{PrepNetWithCoral.java => PrepNetWCoral.java} (93%) rename src/main/java/frc/robot/commands/States/prep_algae/{PrepProcessorWithCoral.java => PrepProcessorWCoral.java} (91%) rename src/main/java/frc/robot/commands/States/prep_coral/{PrepCoralWithAlgae.java => PrepCoralWAlgae.java} (95%) rename src/main/java/frc/robot/commands/States/scoring/{ScoringAlgaeWithCoral.java => AlgaeScoringWCoral.java} (93%) rename src/main/java/frc/robot/commands/States/scoring/{ScoringCoralWithAlgae.java => ScoringCoralWAlgae.java} (92%) rename src/main/java/frc/robot/commands/States/second_scoring_element/{CleanHighWithCoral.java => CleanHighWCoral.java} (94%) rename src/main/java/frc/robot/commands/States/second_scoring_element/{CleanLowWithCoral.java => CleanLowWCoral.java} (94%) rename src/main/java/frc/robot/commands/States/second_scoring_element/{IntakeAlgaeGroundWithCoral.java => IntakeAlgaeGroundWCoral.java} (91%) rename src/main/java/frc/robot/commands/States/second_scoring_element/{IntakeCoralGroundWithAlgae.java => IntakeCoralGroundWAlgae.java} (91%) rename src/main/java/frc/robot/commands/States/second_scoring_element/{IntakeCoralStationWithAlgae.java => IntakeCoralStationWAlgae.java} (91%) diff --git a/src/main/java/frc/robot/commands/States/prep_algae/PrepNetWithCoral.java b/src/main/java/frc/robot/commands/States/prep_algae/PrepNetWCoral.java similarity index 93% rename from src/main/java/frc/robot/commands/States/prep_algae/PrepNetWithCoral.java rename to src/main/java/frc/robot/commands/States/prep_algae/PrepNetWCoral.java index 6e8bb7e9..07f28933 100644 --- a/src/main/java/frc/robot/commands/States/prep_algae/PrepNetWithCoral.java +++ b/src/main/java/frc/robot/commands/States/prep_algae/PrepNetWCoral.java @@ -16,7 +16,7 @@ import frc.robot.subsystems.StateMachine.RobotState; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class PrepNetWithCoral extends Command { +public class PrepNetWCoral extends Command { Motion globalMotion; Rotors globalRotors; StateMachine globalStateMachine; @@ -24,7 +24,7 @@ public class PrepNetWithCoral extends Command { Pose2d closestPoseByRotation; MechanismPositionGroup prepNet; - public PrepNetWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, + public PrepNetWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, Drivetrain subDrivetrain) { // Use addRequirements() here to declare subsystem dependencies. globalMotion = subMotion; diff --git a/src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWithCoral.java b/src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWCoral.java similarity index 91% rename from src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWithCoral.java rename to src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWCoral.java index b1c4c91b..ecee11cf 100644 --- a/src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWithCoral.java +++ b/src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWCoral.java @@ -12,12 +12,12 @@ import frc.robot.subsystems.StateMachine; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class PrepProcessorWithCoral extends Command { +public class PrepProcessorWCoral extends Command { Motion globalMotion; Rotors globalRotors; StateMachine globalStateMachine; - public PrepProcessorWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { + public PrepProcessorWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { // Use addRequirements() here to declare subsystem dependencies. globalMotion = subMotion; globalRotors = subRotors; diff --git a/src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWithAlgae.java b/src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWAlgae.java similarity index 95% rename from src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWithAlgae.java rename to src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWAlgae.java index 9f754c8b..98a42686 100644 --- a/src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWithAlgae.java +++ b/src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWAlgae.java @@ -16,7 +16,7 @@ import frc.robot.subsystems.StateMachine.RobotState; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class PrepCoralWithAlgae extends Command { +public class PrepCoralWAlgae extends Command { /** Creates a new PrepCoralWithAlgae. */ Drivetrain globalDrivetrain; Motion globalMotion; @@ -28,7 +28,7 @@ public class PrepCoralWithAlgae extends Command { MechanismPositionGroup prepL4; int targetLevel; - public PrepCoralWithAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, + public PrepCoralWAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, Drivetrain subDrivetrain, int level) { // Use addRequirements() here to declare subsystem dependencies. globalMotion = subMotion; diff --git a/src/main/java/frc/robot/commands/States/scoring/ScoringAlgaeWithCoral.java b/src/main/java/frc/robot/commands/States/scoring/AlgaeScoringWCoral.java similarity index 93% rename from src/main/java/frc/robot/commands/States/scoring/ScoringAlgaeWithCoral.java rename to src/main/java/frc/robot/commands/States/scoring/AlgaeScoringWCoral.java index 9273434e..0f14c48f 100644 --- a/src/main/java/frc/robot/commands/States/scoring/ScoringAlgaeWithCoral.java +++ b/src/main/java/frc/robot/commands/States/scoring/AlgaeScoringWCoral.java @@ -11,11 +11,11 @@ import frc.robot.subsystems.Rotors; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class ScoringAlgaeWithCoral extends Command { +public class AlgaeScoringWCoral extends Command { StateMachine globalStateMachine; Rotors globalRotors; - public ScoringAlgaeWithCoral(StateMachine globalStateMachine, Rotors subRotors) { + public AlgaeScoringWCoral(StateMachine globalStateMachine, Rotors subRotors) { // Use addRequirements() here to declare subsystem dependencies. globalRotors = subRotors; this.globalStateMachine = globalStateMachine; diff --git a/src/main/java/frc/robot/commands/States/scoring/ScoringCoralWithAlgae.java b/src/main/java/frc/robot/commands/States/scoring/ScoringCoralWAlgae.java similarity index 92% rename from src/main/java/frc/robot/commands/States/scoring/ScoringCoralWithAlgae.java rename to src/main/java/frc/robot/commands/States/scoring/ScoringCoralWAlgae.java index 32fbde26..cab2fa23 100644 --- a/src/main/java/frc/robot/commands/States/scoring/ScoringCoralWithAlgae.java +++ b/src/main/java/frc/robot/commands/States/scoring/ScoringCoralWAlgae.java @@ -11,11 +11,11 @@ import frc.robot.subsystems.Rotors; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class ScoringCoralWithAlgae extends Command { +public class ScoringCoralWAlgae extends Command { StateMachine globalStateMachine; Rotors globalRotors; - public ScoringCoralWithAlgae(StateMachine globalStateMachine, Rotors subRotors) { + public ScoringCoralWAlgae(StateMachine globalStateMachine, Rotors subRotors) { // Use addRequirements() here to declare subsystem dependencies. globalRotors = subRotors; this.globalStateMachine = globalStateMachine; diff --git a/src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWithCoral.java b/src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWCoral.java similarity index 94% rename from src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWithCoral.java rename to src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWCoral.java index ced97350..ace9a5d5 100644 --- a/src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWithCoral.java +++ b/src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWCoral.java @@ -17,7 +17,7 @@ import frc.robot.subsystems.StateMachine.RobotState; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class CleanHighWithCoral extends Command { +public class CleanHighWCoral extends Command { /** Creates a new CleanHighWithCoral. */ Motion globalMotion; Rotors globalRotors; @@ -26,7 +26,7 @@ public class CleanHighWithCoral extends Command { Drivetrain globalDrivetrain; MechanismPositionGroup cleanHighWithCoral; - public CleanHighWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, + public CleanHighWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, Drivetrain subDrivetrain) { // Use addRequirements() here to declare subsystem dependencies. this.globalStateMachine = globalStateMachine; diff --git a/src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWithCoral.java b/src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWCoral.java similarity index 94% rename from src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWithCoral.java rename to src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWCoral.java index d4db06df..a549bb0e 100644 --- a/src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWithCoral.java +++ b/src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWCoral.java @@ -17,7 +17,7 @@ import frc.robot.subsystems.StateMachine.RobotState; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class CleanLowWithCoral extends Command { +public class CleanLowWCoral extends Command { /** Creates a new CleanLowWithCoral. */ Motion globalMotion; Rotors globalRotors; @@ -26,7 +26,7 @@ public class CleanLowWithCoral extends Command { Drivetrain globalDrivetrain; MechanismPositionGroup cleanLowWithCoral; - public CleanLowWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, + public CleanLowWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors, Drivetrain subDrivetrain) { // Use addRequirements() here to declare subsystem dependencies. this.globalStateMachine = globalStateMachine; diff --git a/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWithCoral.java b/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWCoral.java similarity index 91% rename from src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWithCoral.java rename to src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWCoral.java index b8e21082..6164dfee 100644 --- a/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWithCoral.java +++ b/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWCoral.java @@ -13,12 +13,12 @@ import frc.robot.subsystems.StateMachine; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class IntakeAlgaeGroundWithCoral extends Command { +public class IntakeAlgaeGroundWCoral extends Command { Motion globalMotion; Rotors globalRotors; StateMachine globalStateMachine; - public IntakeAlgaeGroundWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { + public IntakeAlgaeGroundWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { // Use addRequirements() here to declare subsystem dependencies. globalMotion = subMotion; globalRotors = subRotors; diff --git a/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWithAlgae.java b/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWAlgae.java similarity index 91% rename from src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWithAlgae.java rename to src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWAlgae.java index 80c66a02..656ded05 100644 --- a/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWithAlgae.java +++ b/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWAlgae.java @@ -13,12 +13,12 @@ import frc.robot.subsystems.Rotors; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class IntakeCoralGroundWithAlgae extends Command { +public class IntakeCoralGroundWAlgae extends Command { StateMachine globalStateMachine; Motion globalMotion; Rotors globalRotors; - public IntakeCoralGroundWithAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { + public IntakeCoralGroundWAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { // Use addRequirements() here to declare subsystem dependencies. globalMotion = subMotion; globalRotors = subRotors; diff --git a/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWithAlgae.java b/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWAlgae.java similarity index 91% rename from src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWithAlgae.java rename to src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWAlgae.java index 239366cb..f1d51e47 100644 --- a/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWithAlgae.java +++ b/src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWAlgae.java @@ -13,12 +13,12 @@ import frc.robot.subsystems.StateMachine.RobotState; /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */ -public class IntakeCoralStationWithAlgae extends Command { +public class IntakeCoralStationWAlgae extends Command { Motion globalMotion; Rotors globalRotors; StateMachine globalStateMachine; - public IntakeCoralStationWithAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { + public IntakeCoralStationWAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) { // Use addRequirements() here to declare subsystem dependencies. globalMotion = subMotion; globalRotors = subRotors; diff --git a/src/main/java/frc/robot/subsystems/StateMachine.java b/src/main/java/frc/robot/subsystems/StateMachine.java index b4aa1f44..bf209894 100644 --- a/src/main/java/frc/robot/subsystems/StateMachine.java +++ b/src/main/java/frc/robot/subsystems/StateMachine.java @@ -167,7 +167,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_ZERO_WITH_ALGAE: case PREP_ALGAE_PROCESSOR_WITH_CORAL: case PREP_ALGAE_NET_WITH_CORAL: - return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 2); + return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 2); } break; @@ -180,7 +180,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_ZERO_WITH_ALGAE: case PREP_ALGAE_PROCESSOR_WITH_CORAL: case PREP_ALGAE_NET_WITH_CORAL: - return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 3); + return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 3); } break; @@ -193,7 +193,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_ZERO_WITH_ALGAE: case PREP_ALGAE_PROCESSOR_WITH_CORAL: case PREP_ALGAE_NET_WITH_CORAL: - return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, + return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 4); } @@ -207,7 +207,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_L4_WITH_ALGAE: case PREP_ALGAE_PROCESSOR_WITH_CORAL: case PREP_ALGAE_NET_WITH_CORAL: - return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 0); + return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 0); } break; @@ -254,7 +254,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_L3_WITH_ALGAE: case PREP_CORAL_L4_WITH_ALGAE: case PREP_CORAL_ZERO_WITH_ALGAE: - return new PrepNetWithCoral(subStateMachine, subMotion, subRotors, subDrivetrain); + return new PrepNetWCoral(subStateMachine, subMotion, subRotors, subDrivetrain); } break; @@ -267,7 +267,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_L3_WITH_ALGAE: case PREP_CORAL_L4_WITH_ALGAE: case PREP_CORAL_ZERO_WITH_ALGAE: - return new PrepProcessorWithCoral(subStateMachine, subMotion, subRotors); + return new PrepProcessorWCoral(subStateMachine, subMotion, subRotors); } break; @@ -405,7 +405,7 @@ public Command tryState(RobotState desiredState) { case PREP_ALGAE_NET_WITH_CORAL: case PREP_ALGAE_PROCESSOR_WITH_CORAL: case PREP_CORAL_ZERO_WITH_ALGAE: - return new ScoringAlgaeWithCoral(subStateMachine, subRotors); + return new AlgaeScoringWCoral(subStateMachine, subRotors); } break; @@ -416,7 +416,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_L4_WITH_ALGAE: case PREP_CORAL_ZERO_WITH_ALGAE: - return new ScoringCoralWithAlgae(subStateMachine, subRotors); + return new ScoringCoralWAlgae(subStateMachine, subRotors); } break; @@ -428,7 +428,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_L4: case HAS_CORAL: case INTAKE_ALGAE_GROUND_WITH_CORAL: - return new CleanHighWithCoral(subStateMachine, subMotion, subRotors, subDrivetrain); + return new CleanHighWCoral(subStateMachine, subMotion, subRotors, subDrivetrain); } break; @@ -440,7 +440,7 @@ public Command tryState(RobotState desiredState) { case PREP_CORAL_L4: case CLEAN_HIGH_WITH_CORAL: case INTAKE_ALGAE_GROUND_WITH_CORAL: - return new CleanLowWithCoral(subStateMachine, subMotion, subRotors, subDrivetrain); + return new CleanLowWCoral(subStateMachine, subMotion, subRotors, subDrivetrain); } break; @@ -456,7 +456,7 @@ public Command tryState(RobotState desiredState) { switch (currentRobotState) { case HAS_ALGAE: case INTAKE_CORAL_STATION_WITH_ALGAE: - return new IntakeCoralGroundWithAlgae(subStateMachine, subMotion, subRotors); + return new IntakeCoralGroundWAlgae(subStateMachine, subMotion, subRotors); } break; @@ -466,14 +466,14 @@ public Command tryState(RobotState desiredState) { case CLEAN_HIGH_WITH_CORAL: case CLEAN_LOW_WITH_CORAL: case PREP_CORAL_ZERO: - return new IntakeAlgaeGroundWithCoral(subStateMachine, subMotion, subRotors); + return new IntakeAlgaeGroundWCoral(subStateMachine, subMotion, subRotors); } break; case INTAKE_CORAL_STATION_WITH_ALGAE: switch (currentRobotState) { case HAS_ALGAE: case INTAKE_CORAL_GROUND_WITH_ALGAE: - return new IntakeCoralStationWithAlgae(subStateMachine, subMotion, subRotors); + return new IntakeCoralStationWAlgae(subStateMachine, subMotion, subRotors); } break; }