Skip to content

Commit ba7b636

Browse files
Ajneb97Ajneb97
committed
2.8.1
1 parent 5ee603a commit ba7b636

17 files changed

+291
-362
lines changed

‎pom.xml‎

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

77
<groupId>svar.ajneb97</groupId>
88
<artifactId>ServerVariables</artifactId>
9-
<version>2.7.1</version>
9+
<version>2.8.1</version>
1010
<packaging>jar</packaging>
1111

1212
<properties>
@@ -46,7 +46,17 @@
4646
</dependencies>
4747

4848
<build>
49+
<resources>
50+
<resource>
51+
<directory>src/main/resources</directory>
52+
<filtering>true</filtering>
53+
</resource>
54+
</resources>
4955
<plugins>
56+
<plugin>
57+
<artifactId>maven-resources-plugin</artifactId>
58+
<version>3.3.1</version>
59+
</plugin>
5060
<plugin>
5161
<artifactId>maven-compiler-plugin</artifactId>
5262
<version>3.8.1</version>

‎src/main/java/svar/ajneb97/MainCommand.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
3030
return false;
3131
}
3232

33-
FileConfiguration config = plugin.getConfig();
33+
FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
3434
MessagesManager msgManager = plugin.getMessagesManager();
3535
if(args.length >= 1){
3636
if(args[0].equalsIgnoreCase("set")){
@@ -265,7 +265,11 @@ private void sendMessageSet(CommandSender sender,VariableResult result,MessagesM
265265

266266
public void reload(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
267267
// /servervariables reload
268-
plugin.getConfigsManager().reloadConfigs();
268+
if(!plugin.getConfigsManager().reloadConfigs()){
269+
sender.sendMessage(ServerVariables.prefix+MessagesManager.getColoredMessage("&cThere was an error reloading the config, check the console."));
270+
return;
271+
}
272+
269273
msgManager.sendMessage(sender,config.getString("messages.pluginReloaded"),true);
270274
}
271275

‎src/main/java/svar/ajneb97/ServerVariables.java‎

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

2121
public class ServerVariables extends JavaPlugin {
2222

23-
public String prefix;
23+
public static String prefix;
2424
public static ServerVersion serverVersion;
2525
private PluginDescriptionFile pdfFile = getDescription();
2626
public String version = pdfFile.getVersion();

‎src/main/java/svar/ajneb97/config/ConfigsManager.java‎

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

33
import org.bukkit.configuration.file.FileConfiguration;
44
import svar.ajneb97.ServerVariables;
5+
import svar.ajneb97.config.model.CommonConfig;
56
import svar.ajneb97.model.structure.Limitations;
67
import svar.ajneb97.model.structure.ValueType;
78
import svar.ajneb97.model.structure.Variable;
@@ -12,7 +13,7 @@
1213

1314
public class ConfigsManager {
1415

15-
private PlayerConfigsManager playerConfigsManager;
16+
private PlayersConfigsManager playerConfigsManager;
1617
private DataConfigManager dataConfigManager;
1718
private MainConfigManager mainConfigManager;
1819
private VariablesFolderConfigManager variablesFolderConfigManager;
@@ -21,7 +22,7 @@ public class ConfigsManager {
2122
public ConfigsManager(ServerVariables plugin) {
2223
this.plugin = plugin;
2324
this.mainConfigManager = new MainConfigManager(plugin);
24-
this.playerConfigsManager = new PlayerConfigsManager(plugin);
25+
this.playerConfigsManager = new PlayersConfigsManager(plugin,"players");
2526
this.dataConfigManager = new DataConfigManager(plugin);
2627
this.variablesFolderConfigManager = new VariablesFolderConfigManager(plugin,"variables");
2728
}
@@ -36,9 +37,9 @@ public void configure() {
3637

3738
public void configureVariables(){
3839
ArrayList<Variable> variables = new ArrayList<>();
39-
ArrayList<CustomConfig> variablesConfigs = getVariablesConfigs();
40+
ArrayList<CommonConfig> variablesConfigs = getVariablesConfigs();
4041

41-
for(CustomConfig customConfig : variablesConfigs){
42+
for(CommonConfig customConfig : variablesConfigs){
4243
FileConfiguration config = customConfig.getConfig();
4344
if(config.contains("variables")){
4445
for(String key : config.getConfigurationSection("variables").getKeys(false)){
@@ -64,6 +65,9 @@ public void configureVariables(){
6465
if(config.contains(path+".limitations.max_decimals")){
6566
limitations.setMaxDecimals(config.getInt(path+".limitations.max_decimals"));
6667
}
68+
if(config.contains(path+".limitations.manage_out_of_range")){
69+
limitations.setManageOutOfRange(config.getBoolean(path+".limitations.manage_out_of_range"));
70+
}
6771

6872
Variable variable = new Variable(key, variableType, valueType, initialValue, possibleValues, limitations);
6973
variables.add(variable);
@@ -73,7 +77,7 @@ public void configureVariables(){
7377
plugin.getVariablesManager().setVariables(variables);
7478
}
7579

76-
public PlayerConfigsManager getPlayerConfigsManager() {
80+
public PlayersConfigsManager getPlayerConfigsManager() {
7781
return playerConfigsManager;
7882
}
7983

@@ -85,27 +89,30 @@ public MainConfigManager getMainConfigManager() {
8589
return mainConfigManager;
8690
}
8791

88-
private ArrayList<CustomConfig> getVariablesConfigs() {
89-
ArrayList<CustomConfig> configs = new ArrayList<CustomConfig>();
92+
private ArrayList<CommonConfig> getVariablesConfigs() {
93+
ArrayList<CommonConfig> configs = new ArrayList<>();
9094

9195
configs.add(mainConfigManager.getConfigFile());
9296
configs.addAll(variablesFolderConfigManager.getConfigs());
9397

9498
return configs;
9599
}
96100

97-
public void reloadConfigs(){
98-
mainConfigManager.reload();
99-
variablesFolderConfigManager.reloadConfigs();
101+
public boolean reloadConfigs(){
102+
if(!mainConfigManager.reloadConfig()){
103+
return false;
104+
}
105+
100106
configureVariables();
101107

102108
saveServerData();
103109
savePlayerData();
110+
return true;
104111
}
105112

106113
public void savePlayerData(){
107114
if(plugin.getMySQLConnection() == null){
108-
playerConfigsManager.savePlayers();
115+
playerConfigsManager.saveConfigs();
109116
}
110117
}
111118

‎src/main/java/svar/ajneb97/config/DataConfigManager.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
package svar.ajneb97.config;
22

3-
import java.io.File;
4-
import java.io.IOException;
5-
import java.io.InputStreamReader;
6-
import java.io.Reader;
7-
import java.io.UnsupportedEncodingException;
83
import java.util.ArrayList;
94

105
import org.bukkit.configuration.file.FileConfiguration;
11-
import org.bukkit.configuration.file.YamlConfiguration;
126
import svar.ajneb97.ServerVariables;
7+
import svar.ajneb97.config.model.CommonConfig;
138
import svar.ajneb97.managers.ServerVariablesManager;
149
import svar.ajneb97.model.ServerVariablesVariable;
1510

1611
public class DataConfigManager {
1712

1813
private ServerVariables plugin;
19-
private CustomConfig configFile;
14+
private CommonConfig configFile;
2015

2116
public DataConfigManager(ServerVariables plugin) {
2217
this.plugin = plugin;
23-
this.configFile = new CustomConfig("data.yml",plugin,null);
18+
this.configFile = new CommonConfig("data.yml",plugin,null,false);
2419
configFile.registerConfig();
2520
}
2621

‎src/main/java/svar/ajneb97/config/DataFolderConfigManager.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package svar.ajneb97.config;
2+
3+
4+
import svar.ajneb97.ServerVariables;
5+
import svar.ajneb97.config.model.CommonConfig;
6+
7+
import java.io.File;
8+
import java.util.ArrayList;
9+
10+
public abstract class DataFolderConfigManager {
11+
protected String folderName;
12+
protected ServerVariables plugin;
13+
14+
public DataFolderConfigManager(ServerVariables plugin, String folderName){
15+
this.plugin = plugin;
16+
this.folderName = folderName;
17+
}
18+
19+
public void configure() {
20+
createFolder();
21+
loadConfigs();
22+
}
23+
24+
public void createFolder(){
25+
File folder;
26+
try {
27+
folder = new File(plugin.getDataFolder() + File.separator + folderName);
28+
if(!folder.exists()){
29+
folder.mkdirs();
30+
createFiles();
31+
}
32+
} catch(SecurityException e) {
33+
folder = null;
34+
}
35+
}
36+
37+
public CommonConfig getConfigFile(String pathName) {
38+
CommonConfig commonConfig = new CommonConfig(pathName, plugin, folderName, true);
39+
commonConfig.registerConfig();
40+
return commonConfig;
41+
}
42+
43+
public ArrayList<CommonConfig> getConfigs(){
44+
ArrayList<CommonConfig> configs = new ArrayList<>();
45+
46+
String pathFile = plugin.getDataFolder() + File.separator + folderName;
47+
File folder = new File(pathFile);
48+
File[] listOfFiles = folder.listFiles();
49+
for (File file : listOfFiles) {
50+
if (file.isFile()) {
51+
String pathName = file.getName();
52+
CommonConfig commonConfig = new CommonConfig(pathName, plugin, folderName, true);
53+
commonConfig.registerConfig();
54+
configs.add(commonConfig);
55+
}
56+
}
57+
58+
return configs;
59+
}
60+
61+
public abstract void createFiles();
62+
63+
public abstract void loadConfigs();
64+
65+
public abstract void saveConfigs();
66+
}

‎src/main/java/svar/ajneb97/config/MainConfigManager.java‎

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

33
import org.bukkit.configuration.file.FileConfiguration;
44
import svar.ajneb97.ServerVariables;
5+
import svar.ajneb97.config.model.CommonConfig;
56
import svar.ajneb97.managers.MessagesManager;
67
import svar.ajneb97.tasks.DataSaveTask;
78

@@ -13,23 +14,18 @@
1314
public class MainConfigManager {
1415

1516
private ServerVariables plugin;
16-
private CustomConfig configFile;
17+
private CommonConfig configFile;
1718

1819
private boolean updateNotify;
1920
private boolean isMySQL;
2021
private boolean silentCommandsHideErrors;
2122

2223
public MainConfigManager(ServerVariables plugin) {
2324
this.plugin = plugin;
24-
this.configFile = new CustomConfig("config.yml",plugin,null);
25+
this.configFile = new CommonConfig("config.yml",plugin,null,false);
2526
configFile.registerConfig();
2627
checkMessagesUpdate();
2728
}
28-
29-
public void reload(){
30-
configFile.reloadConfig();
31-
configure();
32-
}
3329

3430
public void configure() {
3531
FileConfiguration config = configFile.getConfig();
@@ -48,7 +44,15 @@ public void configure() {
4844
silentCommandsHideErrors = config.getBoolean("config.silent_commands_hide_errors");
4945
}
5046

51-
public CustomConfig getConfigFile() {
47+
public boolean reloadConfig(){
48+
if(!configFile.reloadConfig()){
49+
return false;
50+
}
51+
configure();
52+
return true;
53+
}
54+
55+
public CommonConfig getConfigFile() {
5256
return configFile;
5357
}
5458

‎src/main/java/svar/ajneb97/config/PlayerConfig.java‎

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

0 commit comments

Comments
 (0)