Skip to content

Commit 7613617

Browse files
committed
25w32a support
1 parent 2187623 commit 7613617

File tree

12 files changed

+44
-18
lines changed

12 files changed

+44
-18
lines changed

build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,18 @@ dependencies {
126126
modRuntimeOnly("me.djtheredstoner:DevAuth-${loader.loader}:${deps.devauthVersion}")
127127
include(implementation("com.moulberry:mixinconstraints:${deps.mixinconstraintsVersion}")!!)!!
128128
include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-${loader.loader}:${deps.mixinsquaredVersion}")!!)!!)
129-
130129
if (loader.isFabric) {
131130
modImplementation("net.fabricmc:fabric-loader:${deps.fabricLoaderVersion}")!!
132-
modImplementation("net.fabricmc.fabric-api:fabric-api:${deps.fabricApiVersion}+${mc.version}")
133-
modImplementation(fletchingTable.modrinth("modmenu", "${mc.version}", "fabric"))
131+
modImplementation("net.fabricmc.fabric-api:fabric-api:${deps.fabricApiVersion}")
132+
if (project.hasProperty("deps.modmenu_version")) {
133+
modImplementation("com.terraformersmc:modmenu:${property("deps.modmenu_version")}")
134+
} else {
135+
modImplementation(fletchingTable.modrinth("modmenu", "${mc.version}", "fabric"))
136+
}
137+
134138
} else if (loader.isNeoforge) {
135139
"neoForge"("net.neoforged:neoforge:${deps.neoforgeVersion}")
136140
}
137-
138141
}
139142

140143
// mc_dep fields must be in the format 'x', '>=x', '>=x <=y'
@@ -227,7 +230,6 @@ tasks.processResources {
227230
put("modrinth", mod.modrinth)
228231
put("curseforge", mod.curseforge)
229232
put("discord", mod.discord)
230-
231233
if (loader.isFabric) {
232234
put("fabric_loader_version", deps.fabricLoaderVersion)
233235
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22

33
kotlin-jvm = "2.2.0"
4-
loom = "1.10.+"
4+
loom = "1.11-SNAPSHOT"
55
publishing = "0.8.4"
66
blossom = "1.3.2"
77
ksp = "2.2.0-2.0.2"

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ stonecutter {
3131
mc("1.21.4", listOf("fabric"))
3232
mc("1.21.5", listOf("fabric"))
3333
mc("1.21.8", listOf("fabric"))
34+
mc("1.21.9", listOf("fabric"))
3435

3536
vcsVersion = "1.21.8-fabric"
3637
}

src/main/java/btw/lowercase/optiboxes/mixins/MixinLevelRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ public abstract class MixinLevelRenderer {
131131
//? >=1.21.6 {
132132
target = "Lnet/minecraft/client/renderer/SkyRenderer;renderSunMoonAndStars(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;FIFF)V"
133133
//?} else >=1.21.4 {
134-
/*target = "Lnet/minecraft/client/renderer/SkyRenderer;renderSunMoonAndStars(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;FIFFLnet/minecraft/client/renderer/FogParameters;)V"*/
135-
//?} else {
134+
/*target = "Lnet/minecraft/client/renderer/SkyRenderer;renderSunMoonAndStars(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;FIFFLnet/minecraft/client/renderer/FogParameters;)V"
135+
*///?} else {
136136
/*target = "Lnet/minecraft/client/renderer/SkyRenderer;renderSunMoonAndStars(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/Tesselator;FIFFLnet/minecraft/client/renderer/FogParameters;)V"
137137
*///?}
138138
)

src/main/java/btw/lowercase/optiboxes/utils/SkyboxResourceHelper.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,24 @@ public class SkyboxResourceHelper implements IdentifiableResourceReloadListener
1818
private ResourceManager resourceManager;
1919

2020
@Override
21-
public @NotNull CompletableFuture<Void> reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, Executor backgroundExecutor, Executor gameExecutor) {
22-
this.resourceManager = resourceManager;
21+
public @NotNull CompletableFuture<Void> reload(
22+
//? >=1.21.9
23+
SharedState sharedState,
24+
//? <1.21.9
25+
/*PreparationBarrier preparationBarrier,*/
26+
//? <1.21.9
27+
/*ResourceManager resourceManager,*/
28+
Executor backgroundExecutor,
29+
//? >=1.21.9
30+
PreparationBarrier preparationBarrier,
31+
Executor gameExecutor
32+
) {
33+
this.resourceManager =
34+
//? >=1.21.9 {
35+
sharedState.resourceManager();
36+
//? } else {
37+
/*resourceManager;*/
38+
//? }
2339
return CompletableFuture.runAsync(() -> {
2440
SkyboxManager.INSTANCE.clearSkyboxes();
2541
if (OptiBoxesClient.getConfig().enabled.isEnabled()) {

stonecutter.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
alias(libs.plugins.publishing)
66
}
77

8-
stonecutter active "1.21.8-fabric" /* [SC] DO NOT EDIT */
8+
stonecutter active "1.21.9-fabric" /* [SC] DO NOT EDIT */
99

1010
stonecutter tasks {
1111
val ordering = Comparator
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
loom.platform=fabric
22

33
deps.parchment_version=2024.11.17
4-
deps.fabric_api_version=0.115.4
4+
deps.fabric_api_version=0.116.5+1.21.1
55

66
mod.mc_version=1.21.1
77
mod.mc_dep=>=1.21 <=1.21.1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
loom.platform=fabric
22

33
deps.parchment_version=2024.12.07
4-
deps.fabric_api_version=0.114.0
5-
deps.modmenu_version=12.0.0
4+
deps.fabric_api_version=0.114.1+1.21.3
5+
66

77
mod.mc_version=1.21.3
88
mod.mc_dep=>=1.21.2 <=1.21.3
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
loom.platform=fabric
22

33
deps.parchment_version=2025.03.23
4-
deps.fabric_api_version=0.119.2
5-
deps.modmenu_version=13.0.3
4+
deps.fabric_api_version=0.119.4+1.21.4
65

76
mod.mc_version=1.21.4
87
mod.mc_dep=>=1.21.4 <=1.21.4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
loom.platform=fabric
22

33
deps.parchment_version=2025.06.15
4-
deps.fabric_api_version=0.119.6
4+
deps.fabric_api_version=0.128.2+1.21.5
55

66
mod.mc_version=1.21.5
77
mod.mc_dep=1.21.5

0 commit comments

Comments
 (0)