Skip to content

Commit 8ea4495

Browse files
KrLiteKrLite
committed
migrate
1 parent a07431d commit 8ea4495

24 files changed

+131
-81
lines changed

‎.github/workflows/build.yml‎

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

‎.github/workflows/call_build.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: Build
2+
3+
on: [ pull_request, push, workflow_dispatch ]
4+
5+
jobs:
6+
call-workflow:
7+
uses: KessokuTeaTime/.github/.github/workflows/build.yml@main

‎.github/workflows/call_release.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Publish Release
2+
3+
on:
4+
workflow_dispatch:
5+
release:
6+
types:
7+
- published
8+
9+
permissions:
10+
contents: write
11+
12+
jobs:
13+
call-workflow:
14+
uses: KessokuTeaTime/.github/.github/workflows/release.yml@main
15+
secrets: inherit

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### Changes
2+
3+
- Unified publishing using **modpublisher.**
4+
- Jar name migrate: `{id}-{mcversion}-{modversion}` -> `{id}-{modversion}-{loader}{mcversion}`.
5+
- Tag name migrate: `{id}-{modversion}-mc{mcversion}` -> `{id}-{modversion}-{loader}{mcversion}`.
6+
7+
### Ownership Transfer
8+
9+
- **Transferred** ownership to **[Kessoku Tea Time.](https://github.com/KessokuTeaTime)**

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### <p align=right>[`→` Modrinth](https://modrinth.com/mod/rei-collapsible-entries)</p>
1+
### <p align=right>[`→` CurseForge](https://www.curseforge.com/minecraft/mc-mods/rei-collapsible-entries)&ensp;[`→` Modrinth](https://modrinth.com/mod/rei-collapsible-entries)</p>
22

33
# The *Roughly Enough Items* Collapsible Entries *Quality of Life* Mod
44

‎build.gradle.kts‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1+
class Display {
2+
lateinit var name: String
3+
lateinit var loader: String
4+
lateinit var version: String
5+
}
6+
7+
var display: Display = Display()
8+
19
plugins {
210
base
311
java
412
idea
513
`maven-publish`
614
alias(libs.plugins.fabric.loom)
15+
alias(libs.plugins.modpublisher)
716
}
817

918
group = libs.versions.maven.group.get()
10-
version = "${libs.versions.minecraft.get()}-${libs.versions.mod.get()}"
19+
version = "${libs.versions.mod.get()}-${libs.versions.loader.get()}${libs.versions.minecraft.get()}"
20+
21+
display.name = libs.versions.display.name.get()
22+
display.loader = libs.versions.display.loader.get()
23+
display.version = libs.versions.display.version.get()
1124

1225
base {
1326
archivesName.set(libs.versions.archives.name)
@@ -43,10 +56,11 @@ loom {
4356

4457
tasks {
4558
processResources {
46-
inputs.property("version", libs.versions.mod.get())
47-
4859
filesMatching("fabric.mod.json") {
49-
expand(mapOf("version" to libs.versions.mod.get()))
60+
expand(mapOf(
61+
"version" to libs.versions.mod.get(),
62+
"display" to display
63+
))
5064
}
5165
}
5266

@@ -65,3 +79,34 @@ publishing {
6579
repositories {
6680
}
6781
}
82+
83+
publisher {
84+
apiKeys {
85+
modrinth(System.getenv("MODRINTH_TOKEN"))
86+
curseforge(System.getenv("CURSEFORGE_TOKEN"))
87+
}
88+
89+
modrinthID.set(libs.versions.id.modrinth)
90+
curseID.set(libs.versions.id.curseforge)
91+
92+
versionType.set("release")
93+
projectVersion.set(project.version.toString())
94+
gameVersions.set(listOf("1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4"))
95+
loaders.set(listOf("fabric", "quilt"))
96+
curseEnvironment.set("client")
97+
98+
modrinthDepends.required("fabric-api")
99+
modrinthDepends.optional()
100+
modrinthDepends.embedded()
101+
102+
curseDepends.required("fabric-api")
103+
curseDepends.optional()
104+
curseDepends.embedded()
105+
106+
displayName.set("${display.name} ${libs.versions.mod.get()} for ${display.loader} ${display.version}")
107+
108+
artifact.set(tasks.remapJar)
109+
addAdditionalFile(tasks.remapSourcesJar)
110+
111+
changelog.set(file("CHANGELOG.md"))
112+
}

‎gradle/libs.versions.toml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
[versions]
2-
maven-group = "net.krlite"
2+
maven-group = "band.kessokuteatime"
33
archives-name = "reicollapsibleentries"
4-
mod = "3.0.2"
4+
mod = "3.1.0"
5+
loader = "fabric"
56

67
minecraft = "1.20"
78
yarn = "1.20+build.1"
8-
fabric-loader = "0.15.7"
9+
fabric-loader = "0.15.10"
910
fabric-api = "0.83.0+1.20"
10-
fabric-loom = "1.5-SNAPSHOT"
11+
fabric-loom = "1.6-SNAPSHOT"
12+
modpublisher = "2.1.0"
1113

1214
cloth-config = "11.1.118"
1315
modmenu = "7.0.1"
1416
rei = "12.0.684"
1517

18+
# id
19+
id-modrinth = "id"
20+
id-curseforge = "id"
21+
22+
# display
23+
display-name = "REI Collapsible Entries"
24+
display-loader = "Fabric"
25+
display-version = "1.20.x"
26+
1627
[libraries]
1728
minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
1829
yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
@@ -25,6 +36,7 @@ rei = { group = "me.shedaniel", name = "RoughlyEnoughItems-fabric", version.ref
2536

2637
[plugins]
2738
fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
39+
modpublisher = { id = "com.hypherionmc.modutils.modpublisher", version.ref = "modpublisher" }
2840

2941
[bundles]
3042
fabric = ["fabric-loader", "fabric-api"]

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ pluginManagement {
44
name = "Fabric"
55
url = uri("https://maven.fabricmc.net/")
66
}
7+
maven { url = uri("https://maven.firstdark.dev/releases") } // modpublisher
78
mavenCentral()
89
gradlePluginPortal()
910
}

src/main/java/net/krlite/reicollapsibleentries/REIClientPlugin.java renamed to src/main/java/band/kessokuteatime/reicollapsibleentries/REIClientPlugin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package net.krlite.reicollapsibleentries;
1+
package band.kessokuteatime.reicollapsibleentries;
22

33
import me.shedaniel.rei.api.client.registry.entry.CollapsibleEntryRegistry;
44
import me.shedaniel.rei.api.common.entry.type.EntryType;
55
import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
66
import me.shedaniel.rei.api.common.util.EntryIngredients;
7-
import net.krlite.reicollapsibleentries.core.ModPredicate;
7+
import band.kessokuteatime.reicollapsibleentries.core.ModPredicate;
88
import net.minecraft.block.Blocks;
99
import net.minecraft.item.Item;
1010
import net.minecraft.item.Items;
@@ -16,7 +16,7 @@
1616
import java.util.List;
1717
import java.util.Optional;
1818

19-
import static net.krlite.reicollapsibleentries.core.ModEntry.*;
19+
import static band.kessokuteatime.reicollapsibleentries.core.ModEntry.*;
2020

2121
@SuppressWarnings("UnstableApiUsage")
2222
public class REIClientPlugin implements me.shedaniel.rei.api.client.plugins.REIClientPlugin {

0 commit comments

Comments
 (0)