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

Commit 3e2e70d

Browse files
author
Shynixn
committed
#116 Added support for 1.20.4.
1 parent 2cd64e2 commit 3e2e70d

File tree

15 files changed

+985
-14
lines changed

15 files changed

+985
-14
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN java -jar BuildTools.jar --rev 1.19.3 --remapped
3131
RUN java -jar BuildTools.jar --rev 1.19.4 --remapped
3232
RUN java -jar BuildTools.jar --rev 1.20.1 --remapped
3333
RUN java -jar BuildTools.jar --rev 1.20.2 --remapped
34+
RUN java -jar BuildTools.jar --rev 1.20.4 --remapped
3435

3536
# 3. Build plugin for 1.8 - 1.17 with jdk17
3637
FROM amazoncorretto:17 AS plugin-jdk17
@@ -48,7 +49,7 @@ RUN ./gradlew build pluginJar --no-daemon
4849
# 4. Launch a minecraft server with jdk17 and plugin
4950
FROM amazoncorretto:17
5051
# Change to the current plugin version present in build.gradle
51-
ENV PLUGIN_VERSION=2.12.0
52+
ENV PLUGIN_VERSION=2.13.0
5253
# Change to the server version you want to test.
5354
ENV SERVER_VERSION=spigot-1.19.4.jar
5455
# 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.20.R2
20+
* Version support 1.9.R1 - 1.20.R3
2121
* Java support 8 - Latest
2222

2323
## Installation
@@ -29,15 +29,15 @@ StructureBlockLib is a bukkit API and implementation for handling structures on
2929
<dependency>
3030
<groupId>com.github.shynixn.structureblocklib</groupId>
3131
<artifactId>structureblocklib-bukkit-api</artifactId>
32-
<version>2.12.0</version>
32+
<version>2.13.0</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
```
3636
**Gradle**
3737

3838
```xml
3939
dependencies {
40-
compileOnly("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.12.0")
40+
compileOnly("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.13.0")
4141
}
4242
```
4343

@@ -271,8 +271,8 @@ structureBlock.update();
271271
**plugin.yml**
272272
```yaml
273273
libraries:
274-
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.12.0
275-
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.12.0
274+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.13.0
275+
- com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.13.0
276276
```
277277
278278
### For version < 1.17
@@ -291,22 +291,22 @@ go with the option above instead. There are several tutorials on spigotmc.org.
291291
<dependency>
292292
<groupId>com.github.shynixn.structureblocklib</groupId>
293293
<artifactId>structureblocklib-bukkit-api</artifactId>
294-
<version>2.12.0</version>
294+
<version>2.13.0</version>
295295
<scope>compile</scope>
296296
</dependency>
297297
<dependency>
298298
<groupId>com.github.shynixn.structureblocklib</groupId>
299299
<artifactId>structureblocklib-bukkit-core</artifactId>
300-
<version>2.12.0</version>
300+
<version>2.13.0</version>
301301
<scope>compile</scope>
302302
</dependency>
303303
```
304304
**Gradle**
305305

306306
```xml
307307
dependencies {
308-
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.12.0")
309-
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.12.0")
308+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-api:2.13.0")
309+
implementation("com.github.shynixn.structureblocklib:structureblocklib-bukkit-core:2.13.0")
310310
}
311311
```
312312

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.12.0'
47+
version '2.13.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
@@ -21,3 +21,4 @@ include("structureblocklib-bukkit-core:bukkit-nms-119R2")
2121
include("structureblocklib-bukkit-core:bukkit-nms-119R3")
2222
include("structureblocklib-bukkit-core:bukkit-nms-120R1")
2323
include("structureblocklib-bukkit-core:bukkit-nms-120R2")
24+
include("structureblocklib-bukkit-core:bukkit-nms-120R3")

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
@@ -94,7 +94,12 @@ public enum Version {
9494
/**
9595
* Version 1.20.2 - 1.20.2.
9696
*/
97-
VERSION_1_20_R2("v1_20_R2", "1.20.2", 1.22);
97+
VERSION_1_20_R2("v1_20_R2", "1.20.2", 1.202),
98+
99+
/**
100+
* Version 1.20.3 - 1.20.4.
101+
*/
102+
VERSION_1_20_R3("v1_20_R3", "1.20.4", 1.203);
98103

99104
private final String bukkitId;
100105
private final String id;

structureblocklib-bukkit-core/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,14 @@ tasks.register("pluginJar", Exec::class.java, ) {
148148
targetJarFile,
149149
targetJarFile
150150
)
151+
obsMapping = "$obsMapping && " + createCommand(
152+
"1.20.4-R0.1-SNAPSHOT",
153+
"com/github/shynixn/structureblocklib/bukkit/v1_20_R3",
154+
file,
155+
shadowJar,
156+
targetJarFile,
157+
targetJarFile
158+
)
151159

152160
if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
153161
commandLine = listOf("cmd", "/c", obsMapping.replace("\$HOME", "%userprofile%"))
@@ -191,6 +199,7 @@ dependencies {
191199
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-119R3"))
192200
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-120R1"))
193201
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-120R2"))
202+
implementation(project(":structureblocklib-bukkit-core:bukkit-nms-120R3"))
194203

195204
compileOnly("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
196205
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.20.4-R0.1-SNAPSHOT:remapped-mojang")
23+
testCompile("org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT:remapped-mojang")
24+
}

0 commit comments

Comments
 (0)