AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 18:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

some education fixes

Browse Source
This commit is contained in:
Moritz Zwerger 2024-08-09 22:22:50 +02:00
parent 967900100d
commit 379043ee88
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/bixilon/minosoft/Minosoft.kt
View File

@ -46,7 +46,6 @@ import de.bixilon.minosoft.modding.event.master.GlobalEventMaster
import de.bixilon.minosoft.modding.loader.phase.DefaultModPhases import de.bixilon.minosoft.modding.loader.phase.DefaultModPhases
import de.bixilon.minosoft.properties.MinosoftProperties import de.bixilon.minosoft.properties.MinosoftProperties
import de.bixilon.minosoft.properties.MinosoftPropertiesLoader import de.bixilon.minosoft.properties.MinosoftPropertiesLoader
import de.bixilon.minosoft.terminal.AutoConnect
import de.bixilon.minosoft.terminal.CommandLineArguments import de.bixilon.minosoft.terminal.CommandLineArguments
import de.bixilon.minosoft.terminal.RunConfiguration import de.bixilon.minosoft.terminal.RunConfiguration
import de.bixilon.minosoft.updater.MinosoftUpdater import de.bixilon.minosoft.updater.MinosoftUpdater
@ -118,7 +117,7 @@ object Minosoft {
Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "Eros is disabled, no gui will show up! Use the cli to connect to servers!" } Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "Eros is disabled, no gui will show up! Use the cli to connect to servers!" }
} }
RunConfiguration.AUTO_CONNECT_TO?.let { AutoConnect.autoConnect(it) } // RunConfiguration.AUTO_CONNECT_TO?.let { AutoConnect.autoConnect(it) }
} }
private fun javafx(taskWorker: TaskWorker) { private fun javafx(taskWorker: TaskWorker) {

19
src/main/java/de/bixilon/minosoft/education/MinosoftEducation.kt
View File

@ -17,7 +17,11 @@ import de.bixilon.kutil.observer.DataObserver.Companion.observe
import de.bixilon.kutil.shutdown.AbstractShutdownReason import de.bixilon.kutil.shutdown.AbstractShutdownReason
import de.bixilon.kutil.shutdown.ShutdownManager import de.bixilon.kutil.shutdown.ShutdownManager
import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.Minosoft
import de.bixilon.minosoft.assets.minecraft.index.IndexAssetsType
import de.bixilon.minosoft.config.profile.profiles.account.AccountProfileManager import de.bixilon.minosoft.config.profile.profiles.account.AccountProfileManager
import de.bixilon.minosoft.config.profile.profiles.audio.AudioProfileManager
import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfileManager
import de.bixilon.minosoft.config.profile.profiles.resources.ResourcesProfileManager
import de.bixilon.minosoft.data.accounts.Account import de.bixilon.minosoft.data.accounts.Account
import de.bixilon.minosoft.data.accounts.types.offline.OfflineAccount import de.bixilon.minosoft.data.accounts.types.offline.OfflineAccount
import de.bixilon.minosoft.education.config.EducationC import de.bixilon.minosoft.education.config.EducationC
@ -72,12 +76,25 @@ object MinosoftEducation {
RunConfiguration.APPLICATION_NAME = "Minosoft Education" RunConfiguration.APPLICATION_NAME = "Minosoft Education"
RunConfiguration.IGNORE_YGGDRASIL = true RunConfiguration.IGNORE_YGGDRASIL = true
RunConfiguration.IGNORE_MODS = true RunConfiguration.IGNORE_MODS = true
RunConfiguration.PROFILES_HOT_RELOADING = false
RunConfiguration.PROFILES_SAVING = false
}
fun postSetup() {
AudioProfileManager.selected.enabled = false
AudioProfileManager.selected.skipLoading = true
RenderingProfileManager.selected.performance.fastBedrock = false
ResourcesProfileManager.selected.assets.indexAssetsTypes.clear()
ResourcesProfileManager.selected.assets.indexAssetsTypes += IndexAssetsType.OTHER
ResourcesProfileManager.selected.assets.indexAssetsTypes += IndexAssetsType.LANGUAGE
} }
@JvmStatic @JvmStatic
fun main(args: Array<String>) { fun main(args: Array<String>) {
setup() setup()
Minosoft.main(args) Minosoft.main(emptyArray())
postSetup()
// TODO: load education.json // TODO: load education.json

4
src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/PerformanceHUDElement.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2023 Moritz Zwerger * Copyright (C) 2020-2024 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -52,7 +52,7 @@ class PerformanceHUDElement(guiRenderer: GUIRenderer) : Element(guiRenderer), La
override fun poll(): Boolean { override fun poll(): Boolean {
val debugHUDElement = guiRenderer.hud[DebugHUDElement] val debugHUDElement = guiRenderer.hud[DebugHUDElement]
val hide = debugHUDElement?.enabled == true val hide = true
val fps = guiRenderer.context.renderStats.smoothAvgFPS.rounded10 val fps = guiRenderer.context.renderStats.smoothAvgFPS.rounded10
if (this.hide == hide && this.fps == fps) { if (this.hide == hide && this.fps == fps) {
return false return false

2
src/main/resources/assets/minosoft/education/blocks.json
View File

@ -36,7 +36,7 @@
"minecraft:cobblestone": { "minecraft:cobblestone": {
"id": 12, "id": 12,
"states": { "states": {
"15": {} "14": {}
} }
}, },
"minecraft:oak_planks": { "minecraft:oak_planks": {