move from Queffe to Qalcyo

build.gradle

@@ -17,7 +17,6 @@ minecraft {
     runDir = "run"
     mappings = "stable_22"
     makeObfSourceJar = false
-    clientJvmArgs += '-Dfml.coreMods.load=xyz.queffe.timerhud.tweaker.TimerHUDLoadingPlugin'
     clientRunArgs += '--tweakClass gg.essential.loader.stage0.EssentialSetupTweaker'
 }
 
@@ -46,7 +45,6 @@ dependencies {
 jar {
     manifest.attributes(
             'ModSide': 'CLIENT',
-            'FMLCorePlugin': 'xyz.queffe.timerhud.tweaker.TimerHUDLoadingPlugin',
             'FMLCorePluginContainsFMLMod': true,
             'ForceLoadAsMod': true,
             'TweakClass': 'gg.essential.loader.stage0.EssentialSetupTweaker',

src/main/kotlin/xyz/queffe/timerhud/TimerHUD.kt → src/main/kotlin/xyz/qalcyo/timerhud/TimerHUD.kt

@@ -1,4 +1,4 @@
-package xyz.queffe.timerhud
+package xyz.qalcyo.timerhud
 
 import gg.essential.universal.ChatColor
 import net.minecraft.client.Minecraft
@@ -10,10 +10,10 @@ import net.minecraftforge.fml.client.registry.ClientRegistry
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
-import xyz.queffe.timerhud.commands.TimerHUDCommand
-import xyz.queffe.timerhud.config.TimerConfig
-import xyz.queffe.timerhud.listener.Listener
-import xyz.queffe.timerhud.utils.Updater
+import xyz.qalcyo.timerhud.commands.TimerHUDCommand
+import xyz.qalcyo.timerhud.config.TimerConfig
+import xyz.qalcyo.timerhud.listener.Listener
+import xyz.qalcyo.timerhud.utils.Updater
 import org.lwjgl.input.Keyboard
 import java.io.File
 
@@ -39,7 +39,7 @@ object TimerHUD {
     }
 
     lateinit var jarFile: File
-    val modDir = File(File(File(mc.mcDataDir, "config"), "Queffe"), NAME)
+    val modDir = File(File(File(mc.mcDataDir, "config"), "Qalcyo"), NAME)
     var timerKeybind: KeyBinding = KeyBinding("Toggle Timer", Keyboard.KEY_NONE, "TimerHUD")
 
     @Mod.EventHandler
@@ -53,8 +53,8 @@ object TimerHUD {
         TimerConfig.initialize()
         TimerHUDCommand.register()
         Updater.update()
-        TimerTask.timer.start()
-        TimerTask.setTimer(false) //just to make sure
+        TimerTask.setTimer(true)
+        TimerTask.setTimer(false)
         ClientRegistry.registerKeyBinding(timerKeybind)
         EVENT_BUS.register(Listener)
     }

src/main/kotlin/xyz/queffe/timerhud/TimerTask.kt → src/main/kotlin/xyz/qalcyo/timerhud/TimerTask.kt

@@ -1,7 +1,7 @@
-package xyz.queffe.timerhud
+package xyz.qalcyo.timerhud
 
 import gg.essential.api.utils.Multithreading
-import xyz.queffe.timerhud.TimerHUD.mc
+import xyz.qalcyo.timerhud.TimerHUD.mc
 import java.awt.event.ActionListener
 import javax.swing.Timer
 
@@ -11,12 +11,13 @@ object TimerTask {
     var secondsPassed = 0
     var running = false
     private var timerTask = ActionListener { secondsPassed += 1 }
-    var timer = Timer(1000, timerTask)
+    private var timer = Timer(1000, timerTask)
 
     fun toggleTimer() {
         Multithreading.runAsync {
             if (!running) {
                 if (mc.theWorld == null) return@runAsync
+                secondsPassed = 0
                 timer.start()
                 running = true
             } else {
@@ -30,6 +31,7 @@ object TimerTask {
     fun setTimer(status: Boolean) {
         Multithreading.runAsync {
             if (status) {
+                secondsPassed = 0
                 timer.start()
                 running = true
             } else {

src/main/kotlin/xyz/queffe/timerhud/commands/TimerHUDCommand.kt → src/main/kotlin/xyz/qalcyo/timerhud/commands/TimerHUDCommand.kt

@@ -1,12 +1,12 @@
-package xyz.queffe.timerhud.commands
+package xyz.qalcyo.timerhud.commands
 
 import gg.essential.api.EssentialAPI
 import gg.essential.api.commands.Command
 import gg.essential.api.commands.DefaultHandler
 import gg.essential.api.commands.SubCommand
-import xyz.queffe.timerhud.TimerHUD
-import xyz.queffe.timerhud.config.TimerConfig
-import xyz.queffe.timerhud.gui.HUDGui
+import xyz.qalcyo.timerhud.TimerHUD
+import xyz.qalcyo.timerhud.config.TimerConfig
+import xyz.qalcyo.timerhud.gui.HUDGui
 
 @Suppress("unused")
 object TimerHUDCommand : Command(TimerHUD.ID, true) {

src/main/kotlin/xyz/queffe/timerhud/config/TimerConfig.kt → src/main/kotlin/xyz/qalcyo/timerhud/config/TimerConfig.kt

@@ -1,17 +1,17 @@
-package xyz.queffe.timerhud.config
+package xyz.qalcyo.timerhud.config
 
 import gg.essential.api.EssentialAPI
 import gg.essential.vigilance.Vigilant
 import gg.essential.vigilance.data.Category
 import gg.essential.vigilance.data.Property
 import gg.essential.vigilance.data.PropertyType
 import gg.essential.vigilance.data.SortingBehavior
-import xyz.queffe.timerhud.TimerHUD
-import xyz.queffe.timerhud.TimerHUD.NAME
-import xyz.queffe.timerhud.TimerHUD.mc
-import xyz.queffe.timerhud.gui.DownloadConfirmGui
-import xyz.queffe.timerhud.gui.HUDGui
-import xyz.queffe.timerhud.utils.Updater
+import xyz.qalcyo.timerhud.TimerHUD
+import xyz.qalcyo.timerhud.TimerHUD.NAME
+import xyz.qalcyo.timerhud.TimerHUD.mc
+import xyz.qalcyo.timerhud.gui.DownloadConfirmGui
+import xyz.qalcyo.timerhud.gui.HUDGui
+import xyz.qalcyo.timerhud.utils.Updater
 import java.awt.Color
 import java.io.File
 

src/main/kotlin/xyz/queffe/timerhud/gui/DownloadConfirmGui.kt → src/main/kotlin/xyz/qalcyo/timerhud/gui/DownloadConfirmGui.kt

@@ -1,4 +1,4 @@
-package xyz.queffe.timerhud.gui
+package xyz.qalcyo.timerhud.gui
 
 import gg.essential.api.EssentialAPI
 import gg.essential.api.utils.Multithreading
@@ -7,10 +7,10 @@ import net.minecraft.client.gui.GuiMainMenu
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.EnumChatFormatting
-import xyz.queffe.timerhud.TimerHUD
-import xyz.queffe.timerhud.utils.Updater
-import xyz.queffe.timerhud.utils.Updater.shouldUpdate
-import xyz.queffe.timerhud.utils.Updater.updateUrl
+import xyz.qalcyo.timerhud.TimerHUD
+import xyz.qalcyo.timerhud.utils.Updater
+import xyz.qalcyo.timerhud.utils.Updater.shouldUpdate
+import xyz.qalcyo.timerhud.utils.Updater.updateUrl
 import java.io.File
 import kotlin.math.max
 

src/main/kotlin/xyz/queffe/timerhud/gui/HUDGui.kt → src/main/kotlin/xyz/qalcyo/timerhud/gui/HUDGui.kt

@@ -1,11 +1,11 @@
-package xyz.queffe.timerhud.gui
+package xyz.qalcyo.timerhud.gui
 
 import gg.essential.api.EssentialAPI
 import net.minecraft.client.gui.GuiButton
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.renderer.GlStateManager
-import xyz.queffe.timerhud.config.TimerConfig
-import xyz.queffe.timerhud.hud.HUD
+import xyz.qalcyo.timerhud.config.TimerConfig
+import xyz.qalcyo.timerhud.hud.HUD
 import org.lwjgl.input.Keyboard
 import org.lwjgl.opengl.GL11
 import java.io.IOException

src/main/kotlin/xyz/queffe/timerhud/hud/HUD.kt → src/main/kotlin/xyz/qalcyo/timerhud/hud/HUD.kt

@@ -1,10 +1,10 @@
-package xyz.queffe.timerhud.hud
+package xyz.qalcyo.timerhud.hud
 
 import net.minecraft.client.gui.Gui
-import xyz.queffe.timerhud.TimerHUD.mc
-import xyz.queffe.timerhud.TimerTask
-import xyz.queffe.timerhud.config.TimerConfig
-import xyz.queffe.timerhud.utils.drawString
+import xyz.qalcyo.timerhud.TimerHUD.mc
+import xyz.qalcyo.timerhud.TimerTask
+import xyz.qalcyo.timerhud.config.TimerConfig
+import xyz.qalcyo.timerhud.utils.drawString
 import kotlin.math.max
 
 object HUD {

src/main/kotlin/xyz/queffe/timerhud/listener/Listener.kt → src/main/kotlin/xyz/qalcyo/timerhud/listener/Listener.kt

@@ -1,16 +1,16 @@
-package xyz.queffe.timerhud.listener
+package xyz.qalcyo.timerhud.listener
 
 import net.minecraft.client.gui.GuiChat
 import net.minecraftforge.client.event.RenderGameOverlayEvent
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.InputEvent
-import xyz.queffe.timerhud.TimerHUD.mc
-import xyz.queffe.timerhud.TimerHUD.timerKeybind
-import xyz.queffe.timerhud.TimerTask
-import xyz.queffe.timerhud.config.TimerConfig
-import xyz.queffe.timerhud.gui.HUDGui
-import xyz.queffe.timerhud.hud.HUD
+import xyz.qalcyo.timerhud.TimerHUD.mc
+import xyz.qalcyo.timerhud.TimerHUD.timerKeybind
+import xyz.qalcyo.timerhud.TimerTask
+import xyz.qalcyo.timerhud.config.TimerConfig
+import xyz.qalcyo.timerhud.gui.HUDGui
+import xyz.qalcyo.timerhud.hud.HUD
 import org.lwjgl.input.Keyboard
 import org.lwjgl.input.Mouse
 

src/main/kotlin/xyz/queffe/timerhud/utils/APIUtil.kt → src/main/kotlin/xyz/qalcyo/timerhud/utils/APIUtil.kt

@@ -1,8 +1,8 @@
-package xyz.queffe.timerhud.utils
+package xyz.qalcyo.timerhud.utils
 
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
-import xyz.queffe.timerhud.TimerHUD
+import xyz.qalcyo.timerhud.TimerHUD
 import org.apache.http.HttpRequest
 import org.apache.http.HttpResponse
 import org.apache.http.HttpVersion

src/main/kotlin/xyz/queffe/timerhud/utils/Updater.kt → src/main/kotlin/xyz/qalcyo/timerhud/utils/Updater.kt

@@ -1,4 +1,4 @@
-package xyz.queffe.timerhud.utils
+package xyz.qalcyo.timerhud.utils
 
 import gg.essential.api.EssentialAPI
 import kotlinx.coroutines.CoroutineName
@@ -7,10 +7,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.minecraft.util.Util
 import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion
-import xyz.queffe.timerhud.TimerHUD
-import xyz.queffe.timerhud.TimerHUD.mc
-import xyz.queffe.timerhud.config.TimerConfig
-import xyz.queffe.timerhud.gui.DownloadConfirmGui
+import xyz.qalcyo.timerhud.TimerHUD
+import xyz.qalcyo.timerhud.TimerHUD.mc
+import xyz.qalcyo.timerhud.config.TimerConfig
+import xyz.qalcyo.timerhud.gui.DownloadConfirmGui
 import org.apache.http.HttpResponse
 import org.apache.http.client.methods.HttpGet
 import java.awt.Desktop
@@ -31,7 +31,7 @@ object Updater {
     fun update() {
         CoroutineScope(Dispatchers.IO + CoroutineName("${TimerHUD.NAME}-UpdateChecker")).launch {
             val latestRelease =
-                APIUtil.getJSONResponse("https://api.github.com/repos/Queffe/${TimerHUD.ID}/releases/latest")
+                APIUtil.getJSONResponse("https://api.github.com/repos/Qalcyo/${TimerHUD.ID}/releases/latest")
             latestTag = latestRelease.get("tag_name").asString
 
             val currentVersion = DefaultArtifactVersion(TimerHUD.VERSION.substringBefore("-"))

src/main/kotlin/xyz/queffe/timerhud/utils/Utils.kt → src/main/kotlin/xyz/qalcyo/timerhud/utils/Utils.kt

@@ -1,4 +1,4 @@
-package xyz.queffe.timerhud.utils
+package xyz.qalcyo.timerhud.utils
 
 import net.minecraft.client.gui.FontRenderer
 import java.awt.Color