Skip to content
This repository was archived by the owner on Dec 30, 2022. It is now read-only.

Commit 3abd7a8

Browse files
DeathsGunDeathsGun
committed
Update to 1.18
1 parent d4af048 commit 3abd7a8

File tree

8 files changed

+45
-31
lines changed

8 files changed

+45
-31
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//file:noinspection GroovyAssignabilityCheck
1818
//file:noinspection GroovyAccessibility
1919
plugins {
20-
id "fabric-loom" version "0.9-SNAPSHOT"
20+
id "fabric-loom" version "0.10-SNAPSHOT"
2121
id "com.modrinth.minotaur" version "1.2.1"
2222
id "org.jetbrains.kotlin.jvm" version "1.5.30"
2323
id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30"

‎gradle.properties

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
org.gradle.jvmargs=-Xms2G -Xmx4G
1717
# Fabric Properties
1818
# check this on https://modmuss50.me/fabric.html
19-
minecraft_version=1.17.1
20-
yarn_mappings=1.17.1+build.61
21-
loader_version=0.12.1
19+
minecraft_version=1.18-pre1
20+
yarn_mappings=1.18-pre1+build.6
21+
loader_version=0.12.5
2222
# Mod Properties
23-
mod_version=1.2.0-alpha+1.17
23+
mod_version=2.0.0+1.18
2424
maven_group=xyz.deathsgun
2525
archives_base_name=modmanager
2626
# Dependencies
27-
modmenu_version=2.0.5
27+
modmenu_version=3.0.0
2828
# Kotlin
29-
kotlin_version=1.5.30
3029
fabric_kotlin_version=1.6.4+kotlin.1.5.30

‎src/main/kotlin/xyz/deathsgun/modmanager/ModManager.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,17 @@ class ModManager : ClientModInitializer {
5151
@JvmStatic
5252
fun getVersion(): String {
5353
return FabricLoader.getInstance().allMods.find { it.metadata.id.equals("modmanager") }
54-
?.metadata?.version?.friendlyString ?: "1.1.0+1.17-alpha"
54+
?.metadata?.version?.friendlyString ?: "2.0.0+1.18"
5555
}
5656

5757
@JvmStatic
58-
fun getMinecraftVersion(): String {
59-
return MinecraftClient.getInstance()?.game?.version?.releaseTarget ?: "1.17"
58+
fun getMinecraftReleaseTarget(): String {
59+
return MinecraftClient.getInstance()?.game?.version?.releaseTarget ?: "1.18"
60+
}
61+
62+
@JvmStatic
63+
fun getMinecraftVersionId(): String {
64+
return MinecraftClient.getInstance()?.game?.version?.id ?: "1.18-pre1"
6065
}
6166
}
6267

‎src/main/kotlin/xyz/deathsgun/modmanager/api/gui/list/ListWidget.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,21 @@ abstract class ListWidget<E : ListWidget.Entry<E>>(
9292
val color = if (this.isFocused) 1.0f else 0.5f
9393
RenderSystem.setShader { GameRenderer.getPositionShader() }
9494
RenderSystem.setShaderColor(color, color, color, 1.0f)
95-
val matrix = matrices!!.peek().model
9695
buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION)
97-
buffer.vertex(matrix, entryLeft.toFloat(), (entryTop + entryHeight + 2).toFloat(), 0.0f).next()
98-
buffer.vertex(matrix, selectionRight.toFloat(), (entryTop + entryHeight + 2).toFloat(), 0.0f).next()
99-
buffer.vertex(matrix, selectionRight.toFloat(), (entryTop - 2).toFloat(), 0.0f).next()
100-
buffer.vertex(matrix, entryLeft.toFloat(), (entryTop - 2).toFloat(), 0.0f).next()
96+
buffer.vertex(entryLeft.toDouble(), (entryTop + entryHeight + 2).toDouble(), 0.0).next()
97+
buffer.vertex(selectionRight.toDouble(), (entryTop + entryHeight + 2).toDouble(), 0.0).next()
98+
buffer.vertex(selectionRight.toDouble(), (entryTop - 2).toDouble(), 0.0).next()
99+
buffer.vertex(entryLeft.toDouble(), (entryTop - 2).toDouble(), 0.0).next()
101100
tessellator.draw()
102101
RenderSystem.setShader { GameRenderer.getPositionShader() }
103102
RenderSystem.setShaderColor(0.0f, 0.0f, 0.0f, 1.0f)
104103
buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION)
105-
buffer.vertex(matrix, (entryLeft + 1).toFloat(), (entryTop + entryHeight + 1).toFloat(), 0.0f)
104+
buffer.vertex((entryLeft + 1).toDouble(), (entryTop + entryHeight + 1).toDouble(), 0.0)
106105
.next()
107-
buffer.vertex(matrix, (selectionRight - 1).toFloat(), (entryTop + entryHeight + 1).toFloat(), 0.0f)
106+
buffer.vertex((selectionRight - 1).toDouble(), (entryTop + entryHeight + 1).toDouble(), 0.0)
108107
.next()
109-
buffer.vertex(matrix, (selectionRight - 1).toFloat(), (entryTop - 1).toFloat(), 0.0f).next()
110-
buffer.vertex(matrix, (entryLeft + 1).toFloat(), (entryTop - 1).toFloat(), 0.0f).next()
108+
buffer.vertex((selectionRight - 1).toDouble(), (entryTop - 1).toDouble(), 0.0).next()
109+
buffer.vertex((entryLeft + 1).toDouble(), (entryTop - 1).toDouble(), 0.0).next()
111110
tessellator.draw()
112111
RenderSystem.enableTexture()
113112
}

