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

Commit 4b0497a

Browse files
DeathsGunDeathsGun
committed
Change ModState.kt to State.kt
Signed-off-by: deathsgun <deathsgun@protonmail.com>
1 parent 7858278 commit 4b0497a

File tree

8 files changed

+42
-69
lines changed

8 files changed

+42
-69
lines changed

‎src/main/java/xyz/deathsgun/modmanager/mixin/ModsScreenMixin.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ protected ModsScreenMixin(Text title) {
6464
public void onInit(CallbackInfo ci) {
6565
int searchBoxWidth = this.paneWidth - 32 - 22;
6666
this.addDrawableChild(new ModMenuTexturedButtonWidget(this.paneWidth / 2 + searchBoxWidth / 2 + 14,
67-
22, 20, 20, 0, 0, MODMANAGER_BUTTON_LOCATION, 32, 64, button -> {
68-
MinecraftClient.getInstance().setScreen(new ModsOverviewScreen(this));
69-
}, LiteralText.EMPTY, (button, matrices, mouseX, mouseY) -> {
70-
if (!button.isHovered()) {
71-
return;
72-
}
73-
this.renderTooltip(matrices, new TranslatableText("modmanager.button.open"), mouseX, mouseY);
74-
}));
67+
22, 20, 20, 0, 0, MODMANAGER_BUTTON_LOCATION, 32, 64,
68+
button -> MinecraftClient.getInstance().setScreen(new ModsOverviewScreen(this)), LiteralText.EMPTY,
69+
(button, matrices, mouseX, mouseY) -> {
70+
if (!button.isHovered()) {
71+
return;
72+
}
73+
this.renderTooltip(matrices, new TranslatableText("modmanager.button.open"), mouseX, mouseY);
74+
}));
7575
this.hideButton = this.addDrawableChild(new TexturedButton(width - 24 - 22, paneY, 20, 20, 0,
7676
0, MODMANAGER_HIDE_BUTTON, 32, 64, button -> {
7777
if (ModManager.modManager.config.getHidden().contains(selected.getMod().getId())) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import kotlinx.coroutines.launch
2222
import net.fabricmc.api.ClientModInitializer
2323
import net.fabricmc.loader.api.FabricLoader
2424
import net.minecraft.client.MinecraftClient
25+
import xyz.deathsgun.modmanager.api.mod.State
2526
import xyz.deathsgun.modmanager.api.provider.IModProvider
2627
import xyz.deathsgun.modmanager.api.provider.IModUpdateProvider
2728
import xyz.deathsgun.modmanager.config.Config
2829
import xyz.deathsgun.modmanager.icon.IconCache
2930
import xyz.deathsgun.modmanager.providers.modrinth.Modrinth
30-
import xyz.deathsgun.modmanager.state.ModState
3131
import xyz.deathsgun.modmanager.state.SavedState
3232
import xyz.deathsgun.modmanager.update.UpdateManager
3333

@@ -73,13 +73,13 @@ class ModManager : ClientModInitializer {
7373
}
7474
}
7575

76-
fun setModState(fabricId: String, modId: String, state: ModState) {
76+
fun setModState(fabricId: String, modId: String, state: State) {
7777
this.states.removeAll { it.modId == modId || it.fabricId == fabricId }
7878
this.states.add(SavedState(fabricId, modId, state))
7979
}
8080

81-
fun getModState(id: String): ModState {
82-
return this.states.find { it.modId == id || it.fabricId == id }?.state ?: ModState.DOWNLOADABLE
81+
fun getModState(id: String): State {
82+
return this.states.find { it.modId == id || it.fabricId == id }?.state ?: State.DOWNLOADABLE
8383
}
8484

8585
fun getSelectedProvider(): IModProvider? {

‎src/main/kotlin/xyz/deathsgun/modmanager/api/mod/State.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,9 @@ enum class State {
3030
*/
3131
OUTDATED,
3232

33-
/**
34-
* Returns this if the mod has been found but been removed by ModManager
35-
*/
36-
REMOVED,
37-
3833
/**
3934
* Returns this if the mod was not found
4035
*/
41-
DOWNLOADABLE,
42-
CHECKING
36+
DOWNLOADABLE
4337

4438
}

‎src/main/kotlin/xyz/deathsgun/modmanager/gui/ModDetailScreen.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import xyz.deathsgun.modmanager.api.ModRemoveResult
2828
import xyz.deathsgun.modmanager.api.gui.list.IListScreen
2929
import xyz.deathsgun.modmanager.api.http.ModResult
3030
import xyz.deathsgun.modmanager.api.mod.Mod
31+
import xyz.deathsgun.modmanager.api.mod.State
3132
import xyz.deathsgun.modmanager.gui.widget.DescriptionWidget
32-
import xyz.deathsgun.modmanager.state.ModState
3333

3434

3535
class ModDetailScreen(private val previousScreen: Screen, var mod: Mod) : Screen(LiteralText(mod.name)), IListScreen {
@@ -82,7 +82,7 @@ class ModDetailScreen(private val previousScreen: Screen, var mod: Mod) : Screen
8282
TranslatableText("modmanager.button.install")
8383
) {
8484
when (ModManager.modManager.getModState(mod.id)) {
85-
ModState.DOWNLOADABLE -> {
85+
State.DOWNLOADABLE -> {
8686
client!!.setScreen(
8787
ModProgressScreen(
8888
mod,
@@ -92,7 +92,7 @@ class ModDetailScreen(private val previousScreen: Screen, var mod: Mod) : Screen
9292
)
9393
)
9494
}
95-
ModState.OUTDATED -> {
95+
State.OUTDATED -> {
9696
client!!.setScreen(
9797
ModProgressScreen(
9898
mod,
@@ -102,7 +102,7 @@ class ModDetailScreen(private val previousScreen: Screen, var mod: Mod) : Screen
102102
)
103103
)
104104
}
105-
ModState.INSTALLED -> {
105+
State.INSTALLED -> {
106106
removeMod()
107107
}
108108
}
@@ -118,9 +118,9 @@ class ModDetailScreen(private val previousScreen: Screen, var mod: Mod) : Screen
118118

119119
override fun tick() {
120120
actionButton.message = when (ModManager.modManager.getModState(mod.id)) {
121-
ModState.INSTALLED -> TranslatableText("modmanager.button.remove")
122-
ModState.DOWNLOADABLE -> TranslatableText("modmanager.button.install")
123-
ModState.OUTDATED -> TranslatableText("modmanager.button.update")
121+
State.INSTALLED -> TranslatableText("modmanager.button.remove")
122+
State.DOWNLOADABLE -> TranslatableText("modmanager.button.install")
123+
State.OUTDATED -> TranslatableText("modmanager.button.update")
124124
}
125125
}
126126

‎src/main/kotlin/xyz/deathsgun/modmanager/gui/widget/ModListEntry.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import net.minecraft.util.Language
2626
import xyz.deathsgun.modmanager.ModManager
2727
import xyz.deathsgun.modmanager.api.gui.list.ListWidget
2828
import xyz.deathsgun.modmanager.api.mod.Mod
29-
import xyz.deathsgun.modmanager.state.ModState
29+
import xyz.deathsgun.modmanager.api.mod.State
3030

3131

3232
class ModListEntry(private val client: MinecraftClient, override val list: ModListWidget, val mod: Mod) :
@@ -51,12 +51,12 @@ class ModListEntry(private val client: MinecraftClient, override val list: ModLi
5151
var primaryColor = 0xFFFFFF
5252
var secondaryColor = 0xFFFFFF
5353
var badgeText: OrderedText? = null
54-
if (state == ModState.INSTALLED) {
54+
if (state == State.INSTALLED) {
5555
primaryColor = 0xff0e2a55.toInt()
5656
secondaryColor = 0xff2b4b7c.toInt()
5757
badgeText = TranslatableText("modmanager.badge.installed").asOrderedText()
5858
maxNameWidth -= font.getWidth(badgeText) + 6
59-
} else if (state == ModState.OUTDATED) {
59+
} else if (state == State.OUTDATED) {
6060
primaryColor = 0xff530C17.toInt()
6161
secondaryColor = 0xff841426.toInt()
6262
badgeText = TranslatableText("modmanager.badge.outdated").asOrderedText()

‎src/main/kotlin/xyz/deathsgun/modmanager/state/ModState.kt

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

‎src/main/kotlin/xyz/deathsgun/modmanager/state/SavedState.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
package xyz.deathsgun.modmanager.state
1818

19+
import xyz.deathsgun.modmanager.api.mod.State
20+
1921
data class SavedState(
2022
val fabricId: String,
2123
val modId: String,
22-
val state: ModState
24+
val state: State
2325
)

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import xyz.deathsgun.modmanager.api.http.ModResult
3636
import xyz.deathsgun.modmanager.api.http.ModsResult
3737
import xyz.deathsgun.modmanager.api.http.VersionResult
3838
import xyz.deathsgun.modmanager.api.mod.Mod
39+
import xyz.deathsgun.modmanager.api.mod.State
3940
import xyz.deathsgun.modmanager.api.mod.Version
4041
import xyz.deathsgun.modmanager.api.provider.IModUpdateProvider
4142
import xyz.deathsgun.modmanager.api.provider.Sorting
4243
import xyz.deathsgun.modmanager.models.FabricMetadata
43-
import xyz.deathsgun.modmanager.state.ModState
4444
import java.io.File
4545
import java.math.BigInteger
4646
import java.net.URI
@@ -90,7 +90,7 @@ class UpdateManager {
9090
}
9191

9292
private fun checkForUpdatesManually(metadata: ModMetadata) {
93-
ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
93+
ModManager.modManager.setModState(metadata.id, metadata.id, State.INSTALLED)
9494
val defaultProvider = ModManager.modManager.config.defaultProvider
9595
val provider = ModManager.modManager.provider[defaultProvider]
9696
if (provider == null) {
@@ -112,11 +112,11 @@ class UpdateManager {
112112
)
113113
if (version == null) {
114114
logger.info("No update for {} found!", metadata.id)
115-
ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
115+
ModManager.modManager.setModState(metadata.id, metadata.id, State.INSTALLED)
116116
return
117117
}
118118
logger.info("Update for {} found [{} -> {}]", metadata.id, metadata.version.friendlyString, version.version)
119-
ModManager.modManager.setModState(metadata.id, metadata.id, ModState.OUTDATED)
119+
ModManager.modManager.setModState(metadata.id, metadata.id, State.OUTDATED)
120120
when (val modResult = provider.getMod(metadata.id)) {
121121
is ModResult.Success -> {
122122
this.updates.add(Update(modResult.mod, metadata.id, metadata.version.friendlyString, version))
@@ -133,7 +133,7 @@ class UpdateManager {
133133
queryResult.text.key,
134134
queryResult.cause
135135
)
136-
ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
136+
ModManager.modManager.setModState(metadata.id, metadata.id, State.INSTALLED)
137137
return
138138
}
139139
val mod =
@@ -145,14 +145,14 @@ class UpdateManager {
145145
}
146146
if (mod == null) {
147147
logger.warn("Error while searching for fallback id for mod {}: No possible match found", metadata.id)
148-
ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
148+
ModManager.modManager.setModState(metadata.id, metadata.id, State.INSTALLED)
149149
return
150150
}
151151
result = updateProvider.getVersionsForMod(mod.id)
152152
val versions = when (result) {
153153
is VersionResult.Error -> {
154154
logger.error("Error while getting versions for mod {}", metadata.id, result.cause)
155-
ModManager.modManager.setModState(metadata.id, mod.id, ModState.INSTALLED)
155+
ModManager.modManager.setModState(metadata.id, mod.id, State.INSTALLED)
156156
return
157157
}
158158
is VersionResult.Success -> result.versions
@@ -165,11 +165,11 @@ class UpdateManager {
165165
)
166166
if (version == null) {
167167
logger.info("No update for {} found!", metadata.id)
168-
ModManager.modManager.setModState(metadata.id, mod.id, ModState.INSTALLED)
168+
ModManager.modManager.setModState(metadata.id, mod.id, State.INSTALLED)
169169
return
170170
}
171171
logger.info("Update for {} found [{} -> {}]", metadata.id, metadata.version.friendlyString, version.version)
172-
ModManager.modManager.setModState(metadata.id, mod.id, ModState.OUTDATED)
172+
ModManager.modManager.setModState(metadata.id, mod.id, State.OUTDATED)
173173
when (val modResult = provider.getMod(mod.id)) {
174174
is ModResult.Success -> {
175175
this.updates.add(Update(modResult.mod, metadata.id, metadata.version.friendlyString, version))
@@ -178,7 +178,7 @@ class UpdateManager {
178178
}
179179

180180
private fun checkForUpdates(metadata: ModMetadata, ids: Map<String, String>) {
181-
ModManager.modManager.setModState(metadata.id, metadata.id, ModState.INSTALLED)
181+
ModManager.modManager.setModState(metadata.id, metadata.id, State.INSTALLED)
182182
var provider: IModUpdateProvider? = null
183183
var id: String? = null
184184
for ((provId, modId) in ids) {
@@ -192,13 +192,13 @@ class UpdateManager {
192192
}
193193
if (provider == null || id == null) {
194194
logger.warn("No valid provider for {} found! Skipping", metadata.id)
195-
ModManager.modManager.setModState(metadata.id, id ?: metadata.id, ModState.INSTALLED)
195+
ModManager.modManager.setModState(metadata.id, id ?: metadata.id, State.INSTALLED)
196196
return
197197
}
198198
val versions = when (val result = provider.getVersionsForMod(id)) {
199199
is VersionResult.Error -> {
200200
logger.error("Error while getting versions for mod {}", metadata.id, result.cause)
201-
ModManager.modManager.setModState(metadata.id, id, ModState.INSTALLED)
201+
ModManager.modManager.setModState(metadata.id, id, State.INSTALLED)
202202
return
203203
}
204204
is VersionResult.Success -> result.versions
@@ -211,11 +211,11 @@ class UpdateManager {
211211
)
212212
if (version == null) {
213213
logger.info("No update for {} found!", metadata.id)
214-
ModManager.modManager.setModState(metadata.id, id, ModState.INSTALLED)
214+
ModManager.modManager.setModState(metadata.id, id, State.INSTALLED)
215215
return
216216
}
217217
logger.info("Update for {} found [{} -> {}]", metadata.id, metadata.version.friendlyString, version.version)
218-
ModManager.modManager.setModState(metadata.id, id, ModState.OUTDATED)
218+
ModManager.modManager.setModState(metadata.id, id, State.OUTDATED)
219219
when (val modResult = ModManager.modManager.provider[provider.getName()]?.getMod(id)) {
220220
is ModResult.Success -> {
221221
this.updates.add(Update(modResult.mod, metadata.id, metadata.version.friendlyString, version))
@@ -292,7 +292,7 @@ class UpdateManager {
292292
)
293293
)
294294
}
295-
ModManager.modManager.setModState(fabricId, mod.id, ModState.INSTALLED)
295+
ModManager.modManager.setModState(fabricId, mod.id, State.INSTALLED)
296296
this.updates.removeIf { it.fabricId == mod.slug || it.mod.id == mod.id }
297297
ModManager.modManager.changed = true
298298
ModUpdateResult.Success
@@ -433,7 +433,7 @@ class UpdateManager {
433433
?: return ModRemoveResult.Error(TranslatableText("modmanager.error.jar.notFound"))
434434
return try {
435435
jar.delete()
436-
ModManager.modManager.setModState(mod.slug, mod.id, ModState.DOWNLOADABLE)
436+
ModManager.modManager.setModState(mod.slug, mod.id, State.DOWNLOADABLE)
437437
ModRemoveResult.Success
438438
} catch (e: Exception) {
439439
return ModRemoveResult.Error(TranslatableText("modmanager.error.jar.failedDelete", e))

0 commit comments

Comments
 (0)