Skip to content

Commit 6e78587

Browse files
committed
Update fabric-1.19.3 and add forge-1.19.3 implementations
1 parent 11306ec commit 6e78587

File tree

18 files changed

+1335
-9
lines changed

18 files changed

+1335
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
3838

3939
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, 1);
41+
public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 3);
4242
public static final MinecraftVersion EARLIEST_SUPPORTED = new MinecraftVersion(1, 13);
4343

4444
private final int major, minor, patch;

implementations/fabric-1.19.3/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ dependencies {
5858
exclude (group = "com.mojang", module = "brigadier")
5959
}
6060

61-
minecraft ("com.mojang:minecraft:1.19.3-pre2")
62-
mappings ("net.fabricmc:yarn:1.19.3-pre2+build.6:v2")
63-
modImplementation ("net.fabricmc:fabric-loader:0.14.10")
64-
modImplementation ("net.fabricmc.fabric-api:fabric-api:0.67.2+1.19.3")
61+
minecraft ("com.mojang:minecraft:1.19.3")
62+
mappings ("net.fabricmc:yarn:1.19.3+build.2")
63+
modImplementation ("net.fabricmc:fabric-loader:0.14.11")
64+
modImplementation ("net.fabricmc.fabric-api:fabric-api:0.68.1+1.19.3")
6565
modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
6666

67-
testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
68-
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2")
67+
testImplementation ("org.junit.jupiter:junit-jupiter:5.9.0")
68+
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.9.0")
6969
}
7070

7171
spotless {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
],
2828

