Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Commit 25ff072

Browse files
author
Shynixn
committed
#102 Implemented 1.19 support.
1 parent 381791d commit 25ff072

File tree

16 files changed

+965
-16
lines changed

16 files changed

+965
-16
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Validate Spigot Dependencies
3737
run: |
38-
test -f ~/.m2/repository/org/spigotmc/spigot/1.9.4-R0.1-SNAPSHOT/spigot-1.9.4-R0.1-SNAPSHOT.jar && echo "DEPENDENCIES=true" >> $GITHUB_ENV || echo "DEPENDENCIES=false" >> $GITHUB_ENV
38+
test -f ~/.m2/repository/org/spigotmc/spigot/1.19-R0.1-SNAPSHOT/spigot-1.19-R0.1-SNAPSHOT.jar && echo "DEPENDENCIES=true" >> $GITHUB_ENV || echo "DEPENDENCIES=false" >> $GITHUB_ENV
3939
4040
- name: Build Spigot Dependencies
4141
if: ${{ env.DEPENDENCIES != 'true' }}

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/ar
2626
RUN java -jar BuildTools.jar --rev 1.17.1 --remapped
2727
RUN java -jar BuildTools.jar --rev 1.18 --remapped
2828
RUN java -jar BuildTools.jar --rev 1.18.2 --remapped
29+
RUN java -jar BuildTools.jar --rev 1.19 --remapped
2930

3031
# 3. Build plugin for 1.8 - 1.17 with jdk17
3132
FROM amazoncorretto:17 AS plugin-jdk17
@@ -43,9 +44,9 @@ RUN ./gradlew build pluginJar --no-daemon
4344
# 4. Launch a minecraft server with jdk17 and plugin
4445
FROM amazoncorretto:17
4546
# Change to the current plugin version present in build.gradle
46-
ENV PLUGIN_VERSION=2.7.0
47+
ENV PLUGIN_VERSION=2.8.0
4748
# Change to the server version you want to test.
48-
ENV SERVER_VERSION=spigot-1.18.2.jar
49+
ENV SERVER_VERSION=spigot-1.19.jar
4950
# Port of the Minecraft Server.
5051
EXPOSE 25565
5152
# Port for Remote Debugging

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ StructureBlockLib is a bukkit API and implementation for handling structures on
1717
* API to save or load structures without an actual structure block.
1818
* Asynchronous implementation and API.
1919
* Fluent API.
20-
* Version support 1.9.R1 - 1.18.R2
20+
* Version support 1.9.R1 - 1.19.R1
2121
* Java support 8 - Latest
2222

2323
## Donation
@@ -35,15 +35,15 @@ Support development with a small tip :heart: :coffee:.
3535
<dependency>
3636
<groupId>com.github.shynixn.structureblocklib</groupId>
3737
<artifactId>structureblocklib-bukkit-api</artifactId>
38-
<version>2.7.0</version>
38+
<version>2.8.0</version>
3939
<scope>provided</scope>
4040
</dependency>
4141
```
4242
**Gradle**
4343

4444
```xml
4545
dependencies {
46-
compileOnly("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.7.0")
46+
compileOnly("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.8.0")
4747
}
4848
```
4949

@@ -277,8 +277,8 @@ structureBlock.update();
277277
**plugin.yml**
278278
```yaml
279279
libraries:
280-
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.7.0
281-
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.7.0
280+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.8.0
281+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.8.0
282282
```
283283
284284
### For version < 1.17
@@ -297,22 +297,22 @@ go with the option above instead. There are several tutorials on spigotmc.org.
297297
<dependency>
298298
<groupId>com.github.shynixn.structureblocklib</groupId>
299299
<artifactId>structureblocklib-bukkit-api</artifactId>
300-
<version>2.7.0</version>
300+
<version>2.8.0</version>
301301
<scope>compile</scope>
302302
</dependency>
303303
<dependency>
304304
<groupId>com.github.shynixn.structureblocklib</groupId>
305305
<artifactId>structureblocklib-bukkit-core</artifactId>
306-
<version>2.7.0</version>
306+
<version>2.8.0</version>
307307
<scope>compile</scope>
308308
</dependency>
309309
```
310310
**Gradle**
311311

312312
```xml
313313
dependencies {
314-
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.7.0")
315-
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.7.0")
314+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.8.0")
315+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.8.0")
316316
}
317317
```
318318

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tasks.register("printVersion") {
4444

4545
subprojects {
4646
group 'com.github.shynixn.structureblocklib'
47-
version '2.7.0'
47+
version '2.8.0'
4848

4949
apply plugin: 'kotlin-platform-jvm'
5050
apply plugin: 'signing'

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ include("structureblocklib-bukkit-core:bukkit-nms-116R3")
1616
include("structureblocklib-bukkit-core:bukkit-nms-117R1")
1717
include("structureblocklib-bukkit-core:bukkit-nms-118R1")
1818
include("structureblocklib-bukkit-core:bukkit-nms-118R2")
19+
include("structureblocklib-bukkit-core:bukkit-nms-119R1")

structureblocklib-api/src/main/java/com/github/shynixn/structureblocklib/api/enumeration/Version.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ public enum Version {
6969
/**
7070
* Version 1.18.2 - 1.18.2.
7171
*/
72-
VERSION_1_18_R2("v1_18_R2", "1.18.2", 1.182);
72+
VERSION_1_18_R2("v1_18_R2", "1.18.2", 1.182),
73+
74+
/**
75+
* Version 1.19.0 - 1.19.0
76+
*/
77+
VERSION_1_19_R1("v1_19_R1", "1.19.0", 1.190);
7378

7479
private final String bukkitId;
7580
private final String id;

structureblocklib-bukkit-core/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ tasks.register("pluginJar", Exec::class.java) {
6666
targetJarFile,
6767
targetJarFile
6868
)
69+
obsMapping = "$obsMapping && " + createCommand(
70+
"1.19-R0.1-SNAPSHOT",
71+
"com/github/shynixn/structureblocklib/bukkit/v1_19_R1",
72+
file,
73+
shadowJar,
74+
targetJarFile,
75+
targetJarFile
76+
)
6977

7078
if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
7179
commandLine = listOf("cmd", "/c", obsMapping.replace("\$HOME", "%userprofile%"))
@@ -104,6 +112,7 @@ dependencies {
104112
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-117R1"))
105113
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-118R1"))
106114
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-118R2"))
115+
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R1"))
107116

108117
compileOnly("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
109118
testCompile("org.spigotmc:spigot:1.12-R0.1-SNAPSHOT")
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
repositories {
2+
maven(url = "https://libraries.minecraft.net")
3+
}
4+
5+
dependencies {
6+
// Dependencies of spigot mojang want to restrict usage to only Java 17. However, we do not care
7+
// what they want because the general compatibility of this plugin is Java 8. The plugin
8+
// guarantees that everything works during runtime. This error is a false positive.
9+
components {
10+
all {
11+
allVariants {
12+
attributes {
13+
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
14+
}
15+
}
16+
}
17+
}
18+
19+
implementation(project(":structureblocklib-api"))
20+
implementation(project(":structureblocklib-core"))
21+
implementation(project(":structureblocklib-bukkit-api"))
22+
compileOnly("org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:remapped-mojang")
23+
testCompile("org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:remapped-mojang")
24+
}

0 commit comments

Comments
 (0)