Skip to content

Commit 547ebed

Browse files
committed
Update elementa
1 parent 5d40b9a commit 547ebed

7 files changed

Lines changed: 5 additions & 167 deletions

File tree

build.gradle.kts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ dependencies {
205205
isTransitive = false
206206
}
207207
// Always shade elementa since we use a custom version, relocate to avoid conflicts
208-
shadeModImplementation("gg.essential:elementa:DIAMOND-13") {
208+
shadeModImplementation("gg.essential:elementa:DIAMOND-14") {
209209
isTransitive = false
210210
}
211211
// Since elementa is relocated, and MineMark doesn't guarantee backwards compatibility, we need to shade this
@@ -220,10 +220,7 @@ val accessWidener = when {
220220
mcPlatform.minor == 21 -> "1.21.resourcify"
221221
else -> "1.20.resourcify"
222222
}
223-
val mixinPath = when {
224-
mcPlatform.version >= 1_21_11 -> "mixins.resourcify-1.21.11.json"
225-
else -> "mixins.resourcify.json"
226-
}
223+
val mixinPath = "mixins.resourcify.json"
227224

228225
loom {
229226
accessWidenerPath = rootProject.file("src/main/resources/$accessWidener.accesswidener")
@@ -355,9 +352,6 @@ tasks {
355352
listOf("1.20.resourcify", "1.21.resourcify", "1.21.9.resourcify", "26.1.resourcify")
356353
.filter { it != accessWidener }
357354
.forEach { exclude("$it.accesswidener") }
358-
listOf("mixins.resourcify.json", "mixins.resourcify-1.21.11.json")
359-
.filter { it != mixinPath }
360-
.forEach { exclude(it) }
361355
}
362356
withType<Jar> {
363357
from(rootProject.file("LICENSE"))

changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ the [Discord](https://dediamondpro.dev/discord).
66

77
- Resourcify now contributes to Modrinth's analytics,
88
see [their article](https://modrinth.com/news/article/analytics-overhaul/) for more info.
9-
- Ported to 26.1.2 NeoForge
9+
- Ported to 1.21.11 and 26.1.2 NeoForge
10+
- Updated a lot of dependencies
1011

1112
----------------------------------------------------------------------------------------------------
1213

src/main/java/dev/dediamondpro/resourcify/mixins/MixinUIImage.java

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/main/java/dev/dediamondpro/resourcify/mixins/MixinURenderPass.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/main/java/dev/dediamondpro/resourcify/util/UFilterHandler.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/kotlin/dev/dediamondpro/resourcify/gui/PaginatedScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import kotlin.math.floor
3131

3232

3333
abstract class PaginatedScreen(private val adaptScale: Boolean = true, private val minimumWidth: Float = 500f) : WindowScreen(
34-
version = ElementaVersion.V10,
34+
version = ElementaVersion.V11,
3535
drawDefaultBackground = true
3636
) {
3737
private var defaultScale = -1

src/main/resources/mixins.resourcify-1.21.11.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)