Skip to content

Commit 2b21763

Browse files
committed
Merge branch 'release/1.0.10'
2 parents b0a9036 + 62e6c0f commit 2b21763

File tree

7 files changed

+148
-93
lines changed

7 files changed

+148
-93
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Build Action
2+
3+
on:
4+
push:
5+
branches: [ main, develop ]
6+
pull_request:
7+
types: [ opened, synchronize, reopened ]
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
packages: write
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build:
20+
name: Build and Publish CurrenciesAPI
21+
uses: GroupeZ-dev/actions/.github/workflows/build.yml@main
22+
with:
23+
project-name: "CurrenciesAPI"
24+
publish: true
25+
publish-on-discord: false
26+
project-to-publish: "publish"
27+
secrets:
28+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
29+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
30+
WEBHOOK_URL: ""

build.gradle

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

build.gradle.kts

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
plugins {
2+
`java-library`
3+
id("re.alwyn974.groupez.repository") version "1.0.0"
4+
id("re.alwyn974.groupez.publish") version "1.0.0"
5+
id("com.gradleup.shadow") version "9.0.0-beta11"
6+
}
7+
8+
rootProject.extra.properties["sha"]?.let { sha ->
9+
version = sha
10+
}
11+
12+
group = "fr.traqueur.currencies"
13+
version = property("version") as String
14+
15+
extra.set("targetFolder", file("target/"))
16+
extra.set("classifier", System.getProperty("archive.classifier"))
17+
extra.set("sha", System.getProperty("github.sha"))
18+
19+
repositories {
20+
mavenCentral()
21+
maven {
22+
url = uri("https://jitpack.io")
23+
name = "jitpack"
24+
}
25+
maven {
26+
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
27+
name = "spigot-repo"
28+
}
29+
maven {
30+
url = uri("https://nexus.bencodez.com/repository/maven-public/")
31+
name = "BenCodez Repo"
32+
}
33+
}
34+
35+
dependencies {
36+
compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
37+
38+
compileOnly("com.github.MilkBowl:VaultAPI:1.7")
39+
compileOnly("com.github.PlayerNguyen:OptEco:2.1.4b")
40+
compileOnly("com.willfp:EcoBits:1.8.4")
41+
compileOnly("com.bencodez:votingplugin:6.17.2")
42+
compileOnly("com.github.Emibergo02:RedisEconomy:4.3.19")
43+
44+
compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.0")
45+
46+
compileOnly(files("libs/bt-api-3.14.6.jar"))
47+
compileOnly(files("libs/MySQLTokens.jar"))
48+
compileOnly(files("libs/PlayerPoints-3.2.7.jar"))
49+
compileOnly(files("libs/TokenAPI.jar"))
50+
compileOnly(files("libs/GemAPI.jar"))
51+
compileOnly(files("libs/zEssentialsAPI-1.0.1.4.jar"))
52+
compileOnly(files("libs/CoinsEngine-2.4.2.jar"))
53+
compileOnly(files("libs/nightcore-2.7.1.jar"))
54+
compileOnly(files("libs/RoyaleEconomyAPI.jar"))
55+
}
56+
57+
val targetJavaVersion = 8
58+
59+
java {
60+
val javaVersion = JavaVersion.toVersion(targetJavaVersion)
61+
sourceCompatibility = javaVersion
62+
targetCompatibility = javaVersion
63+
if (JavaVersion.current() < javaVersion) {
64+
toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion))
65+
}
66+
67+
withSourcesJar()
68+
withJavadocJar()
69+
}
70+
71+
tasks.withType<JavaCompile>().configureEach {
72+
options.encoding = "UTF-8"
73+
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible) {
74+
options.release.set(targetJavaVersion)
75+
}
76+
}
77+
78+
val generateVersionProperties by tasks.registering {
79+
doLast {
80+
val file = file("src/main/resources/${project.name.lowercase()}.properties")
81+
file.parentFile.mkdirs()
82+
file.writeText("version=${project.version}")
83+
}
84+
}
85+
86+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
87+
archiveClassifier.set("") // Écrase le JAR de base par le fat jar
88+
}
89+
90+
tasks.build {
91+
dependsOn(tasks.shadowJar)
92+
}
93+
94+
tasks.withType<Jar> {
95+
manifest {
96+
attributes["Implementation-Title"] = "CurrenciesAPI"
97+
attributes["Implementation-Version"] = project.version
98+
}
99+
}
100+
101+
publishConfig {
102+
githubOwner = "GroupeZ-dev"
103+
useRootProjectName = true
104+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.0.8
1+
version=1.0.9

settings.gradle

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

settings.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
rootProject.name = "CurrenciesAPI"
2+
3+
pluginManagement {
4+
repositories {
5+
maven {
6+
name = "groupezReleases"
7+
url = uri("https://repo.groupez.dev/releases")
8+
}
9+
gradlePluginPortal()
10+
}
11+
}

src/main/java/fr/traqueur/currencies/providers/ZMenuItemProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public BigDecimal getBalance(OfflinePlayer offlinePlayer) {
3333
public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
3434
if (offlinePlayer.isOnline()) {
3535
Player player = offlinePlayer.getPlayer();
36-
removeItems(player, this.menuItemStack.build(player), amount.intValue());
36+
giveItem(player, amount.intValue(), this.menuItemStack.build(player));
3737
} else {
3838
this.plugin.getLogger().severe("Deposit items to " + offlinePlayer.getName() + " but is offline");
3939
}
@@ -43,7 +43,7 @@ public void deposit(OfflinePlayer offlinePlayer, BigDecimal amount, String reaso
4343
public void withdraw(OfflinePlayer offlinePlayer, BigDecimal amount, String reason) {
4444
if (offlinePlayer.isOnline()) {
4545
Player player = offlinePlayer.getPlayer();
46-
giveItem(player, amount.intValue(), this.menuItemStack.build(player));
46+
removeItems(player, this.menuItemStack.build(player), amount.intValue());
4747
} else {
4848
this.plugin.getLogger().severe("Withdraw items from " + offlinePlayer.getName() + " but is offline");
4949
}

0 commit comments

Comments
 (0)