mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-10 12:34:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Instant backport

Browse Source 
- Switch to 1.20.1
- It still compiles!
This commit is contained in:
Jozufozu 2023-11-23 16:14:46 -08:00
parent 1e9b0ee85c
commit 8ff208d23e
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@ -3,8 +3,8 @@ plugins {
id 'idea' id 'idea'
id 'maven-publish' id 'maven-publish'
id 'net.minecraftforge.gradle' version "${forgegradle_version}" id 'net.minecraftforge.gradle' version "${forgegradle_version}"
id 'org.spongepowered.mixin' version "${mixingradle_version}"
id 'org.parchmentmc.librarian.forgegradle' version "${librarian_version}" id 'org.parchmentmc.librarian.forgegradle' version "${librarian_version}"
id 'org.spongepowered.mixin' version "${mixingradle_version}"
id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
} }
@ -104,9 +104,9 @@ dependencies {
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
// This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly // This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
if (System.getProperty('idea.sync.active') != 'true') { // if (System.getProperty('idea.sync.active') != 'true') {
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
} // }
} }
test { test {
@ -159,7 +159,6 @@ tasks.named('jar', Jar).configure {
'Implementation-Version' : project.jar.archiveVersion, 'Implementation-Version' : project.jar.archiveVersion,
//'Implementation-Vendor': 'flywheel authors', //'Implementation-Vendor': 'flywheel authors',
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
'MixinConfigs' : 'flywheel.mixins.json,flywheel.sodium.mixins.json'
]) ])
} }
@ -167,11 +166,6 @@ tasks.named('jar', Jar).configure {
addLicense(it) addLicense(it)
} }
tasks.named('jarJar').configure {
finalizedBy 'reobfJarJar'
addLicense(it)
}
java { java {
withSourcesJar() withSourcesJar()
withJavadocJar() withJavadocJar()
@ -209,6 +203,6 @@ curseforge {
changelog = file('changelog.txt') changelog = file('changelog.txt')
releaseType = project.curse_type releaseType = project.curse_type
mainArtifact jar mainArtifact jar
addGameVersion '1.20.2' addGameVersion '1.20.1'
} }
} }

12
gradle.properties
View File

@ -3,17 +3,17 @@ org.gradle.daemon = false
# mod version info # mod version info
mod_version = 1.0.0-alpha mod_version = 1.0.0-alpha
artifact_minecraft_version=1.20 artifact_minecraft_version = 1.20
minecraft_version=1.20.2 minecraft_version = 1.20.1
forge_version=48.0.40 forge_version = 47.2.6
# build dependency versions # build dependency versions
forgegradle_version=[6.0.16,6.2) forgegradle_version = [6.0.16,6.2)
mixingradle_version=0.7.+ mixingradle_version = 0.7.+
mixin_version = 0.8.5 mixin_version = 0.8.5
librarian_version = 1.+ librarian_version = 1.+
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
parchment_version=2023.10.22 parchment_version = 2023.09.03
# curseforge info # curseforge info
projectId = 486392 projectId = 486392

6
src/main/resources/META-INF/mods.toml
View File

@ -1,5 +1,5 @@
modLoader = "javafml" modLoader = "javafml"
loaderVersion = "[48,)" loaderVersion = "[47,)"
issueTrackerURL = "https://github.com/Jozufozu/Flywheel/issues" issueTrackerURL = "https://github.com/Jozufozu/Flywheel/issues"
license = "MIT" license = "MIT"
@ -18,13 +18,13 @@ A modern engine for modded minecraft.'''
[[dependencies.flywheel]] [[dependencies.flywheel]]
modId = "forge" modId = "forge"
mandatory = true mandatory = true
versionRange = "[48.0.0,)" versionRange = "[47.0.0,)"
ordering = "NONE" ordering = "NONE"
side = "CLIENT" side = "CLIENT"
[[dependencies.flywheel]] [[dependencies.flywheel]]
modId = "minecraft" modId = "minecraft"
mandatory = true mandatory = true
versionRange = "[1.20.2,)" versionRange = "[1.20.1,)"
ordering = "NONE" ordering = "NONE"
side = "CLIENT" side = "CLIENT"