Skip to content

Commit 018705c

Browse files
committed
Prepare for 26.1 release
1 parent af4b630 commit 018705c

File tree

8 files changed

+14
-23
lines changed

8 files changed

+14
-23
lines changed

implementations/fabric/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ plugins {
88
}
99

1010
val supportedMinecraftVersions = listOf(
11-
"26.1-snapshot-11"
11+
"26.1"
1212
)
1313

14-
val minecraftVersion = supportedMinecraftVersions.first()
14+
val minecraftVersion = "26.1-rc-3"
1515
val fabricLoaderVersion = "0.18.4"
16-
//val fabricApiVersion = "0.143.11+${minecraftVersion}"
17-
val fabricApiVersion = "0.143.11+26.1"
16+
val fabricApiVersion = "0.144.0+26.1"
1817

1918
val shadowInclude: Configuration by configurations.creating
2019
configurations.api.get().extendsFrom(shadowInclude)
@@ -83,8 +82,6 @@ tasks.withType(ProcessResources::class).configureEach {
8382
val replacements = mapOf(
8483
"version" to project.version,
8584
"fabric_loader_version" to fabricLoaderVersion,
86-
"minecraft_version" to "26.1-alpha.11",
87-
//"minecraft_version" to minecraftVersion,
8885
"java_version" to java.toolchain.languageVersion.get()
8986
)
9087
inputs.properties(replacements)

implementations/fabric/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
"depends": {
2626
"java": ">=${java_version}",
27-
"minecraft": ">=${minecraft_version}",
27+
"minecraft": "*",
2828
"fabricloader": ">=${fabric_loader_version}",
2929
"fabric-api-base": "*"
3030
},

implementations/neoforge/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ plugins {
66
}
77

88
val supportedMinecraftVersions = listOf(
9-
"26.1-snapshot-1"
9+
"26.1"
1010
)
1111

1212
val minecraftVersion = supportedMinecraftVersions.first()
13-
val neoVersion = "26.1.0.0-alpha.2+snapshot-1"
13+
val neoVersion = "26.1.0.0-alpha.15+pre-3"
1414

1515
val shadowInclude: Configuration by configurations.creating
1616
configurations.api.get().extendsFrom(shadowInclude)
@@ -74,8 +74,6 @@ tasks.shadowJar {
7474
tasks.withType(ProcessResources::class).configureEach {
7575
val replacements = mapOf(
7676
"version" to project.version,
77-
"minecraft_version" to minecraftVersion,
78-
"neo_version" to neoVersion,
7977
)
8078
inputs.properties(replacements)
8179
filesMatching(listOf(

implementations/neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ displayTest="IGNORE_SERVER_VERSION"
1010
[[dependencies.bluemap]]
1111
modId="neoforge"
1212
mandatory=true
13-
versionRange="[${neo_version},)"
1413
ordering="NONE"
1514
side="BOTH"
1615
[[dependencies.bluemap]]
1716
modId="minecraft"
1817
mandatory=true
19-
versionRange="[${minecraft_version},)"
2018
ordering="NONE"
2119
side="BOTH"

implementations/paper/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ plugins {
55
}
66

77
val supportedMinecraftVersions = listOf(
8-
"1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"
8+
"26.1"
99
)
1010

11-
val minecraftVersion = supportedMinecraftVersions.first()
12-
val paperVersion = "${minecraftVersion}-R0.1-SNAPSHOT"
1311
val apiVersion = "1.21.6" // paper-version but without minor
12+
val paperVersion = "1.21.6-R0.1-SNAPSHOT"
1413

1514
dependencies {
1615
api ( project( ":common" ) ) {

implementations/spigot/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ plugins {
44
}
55

66
val supportedMinecraftVersions = listOf(
7-
"1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
8-
"1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"
7+
"26.1"
98
)
109

1110
val apiVersion = "1.16"

implementations/sponge/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ plugins {
88
}
99

1010
val supportedMinecraftVersions = listOf(
11-
"1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
12-
"1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"
11+
"26.1"
1312
)
1413

1514
dependencies {
@@ -24,7 +23,7 @@ dependencies {
2423
}
2524

2625
sponge {
27-
apiVersion("11.0.0")
26+
apiVersion("17.0.0")
2827
license("MIT")
2928
loader {
3029
name(PluginLoaders.JAVA_PLAIN)

implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.spongepowered.plugin.PluginContainer;
5555

5656
import java.io.IOException;
57+
import java.lang.invoke.MethodHandles;
5758
import java.nio.file.Path;
5859
import java.util.*;
5960
import java.util.concurrent.ConcurrentHashMap;
@@ -192,13 +193,13 @@ public String getMinecraftVersion() {
192193

193194
@Override
194195
public void registerListener(ServerEventListener listener) {
195-
Sponge.eventManager().registerListeners(this.pluginContainer, new EventForwarder(listener));
196+
Sponge.eventManager().registerListeners(this.pluginContainer, new EventForwarder(listener), MethodHandles.lookup());
196197
}
197198

198199
@Override
199200
public void unregisterAllListeners() {
200201
Sponge.eventManager().unregisterListeners(this.pluginContainer);
201-
Sponge.eventManager().registerListeners(this.pluginContainer, this);
202+
Sponge.eventManager().registerListeners(this.pluginContainer, this, MethodHandles.lookup());
202203
}
203204

204205
@Override

0 commit comments

Comments
 (0)