diff options
| author | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-08-27 15:34:22 -0400 |
|---|---|---|
| committer | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-08-27 15:34:22 -0400 |
| commit | f7a964d50a623049061eebefd9f3638647bbd313 (patch) | |
| tree | 686535a4561545302b08f69ba1de87a6bcd23733 /src/main/kotlin | |
| parent | 7e4c88401288bb90dad7c53cf5f23b50fa66b09d (diff) | |
| download | SkytilsMod-f7a964d50a623049061eebefd9f3638647bbd313.tar.gz SkytilsMod-f7a964d50a623049061eebefd9f3638647bbd313.tar.bz2 SkytilsMod-f7a964d50a623049061eebefd9f3638647bbd313.zip | |
bump kotlin
Diffstat (limited to 'src/main/kotlin')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/skytils/skytilsmod/core/Config.kt index c78768b3..a53b0b1b 100644 --- a/src/main/kotlin/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/skytils/skytilsmod/core/Config.kt @@ -2223,12 +2223,9 @@ object Config : Vigilant(File("./config/skytils/config.toml"), "Skytils", sortin val ver = UpdateChecker.SkytilsVersion(Skytils.config.lastLaunchedVersion) when { !ver.isSafe -> { - if (GuiManager.GUISCALES["Crystal Hollows Map"] == 0.1f) { - GuiManager.GUISCALES["Crystal Hollows Map"] = 1f - PersistentSave.markDirty<GuiManager>() - } + } - ver < UpdateChecker.SkytilsVersion("1.0.3") -> { + ver < UpdateChecker.SkytilsVersion("1.0.6") -> { if (largerHeadScale > 2) { largerHeadScale /= 100 } @@ -2241,6 +2238,10 @@ object Config : Vigilant(File("./config/skytils/config.toml"), "Skytils", sortin if (transparentHeadLayer > 1) { transparentHeadLayer /= 100f } + if (GuiManager.GUISCALES["Crystal Hollows Map"] == 0.1f) { + GuiManager.GUISCALES["Crystal Hollows Map"] = 1f + PersistentSave.markDirty<GuiManager>() + } } } } diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt index 26cef7e2..0bdb78ea 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt @@ -212,7 +212,7 @@ class DungeonTimer { if (bloodClearTime == -1L) System.currentTimeMillis() else bloodClearTime, bloodOpenTime ) - }" + }s" ) add("ยง9Boss Entry: ${if (bossEntryTime == -1L) dungeonTimeFormat(time) else dungeonTimeFormat((bossEntryTime - dungeonStartTime) / 1000.0)}") if (bossEntryTime != -1L) diff --git a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/TileEntitySkullRendererHook.kt b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/TileEntitySkullRendererHook.kt index 9ce13270..2ce96a65 100644 --- a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/TileEntitySkullRendererHook.kt +++ b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/TileEntitySkullRendererHook.kt @@ -24,7 +24,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer import net.minecraft.entity.EntityLivingBase import net.minecraft.util.EnumFacing import net.minecraft.util.ResourceLocation -import org.spongepowered.asm.mixin.* import org.spongepowered.asm.mixin.injection.callback.CallbackInfo import skytils.skytilsmod.Skytils.Companion.mc import skytils.skytilsmod.features.impl.handlers.GlintCustomizer |