Skip to content

Commit 9aa2e34

Browse files
committed
added basic lifesystem commands
1 parent c88d773 commit 9aa2e34

5 files changed

Lines changed: 14 additions & 23 deletions

File tree

src/main/java/org/matrixnetwork/matrixlifesystem/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
public final class Constants {
44

55
public static final String ACF_BASE_KEY = "commands";
6-
public static final String INFO_CMD_PERMISSION = "stemplate.admin.info";
76
}

src/main/java/org/matrixnetwork/matrixlifesystem/MatrixLifeSystem.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22

33
import co.aikar.commands.PaperCommandManager;
44
import co.aikar.locales.MessageKey;
5-
import co.aikar.locales.MessageKeyProvider;
65
import kr.entree.spigradle.annotations.PluginMain;
76
import lombok.AccessLevel;
87
import lombok.Getter;
98
import lombok.Setter;
109
import lombok.experimental.Accessors;
1110
import net.kyori.adventure.text.Component;
1211
import net.milkbowl.vault.economy.Economy;
13-
import org.hibernate.Session;
14-
import org.hibernate.SessionFactory;
15-
import org.hibernate.Transaction;
16-
import org.matrixnetwork.matrixlifesystem.commands.TemplatesCommands;
17-
import org.matrixnetwork.matrixlifesystem.database.SessionFactoryMaker;
12+
import org.matrixnetwork.matrixlifesystem.commands.LifeSystemCommands;
1813
import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
1914
import org.matrixnetwork.matrixlifesystem.vault.VaultProvider;
2015
import org.bukkit.Bukkit;
@@ -95,7 +90,7 @@ private void setupCommands() {
9590

9691
loadCommandLocales(commandManager);
9792

98-
commandManager.registerCommand(new TemplatesCommands());
93+
commandManager.registerCommand(new LifeSystemCommands());
9994
}
10095

10196
// see https://github.com/aikar/commands/wiki/Locales

src/main/java/org/matrixnetwork/matrixlifesystem/commands/TemplatesCommands.java renamed to src/main/java/org/matrixnetwork/matrixlifesystem/commands/LifeSystemCommands.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
import co.aikar.commands.MessageType;
66
import co.aikar.commands.annotation.*;
77
import co.aikar.locales.MessageKey;
8-
import org.bukkit.Statistic;
98
import org.bukkit.command.CommandSender;
109
import org.bukkit.entity.Player;
10+
import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
1111

1212
import static org.matrixnetwork.matrixlifesystem.Constants.ACF_BASE_KEY;
13-
import static org.matrixnetwork.matrixlifesystem.Constants.INFO_CMD_PERMISSION;
1413

15-
@CommandAlias("stemplate")
16-
public class TemplatesCommands extends BaseCommand {
14+
@CommandAlias("lifesystem")
15+
public class LifeSystemCommands extends BaseCommand {
1716

1817
// see https://github.com/aikar/commands/wiki/Locales
1918
static MessageKey key(String key) {
@@ -30,12 +29,10 @@ public void showHelp(CommandSender sender, CommandHelp help) {
3029
@Subcommand("info|i")
3130
@CommandAlias("info")
3231
@Description("{@@commands.descriptions.info}")
33-
@CommandCompletion("@players")
34-
@CommandPermission(INFO_CMD_PERMISSION)
3532
public void info(@Flags("self") Player player) {
3633
success("info",
37-
"{player}", player.getName(),
38-
"{play_time}", player.getStatistic(Statistic.PLAY_ONE_MINUTE) + " Minutes"
34+
"{lifes}", String.valueOf(PlayerData.getPlayerData(player
35+
.getUniqueId().toString()).getLifes())
3936
);
4037
}
4138

src/main/resources/lang_en.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# See https://github.com/aikar/commands/wiki/Locales
22
commands:
33
descriptions:
4-
info: 'Prints out the players name and play time.'
5-
info: 'Your name is: {player}. Playtime: {play_time}.'
4+
info: 'Shows your actual life count.'
5+
info: 'You have {lifes} lifes.'
66

77
kick:
88
message: 'You cannot join! You do not have enough lifes!'

src/test/java/org/matrixnetwork/matrixlifesystem/commands/TemplateCommandsTests.java renamed to src/test/java/org/matrixnetwork/matrixlifesystem/commands/LifeSystemCommandsTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
import org.junit.jupiter.api.BeforeEach;
77
import org.junit.jupiter.api.Test;
88
import org.matrixnetwork.matrixlifesystem.TestBase;
9+
import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
910

1011
import static org.assertj.core.api.Assertions.assertThat;
1112

12-
public class TemplateCommandsTests extends TestBase {
13+
public class LifeSystemCommandsTests extends TestBase {
1314

1415
private PlayerMock player;
1516

@@ -19,14 +20,13 @@ public void setUp() {
1920
super.setUp();
2021

2122
player = server.addPlayer();
22-
player.addAttachment(plugin, Constants.INFO_CMD_PERMISSION, true);
2323
}
2424

2525
@Test
2626
void info_forSelf_printsOwnPlayerName() {
27-
player.performCommand("stemplate info");
27+
player.performCommand("lifesystem info");
2828

29-
int minutesPlayed = player.getStatistic(Statistic.PLAY_ONE_MINUTE);
30-
assertThat(player.nextMessage()).contains("Your name is: Player0. Playtime: " + minutesPlayed);
29+
int lifes = PlayerData.getPlayerData(player.getUniqueId().toString()).getLifes();
30+
assertThat(player.nextMessage()).contains(lifes + " lifes");
3131
}
3232
}

0 commit comments

Comments
 (0)