Skip to content

Commit 3f73ff8

Browse files
committed
Merge branch 'release/3.2.0'
2 parents 40dabfb + ef130dc commit 3f73ff8

File tree

167 files changed

+930
-1301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+930
-1301
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 zKoth
21+
uses: GroupeZ-dev/actions/.github/workflows/build.yml@main
22+
with:
23+
project-name: "zKoth"
24+
publish: true
25+
project-to-publish: "API:publish"
26+
discord-avatar-url: "https://groupez.dev/storage/images/335.png"
27+
secrets:
28+
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
29+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
30+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# User-specific stuff
2+
.idea/
3+
target/
4+
target-api/
5+
personal.properties
6+
7+
*.iml
8+
*.ipr
9+
*.iws
10+
11+
# IntelliJ
12+
out/
13+
# mpeltonen/sbt-idea plugin
14+
.idea_modules/
15+
16+
# JIRA plugin
17+
atlassian-ide-plugin.xml
18+
19+
# Compiled class file
20+
*.class
21+
22+
# Log file
23+
*.log
24+
25+
# BlueJ files
26+
*.ctxt
27+
28+
# Package Files #
29+
*.jar
30+
*.war
31+
*.nar
32+
*.ear
33+
*.zip
34+
*.tar.gz
35+
*.rar
36+
37+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
38+
hs_err_pid*
39+
40+
*~
41+
42+
# temporary files which can be created if a process still has a handle open of a deleted file
43+
.fuse_hidden*
44+
45+
# KDE directory preferences
46+
.directory
47+
48+
# Linux trash folder which might appear on any partition or disk
49+
.Trash-*
50+
51+
# .nfs files are created when an open file is removed but is still being accessed
52+
.nfs*
53+
54+
# General
55+
.DS_Store
56+
.AppleDouble
57+
.LSOverride
58+
59+
# Icon must end with two \r
60+
Icon
61+
62+
# Thumbnails
63+
._*
64+
65+
# Files that might appear in the root of a volume
66+
.DocumentRevisions-V100
67+
.fseventsd
68+
.Spotlight-V100
69+
.TemporaryItems
70+
.Trashes
71+
.VolumeIcon.icns
72+
.com.apple.timemachine.donotpresent
73+
74+
# Directories potentially created on remote AFP share
75+
.AppleDB
76+
.AppleDesktop
77+
Network Trash Folder
78+
Temporary Items
79+
.apdisk
80+
81+
# Windows thumbnail cache files
82+
Thumbs.db
83+
Thumbs.db:encryptable
84+
ehthumbs.db
85+
ehthumbs_vista.db
86+
87+
# Dump file
88+
*.stackdump
89+
90+
# Folder config file
91+
[Dd]esktop.ini
92+
93+
# Recycle Bin used on file shares
94+
$RECYCLE.BIN/
95+
96+
# Windows Installer files
97+
*.cab
98+
*.msi
99+
*.msix
100+
*.msm
101+
*.msp
102+
103+
# Windows shortcuts
104+
*.lnk
105+
106+
.gradle
107+
build/
108+
109+
# Ignore Gradle GUI config
110+
gradle-app.setting
111+
112+
# Cache of project
113+
.gradletasknamecache
114+
115+
**/build/
116+
117+
# Common working directory
118+
run/
119+
runs/
120+
121+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
122+
!gradle-wrapper.jar
123+
!/libs/*.jar

API/build.gradle.kts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
plugins {
2+
id("re.alwyn974.groupez.publish") version "1.0.0"
3+
}
4+
5+
rootProject.extra.properties["sha"]?.let { sha ->
6+
version = sha
7+
}
8+
9+
tasks {
10+
shadowJar {
11+
relocate("com.tcoded.folialib", "fr.maxlego08.menu.hooks.folialib")
12+
relocate("fr.traqueur.currencies", "fr.maxlego08.menu.hooks.currencies")
13+
relocate("de.tr7zw.changeme.nbtapi", "fr.maxlego08.menu.hooks.nbtapi")
14+
relocate("com.cryptomorin.xseries", "fr.maxlego08.menu.hooks.xseries")
15+
relocate("fr.maxlego08.sarah", "fr.maxlego08.menu.hooks.sarah")
16+
relocate("net.objecthunter.exp4j", "fr.maxlego08.menu.hooks.exp4j")
17+
18+
destinationDirectory.set(rootProject.extra["apiFolder"] as File)
19+
}
20+
21+
build {
22+
dependsOn(shadowJar)
23+
}
24+
}
25+
26+
publishConfig {
27+
githubOwner.set("GroupeZ-dev")
28+
}

src/fr/maxlego08/koth/api/Koth.java renamed to API/src/main/java/fr/maxlego08/koth/api/Koth.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package fr.maxlego08.koth.api;
22

33
import fr.maxlego08.koth.api.discord.DiscordWebhookConfig;
4+
import fr.maxlego08.koth.api.utils.Cuboid;
45
import fr.maxlego08.koth.api.utils.HologramConfig;
56
import fr.maxlego08.koth.api.utils.PlayerResult;
7+
import fr.maxlego08.koth.api.utils.ProgressBar;
68
import fr.maxlego08.koth.api.utils.RandomCommand;
79
import fr.maxlego08.koth.api.utils.ScoreboardConfiguration;
8-
import fr.maxlego08.koth.zcore.utils.Cuboid;
9-
import fr.maxlego08.koth.zcore.utils.ProgressBar;
10-
import fr.maxlego08.koth.zcore.utils.interfaces.CollectionConsumer;
10+
import fr.maxlego08.koth.api.utils.interfaces.CollectionConsumer;
1111
import org.bukkit.Location;
1212
import org.bukkit.command.CommandSender;
1313
import org.bukkit.entity.Player;
@@ -96,15 +96,16 @@ public interface Koth {
9696
* @return A list of {@code String} commands to execute at the end.
9797
*/
9898
List<String> getEndCommands();
99-
99+
100100
/**
101101
* Retrieves a collection of all nearby players according to the koth's scoreboard radius
102102
*
103103
* @return A collection of {@link Player}s currently within the koth's scoreboard radius
104104
*/
105105
Collection<Player> getAllPlayersNearby();
106-
106+
107107
String getFormattedPlayersNearbyList();
108+
108109
/**
109110
* @return Counts the number of nearby players from {@link Koth#getAllPlayersNearby()}
110111
*/

0 commit comments

Comments
 (0)