Skip to content

Commit

Permalink
Minecraft 1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz-htk committed Dec 31, 2023
1 parent cec00f7 commit c06f779
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 17 deletions.
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,5 @@ build
# other
eclipse
run

# Files from Forge MDK
forge*changelog.txt
/src/generated/resources/.cache/
/run-data/
run-data
src/generated/resources/.cache
17 changes: 15 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.minecraftforge.gradle' version '5.1.+'
id 'net.minecraftforge.gradle' version '[6.0.18,6.2)'
}

version = mod_version
Expand All @@ -17,6 +18,8 @@ println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty '
minecraft {
mappings channel: mapping_channel, version: minecraft_version

copyIdeResources = true

runs {
configureEach {
workingDirectory project.file('run')
Expand Down Expand Up @@ -63,7 +66,7 @@ tasks.named('processResources', ProcessResources).configure {
var 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,
loader_version_range: loader_version_range, pack_format_number: pack_format_number,
mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors: mod_authors, mod_description: mod_description, mod_issue_url: mod_issue_url,
mod_url: mod_url, mod_logo: mod_logo, mod_credits: mod_credits, mod_update_url: mod_update_url
Expand Down Expand Up @@ -106,4 +109,14 @@ publishing {

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}

eclipse {
synchronizationTasks 'genEclipseRuns'
}

sourceSets.each {
def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
it.output.resourcesDir = dir
it.java.destinationDirectory = dir
}
15 changes: 8 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

## Environment Properties
minecraft_version=1.20.1
minecraft_version_range=[1.20.1,)
forge_version=47.2.1
forge_version_range=[47,)
loader_version_range=[47,)
minecraft_version=1.20.4
minecraft_version_range=[1.20.4,)
forge_version=49.0.13
forge_version_range=[49.0,)
loader_version_range=[49,)
mapping_channel=official

## Mod Properties
mod_id=advancedmusicmod
mod_version=1.0.2+1.20.1
mod_version=1.0.2+1.20.4
mod_group_id=net.moritz_htk.advancedmusicmod
mod_license=moritz_htk Software License Agreement (mSLA)
mod_issue_url=https://github.com/moritz-htk/Advanced-Music-Mod-Forge/issues
Expand All @@ -21,4 +21,5 @@ mod_url=https://www.curseforge.com/minecraft/mc-mods/advanced-music-mod
mod_logo=banner.png
mod_credits=https://github.com/moritz-htk/Advanced-Music-Mod-Forge/blob/master/CREDITS.txt
mod_authors=moritz_htk
mod_description=Adds new music discs to Minecraft.
mod_description=Adds new music discs to Minecraft.
pack_format_number=26
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"description": {
"text": "${mod_id} resources"
},
"pack_format": 15
"pack_format": ${pack_format_number}
}
}

0 comments on commit c06f779

Please sign in to comment.