Skip to content

Commit dec8d43

Browse files
committed
port to neoforge
1 parent 96f10e8 commit dec8d43

File tree

6 files changed

+98
-45
lines changed

6 files changed

+98
-45
lines changed

.github/workflows/publish.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Publish to KTT Maven
2+
3+
on:
4+
workflow_dispatch:
5+
release:
6+
types:
7+
- published
8+
9+
permissions:
10+
contents: write
11+
12+
jobs:
13+
Build:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Set up JDK 21
19+
uses: actions/setup-java@v4
20+
with:
21+
distribution: 'adopt'
22+
java-version: 21
23+
- name: Cache
24+
uses: actions/cache@v4
25+
with:
26+
path: |
27+
~/.gradle/caches
28+
~/.gradle/wrapper
29+
.gradle
30+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }}
31+
- uses: gradle/actions/wrapper-validation@v4
32+
- run: |
33+
chmod +x gradlew
34+
./gradlew build publish --stacktrace -Porg.gradle.parallel.threads=4
35+
env:
36+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
39+
KTT_MAVEN_USERNAME: ${{ secrets.KTT_MAVEN_USERNAME }}
40+
KTT_MAVEN_TOKEN: ${{ secrets.KTT_MAVEN_TOKEN }}

build.gradle

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.8-SNAPSHOT'
2+
id 'dev.architectury.loom' version '1.10-SNAPSHOT'
33
id 'maven-publish'
44
}
55

@@ -10,10 +10,17 @@ archivesBaseName = project.archives_base_name
1010
version = project.mod_version
1111
group = project.maven_group
1212

13+
repositories {
14+
maven { url "https://maven.neoforged.net/releases/" }
15+
}
16+
1317
dependencies {
1418
minecraft "com.mojang:minecraft:${project.minecraft_version}"
15-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
16-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
19+
mappings loom.layered {
20+
mappings "net.fabricmc:yarn:$rootProject.yarn_mappings:v2"
21+
mappings "dev.architectury:yarn-mappings-patch-neoforge:1.21+build.6"
22+
}
23+
neoForge "net.neoforged:neoforge:${project.neoforge_version}"
1724

1825

1926
api "blue.endless:jankson:1.2.3"
@@ -23,7 +30,7 @@ dependencies {
2330
processResources {
2431
inputs.property "version", project.version
2532

26-
filesMatching("fabric.mod.json") {
33+
filesMatching("META-INF/neoforge.mods.toml") {
2734
expand "version": project.version
2835
}
2936
}
@@ -51,14 +58,13 @@ publishing {
5158

5259
// select the repositories you want to publish to
5360
repositories {
54-
def env = System.getenv()
55-
if (env.MAVEN_URL) {
56-
maven {
57-
url = env.MAVEN_URL
58-
credentials {
59-
username = env.MAVEN_USERNAME
60-
password = env.MAVEN_PASSWORD
61-
}
61+
maven {
62+
name = "KTTMaven"
63+
url = "https://maven.kessokuteatime.work/releases"
64+
65+
credentials {
66+
username = System.getenv("KTT_MAVEN_USERNAME")
67+
password = System.getenv("KTT_MAVEN_TOKEN")
6268
}
6369
}
6470
}

gradle.properties

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
33

4+
loom.platform=neoforge
5+
46
# Fabric Properties
57
# check these on https://fabricmc.net/use
68
minecraft_version=1.21.5
79
yarn_mappings=1.21.5+build.1
8-
loader_version=0.16.10
10+
neoforge_version=21.5.96
911

1012
# Mod Properties
1113
mod_version = 10.0.0+j1.2.3
12-
maven_group = io.github.cottonmc
13-
archives_base_name = Jankson
14+
maven_group = org.thinkingstudio
15+
archives_base_name = CottonJanksonFoxified
1416

1517
# Artifactory Shenanigans
1618
buildInfo.build.name = Jankson

settings.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ pluginManagement {
44
name = 'Fabric'
55
url = 'https://maven.fabricmc.net/'
66
}
7+
maven { url = 'https://maven.architectury.dev/' }
8+
maven { url = 'https://files.minecraftforge.net/maven/' }
79
mavenCentral()
810
gradlePluginPortal()
911
}
1012
}
1113

12-
rootProject.name = "Jankson-Fabric"
14+
rootProject.name = "CottonJankson-Foxified"
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
modLoader = "javafml"
2+
loaderVersion = "[4,)"
3+
#issueTrackerURL = ""
4+
license = "MIT"
5+
6+
[[mods]]
7+
modId = "libgui"
8+
version = "${version}"
9+
displayName = "CottonJankson-Foxified"
10+
displayURL = "https://github.com/ThinkingStudio/CottonJankson-Foxified"
11+
credits = "Falkreon, The Cotton Project"
12+
authors = "TexTrue, ThinkingStudio"
13+
description = '''
14+
CottonMC's Jankson unofficial NeoForge port.
15+
16+
A (Neo)Forge-mod wrapper for Jankson, packaged with helpful (Neo)Forge-specific deserializers!
17+
'''
18+
logoFile = "assets/jankson/icon.png"
19+
20+
[[dependencies.libgui]]
21+
modId = "neoforge"
22+
type = "required"
23+
versionRange = "[21.5,)"
24+
ordering = "NONE"
25+
side = "BOTH"
26+
27+
[[dependencies.libgui]]
28+
modId = "minecraft"
29+
type = "required"
30+
versionRange = "[1.21.5,)"
31+
ordering = "NONE"
32+
side = "BOTH"

src/main/resources/fabric.mod.json

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

0 commit comments

Comments
 (0)