Skip to content

Commit b0a927b

Browse files
authoredDec 7, 2023
1.20.4 update (MeteorDevelopment#4249)
1 parent 4796623 commit b0a927b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+332
-360
lines changed
 

‎build.gradle

+14-9
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858
modCompileOnly("maven.modrinth:indium:${project.indium_version}") { transitive = false }
5959

6060
// Baritone (https://github.com/MeteorDevelopment/baritone)
61-
modCompileOnly "meteordevelopment:baritone:${project.minecraft_version}-SNAPSHOT"
61+
modCompileOnly "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"
6262

6363
// Libraries
6464
library "meteordevelopment:orbit:${project.orbit_version}"
@@ -67,8 +67,6 @@ dependencies {
6767
library "org.reflections:reflections:${project.reflections_version}"
6868
library("io.netty:netty-handler-proxy:${project.netty_version}") { transitive = false }
6969
library("io.netty:netty-codec-socks:${project.netty_version}") { transitive = false }
70-
library "io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}"
71-
annotationProcessor "io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}"
7270
library "de.florianmichael:WaybackAuthLib:1.0.0"
7371

7472
// Launch sub project
@@ -96,17 +94,24 @@ shadowJar {
9694
}
9795

9896
processResources {
97+
def propertyMap = [
98+
"version" : project.version,
99+
"devbuild" : project.findProperty("devbuild") ?: "",
100+
"commit" : project.findProperty("commit") ?: "",
101+
"minecraft_version": project.minecraft_version,
102+
"loader_version" : project.loader_version
103+
]
104+
105+
inputs.properties(propertyMap)
99106
filesMatching("fabric.mod.json") {
100-
expand "version": project.version,
101-
"devbuild": project.findProperty("devbuild") ?: "",
102-
"commit": project.findProperty("commit") ?: "",
103-
"minecraft_version": project.minecraft_version,
104-
"loader_version": project.loader_version
107+
expand(propertyMap)
105108
}
106109
}
107110

108111
jar {
109-
from "LICENSE"
112+
from("LICENSE") {
113+
rename { "${it}_${archivesBaseName}" }
114+
}
110115

111116
manifest {
112117
attributes("Main-Class": "meteordevelopment.meteorclient.Main")

‎gradle.properties

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
org.gradle.jvmargs=-Xmx2G
22

33
# Fabric (https://fabricmc.net/develop)
4-
minecraft_version=1.20.2
5-
yarn_mappings=1.20.2+build.4
6-
loader_version=0.14.24
7-
fapi_version=0.90.4+1.20.2
4+
# TODO: when updating to 1.21, revert "minecraft": ["1.20.3", "1.20.4"] to "minecraft": "${minecraft_version}"
5+
minecraft_version=1.20.4
6+
yarn_mappings=1.20.4+build.1
7+
loader_version=0.15.0
8+
fapi_version=0.91.1+1.20.4
89

910
# Mod Properties
10-
mod_version=0.5.5
11+
mod_version=0.5.6
1112
maven_group=meteordevelopment
1213
archives_base_name=meteor-client
1314

1415
# Dependency Versions
1516

17+
# Baritone (https://github.com/MeteorDevelopment/baritone)
18+
baritone_version=1.20.2
19+
1620
# Sodium (https://github.com/CaffeineMC/sodium-fabric)
17-
sodium_version=mc1.20.2-0.5.3
21+
sodium_version=mc1.20.3-0.5.4
1822

1923
# Lithium (https://github.com/CaffeineMC/lithium-fabric)
2024
lithium_version=mc1.20.2-0.12.0
2125

2226
# Iris (https://github.com/IrisShaders/Iris)
23-
iris_version=1.6.10+1.20.2
27+
iris_version=1.6.12+1.20.3
2428

2529
# Orbit (https://github.com/MeteorDevelopment/orbit)
2630
orbit_version=0.2.3
@@ -37,8 +41,5 @@ reflections_version=0.10.2
3741
# Netty (https://github.com/netty/netty)
3842
netty_version=4.1.90.Final
3943

40-
# Mixin Extras (https://github.com/LlamaLad7/MixinExtras)
41-
mixin_extras_version=0.2.0
42-
4344
# Indium (https://github.com/comp500/Indium)
4445
indium_version=1.0.27+mc1.20.1

0 commit comments

Comments
 (0)