Skip to content

Commit 61f6138

Browse files
committed
update plugin
1 parent 9172064 commit 61f6138

File tree

19 files changed

+3951
-818
lines changed

19 files changed

+3951
-818
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Release
22
on:
33
release:
4-
types: [created]
4+
types: [published]
55

66
env:
77
CI: true
@@ -12,19 +12,12 @@ jobs:
1212
timeout-minutes: 20
1313
permissions:
1414
contents: read
15-
packages: write
15+
packages: read
1616
steps:
1717
- uses: actions/checkout@v4
1818
with:
1919
lfs: true
2020

21-
- name: Update version
22-
uses: christian-draeger/[email protected]
23-
with:
24-
path: "gradle.properties"
25-
property: "mod_version"
26-
value: ${{ github.event.release.tag_name }}
27-
2821
- uses: actions/setup-java@v4
2922
with:
3023
java-version: 17
@@ -36,10 +29,11 @@ jobs:
3629
- name: Build and upload
3730
uses: gradle/gradle-build-action@v2
3831
with:
39-
arguments: build curseforge modrinth publish
32+
arguments: build publish
4033
env:
41-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
NEXUS_USER: ${{ secrets.NEXUS_USER }}
35+
NEXUS_TOKEN: ${{ secrets.NEXUS_TOKEN }}
4236
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
4337
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
4438
CHANGELOG: ${{ github.event.release.body }}
45-
CI: true
39+
RELEASE_VERSION: ${{ github.event.release.tag_name }}

build.gradle.kts

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
1-
val mod_id: String by extra
21
val mc_version: String by extra
32
val registrate_version: String by extra
43
val create_version: String by extra
54
val ponder_version: String by extra
65
val flywheel_version: String by extra
76
val flightlib_version: String by extra
8-
val mod_version: String by extra
97
val curios_version: String by extra
108
val caelus_version: String by extra
119
val elytra_slot_version: String by extra
1210
val jei_version: String by extra
13-
val mixin_extras_version: String by extra
1411
val cold_sweat_version: String by extra
1512

1613
plugins {
17-
id("com.possible-triangle.gradle") version("0.1.4")
14+
id("com.possible-triangle.forge")
1815
}
1916

2017
withKotlin()
2118

19+
mod {
20+
mods.include("com.possible-triangle:flightlib-forge:${flightlib_version}")
21+
}
22+
2223
forge {
2324
dataGen()
24-
includesMod("com.possible-triangle:flightlib-forge:${flightlib_version}")
2525
}
2626

2727
base {
28-
archivesName.set("$mod_id-forge-$mod_version")
28+
archivesName = "${mod.id.get()}-forge-${mod.version.get()}"
2929
}
3030

3131
repositories {
32-
curseMaven()
33-
localMaven(project)
34-
3532
maven {
3633
url = uri("https://maven.blamejared.com/")
3734
content {
@@ -55,16 +52,10 @@ repositories {
5552
maven {
5653
url = uri("https://maven.theillusivec4.top/")
5754
content {
58-
includeGroup("top.theillusivec4.caelus")
59-
includeGroup("top.theillusivec4.curios")
55+
includeGroupAndSubgroups("top.theillusivec4")
6056
}
6157
}
62-
maven {
63-
url = uri("https://maven.pkg.github.com/PssbleTrngle/FlightLib")
64-
credentials {
65-
username = env["GITHUB_ACTOR"]
66-
password = env["GITHUB_TOKEN"]
67-
}
58+
nexus {
6859
content {
6960
includeGroup("com.possible-triangle")
7061
}
@@ -77,14 +68,14 @@ dependencies {
7768
modImplementation("net.createmod.ponder:Ponder-Forge-${mc_version}:${ponder_version}")
7869
modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${mc_version}:${flywheel_version}")
7970
modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${mc_version}:${flywheel_version}")
80-
implementation("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}")
8171

8272
if (!env.isCI) {
8373
modRuntimeOnly("mezz.jei:jei-${mc_version}-forge:${jei_version}")
8474

85-
modRuntimeOnly("top.theillusivec4.curios:curios-forge:${curios_version}")
86-
modRuntimeOnly("top.theillusivec4.caelus:caelus-forge:${caelus_version}")
87-
modRuntimeOnly("curse.maven:elytra-slot-317716:${elytra_slot_version}")
75+
// Only here to test jetpack+elytra combination behaviour
76+
modRuntimeOnly("top.theillusivec4.curios:curios-forge:${curios_version}+${mc_version}")
77+
modRuntimeOnly("top.theillusivec4.caelus:caelus-forge:${caelus_version}+${mc_version}")
78+
modRuntimeOnly("maven.modrinth:mSQF1NpT:${elytra_slot_version}")
8879
modRuntimeOnly("maven.modrinth:uXhSmPjd:${cold_sweat_version}")
8980
}
9081

@@ -96,22 +87,22 @@ tasks.withType<Jar> {
9687
exclude("screenshots")
9788
}
9889

99-
enablePublishing {
100-
githubPackages()
101-
}
10290

103-
uploadToCurseforge {
104-
dependencies {
105-
required("create")
91+
upload {
92+
maven {
93+
nexus()
10694
}
107-
}
10895

109-
uploadToModrinth {
110-
dependencies {
111-
required("LNytGWDc")
96+
forEach {
97+
dependencies {
98+
required("create")
99+
}
112100
}
113101

114-
syncBodyFromReadme()
102+
modrinth {
103+
syncBodyFromReadme()
104+
}
115105
}
116106

117-
enableSonarQube()
107+
enableSonarQube()
108+
enableSpotless()

gradle.properties

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
33
org.gradle.daemon=false
44

55
mc_version=1.20.1
6-
forge_version=47.1.3
6+
forge_version=47.3.10
77

88
mod_id=create_jetpack
99
mod_version=0.0.0-dev
@@ -12,18 +12,17 @@ mod_name=Create Jetpack
1212
mod_author=possible_triangle
1313
maven_group=com.possible-triangle
1414

15+
kotlin_forge_version=4.3.0
1516
jei_version=15.20.0.106
16-
flywheel_version=1.0.1
17-
create_version=6.0.2-52
18-
ponder_version=1.0.43
17+
flywheel_version=1.0.5
18+
create_version=6.0.7-281
19+
ponder_version=1.0.91
1920
registrate_version=MC1.20-1.3.3
20-
flightlib_version=2.1.0
21-
kotlin_forge_version=4.3.0
22-
mixin_extras_version=0.4.1
21+
flightlib_version=2.2.0
2322

24-
curios_version=5.2.0-beta.3+1.20.1
25-
caelus_version=3.1.0+1.20
26-
elytra_slot_version=4598379
23+
curios_version=5.14.1
24+
caelus_version=3.2.0
25+
elytra_slot_version=KgVglTfH
2726
cold_sweat_version=jZs0ZjVy
2827

2928
repository=pssbletrngle/createjetpack

gradle/wrapper/gradle-wrapper.jar

-15.9 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
6-
zipStorePath=wrapper/dists
7+
zipStorePath=wrapper/dists

gradlew

Lines changed: 30 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 21 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)