Skip to content

- Add folia-supported: true to plugin.yml to indicate compatibility… #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrNickax wants to merge 1 commit into
base: main
Choose a base branch
from
Open

- Add folia-supported: true to plugin.yml to indicate compatibility… #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
Expand All @@ -35,12 +31,6 @@
<version>1.21.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.21.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
Expand Down
90 changes: 56 additions & 34 deletions src/main/java/svar/ajneb97/ServerVariables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package svar.ajneb97;

import org.bukkit.Bukkit;
import org.bukkit.command.PluginCommand;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
Expand All @@ -16,12 +17,12 @@
import svar.ajneb97.tasks.DataSaveTask;
import svar.ajneb97.utils.ServerVersion;


@SuppressWarnings("deprecation")
public class ServerVariables extends JavaPlugin {

public static String prefix;
public static ServerVersion serverVersion;
private PluginDescriptionFile pdfFile = getDescription();
private final PluginDescriptionFile pdfFile = getDescription();
public String version = pdfFile.getVersion();

private VariablesManager variablesManager;
Expand All @@ -35,51 +36,63 @@ public class ServerVariables extends JavaPlugin {

private MySQLConnection mySQLConnection;

public void onEnable(){
public final boolean isFolia = checkFolia();

public void onEnable() {
setVersion();
setPrefix();

this.variablesManager = new VariablesManager(this);
this.serverVariablesManager = new ServerVariablesManager(this);
this.playerVariablesManager = new PlayerVariablesManager(this);
variablesManager = new VariablesManager(this);
serverVariablesManager = new ServerVariablesManager();
playerVariablesManager = new PlayerVariablesManager(this);

registerCommands();
registerEvents();

this.configsManager = new ConfigsManager(this);
this.configsManager.configure();
configsManager = new ConfigsManager(this);
configsManager.configure();

ServerVariablesAPI api = new ServerVariablesAPI(this);
if(Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null){
if (Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
new ServerVariablesExpansion(this).register();
}
Metrics metrics = new Metrics(this,19731);
new Metrics(this, 19731);

if(configsManager.getMainConfigManager().isMySQL()){
if (configsManager.getMainConfigManager().isMySQL()) {
mySQLConnection = new MySQLConnection(this);
mySQLConnection.setupMySql();
}

Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eHas been enabled! &fVersion: "+version));
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eThanks for using my plugin! &f~Ajneb97"));
dataSaveTask = new DataSaveTask(this);
dataSaveTask.start(configsManager.getMainConfigManager().getConfig().getInt("config.data_save_time"));

Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &eHas been enabled! &fVersion: " + version));
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &eThanks for using my plugin! &f~Ajneb97"));

updateCheckerManager = new UpdateCheckerManager(version);
updateMessage(updateCheckerManager.check());
ServerVariablesAPI.init(this);
}

public void onDisable(){
this.configsManager.saveServerData();
this.configsManager.savePlayerData();
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eHas been disabled! &fVersion: "+version));
public void onDisable() {
configsManager.saveServerData();

configsManager.savePlayerData();

if (mySQLConnection != null) {
mySQLConnection.disable();
}

Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &eHas been disabled! &fVersion: " + version));
}

public void setPrefix(){
public void setPrefix() {
prefix = MessagesManager.getLegacyColoredMessage("&8[&a&lServerVariables&8]");
}

public void setVersion(){
public void setVersion() {
String packageName = Bukkit.getServer().getClass().getPackage().getName();
String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
switch(bukkitVersion){
switch (bukkitVersion) {
case "1.20.5":
case "1.20.6":
serverVersion = ServerVersion.v1_20_R4;
Expand Down Expand Up @@ -111,9 +124,9 @@ public void setVersion(){
serverVersion = ServerVersion.v1_21_R7;
break;
default:
try{
try {
serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", ""));
}catch(Exception e){
} catch (Exception e) {
serverVersion = ServerVersion.v1_21_R7;
}
}
Expand Down Expand Up @@ -142,6 +155,7 @@ public ConfigsManager getConfigsManager() {
public PlayerVariablesManager getPlayerVariablesManager() {
return playerVariablesManager;
}

public void registerEvents() {
PluginManager pm = getServer().getPluginManager();
pm.registerEvents(new PlayerListener(this), this);
Expand All @@ -151,31 +165,39 @@ public DataSaveTask getDataSaveTask() {
return dataSaveTask;
}

public void setDataSaveTask(DataSaveTask dataSaveTask) {
this.dataSaveTask = dataSaveTask;
}
public UpdateCheckerManager getUpdateCheckerManager() {
return updateCheckerManager;
}

public void registerCommands(){
this.getCommand("servervariables").setExecutor(new MainCommand(this));
public void registerCommands() {
PluginCommand command = getCommand("servervariables");
if (command != null) {
command.setExecutor(new MainCommand(this));
}
}

public MySQLConnection getMySQLConnection() {
return mySQLConnection;
}

public void updateMessage(UpdateCheckerResult result){
if(!result.isError()){
public void updateMessage(UpdateCheckerResult result) {
if (!result.isError()) {
String latestVersion = result.getLatestVersion();
if(latestVersion != null){
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
if (latestVersion != null) {
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7" + latestVersion + "&e)"));
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/servervariables"));
}
}else{
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &cError while checking update."));
} else {
Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &cError while checking update."));
}
}

private boolean checkFolia() {
try {
Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
return true;
} catch (ClassNotFoundException e) {
return false;
}
}
}
8 changes: 5 additions & 3 deletions src/main/java/svar/ajneb97/api/ListVariableChangeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@

import java.util.List;

@SuppressWarnings("unused")
public class ListVariableChangeEvent extends VariableChangeEvent {
private List<String> newValue;
private List<String> oldValue;
private int indexModified;

private final List<String> newValue;
private final List<String> oldValue;
private final int indexModified;

public ListVariableChangeEvent(Player player, Variable variable, List<String> newValue, List<String> oldValue, int indexModified) {
super(player, variable);
Expand Down
Loading