Skip to content

Commit 7443fc7

Browse files
authored
Merge pull request #1 from Minecraft-Java-Edition-Speedrunning/finalize
finalize CI/CD stuff
2 parents c94a492 + df89722 commit 7443fc7

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins {
77
/*
88
* Gets the version name from the latest Git tag
99
*/
10-
// https://stackoverflow.com/questions/28498688/gradle-script-to-autoversion-and-include-the-commit-hash-in-android
1110
def getVersionMetadata() {
1211
// CI builds version numbers
1312
def build_id = System.getenv("RELEASE_TAG")
@@ -29,8 +28,8 @@ def getVersionMetadata() {
2928
return "rev.${id}"
3029
}
3130

32-
archivesBaseName = project.archives_base_name
33-
version = "1.16.1-${getVersionMetadata()}"
31+
archivesBaseName = "${project.archives_base_name}-${project.minecraft_version}"
32+
version = "${getVersionMetadata()}"
3433
group = project.maven_group
3534

3635
dependencies {
@@ -48,10 +47,11 @@ dependencies {
4847
}
4948

5049
processResources {
50+
inputs.property "mod_id", project.archives_base_name
5151
inputs.property "version", project.version
5252

5353
filesMatching("fabric.mod.json") {
54-
expand "version": project.version
54+
expand "mod_id": project.archives_base_name, "version": project.version
5555
}
5656
}
5757

@@ -77,5 +77,5 @@ java {
7777
targetCompatibility = JavaVersion.VERSION_1_8
7878
}
7979
jar {
80-
from "LICENSE"
80+
from "LICENSE.txt"
8181
}

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"schemaVersion": 1,
3-
"id": "starlight",
3+
"id": "${mod_id}",
44
"version": "${version}",
55
"name": "Starlight",
66
"description": "Rewrites the light engine to fix lighting performance and lighting errors",
@@ -16,7 +16,6 @@
1616
"phosphor" : "*"
1717
},
1818
"license": "LGPL-3.0-only",
19-
"icon": "assets/starlight/icon.png",
2019
"environment": "*",
2120
"entrypoints": {},
2221
"mixins": [

0 commit comments

Comments
 (0)