Skip to content

Commit 1fbaaea

Browse files
Jeryn99Jeryn99
committed
Release 1.20.1 - 2.1.3
1 parent 9c5215b commit 1fbaaea

File tree

4 files changed

+66
-82
lines changed

4 files changed

+66
-82
lines changed

‎.github/workflows/github_release.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/workflows/stale.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/stale@v5
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
24-
stale-issue-message: 'This issue has not recieved activity in a while - is it still a issue?'
25-
stale-pr-message: 'This PR has not recieved activity for a while - please provide activity'
24+
stale-issue-message: 'This issue has not received activity in a while - is it still a issue?'
25+
stale-pr-message: 'This PR has not received activity for a while - please provide activity'
2626
stale-issue-label: 'stale'
2727
stale-pr-label: 'stale'

‎fabric/build.gradle‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ repositories {
5656
}
5757
}
5858

59+
sourceSets.main.resources {
60+
srcDir project(":common").file("src/resources").absolutePath
61+
}
5962

6063
def generatedResources = project(":forge").file("src/generated/resources")
6164

@@ -158,42 +161,48 @@ remapJar {
158161
dependsOn shadowJar
159162
}
160163

161-
unifiedPublishing {
162-
project {
163-
displayName = "[Fabric] Tardis Refined - $project.version"
164-
releaseType = "release"
165-
changelog = new File("${rootProject.projectDir}/changelog.md").text
166-
gameVersions = ["$rootProject.minecraft_version"]
167-
mainPublication tasks.remapJar
168-
gameLoaders = ["fabric"]
169-
relations {
170-
depends {
171-
curseforge = "fabric-api"
172-
modrinth = "fabric-api"
173-
}
174-
optional {
175-
curseforge = "immersive-portals-mod"
176-
modrinth = "immersiveportals"
177-
}
178-
optional {
179-
curseforge = "trinkets"
180-
modrinth = "trinkets"
164+
def CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge");
165+
def MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth");
166+
167+
if (true) {
168+
unifiedPublishing {
169+
project {
170+
displayName = "[Fabric] Tardis Refined - $project.version"
171+
releaseType = "release"
172+
changelog = new File("${rootProject.projectDir}/changelog.md").text
173+
gameVersions = ["$rootProject.minecraft_version"]
174+
mainPublication tasks.remapJar
175+
gameLoaders = ["fabric"]
176+
177+
relations {
178+
depends {
179+
curseforge = "fabric-api"
180+
modrinth = "fabric-api"
181+
}
182+
optional {
183+
curseforge = "immersive-portals-mod"
184+
modrinth = "immersiveportals"
185+
}
186+
optional {
187+
curseforge = "trinkets"
188+
modrinth = "trinkets"
189+
}
181190
}
182-
}
183-
var CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge") ?: ""
184-
if (CURSE_API_KEY != "") {
185-
curseforge {
186-
token = CURSE_API_KEY
187-
id = "782697"
188-
gameVersions.addAll "Java 17", "$rootProject.minecraft_version"
191+
192+
if (CURSE_API_KEY != "") {
193+
curseforge {
194+
token = CURSE_API_KEY
195+
id = "782697"
196+
gameVersions.addAll "Java 17", "$rootProject.minecraft_version"
197+
}
189198
}
190-
}
191-
var MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth") ?: ""
192-
if (MODRINTH_TOKEN != "") {
193-
modrinth {
194-
token = MODRINTH_TOKEN
195-
id = "nqVt6aES"
196-
version = "fabric-$project.version"
199+
200+
if (MODRINTH_TOKEN != "") {
201+
modrinth {
202+
token = MODRINTH_TOKEN
203+
id = "nqVt6aES"
204+
version = "fabric-$project.version"
205+
}
197206
}
198207
}
199208
}
@@ -221,7 +230,7 @@ publishing {
221230

222231
repositories {
223232
maven {
224-
url = "https://maven.craig.software/snapshots/"
233+
url = "https://mvn.jeryn.dev/snapshots/"
225234
credentials {
226235
username = project.findProperty("MAVEN_REPO_USERNAME") ?: System.getenv("MAVEN_REPO_USERNAME") ?: ""
227236
password = project.findProperty("MAVEN_REPO_PASSWORD") ?: System.getenv("MAVEN_REPO_PASSWORD") ?: ""

‎forge/build.gradle‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ loom {
3535
mod "tardis_refined"
3636
}
3737

38+
runs {
39+
data {
40+
programArgs "--existing", project(":common").file("src/main/resources/").absolutePath
41+
}
42+
}
43+
3844
}
3945
}
4046

@@ -76,6 +82,11 @@ dependencies {
7682

7783
}
7884

85+
86+
def CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge");
87+
def MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth");
88+
89+
if (true) {
7990
unifiedPublishing {
8091
project {
8192
displayName = "[Forge] Tardis Refined - $project.version"
@@ -84,9 +95,10 @@ dependencies {
8495
gameVersions = ["$rootProject.minecraft_version"]
8596
mainPublication tasks.remapJar
8697
gameLoaders = ["neoforge", "forge"]
98+
8799
relations {
88100
optional {
89-
curseforge = "immersive-portals-mod"
101+
curseforge = "immersive-portals-for-forge"
90102
modrinth = "immersiveportals"
91103
}
92104
optional {
@@ -95,7 +107,6 @@ dependencies {
95107
}
96108
}
97109

98-
var CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge") ?: ""
99110
if (CURSE_API_KEY != "") {
100111
curseforge {
101112
token = CURSE_API_KEY
@@ -104,7 +115,6 @@ dependencies {
104115
}
105116
}
106117

107-
var MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth") ?: ""
108118
if (MODRINTH_TOKEN != "") {
109119
modrinth {
110120
token = MODRINTH_TOKEN
@@ -114,6 +124,12 @@ dependencies {
114124
}
115125
}
116126
}
127+
}
128+
129+
sourceSets.main.resources {
130+
srcDir project(":common").file("src/resources").absolutePath
131+
}
132+
117133

118134

119135
def resourceTargets = ["META-INF/mods.toml", "pack.mcmeta"]
@@ -202,7 +218,7 @@ publishing {
202218

203219
repositories {
204220
maven {
205-
url = "https://maven.craig.software/snapshots/"
221+
url = "https://mvn.jeryn.dev/snapshots"
206222
credentials {
207223
username = project.findProperty("MAVEN_REPO_USERNAME") ?: System.getenv("MAVEN_REPO_USERNAME") ?: ""
208224
password = project.findProperty("MAVEN_REPO_PASSWORD") ?: System.getenv("MAVEN_REPO_PASSWORD") ?: ""

0 commit comments

Comments
 (0)