Skip to content

Commit 5aeb3a2

Browse files
committedJul 31, 2024··
fix: apply mixin refmap on fabric
cherry-picked from c8edff9
1 parent b8aaa57 commit 5aeb3a2

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed
 

‎.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
neoforge/build/tmp/neoFormRecompile
4141
key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/gradle-wrapper.properties', 'settings.gradle.kts', '**/build.gradle.kts', '**/gradle.properties') }}-${{github.ref_name}}
4242

43-
- name: Initialize build environment
44-
run: ./gradlew
45-
4643
- name: Initialize CodeQL
4744
uses: github/codeql-action/init@v3
4845
with:
4946
languages: java
5047

48+
- name: Initialize build environment
49+
run: ./gradlew
50+
5151
- name: Build
5252
run: ./gradlew assemble -x checkLicenses --no-daemon
5353

‎.github/workflows/commit.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,12 @@ jobs:
4848
- name: Build
4949
if: ${{ !cancelled() }}
5050
id: build
51-
run: ./gradlew assemble -x checkLicenses -x javadoc
51+
run: ./gradlew assemble -x checkLicenses
5252

5353
- name: Test
5454
if: ${{ steps.build.outcome == 'success' && !cancelled() }}
5555
run: ./gradlew :fabric:runGametest :neoforge:runGameTestServer
5656

57-
- name: Javadoc
58-
if: ${{ success() }}
59-
run: ./gradlew javadoc
60-
6157
- name: Publish
6258
if: ${{ github.repository == 'TeamGalacticraft/DynamicDimensions' && success() }}
6359
run: ./gradlew publish -x test --no-daemon

‎.github/workflows/pr_check.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,8 @@ jobs:
5151
- name: Build
5252
if: ${{ !cancelled() }}
5353
id: build
54-
run: ./gradlew assemble -x checkLicenses -x javadoc
54+
run: ./gradlew assemble -x checkLicenses
5555

5656
- name: Test
5757
if: ${{ steps.build.outcome == 'success' && !cancelled() }}
5858
run: ./gradlew :fabric:runGametest :neoforge:runGameTestServer
59-
60-
- name: Javadoc
61-
if: ${{ success() }}
62-
run: ./gradlew javadoc

‎common/src/main/resources/dynamicdimensions.mixins.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
],
1717
"server": [
1818
],
19+
"refmap": "dynamicdimensions.refmap.json",
1920
"injectors": {
2021
"defaultRequire": 1
2122
}

‎fabric/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ loom {
2121
interfaceInjection.getIsEnabled().set(false)
2222
enableTransitiveAccessWideners.set(false)
2323

24+
mixin {
25+
defaultRefmapName.set("dynamicdimensions.refmap.json")
26+
}
27+
2428
runs {
2529
named("client") {
2630
client()

‎neoforge/build.gradle.kts

+9
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ tasks.compileJava {
3333

3434
tasks.processResources {
3535
from(project(":common").sourceSets.main.get().resources)
36+
37+
// remove refmap on neoforge
38+
doLast {
39+
file(outputs.files.asFileTree.first { it.name.equals("dynamicdimensions.mixins.json") }.apply {
40+
val parse = groovy.json.JsonSlurper().parse(this)!! as MutableMap<*, *>
41+
parse.remove("refmap")
42+
writeText(groovy.json.JsonOutput.toJson(parse))
43+
})
44+
}
3645
}
3746

3847
tasks.javadoc {

0 commit comments

Comments
 (0)
Please sign in to comment.