Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #17 from BEAN-Tastic/oauthCLI
Browse files Browse the repository at this point in the history 
Added oauth
  • Loading branch information
@LiamTalberg
LiamTalberg authored Mar 14, 2024
2 parents c883adb + 944d954 commit 55edfad
Show file tree
Hide file tree
Showing 5 changed files with 317 additions and 154 deletions.
273 changes: 141 additions & 132 deletions src/main/java/com/beantastic/Main.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.beantastic;

import java.io.IOException;
import java.util.List;
import java.util.Random;
import java.util.Scanner;
Expand All @@ -13,6 +14,7 @@
import com.beantastic.logging.ChoiceOption;
import com.beantastic.logging.Logger;
import com.beantastic.logging.UserChoice;
import com.beantastic.oauth.GitHubOAuth;
import com.beantastic.path.PathManager;
import com.beantastic.player.Player;
import com.beantastic.player.PlayerClass;
Expand All @@ -22,139 +24,146 @@

public class Main {

private final Random random;

private final Logger logger;
private final Scanner scanner;
private final EnemyManager enemyManager;
private final ItemManager itemManager;
private final PlayerManager playerManager;

public Main(Random random, Logger logger, Scanner scanner, EnemyManager enemyManager, ItemManager itemManager, PlayerManager playerManager) {
this.random = random;
this.logger = logger;
this.scanner = scanner;
this.enemyManager = enemyManager;
this.itemManager = itemManager;
this.playerManager = playerManager;
}


public static void main(String[] args) {
Random random = new Random();
Scanner scanner = new Scanner(System.in);
Logger logger = new Logger(System.out);

List<PlayerClass> playerClasses = ApitController.getClasses();
PlayerManager playerManager = new PlayerManager(logger, scanner, playerClasses);

List<Enemy> enemies = ApitController.getEnemies();
EnemyManager enemyManager = new EnemyManager(random, enemies.toArray(Enemy[]::new));
List<ItemClass> items = ApitController.getItems();
ItemManager itemManager = new ItemManager(logger, random, scanner, items.toArray(ItemClass[]::new));
Main main = new Main(random, logger, scanner, enemyManager, itemManager, playerManager);

// START GAME
boolean play;
do {
play = main.startGame();
} while (play);

}

//TEMP DATA INSERTION\\
public static PlayerClassManager addClass(){
return new PlayerClassManager(
new PlayerClass("Green Bean Warrior",
"A sturdy bean skilled in close combat, wielding the might of beans with brute force.",
new StatBlock(5, 3, 2, 2)),
new PlayerClass("Magic Coffee Bean",
"A magical bean adept at harnessing the mystical energies of beans to cast powerful spells.",
new StatBlock(3, 2, 3, 3)),
new PlayerClass("Sneaky Black Bean",
"A nimble bean with a knack for stealth and deception, striking enemies from the shadows.",
new StatBlock(5, 3, 2, 2)),
new PlayerClass("Divine Lima Bean",
"A benevolent bean with divine powers, healing allies and smiting foes with righteous fury.",
new StatBlock(5, 3, 2, 2)),
new PlayerClass("Arrowhead Pinto Bean",
"A skilled bean archer, raining down arrows upon enemies with deadly precision.",
new StatBlock(5, 3, 2, 2)));
}

public static ItemManager addItems(Logger logger, Random random, Scanner scanner){
return new ItemManager(
logger,
random,
scanner,
new ItemClass("SHOE", "HOT PINK HIGH HEEL", new StatBlock(0, 0, 0, 1), "Common"),
new ItemClass("tea cup", "steaming black tea", new StatBlock(0, 0, -1, 0), "Rare"));
}

public static EnemyManager addEnemies(Random random){
return new EnemyManager(random,
new Enemy("Sorcerer Soup", new StatBlock(3, 0, 1, 2), "Easy",
"Fiery Ladle Strike- The Sorcerer Soup hurls a fiery ladle at you, inflicting heavy damage to your health.",
"A mystical soup with potent magical properties."),
new Enemy("Cursed Carrot", new StatBlock( 5, 0, 2, 3), "Medium",
"Toxic Root Slam- The Cursed Carrot slams its toxic roots into the ground, weakening your defenses.",
"A carrot cursed by dark magic, capable of unleashing havoc."),
new Enemy("Haunted Hamburger", new StatBlock(7, 0, 3, 4), "Hard",
"Seductive Sizzle- The Haunted Hamburger emits a seductive sizzle, enchanting you and lowering your charisma.",
"A haunted hamburger possessed by vengeful spirits."));
}

public boolean startGame(){
logger.println("""
____ _ _ _ _ _ \s
| _ \\ | | | | (_) /\\ | | | | \s
| |_) | ___ __ _ _ __ ______| |_ __ _ ___| |_ _ ___ / \\ __| |_ _____ _ __ | |_ _ _ _ __ ___ \s
| _ < / _ \\/ _` | '_ \\______| __/ _` / __| __| |/ __| / /\\ \\ / _` \\ \\ / / _ \\ '_ \\| __| | | | '__/ _ \\\s
| |_) | __/ (_| | | | | | || (_| \\__ \\ |_| | (__ / ____ \\ (_| |\\ V / __/ | | | |_| |_| | | | __/\s
|____/ \\___|\\__,_|_| |_| \\__\\__,_|___/\\__|_|\\___| /_/ \\_\\__,_| \\_/ \\___|_| |_|\\__|\\__,_|_| \\___|\
""");
if (!getStartInput()) {
logger.writeln("What a loser!");
return false;
private final Random random;

private final Logger logger;
private final Scanner scanner;
private final EnemyManager enemyManager;
private final ItemManager itemManager;
private final PlayerManager playerManager;

public Main(Random random, Logger logger, Scanner scanner, EnemyManager enemyManager, ItemManager itemManager,
PlayerManager playerManager) {
this.random = random;
this.logger = logger;
this.scanner = scanner;
this.enemyManager = enemyManager;
this.itemManager = itemManager;
this.playerManager = playerManager;
}
Player player = playerManager.createPlayer();
ObstacleSystem obstacleSystem = new ObstacleSystem(random, new OldBean(scanner, logger), new FloorCrack(scanner, logger, random));
PathManager pathManager = new PathManager(player, enemyManager, itemManager, obstacleSystem, logger, scanner, 6);
Obstacle start = new JourneyStart(logger, scanner, new CombatSystem(logger, scanner, player, enemyManager.getEnemy(1), itemManager));
Obstacle end = new JourneyEnd(logger);
return gameOver(pathManager.generatePath(start, end));
}

private boolean getStartInput() {
UserChoice<Boolean> choices = new UserChoice<>(scanner, logger, "Do you want to play the game?",
List.of(
new ChoiceOption<>("Yes", () -> true),
new ChoiceOption<>("No", () -> false)
));
return choices.getChoice().outcome().get();
}

public boolean gameOver(boolean won){
if (won) {
logger.writeln("Your are the mightiest Bean there ever was!");
} else {
logger.writeln("Better luck next time!");

public static void main(String[] args) throws IOException, InterruptedException {

String accessToken = GitHubOAuth.getAccessToken();

Random random = new Random();
Scanner scanner = new Scanner(System.in);
Logger logger = new Logger(System.out);

ApitController apitController = new ApitController(accessToken);

List<PlayerClass> playerClasses = apitController.getClasses();
PlayerManager playerManager = new PlayerManager(logger, scanner, playerClasses);

List<Enemy> enemies = apitController.getEnemies();
EnemyManager enemyManager = new EnemyManager(random, enemies.toArray(Enemy[]::new));
List<ItemClass> items = apitController.getItems();
ItemManager itemManager = new ItemManager(logger, random, scanner,
items.toArray(ItemClass[]::new));
Main main = new Main(random, logger, scanner, enemyManager, itemManager, playerManager);

// START GAME
boolean play;
do {
play = main.startGame();
} while (play);

}

// TEMP DATA INSERTION\\
public static PlayerClassManager addClass() {
return new PlayerClassManager(
new PlayerClass("Green Bean Warrior",
"A sturdy bean skilled in close combat, wielding the might of beans with brute force.",
new StatBlock(5, 3, 2, 2)),
new PlayerClass("Magic Coffee Bean",
"A magical bean adept at harnessing the mystical energies of beans to cast powerful spells.",
new StatBlock(3, 2, 3, 3)),
new PlayerClass("Sneaky Black Bean",
"A nimble bean with a knack for stealth and deception, striking enemies from the shadows.",
new StatBlock(5, 3, 2, 2)),
new PlayerClass("Divine Lima Bean",
"A benevolent bean with divine powers, healing allies and smiting foes with righteous fury.",
new StatBlock(5, 3, 2, 2)),
new PlayerClass("Arrowhead Pinto Bean",
"A skilled bean archer, raining down arrows upon enemies with deadly precision.",
new StatBlock(5, 3, 2, 2)));
}

logger.println("""
____ _ __ __ _____ _____ _______ ____ \s
/ ___| / \\ | \\/ | ____| / _ \\ \\ / / ____| _ \\ \s
| | _ / _ \\ | |\\/| | _| | | | \\ \\ / /| _| | |_) | \s
| |_| |/ ___ \\| | | | |___ | |_| |\\ V / | |___| _ < _\s
\\____/_/ \\_\\_| |_|_____| \\___/ \\_/ |_____|_| \\_(_)
""");

UserChoice<Boolean> playAgain = new UserChoice<>(scanner, logger, "Play again?",
List.of(
new ChoiceOption<>("Yes!", () -> true),
new ChoiceOption<>("No!", () -> false)
));
return playAgain.getChoice().outcome().get();
}
public static ItemManager addItems(Logger logger, Random random, Scanner scanner) {
return new ItemManager(
logger,
random,
scanner,
new ItemClass("SHOE", "HOT PINK HIGH HEEL", new StatBlock(0, 0, 0, 1), "Common"),
new ItemClass("tea cup", "steaming black tea", new StatBlock(0, 0, -1, 0), "Rare"));
}

public static EnemyManager addEnemies(Random random) {
return new EnemyManager(random,
new Enemy("Sorcerer Soup", new StatBlock(3, 0, 1, 2), "Easy",
"Fiery Ladle Strike- The Sorcerer Soup hurls a fiery ladle at you, inflicting heavy damage to your health.",
"A mystical soup with potent magical properties."),
new Enemy("Cursed Carrot", new StatBlock(5, 0, 2, 3), "Medium",
"Toxic Root Slam- The Cursed Carrot slams its toxic roots into the ground, weakening your defenses.",
"A carrot cursed by dark magic, capable of unleashing havoc."),
new Enemy("Haunted Hamburger", new StatBlock(7, 0, 3, 4), "Hard",
"Seductive Sizzle- The Haunted Hamburger emits a seductive sizzle, enchanting you and lowering your charisma.",
"A haunted hamburger possessed by vengeful spirits."));
}

public boolean startGame() {
logger.println("""
____ _ _ _ _ _ \s
| _ \\ | | | | (_) /\\ | | | | \s
| |_) | ___ __ _ _ __ ______| |_ __ _ ___| |_ _ ___ / \\ __| |_ _____ _ __ | |_ _ _ _ __ ___ \s
| _ < / _ \\/ _` | '_ \\______| __/ _` / __| __| |/ __| / /\\ \\ / _` \\ \\ / / _ \\ '_ \\| __| | | | '__/ _ \\\s
| |_) | __/ (_| | | | | | || (_| \\__ \\ |_| | (__ / ____ \\ (_| |\\ V / __/ | | | |_| |_| | | | __/\s
|____/ \\___|\\__,_|_| |_| \\__\\__,_|___/\\__|_|\\___| /_/ \\_\\__,_| \\_/ \\___|_| |_|\\__|\\__,_|_| \\___|\
""");
if (!getStartInput()) {
logger.writeln("What a loser!");
return false;
}
Player player = playerManager.createPlayer();
ObstacleSystem obstacleSystem = new ObstacleSystem(random, new OldBean(scanner, logger),
new FloorCrack(scanner, logger, random));
PathManager pathManager = new PathManager(player, enemyManager, itemManager, obstacleSystem, logger,
scanner, 6);
Obstacle start = new JourneyStart(logger, scanner,
new CombatSystem(logger, scanner, player, enemyManager.getEnemy(1), itemManager));
Obstacle end = new JourneyEnd(logger);
return gameOver(pathManager.generatePath(start, end));
}

private boolean getStartInput() {
UserChoice<Boolean> choices = new UserChoice<>(scanner, logger, "Do you want to play the game?",
List.of(
new ChoiceOption<>("Yes", () -> true),
new ChoiceOption<>("No", () -> false)));
return choices.getChoice().outcome().get();
}

public boolean gameOver(boolean won) {
if (won) {
logger.writeln("Your are the mightiest Bean there ever was!");
} else {
logger.writeln("Better luck next time!");
}

logger.println("""
____ _ __ __ _____ _____ _______ ____ \s
/ ___| / \\ | \\/ | ____| / _ \\ \\ / / ____| _ \\ \s
| | _ / _ \\ | |\\/| | _| | | | \\ \\ / /| _| | |_) | \s
| |_| |/ ___ \\| | | | |___ | |_| |\\ V / | |___| _ < _\s
\\____/_/ \\_\\_| |_|_____| \\___/ \\_/ |_____|_| \\_(_)
""");

UserChoice<Boolean> playAgain = new UserChoice<>(scanner, logger, "Play again?",
List.of(
new ChoiceOption<>("Yes!", () -> true),
new ChoiceOption<>("No!", () -> false)));
return playAgain.getChoice().outcome().get();
}
}
16 changes: 9 additions & 7 deletions src/main/java/com/beantastic/api/ApiCaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@
import java.util.Arrays;
import java.util.List;

public class ApiCaller <R>{
public class ApiCaller<R> {

private final String uri;

private final String accessToken;

private final Class<R[]> rClass;

private final RestClient defaultClient;

public ApiCaller (String uri, Class<R[]> rClass) {
public ApiCaller(String uri, String accessToken, Class<R[]> rClass) {
this.uri = uri;
this.accessToken = accessToken;
this.rClass = rClass;
this.defaultClient = RestClient.create();
}



private String getApiCall (){
private String getApiCall() {
String result = defaultClient.get()
.uri(uri)
.header("Authorization", ("Bearer " + accessToken))
.retrieve()
.body(String.class);

Expand All @@ -35,9 +37,9 @@ private String getApiCall (){
return result;
}

public List<R> getDTO () {
public List<R> getDTO() {
try {
return Arrays.stream(new ObjectMapper().readValue(getApiCall(),rClass)).toList();
return Arrays.stream(new ObjectMapper().readValue(getApiCall(), rClass)).toList();
} catch (JsonProcessingException e) {
throw new IllegalArgumentException("Server sent back malformed data");
}
Expand Down
Loading

0 comments on commit 55edfad

Please sign in to comment.