Skip to content
This repository was archived by the owner on Mar 8, 2024. It is now read-only.

Convert forge build to archloom #202

Open
jpenilla wants to merge 4 commits into
base: forge
Choose a base branch
from
Open

Convert forge build to archloom #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
611dc9e
Add editorconfig
jpenilla Dec 6, 2023
f22f975
Convert to archloom
jpenilla Dec 6, 2023
3bf3165
reproducible builds
jpenilla Dec 6, 2023
7f70c99
Add mixin debug arg
jpenilla Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[*]
charset = utf-8
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = off
5 changes: 5 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf
157 changes: 46 additions & 111 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
buildscript {
repositories {
maven { url = 'https://repo.spongepowered.org/maven' }
}
dependencies {
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
}
}

plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '[6.0.14,6.2)'
}

/*
* Gets the version name from the latest Git tag
*/
// https://stackoverflow.com/questions/28498688/gradle-script-to-autoversion-and-include-the-commit-hash-in-android
def getGitCommit = { ->
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = stdout
}
return stdout.toString().trim()
id 'dev.architectury.loom' version '1.4-SNAPSHOT'
}

group = mod_group_id
Expand All @@ -34,74 +9,43 @@ base {
archivesName = mod_id
}

apply plugin: 'org.spongepowered.mixin'

java.toolchain.languageVersion = JavaLanguageVersion.of(17)

minecraft {
mappings channel: mapping_channel, version: mapping_version

copyIdeResources = true

accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
// applies to all the run configs below
configureEach {
workingDirectory project.file('run')

// add mixins
arg "--mixin.config=" + mod_id + ".mixins.json"

// 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'

mods {
"${mod_id}" {
source sourceSets.main
}
}
}

client {
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
property 'forge.enabledGameTestNamespaces', mod_id
}

server {
property 'forge.enabledGameTestNamespaces', mod_id
args '--nogui'
}
loom.forge.mixinConfig("starlight.mixins.json")

// 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 {
property 'forge.enabledGameTestNamespaces', mod_id
repositories {
maven {
name = 'MinecraftForge'
url = 'https://maven.minecraftforge.net/'
}
maven {
// Mirrors NeoForged & Fabric
name = "Paper"
url = 'https://repo.papermc.io/repository/maven-public/'
}
maven {
name = "Parchment"
url = "https://maven.parchmentmc.org/"
mavenContent {
includeGroup 'org.parchmentmc.data'
}
}
}

data {
// example of overriding the workingDirectory set in configureEach above
workingDirectory project.file('run-data')

// 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/')
}
dependencies {
mappings loom.layered {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-${parchment_ver}@zip")
}
minecraft "com.mojang:minecraft:${minecraft_version}"
forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
}

sourceSets.main.resources { srcDir 'src/generated/resources' }
// make build reproducible
tasks.withType(AbstractArchiveTask).configureEach {
preserveFileTimestamps = false
reproducibleFileOrder = true
}

tasks.named('processResources', ProcessResources).configure {
var replaceProperties = [
Expand All @@ -119,33 +63,24 @@ tasks.named('processResources', ProcessResources).configure {
}
}

tasks.named('jar', Jar).configure {
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,
'MixinConfigs' : mod_id + '.mixins.json',
'MixinConnector' : 'ca.spottedleaf.starlight.mixin.MixinConnector',
])
}

// This is the preferred method to reobfuscate your jar file
finalizedBy 'reobfJar'
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}

dependencies {
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
loom.runs.all {
// https://github.com/SpongePowered/Mixin/wiki/Mixin-Java-System-Properties
vmArg("-Dmixin.debug=true")
}

mixin {
add sourceSets.main, "${mod_id}.refmap.json"
/*
* Gets the version name from the latest Git tag
*/
// https://stackoverflow.com/questions/28498688/gradle-script-to-autoversion-and-include-the-commit-hash-in-android
def getGitCommit() {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = stdout
}
return stdout.toString().trim()
}

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}
4 changes: 3 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

loom.platform=forge
minecraft_version=1.20.2
minecraft_version_range=[1.20.2,1.20.3)
forge_version=48.0.33
forge_version_range=[48,)
loader_version_range=[48,)
mapping_channel=official
mapping_version=1.20.2
parchment_ver=1.20.2:2023.10.08

mod_id=starlight
mod_name=Starlight
mod_license=LGPL-3.0-only
mod_version=1.1.3
mod_group_id=ca.spottedleaf.starlight
mod_authors=Spottedleaf
mod_description=Rewrites the light engine to fix lighting performance and lighting errors
mod_description=Rewrites the light engine to fix lighting performance and lighting errors
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 28 additions & 13 deletions gradlew
100644 → 100755
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading