-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #145 from ChoiceTheorem/1.20
Rework the master branch
- Loading branch information
Showing
3,311 changed files
with
35,036 additions
and
23,396 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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 |
|---|---|---|
|
|
@@ -7,4 +7,5 @@ src/main/ctov-size-variantion-add-on/* | |
| run/* | ||
| .gitignore | ||
| gradle/* | ||
| mcmodsrepo/* | ||
| mcmodsrepo/* | ||
| .eclipse/* | ||
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,6 +1,5 @@ | ||
| # What's changed | ||
|
|
||
| + Fix the long standing village distribution bug | ||
| + Decrease mesa fortified village lion statue. | ||
| + Compatibility with [Etched](https://www.curseforge.com/minecraft/mc-mods/etched) | ||
| + Compatibility with [Floralis](https://modrinth.com/mod/floralis) | ||
| + Fix bug [#133](https://github.com/ChoiceTheorem/ChoiceTheorem-s-overhauled-village/issues/133) | ||
| + Fix bug [#136](https://github.com/ChoiceTheorem/ChoiceTheorem-s-overhauled-village/issues/136) | ||
| + Fix bug [#137](https://github.com/ChoiceTheorem/ChoiceTheorem-s-overhauled-village/issues/137) |
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,241 +1,59 @@ | ||
| plugins { | ||
| id 'eclipse' | ||
| id 'idea' | ||
| id 'maven-publish' | ||
| id 'net.minecraftforge.gradle' version '[6.0,6.2)' | ||
| id "architectury-plugin" version "3.4-SNAPSHOT" | ||
| id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false | ||
|
|
||
| } | ||
|
|
||
| version = mod_version | ||
| group = mod_group_id | ||
|
|
||
| base { | ||
| archivesName = mod_id | ||
| } | ||
|
|
||
| // 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: mapping_channel, version: mapping_version | ||
|
|
||
| // When true, this property will have all Eclipse run configurations run the "prepareX" task for the given run configuration before launching the game. | ||
| // In most cases, it is not necessary to enable. | ||
| // enableEclipsePrepareRuns = true | ||
|
|
||
| // When true, this property will have all IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. | ||
| // In most cases, it is not necessary to enable. | ||
| // enableIdeaPrepareRuns = true | ||
|
|
||
| // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. | ||
| // It is REQUIRED to be set to true for this template to function. | ||
| // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html | ||
| copyIdeResources = true | ||
|
|
||
| // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. | ||
| // The folder name can be set on a run configuration using the "folderName" property. | ||
| // By default, the folder name of a run configuration is the name of the Gradle project containing it. | ||
| // generateRunFolders = true | ||
|
|
||
| // This property enables access transformers for use in development. | ||
| // They will be applied to the Minecraft artifact. | ||
| // The access transformer file can be anywhere in the project. | ||
| // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. | ||
| // This default location is a best practice to automatically put the file in the right place in the final jar. | ||
| // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. | ||
| // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') | ||
|
|
||
| // 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', mod_id | ||
|
|
||
| mods { | ||
| "${mod_id}" { | ||
| source sourceSets.main | ||
| } | ||
| } | ||
| } | ||
|
|
||
| server { | ||
| workingDirectory project.file('run') | ||
|
|
||
| property 'forge.logging.markers', 'REGISTRIES' | ||
|
|
||
| property 'forge.logging.console.level', 'debug' | ||
|
|
||
| property 'forge.enabledGameTestNamespaces', mod_id | ||
|
|
||
| mods { | ||
| "${mod_id}" { | ||
| 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', mod_id | ||
|
|
||
| mods { | ||
| "${mod_id}" { | ||
| 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', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') | ||
|
|
||
| mods { | ||
| "${mod_id}" { | ||
| 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. | ||
| // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver | ||
| // 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.20.1+build.10:v2" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| // Specify the version of Minecraft to use. | ||
| // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. | ||
| // The "userdev" classifier will be requested and setup by ForgeGradle. | ||
| // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], | ||
| // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. | ||
| minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" | ||
| allprojects { | ||
| apply plugin: "java" | ||
| apply plugin: "architectury-plugin" | ||
| apply plugin: "maven-publish" | ||
|
|
||
| // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings | ||
| // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime | ||
| // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") | ||
| // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") | ||
| // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") | ||
| base { | ||
| archivesName = rootProject.archives_base_name | ||
| } | ||
|
|
||
| // Example mod dependency using a mod jar from ./libs with a flat dir repository | ||
| // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar | ||
| // The group id is ignored when searching -- in this case, it is "blank" | ||
| // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") | ||
| 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 | ||
| } | ||
| 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. | ||
| maven { | ||
| url = "https://maven.neoforged.net/releases" | ||
| } | ||
| } | ||
|
|
||
| // This block of code expands all declared replace properties in the specified resource targets. | ||
| // A missing property will result in an error. Properties are expanded using ${} Groovy notation. | ||
| // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. | ||
| // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html | ||
| def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta','fabric.mod.json'] | ||
| def replaceProperties = [ | ||
| minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, | ||
| forge_version: forge_version, forge_version_range: forge_version_range, | ||
| loader_version_range: loader_version_range, | ||
| mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, | ||
| mod_authors: mod_authors, mod_description: mod_description, | ||
| source_url: source_url, issue_url: issue_url, | ||
| fabric_loader_version_range: fabric_loader_version_range, fabric_mc_version_range: fabric_mc_version_range, | ||
| icon_path: icon_path | ||
| ] | ||
| processResources { | ||
| inputs.properties replaceProperties | ||
| replaceProperties.put 'project', project | ||
|
|
||
| filesMatching(resourceTargets) { | ||
| expand replaceProperties | ||
| } | ||
| } | ||
| tasks.withType(JavaCompile) { | ||
| options.encoding = "UTF-8" | ||
| options.release = 17 | ||
| } | ||
|
|
||
| // Example for how to get properties into the manifest for reading at runtime. | ||
| jar { | ||
| manifest { | ||
| attributes([ | ||
| "Specification-Title" : mod_id, | ||
| "Specification-Vendor" : mod_authors, | ||
| "Specification-Version" : "1", // We are version 1 of ourselves | ||
| "Implementation-Title" : project.name, | ||
| "Implementation-Version" : project.jar.archiveVersion, | ||
| "Implementation-Vendor" : mod_authors, | ||
| "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") | ||
| ]) | ||
| } | ||
| java { | ||
| withSourcesJar() | ||
| } | ||
| } | ||
|
|
||
| // 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 | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
| url "file://${project.projectDir}/mcmodsrepo" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile).configureEach { | ||
| options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation | ||
| } |
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,27 @@ | ||
| architectury { | ||
| common(rootProject.enabled_platforms.split(",")) | ||
| } | ||
|
|
||
| loom { | ||
| accessWidenerPath = file("src/main/resources/ctov.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}" | ||
| } | ||
|
|
||
| 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. | ||
| } | ||
| } |
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,10 @@ | ||
| package net.ctov; | ||
|
|
||
| public class ctov { | ||
| public static final String MOD_ID = "ctov"; | ||
|
|
||
| // We can use this if we don't want to use DeferredRegister | ||
| public static void init() { | ||
| //System.out.println(ctovExpectPlatform.getConfigDirectory().toAbsolutePath().normalize().toString()); | ||
| } | ||
| } |
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,3 @@ | ||
| { | ||
| "accessWidener": "ctov.accesswidener" | ||
| } |
Oops, something went wrong.