2929
"depends": {
30-
"fabricloader": ">=0.11.3",
30+
"fabricloader": ">=0.14.11",
3131
"fabric": "*",
3232
"fabric-api-base": "*",
33-
"minecraft": ">=1.18-alpha.21.37.a"
33+
"minecraft": "*"
3434
},
3535
"suggests": {}
3636
}
Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
buildscript {
2+
repositories {
3+
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
4+
maven { url = 'https://maven.minecraftforge.net' }
5+
mavenCentral()
6+
}
7+
dependencies {
8+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
9+
}
10+
}
11+
12+
plugins {
13+
id "java"
14+
id "java-library"
15+
id "com.diffplug.spotless" version "6.1.2"
16+
id "com.github.node-gradle.node" version "3.0.1"
17+
id "com.github.johnrengelman.shadow" version "7.1.2"
18+
id "com.modrinth.minotaur" version "2.+"
19+
id "com.matthewprenger.cursegradle" version "1.4.0"
20+
}
21+
22+
apply plugin: "net.minecraftforge.gradle"
23+
24+
group = "de.bluecolored.bluemap.forge"
25+
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
26+
archivesBaseName = 'bluemap'
27+
28+
def javaTarget = 17
29+
java {
30+
toolchain.languageVersion = JavaLanguageVersion.of(javaTarget)
31+
}
32+
33+
minecraft {
34+
mappings channel: 'official', version: '1.19.3'
35+
36+
runs {
37+
server {
38+
workingDirectory project.file('run')
39+
property 'forge.logging.markers', 'REGISTRIES'
40+
property 'forge.logging.console.level', 'debug'
41+
42+
mods {
43+
bluemap {
44+
source sourceSets.main
45+
}
46+
}
47+
}
48+
}
49+
}
50+
51+
sourceSets.main.resources { srcDir 'src/generated/resources' }
52+
53+
repositories {
54+
mavenCentral()
55+
maven {
56+
setUrl("https://libraries.minecraft.net")
57+
}
58+
maven {
59+
setUrl("https://jitpack.io")
60+
}
61+
}
62+
63+
configurations {
64+
implementation.extendsFrom(shadowInclude)
65+
}
66+
67+
dependencies {
68+
minecraft 'net.minecraftforge:forge:1.19.3-44.0.0'
69+
70+
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
71+
//exclude dependencies provided by forge
72+
exclude (group: "com.google.guava", module: "guava")
73+
exclude (group: "com.google.code.gson", module: "gson")
74+
exclude (group: "org.apache.commons", module: "commons-lang3")
75+
exclude (group: "commons-io", module: "commons-io")
76+
exclude (group: "com.mojang", module: "brigadier")
77+
}
78+
79+
testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
80+
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2")
81+
}
82+
83+
spotless {
84+
java {
85+
target ("src/*/java/**/*.java")
86+
87+
licenseHeaderFile("../../HEADER")
88+
indentWithSpaces()
89+
trimTrailingWhitespace()
90+
}
91+
}
92+
93+
jar {
94+
manifest {
95+
attributes([
96+
"Specification-Title" : "bluemap",
97+
"Specification-Vendor" : "bluemap",
98+
"Specification-Version" : "1", // We are version 1 of ourselves
99+
"Implementation-Title" : project.name,
100+
"Implementation-Version" : project.jar.archiveVersion,
101+
"Implementation-Vendor" : "bluemap",
102+
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
103+
])
104+
}
105+
}
106+
107+
jar.finalizedBy('reobfJar')
108+
109+
tasks.withType(JavaCompile).configureEach {
110+
options.encoding = "utf-8"
111+
}
112+
113+
tasks.withType(AbstractArchiveTask).configureEach {
114+
setReproducibleFileOrder(true)
115+
setPreserveFileTimestamps(false)
116+
}
117+
118+
test {
119+
useJUnitPlatform()
120+
}
121+
122+
shadowJar {
123+
def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore
124+
destinationDirectory.set(file("../../build/release"))
125+
archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
126+
127+
configurations = [project.configurations.shadowInclude]
128+
129+
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
130+
relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")
131+
relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")
132+
relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate")
133+
relocate ("com.github.benmanes.caffeine", "de.bluecolored.shadow.benmanes.caffeine")
134+
relocate ("org.aopalliance", "de.bluecolored.shadow.aopalliance")
135+
relocate ("javax.inject", "de.bluecolored.shadow.javax.inject")
136+
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
137+
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
138+
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
139+
140+
relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone")
141+
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
142+
143+
relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
144+
relocate ("org.apache.commons.logging", "de.bluecolored.shadow.apache.commons.logging")
145+
relocate ("org.apache.commons.pool2", "de.bluecolored.shadow.apache.commons.pool2")
146+
}
147+
148+
processResources {
149+
from(sourceSets.main.resources.srcDirs) {
150+
include 'mcmod.info','META-INF/mods.toml'
151+
duplicatesStrategy = DuplicatesStrategy.WARN
152+
153+
expand (
154+
version: project.version
155+
)
156+
}
157+
}
158+
159+
afterEvaluate {
160+
reobf {
161+
shadowJar {
162+
mappings = createMcpToSrg.output
163+
}
164+
}
165+
}
166+
167+
task release {
168+
dependsOn(build)
169+
}
170+
171+
modrinth {
172+
token = System.getenv("MODRINTH_TOKEN")
173+
projectId = "swbUV1cr"
174+
versionNumber = "${project.version}-${project.name}"
175+
changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
176+
uploadFile = shadowJar
177+
gameVersions = ["1.19.3"]
178+
}
179+
180+
curseforge {
181+
apiKey = System.getenv("CURSEFORGE_TOKEN") ?: ""
182+
project {
183+
id = "406463"
184+
changelogType = "markdown"
185+
changelog = "**Releasenotes and Changelog:**\n\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
186+
releaseType = "release"
187+
188+
addGameVersion "Forge"
189+
190+
addGameVersion "Java 18"
191+
addGameVersion "Java 17"
192+
193+
addGameVersion "1.19.3"
194+
195+
mainArtifact shadowJar
196+
}
197+
options {
198+
javaVersionAutoDetect = false
199+
javaIntegration = false
200+
forgeGradleIntegration = false
201+
}
202+
}
203+
204+
task publish {
205+
dependsOn(tasks.findByName("modrinth"))
206+
dependsOn(tasks.findByName("curseforge"))
207+
}
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)