Skip to content

Commit baf5dcf

Browse files
DeDiamondProDeDiamondPro
committed
1.21.9 pre 3 port
1 parent 55dda52 commit baf5dcf

File tree

7 files changed

+64
-17
lines changed

7 files changed

+64
-17
lines changed

‎build.gradle.kts‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ val shadeModImplementation: Configuration by configurations.creating {
7070

7171
// Version definitions
7272
val mcVersion = VersionDefinition( // Used for pre releases and release candidates
73+
"1.21.9" to "1.21.9-pre3",
7374
default = mcPlatform.versionString
7475
)
7576
val compatibleMcVersion = VersionDefinition(
@@ -79,7 +80,8 @@ val compatibleMcVersion = VersionDefinition(
7980
// NeoForge changed stuff going from .3 to .4
8081
"1.21.4-neoforge" to VersionRange("1.21.4", "1.21.4", name = "1.21.4"),
8182
"1.21.5" to VersionRange("1.21.5", "1.21.5", name = "1.21.5"),
82-
"1.21.8" to VersionRange("1.21.6", "1.21.8", name = "1.21.8", openEnd = true)
83+
"1.21.8" to VersionRange("1.21.6", "1.21.8", name = "1.21.8"),
84+
"1.21.9" to VersionRange("1.21.9", "1.21.9", name = "1.21.9", openEnd = true, allowAll = true), // TODO: disable allow all when ready for release
8385
)
8486
val javaVersion = VersionDefinition(
8587
"1.20.1" to "17",
@@ -88,21 +90,25 @@ val javaVersion = VersionDefinition(
8890
val parchmentVersion = VersionDefinition(
8991
"1.20.1" to "1.20.1:2023.09.03",
9092
"1.21.1" to "1.21.1:2024.11.17",
91-
"1.21.4" to "1.21.4:2025.02.16"
93+
"1.21.4" to "1.21.4:2025.03.23",
94+
"1.21.5" to "1.21.5:2025.06.15",
95+
"1.21.8" to "1.21.8:2025.09.14",
9296
)
9397
val fabricApiVersion = VersionDefinition(
9498
"1.20.1" to "0.92.3+1.20.1",
9599
"1.21.1" to "0.114.0+1.21.1",
96100
"1.21.4" to "0.118.0+1.21.4",
97101
"1.21.5" to "0.119.4+1.21.5",
98102
"1.21.8" to "0.129.0+1.21.8",
103+
"1.21.9" to "0.133.10+1.21.9",
99104
)
100105
val modMenuVersion = VersionDefinition(
101106
"1.20.1" to "7.2.2",
102107
"1.21.1" to "11.0.3",
103108
"1.21.4" to "13.0.2",
104109
"1.21.5" to "14.0.0-rc.2",
105-
"1.21.8" to "15.0.0-beta.3",
110+
"1.21.8" to "15.0.0",
111+
"1.21.9" to "15.0.0",
106112
)
107113
val neoForgeVersion = VersionDefinition(
108114
"1.21.1" to "21.1.95",
@@ -129,10 +135,9 @@ val kotlinForForgeVersion = VersionDefinition(
129135
"1.21.8" to "5.9.0",
130136
)
131137
val universalVersion = VersionDefinition(
132-
"1.21.1" to "1.21-${mcPlatform.loaderString}:421",
133-
"1.21.8" to "1.21.7-${mcPlatform.loaderString}:421",
134-
"1.21.8-forge" to "1.21.7-forge:422+feature-1.21.7-forge-neoforge",
135-
"1.21.8-neoforge" to "1.21.7-neoforge:422+feature-1.21.7-forge-neoforge",
138+
"1.21.1" to "1.21-${mcPlatform.loaderString}:427",
139+
"1.21.8" to "1.21.7-${mcPlatform.loaderString}:427",
140+
"1.21.9" to "1.21.9-${mcPlatform.loaderString}:428+feature-1.21.9-fabric",
136141
default = "${mcPlatform.name}:421"
137142
)
138143

@@ -148,7 +153,7 @@ dependencies {
148153
})
149154

150155
if (mcPlatform.isFabric) {
151-
modImplementation("net.fabricmc:fabric-loader:0.16.13")
156+
modImplementation("net.fabricmc:fabric-loader:0.17.2")
152157

153158
modImplementation("net.fabricmc:fabric-language-kotlin:${libs.versions.fabric.language.kotlin.get()}")
154159
modImplementation("net.fabricmc.fabric-api:fabric-api:${fabricApiVersion.get(mcPlatform)}")
@@ -177,7 +182,14 @@ dependencies {
177182
}
178183
}
179184

180-
val accesWidener = if (mcPlatform.minor == 21) "1.21.resourcify" else "1.20.resourcify"
185+
val accesWidener = if (mcPlatform.version >= 1_21_09) {
186+
"1.21.9.resourcify"
187+
} else if (mcPlatform.minor == 21) {
188+
"1.21.resourcify"
189+
} else {
190+
"1.20.resourcify"
191+
}
192+
181193
loom {
182194
accessWidenerPath = rootProject.file("src/main/resources/$accesWidener.accesswidener")
183195

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kotlin = "2.0.20"
44
fabric_language_kotlin = "1.11.0+kotlin.2.0.0" # Use 2.0.0 here since it is the minimum kotlin version we require
55

66
# Build system
7-
arch_loom = "1.10-SNAPSHOT"
7+
arch_loom = "1.11-SNAPSHOT"
88
shadow = "8.1.1"
99
publishing = "0.8.3"
1010

‎settings.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ val platforms = listOf(
4444
"1.21.5-fabric",
4545
"1.21.8-neoforge",
4646
"1.21.8-fabric",
47+
"1.21.9-fabric",
4748
)
4849

4950
stonecutter {
@@ -53,7 +54,7 @@ stonecutter {
5354
for (version in platforms) {
5455
vers(version, version.split('-')[0])
5556
}
56-
vcsVersion = "1.21.8-fabric"
57+
vcsVersion = "1.21.9-fabric"
5758
}
5859
}
5960

‎src/main/kotlin/dev/dediamondpro/resourcify/gui/ConfirmLinkScreen.kt‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,30 @@ import gg.essential.universal.UScreen
2424
import net.minecraft.client.gui.screens.ConfirmLinkScreen
2525
import net.minecraft.client.gui.screens.Screen
2626

27+
//? if >=1.21.9
28+
import net.minecraft.client.input.KeyEvent
29+
2730

2831
class ConfirmLinkScreen(private val url: String, private val previousScreen: Screen?, trusted: Boolean = false) :
2932
ConfirmLinkScreen({ result ->
3033
if (result) UDesktop.browse(url.toURI())
3134
UScreen.displayScreen(previousScreen)
3235
}, url, trusted) {
3336

34-
override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
35-
if (keyCode == UKeyboard.KEY_ESCAPE) {
37+
override fun keyPressed(
38+
//? if <1.21.9 {
39+
/*keyCode: Int, scanCode: Int, modifiers: Int
40+
*///?} else
41+
keyEvent: KeyEvent
42+
): Boolean {
43+
val key = /*? if <1.21.9 {*/ /*keyCode *//*?} else {*/ keyEvent.key /*?}*/
44+
if (key == UKeyboard.KEY_ESCAPE) {
3645
UScreen.displayScreen(previousScreen)
3746
return true
3847
}
39-
return super.keyPressed(keyCode, scanCode, modifiers)
48+
//? if <1.21.9 {
49+
/*return super.keyPressed(keyCode, scanCode, modifiers)
50+
*///?} else
51+
return super.keyPressed(keyEvent)
4052
}
4153
}

‎src/main/kotlin/dev/dediamondpro/resourcify/gui/update/components/UpdateCard.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import gg.essential.elementa.effects.ScissorEffect
4646
import gg.essential.universal.ChatColor
4747
import net.minecraft.client.gui.screens.packs.PackSelectionModel
4848
import net.minecraft.client.gui.screens.packs.PackSelectionScreen
49-
import net.minecraft.server.packs.FilePackResources
5049
import java.awt.Color
5150
import java.io.File
5251
import java.util.concurrent.locks.ReentrantLock
@@ -285,7 +284,12 @@ class UpdateCard(
285284
// Set the index correctly
286285
entry.otherList.remove(entry.pack)
287286
entry.otherList.add(index, entry.pack)
288-
model.onListChanged.run()
287+
288+
// Call the list change method
289+
//? if <1.21.9 {
290+
/*model.onListChanged.run()
291+
*///?} else
292+
model.onListChanged.accept(null)
289293
break
290294
}
291295
}

‎src/main/resources/1.21.9.resourcify.accesswidener‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
accessWidener v2 named
2+
3+
# Access to pack from entry
4+
accessible class net/minecraft/client/gui/screens/packs/PackSelectionModel$EntryBase
5+
accessible field net/minecraft/client/gui/screens/packs/PackSelectionModel$EntryBase pack Lnet/minecraft/server/packs/repository/Pack;
6+
7+
# Access to file from pack
8+
accessible field net/minecraft/server/packs/repository/Pack resources Lnet/minecraft/server/packs/repository/Pack$ResourcesSupplier;
9+
accessible field net/minecraft/server/packs/FilePackResources$FileResourcesSupplier content Ljava/io/File;
10+
accessible method net/minecraft/client/gui/screens/packs/PackSelectionModel$EntryBase getSelfList ()Ljava/util/List;
11+
accessible method net/minecraft/client/gui/screens/packs/PackSelectionModel$EntryBase getOtherList ()Ljava/util/List;
12+
accessible field net/minecraft/client/gui/screens/packs/PackSelectionModel onListChanged Ljava/util/function/Consumer;
13+
14+
# Access message in GenericMessageScreen, used for world downloading screen
15+
accessible field net/minecraft/client/gui/screens/GenericMessageScreen textWidget Lnet/minecraft/client/gui/components/FocusableTextWidget;
16+
17+
# Access to rendering buffer
18+
accessible field net/minecraft/client/renderer/GameRenderer renderBuffers Lnet/minecraft/client/renderer/RenderBuffers;

‎stonecutter.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
id("dev.kikugie.stonecutter")
2020
alias(libs.plugins.arch.loom) apply false
2121
}
22-
stonecutter active "1.21.8-fabric" /* [SC] DO NOT EDIT */
22+
stonecutter active "1.21.9-fabric" /* [SC] DO NOT EDIT */
2323

2424
stonecutter tasks {
2525
val ordering = versionComparator.thenComparingInt {

0 commit comments

Comments
 (0)