Skip to content

Commit 768abff

Browse files
Maxlego08Maxlego08
committed
📝 Update to last zmenu and sarah version
1 parent 541bc60 commit 768abff

10 files changed

Lines changed: 19 additions & 18 deletions

File tree

‎API/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ rootProject.extra.properties["sha"]?.let { sha ->
88

99
dependencies {
1010
compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
11-
compileOnly(files("../libs/zMenu-1.1.1.0.jar"))
11+
compileOnly(files("../libs/zMenu-1.1.1.2.jar"))
1212

13-
implementation("fr.maxlego08.sarah:sarah:1.20")
13+
implementation("fr.maxlego08.sarah:sarah:1.23")
1414
implementation("com.tcoded:FoliaLib:0.5.1")
1515
implementation("fr.mrmicky:fastboard:2.1.5")
1616
}

‎DiscordBot/src/main/java/fr/maxlego08/essentials/bot/storage/StorageManager.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import fr.maxlego08.sarah.DatabaseConnection;
1010
import fr.maxlego08.sarah.HikariDatabaseConnection;
1111
import fr.maxlego08.sarah.RequestHelper;
12+
import fr.maxlego08.sarah.logger.JULogger;
1213
import fr.maxlego08.sarah.logger.Logger;
1314

1415
import java.util.Optional;
@@ -25,14 +26,14 @@ public class StorageManager {
2526
public void connect(Configuration configuration) {
2627

2728
DatabaseConfiguration databaseConfiguration = configuration.getDatabaseConfiguration().toDatabaseConfiguration();
28-
DatabaseConnection databaseConnection = new HikariDatabaseConnection(databaseConfiguration);
29+
Logger logger = System.out::println;
30+
DatabaseConnection databaseConnection = new HikariDatabaseConnection(databaseConfiguration, logger);
2931

3032
if (!databaseConnection.isValid()) {
3133
System.err.println("Database connection failed.");
3234
return;
3335
}
3436

35-
Logger logger = System.out::println;
3637
this.requestHelper = new RequestHelper(databaseConnection, logger);
3738
}
3839

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ allprojects {
6767

6868
dependencies {
6969
// compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.0")
70-
compileOnly(files("libs/zMenu-1.1.1.0.jar"))
70+
compileOnly(files("libs/zMenu-1.1.1.2.jar"))
7171

72-
compileOnly("fr.maxlego08.sarah:sarah:1.20")
72+
compileOnly("fr.maxlego08.sarah:sarah:1.23")
7373
compileOnly("com.tcoded:FoliaLib:0.5.1")
7474
compileOnly("fr.mrmicky:fastboard:2.1.5")
7575
}

‎libs/zMenu-1.1.1.2.jar‎

2.56 MB
Binary file not shown.

‎src/main/java/fr/maxlego08/essentials/convert/cmi/CMIConvert.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import fr.maxlego08.sarah.DatabaseConfiguration;
1414
import fr.maxlego08.sarah.RequestHelper;
1515
import fr.maxlego08.sarah.SqliteConnection;
16-
import org.bukkit.Bukkit;
17-
import org.bukkit.Location;
16+
import fr.maxlego08.sarah.logger.Logger;
1817
import org.bukkit.Material;
1918
import org.bukkit.command.CommandSender;
2019

@@ -50,14 +49,15 @@ public void convert(CommandSender sender) {
5049
}
5150

5251
private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage) {
53-
var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), plugin.getDataFolder());
52+
Logger logger = message -> this.plugin.getLogger().info(message);
53+
var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), this.plugin.getDataFolder(), logger);
5454
databaseConnection.setFileName("cmi.sqlite.db");
5555

5656
if (!databaseConnection.isValid()) {
5757
message(sender, "&cUnable to connect to database.");
5858
}
5959

60-
RequestHelper requestHelper = new RequestHelper(databaseConnection, message -> plugin.getLogger().info(message));
60+
RequestHelper requestHelper = new RequestHelper(databaseConnection, logger);
6161
List<CMIUser> cmiUsers = requestHelper.select("users", CMIUser.class, table -> {
6262
});
6363

‎src/main/java/fr/maxlego08/essentials/convert/coinsengine/CoinsEngineConvert.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void convert(CommandSender sender) {
5757
}
5858

5959
private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage, File folder) throws SQLException {
60-
var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), folder);
60+
var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), folder, JULogger.from(plugin.getLogger()));
6161
databaseConnection.setFileName("data.db");
6262

