Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let's not do that again #3799

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Let's not do that again #3799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 24 additions & 23 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
.gradle/
*-merged.jar
*-mapped.jar
*-intermediary.jar
*.DS_Store
build/
out/
mappings_official/
namedSrc/
# Ignore everything
/*

# idea
.idea/
*.iml
*.iws
*.ipr
*.jar
# Folders
!/.github
!/filament
!/gradle
!/src
!/unpick-definitions

# eclipse
.eclipse
.classpath
.project
.settings/
# Files

# vscode
.vscode/
bin/
!.editorconfig
!.gitattributes
!.gitignore
!build.gradle
!CONTRIBUTING.md
!enigma_profile.json
!gradle.properties
!gradlew
!gradlew.bat
!HEADER
!LICENSE
!MAINTAINERS
!README.md
!settings.gradle
!unpick-logging.properties
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ tasks.register('downloadIntermediary', DownloadTask) {
tasks.register('mapIntermediaryJar', MapJarTask) {
dependsOn downloadIntermediary, mergeMinecraftJars
group = mapJarGroup
output = file("${minecraft_version}-intermediary.jar")
output = layout.buildDirectory.file("${minecraft_version}-intermediary.jar")
input = mergeMinecraftJars.output
mappings = downloadIntermediary.output
classpath.from minecraftLibraries
Expand All @@ -135,7 +135,7 @@ tasks.register('mapIntermediaryJar', MapJarTask) {
tasks.register('mapServerIntermediaryJar', MapJarTask) {
dependsOn downloadIntermediary, extractBundledServer
group = mapJarGroup
output = file("${minecraft_version}-server-intermediary.jar")
output = layout.buildDirectory.file("${minecraft_version}-server-intermediary.jar")
input = extractBundledServer.output
mappings = downloadIntermediary.output
classpath.from minecraftLibraries
Expand Down Expand Up @@ -338,7 +338,7 @@ remapUnpickDefinitionsIntermediary {
tasks.register('unpickIntermediaryJar', UnpickJarTask) {
group = 'unpick'
input = mapIntermediaryJar.output
output = file("${minecraft_version}-intermediary-unpicked.jar")
output = layout.buildDirectory.file("${minecraft_version}-intermediary-unpicked.jar")
unpickDefinition = remapUnpickDefinitionsIntermediary.output
constantsJarFile = constantsJar.archiveFile
classpath.from minecraftLibraries
Expand Down Expand Up @@ -406,7 +406,7 @@ tasks.register('v2MergedYarnJar', Jar) {
tasks.register('mapNamedJar', MapJarTask) {
dependsOn mergeV2, unpickIntermediaryJar
group = mapJarGroup
output = file("${minecraft_version}-named.jar")
output = layout.buildDirectory.file("${minecraft_version}-named.jar")
input = unpickIntermediaryJar.output
mappings = mergeV2.output
classpath.from minecraftLibraries
Expand Down Expand Up @@ -445,7 +445,7 @@ tasks.register('genFakeSource', JavaExec) {
}

tasks.register('decompileCFR', JavaExec) {
def outputDir = file("namedSrc")
def outputDir = layout.buildDirectory.file("namedSrc")

dependsOn mapNamedJar
mainClass = "org.benf.cfr.reader.Main"
Expand Down
12 changes: 12 additions & 0 deletions filament/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Ignore everything
/*

# Folders
!/src
# Files

!.gitignore
!build.gradle
!checkstyle.xml
!gradle.properties
!settings.gradle