diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index af3fe6c9..e14c3237 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,9 +22,5 @@ jobs: run: ./gradlew --no-daemon build - uses: actions/upload-artifact@v2 with: - name: Forge - path: forge/build/libs - - uses: actions/upload-artifact@v2 - with: - name: Fabric - path: fabric/build/libs \ No newline at end of file + name: Package + path: bin \ No newline at end of file diff --git a/.gitignore b/.gitignore index bcd10106..c70bdc40 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,6 @@ fabric.properties ### Eclipse ### *.pydevproject .metadata -bin/ tmp/ *.tmp *.bak diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 00000000..d392f0e8 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index d91e5fc5..28733531 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -157,6 +157,7 @@ public class ModernFixEarlyConfig { this.configFile = file; this.scanForAndBuildMixinOptions(); + mixinOptions.addAll(DEFAULT_SETTING_OVERRIDES.keySet()); for(String optionName : mixinOptions) { boolean defaultEnabled = DEFAULT_SETTING_OVERRIDES.getOrDefault(optionName, true); this.options.putIfAbsent(optionName, new Option(optionName, defaultEnabled, false)); diff --git a/fabric/build.gradle b/fabric/build.gradle index e09df301..8cedb676 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -61,6 +61,13 @@ remapJar { classifier null } +task copyJarToBin(type: Copy) { + from remapJar // shortcut for createJar.outputs.files + into rootProject.file("bin") +} + +tasks.build.dependsOn(copyJarToBin) + jar { classifier "dev" } diff --git a/forge/build.gradle b/forge/build.gradle index 2e84454c..0d53bc2c 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -79,6 +79,13 @@ remapJar { classifier null } +task copyJarToBin(type: Copy) { + from remapJar // shortcut for createJar.outputs.files + into rootProject.file("bin") +} + +tasks.build.dependsOn(copyJarToBin) + jar { classifier "dev" manifest {