2.7.1

Author: Ajneb97

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>svar.ajneb97</groupId>
     <artifactId>ServerVariables</artifactId>
-    <version>2.6.4</version>
+    <version>2.7.1</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.7-R0.1-SNAPSHOT</version>
+            <version>1.21.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -101,6 +101,7 @@ public void setVersion(){
                 break;
             case "1.21.6":
             case "1.21.7":
+            case "1.21.8":
                 serverVersion = ServerVersion.v1_21_R5;
                 break;
             default:

src/main/java/svar/ajneb97/api/ServerVariablesAPI.java

@@ -4,6 +4,7 @@
 import svar.ajneb97.managers.VariablesManager;
 import svar.ajneb97.model.VariableResult;
 import svar.ajneb97.model.ServerVariablesPlayer;
+import svar.ajneb97.model.structure.Variable;
 
 import java.util.UUID;
 
@@ -27,6 +28,11 @@ public static String getServerVariableDisplay(String variableName){
         return result.getResultValue();
     }
 
+    public static String getPlayerVariableValue(UUID uuid, String variableName){
+        VariableResult result = plugin.getPlayerVariablesManager().getVariableValue(uuid, variableName, false);
+        return result.getResultValue();
+    }
+
     public static String getPlayerVariableValue(String playerName, String variableName){
         VariableResult result = plugin.getPlayerVariablesManager().getVariableValue(playerName, variableName, false);
         return result.getResultValue();
@@ -40,11 +46,27 @@ public static String getPlayerVariableDisplay(String playerName, String variable
         return result.getResultValue();
     }
 
-    public ServerVariablesPlayer getPlayerByName(String playerName){
+    public static VariableResult setPlayerVariableValue(UUID uuid, String variableName, String value){
+        return plugin.getPlayerVariablesManager().setVariable(uuid,variableName,value);
+    }
+
+    public static VariableResult setPlayerVariableValue(String playerName, String variableName, String value){
+        return plugin.getPlayerVariablesManager().setVariable(playerName,variableName,value);
+    }
+
+    public static ServerVariablesPlayer getPlayerByName(String playerName){
         return plugin.getPlayerVariablesManager().getPlayerByName(playerName);
     }
 
-    public ServerVariablesPlayer getPlayerByUUID(String uuid){
-        return plugin.getPlayerVariablesManager().getPlayerByUUID(UUID.fromString(uuid));
+    public static ServerVariablesPlayer getPlayerByUUID(UUID uuid){
+        return plugin.getPlayerVariablesManager().getPlayerByUUID(uuid);
+    }
+
+    public static String getVariableInitialValue(String variableName){
+        Variable variable = plugin.getVariablesManager().getVariable(variableName);
+        if(variable == null){
+            return null;
+        }
+        return variable.getInitialValue();
     }
 }

src/main/java/svar/ajneb97/api/ServerVariablesExpansion.java

@@ -77,6 +77,10 @@ public String onPlaceholderRequest(Player player, String identifier){
             }
             String variableName = identifier.replace("display_", "");
             return ServerVariablesAPI.getPlayerVariableDisplay(player.getName(),variableName);
+        }else if(identifier.startsWith("initial_value_")){
+            // %servervariables_initial_value_<variable>%
+            String variableName = identifier.replace("initial_value_", "");
+            return ServerVariablesAPI.getVariableInitialValue(variableName);
         }
 
         return null;

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

@@ -15,6 +15,7 @@ public class MainConfigManager {
 	private ServerVariables plugin;
 	private CustomConfig configFile;
 
+	private boolean updateNotify;
 	private boolean isMySQL;
 	private boolean silentCommandsHideErrors;
 
@@ -42,6 +43,7 @@ public void configure() {
 		dataSaveTask = new DataSaveTask(plugin);
 		dataSaveTask.start(config.getInt("config.data_save_time"));
 
+		updateNotify = config.getBoolean("update_notify");
 		isMySQL = config.getBoolean("config.mysql_database.enabled");
 		silentCommandsHideErrors = config.getBoolean("config.silent_commands_hide_errors");
 	}
@@ -54,6 +56,10 @@ public boolean isMySQL(){
 		return isMySQL;
 	}
 
+	public boolean isUpdateNotify() {
+		return updateNotify;
+	}
+
 	public FileConfiguration getConfig(){
 		return configFile.getConfig();
 	}
@@ -66,6 +72,10 @@ public void checkMessagesUpdate(){
 		Path pathConfig = Paths.get(configFile.getRoute());
 		try{
 			String text = new String(Files.readAllBytes(pathConfig));
+			if(!text.contains("update_notify:")){
+				getConfig().set("config.update_notify",true);
+				saveConfig();
+			}
 			if(!text.contains("verifyServerCertificate:")){
 				getConfig().set("config.mysql_database.pool.connectionTimeout",5000);
 				getConfig().set("config.mysql_database.advanced.verifyServerCertificate",false);

src/main/java/svar/ajneb97/listeners/PlayerListener.java

@@ -23,7 +23,7 @@ public void onJoin(PlayerJoinEvent event){
 
         //Update notification
         String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion();
-        if(player.isOp() && !plugin.version.equals(latestVersion)){
+        if(player.isOp() && plugin.getConfigsManager().getMainConfigManager().isUpdateNotify() && !plugin.version.equals(latestVersion)){
             player.sendMessage(MessagesManager.getColoredMessage(plugin.prefix+" &cThere is a new version available. &e(&7"+latestVersion+"&e)"));
             player.sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/servervariables"));
         }

src/main/java/svar/ajneb97/managers/PlayerVariablesManager.java

@@ -141,8 +141,17 @@ public VariableResult modifyVariable(String playerName, String variableName, Str
         }
     }
 
+    public VariableResult setVariable(UUID uuid, String variableName, String newValue){
+        ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
+        return setVariable(variablesPlayer,variableName,newValue);
+    }
 
     public VariableResult setVariable(String playerName, String variableName, String newValue){
+        ServerVariablesPlayer variablesPlayer = getPlayerByName(playerName);
+        return setVariable(variablesPlayer,variableName,newValue);
+    }
+
+    private VariableResult setVariable(ServerVariablesPlayer variablesPlayer, String variableName, String newValue){
         FileConfiguration config = plugin.getConfig();
         VariablesManager variablesManager = plugin.getVariablesManager();
         Variable variable = variablesManager.getVariable(variableName);
@@ -161,7 +170,6 @@ public VariableResult setVariable(String playerName, String variableName, String
             return VariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"));
         }
 
-        ServerVariablesPlayer variablesPlayer = getPlayerByName(playerName);
         if(variablesPlayer == null){
             //The player hasn't joined the server and can't set data.
             return VariableResult.error(config.getString("messages.playerNoData"));
@@ -177,15 +185,24 @@ public VariableResult setVariable(String playerName, String variableName, String
         String oldValue = variablesPlayer.getVariableValue(variableName,variable);
         variablesPlayer.setVariable(variableName,newValue);
 
-        plugin.getServer().getPluginManager().callEvent(new VariableChangeEvent(Bukkit.getPlayer(playerName),variable,newValue,oldValue));
+        plugin.getServer().getPluginManager().callEvent(new VariableChangeEvent(Bukkit.getPlayer(variablesPlayer.getName()),variable,newValue,oldValue));
 
         return VariableResult.noErrors(newValue);
     }
 
-    public VariableResult getVariableValue(String playerName, String name, boolean modifying){
-        FileConfiguration config = plugin.getConfig();
+    public VariableResult getVariableValue(UUID uuid, String variableName, boolean modifying){
+        ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
+        return getVariableValue(variablesPlayer,variableName,modifying);
+    }
 
+    public VariableResult getVariableValue(String playerName, String variableName, boolean modifying){
         ServerVariablesPlayer variablesPlayer = getPlayerByName(playerName);
+        return getVariableValue(variablesPlayer,variableName,modifying);
+    }
+
+    public VariableResult getVariableValue(ServerVariablesPlayer variablesPlayer, String name, boolean modifying){
+        FileConfiguration config = plugin.getConfig();
+
         Variable variable = plugin.getVariablesManager().getVariable(name);
 
         if(variable == null){

src/main/resources/config.yml

@@ -1,4 +1,5 @@
 config:
+  update_notify: true
   data_save_time: 5
   silent_commands_hide_errors: false
   mysql_database:

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 main: svar.ajneb97.ServerVariables
-version: 2.6.4
+version: 2.7.1
 name: ServerVariables
 api-version: 1.13
 softdepend: [PlaceholderAPI]