-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change-log SimplyStatus 1.7.3-beta.1
- Добавлена поддержка музыки из KelUtls - Немного переписана поддержка Music Player Fabric - Обновлены библиотеки - Была сделана поддержка YetAnotherConfigLib, в будущем возможно будет заменой Cloth Config [Мб сделаю выбор] - Изменена локализация статистики #6
- Loading branch information
Kel
committed
Aug 1, 2023
1 parent
f45524c
commit 8394f50
Showing
36 changed files
with
1,840 additions
and
835 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| # Done to increase the memory available to gradle. | ||
| org.gradle.jvmargs=-Xmx1G | ||
| org.gradle.jvmargs=-Xmx2G | ||
| # Fabric Properties | ||
| # check these on https://modmuss50.me/fabric.html | ||
| minecraft_version=1.20-rc1 | ||
| yarn_mappings=1.20-rc1+build.2 | ||
| minecraft_version=1.20.1 | ||
| yarn_mappings=1.20.1+build.10 | ||
| loader_version=0.14.21 | ||
|
|
||
| # Mod Properties | ||
| mod_version=1.7.2 | ||
| mod_version=1.7.3-beta.1 | ||
| maven_group=ru.simplykel | ||
| archives_base_name=simplystatus | ||
| # Dependencies | ||
| # check this on https://modmuss50.me/fabric.html | ||
|
|
||
| #Fabric api | ||
| fabric_version=0.83.0+1.20 | ||
| fabric_version=0.86.1+1.20.1 | ||
| # Mods | ||
| modmenu_version=7.0.0-beta.2 | ||
| cloth_config=11.0.98 | ||
| modmenu_version=7.2.1 | ||
| cloth_config=11.1.106 | ||
| musicplayer=1.19.4:2.6.0.206 | ||
| replaymod=1.19.4-2.6.12 | ||
| plasmovoice=fabric-1.19.4-2.0.3 | ||
| svc=fabric-1.20-pre6-2.4.8 | ||
| replaymod=1.20.1-2.6.13 | ||
| plasmovoice=fabric-1.20.1-2.0.6 | ||
| svc=fabric-1.20.1-2.4.16 | ||
| fastload=3.4.0 | ||
| # Not Minecraft Libs | ||
| JSON=20230227 | ||
| JSON=20230618 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 76 additions & 76 deletions
152
...simplystatus/config/gui/ConfigScreen.java → ...status/config/gui/cloth/ConfigScreen.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,76 @@ | ||
| package ru.simplykel.simplystatus.config.gui; | ||
|
|
||
| import me.shedaniel.clothconfig2.api.ConfigBuilder; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.gui.screen.Screen; | ||
| import ru.simplykel.simplystatus.Client; | ||
| import ru.simplykel.simplystatus.Main; | ||
| import ru.simplykel.simplystatus.config.Localization; | ||
| import ru.simplykel.simplystatus.config.ModConfig; | ||
| import ru.simplykel.simplystatus.config.ServerConfig; | ||
| import ru.simplykel.simplystatus.config.UserConfig; | ||
| import ru.simplykel.simplystatus.config.gui.category.*; | ||
|
|
||
| public class ConfigScreen { | ||
| public static Screen buildScreen (Screen currentScreen) { | ||
| MinecraftClient CLIENT = MinecraftClient.getInstance(); | ||
| ConfigBuilder builder = ConfigBuilder.create() | ||
| .setParentScreen(currentScreen) | ||
| .setTitle(Localization.getText("simplystatus.name")) | ||
| .setTransparentBackground(true) | ||
| .setSavingRunnable(ConfigScreen::save); | ||
| new MainConfigs().getCategory(builder); | ||
| new LocalizationsConfig().getCategory(builder); | ||
| if(UserConfig.USE_CUSTOM_ASSETS || UserConfig.USE_CUSTOM_APP_ID) new AssetsConfigs().getCategory(builder); | ||
| new AddonsConfigs().getCategory(builder); | ||
| if(!CLIENT.isInSingleplayer() && CLIENT.getCurrentServerEntry() != null) { | ||
| new ServerConfigs().getCategory(builder); | ||
| } | ||
| if(Main.replayMod && UserConfig.VIEW_REPLAY_MOD){ | ||
| new ReplayModConfigs().getCategory(builder); | ||
| } | ||
| if(Main.isVoiceModsEnable && UserConfig.VIEW_VOICE_SPEAK){ | ||
| new VoiceConfigs().getCategory(builder); | ||
| } | ||
| if(Main.musicPlayer && UserConfig.VIEW_MUSIC_LISTENER){ | ||
| new MusicPlayerConfigs().getCategory(builder); | ||
| } | ||
| if(Main.isBetaBuild || Main.isDevBuild){ | ||
| new DevConfigs().getCategory(builder); | ||
| } | ||
| return builder.build(); | ||
| } | ||
| private static void save(){ | ||
| MinecraftClient CLIENT = MinecraftClient.getInstance(); | ||
| Client.LOG.info(Main.prefixLog+"Save user configs..."); | ||
| Client.ASSETS.saveUserAssets(); | ||
| if(UserConfig.USE_CUSTOM_APP_ID && !Main.customID.equals(UserConfig.CUSTOM_APP_ID)){ | ||
| Main.useCustomID = true; | ||
| String APPLICATION_ID = UserConfig.CUSTOM_APP_ID; | ||
| if(APPLICATION_ID.isBlank()){ | ||
| APPLICATION_ID = ModConfig.baseID; | ||
| UserConfig.CUSTOM_APP_ID = APPLICATION_ID; | ||
| } | ||
| if(!Main.customID.equals(APPLICATION_ID)) { | ||
| Main.customID = APPLICATION_ID; | ||
| Client.LIB.Discord_Shutdown(); | ||
| Client.LIB.Discord_Initialize(APPLICATION_ID, Client.HANDLERS, Client.AUTO_REGISTER, Client.STEAM_ID); | ||
| } | ||
| } else if((Main.useAnotherID != UserConfig.USE_ANOTHER_ID) || (Main.useCustomID != UserConfig.USE_CUSTOM_APP_ID)){ | ||
| Main.useAnotherID = UserConfig.USE_ANOTHER_ID; | ||
| Main.useCustomID = UserConfig.USE_CUSTOM_APP_ID; | ||
| Main.customID = ""; | ||
| String APPLICATION_ID = ""; | ||
| if(UserConfig.USE_ANOTHER_ID) APPLICATION_ID = ModConfig.mineID; | ||
| else APPLICATION_ID = ModConfig.baseID; | ||
|
|
||
| Client.LIB.Discord_Shutdown(); | ||
| Client.LIB.Discord_Initialize(APPLICATION_ID, Client.HANDLERS, Client.AUTO_REGISTER, Client.STEAM_ID); | ||
| } | ||
| UserConfig.save(); | ||
| if(!CLIENT.isInSingleplayer() && CLIENT.getCurrentServerEntry() != null){ | ||
| Client.LOG.info(Main.prefixLog+"Save server configs..."); | ||
| ServerConfig.save(); | ||
| } | ||
| } | ||
| } | ||
| package ru.simplykel.simplystatus.config.gui.cloth; | ||
|
|
||
| import me.shedaniel.clothconfig2.api.ConfigBuilder; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.gui.screen.Screen; | ||
| import ru.simplykel.simplystatus.Client; | ||
| import ru.simplykel.simplystatus.Main; | ||
| import ru.simplykel.simplystatus.config.Localization; | ||
| import ru.simplykel.simplystatus.config.ModConfig; | ||
| import ru.simplykel.simplystatus.config.ServerConfig; | ||
| import ru.simplykel.simplystatus.config.UserConfig; | ||
| import ru.simplykel.simplystatus.config.gui.cloth.category.*; | ||
|
|
||
| public class ConfigScreen { | ||
| public static Screen buildScreen (Screen currentScreen) { | ||
| MinecraftClient CLIENT = MinecraftClient.getInstance(); | ||
| ConfigBuilder builder = ConfigBuilder.create() | ||
| .setParentScreen(currentScreen) | ||
| .setTitle(Localization.getText("simplystatus.name")) | ||
| .setTransparentBackground(true) | ||
| .setSavingRunnable(ConfigScreen::save); | ||
| new MainConfigs().getCategory(builder); | ||
| new LocalizationsConfig().getCategory(builder); | ||
| if(UserConfig.USE_CUSTOM_ASSETS || UserConfig.USE_CUSTOM_APP_ID) new AssetsConfigs().getCategory(builder); | ||
| new AddonsConfigs().getCategory(builder); | ||
| if(!CLIENT.isInSingleplayer() && CLIENT.getCurrentServerEntry() != null) { | ||
| new ServerConfigs().getCategory(builder); | ||
| } | ||
| if(Main.replayMod && UserConfig.VIEW_REPLAY_MOD){ | ||
| new ReplayModConfigs().getCategory(builder); | ||
| } | ||
| if(Main.isVoiceModsEnable && UserConfig.VIEW_VOICE_SPEAK){ | ||
| new VoiceConfigs().getCategory(builder); | ||
| } | ||
| if((Main.musicPlayer || Main.kelUtils) && UserConfig.VIEW_MUSIC_LISTENER){ | ||
| new MusicPlayerConfigs().getCategory(builder); | ||
| } | ||
| if(Main.isBetaBuild || Main.isDevBuild){ | ||
| new DevConfigs().getCategory(builder); | ||
| } | ||
| return builder.build(); | ||
| } | ||
| private static void save(){ | ||
| MinecraftClient CLIENT = MinecraftClient.getInstance(); | ||
| Client.LOG.info(Main.prefixLog+"Save user configs..."); | ||
| Client.ASSETS.saveUserAssets(); | ||
| if(UserConfig.USE_CUSTOM_APP_ID && !Main.customID.equals(UserConfig.CUSTOM_APP_ID)){ | ||
| Main.useCustomID = true; | ||
| String APPLICATION_ID = UserConfig.CUSTOM_APP_ID; | ||
| if(APPLICATION_ID.isBlank()){ | ||
| APPLICATION_ID = ModConfig.baseID; | ||
| UserConfig.CUSTOM_APP_ID = APPLICATION_ID; | ||
| } | ||
| if(!Main.customID.equals(APPLICATION_ID)) { | ||
| Main.customID = APPLICATION_ID; | ||
| Client.LIB.Discord_Shutdown(); | ||
| Client.LIB.Discord_Initialize(APPLICATION_ID, Client.HANDLERS, Client.AUTO_REGISTER, Client.STEAM_ID); | ||
| } | ||
| } else if((Main.useAnotherID != UserConfig.USE_ANOTHER_ID) || (Main.useCustomID != UserConfig.USE_CUSTOM_APP_ID)){ | ||
| Main.useAnotherID = UserConfig.USE_ANOTHER_ID; | ||
| Main.useCustomID = UserConfig.USE_CUSTOM_APP_ID; | ||
| Main.customID = ""; | ||
| String APPLICATION_ID = ""; | ||
| if(UserConfig.USE_ANOTHER_ID) APPLICATION_ID = ModConfig.mineID; | ||
| else APPLICATION_ID = ModConfig.baseID; | ||
|
|
||
| Client.LIB.Discord_Shutdown(); | ||
| Client.LIB.Discord_Initialize(APPLICATION_ID, Client.HANDLERS, Client.AUTO_REGISTER, Client.STEAM_ID); | ||
| } | ||
| UserConfig.save(); | ||
| if(!CLIENT.isInSingleplayer() && CLIENT.getCurrentServerEntry() != null){ | ||
| Client.LOG.info(Main.prefixLog+"Save server configs..."); | ||
| ServerConfig.save(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.