Skip to content

Commit 80945a9

Browse files
RhythmicSysRhythmicSys
committed
Merge branch '1.19.4_prep'
# Conflicts: # src/main/java/adhdmc/villagerinfo/Config/Defaults.java # src/main/java/adhdmc/villagerinfo/Config/Message.java
2 parents 0c408d7 + d84089a commit 80945a9

File tree

16 files changed

+211
-334
lines changed

16 files changed

+211
-334
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>ADHDMC</groupId>
88
<artifactId>VillagerInfo</artifactId>
9-
<version>2.5</version>
9+
<version>2.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>VillagerInfo</name>

‎src/main/java/adhdmc/villagerinfo/Commands/CommandHandler.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package adhdmc.villagerinfo.Commands;
22

3-
import adhdmc.villagerinfo.Config.ConfigValidator;
4-
import adhdmc.villagerinfo.Config.Message;
3+
import adhdmc.villagerinfo.Config.VIMessage;
54
import adhdmc.villagerinfo.VillagerInfo;
65
import net.kyori.adventure.text.minimessage.MiniMessage;
76
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
87
import org.bukkit.command.Command;
98
import org.bukkit.command.CommandExecutor;
109
import org.bukkit.command.CommandSender;
1110
import org.bukkit.command.TabExecutor;
11+
import org.jetbrains.annotations.NotNull;
1212

1313
import java.util.*;
1414

@@ -19,7 +19,7 @@ public class CommandHandler implements CommandExecutor, TabExecutor {
1919

2020
//TY Peashooter101
2121
@Override
22-
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
22+
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
2323
ArrayList<String> subCommands1 = new ArrayList<>(Arrays.asList("help", "toggle", "reload"));
2424
if (args.length == 1) {
2525
return subCommands1;
@@ -29,10 +29,15 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
2929

3030

3131
@Override
32-
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
32+
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
3333
//Checking for arguments
3434
if (args.length == 0) {
35-
String url = VillagerInfo.getInstance().getDescription().getWebsite();
35+
String url;
36+
if (VillagerInfo.getInstance().getDescription().getWebsite() != null) {
37+
url = VillagerInfo.getInstance().getDescription().getWebsite();
38+
} else {
39+
url = "https://github.com/ADHDMC/VillagerInfo";
40+
}
3641
String version = VillagerInfo.getInstance().getDescription().getVersion();
3742
List<String> authors = new ArrayList<>();
3843
for (String authorName : VillagerInfo.getInstance().getDescription().getAuthors()) {
@@ -48,12 +53,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
4853
);
4954
return true;
5055
}
51-
//if has an argument, check to see if it's contained in the list of arguments
56+
//if there is an argument, check to see if it's contained in the list of arguments
5257
String command = args[0].toLowerCase();
5358
if (subcommandList.containsKey(command)) {
5459
subcommandList.get(command).execute(sender, Arrays.copyOfRange(args, 1, args.length));
5560
} else {
56-
sender.sendMessage(miniMessage.deserialize(Message.NO_COMMAND.getMessage()));
61+
sender.sendMessage(miniMessage.deserialize(VIMessage.NO_COMMAND.getMessage()));
5762
}
5863
return true;
5964
}

‎src/main/java/adhdmc/villagerinfo/Commands/SubCommands/HelpCommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package adhdmc.villagerinfo.Commands.SubCommands;
22

33
import adhdmc.villagerinfo.Commands.SubCommand;
4-
import adhdmc.villagerinfo.Config.Message;
4+
import adhdmc.villagerinfo.Config.VIMessage;
55
import adhdmc.villagerinfo.Config.Perms;
66
import adhdmc.villagerinfo.VillagerInfo;
77
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -19,14 +19,14 @@ public HelpCommand() {
1919
public void execute(CommandSender sender, String[] args) {
2020
MiniMessage miniMessage = VillagerInfo.getMiniMessage();
2121

22-
if (sender.hasPermission(Perms.USE.getPerm())) {
23-
sender.sendMessage(miniMessage.deserialize(Message.PREFIX.getMessage()));
24-
sender.sendMessage(miniMessage.deserialize(Message.HELP_MAIN.getMessage()));
25-
sender.sendMessage(miniMessage.deserialize(Message.HELP_TOGGLE.getMessage()));
26-
sender.sendMessage(miniMessage.deserialize(Message.HELP_RELOAD.getMessage()));
22+
if (sender.hasPermission(Perms.USE.getVIPerm())) {
23+
sender.sendMessage(miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage()));
24+
sender.sendMessage(miniMessage.deserialize(VIMessage.HELP_MAIN.getMessage()));
25+
sender.sendMessage(miniMessage.deserialize(VIMessage.HELP_TOGGLE.getMessage()));
26+
sender.sendMessage(miniMessage.deserialize(VIMessage.HELP_RELOAD.getMessage()));
2727
return;
2828
}
29-
sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage()));
29+
sender.sendMessage(miniMessage.deserialize(VIMessage.NO_PERMISSION.getMessage()));
3030
}
3131

