Skip to content

Commit 1b6a1f0

Browse files
committed
Backport to forge-1.20
1 parent 2c63d76 commit 1b6a1f0

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

implementations/forge/build.gradle.kts

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

88
val supportedMinecraftVersions = listOf(
9-
"1.21", "1.21.1", "1.21.2", "1.21.3"
9+
"1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4"
1010
)
1111

1212
val minecraftVersion = supportedMinecraftVersions.first()
13-
val forgeVersion = "51.0.1"
13+
val forgeVersion = "46.0.1"
1414

1515
val shadowInclude: Configuration by configurations.creating
1616
configurations.api.get().extendsFrom(shadowInclude)
@@ -31,7 +31,7 @@ dependencies {
3131

3232
minecraft {
3333
mappings( "official", minecraftVersion )
34-
reobf = false
34+
reobf = true
3535
}
3636

3737
tasks.shadowJar {
@@ -97,8 +97,15 @@ val mergeShadowAndJarJar = tasks.create<Jar>("mergeShadowAndJarJar") {
9797
archiveFileName = "${project.name}-${project.version}-merged.jar"
9898
}
9999

100+
reobf {
101+
create("mergeShadowAndJarJar") {
102+
mappings = tasks.createMcpToSrg.map { it.output.get() }
103+
}
104+
}
105+
106+
val reobfMergeShadowAndJarJar = tasks.getByName("reobfMergeShadowAndJarJar")
100107
tasks.getByName<CopyFileTask>("release") {
101-
dependsOn( mergeShadowAndJarJar )
108+
dependsOn( reobfMergeShadowAndJarJar )
102109
inputFile = mergeShadowAndJarJar.outputs.files.singleFile
103110
}
104111

implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public ForgeCommandSource(ForgeMod mod, Plugin plugin, CommandSourceStack delega
4949

5050
@Override
5151
public void sendMessage(Text text) {
52-
var component = Component.Serializer.fromJsonLenient(text.toJSONString(), delegate.registryAccess());
52+
var component = Component.Serializer.fromJsonLenient(text.toJSONString());
5353
if (component != null)
5454
delegate.sendSuccess(() -> component, false);
5555
}

implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgeWorld.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ForgeWorld(ServerLevel delegate) {
4848
this.delegate = new WeakReference<>(delegate);
4949

5050
MinecraftServer server = delegate.getServer();
51-
this.worldFolder = delegate.getServer().getServerDirectory()
51+
this.worldFolder = delegate.getServer().getServerDirectory().toPath()
5252
.resolve(server.getWorldPath(LevelResource.ROOT));
5353

5454
ResourceLocation id = delegate.dimension().location();

settings.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ includeBuild("api")
2222
include(":core")
2323
include(":common")
2424

25-
implementation("cli")
26-
implementation("fabric")
25+
//implementation("cli")
26+
//implementation("fabric")
2727
implementation("forge")
28-
implementation("neoforge")
29-
implementation("paper")
30-
implementation("spigot")
31-
implementation("sponge")
28+
//implementation("neoforge")
29+
//implementation("paper")
30+
//implementation("spigot")
31+
//implementation("sponge")
3232

3333
fun implementation(name: String) {
3434
val project = ":$name"

0 commit comments

Comments
 (0)