Skip to content

Commit 3bc93c8

Browse files
RhythmicSysRhythmicSys
committed
fix p's
1 parent 19a08a7 commit 3bc93c8

5 files changed

Lines changed: 56 additions & 52 deletions

File tree

‎src/main/java/simplexity/simplenicks/util/NickHandler.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import java.util.List;
1313

14+
@SuppressWarnings("UnusedReturnValue")
1415
public class NickHandler {
1516

1617
private static NickHandler instance;
@@ -28,19 +29,19 @@ public static NickHandler getInstance() {
2829
return instance;
2930
}
3031

31-
public String getNickname(OfflinePlayer p) {
32-
return saveHandler.getNickname(p);
32+
public String getNickname(OfflinePlayer player) {
33+
return saveHandler.getNickname(player);
3334
}
3435

35-
public boolean setNickname(OfflinePlayer p, String nickname) {
36-
if (!saveHandler.setNickname(p, nickname)) return false;
37-
refreshNickname(p);
36+
public boolean setNickname(OfflinePlayer player, String nickname) {
37+
if (!saveHandler.setNickname(player, nickname)) return false;
38+
refreshNickname(player);
3839
return true;
3940
}
4041

41-
public boolean resetNickname(OfflinePlayer p) {
42-
if (!saveHandler.resetNickname(p)) return false;
43-
refreshNickname(p);
42+
public boolean resetNickname(OfflinePlayer player) {
43+
if (!saveHandler.resetNickname(player)) return false;
44+
refreshNickname(player);
4445
return true;
4546
}
4647

@@ -68,15 +69,15 @@ public void loadSavingType() {
6869
saveHandler.init();
6970
}
7071

71-
public boolean saveNickname(OfflinePlayer p, String nickname) {
72-
return saveHandler.saveNickname(p, nickname);
72+
public boolean saveNickname(OfflinePlayer player, String nickname) {
73+
return saveHandler.saveNickname(player, nickname);
7374
}
7475

75-
public boolean deleteNickname(OfflinePlayer p, String nickname) {
76-
return saveHandler.deleteNickname(p, nickname);
76+
public boolean deleteNickname(OfflinePlayer player, String nickname) {
77+
return saveHandler.deleteNickname(player, nickname);
7778
}
7879

79-
public List<String> getSavedNicknames(OfflinePlayer p) {
80-
return saveHandler.getSavedNicknames(p);
80+
public List<String> getSavedNicknames(OfflinePlayer player) {
81+
return saveHandler.getSavedNicknames(player);
8182
}
8283
}

‎src/main/java/simplexity/simplenicks/util/SNExpansion.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import org.jetbrains.annotations.NotNull;
66
import simplexity.simplenicks.SimpleNicks;
77

8-
import java.util.Locale;
9-
108
public class SNExpansion extends PlaceholderExpansion {
119
@Override
1210
public @NotNull String getIdentifier() {
@@ -15,12 +13,17 @@ public class SNExpansion extends PlaceholderExpansion {
1513

1614
@Override
1715
public @NotNull String getAuthor() {
18-
return SimpleNicks.getInstance().getDescription().getAuthors().toString();
16+
return "simplexity";
1917
}
2018

2119
@Override
2220
public @NotNull String getVersion() {
23-
return SimpleNicks.getInstance().getDescription().getVersion();
21+
return "1.0.0";
22+
}
23+
24+
@Override
25+
public boolean persist() {
26+
return true;
2427
}
2528

2629
@Override

‎src/main/java/simplexity/simplenicks/util/saving/AbstractSaving.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ public abstract class AbstractSaving {
88

99
public abstract void init();
1010

11-
public abstract String getNickname(OfflinePlayer p);
11+
public abstract String getNickname(OfflinePlayer offlinePlayer);
1212

13-
public abstract boolean setNickname(OfflinePlayer p, String nickname);
13+
public abstract boolean setNickname(OfflinePlayer offlinePlayer, String nickname);
1414

15-
public abstract boolean saveNickname(OfflinePlayer p, String nickname);
15+
public abstract boolean saveNickname(OfflinePlayer offlinePlayer, String nickname);
1616

17-
public abstract boolean deleteNickname(OfflinePlayer p, String nickname);
17+
public abstract boolean deleteNickname(OfflinePlayer offlinePlayer, String nickname);
1818

19-
public abstract boolean resetNickname(OfflinePlayer p);
19+
public abstract boolean resetNickname(OfflinePlayer offlinePlayer);
2020

21-
public abstract List<String> getSavedNicknames(OfflinePlayer p);
21+
public abstract List<String> getSavedNicknames(OfflinePlayer offlinePlayer);
2222
}

‎src/main/java/simplexity/simplenicks/util/saving/PlayerPDC.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,43 @@ public void init() {
1818
}
1919

2020
@Override
21-
public String getNickname(OfflinePlayer p) {
22-
Player player = p.getPlayer();
21+
public String getNickname(OfflinePlayer offlinePlayer) {
22+
Player player = offlinePlayer.getPlayer();
2323
if (player == null) return null;
24-
PersistentDataContainer pdc = p.getPlayer().getPersistentDataContainer();
24+
PersistentDataContainer pdc = offlinePlayer.getPlayer().getPersistentDataContainer();
2525
return pdc.get(nickNameSave, PersistentDataType.STRING);
2626
}
2727

2828
@Override
29-
public boolean setNickname(OfflinePlayer p, String nickname) {
30-
Player player = p.getPlayer();
29+
public boolean setNickname(OfflinePlayer offlinePlayer, String nickname) {
30+
Player player = offlinePlayer.getPlayer();
3131
if (player == null) return false;
32-
PersistentDataContainer pdc = p.getPlayer().getPersistentDataContainer();
32+
PersistentDataContainer pdc = offlinePlayer.getPlayer().getPersistentDataContainer();
3333
pdc.set(nickNameSave, PersistentDataType.STRING, nickname);
3434
return true;
3535
}
3636

3737
@Override
38-
public boolean saveNickname(OfflinePlayer p, String nickname) {
38+
public boolean saveNickname(OfflinePlayer offlinePlayer, String nickname) {
3939
return false;
4040
}
4141

4242
@Override
43-
public boolean deleteNickname(OfflinePlayer p, String nickname) {
43+
public boolean deleteNickname(OfflinePlayer offlinePlayer, String nickname) {
4444
return false;
4545
}
4646

4747
@Override
48-
public boolean resetNickname(OfflinePlayer p) {
49-
Player player = p.getPlayer();
48+
public boolean resetNickname(OfflinePlayer offlinePlayer) {
49+
Player player = offlinePlayer.getPlayer();
5050
if (player == null) return false;
51-
PersistentDataContainer pdc = p.getPlayer().getPersistentDataContainer();
51+
PersistentDataContainer pdc = offlinePlayer.getPlayer().getPersistentDataContainer();
5252
pdc.remove(nickNameSave);
5353
return true;
5454
}
5555

5656
@Override
57-
public List<String> getSavedNicknames(OfflinePlayer p) {
57+
public List<String> getSavedNicknames(OfflinePlayer offlinePlayer) {
5858
return new ArrayList<>();
5959
}
6060
}

‎src/main/java/simplexity/simplenicks/util/saving/YMLFile.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@ public void init() {
3434
}
3535

3636
@Override
37-
public String getNickname(OfflinePlayer p) {
38-
ConfigurationSection section = nicknameData.getConfigurationSection(p.getUniqueId().toString());
37+
public String getNickname(OfflinePlayer offlinePlayer) {
38+
ConfigurationSection section = nicknameData.getConfigurationSection(offlinePlayer.getUniqueId().toString());
3939
if (section == null) return null;
4040
return section.getString("current", null);
4141
}
4242

4343
@Override
44-
public boolean setNickname(OfflinePlayer p, String nickname) {
45-
ConfigurationSection section = nicknameData.getConfigurationSection(p.getUniqueId().toString());
46-
if (section == null) section = nicknameData.createSection(p.getUniqueId().toString());
44+
public boolean setNickname(OfflinePlayer offlinePlayer, String nickname) {
45+
ConfigurationSection section = nicknameData.getConfigurationSection(offlinePlayer.getUniqueId().toString());
46+
if (section == null) section = nicknameData.createSection(offlinePlayer.getUniqueId().toString());
4747
section.set("current", nickname);
4848
saveData();
4949
return true;
5050
}
5151

5252
@Override
53-
public boolean saveNickname(OfflinePlayer p, String nickname) {
54-
ConfigurationSection section = nicknameData.getConfigurationSection(p.getUniqueId().toString());
55-
if (section == null) section = nicknameData.createSection(p.getUniqueId().toString());
53+
public boolean saveNickname(OfflinePlayer offlinePlayer, String nickname) {
54+
ConfigurationSection section = nicknameData.getConfigurationSection(offlinePlayer.getUniqueId().toString());
55+
if (section == null) section = nicknameData.createSection(offlinePlayer.getUniqueId().toString());
5656
List<String> savedNicknames = section.getStringList("saved");
5757
if (savedNicknames.contains(nickname)) return true;
5858
savedNicknames.add(nickname);
@@ -62,9 +62,9 @@ public boolean saveNickname(OfflinePlayer p, String nickname) {
6262
}
6363

6464
@Override
65-
public boolean deleteNickname(OfflinePlayer p, String nickname) {
66-
List<String> nicknames = getSavedNicknames(p);
67-
ConfigurationSection section = nicknameData.getConfigurationSection(p.getUniqueId().toString());
65+
public boolean deleteNickname(OfflinePlayer offlinePlayer, String nickname) {
66+
List<String> nicknames = getSavedNicknames(offlinePlayer);
67+
ConfigurationSection section = nicknameData.getConfigurationSection(offlinePlayer.getUniqueId().toString());
6868
if (section == null) return false;
6969
if (!nicknames.contains(nickname)) return false;
7070
nicknames.remove(nickname);
@@ -74,17 +74,17 @@ public boolean deleteNickname(OfflinePlayer p, String nickname) {
7474
}
7575

7676
@Override
77-
public boolean resetNickname(OfflinePlayer p) {
78-
ConfigurationSection section = nicknameData.getConfigurationSection(p.getUniqueId().toString());
79-
if (section == null) section = nicknameData.createSection(p.getUniqueId().toString());
77+
public boolean resetNickname(OfflinePlayer offlinePlayer) {
78+
ConfigurationSection section = nicknameData.getConfigurationSection(offlinePlayer.getUniqueId().toString());
79+
if (section == null) section = nicknameData.createSection(offlinePlayer.getUniqueId().toString());
8080
section.set("current", null);
8181
saveData();
8282
return true;
8383
}
8484

8585
@Override
86-
public List<String> getSavedNicknames(OfflinePlayer p) {
87-
ConfigurationSection section = nicknameData.getConfigurationSection(p.getUniqueId().toString());
86+
public List<String> getSavedNicknames(OfflinePlayer offlinePlayer) {
87+
ConfigurationSection section = nicknameData.getConfigurationSection(offlinePlayer.getUniqueId().toString());
8888
if (section == null) return new ArrayList<>();
8989
return section.getStringList("saved");
9090
}

0 commit comments

Comments
 (0)