wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save commit for new build system

Browse Source
This commit is contained in:
coolGi
2022-11-14 21:51:09 +10:30
parent de744d1f10
commit 4fe24abc51
17 changed files with 287 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-3
View File
@@ -28,6 +28,3 @@ Merged/
# file genearated via MC version switching using preprocessor # file genearated via MC version switching using preprocessor
build.properties build.properties
# This accesswidener is generated at runtime ant not needed
common/src/main/resources/lod.accesswidener
build.gradle
+92 -140
View File
@@ -1,16 +1,17 @@
plugins { plugins {
// Plugin to help in developing multi-loader mods id "java"
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
// Plugin to handle dependencies // Plugin to handle dependencies
id 'com.github.johnrengelman.shadow' version '7.0.0' apply false id "com.github.johnrengelman.shadow" version '7.0.0' apply false
// Plugin to create merged jars // Plugin to create merged jars
id "io.github.pacifistmc.forgix" version "1.2.6" id "io.github.pacifistmc.forgix" version "1.2.6"
// Manifold preprocessor
id 'systems.manifold.manifold-gradle-plugin' version '0.0.2-alpha'
// Provides mc libraries to core // Provides mc libraries to core
id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply false // id "org.spongepowered.gradle.vanilla" version '0.2.1-SNAPSHOT' apply false
} }
/** /**
@@ -20,10 +21,10 @@ plugins {
* @param mcIndex array index of the currently active MC version * @param mcIndex array index of the currently active MC version
*/ */
def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) { def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) {
ArrayList<String> redefineList = new ArrayList<String>() ArrayList<String> redefineList = new ArrayList<String>()
for (int i=0; i<mcVers.size(); i++) { for (int i=0; i<mcVers.size(); i++) {
String mcStr = mcVers.get(i).replace(".", "_") String mcStr = mcVers[i].replace(".", "_")
if (mcIndex<i) { if (mcIndex<i) {
redefineList.add("PRE_MC_"+mcStr) redefineList.add("PRE_MC_"+mcStr)
} }
@@ -35,10 +36,12 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) {
} }
} }
// build the list of preprocessors to use // Build the list of preprocessors to use
StringBuilder sb = new StringBuilder() StringBuilder sb = new StringBuilder()
// check if this is a development build sb.append("# DON'T TOUCH THIS FILE, This is handled by the build script\n")
// Check if this is a development build
if (mod_version.toLowerCase().contains("dev")) { if (mod_version.toLowerCase().contains("dev")) {
// WARNING: only use this for logging, we don't want to have confusion // WARNING: only use this for logging, we don't want to have confusion
// when a method doesn't work correctly in the release build. // when a method doesn't work correctly in the release build.
@@ -46,7 +49,7 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) {
sb.append("=\n") sb.append("=\n")
} }
// build the MC version preprocessors // Build the MC version preprocessors
for (String redefinedVersion : redefineList) { for (String redefinedVersion : redefineList) {
sb.append(redefinedVersion) sb.append(redefinedVersion)
sb.append("=\n") sb.append("=\n")
@@ -56,71 +59,46 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) {
// Sets up the variables for Manifold in the code // Sets up the variables for Manifold in the code
def loadProperties() { def loadProperties() {
def defaultMcVersion = "1.19.2" def defaultMcVersion = "1.18.2" // 1.18.2 is our current most stable version so we use that if no version was defined
// def defaultMcVersion = "1.19" // For now use 1.18.2 as default until 1.19 is done
def mcVersion = "" def mcVersion = ""
def mcVers = mcVersions.split(",") def mcVers = fileTree("versionProperties").files.name // Get all the files in "versionProperties"
for (int i = 0; i < mcVers.size(); i++) {
mcVers[i] = mcVers[i].replaceAll(".properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions
}
int mcIndex = -1 int mcIndex = -1
println "Avalible MC versions: ${mcVersions}" println "Avalible MC versions: ${mcVers}"
if (project.hasProperty("mcVer")) { if (project.hasProperty("mcVer")) {
mcVersion = mcVer mcVersion = mcVer
mcIndex = Arrays.asList(mcVers).indexOf(mcVer) mcIndex = mcVers.indexOf(mcVer)
} }
if (mcIndex == -1) { if (mcIndex == -1) {
println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}." println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}."
println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer." println "Tip: Use -PmcVer=\"${defaultMcVersion}\" in cmd arg to set mcVer."
mcVersion = defaultMcVersion mcVersion = defaultMcVersion
mcIndex = Arrays.asList(mcVers).indexOf(defaultMcVersion) mcIndex = mcVers.indexOf(defaultMcVersion)
assert mcIndex != -1 assert mcIndex != -1
} }
println "Loading properties file at " + mcVersion + ".properties" println "Loading properties file at " + mcVersion + ".properties"
def props = new Properties() def props = new Properties()
props.load(new FileInputStream("$rootProject.rootDir/"+"$mcVersion"+".properties")) props.load(new FileInputStream("$rootProject.rootDir/versionProperties/"+"$mcVersion"+".properties"))
props.each { prop -> props.each { prop ->
rootProject.ext.set(prop.key, prop.value) rootProject.ext.set(prop.key, prop.value)
// println "Added prop [key:" + prop.key + ", value:" + prop.value + "]" // println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
} }
writeBuildGradlePredefine(Arrays.asList(mcVers), mcIndex) writeBuildGradlePredefine(mcVers, mcIndex)
// Stuff for access wideners
def mcVersionToAcsessWidenerVersion = [
"1.16.5": "1_16",
"1.17.1": "1_17",
"1.18.1": "1_18",
"1.18.2": "1_18",
"1.19": "1_19",
"1.19.1": "1_19",
"1.19.2": "1_19"
]
// Use this as sometimes multiple versions use the same access wideners
rootProject.ext.set("accessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion))
} }
loadProperties() loadProperties()
// Sets up the accesswideners
def makeAccessWidener() {
def accessWidenerFile = project(":common").file("src/main/resources/lod.accesswidener")
if (accessWidenerFile.exists()) {
delete accessWidenerFile
}
copy {
from project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.lod.accesswidener")
into project(":common").file("src/main/resources/")
rename "${rootProject.accessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
}
}
makeAccessWidener()
// Sets up the version string (the name we use for our jar)
// Sets up the version string
rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm") rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm")
// Forgix settings (used for merging jars)
// Merged jar settings
forgix { forgix {
group = "com.seibel.lod" group = "com.seibel.lod"
mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar" mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar"
@@ -137,26 +115,17 @@ forgix {
removeDuplicate "com.seibel.lod.core" removeDuplicate "com.seibel.lod.core"
} }
architectury {
minecraft = rootProject.minecraft_version
}
subprojects { p -> subprojects { p ->
// Apply plugins
// setup Architectury apply plugin: "java"
if (p == project(":core") || p == project(":api")) { apply plugin: "com.github.johnrengelman.shadow"
// apply plugin: "org.spongepowered.gradle.vanilla" // Provides minecraft libraries
if (p == project(":core")) {
apply plugin: "application" apply plugin: "application"
apply plugin: "org.spongepowered.gradle.vanilla" // Provides minecraft libraries
apply plugin: "com.github.johnrengelman.shadow"
} else {
apply plugin: "com.github.johnrengelman.shadow"
apply plugin: "dev.architectury.loom"
loom {
silentMojangMappingsLicense()
}
} }
// set up custom configurations (configurations are a way to handle dependencies) // set up custom configurations (configurations are a way to handle dependencies)
configurations { configurations {
// extends the shadowJar configuration // extends the shadowJar configuration
@@ -166,23 +135,27 @@ subprojects { p ->
customModule customModule
implementation.extendsFrom(customModule) implementation.extendsFrom(customModule)
}
// Set up the minecraft non-dependency for core sub-projects
if (p == project(":core") || p == project(":api")) {
minecraft {
version("${rootProject.minecraft_version}")
}
// Set the standalone jar entrypoint if (p == project(":fabric") /* || p == project(":quilt") */ || p == project(":forge")) {
// (This will point to a non-existent class in all sub-projects except "Core") // Shadow common
common
shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
compileClasspath.extendsFrom common
runtimeClasspath.extendsFrom common
developmentForge.extendsFrom common
}
}
// Set the standalone jar entrypoint
// (This will point to a non-existent class in all sub-projects except "Core")
if (p == project(":core")) {
application { application {
mainClass.set('com.seibel.lod.core.jar.JarMain') mainClass.set('com.seibel.lod.core.jar.JarMain')
} }
} }
dependencies { dependencies {
//=====================// //=====================//
// shared dependencies // // shared dependencies //
//=====================// //=====================//
@@ -217,29 +190,6 @@ subprojects { p ->
// conditional dependencies // // conditional dependencies //
//==========================// //==========================//
// The logic for buildForge can be made more succinct, but the readability goes way down.
def buildForge = true
if (gradle.startParameter.taskRequests.size() > 0) {
if (gradle.startParameter.taskRequests[0].args.size() > 0) {
if (gradle.startParameter.taskRequests[0].args[0].startsWith("fabric:")) {
buildForge = false
}
}
}
// Minecraft dependent sub-projects
if (p == project(":common") || (buildForge && p == project(":forge")) || p == project(":fabric")) {
// Add Minecraft
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
// The following line declares the mojmap mappings & parchment mappings
mappings loom.layered() {
// Mojmap mappings
officialMojangMappings()
// Parchment mappings (it adds parameter mappings & javadoc)
parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
}
}
// Add core // Add core
if (p != project(":api") && p != project(":core")) { if (p != project(":api") && p != project(":core")) {
implementation(project(":core")) { implementation(project(":core")) {
@@ -261,10 +211,10 @@ subprojects { p ->
} }
} }
// Allows the jar to run standalone // Adds the standalone jar's entrypoint
jar { jar {
manifest { manifest {
attributes 'Implementation-Title': rootProject.archives_base_name, attributes 'Implementation-Title': rootProject.mod_name,
'Implementation-Version': rootProject.mod_version, 'Implementation-Version': rootProject.mod_version,
'Main-Class': 'com.seibel.lod.core.jar.JarMain' // When changing the main of the jar change this line 'Main-Class': 'com.seibel.lod.core.jar.JarMain' // When changing the main of the jar change this line
} }
@@ -286,7 +236,7 @@ subprojects { p ->
// } // }
// Run mergeJars when running build // Run mergeJars when running build
if (p != project(":api") && p != project(":api")) { if (p != project(":api") && p != project(":core")) {
build.finalizedBy(mergeJars) build.finalizedBy(mergeJars)
assemble.finalizedBy(mergeJars) assemble.finalizedBy(mergeJars)
} }
@@ -294,10 +244,9 @@ subprojects { p ->
allprojects { p -> allprojects { p ->
apply plugin: "java" apply plugin: "java"
apply plugin: "architectury-plugin"
apply plugin: "maven-publish" apply plugin: "maven-publish"
archivesBaseName = rootProject.archives_base_name archivesBaseName = rootProject.mod_name
version = rootProject.mod_version version = rootProject.mod_version
group = rootProject.maven_group group = rootProject.maven_group
@@ -308,13 +257,13 @@ allprojects { p ->
maven { url "https://maven.parchmentmc.org" } maven { url "https://maven.parchmentmc.org" }
// For Architectury API // For Architectury API
maven { url "https://maven.architectury.dev" } // maven { url "https://maven.architectury.dev" }
// used to download and compile dependencies from git repos // For Git repositories
maven { url 'https://jitpack.io' } maven { url "https://jitpack.io" }
// For Manifold Preprocessor // For Manifold Preprocessor
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
// Required for importing Modrinth mods // Required for importing Modrinth mods
maven { maven {
@@ -339,7 +288,7 @@ allprojects { p ->
// Required for Mixins & VanillaGradle // Required for Mixins & VanillaGradle
maven { url "https://repo.spongepowered.org/maven/" } maven { url "https://repo.spongepowered.org/maven/" }
// Required for canvas // Required for Canvas (mod)
maven { url "https://maven.vram.io/" } maven { url "https://maven.vram.io/" }
// These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
@@ -359,48 +308,51 @@ allprojects { p ->
// Only uncomment this when testing stuff with lwjgl in the core jar // Only uncomment this when testing stuff with lwjgl in the core jar
// if (p == project(":core")) { /*
// dependencies { if (p == project(":core")) {
// project.ext.lwjglNatives = "natives-linux" dependencies {
// project.ext.lwjglNatives = "natives-linux"
// implementation platform("org.lwjgl:lwjgl-bom:3.3.0")
// implementation platform("org.lwjgl:lwjgl-bom:3.3.0")
// implementation "org.lwjgl:lwjgl"
// implementation "org.lwjgl:lwjgl-assimp" implementation "org.lwjgl:lwjgl"
// implementation "org.lwjgl:lwjgl-glfw" implementation "org.lwjgl:lwjgl-assimp"
// implementation "org.lwjgl:lwjgl-openal" implementation "org.lwjgl:lwjgl-glfw"
// implementation "org.lwjgl:lwjgl-opengl" implementation "org.lwjgl:lwjgl-openal"
// implementation "org.lwjgl:lwjgl-stb" implementation "org.lwjgl:lwjgl-opengl"
// implementation "org.lwjgl:lwjgl-tinyfd" implementation "org.lwjgl:lwjgl-stb"
// runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives" implementation "org.lwjgl:lwjgl-tinyfd"
// runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives" runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
// runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives" runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
// runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives" runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
// runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives" runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
// runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives" runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
// runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives" runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
// implementation "org.joml:joml:1.10.2" runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
// } implementation "org.joml:joml:1.10.2"
// } }
}
*/
// Put stuff from gradle.properties into the mod info // Put stuff from gradle.properties into the mod info
processResources { processResources {
def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put def resourceTargets = ["fabric.mod.json", "quilt.mod.json", "META-INF/mods.toml"] // Location of where to inject the properties
def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
def replaceProperties = [ def replaceProperties = [
version : mod_version, version : mod_version,
mod_name : mod_name, mod_name : mod_readable_name,
authors : mod_authors, authors : mod_authors,
description : mod_description, description : mod_description,
homepage : mod_homepage, homepage : mod_homepage,
source : mod_source, source : mod_source,
issues : mod_issues, issues : mod_issues,
discord : mod_discord,
minecraft_version : minecraft_version, minecraft_version : minecraft_version,
compatible_minecraft_versions: compatible_minecraft_versions, compatible_minecraft_versions: compatible_minecraft_versions,
java_version : java_version java_version : java_version
] ]
// The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
//TODO: Make Forge loader version also be relaced with non hardcoded value instead of "[36,42)" //TODO: Make Forge loader version also be replaced with non hardcoded value instead of "[36,42)"
inputs.properties replaceProperties inputs.properties replaceProperties
replaceProperties.put 'project', project replaceProperties.put 'project', project
@@ -421,6 +373,12 @@ allprojects { p ->
} }
} }
task copyAccessWidener(type: Copy) {
from project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener")
into(file(p.file("build/resources/main")))
rename "${accessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
}
task copyCoreResources(type: Copy) { task copyCoreResources(type: Copy) {
from fileTree(project(":core").file("src/main/resources")) from fileTree(project(":core").file("src/main/resources"))
into p.file("build/resources/main") into p.file("build/resources/main")
@@ -441,12 +399,6 @@ allprojects { p ->
java { java {
withSourcesJar() withSourcesJar()
} }
// Disable running common
if (p == project(":common")) {
runClient.enabled = false
runServer.enabled = false
}
} }
// Delete the merged folder when running clean // Delete the merged folder when running clean
buildAll
+13 -11
View File
@@ -1,13 +1,15 @@
#!/usr/bin/env sh #!/bin/sh
buildVersion() # Loop trough everything in the version properties folder
{ for d in versionProperties/*; do
./gradlew clean -PmcVer=$1 --no-daemon # Get the name of the version that is going to be compiled
./gradlew build -PmcVer=$1 --no-daemon version=$(echo "$d" | sed "s/versionProperties\///" | sed "s/.properties//")
}
buildVersion 1.19 # Clean out the folders and build it
buildVersion 1.18.2 # (We could use "./" to run gradlew, but as it is a shell script im going to be running it with the "sh" command)
buildVersion 1.18.1 echo "Cleaning workspace to build $version"
buildVersion 1.17.1 sh gradlew clean -PmcVer=$version --no-daemon | true
buildVersion 1.16.5 echo "Building $version"
sh gradlew build -PmcVer=$version --no-daemon | true
# The "| true" at the end of those 2 are just to make sure the script continues even if a build fails
done
buildAll.bat
+22 -13
View File
@@ -1,16 +1,25 @@
@echo off @echo off
SETLOCAL echo Windows build all script needs to be rewritten
CALL :buildVersion "1.19" echo I dont use Windows so I cant really make this
CALL :buildVersion "1.18.2" echo So if someone does use Windows and knows how to script stuff then can you please port the "buildall" script I made for Unix
CALL :buildVersion "1.18.1"
CALL :buildVersion "1.17.1"
CALL :buildVersion "1.16.5"
EXIT /B %ERRORLEVEL%
:buildVersion
@echo on
call ./gradlew.bat clean -PmcVer="%~1" --no-daemon
call ./gradlew.bat build -PmcVer="%~1" --no-daemon @REM Old BAT script if you need some help with this task
@echo off
EXIT /B 0 @REM SETLOCAL
@REM CALL :buildVersion "1.19"
@REM CALL :buildVersion "1.18.2"
@REM CALL :buildVersion "1.18.1"
@REM CALL :buildVersion "1.17.1"
@REM CALL :buildVersion "1.16.5"
@REM EXIT /B %ERRORLEVEL%
@REM
@REM :buildVersion
@REM @echo on
@REM call ./gradlew.bat clean -PmcVer="%~1" --no-daemon
@REM call ./gradlew.bat build -PmcVer="%~1" --no-daemon
@REM @echo off
@REM EXIT /B 0
common/build.gradle
+8 -12
View File
@@ -1,27 +1,23 @@
architectury { plugins {
common(rootProject.enabled_platforms.split(",")) id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
} }
loom { minecraft {
accessWidenerPath = file("src/main/resources/lod.accesswidener") accessWideners(project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.lod.accesswidener"))
version(rootProject.minecraft_version)
} }
dependencies { dependencies {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin 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 // Do NOT use other classes from fabric loader
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" // modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
if (minecraft_version == "1.16.5") {
modApi("me.shedaniel:architectury:${rootProject.architectury_version}")
} else {
modApi("dev.architectury:architectury:${rootProject.architectury_version}")
}
} }
publishing { publishing {
publications { publications {
mavenCommon(MavenPublication) { mavenCommon(MavenPublication) {
artifactId = rootProject.archives_base_name artifactId = rootProject.mod_readable_name
from components.java from components.java
} }
} }
common/src/main/resources/architectury.common.json
-3
View File
@@ -1,3 +0,0 @@
{
"accessWidener": "lod.accesswidener"
}
fabric/build.gradle
+29 -14
View File
@@ -1,21 +1,26 @@
version = rootProject.versionStr plugins {
id "fabric-loom" version "0.12-SNAPSHOT"
architectury {
platformSetupLoomIde()
fabric()
} }
loom { loom {
accessWidenerPath = project(":common").loom.accessWidenerPath accessWidenerPath = project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.lod.accesswidener")
runs {
client {
client()
setConfigName("Fabric Client")
ideConfigGenerated(true)
runDir("run")
}
server {
server()
setConfigName("Fabric Server")
ideConfigGenerated(true)
runDir("run")
}
}
} }
configurations { configurations {
common
shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
compileClasspath.extendsFrom common
runtimeClasspath.extendsFrom common
developmentFabric.extendsFrom common
// The addModJar basically embeds the mod to the built jar // The addModJar basically embeds the mod to the built jar
addModJar addModJar
include.extendsFrom addModJar include.extendsFrom addModJar
@@ -30,9 +35,19 @@ def addMod(path, enabled) {
} }
dependencies { dependencies {
minecraft "com.mojang:minecraft:${minecraft_version}"
mappings loom.layered() {
// Mojmap mappings
officialMojangMappings()
// Parchment mappings (it adds parameter mappings & javadoc)
parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
}
// Fabric loader // Fabric loader
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
// Common
implementation project(":common")
// Architectury API // Architectury API
if (minecraft_version == "1.16.5") { if (minecraft_version == "1.16.5") {
addModJar("me.shedaniel:architectury-fabric:${rootProject.architectury_version}") addModJar("me.shedaniel:architectury-fabric:${rootProject.architectury_version}")
@@ -98,8 +113,6 @@ dependencies {
} }
shadowJar { shadowJar {
exclude "architectury.common.json"
configurations = [project.configurations.shadowCommon, project.configurations.shadowMe, project.configurations.customModule] configurations = [project.configurations.shadowCommon, project.configurations.shadowMe, project.configurations.customModule]
// Compression // Compression
@@ -132,10 +145,12 @@ task deleteResources(type: Delete) {
processResources { processResources {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyAccessWidener)
} }
runClient { runClient {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyAccessWidener)
jvmArgs "-XX:-OmitStackTraceInFastThrow" jvmArgs "-XX:-OmitStackTraceInFastThrow"
finalizedBy(deleteResources) finalizedBy(deleteResources)
} }
fabric/src/main/resources/fabric.mod.json
+1 -1
View File
@@ -48,7 +48,7 @@
"custom": { "custom": {
"modmenu": { "modmenu": {
"links": { "links": {
"modmenu.discord": "https://discord.gg/xAB8G4cENx" "modmenu.discord": "${discord}"
} }
} }
} }
forge/build.gradle
+75 -34
View File
@@ -1,52 +1,92 @@
version = rootProject.versionStr buildscript {
repositories {
maven { url = "https://maven.minecraftforge.net" }
maven { url = "https://repo.spongepowered.org/repository/maven-public/" }
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.spongepowered.mixin'
loom { mixin {
forge { add sourceSets.main, "DistantHorizons.refmap.json"
convertAccessWideners.set(true)
extraAccessWideners.add("lod.accesswidener") config "DistantHorizons.mixins.json"
mixinConfigs("DistantHorizons.mixins.json") }
minecraft {
mappings channel: 'official', version: minecraft_version
// mappings loom.layered() {
// // Mojmap mappings
// officialMojangMappings()
// // Parchment mappings (it adds parameter mappings & javadoc)
// parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
// }
runs {
client {
workingDirectory project.file('run')
ideaModule "${rootProject.name}.${project.name}.main"
taskName 'Client'
args "-mixins.config=DistantHorizons.mixins.json"
}
server {
workingDirectory project.file('run')
ideaModule "${rootProject.name}.${project.name}.main"
taskName 'Server'
args "-mixins.config=DistantHorizons.mixins.json"
}
data {
workingDirectory project.file("run")
ideaModule "${rootProject.name}.${project.name}.main"
args '--mod', "lod", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
taskName 'Data'
args "-mixins.config=DistantHorizons.mixins.json"
}
} }
} }
//loom {
// forge {
// convertAccessWideners.set(true)
// extraAccessWideners.add("lod.accesswidener")
// mixinConfigs("DistantHorizons.mixins.json")
// }
//}
architectury {
platformSetupLoomIde()
forge()
}
loom { //loom {
accessWidenerPath = project(":common").loom.accessWidenerPath // accessWidenerPath = project(":common").loom.accessWidenerPath
//
// forge {
// convertAccessWideners = true
// extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
// }
//}
forge {
convertAccessWideners = true
extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
}
}
configurations {
common
shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
compileClasspath.extendsFrom common
runtimeClasspath.extendsFrom common
developmentForge.extendsFrom common
}
def addMod(path, enabled) { def addMod(path, enabled) {
if (enabled == "2") if (enabled == "2")
dependencies { modImplementation(path) } dependencies { implementation(path) }
else if (enabled == "1") else if (enabled == "1")
dependencies { modCompileOnly(path) } dependencies { modCompileOnly(path) }
} }
dependencies { dependencies {
// Forge loader // Forge loader
forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}" minecraft "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
// Architectury API // Architectury API
if (minecraft_version == "1.16.5") { if (minecraft_version == "1.16.5") {
modImplementation("me.shedaniel:architectury-forge:${rootProject.architectury_version}") implementation("me.shedaniel:architectury-forge:${rootProject.architectury_version}")
} else { } else {
modImplementation("dev.architectury:architectury-forge:${rootProject.architectury_version}") implementation("dev.architectury:architectury-forge:${rootProject.architectury_version}")
} }
// Starlight // Starlight
@@ -61,6 +101,7 @@ dependencies {
processResources { processResources {
dependsOn(copyCoreResources) dependsOn(copyCoreResources)
dependsOn(copyAccessWidener)
} }
shadowJar { shadowJar {
@@ -85,11 +126,11 @@ shadowJar {
mergeServiceFiles() mergeServiceFiles()
} }
remapJar { //remapJar {
input.set shadowJar.archiveFile // input.set shadowJar.archiveFile
dependsOn shadowJar // dependsOn shadowJar
classifier null // classifier null
} //}
jar { jar {
classifier "dev" classifier "dev"
gradle.properties
+7 -11
View File
@@ -1,31 +1,27 @@
org.gradle.jvmargs=-Xmx4096M org.gradle.jvmargs=-Xmx4096M
# Mod Info # Mod Info
archives_base_name=DistantHorizons mod_name=DistantHorizons
mod_version=1.7.0-a-dev mod_version=1.7.0-a-dev
maven_group=com.seibel.lod maven_group=com.seibel.lod
mod_name=Distant Horizons mod_readable_name=Distant Horizons
mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.
mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"] mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"]
mod_homepage=https://www.curseforge.com/minecraft/mc-mods/distant-horizons mod_homepage=https://www.curseforge.com/minecraft/mc-mods/distant-horizons
mod_source=https://gitlab.com/jeseibel/minecraft-lod-mod/ mod_source=https://gitlab.com/jeseibel/minecraft-lod-mod/
mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues
mod_discord=https://discord.gg/xAB8G4cENx
# Architectury Version & Info
architectury_version=5.7.28
enabled_platforms=fabric,forge
# Global Plugin Versions # Global Plugin Versions
manifold_version=2022.1.19
toml_version=3.6.4 toml_version=3.6.4
nightconfig_version=3.6.6 nightconfig_version=3.6.6
flatlaf_version=2.3 flatlaf_version=2.3
svgSalamander_version=1.1.3 svgSalamander_version=1.1.3
manifold_version=2022.1.19
mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19,1.19.1,1.19.2
# Internal Properties (These are set at runtime) # Internal Properties (These are set at runtime for Forgix to merge jar's)
versionStr= versionStr=
##### This defines what MC version Intellij will use for the preprocessor # This defines what MC version Intellij will use for the preprocessor
##### and what version is used automatically by build and run commands # and what version is used automatically by build and run commands
mcVer=1.18.2 mcVer=1.18.2
settings.gradle
+24 -22
View File
@@ -1,35 +1,37 @@
pluginManagement { pluginManagement {
repositories { repositories {
maven { url "https://maven.fabricmc.net/" } maven {
maven { url "https://maven.architectury.dev/" } name "Fabric"
maven { url "https://maven.minecraftforge.net/" } url "https://maven.fabricmc.net/"
maven { url "https://repo.spongepowered.org/repository/maven-public/"} }
maven {
name "Forge"
url "https://maven.minecraftforge.net/"
}
maven { // We may not use Quilt atm, but better to have it here for when it eventually gets added
name "Quilt"
url "https://maven.quiltmc.org/repository/release"
}
maven { // Used for Vanilla Minecraft's libraries
name "Sponge"
url "https://repo.spongepowered.org/repository/maven-public/"
}
mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
// Minecraft dependent sub-projects
include("common")
include("fabric")
// The logic for buildForge can be made more succinct, but the readability goes way down.
def buildForge = true
if (gradle.startParameter.taskRequests.size() > 0) {
if (gradle.startParameter.taskRequests[0].args.size() > 0) {
if (gradle.startParameter.taskRequests[0].args[0].startsWith("fabric:")) {
buildForge = false
}
}
}
if (buildForge) {
include("forge")
}
// Minecraft independent sub-projects // Minecraft independent sub-projects
include("core") include("core")
project(":core").projectDir = file('coreSubProjects/core') project(":core").projectDir = file('coreSubProjects/core')
include("api") include("api")
project(":api").projectDir = file('coreSubProjects/api') project(":api").projectDir = file('coreSubProjects/api')
// Minecraft dependent sub-projects
include("common")
include("fabric")
//include("quilt") // Just put this here for once we need it
include("forge")
rootProject.name = "DistantHorizons" rootProject.name = "DistantHorizons"
1.16.5.properties → versionProperties/1.16.5.properties
+2 -1
View File
@@ -1,9 +1,10 @@
# 1.16.5 version # 1.16.5 version
java_version=8 java_version=8
minecraft_version=1.16.5 minecraft_version=1.16.5
parchment_version=2022.03.06 parchment_version=2022.03.06
compatible_minecraft_versions=["1.16.4", "1.16.5"] compatible_minecraft_versions=["1.16.4", "1.16.5"]
accessWidenerVersion=1_16
builds_for=["fabric", "forge"]
# Fabric loader # Fabric loader
fabric_loader_version=0.13.2 fabric_loader_version=0.13.2
1.17.1.properties → versionProperties/1.17.1.properties
+2 -1
View File
@@ -1,9 +1,10 @@
# 1.17.1 version # 1.17.1 version
java_version=16 java_version=16
minecraft_version=1.17.1 minecraft_version=1.17.1
parchment_version=2021.12.12 parchment_version=2021.12.12
compatible_minecraft_versions=["1.17", "1.17.1"] compatible_minecraft_versions=["1.17", "1.17.1"]
accessWidenerVersion=1_17
builds_for=["fabric", "forge"]
# Fabric loader # Fabric loader
fabric_loader_version=0.13.2 fabric_loader_version=0.13.2
1.18.1.properties → versionProperties/1.18.1.properties
+2 -1
View File
@@ -1,9 +1,10 @@
# 1.18.1 version # 1.18.1 version
java_version = 17 java_version = 17
minecraft_version=1.18.1 minecraft_version=1.18.1
parchment_version=2022.03.06 parchment_version=2022.03.06
compatible_minecraft_versions=["1.18", "1.18.1"] compatible_minecraft_versions=["1.18", "1.18.1"]
accessWidenerVersion=1_18
builds_for=["fabric", "forge"]
# Fabric loader # Fabric loader
fabric_loader_version=0.13.3 fabric_loader_version=0.13.3
1.18.2.properties → versionProperties/1.18.2.properties
+3 -2
View File
@@ -1,9 +1,10 @@
# 1.18.2 version based stuff # 1.18.2 version based stuff
java_version = 17 java_version = 17
minecraft_version=1.18.2 minecraft_version=1.18.2
parchment_version=2022.03.13 parchment_version=2022.03.13
compatible_minecraft_versions=["1.18.2"] compatible_minecraft_versions=["1.18.2"]
accessWidenerVersion=1_18
builds_for=["fabric", "forge"]
# Fabric loader # Fabric loader
fabric_loader_version=0.13.3 fabric_loader_version=0.13.3
@@ -17,8 +18,8 @@ architectury_version=4.4.59
sodium_version=mc1.18.2-0.4.1 sodium_version=mc1.18.2-0.4.1
iris_version=1.18.x-v1.2.5 iris_version=1.18.x-v1.2.5
bclib_version=1.4.5 bclib_version=1.4.5
canvas_version=mc118:1.0.2397
immersive_portals_version = v1.4.9-1.18 immersive_portals_version = v1.4.9-1.18
canvas_version=mc118:1.0.2397
# Fabric mod run # Fabric mod run
# 0 = Don't enable and don't run # 0 = Don't enable and don't run
1.19.2.properties → versionProperties/1.19.2.properties
+3
View File
@@ -1,7 +1,10 @@
# 1.19.2 version
java_version = 17 java_version = 17
minecraft_version=1.19.2 minecraft_version=1.19.2
parchment_version=2022.08.10 parchment_version=2022.08.10
compatible_minecraft_versions=["1.19.2"] compatible_minecraft_versions=["1.19.2"]
accessWidenerVersion=1_19
builds_for=["fabric", "forge"]
# Fabric loader # Fabric loader
fabric_loader_version=0.14.9 fabric_loader_version=0.14.9
1.19.properties → versionProperties/1.19.properties
+4 -3
View File
@@ -1,9 +1,10 @@
# 1.18.2 version based stuff # 1.19 version
java_version = 17 java_version = 17
minecraft_version=1.19 minecraft_version=1.19
parchment_version=2022.08.10 parchment_version=2022.08.10
compatible_minecraft_versions=["1.19"] compatible_minecraft_versions=["1.19"]
accessWidenerVersion=1_19
builds_for=["fabric", "forge"]
# Fabric loader # Fabric loader
fabric_loader_version=0.14.7 fabric_loader_version=0.14.7
@@ -16,8 +17,8 @@ architectury_version=5.6.24
lithium_version= lithium_version=
sodium_version=3820973 sodium_version=3820973
iris_version=1.19.x-v1.2.5 iris_version=1.19.x-v1.2.5
immersive_portals_version =
bclib_version= bclib_version=
immersive_portals_version =
canvas_version=mc118:1.0.2397 canvas_version=mc118:1.0.2397
# Fabric mod run # Fabric mod run