Merge pull request #54 from chriskearney/storageAndOptionalOverhaul (5b71652e) · Commits · Aethyr / creeper

Commit 5b71652e authored 7 years ago by Chris Kearney Committed by GitHub 7 years ago

Merge pull request #54 from chriskearney/storageAndOptionalOverhaul

Storage and optional overhaul

parents edd49b15 2328ed56

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/com/comandante/creeper/Main.java 7 additions, 4 deletions

src/main/java/com/comandante/creeper/Main.java
src/main/java/com/comandante/creeper/bot/command/commands/WhoBotCommand.java 7 additions, 1 deletion

...omandante/creeper/bot/command/commands/WhoBotCommand.java
src/main/java/com/comandante/creeper/command/commands/GoldCommand.java 11 additions, 1 deletion

.../com/comandante/creeper/command/commands/GoldCommand.java
src/main/java/com/comandante/creeper/command/commands/MovementCommand.java 11 additions, 2 deletions

.../comandante/creeper/command/commands/MovementCommand.java
src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java 12 additions, 10 deletions

...om/comandante/creeper/command/commands/PickUpCommand.java
src/main/java/com/comandante/creeper/command/commands/UseCommand.java 3 additions, 3 deletions

...a/com/comandante/creeper/command/commands/UseCommand.java
src/main/java/com/comandante/creeper/command/commands/WhoCommand.java 9 additions, 6 deletions

...a/com/comandante/creeper/command/commands/WhoCommand.java
src/main/java/com/comandante/creeper/command/commands/XpCommand.java 6 additions, 1 deletion

...va/com/comandante/creeper/command/commands/XpCommand.java
src/main/java/com/comandante/creeper/command/commands/admin/TeleportCommand.java 12 additions, 6 deletions

...dante/creeper/command/commands/admin/TeleportCommand.java
src/main/java/com/comandante/creeper/core_game/GameManager.java 25 additions, 12 deletions

...in/java/com/comandante/creeper/core_game/GameManager.java
src/main/java/com/comandante/creeper/core_game/NewUserRegistrationManager.java 2 additions, 2 deletions

...andante/creeper/core_game/NewUserRegistrationManager.java
src/main/java/com/comandante/creeper/entity/EntityManager.java 33 additions, 46 deletions

...ain/java/com/comandante/creeper/entity/EntityManager.java
src/main/java/com/comandante/creeper/items/ItemDecayManager.java 4 additions, 2 deletions

...n/java/com/comandante/creeper/items/ItemDecayManager.java
src/main/java/com/comandante/creeper/merchant/MerchantManager.java 8 additions, 1 deletion

...java/com/comandante/creeper/merchant/MerchantManager.java
src/main/java/com/comandante/creeper/merchant/bank/commands/AccountQueryCommand.java 9 additions, 2 deletions

...e/creeper/merchant/bank/commands/AccountQueryCommand.java
src/main/java/com/comandante/creeper/merchant/bank/commands/DepositCommand.java 8 additions, 1 deletion

...ndante/creeper/merchant/bank/commands/DepositCommand.java
src/main/java/com/comandante/creeper/merchant/bank/commands/WithdrawalCommand.java 8 additions, 1 deletion

...nte/creeper/merchant/bank/commands/WithdrawalCommand.java
src/main/java/com/comandante/creeper/merchant/lockers/GetCommand.java 11 additions, 2 deletions

...a/com/comandante/creeper/merchant/lockers/GetCommand.java
src/main/java/com/comandante/creeper/merchant/lockers/QueryCommand.java 6 additions, 1 deletion

...com/comandante/creeper/merchant/lockers/QueryCommand.java
src/main/java/com/comandante/creeper/player/Player.java 282 additions, 102 deletions

src/main/java/com/comandante/creeper/player/Player.java

with 474 additions and 206 deletions

Please register or to comment