Skip to content

Commit 8fe77d4

Browse files
Initial 7.3 update work
1 parent 59bfd2d commit 8fe77d4

File tree

5 files changed

+64
-17
lines changed

5 files changed

+64
-17
lines changed

build.gradle

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
11
plugins {
2-
id 'babric-loom' version '1.4.+'
2+
id 'fabric-loom' version '1.7.bta'
33
id 'java'
44
}
55

6+
import org.gradle.internal.os.OperatingSystem
7+
8+
project.ext.lwjglVersion = "3.3.4"
9+
10+
switch (OperatingSystem.current()) {
11+
case OperatingSystem.LINUX:
12+
project.ext.lwjglNatives = "natives-linux"
13+
break
14+
case OperatingSystem.WINDOWS:
15+
project.ext.lwjglNatives = "natives-windows"
16+
break
17+
case OperatingSystem.MAC_OS:
18+
project.ext.lwjglNatives = "natives-macos"
19+
}
20+
621
group = project.mod_group
722
archivesBaseName = project.mod_name
823
version = project.mod_version
924

1025
loom {
11-
gluedMinecraftJar()
1226
noIntermediateMappings()
13-
customMinecraftManifest.set("https://github.com/Turnip-Labs/bta-manifest-repo/releases/download/v${project.bta_version}/${project.bta_version}.json")
27+
customMinecraftMetadata.set("https://github.com/Turnip-Labs/bta-manifest-repo/releases/download/v${project.bta_version}/${project.bta_version}.json")
1428
}
1529

1630
repositories {
@@ -24,6 +38,14 @@ repositories {
2438
name = 'Fabric'
2539
url = 'https://maven.fabricmc.net/'
2640
}
41+
maven {
42+
name = 'SignalumMavenInfrastructure'
43+
url = 'https://maven.thesignalumproject.net/infrastructure'
44+
}
45+
maven {
46+
name = 'SignalumMavenReleases'
47+
url = 'https://maven.thesignalumproject.net/releases'
48+
}
2749
ivy {
2850
url = "https://github.com/Better-than-Adventure"
2951
patternLayout {
@@ -83,19 +105,20 @@ repositories {
83105
}
84106

85107
dependencies {
86-
minecraft "bta-download-repo:bta:${project.bta_version}"
108+
minecraft "::${project.bta_version}"
87109
mappings loom.layered() {}
88110

89111
modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar
90112
modImplementation "fabric-loader:fabric-loader:${project.loader_version}"
91113

92114
// Helper library
93-
modImplementation "bta-halplibe:halplibe:${project.halplibe_version}"
115+
// modImplementation "bta-halplibe:halplibe:${project.halplibe_version}"
116+
implementation("turniplabs:halplibe:${project.halplibe_version}")
94117

95118
// BTWaila
96-
modImplementation "BTWaila:btwaila:${project.btwaila_version}"
119+
// modImplementation "BTWaila:btwaila:${project.btwaila_version}"
97120

98-
modImplementation "ModMenu:ModMenu:${project.mod_menu_version}"
121+
modImplementation("turniplabs:modmenu-bta:${project.mod_menu_version}")
99122

100123
implementation "org.slf4j:slf4j-api:1.8.0-beta4"
101124
implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0"
@@ -108,6 +131,22 @@ dependencies {
108131
implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}")
109132

110133
include(implementation("org.apache.commons:commons-lang3:3.12.0"))
134+
135+
modImplementation("com.github.zarzelcow:legacy-lwjgl3:1.0.4")
136+
implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
137+
138+
runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
139+
runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
140+
runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
141+
runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
142+
runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
143+
runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
144+
implementation "org.lwjgl:lwjgl:$lwjglVersion"
145+
implementation "org.lwjgl:lwjgl-assimp:$lwjglVersion"
146+
implementation "org.lwjgl:lwjgl-glfw:$lwjglVersion"
147+
implementation "org.lwjgl:lwjgl-openal:$lwjglVersion"
148+
implementation "org.lwjgl:lwjgl-opengl:$lwjglVersion"
149+
implementation "org.lwjgl:lwjgl-stb:$lwjglVersion"
111150
}
112151

113152
java {
@@ -126,6 +165,11 @@ jar {
126165
}
127166
}
128167

168+
configurations.configureEach {
169+
// Removes LWJGL2 dependencies
170+
exclude group: "org.lwjgl.lwjgl"
171+
}
172+
129173
processResources {
130174
inputs.property "version", version
131175

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
org.gradle.jvmargs=-Xmx2G
22

33
# BTA
4-
bta_version=7.2
4+
bta_version=7.3-pre4
55

66
# Loader & Mod Menu
7-
loader_version=0.15.6-babric.6-bta
8-
mod_menu_version=2.0.6
7+
loader_version=0.15.6-bta.7
8+
mod_menu_version=3.0.0
99

1010
# HalpLibe
11-
halplibe_version=4.1.3
11+
halplibe_version=5.0.0
1212

1313
# BTWaila
14-
btwaila_version=1.1.2-7.2-pre2
14+
# btwaila_version=1.1.2-7.2-pre2
1515

1616
# Mod
17-
mod_version=1.4.4
17+
mod_version=1.5.0
1818
mod_group=fl205
1919
mod_name=ironfurnaces
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,9 @@ pluginManagement {
1313
name = 'Babric'
1414
url = 'https://maven.glass-launcher.net/babric'
1515
}
16+
maven {
17+
name = 'SignalumMavenInfrastructure'
18+
url = 'https://maven.thesignalumproject.net/infrastructure'
19+
}
1620
}
17-
}
21+
}

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
},
3737

3838
"depends": {
39-
"minecraft": "^7.2-beta",
4039
"fabricloader": ">0.15.5",
41-
"halplibe": ">=4.1.3"
40+
"halplibe": ">=5.0.0"
4241
},
4342
"suggests": {
4443
"btwaila": ">=1.1.2-7.2-pre2"

0 commit comments

Comments
 (0)