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

Commit 35675f6

Browse files
author
Shynixn
committed
#106 Implemented structureblocklib for 1.19.3.
1 parent 25ff072 commit 35675f6

File tree

15 files changed

+985
-15
lines changed

15 files changed

+985
-15
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ 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
2929
RUN java -jar BuildTools.jar --rev 1.19 --remapped
30+
RUN java -jar BuildTools.jar --rev 1.19.3 --remapped
3031

3132
# 3. Build plugin for 1.8 - 1.17 with jdk17
3233
FROM amazoncorretto:17 AS plugin-jdk17
@@ -44,7 +45,7 @@ RUN ./gradlew build pluginJar --no-daemon
4445
# 4. Launch a minecraft server with jdk17 and plugin
4546
FROM amazoncorretto:17
4647
# Change to the current plugin version present in build.gradle
47-
ENV PLUGIN_VERSION=2.8.0
48+
ENV PLUGIN_VERSION=2.9.0
4849
# Change to the server version you want to test.
4950
ENV SERVER_VERSION=spigot-1.19.jar
5051
# Port of the Minecraft Server.

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.19.R1
20+
* Version support 1.9.R1 - 1.19.R2
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.8.0</version>
38+
<version>2.9.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.8.0")
46+
compileOnly("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.9.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.8.0
281-
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.8.0
280+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.9.0
281+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.9.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.8.0</version>
300+
<version>2.9.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.8.0</version>
306+
<version>2.9.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.8.0")
315-
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.8.0")
314+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.9.0")
315+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.9.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.8.0'
47+
version '2.9.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
@@ -17,3 +17,4 @@ include("structureblocklib-bukkit-core:bukkit-nms-117R1")
1717
include("structureblocklib-bukkit-core:bukkit-nms-118R1")
1818
include("structureblocklib-bukkit-core:bukkit-nms-118R2")
1919
include("structureblocklib-bukkit-core:bukkit-nms-119R1")
20+
include("structureblocklib-bukkit-core:bukkit-nms-119R2")

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,14 @@ public enum Version {
7272
VERSION_1_18_R2("v1_18_R2", "1.18.2", 1.182),
7373

7474
/**
75-
* Version 1.19.0 - 1.19.0
75+
* Version 1.19.0 - 1.19.2.
7676
*/
77-
VERSION_1_19_R1("v1_19_R1", "1.19.0", 1.190);
77+
VERSION_1_19_R1("v1_19_R1", "1.19.0", 1.190),
78+
79+
/**
80+
* Version 1.19.3 - 1.19.3.
81+
*/
82+
VERSION_1_19_R2("v1_19_R2", "1.19.3", 1.193);
7883

7984
private final String bukkitId;
8085
private final String id;

structureblocklib-bukkit-core/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ tasks.register("pluginJar", Exec::class.java) {
7474
targetJarFile,
7575
targetJarFile
7676
)
77+
obsMapping = "$obsMapping && " + createCommand(
78+
"1.19.3-R0.1-SNAPSHOT",
79+
"com/github/shynixn/structureblocklib/bukkit/v1_19_R2",
80+
file,
81+
shadowJar,
82+
targetJarFile,
83+
targetJarFile
84+
)
7785

7886
if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
7987
commandLine = listOf("cmd", "/c", obsMapping.replace("\$HOME", "%userprofile%"))
@@ -113,6 +121,7 @@ dependencies {
113121
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-118R1"))
114122
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-118R2"))
115123
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R1"))
124+
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R2"))
116125

117126
compileOnly("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
118127
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.3-R0.1-SNAPSHOT:remapped-mojang")
23+
testCompile("org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:remapped-mojang")
24+
}

0 commit comments

Comments
 (0)