Skip to content

Commit a174e77

Browse files
committed
📝 Update to last zmenu build
1 parent 674dbcf commit a174e77

14 files changed

+47
-18
lines changed

API/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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.0.9.jar"))
11+
compileOnly(files("../libs/zMenu-1.1.1.0.jar"))
1212

1313
implementation("fr.maxlego08.sarah:sarah:1.20")
1414
implementation("com.tcoded:FoliaLib:0.5.1")

build-and-deploy.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
cd "$(dirname "$0")"
3+
4+
# Set Java 21
5+
export JAVA_HOME="$HOME/.jdks/ms-21.0.10"
6+
export PATH="$JAVA_HOME/bin:$PATH"
7+
8+
# Extract version from build.gradle.kts
9+
VERSION=$(grep "^version" build.gradle.kts | sed 's/version = "\(.*\)"/\1/')
10+
11+
echo "Building zEssentials version $VERSION..."
12+
./gradlew build
13+
14+
if [ $? -ne 0 ]; then
15+
echo "Build failed!"
16+
exit 1
17+
fi
18+
19+
echo "Copying zEssentials-$VERSION.jar to server plugins folder..."
20+
cp "target/zEssentials-$VERSION.jar" "$HOME/Desktop/Serveur dev/Serveur1.21.11/plugins/"
21+
22+
if [ $? -eq 0 ]; then
23+
echo "Done!"
24+
else
25+
echo "Copy failed!"
26+
fi

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ allprojects {
5959

6060
dependencies {
6161
// compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.0")
62-
compileOnly(files("libs/zMenu-1.1.0.9.jar"))
62+
compileOnly(files("libs/zMenu-1.1.1.0.jar"))
6363

6464
compileOnly("fr.maxlego08.sarah:sarah:1.20")
6565
compileOnly("com.tcoded:FoliaLib:0.5.1")

src/main/java/fr/maxlego08/essentials/buttons/kit/ButtonKitCategorySelector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void onClick(Player player, InventoryClickEvent event, InventoryEngine in
4848
}
4949

5050
@Override
51-
public ItemStack getCustomItemStack(@NonNull Player player, Placeholders placeholders) {
51+
public @NonNull ItemStack getCustomItemStack(@NonNull Player player, boolean useCache, Placeholders placeholders) {
5252

5353
KitModule kitModule = this.plugin.getModuleManager().getModule(KitModule.class);
5454
List<Kit> kits = kitModule.getKitsByCategory(player, this.categoryName);

src/main/java/fr/maxlego08/essentials/buttons/kit/ButtonKitCooldown.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public void onClick(Player player, InventoryClickEvent event, InventoryEngine in
4545

4646

4747
@Override
48-
public ItemStack getCustomItemStack(@NonNull Player player, @NonNull Placeholders placeholders) {
48+
public @NonNull ItemStack getCustomItemStack(@NonNull Player player, boolean useCache, @NonNull Placeholders placeholders) {
4949

5050
User user = this.plugin.getUser(player.getUniqueId());
51-
if (user == null) return super.getCustomItemStack(player, placeholders);
51+
if (user == null) return super.getCustomItemStack(player, useCache, placeholders);
5252

5353
Optional<Kit> optional = this.plugin.getKit(this.kitName);
54-
if (optional.isEmpty()) return super.getCustomItemStack(player, placeholders);
54+
if (optional.isEmpty()) return super.getCustomItemStack(player, useCache, placeholders);
5555
Kit kit = optional.get();
5656

5757
placeholders.register("cooldown", TimerBuilder.getStringTime(user.getKitCooldown(kit) - System.currentTimeMillis()));

src/main/java/fr/maxlego08/essentials/buttons/kit/ButtonKitGet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public void onClick(Player player, InventoryClickEvent event, InventoryEngine in
4646
}
4747

4848
@Override
49-
public ItemStack getCustomItemStack(@NonNull Player player, @NonNull Placeholders placeholders) {
49+
public @NonNull ItemStack getCustomItemStack(@NonNull Player player, boolean useCache, @NonNull Placeholders placeholders) {
5050

5151
Optional<Kit> optional = this.plugin.getKit(this.kitName);
52-
if (optional.isEmpty()) return super.getCustomItemStack(player, placeholders);
52+
if (optional.isEmpty()) return super.getCustomItemStack(player, useCache, placeholders);
5353
Kit kit = optional.get();
5454

5555
placeholders.register("cooldown", TimerBuilder.getStringTime(kit.getCooldown() * 1000));

src/main/java/fr/maxlego08/essentials/buttons/kit/ButtonKitSubCategorySelector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void onClick(Player player, InventoryClickEvent event, InventoryEngine in
5151
}
5252

5353
@Override
54-
public ItemStack getCustomItemStack(@NonNull Player player, @NonNull Placeholders placeholders) {
54+
public @NonNull ItemStack getCustomItemStack(@NonNull Player player, boolean useCache, Placeholders placeholders) {
5555

5656
KitModule kitModule = this.plugin.getModuleManager().getModule(KitModule.class);
5757
List<Kit> kits = kitModule.getKitsBySubCategory(player, this.categoryName, this.subCategoryName);

src/main/java/fr/maxlego08/essentials/buttons/sanction/ButtonSanctionInformation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public ButtonSanctionInformation(Plugin plugin) {
2525
}
2626

2727
@Override
28-
public ItemStack getCustomItemStack(Player player, @NonNull Placeholders placeholders) {
28+
public @NonNull ItemStack getCustomItemStack(Player player, boolean useCache, @NonNull Placeholders placeholders) {
2929

3030
User user = this.plugin.getUser(player.getUniqueId());
31-
if (user == null) return super.getCustomItemStack(player, placeholders);
31+
if (user == null) return super.getCustomItemStack(player, useCache, placeholders);
3232

3333
User targetuser = user.getTargetUser();
34-
if (targetuser == null) return super.getCustomItemStack(player, placeholders);
34+
if (targetuser == null) return super.getCustomItemStack(player, useCache, placeholders);
3535

3636
MenuItemStack menuItemStack = this.getItemStack();
3737

src/main/java/fr/maxlego08/essentials/buttons/vault/ButtonVaultIcon.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public ButtonVaultIcon(Plugin plugin) {
2121
}
2222

2323
@Override
24-
public ItemStack getCustomItemStack(@NonNull Player player, @NonNull Placeholders placeholders) {
24+
public @NonNull ItemStack getCustomItemStack(@NonNull Player player, boolean useCache, Placeholders placeholders) {
2525

2626
PlayerVaults playerVaults = plugin.getVaultManager().getPlayerVaults(player);
2727
Vault vault = playerVaults.getTargetVault();
28-
if (vault == null) return super.getCustomItemStack(player, placeholders);
28+
if (vault == null) return super.getCustomItemStack(player, useCache, placeholders);
2929

3030
var itemstack = this.getItemStack();
3131
var vaultManager = plugin.getVaultManager();

0 commit comments

Comments
 (0)