Skip to content

Commit ba1bd0b

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents a19a2e3 + e6a8d1f commit ba1bd0b

File tree

281 files changed

+13534
-10224
lines changed

Some content is hidden

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

281 files changed

+13534
-10224
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
## environment <--
77

88
## build -->
9-
target
109
*.iml
1110
build
1211
.gradle
13-
## build <--
12+
## build <--

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ git clone https://github.com/Gecolay/GSit.git
1919

2020
### Build
2121

22-
Run the maven build command by your ide or in a terminal.
22+
Run the `gradle build` command.
2323

24-
`mvn clean package`
25-
26-
The final `GSit-x.x-x.jar` file will be in the [`target`](./target) folder.
24+
The final `GSit-x.x-x.jar` file will be in the [`build/libs`](./build/libs) folder.
2725

2826
## Pull requests
2927

30-
You can create a pull request to submit your code to this repository: [Pull requests](https://github.com/Gecolay/GSit/pulls)
28+
You can create a pull request to submit your code to this repository: [Pull requests](https://github.com/Gecolay/GSit/pulls)

build.gradle.kts

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
plugins {
2+
`java-library`
3+
`maven-publish`
4+
id("com.gradleup.shadow") version "9.0.0-beta11"
5+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.16" apply false
6+
}
7+
8+
allprojects {
9+
apply(plugin = "java-library")
10+
11+
repositories {
12+
mavenLocal()
13+
mavenCentral()
14+
15+
maven(url = "https://repo.papermc.io/repository/maven-public/")
16+
maven(url = "https://maven.enginehub.org/repo/")
17+
maven(url = "https://repo.extendedclip.com/content/repositories/placeholderapi/")
18+
maven(url = "https://jitpack.io/")
19+
}
20+
21+
tasks.compileJava {
22+
options.encoding = "UTF-8"
23+
}
24+
25+
tasks.javadoc {
26+
options.encoding = "UTF-8"
27+
}
28+
}
29+
30+
dependencies {
31+
api(project(":core"))
32+
api(project(":v1_17_1", configuration = "reobf"))
33+
api(project(":v1_18", configuration = "reobf"))
34+
api(project(":v1_18_2", configuration = "reobf"))
35+
api(project(":v1_19", configuration = "reobf"))
36+
api(project(":v1_19_1", configuration = "reobf"))
37+
api(project(":v1_19_3", configuration = "reobf"))
38+
api(project(":v1_19_4", configuration = "reobf"))
39+
api(project(":v1_20", configuration = "reobf"))
40+
api(project(":v1_20_2", configuration = "reobf"))
41+
api(project(":v1_20_3", configuration = "reobf"))
42+
api(project(":v1_20_5", configuration = "reobf"))
43+
api(project(":v1_21", configuration = "reobf"))
44+
api(project(":v1_21_2", configuration = "reobf"))
45+
api(project(":v1_21_4", configuration = "reobf"))
46+
}
47+
48+
tasks {
49+
shadowJar {
50+
archiveClassifier = ""
51+
minimize()
52+
manifest {
53+
attributes["paperweight-mappings-namespace"] = "spigot"
54+
}
55+
}
56+
57+
build {
58+
dependsOn(shadowJar)
59+
}
60+
61+
compileJava {
62+
options.release = 16
63+
}
64+
65+
processResources {
66+
from("resources")
67+
expand(
68+
"name" to project.name,
69+
"version" to project.version,
70+
"description" to project.description,
71+
"main" to "${project.group}.${project.name}Main"
72+
)
73+
}
74+
}
75+
76+
publishing {
77+
publications {
78+
create<MavenPublication>("maven") {
79+
groupId = project.group.toString()
80+
artifactId = project.name
81+
version = project.version.toString()
82+
from(project.components["java"])
83+
}
84+
}
85+
}

core/build.gradle.kts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
plugins {
2+
`maven-publish`
3+
}
4+
5+
dependencies {
6+
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
7+
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.13") {
8+
exclude("com.google.guava", "guava")
9+
exclude("com.google.code.gson", "gson")
10+
exclude("it.unimi.dsi", "fastutil")
11+
}
12+
compileOnly("me.clip:placeholderapi:2.11.6")
13+
compileOnly("com.github.GriefPrevention:GriefPrevention:16.18.4")
14+
compileOnly("com.intellectualsites.plotsquared:plotsquared-core:7.5.1")
15+
}
16+
17+
java {
18+
disableAutoTargetJvm()
19+
toolchain.languageVersion = JavaLanguageVersion.of(21)
20+
}
21+
22+
tasks.compileJava {
23+
options.release = 16
24+
}
25+
26+
publishing {
27+
publications {
28+
create<MavenPublication>("maven") {
29+
groupId = project.group.toString()
30+
artifactId = project.name
31+
version = project.version.toString()
32+
from(project.components["java"])
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)