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

Commit bd812e9

Browse files
committed
Update to 1.19.4
1 parent 1edc060 commit bd812e9

File tree

15 files changed

+988
-14
lines changed

15 files changed

+988
-14
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN java -jar BuildTools.jar --rev 1.18 --remapped
2828
RUN java -jar BuildTools.jar --rev 1.18.2 --remapped
2929
RUN java -jar BuildTools.jar --rev 1.19 --remapped
3030
RUN java -jar BuildTools.jar --rev 1.19.3 --remapped
31+
RUN java -jar BuildTools.jar --rev 1.19.4 --remapped
3132

3233
# 3. Build plugin for 1.8 - 1.17 with jdk17
3334
FROM amazoncorretto:17 AS plugin-jdk17
@@ -45,9 +46,9 @@ RUN ./gradlew build pluginJar --no-daemon
4546
# 4. Launch a minecraft server with jdk17 and plugin
4647
FROM amazoncorretto:17
4748
# Change to the current plugin version present in build.gradle
48-
ENV PLUGIN_VERSION=2.9.0
49+
ENV PLUGIN_VERSION=2.10.0
4950
# Change to the server version you want to test.
50-
ENV SERVER_VERSION=spigot-1.19.jar
51+
ENV SERVER_VERSION=spigot-1.19.4.jar
5152
# Port of the Minecraft Server.
5253
EXPOSE 25565
5354
# Port for Remote Debugging

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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.9.0</version>
38+
<version>2.10.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.9.0")
46+
compileOnly("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.10.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.9.0
281-
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.9.0
280+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.10.0
281+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.10.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.9.0</version>
300+
<version>2.10.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.9.0</version>
306+
<version>2.10.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.9.0")
315-
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.9.0")
314+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.10.0")
315+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.10.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.9.0'
47+
version '2.10.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
@@ -18,3 +18,4 @@ include("structureblocklib-bukkit-core:bukkit-nms-118R1")
1818
include("structureblocklib-bukkit-core:bukkit-nms-118R2")
1919
include("structureblocklib-bukkit-core:bukkit-nms-119R1")
2020
include("structureblocklib-bukkit-core:bukkit-nms-119R2")
21+
include("structureblocklib-bukkit-core:bukkit-nms-119R3")

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
@@ -79,7 +79,12 @@ public enum Version {
7979
/**
8080
* Version 1.19.3 - 1.19.3.
8181
*/
82-
VERSION_1_19_R2("v1_19_R2", "1.19.3", 1.193);
82+
VERSION_1_19_R2("v1_19_R2", "1.19.3", 1.193),
83+
84+
/**
85+
* Version 1.19.4 - 1.19.4.
86+
*/
87+
VERSION_1_19_R3("v1_19_R3", "1.19.4", 1.194);
8388

8489
private final String bukkitId;
8590
private final String id;

structureblocklib-bukkit-core/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ tasks.register("pluginJar", Exec::class.java) {
8282
targetJarFile,
8383
targetJarFile
8484
)
85+
obsMapping = "$obsMapping && " + createCommand(
86+
"1.19.4-R0.1-SNAPSHOT",
87+
"com/github/shynixn/structureblocklib/bukkit/v1_19_R3",
88+
file,
89+
shadowJar,
90+
targetJarFile,
91+
targetJarFile
92+
)
8593

8694
if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
8795
commandLine = listOf("cmd", "/c", obsMapping.replace("\$HOME", "%userprofile%"))
@@ -122,6 +130,7 @@ dependencies {
122130
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-118R2"))
123131
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R1"))
124132
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R2"))
133+
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R3"))
125134

126135
compileOnly("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
127136
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.4-R0.1-SNAPSHOT:remapped-mojang")
23+
testCompile("org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT:remapped-mojang")
24+
}

0 commit comments

Comments
 (0)