diff options
Diffstat (limited to 'src/main/kotlin/dulkirmod/utils')
-rw-r--r-- | src/main/kotlin/dulkirmod/utils/ConfigData.kt | 6 | ||||
-rw-r--r-- | src/main/kotlin/dulkirmod/utils/ScoreBoardUtils.kt | 2 | ||||
-rw-r--r-- | src/main/kotlin/dulkirmod/utils/TitleUtils.kt | 6 | ||||
-rw-r--r-- | src/main/kotlin/dulkirmod/utils/Utils.kt | 12 | ||||
-rw-r--r-- | src/main/kotlin/dulkirmod/utils/WorldRenderUtils.kt | 9 |
5 files changed, 21 insertions, 14 deletions
diff --git a/src/main/kotlin/dulkirmod/utils/ConfigData.kt b/src/main/kotlin/dulkirmod/utils/ConfigData.kt index 213528b..b881248 100644 --- a/src/main/kotlin/dulkirmod/utils/ConfigData.kt +++ b/src/main/kotlin/dulkirmod/utils/ConfigData.kt @@ -1,10 +1,8 @@ package dulkirmod.utils -import com.sun.org.apache.xpath.internal.operations.Bool -import com.typesafe.config.ConfigOrigin import dulkirmod.config.Config -data class ConfigData ( +data class ConfigData( val size: Float = Config.customSize, val scaleSwing: Boolean = Config.doesScaleSwing, val x: Float = Config.customX, @@ -15,5 +13,5 @@ data class ConfigData ( val roll: Float = Config.customRoll, val speed: Float = Config.customSpeed, val ignoreHaste: Boolean = Config.ignoreHaste, - val drinkingFix: Int = Config.drinkingSelector + val drinkingFix: Int = Config.drinkingSelector, ) diff --git a/src/main/kotlin/dulkirmod/utils/ScoreBoardUtils.kt b/src/main/kotlin/dulkirmod/utils/ScoreBoardUtils.kt index 7b6c96d..520c143 100644 --- a/src/main/kotlin/dulkirmod/utils/ScoreBoardUtils.kt +++ b/src/main/kotlin/dulkirmod/utils/ScoreBoardUtils.kt @@ -5,7 +5,7 @@ import net.minecraft.scoreboard.Score import net.minecraft.scoreboard.ScorePlayerTeam object ScoreBoardUtils { - fun getLines() : MutableList<String> { + fun getLines(): MutableList<String> { val scoreboard = DulkirMod.mc.thePlayer.worldScoreboard val sidebarObjective = scoreboard.getObjectiveInDisplaySlot(1) val scores: List<Score> = ArrayList(scoreboard.getSortedScores(sidebarObjective)) diff --git a/src/main/kotlin/dulkirmod/utils/TitleUtils.kt b/src/main/kotlin/dulkirmod/utils/TitleUtils.kt index f289a8c..b7399c3 100644 --- a/src/main/kotlin/dulkirmod/utils/TitleUtils.kt +++ b/src/main/kotlin/dulkirmod/utils/TitleUtils.kt @@ -10,7 +10,7 @@ import kotlin.math.min class TitleUtils { var curString = "" - var endTime : Long = 0 + var endTime: Long = 0 @SubscribeEvent fun onRender(event: RenderGameOverlayEvent.Text) { @@ -21,13 +21,13 @@ class TitleUtils { var scale = ((screenWidth - 100) * Config.bestiaryNotifSize) / width scale = min(scale, 10.0) GlStateManager.pushMatrix() - GlStateManager.translate((screenWidth / 2 - width * scale / 2), screenHeight/2 - (4.5 * scale), 0.0) + GlStateManager.translate((screenWidth / 2 - width * scale / 2), screenHeight / 2 - (4.5 * scale), 0.0) GlStateManager.scale(scale, scale, scale) mc.fontRendererObj.drawString(curString, 0f, 0f, 0, Config.bestiaryTextShadow) GlStateManager.popMatrix() } - fun drawStringForTime(string : String, time : Int) { + fun drawStringForTime(string: String, time: Int) { this.curString = string this.endTime = time.toLong() + System.currentTimeMillis() } diff --git a/src/main/kotlin/dulkirmod/utils/Utils.kt b/src/main/kotlin/dulkirmod/utils/Utils.kt index 1a85d0a..731778f 100644 --- a/src/main/kotlin/dulkirmod/utils/Utils.kt +++ b/src/main/kotlin/dulkirmod/utils/Utils.kt @@ -44,7 +44,8 @@ object Utils { Config.customPitch = import.pitch Config.customRoll = import.roll Config.drinkingSelector = import.drinkingFix - Config.ignoreHaste = import.ignoreHaste } catch (e : Exception) { + Config.ignoreHaste = import.ignoreHaste + } catch (e: Exception) { mc.thePlayer.addChatMessage( ChatComponentText( EnumChatFormatting.GOLD.toString() + "" + EnumChatFormatting.BOLD + "Current clipboard is not a recognizable Custom Animation Preset." @@ -54,10 +55,11 @@ object Utils { mc.displayGuiScreen(null) } - fun isInSkyblock() : Boolean{ + fun isInSkyblock(): Boolean { if ((mc.theWorld != null) && (mc.thePlayer != null)) { if (mc.isSingleplayer || mc.thePlayer.clientBrand == null || - !mc.thePlayer.clientBrand.lowercase(Locale.getDefault()).contains("hypixel")) { + !mc.thePlayer.clientBrand.lowercase(Locale.getDefault()).contains("hypixel") + ) { return false } if (mc.thePlayer.worldScoreboard.getObjectiveInDisplaySlot(1) == null) @@ -67,7 +69,7 @@ object Utils { return false } - fun isInDungeons() : Boolean { + fun isInDungeons(): Boolean { val lines = ScoreBoardUtils.getLines() for (l in lines) { if (l.contains("Catac\uD83C\uDF6D§combs")) @@ -76,7 +78,7 @@ object Utils { return false } - fun getColorString(int : Int) : String { + fun getColorString(int: Int): String { return if (int == 16) "§z" else EnumChatFormatting.values()[int].toString() } }
\ No newline at end of file diff --git a/src/main/kotlin/dulkirmod/utils/WorldRenderUtils.kt b/src/main/kotlin/dulkirmod/utils/WorldRenderUtils.kt index b214555..d3c2761 100644 --- a/src/main/kotlin/dulkirmod/utils/WorldRenderUtils.kt +++ b/src/main/kotlin/dulkirmod/utils/WorldRenderUtils.kt @@ -13,7 +13,14 @@ import org.lwjgl.opengl.GL11 class WorldRenderUtils { companion object { - fun render(location: Vec3, text: String, depthTest: Boolean = true, scale: Float = 1f, shadow: Boolean = false, renderBlackBox: Boolean = true) { + fun render( + location: Vec3, + text: String, + depthTest: Boolean = true, + scale: Float = 1f, + shadow: Boolean = false, + renderBlackBox: Boolean = true, + ) { if (!depthTest) { GL11.glDisable(GL11.GL_DEPTH_TEST) GL11.glDepthMask(false) |