diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e6845138..22b2005a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -27,13 +27,6 @@ jobs: with: cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }} gradle-home-cache-cleanup: true - - name: Setup project Loom cache - uses: actions/cache@v4 - with: - path: | - .gradle/loom-cache - key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle.properties', '**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-gradle- - name: Build ModernFix using Gradle run: ./gradlew build - name: Upload Artifacts to GitHub diff --git a/build.gradle.kts b/build.gradle.kts index 7dd6fedc..f3ba5fab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -152,6 +152,10 @@ tasks.named("jar") { from(embed.map { if (it.isDirectory) it else zipTree(it) }) } +tasks.named("jar") { + from(embed.map { if (it.isDirectory) it else zipTree(it) }) +} + // For the AP tasks.withType().configureEach { if (!name.lowercase().contains("test")) { diff --git a/scripts/gen-markdown-patchlist.py b/scripts/gen-markdown-patchlist.py index 35667b35..5dd8b303 100644 --- a/scripts/gen-markdown-patchlist.py +++ b/scripts/gen-markdown-patchlist.py @@ -8,7 +8,7 @@ from contextlib import redirect_stdout from modernfixlib import get_valid_mixin_options parser = argparse.ArgumentParser(description='Generate ModernFix patch summary Markdown file.') -parser.add_argument('-p', '--langpath', default='common/src/main/resources/assets/modernfix/lang/en_us.json') +parser.add_argument('-p', '--langpath', default='src/main/resources/assets/modernfix/lang/en_us.json') args = parser.parse_args() diff --git a/scripts/modernfixlib.py b/scripts/modernfixlib.py index be94b3bb..482d3c95 100644 --- a/scripts/modernfixlib.py +++ b/scripts/modernfixlib.py @@ -15,7 +15,7 @@ def get_valid_mixin_options(): mixin_name = mixin_name[1:] all_mixin_options.add("mixin." + mixin_name) # gather any mixin strings referenced in ModernFixEarlyConfig - with open('common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java') as config_java: + with open('src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java') as config_java: for line in config_java: for option in re.findall(r"\.put[A-Za-z_]*\(.*\"(mixin(?:\.[a-z_]+)+)\"", line): all_mixin_options.add(option) diff --git a/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java index fc2c7eba..c8575355 100644 --- a/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java +++ b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java @@ -114,7 +114,7 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin { @Override public String getRefMapperConfig() { - return null; + return "modernfix.refmap.json"; } @Override