From af65dd83deb907e1c7a76695f08e2afddd42e16b Mon Sep 17 00:00:00 2001 From: Chris Kearney <chris.kearney@urbanairship.com> Date: Wed, 27 Aug 2014 23:28:32 -0700 Subject: [PATCH] example for bk --- dependency-reduced-pom.xml | 3 +- pom.xml | 156 +++++++++--------- .../creeper/Items/ItemDecayManager.java | 6 +- .../java/com/comandante/creeper/Main.java | 2 +- .../creeper/builder/RoomBuilders.java | 6 +- .../command/DefaultCommandHandler.java | 29 ++-- .../creeper/command/commands/DropCommand.java | 2 +- .../command/commands/InventoryCommand.java | 2 +- .../creeper/command/commands/WhoCommand.java | 24 +-- .../creeper/managers/EntityManager.java | 2 +- .../managers/NewUserRegistrationManager.java | 2 +- .../creeper/managers/PlayerManager.java | 2 +- .../comandante/creeper/model/BasicRoom.java | 2 +- .../comandante/creeper/model/NpcStats.java | 27 +++ .../com/comandante/creeper/model/Player.java | 2 +- .../creeper/model/PlayerMetadata.java | 16 +- .../com/comandante/creeper/model/Room.java | 2 +- .../creeper/server/ChannelUtils.java | 12 +- 18 files changed, 159 insertions(+), 138 deletions(-) create mode 100644 src/main/java/com/comandante/creeper/model/NpcStats.java diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 5c1e2037..51d76e68 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.comandante</groupId> <artifactId>creeper</artifactId> diff --git a/pom.xml b/pom.xml index c6721a38..e9372cad 100644 --- a/pom.xml +++ b/pom.xml @@ -2,85 +2,85 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>com.comandante</groupId> - <artifactId>creeper</artifactId> - <version>0.1.0-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>17.0</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>3.6.9.Final</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.9</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> - </dependency> - <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.11</version> - </dependency> - <dependency> - <groupId>org.mapdb</groupId> - <artifactId>mapdb</artifactId> - <version>1.0.6</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.2.4</version> - </dependency> - </dependencies> + <groupId>com.comandante</groupId> + <artifactId>creeper</artifactId> + <version>0.1.0-SNAPSHOT</version> + <dependencies> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>3.6.9.Final</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.9</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.11</version> + </dependency> + <dependency> + <groupId>org.mapdb</groupId> + <artifactId>mapdb</artifactId> + <version>1.0.6</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.2.4</version> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <manifestEntries> - <Main-Class>com.comandante.creeper.Main</Main-Class> - <Build-Number>0.1.0-SNAPSHOT</Build-Number> - </manifestEntries> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Main-Class>com.comandante.creeper.Main</Main-Class> + <Build-Number>0.1.0-SNAPSHOT</Build-Number> + </manifestEntries> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/src/main/java/com/comandante/creeper/Items/ItemDecayManager.java b/src/main/java/com/comandante/creeper/Items/ItemDecayManager.java index bd288298..73be57b0 100644 --- a/src/main/java/com/comandante/creeper/Items/ItemDecayManager.java +++ b/src/main/java/com/comandante/creeper/Items/ItemDecayManager.java @@ -46,11 +46,11 @@ public class ItemDecayManager extends CreeperEntity { itemsToDestroy.add(item.getItemId()); } } - for (String itemId: itemsToRemoveFromDecay) { + for (String itemId : itemsToRemoveFromDecay) { Item itemEntity = entityManager.getItemEntity(itemId); removeItem(itemEntity); } - for (String itemId: itemsToDestroy) { + for (String itemId : itemsToDestroy) { Item itemEntity = entityManager.getItemEntity(itemId); removeItem(itemEntity); entityManager.removeItem(itemEntity); @@ -65,7 +65,7 @@ public class ItemDecayManager extends CreeperEntity { this.numberOfTicks = numberOfTicks; } - public void incTick(){ + public void incTick() { this.currentTicks++; } diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java index 595c1901..10b88c27 100644 --- a/src/main/java/com/comandante/creeper/Main.java +++ b/src/main/java/com/comandante/creeper/Main.java @@ -29,7 +29,7 @@ public class Main { .make(); RoomManager roomManager = new RoomManager(); - EntityManager entityManager = new EntityManager(roomManager, db); + EntityManager entityManager = new EntityManager(roomManager, db); PlayerManager playerManager = new PlayerManager(db); Stats chrisBrianStats = new StatsBuilder().setStrength(7).setWillpower(8).setAim(6).setAgile(5).setArmorRating(4).setMeleSkill(10).setHealth(100).setWeaponRatingMin(10).setWeaponRatingMax(20).setNumberweaponOfRolls(1).createStats(); diff --git a/src/main/java/com/comandante/creeper/builder/RoomBuilders.java b/src/main/java/com/comandante/creeper/builder/RoomBuilders.java index 0cf74f0e..9820d7b1 100644 --- a/src/main/java/com/comandante/creeper/builder/RoomBuilders.java +++ b/src/main/java/com/comandante/creeper/builder/RoomBuilders.java @@ -13,7 +13,7 @@ import com.google.common.base.Optional; */ public class RoomBuilders { - public static void buildFedTraining(GameManager gameManager){ + public static void buildFedTraining(GameManager gameManager) { EntityManager entityManager = gameManager.getEntityManager(); BasicRoom basicRoom = new BasicRoom( @@ -110,7 +110,7 @@ public class RoomBuilders { } - public static void buildNeoPortland(EntityManager entityManager){ + public static void buildNeoPortland(EntityManager entityManager) { entityManager.addEntity(new BasicRoom( 200, @@ -124,7 +124,7 @@ public class RoomBuilders { "Start of New Portland area.\r\n")); } - public static void buildOldTown(EntityManager entityManager){ + public static void buildOldTown(EntityManager entityManager) { entityManager.addEntity(new BasicRoom( 300, diff --git a/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java b/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java index 3b4e70ff..079d690d 100644 --- a/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java +++ b/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java @@ -32,44 +32,37 @@ public class DefaultCommandHandler { e.getChannel(); String rootCommand = originalMessage.split(" ")[0].toLowerCase(); String playerId = new Player(creeperSession.getUsername().get()).getPlayerId(); - if (GossipCommand.validTriggers.contains(rootCommand)){ + if (GossipCommand.validTriggers.contains(rootCommand)) { GossipCommand gossipCommand = new GossipCommand(playerId, gameManager, originalMessage); commandService.processCommand(gossipCommand); - } - else if (MovementCommand.validTriggers.contains(rootCommand)){ + } else if (MovementCommand.validTriggers.contains(rootCommand)) { MovementCommand movementCommand = new MovementCommand(playerId, gameManager, originalMessage); commandService.processCommand(movementCommand); - } - else if (SayCommand.validTriggers.contains(rootCommand)){ + } else if (SayCommand.validTriggers.contains(rootCommand)) { SayCommand sayCommand = new SayCommand(playerId, gameManager, originalMessage); commandService.processCommand(sayCommand); - } - else if (TellCommand.validTriggers.contains(rootCommand)){ + } else if (TellCommand.validTriggers.contains(rootCommand)) { TellCommand tellCommand = new TellCommand(playerId, gameManager, originalMessage); commandService.processCommand(tellCommand); - } - else if (WhoCommand.validTriggers.contains(rootCommand)){ + } else if (WhoCommand.validTriggers.contains(rootCommand)) { WhoCommand whoCommand = new WhoCommand(playerId, gameManager, originalMessage); commandService.processCommand(whoCommand); - } - else if (WhoamiCommand.validTriggers.contains(rootCommand)){ + } else if (WhoamiCommand.validTriggers.contains(rootCommand)) { WhoamiCommand whoamiCommand = new WhoamiCommand(playerId, gameManager, originalMessage); commandService.processCommand(whoamiCommand); - } - else if (PickUpCommand.validTriggers.contains(rootCommand)){ + } else if (PickUpCommand.validTriggers.contains(rootCommand)) { PickUpCommand pickUpCommand = new PickUpCommand(playerId, gameManager, originalMessage); commandService.processCommand(pickUpCommand); - } - else if (InventoryCommand.validTriggers.contains(rootCommand)){ + } else if (InventoryCommand.validTriggers.contains(rootCommand)) { InventoryCommand inventoryCommand = new InventoryCommand(playerId, gameManager, originalMessage); commandService.processCommand(inventoryCommand); - }else if (UseCommand.validTriggers.contains(rootCommand)){ + } else if (UseCommand.validTriggers.contains(rootCommand)) { UseCommand useCommand = new UseCommand(playerId, gameManager, originalMessage, creeperSession); commandService.processCommand(useCommand); - }else if (DropCommand.validTriggers.contains(rootCommand)){ + } else if (DropCommand.validTriggers.contains(rootCommand)) { DropCommand dropCommand = new DropCommand(playerId, gameManager, originalMessage, creeperSession); commandService.processCommand(dropCommand); - }else { + } else { UnknownCommand unknownCommand = new UnknownCommand(playerId, gameManager, originalMessage); commandService.processCommand(unknownCommand); } diff --git a/src/main/java/com/comandante/creeper/command/commands/DropCommand.java b/src/main/java/com/comandante/creeper/command/commands/DropCommand.java index dd2e6c8f..882ba73e 100644 --- a/src/main/java/com/comandante/creeper/command/commands/DropCommand.java +++ b/src/main/java/com/comandante/creeper/command/commands/DropCommand.java @@ -44,7 +44,7 @@ public class DropCommand extends Command { getGameManager().getPlayerManager().savePlayerMetadata(playerMetadata); getGameManager().getItemDecayManager().addItem(itemEntity); getGameManager().getEntityManager().addItem(itemEntity); - roomSay(playerCurrentRoom.getRoomId(),getGameManager().getPlayerManager().getPlayer(getPlayerId()).getPlayerName() + " dropped " + itemEntity.getItemName()); + roomSay(playerCurrentRoom.getRoomId(), getGameManager().getPlayerManager().getPlayer(getPlayerId()).getPlayerName() + " dropped " + itemEntity.getItemName()); return; } } diff --git a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java b/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java index 7c259f65..32c24ea6 100644 --- a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java +++ b/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java @@ -36,7 +36,7 @@ public class InventoryCommand extends Command { StringBuilder sb = new StringBuilder(); sb.append("You are carrying:\r\n"); sb.append(RESET); - for (String inventoryId: inventory) { + for (String inventoryId : inventory) { Item item = getGameManager().getEntityManager().getItemEntity(inventoryId); sb.append(item.getItemName()); int maxUses = ItemType.itemTypeFromCode(item.getItemTypeId()).getMaxUses(); diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java b/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java index cf488ca1..55486998 100644 --- a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java +++ b/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java @@ -23,17 +23,17 @@ public class WhoCommand extends Command { @Override public void run() { - Set<Player> allPlayers = getGameManager().getAllPlayers(); - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(CYAN); - stringBuilder.append("----------------------\r\n"); - stringBuilder.append("|--active users------|\r\n"); - stringBuilder.append("----------------------\r\n"); - for (Player allPlayer : allPlayers) { - stringBuilder.append(allPlayer.getPlayerName()); - stringBuilder.append("\r\n"); - } - stringBuilder.append(RESET); - commandWrite(stringBuilder.toString()); + Set<Player> allPlayers = getGameManager().getAllPlayers(); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(CYAN); + stringBuilder.append("----------------------\r\n"); + stringBuilder.append("|--active users------|\r\n"); + stringBuilder.append("----------------------\r\n"); + for (Player allPlayer : allPlayers) { + stringBuilder.append(allPlayer.getPlayerName()); + stringBuilder.append("\r\n"); } + stringBuilder.append(RESET); + commandWrite(stringBuilder.toString()); + } } diff --git a/src/main/java/com/comandante/creeper/managers/EntityManager.java b/src/main/java/com/comandante/creeper/managers/EntityManager.java index 9182607d..e5bfbebf 100644 --- a/src/main/java/com/comandante/creeper/managers/EntityManager.java +++ b/src/main/java/com/comandante/creeper/managers/EntityManager.java @@ -47,7 +47,7 @@ public class EntityManager { entities.put(creeperEntity.getEntityId(), creeperEntity); } - public void addItem(Item item){ + public void addItem(Item item) { items.put(item.getItemId(), item); db.commit(); } diff --git a/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java b/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java index 0e6ef752..a21ff391 100644 --- a/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java +++ b/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java @@ -41,7 +41,7 @@ public class NewUserRegistrationManager { newUserRegistrationFlow(session, e); return false; } - session.setUsername(Optional.of((String)e.getMessage())); + session.setUsername(Optional.of((String) e.getMessage())); return true; } diff --git a/src/main/java/com/comandante/creeper/managers/PlayerManager.java b/src/main/java/com/comandante/creeper/managers/PlayerManager.java index fd97268e..6a7e32c3 100644 --- a/src/main/java/com/comandante/creeper/managers/PlayerManager.java +++ b/src/main/java/com/comandante/creeper/managers/PlayerManager.java @@ -34,7 +34,7 @@ public class PlayerManager { public Set<Player> getPresentPlayers(Room room) { Set<String> presentPlayerIds = room.getPresentPlayerIds(); Set<Player> players = Sets.newHashSet(); - for (String playerId: presentPlayerIds) { + for (String playerId : presentPlayerIds) { players.add(getPlayer(playerId)); } return ImmutableSet.copyOf(players); diff --git a/src/main/java/com/comandante/creeper/model/BasicRoom.java b/src/main/java/com/comandante/creeper/model/BasicRoom.java index 23b610d1..bc27dcad 100644 --- a/src/main/java/com/comandante/creeper/model/BasicRoom.java +++ b/src/main/java/com/comandante/creeper/model/BasicRoom.java @@ -6,7 +6,7 @@ public class BasicRoom extends Room { @Override public void run() { super.run(); - // System.out.println(getRoomTitle() + " tick."); + // System.out.println(getRoomTitle() + " tick."); } public BasicRoom(Integer roomId, diff --git a/src/main/java/com/comandante/creeper/model/NpcStats.java b/src/main/java/com/comandante/creeper/model/NpcStats.java new file mode 100644 index 00000000..8bf763be --- /dev/null +++ b/src/main/java/com/comandante/creeper/model/NpcStats.java @@ -0,0 +1,27 @@ +package com.comandante.creeper.model; + +public class NpcStats { + public final static Stats JOE_NPC = new StatsBuilder() + .setStrength(5) + .setWillpower(1) + .setAim(1) + .setAgile(1) + .setArmorRating(5) + .setMeleSkill(5) + .setHealth(100) + .setWeaponRatingMin(5) + .setWeaponRatingMax(10) + .setNumberweaponOfRolls(1).createStats(); + + public final static Stats ANOTHER_DOUCHER = new StatsBuilder() + .setStrength(5) + .setWillpower(1) + .setAim(1) + .setAgile(1) + .setArmorRating(5) + .setMeleSkill(5) + .setHealth(100) + .setWeaponRatingMin(5) + .setWeaponRatingMax(10) + .setNumberweaponOfRolls(1).createStats(); +} diff --git a/src/main/java/com/comandante/creeper/model/Player.java b/src/main/java/com/comandante/creeper/model/Player.java index 35957aab..e0ab45c3 100644 --- a/src/main/java/com/comandante/creeper/model/Player.java +++ b/src/main/java/com/comandante/creeper/model/Player.java @@ -5,7 +5,7 @@ import com.google.common.base.Optional; import org.apache.commons.codec.binary.Base64; import org.jboss.netty.channel.Channel; -public class Player extends CreeperEntity{ +public class Player extends CreeperEntity { private String playerName; private Channel channel; diff --git a/src/main/java/com/comandante/creeper/model/PlayerMetadata.java b/src/main/java/com/comandante/creeper/model/PlayerMetadata.java index a49958aa..63065166 100644 --- a/src/main/java/com/comandante/creeper/model/PlayerMetadata.java +++ b/src/main/java/com/comandante/creeper/model/PlayerMetadata.java @@ -36,7 +36,7 @@ AGILE - CRITICAL CHANCE INCREASE } public String[] getInventory() { - return inventory; + return inventory; } public void setInventory(String[] inventory) { @@ -44,12 +44,12 @@ AGILE - CRITICAL CHANCE INCREASE } public void addInventoryEntityId(String newEntityId) { - if (inventory == null) { - inventory = new String[0]; - } - String[] result = Arrays.copyOf(inventory, inventory.length + 1); - result[inventory.length] = newEntityId; - this.inventory = result; + if (inventory == null) { + inventory = new String[0]; + } + String[] result = Arrays.copyOf(inventory, inventory.length + 1); + result[inventory.length] = newEntityId; + this.inventory = result; } public void removeInventoryEntityId(String itemId) { @@ -57,7 +57,7 @@ AGILE - CRITICAL CHANCE INCREASE itemsIdKeep.remove(itemId); String[] newItems = new String[itemsIdKeep.size()]; int i = 0; - for (String id: itemsIdKeep) { + for (String id : itemsIdKeep) { newItems[i] = id; i++; } diff --git a/src/main/java/com/comandante/creeper/model/Room.java b/src/main/java/com/comandante/creeper/model/Room.java index 79079941..81ee78a3 100644 --- a/src/main/java/com/comandante/creeper/model/Room.java +++ b/src/main/java/com/comandante/creeper/model/Room.java @@ -75,7 +75,7 @@ public abstract class Room extends CreeperEntity { return npcIds; } - public java.util.Set<String> getPresentPlayerIds() { + public java.util.Set<String> getPresentPlayerIds() { return presentPlayerIds; } diff --git a/src/main/java/com/comandante/creeper/server/ChannelUtils.java b/src/main/java/com/comandante/creeper/server/ChannelUtils.java index a72e8414..b1c1821f 100644 --- a/src/main/java/com/comandante/creeper/server/ChannelUtils.java +++ b/src/main/java/com/comandante/creeper/server/ChannelUtils.java @@ -16,7 +16,7 @@ public class ChannelUtils { } public void writeNoPrompt(String playerId, String message) { - write(playerId, message, false); + write(playerId, message, false); } public void write(String playerId, String message) { @@ -43,15 +43,15 @@ public class ChannelUtils { for (int i = 0; i < data.length; i++) { switch (data[i]) { - case (byte) '\n' : - if (i == 0 || i == 1 ) { + case (byte) '\n': + if (i == 0 || i == 1) { break; } - if (i == data.length - 1 || i == data.length - 2 ) { + if (i == data.length - 1 || i == data.length - 2) { break; } - case (byte) '\r' : - if (i == 0 || i == 1 ) { + case (byte) '\r': + if (i == 0 || i == 1) { break; } if (i == data.length - 1 || i == data.length - 2) { -- GitLab