6363
if (!databaseConnection.isValid()) {

‎src/main/java/fr/maxlego08/essentials/convert/huskhomes/HuskHomesConvert.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import fr.maxlego08.sarah.DatabaseConnection;
1313
import fr.maxlego08.sarah.RequestHelper;
1414
import fr.maxlego08.sarah.SqliteConnection;
15+
import fr.maxlego08.sarah.logger.JULogger;
1516
import org.bukkit.command.CommandSender;
1617

1718
import java.io.File;
@@ -48,7 +49,7 @@ private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage) {
4849
DatabaseConnection databaseConnection = sqlStorage.getConnection();
4950
File file = new File(this.plugin.getDataFolder(), "HuskHomesData.db");
5051
if (file.exists()) {
51-
var sqliteConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), this.plugin.getDataFolder());
52+
var sqliteConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), this.plugin.getDataFolder(), JULogger.from(plugin.getLogger()));
5253
sqliteConnection.setFileName("HuskHomesData.db");
5354
databaseConnection = sqliteConnection;
5455

‎src/main/java/fr/maxlego08/essentials/convert/sunlight/SunlightConvert.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import fr.maxlego08.sarah.DatabaseConfiguration;
1212
import fr.maxlego08.sarah.RequestHelper;
1313
import fr.maxlego08.sarah.SqliteConnection;
14+
import fr.maxlego08.sarah.logger.JULogger;
1415
import org.bukkit.command.CommandSender;
1516

1617
import java.io.File;
@@ -44,7 +45,7 @@ public void convert(CommandSender sender) {
4445
}
4546

4647
private void startConvertDatabase(CommandSender sender, SqlStorage sqlStorage) {
47-
var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), plugin.getDataFolder());
48+
var databaseConnection = new SqliteConnection(DatabaseConfiguration.sqlite(sqlStorage.getConnection().getDatabaseConfiguration().isDebug()), plugin.getDataFolder(), JULogger.from(plugin.getLogger()));
4849
databaseConnection.setFileName("data.db");
4950

5051
if (!databaseConnection.isValid()) {

‎src/main/java/fr/maxlego08/essentials/module/modules/worldedit/WorldeditModule.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import fr.maxlego08.essentials.zutils.utils.TimerBuilder;
3434
import fr.maxlego08.menu.api.MenuItemStack;
3535
import fr.maxlego08.menu.api.utils.TypedMapAccessor;
36-
import fr.maxlego08.menu.common.utils.itemstack.MenuItemStackFormMap;
3736
import org.bukkit.Location;
3837
import org.bukkit.Material;
3938
import org.bukkit.Sound;
@@ -109,7 +108,7 @@ public void loadConfiguration() {
109108
int maxUse = accessor.getInt("max-use", -1);
110109
double priceMultiplier = accessor.getDouble("price-multiplier", -1);
111110
Map<String, Object> mapItem = (Map<String, Object>) accessor.getObject("item");
112-
MenuItemStack menuItemStack = MenuItemStackFormMap.fromMap(plugin.getInventoryManager(), new File(getFolder(), "config.yml"), name, mapItem);
111+
MenuItemStack menuItemStack = this.plugin.getInventoryManager().loadItemStack(new File(getFolder(), "config.yml"), name, mapItem);
113112

114113
WorldEditItem worldEditItem = new WorldEditItem(name, displayName, maxUse, priceMultiplier, menuItemStack);
115114
this.worldEditItems.add(worldEditItem);

‎src/main/java/fr/maxlego08/essentials/storage/storages/SqlStorage.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ public SqlStorage(EssentialsPlugin plugin, StorageType storageType) {
5555
super(plugin);
5656
DatabaseConfiguration databaseConfiguration = getDatabaseConfiguration(plugin, storageType);
5757
this.connection = switch (storageType) {
58-
// case HIKARICP -> new HikariDatabaseConnection(databaseConfiguration);
59-
case SQLITE -> new SqliteConnection(databaseConfiguration, plugin.getDataFolder());
60-
default -> new HikariDatabaseConnection(databaseConfiguration);
58+
case SQLITE -> new SqliteConnection(databaseConfiguration, plugin.getDataFolder(), JULogger.from(plugin.getLogger()));
59+
default -> new HikariDatabaseConnection(databaseConfiguration, JULogger.from(plugin.getLogger()));
6160
};
6261

6362
if (!this.connection.isValid()) {

0 commit comments

Comments
 (0)