-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/Architectury_-_Fabric_merge' into dev
- Loading branch information
Showing
48 changed files
with
1,429 additions
and
446 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # Disable autocrlf on generated files, they always generate with LF | ||
| # Add any extra files or paths here to make git stop saying they | ||
| # are changed when only line endings change. | ||
| src/generated/**/.cache/cache text eol=lf | ||
| src/generated/**/*.json text eol=lf | ||
| forge/src/generated/**/.cache/cache text eol=lf | ||
| forge/src/generated/**/*.json text eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # Automatically build the project and run any configured tests for every push | ||
| # and submitted pull request. This can help catch issues that only occur on | ||
| # certain platforms or Java versions, and provides a first line of defence | ||
| # against bad commits. | ||
|
|
||
| name: build | ||
| on: [pull_request, push] | ||
|
|
||
| jobs: | ||
| build: | ||
| strategy: | ||
| matrix: | ||
| # Use these Java versions | ||
| java: [ | ||
| 17, # Current Java LTS & minimum supported by Minecraft | ||
| ] | ||
| # and run on both Linux and Windows | ||
| os: [ubuntu-22.04, windows-2022] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: validate gradle wrapper | ||
| uses: gradle/wrapper-validation-action@v1 | ||
| - name: setup jdk ${{ matrix.java }} | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
| distribution: 'microsoft' | ||
| - name: make gradle wrapper executable | ||
| if: ${{ runner.os != 'Windows' }} | ||
| run: chmod +x ./gradlew | ||
| - name: build | ||
| run: ./gradlew build | ||
| - name: capture build artifacts | ||
| if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: Artifacts | ||
| path: build/libs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| # eclipse | ||
| bin | ||
| *.launch | ||
| .settings | ||
| .metadata | ||
| .classpath | ||
| .project | ||
| * | ||
| !*/ | ||
| !.gitignore | ||
| !.github/** | ||
| .idea/.gitignore | ||
|
|
||
| # idea | ||
| out | ||
| *.ipr | ||
| *.iws | ||
| *.iml | ||
| .idea | ||
| !build.gradle | ||
| !gradle.properties | ||
| !gradlew | ||
| !gradlew.bat | ||
| !LICENSE | ||
| !README.md | ||
| !settings.gradle | ||
|
|
||
| # gradle | ||
| build | ||
| .gradle | ||
| !common/build.gradle | ||
| !forge/build.gradle | ||
| !fabric/build.gradle | ||
| !Resources/** | ||
|
|
||
| # other | ||
| eclipse | ||
| run | ||
|
|
||
| # Files from Forge MDK | ||
| forge*changelog.txt | ||
| !gradle/wrapper/** | ||
| !forge/src/** | ||
| !fabric/src/** | ||
| !common/src/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,181 +1,51 @@ | ||
| plugins { | ||
| id 'eclipse' | ||
| id 'maven-publish' | ||
| id 'net.minecraftforge.gradle' version '5.1.+' | ||
| id "architectury-plugin" version "3.4-SNAPSHOT" | ||
| id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false | ||
| } | ||
|
|
||
| version = '0.0.1-1.19-Forge' | ||
| group = 'net.jordon.harmonylink' // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
| archivesBaseName = 'harmonylink' | ||
|
|
||
| // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. | ||
| java.toolchain.languageVersion = JavaLanguageVersion.of(17) | ||
|
|
||
| println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" | ||
| minecraft { | ||
| // The mappings can be changed at any time and must be in the following format. | ||
| // Channel: Version: | ||
| // official MCVersion Official field/method names from Mojang mapping files | ||
| // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official | ||
| // | ||
| // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. | ||
| // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md | ||
| // | ||
| // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge | ||
| // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started | ||
| // | ||
| // Use non-default mappings at your own risk. They may not always work. | ||
| // Simply re-run your setup task after changing the mappings to update your workspace. | ||
| mappings channel: 'official', version: '1.19.4' | ||
|
|
||
| // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. | ||
|
|
||
| // Default run configurations. | ||
| // These can be tweaked, removed, or duplicated as needed. | ||
| runs { | ||
| client { | ||
| workingDirectory project.file('run') | ||
|
|
||
| // Recommended logging data for a userdev environment | ||
| // The markers can be added/remove as needed separated by commas. | ||
| // "SCAN": For mods scan. | ||
| // "REGISTRIES": For firing of registry events. | ||
| // "REGISTRYDUMP": For getting the contents of all registries. | ||
| property 'forge.logging.markers', 'REGISTRIES' | ||
|
|
||
| // Recommended logging level for the console | ||
| // You can set various levels here. | ||
| // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels | ||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. | ||
| property 'forge.enabledGameTestNamespaces', 'harmonylink' | ||
|
|
||
| mods { | ||
| harmonylink { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
|
|
||
| server { | ||
| workingDirectory project.file('run') | ||
|
|
||
| property 'forge.logging.markers', 'REGISTRIES' | ||
|
|
||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| property 'forge.enabledGameTestNamespaces', 'harmonylink' | ||
|
|
||
| mods { | ||
| harmonylink { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // This run config launches GameTestServer and runs all registered gametests, then exits. | ||
| // By default, the server will crash when no gametests are provided. | ||
| // The gametest system is also enabled by default for other run configs under the /test command. | ||
| gameTestServer { | ||
| workingDirectory project.file('run') | ||
|
|
||
| property 'forge.logging.markers', 'REGISTRIES' | ||
|
|
||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| property 'forge.enabledGameTestNamespaces', 'harmonylink' | ||
|
|
||
| mods { | ||
| harmonylink { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data { | ||
| workingDirectory project.file('run') | ||
|
|
||
| property 'forge.logging.markers', 'REGISTRIES' | ||
|
|
||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. | ||
| args '--mod', 'harmonylink', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') | ||
|
|
||
| mods { | ||
| harmonylink { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
| } | ||
| architectury { | ||
| minecraft = rootProject.minecraft_version | ||
| } | ||
|
|
||
| // Include resources generated by data generators. | ||
| sourceSets.main.resources { srcDir 'src/generated/resources' } | ||
| subprojects { | ||
| apply plugin: "dev.architectury.loom" | ||
|
|
||
| repositories { | ||
| // Put repositories for dependencies here | ||
| // ForgeGradle automatically adds the Forge maven and Maven Central for you | ||
| loom { | ||
| silentMojangMappingsLicense() | ||
| } | ||
|
|
||
| // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: | ||
| // flatDir { | ||
| // dir 'libs' | ||
| // } | ||
| dependencies { | ||
| minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" | ||
| // The following line declares the mojmap mappings, you may use other mappings as well | ||
| mappings loom.officialMojangMappings() | ||
| // The following line declares the yarn mappings you may select this one as well. | ||
| // mappings "net.fabricmc:yarn:1.19.4+build.2:v2" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed | ||
| // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. | ||
| // The userdev artifact is a special name and will get all sorts of transformations applied to it. | ||
| minecraft 'net.minecraftforge:forge:1.19.4-45.1.0' | ||
|
|
||
| // Real mod deobf dependency examples - these get remapped to your current mappings | ||
| // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency | ||
| allprojects { | ||
| apply plugin: "java" | ||
| apply plugin: "architectury-plugin" | ||
| apply plugin: "maven-publish" | ||
|
|
||
| // Examples using mod jars from ./libs | ||
| // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") | ||
| archivesBaseName = rootProject.archives_base_name | ||
| version = rootProject.mod_version | ||
| group = rootProject.maven_group | ||
|
|
||
| // For more info... | ||
| // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
| // http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
| } | ||
|
|
||
| // Example for how to get properties into the manifest for reading at runtime. | ||
| jar { | ||
| manifest { | ||
| attributes([ | ||
| "Specification-Title" : "harmonylink", | ||
| "Specification-Vendor" : "harmonylinksareus", | ||
| "Specification-Version" : "1", // We are version 1 of ourselves | ||
| "Implementation-Title" : project.name, | ||
| "Implementation-Version" : project.jar.archiveVersion, | ||
| "Implementation-Vendor" : "harmonylinksareus", | ||
| "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") | ||
| ]) | ||
| repositories { | ||
| // Add repositories to retrieve artifacts from in here. | ||
| // You should only use this when depending on other mods because | ||
| // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. | ||
| // See https://docs.gradle.org/current/userguide/declaring_repositories.html | ||
| // for more information about repositories. | ||
| } | ||
| } | ||
|
|
||
| // Example configuration to allow publishing using the maven-publish plugin | ||
| // This is the preferred method to reobfuscate your jar file | ||
| jar.finalizedBy('reobfJar') | ||
| // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing | ||
| // publish.dependsOn('reobfJar') | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenJava(MavenPublication) { | ||
| artifact jar | ||
| } | ||
| tasks.withType(JavaCompile) { | ||
| options.encoding = "UTF-8" | ||
| options.release = 17 | ||
| } | ||
| repositories { | ||
| maven { | ||
| url "file://${project.projectDir}/mcmodsrepo" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile).configureEach { | ||
| options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation | ||
| java { | ||
| withSourcesJar() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| architectury { | ||
| common(rootProject.enabled_platforms.split(",")) | ||
| } | ||
|
|
||
| loom { | ||
| accessWidenerPath = file("src/main/resources/harmonylink.accesswidener") | ||
| } | ||
|
|
||
| dependencies { | ||
| // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies | ||
| // Do NOT use other classes from fabric loader | ||
| modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" | ||
| // Remove the next line if you don't want to depend on the API | ||
| modApi "dev.architectury:architectury:${rootProject.architectury_version}" | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenCommon(MavenPublication) { | ||
| artifactId = rootProject.archives_base_name | ||
| from components.java | ||
| } | ||
| } | ||
|
|
||
| // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. | ||
| repositories { | ||
| // Add repositories to publish to here. | ||
| } | ||
| } |
Oops, something went wrong.