Let's not do that again

This commit is contained in:
modmuss50 2024-02-28 19:30:18 +00:00
parent 90fffc782a
commit 6195f6f57b
3 changed files with 41 additions and 28 deletions

47
.gitignore vendored
View File

@ -1,26 +1,27 @@
.gradle/ # Ignore everything
*-merged.jar /*
*-mapped.jar
*-intermediary.jar
*.DS_Store
build/
out/
mappings_official/
namedSrc/
# idea # Folders
.idea/ !/.github
*.iml !/filament
*.iws !/gradle
*.ipr !/src
*.jar !/unpick-definitions
# eclipse # Files
.eclipse
.classpath
.project
.settings/
# vscode !.editorconfig
.vscode/ !.gitattributes
bin/ !.gitignore
!build.gradle
!CONTRIBUTING.md
!enigma_profile.json
!gradle.properties
!gradlew
!gradlew.bat
!HEADER
!LICENSE
!MAINTAINERS
!README.md
!settings.gradle
!unpick-logging.properties

View File

@ -124,7 +124,7 @@ tasks.register('downloadIntermediary', DownloadTask) {
tasks.register('mapIntermediaryJar', MapJarTask) { tasks.register('mapIntermediaryJar', MapJarTask) {
dependsOn downloadIntermediary, mergeMinecraftJars dependsOn downloadIntermediary, mergeMinecraftJars
group = mapJarGroup group = mapJarGroup
output = file("${minecraft_version}-intermediary.jar") output = layout.buildDirectory.file("${minecraft_version}-intermediary.jar")
input = mergeMinecraftJars.output input = mergeMinecraftJars.output
mappings = downloadIntermediary.output mappings = downloadIntermediary.output
classpath.from minecraftLibraries classpath.from minecraftLibraries
@ -135,7 +135,7 @@ tasks.register('mapIntermediaryJar', MapJarTask) {
tasks.register('mapServerIntermediaryJar', MapJarTask) { tasks.register('mapServerIntermediaryJar', MapJarTask) {
dependsOn downloadIntermediary, extractBundledServer dependsOn downloadIntermediary, extractBundledServer
group = mapJarGroup group = mapJarGroup
output = file("${minecraft_version}-server-intermediary.jar") output = layout.buildDirectory.file("${minecraft_version}-server-intermediary.jar")
input = extractBundledServer.output input = extractBundledServer.output
mappings = downloadIntermediary.output mappings = downloadIntermediary.output
classpath.from minecraftLibraries classpath.from minecraftLibraries
@ -338,7 +338,7 @@ remapUnpickDefinitionsIntermediary {
tasks.register('unpickIntermediaryJar', UnpickJarTask) { tasks.register('unpickIntermediaryJar', UnpickJarTask) {
group = 'unpick' group = 'unpick'
input = mapIntermediaryJar.output input = mapIntermediaryJar.output
output = file("${minecraft_version}-intermediary-unpicked.jar") output = layout.buildDirectory.file("${minecraft_version}-intermediary-unpicked.jar")
unpickDefinition = remapUnpickDefinitionsIntermediary.output unpickDefinition = remapUnpickDefinitionsIntermediary.output
constantsJarFile = constantsJar.archiveFile constantsJarFile = constantsJar.archiveFile
classpath.from minecraftLibraries classpath.from minecraftLibraries
@ -406,7 +406,7 @@ tasks.register('v2MergedYarnJar', Jar) {
tasks.register('mapNamedJar', MapJarTask) { tasks.register('mapNamedJar', MapJarTask) {
dependsOn mergeV2, unpickIntermediaryJar dependsOn mergeV2, unpickIntermediaryJar
group = mapJarGroup group = mapJarGroup
output = file("${minecraft_version}-named.jar") output = layout.buildDirectory.file("${minecraft_version}-named.jar")
input = unpickIntermediaryJar.output input = unpickIntermediaryJar.output
mappings = mergeV2.output mappings = mergeV2.output
classpath.from minecraftLibraries classpath.from minecraftLibraries
@ -445,7 +445,7 @@ tasks.register('genFakeSource', JavaExec) {
} }
tasks.register('decompileCFR', JavaExec) { tasks.register('decompileCFR', JavaExec) {
def outputDir = file("namedSrc") def outputDir = layout.buildDirectory.file("namedSrc")
dependsOn mapNamedJar dependsOn mapNamedJar
mainClass = "org.benf.cfr.reader.Main" mainClass = "org.benf.cfr.reader.Main"

12
filament/.gitignore vendored Normal file
View File

@ -0,0 +1,12 @@
# Ignore everything
/*
# Folders
!/src
# Files
!.gitignore
!build.gradle
!checkstyle.xml
!gradle.properties
!settings.gradle