Skip to content

Commit 8a8b879

Browse files
committed
1.21.9 release
1 parent baf5dcf commit 8a8b879

File tree

3 files changed

+42
-45
lines changed

3 files changed

+42
-45
lines changed

build.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ 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",
7473
default = mcPlatform.versionString
7574
)
7675
val compatibleMcVersion = VersionDefinition(
@@ -81,7 +80,7 @@ val compatibleMcVersion = VersionDefinition(
8180
"1.21.4-neoforge" to VersionRange("1.21.4", "1.21.4", name = "1.21.4"),
8281
"1.21.5" to VersionRange("1.21.5", "1.21.5", name = "1.21.5"),
8382
"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
83+
"1.21.9" to VersionRange("1.21.9", "1.21.9", name = "1.21.9", openEnd = true),
8584
)
8685
val javaVersion = VersionDefinition(
8786
"1.20.1" to "17",
@@ -100,7 +99,7 @@ val fabricApiVersion = VersionDefinition(
10099
"1.21.4" to "0.118.0+1.21.4",
101100
"1.21.5" to "0.119.4+1.21.5",
102101
"1.21.8" to "0.129.0+1.21.8",
103-
"1.21.9" to "0.133.10+1.21.9",
102+
"1.21.9" to "0.133.14+1.21.9",
104103
)
105104
val modMenuVersion = VersionDefinition(
106105
"1.20.1" to "7.2.2",
@@ -135,10 +134,9 @@ val kotlinForForgeVersion = VersionDefinition(
135134
"1.21.8" to "5.9.0",
136135
)
137136
val universalVersion = VersionDefinition(
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",
141-
default = "${mcPlatform.name}:421"
137+
"1.21.1" to "1.21-${mcPlatform.loaderString}:430",
138+
"1.21.8" to "1.21.7-${mcPlatform.loaderString}:430",
139+
default = "${mcPlatform.name}:430"
142140
)
143141

144142
dependencies {

changelog.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
## Resourcify 1.7.4
1+
## Resourcify 1.7.4 for 1.21.9
22

33
Please make sure to report any bugs and/or visual anomalies
44
on [Resourcify's GitHub](https://github.com/DeDiamondPro/Resourcify/issues) or in
55
the [Discord](https://discord.gg/XtAuqsJWby).
66

7-
- Added support for 1.21.8 NeoForge
8-
- Marked VulkanMod as incompatible, this incompatibility lies at how one of the libraries that Resourcify uses works,
9-
and unfortunately there is not much that can be done about it for now.
10-
- Updated some dependencies
7+
- Added support for 1.21.9
118

129
----------------------------------------------------------------------------------------------------
1310

src/main/kotlin/dev/dediamondpro/resourcify/gui/browsepage/BrowseScreen.kt

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -274,42 +274,44 @@ class BrowseScreen(
274274
if (adProvider.isAdAvailable()) adProvider.get().whenComplete { ad, _ ->
275275
if (ad == null) return@whenComplete
276276

277-
adBox.constrain {
278-
x = 0.pixels()
279-
y = 0.pixels()
280-
width = 100.percent()
281-
height = 29.pixels()
282-
}.onMouseClick {
283-
// Prevents opening the ad link accidentally right when the GUI is opened
284-
if (it.mouseButton != 0 || guiOpenedTime + 500 > UMinecraft.getTime()) return@onMouseClick
285-
UDesktop.browse(ad.getUrl().toURI())
286-
}
287-
headerBox.constrain {
288-
y = SiblingConstraint(padding = 4f)
289-
}
277+
Window.enqueueRenderOperation {
278+
adBox.constrain {
279+
x = 0.pixels()
280+
y = 0.pixels()
281+
width = 100.percent()
282+
height = 29.pixels()
283+
}.onMouseClick {
284+
// Prevents opening the ad link accidentally right when the GUI is opened
285+
if (it.mouseButton != 0 || guiOpenedTime + 500 > UMinecraft.getTime()) return@onMouseClick
286+
UDesktop.browse(ad.getUrl().toURI())
287+
}
288+
headerBox.constrain {
289+
y = SiblingConstraint(padding = 4f)
290+
}
290291

291-
val image = ad.getImageBase64()
292-
image?.let {
293-
UIImage.ofBase64(it).constrain {
294-
x = 4.pixels()
295-
y = 4.pixels()
296-
width = 21.pixels()
297-
height = 21.pixels()
292+
val image = ad.getImageBase64()
293+
image?.let {
294+
UIImage.ofBase64(it).constrain {
295+
x = 4.pixels()
296+
y = 4.pixels()
297+
width = 21.pixels()
298+
height = 21.pixels()
299+
} childOf adBox
300+
}
301+
UIWrappedText(ad.getText()).constrain {
302+
x = if (image != null) SiblingConstraint(padding = 4f) else 4.pixels()
303+
y = CenterConstraint()
304+
width = 100.percent() - 33.pixels()
305+
color = Colors.TEXT_PRIMARY.toConstraint()
306+
} childOf adBox
307+
McImage(Icons.ADVERTISEMENT_TEXT).constrain {
308+
x = 1.pixels(alignOpposite = true)
309+
y = 1.pixels(alignOpposite = true)
310+
width = 58.pixels()
311+
height = 5.pixels()
312+
color = Colors.TEXT_SECONDARY.toConstraint()
298313
} childOf adBox
299314
}
300-
UIWrappedText(ad.getText()).constrain {
301-
x = if (image != null) SiblingConstraint(padding = 4f) else 4.pixels()
302-
y = CenterConstraint()
303-
width = 100.percent() - 33.pixels()
304-
color = Colors.TEXT_PRIMARY.toConstraint()
305-
} childOf adBox
306-
McImage(Icons.ADVERTISEMENT_TEXT).constrain {
307-
x = 1.pixels(alignOpposite = true)
308-
y = 1.pixels(alignOpposite = true)
309-
width = 58.pixels()
310-
height = 5.pixels()
311-
color = Colors.TEXT_SECONDARY.toConstraint()
312-
} childOf adBox
313315
}
314316

315317
searchBox = (UITextInput(

0 commit comments

Comments
 (0)