Skip to content

Commit 3dae1b1

Browse files
committed
Add 1.19.4 client download url and fabric 1.19.4 implementation
1 parent 5e17df6 commit 3dae1b1

File tree

22 files changed

+1472
-12
lines changed

22 files changed

+1472
-12
lines changed

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
@DebugDump
3737
public class MinecraftVersion implements Comparable<MinecraftVersion> {
3838

39-
private static final Pattern VERSION_REGEX = Pattern.compile("(?:(?<major>\\d+)\\.(?<minor>\\d+))(?:\\.(?<patch>\\d+))?(?:\\-(?:pre|rc)\\d+)?");
39+
private static final Pattern VERSION_REGEX = Pattern.compile("(?<major>\\d+)\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?(?:-(?:pre|rc)\\d+)?");
4040

41-
public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 3);
41+
public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 4);
4242
public static final MinecraftVersion EARLIEST_SUPPORTED = new MinecraftVersion(1, 13);
4343

4444
private final int major, minor, patch;
@@ -143,14 +143,15 @@ public static MinecraftVersion of(String versionString) {
143143
@DebugDump
144144
public enum MinecraftResource {
145145

146-
MC_1_13 (new MinecraftVersion(1, 13), "mc1_13", "https://launcher.mojang.com/v1/objects/30bfe37a8db404db11c7edf02cb5165817afb4d9/client.jar"),
147-
MC_1_14 (new MinecraftVersion(1, 14), "mc1_13", "https://launcher.mojang.com/v1/objects/8c325a0c5bd674dd747d6ebaa4c791fd363ad8a9/client.jar"),
148-
MC_1_15 (new MinecraftVersion(1, 15), "mc1_15", "https://launcher.mojang.com/v1/objects/e3f78cd16f9eb9a52307ed96ebec64241cc5b32d/client.jar"),
149-
MC_1_16 (new MinecraftVersion(1, 16), "mc1_16", "https://launcher.mojang.com/v1/objects/228fdf45541c4c2fe8aec4f20e880cb8fcd46621/client.jar"),
150-
MC_1_16_2 (new MinecraftVersion(1, 16, 2), "mc1_16", "https://launcher.mojang.com/v1/objects/653e97a2d1d76f87653f02242d243cdee48a5144/client.jar"),
151-
MC_1_17 (new MinecraftVersion(1, 17), "mc1_16", "https://launcher.mojang.com/v1/objects/1cf89c77ed5e72401b869f66410934804f3d6f52/client.jar"),
152-
MC_1_18 (new MinecraftVersion(1, 18), "mc1_18", "https://launcher.mojang.com/v1/objects/020aa79e63a7aab5d6f30e5ec7a6c08baee6b64c/client.jar"),
153-
MC_1_19 (new MinecraftVersion(1, 19), "mc1_18", "https://launcher.mojang.com/v1/objects/c0898ec7c6a5a2eaa317770203a1554260699994/client.jar");
146+
MC_1_13 (new MinecraftVersion(1, 13), "mc1_13", "https://piston-data.mojang.com/v1/objects/30bfe37a8db404db11c7edf02cb5165817afb4d9/client.jar"),
147+
MC_1_14 (new MinecraftVersion(1, 14), "mc1_13", "https://piston-data.mojang.com/v1/objects/8c325a0c5bd674dd747d6ebaa4c791fd363ad8a9/client.jar"),
148+
MC_1_15 (new MinecraftVersion(1, 15), "mc1_15", "https://piston-data.mojang.com/v1/objects/e3f78cd16f9eb9a52307ed96ebec64241cc5b32d/client.jar"),
149+
MC_1_16 (new MinecraftVersion(1, 16), "mc1_16", "https://piston-data.mojang.com/v1/objects/228fdf45541c4c2fe8aec4f20e880cb8fcd46621/client.jar"),
150+
MC_1_16_2 (new MinecraftVersion(1, 16, 2), "mc1_16", "https://piston-data.mojang.com/v1/objects/653e97a2d1d76f87653f02242d243cdee48a5144/client.jar"),
151+
MC_1_17 (new MinecraftVersion(1, 17), "mc1_16", "https://piston-data.mojang.com/v1/objects/1cf89c77ed5e72401b869f66410934804f3d6f52/client.jar"),
152+
MC_1_18 (new MinecraftVersion(1, 18), "mc1_18", "https://piston-data.mojang.com/v1/objects/020aa79e63a7aab5d6f30e5ec7a6c08baee6b64c/client.jar"),
153+
MC_1_19 (new MinecraftVersion(1, 19), "mc1_18", "https://piston-data.mojang.com/v1/objects/a45634ab061beb8c878ccbe4a59c3315f9c0266f/client.jar"),
154+
MC_1_19_4 (new MinecraftVersion(1, 19, 4), "mc1_18", "https://piston-data.mojang.com/v1/objects/958928a560c9167687bea0cefeb7375da1e552a8/client.jar");
154155

155156
private final MinecraftVersion version;
156157
private final String resourcePrefix;

implementations/fabric-1.19.3/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public FabricMod() {
7474
this.onlinePlayerMap = new ConcurrentHashMap<>();
7575
this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
7676

77-
pluginInstance = new Plugin("fabric-1.18", this);
77+
pluginInstance = new Plugin("fabric-1.19.3", this);
7878

7979
this.eventForwarder = new FabricEventForwarder(this);
8080
this.worlds = Caffeine.newBuilder()
Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
import com.matthewprenger.cursegradle.CurseArtifact
2+
import com.matthewprenger.cursegradle.CurseProject
3+
import com.matthewprenger.cursegradle.CurseRelation
4+
import com.matthewprenger.cursegradle.Options
5+
import net.fabricmc.loom.task.RemapJarTask
6+
7+
plugins {
8+
java
9+
`java-library`
10+
id("com.diffplug.spotless") version "6.1.2"
11+
id ("com.github.node-gradle.node") version "3.0.1"
12+
id ("com.github.johnrengelman.shadow") version "7.1.2"
13+
id ("fabric-loom") version "1.1-SNAPSHOT"
14+
id ("com.modrinth.minotaur") version "2.+"
15+
id ("com.matthewprenger.cursegradle") version "1.4.0"
16+
}
17+
18+
group = "de.bluecolored.bluemap.fabric"
19+
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
20+
21+
val javaTarget = 17
22+
java {
23+
sourceCompatibility = JavaVersion.toVersion(javaTarget)
24+
targetCompatibility = JavaVersion.toVersion(javaTarget)
25+
26+
withSourcesJar()
27+
}
28+
29+
repositories {
30+
mavenCentral()
31+
maven {
32+
setUrl("https://libraries.minecraft.net")
33+
}
34+
maven {
35+
setUrl("https://jitpack.io")
36+
}
37+
maven {
38+
setUrl("https://maven.fabricmc.net/")
39+
}
40+
maven {
41+
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
42+
}
43+
}
44+
45+
val shadowInclude: Configuration by configurations.creating
46+
47+
configurations {
48+
implementation.get().extendsFrom(shadowInclude)
49+
}
50+
51+
dependencies {
52+
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
53+
//exclude dependencies provided by fabric
54+
exclude (group = "com.google.guava", module = "guava")
55+
exclude (group = "com.google.code.gson", module = "gson")
56+
exclude (group = "org.apache.commons", module = "commons-lang3")
57+
exclude (group = "commons-io", module = "commons-io")
58+
exclude (group = "com.mojang", module = "brigadier")
59+
}
60+
61+
minecraft ("com.mojang:minecraft:1.19.4")
62+
mappings ("net.fabricmc:yarn:1.19.4+build.1")
63+
modImplementation ("net.fabricmc:fabric-loader:0.14.17")
64+
modImplementation ("net.fabricmc.fabric-api:fabric-api:0.75.3+1.19.4")
65+
modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
66+
67+
testImplementation ("org.junit.jupiter:junit-jupiter:5.9.0")
68+
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.9.0")
69+
}
70+
71+
spotless {
72+
java {
73+
target ("src/*/java/**/*.java")
74+
75+
licenseHeaderFile("../../HEADER")
76+
indentWithSpaces()
77+
trimTrailingWhitespace()
78+
}
79+
}
80+
81+
tasks.withType(JavaCompile::class).configureEach {
82+
options.apply {
83+
encoding = "utf-8"
84+
}
85+
}
86+
87+
tasks.withType(AbstractArchiveTask::class).configureEach {
88+
isReproducibleFileOrder = true
89+
isPreserveFileTimestamps = false
90+
}
91+
92+
tasks.test {
93+
useJUnitPlatform()
94+
}
95+
96+
tasks.processResources {
97+
inputs.property ("version", project.version)
98+
99+
filesMatching("fabric.mod.json") {
100+
expand ("version" to project.version)
101+
}
102+
}
103+
104+
tasks.shadowJar {
105+
configurations = listOf(shadowInclude)
106+
107+
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
108+
relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")
109+
relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")
110+
relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate")
111+
relocate ("com.github.benmanes.caffeine", "de.bluecolored.shadow.benmanes.caffeine")
112+
relocate ("org.aopalliance", "de.bluecolored.shadow.aopalliance")
113+
relocate ("javax.inject", "de.bluecolored.shadow.javax.inject")
114+
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
115+
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
116+
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
117+
118+
relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone")
119+
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
120+
121+
relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
122+
relocate ("org.apache.commons.logging", "de.bluecolored.shadow.apache.commons.logging")
123+
relocate ("org.apache.commons.pool2", "de.bluecolored.shadow.apache.commons.pool2")
124+
}
125+
126+
tasks.register("remappedShadowJar", type = RemapJarTask::class) {
127+
destinationDirectory.set(file("../../build/release"))
128+
archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
129+
dependsOn (tasks.shadowJar)
130+
inputFile.set(tasks.shadowJar.get().archiveFile)
131+
addNestedDependencies.set(true)
132+
}
133+
134+
tasks.register("release") {
135+
dependsOn("remappedShadowJar")
136+
}
137+
138+
modrinth {
139+
token.set(System.getenv("MODRINTH_TOKEN"))
140+
projectId.set("swbUV1cr")
141+
versionNumber.set("${project.version}-${project.name}")
142+
changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}")
143+
uploadFile.set(tasks.findByName("remappedShadowJar"))
144+
gameVersions.addAll("1.19.4")
145+
dependencies {
146+
required.project("P7dR8mSH") // Fabric API
147+
}
148+
}
149+
150+
curseforge {
151+
apiKey = System.getenv("CURSEFORGE_TOKEN") ?: ""
152+
project(closureOf<CurseProject> {
153+
id = "406463"
154+
changelogType = "markdown"
155+
changelog = "**Releasenotes and Changelog:**\n\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
156+
releaseType = "release"
157+
158+
addGameVersion("Fabric")
159+
160+
addGameVersion("Java 18")
161+
addGameVersion("Java 17")
162+
163+
addGameVersion("1.19.4")
164+
165+
mainArtifact(tasks.findByName("remappedShadowJar"), closureOf<CurseArtifact> {
166+
relations(closureOf<CurseRelation> {
167+
requiredDependency("fabric-api")
168+
})
169+
})
170+
})
171+
options(closureOf<Options> {
172+
javaVersionAutoDetect = false
173+
javaIntegration = false
174+
forgeGradleIntegration = false
175+
})
176+
}
177+
178+
tasks.register("publish") {
179+
dependsOn("modrinth")
180+
dependsOn("curseforge")
181+
}
58.1 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)