‎src/main/kotlin/xyz/deathsgun/modmanager/providers/modrinth/Modrinth.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class Modrinth : IModProvider, IModUpdateProvider {
109109
page: Int,
110110
limit: Int
111111
): ModsResult {
112-
val builder = URIBuilder("${baseUri}/api/v1/mod")
112+
val builder = URIBuilder("${baseUri}/api/v2/search")
113113
builder.addParameter("query", query)
114114
builder.addParameter(
115115
"filters",
@@ -137,7 +137,11 @@ class Modrinth : IModProvider, IModUpdateProvider {
137137
private fun getMods(builder: URIBuilder, sorting: Sorting, page: Int, limit: Int): ModsResult {
138138
builder.addParameter(
139139
"version",
140-
String.format("versions=%s", ModManager.getMinecraftVersion())
140+
String.format(
141+
"versions=\"%s\" OR versions=\"%s\"",
142+
ModManager.getMinecraftReleaseTarget(),
143+
ModManager.getMinecraftVersionId()
144+
)
141145
)
142146
builder.addParameter("index", sorting.name.lowercase())
143147
builder.addParameter("offset", (page * limit).toString())

‎src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ class UpdateManager {
106106
if (result is VersionResult.Success) {
107107
val version = VersionFinder.findUpdate(
108108
metadata.version.friendlyString,
109-
ModManager.getMinecraftVersion(),
109+
ModManager.getMinecraftReleaseTarget(),
110+
ModManager.getMinecraftVersionId(),
110111
ModManager.modManager.config.updateChannel,
111112
result.versions
112113
)
@@ -159,7 +160,8 @@ class UpdateManager {
159160
}
160161
val version = VersionFinder.findUpdate(
161162
metadata.version.friendlyString,
162-
ModManager.getMinecraftVersion(),
163+
ModManager.getMinecraftReleaseTarget(),
164+
ModManager.getMinecraftVersionId(),
163165
ModManager.modManager.config.updateChannel,
164166
versions
165167
)
@@ -205,7 +207,8 @@ class UpdateManager {
205207
}
206208
val version = VersionFinder.findUpdate(
207209
metadata.version.friendlyString,
208-
ModManager.getMinecraftVersion(),
210+
ModManager.getMinecraftReleaseTarget(),
211+
ModManager.getMinecraftVersionId(),
209212
ModManager.modManager.config.updateChannel,
210213
versions
211214
)
@@ -243,7 +246,8 @@ class UpdateManager {
243246
}
244247
val version = VersionFinder.findUpdate(
245248
"0.0.0.0",
246-
ModManager.getMinecraftVersion(),
249+
ModManager.getMinecraftReleaseTarget(),
250+
ModManager.getMinecraftVersionId(),
247251
ModManager.modManager.config.updateChannel,
248252
versions
249253
)
@@ -269,7 +273,7 @@ class UpdateManager {
269273
}
270274
var asset = assets[0]
271275
if (assets.size > 1) {
272-
asset = assets.find { it.filename.contains(ModManager.getMinecraftVersion(), true) }
276+
asset = assets.find { it.filename.contains(ModManager.getMinecraftReleaseTarget(), true) }
273277
?: return ModUpdateResult.Error(TranslatableText("modmanager.error.update.noFabricJar"))
274278
}
275279
val jar = dir.resolve(asset.filename) // Download into same directory where the old jar was

‎src/main/kotlin/xyz/deathsgun/modmanager/update/VersionFinder.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ object VersionFinder {
2525

2626
fun findUpdateFallback(
2727
installedVersion: String,
28+
mcReleaseTarget: String,
2829
mcVersion: String,
2930
updateChannel: Config.UpdateChannel,
3031
modVersions: List<Version>
3132
): Version? {
3233
val versions =
3334
modVersions.filter { updateChannel.isReleaseAllowed(it.type) }
34-
.filter { it.gameVersions.any { it1 -> it1.startsWith(mcVersion) } }
35+
.filter { it.gameVersions.any { it1 -> it1.startsWith(mcVersion) || it1.startsWith(mcReleaseTarget) } }
3536
.sortedByDescending { it.releaseDate }
3637

3738
val version = versions.firstOrNull()
@@ -43,12 +44,13 @@ object VersionFinder {
4344

4445
internal fun findUpdateByVersion(
4546
installedVersion: String,
47+
mcReleaseTarget: String,
4648
mcVersion: String,
4749
channel: Config.UpdateChannel,
4850
modVersions: List<Version>
4951
): Version? {
5052
val versions = modVersions.filter { channel.isReleaseAllowed(it.type) }
51-
.filter { it.gameVersions.any { it1 -> it1.startsWith(mcVersion) } }
53+
.filter { it.gameVersions.any { it1 -> it1.startsWith(mcVersion) || it1.startsWith(mcReleaseTarget) } }
5254
var latestVersion: Version? = null
5355
var latestVer: SemanticVersion? = null
5456
val installedVer = SemanticVersion.parse(installedVersion)
@@ -72,14 +74,15 @@ object VersionFinder {
7274

7375
fun findUpdate(
7476
installedVersion: String,
77+
mcReleaseTarget: String,
7578
mcVersion: String,
7679
channel: Config.UpdateChannel,
7780
modVersions: List<Version>
7881
): Version? {
7982
return try {
80-
findUpdateByVersion(installedVersion, mcVersion, channel, modVersions)
83+
findUpdateByVersion(installedVersion, mcReleaseTarget, mcVersion, channel, modVersions)
8184
} catch (e: VersionParsingException) {
82-
findUpdateFallback(installedVersion, mcVersion, channel, modVersions)
85+
findUpdateFallback(installedVersion, mcReleaseTarget, mcVersion, channel, modVersions)
8386
}
8487
}
8588
}

‎src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"fabricloader": "~0.12",
4545
"modmenu": "~${modmenu_version}",
4646
"fabric-language-kotlin": ">=${fabric_kotlin_version}",
47-
"minecraft": "1.17.x",
47+
"minecraft": "1.18.x",
4848
"java": ">=16"
4949
}
5050
}

0 commit comments

Comments
 (0)