3232
@Override

‎src/main/java/adhdmc/villagerinfo/Commands/SubCommands/InventoryCommand.java‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ReloadCommand.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import adhdmc.villagerinfo.Commands.SubCommand;
44
import adhdmc.villagerinfo.Config.ConfigValidator;
5-
import adhdmc.villagerinfo.Config.Message;
5+
import adhdmc.villagerinfo.Config.LocaleConfig;
6+
import adhdmc.villagerinfo.Config.VIMessage;
67
import adhdmc.villagerinfo.Config.Perms;
78
import adhdmc.villagerinfo.VillagerInfo;
89
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -21,13 +22,13 @@ public ReloadCommand() {
2122
@Override
2223
public void execute(CommandSender sender, String[] args) {
2324
MiniMessage miniMessage = VillagerInfo.getMiniMessage();
24-
if (!(sender instanceof Player) || sender.hasPermission(Perms.RELOAD.getPerm())) {
25+
if (!(sender instanceof Player) || sender.hasPermission(Perms.RELOAD.getVIPerm())) {
2526
VillagerInfo.getInstance().reloadConfig();
26-
VillagerInfo.getLocaleConfig().reloadConfig();
27+
LocaleConfig.getInstance().reloadLocale();
2728
ConfigValidator.configValidator();
28-
sender.sendMessage(miniMessage.deserialize(Message.CONFIG_RELOADED.getMessage()));
29+
sender.sendMessage(miniMessage.deserialize(VIMessage.CONFIG_RELOADED.getMessage()));
2930
} else {
30-
sender.sendMessage(miniMessage.deserialize((Message.NO_PERMISSION.getMessage())));
31+
sender.sendMessage(miniMessage.deserialize((VIMessage.NO_PERMISSION.getMessage())));
3132
}
3233
}
3334

‎src/main/java/adhdmc/villagerinfo/Commands/SubCommands/ToggleCommand.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package adhdmc.villagerinfo.Commands.SubCommands;
22

33
import adhdmc.villagerinfo.Commands.SubCommand;
4-
import adhdmc.villagerinfo.Config.Message;
4+
import adhdmc.villagerinfo.Config.VIMessage;
55
import adhdmc.villagerinfo.Config.Perms;
66
import adhdmc.villagerinfo.VillagerInfo;
77
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -22,20 +22,20 @@ public ToggleCommand() {
2222
@Override
2323
public void execute(CommandSender sender, String[] args) {
2424
if (!(sender instanceof Player)) {
25-
sender.sendMessage(miniMessage.deserialize(Message.NOT_A_PLAYER.getMessage()));
25+
sender.sendMessage(miniMessage.deserialize(VIMessage.NOT_A_PLAYER.getMessage()));
2626
return;
2727
}
28-
if (!(sender.hasPermission(Perms.TOGGLE.getPerm()))) {
29-
sender.sendMessage(miniMessage.deserialize(Message.NO_PERMISSION.getMessage()));
28+
if (!(sender.hasPermission(Perms.TOGGLE.getVIPerm()))) {
29+
sender.sendMessage(miniMessage.deserialize(VIMessage.NO_PERMISSION.getMessage()));
3030
return;
3131
}
3232
if (toggleSetting((Player) sender)) {
33-
sender.sendMessage(miniMessage.deserialize(Message.PREFIX.getMessage())
34-
.append(miniMessage.deserialize(Message.TOGGLE_ON.getMessage())));
33+
sender.sendMessage(miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage())
34+
.append(miniMessage.deserialize(VIMessage.TOGGLE_ON.getMessage())));
3535
return;
3636
}
37-
sender.sendMessage(miniMessage.deserialize(Message.PREFIX.getMessage())
38-
.append(miniMessage.deserialize(Message.TOGGLE_OFF.getMessage())));
37+
sender.sendMessage(miniMessage.deserialize(VIMessage.PLUGIN_PREFIX.getMessage())
38+
.append(miniMessage.deserialize(VIMessage.TOGGLE_OFF.getMessage())));
3939
}
4040

4141
private boolean toggleSetting(Player player) {

‎src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import org.bukkit.Sound;
55
import org.bukkit.configuration.file.FileConfiguration;
66

7-
import java.util.Collections;
8-
import java.util.HashMap;
97
import java.util.Locale;
10-
import java.util.Map;
118

129
public class ConfigValidator {
1310

@@ -50,7 +47,6 @@ public static void configValidator() {
5047
soundPitch = 1.5F;
5148
}
5249
ToggleSetting.reloadToggles();
53-
Message.reloadLocale();
5450
}
5551

5652
public static float getSoundPitch() {

‎src/main/java/adhdmc/villagerinfo/Config/Defaults.java‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎src/main/java/adhdmc/villagerinfo/Config/LocaleConfig.java‎

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,45 @@
11
package adhdmc.villagerinfo.Config;
22

33
import adhdmc.villagerinfo.VillagerInfo;
4+
import org.bukkit.configuration.InvalidConfigurationException;
5+
import org.bukkit.configuration.file.FileConfiguration;
46
import org.bukkit.configuration.file.YamlConfiguration;
57

68
import java.io.File;
79
import java.io.IOException;
8-
import java.io.InputStream;
9-
import java.io.InputStreamReader;
10+
import java.util.Set;
1011

1112
public class LocaleConfig {
12-
private final VillagerInfo plugin;
13-
private static final String localeName = "locale.yml";
14-
private YamlConfiguration localeConfig = null;
15-
private File localeFile = null;
1613

17-
public LocaleConfig(VillagerInfo plugin) {
18-
this.plugin = plugin;
19-
}
14+
private static LocaleConfig instance;
15+
private final String fileName = "locale.yml";
16+
private final File localeFile = new File(VillagerInfo.getInstance().getDataFolder(), fileName);
17+
private final FileConfiguration localeConfig = new YamlConfiguration();
2018

21-
public void reloadConfig() {
22-
if (this.localeFile == null) {
23-
this.localeFile = new File(this.plugin.getDataFolder(), localeName);
24-
}
25-
this.localeConfig = YamlConfiguration.loadConfiguration(this.localeFile);
26-
this.localeConfig.options().copyDefaults(true);
27-
InputStream defaultStream = this.plugin.getResource(localeName);
28-
if (defaultStream != null) {
29-
YamlConfiguration defaultConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(defaultStream));
30-
this.localeConfig.setDefaults(defaultConfig);
31-
}
19+
20+
private LocaleConfig() {
21+
if (!localeFile.exists()) VillagerInfo.getInstance().saveResource(fileName, false);
22+
reloadLocale();
3223
}
3324

34-
public YamlConfiguration getlocaleConfig() {
35-
if (this.localeConfig == null) {
36-
reloadConfig();
37-
}
38-
return this.localeConfig;
25+
public static LocaleConfig getInstance() {
26+
if (instance == null) instance = new LocaleConfig();
27+
return instance;
3928
}
4029

41-
public void saveConfig() {
42-
getlocaleConfig();
43-
if (this.localeConfig == null || this.localeFile == null) {
44-
return;
45-
}
46-
try {
47-
this.getlocaleConfig().save(this.localeFile);
48-
} catch (IOException e) {
49-
plugin.getLogger().severe("[saveConfig()] Could not save config to " + this.localeFile);
50-
e.printStackTrace();
51-
}
52-
if (!this.localeFile.exists()) {
53-
this.plugin.saveResource(localeName, false);
30+
public FileConfiguration getLocale() { return localeConfig; }
31+
32+
public void reloadLocale() {
33+
try { localeConfig.load(localeFile); }
34+
catch (IOException | InvalidConfigurationException e) { e.printStackTrace(); }
35+
Set<String> keys = localeConfig.getKeys(false);
36+
for (String key : keys) {
37+
try {
38+
VIMessage message = VIMessage.valueOf(key);
39+
message.setMessage(localeConfig.getString(key, message.getMessage()));
40+
} catch (IllegalArgumentException e) {
41+
VillagerInfo.getVillagerInfoLogger().warning(VIMessage.LOGGER_INVALID_LOCALE_KEY.getMessage() + key);
42+
}
5443
}
5544
}
5645
}
57-

0 commit comments

Comments
 (0)