From 540d90426b64b498cc094987b4cd73a9631584f0 Mon Sep 17 00:00:00 2001 From: Wyvest <45589059+Wyvest@users.noreply.github.com> Date: Sun, 12 Sep 2021 14:02:17 -0400 Subject: [PATCH] move from Queffe to Qalcyo --- .github/workflows/gradle.yml | 0 .gitignore | 0 README.md | 0 build.gradle | 2 - gradle.properties | 0 gradle/wrapper/gradle-wrapper.jar | Bin gradle/wrapper/gradle-wrapper.properties | 0 gradlew | 0 gradlew.bat | 0 settings.gradle | 0 .../tweaker/TimerHUDLoadingPlugin.java | 114 ------------------ .../{queffe => qalcyo}/timerhud/TimerHUD.kt | 16 +-- .../{queffe => qalcyo}/timerhud/TimerTask.kt | 8 +- .../timerhud/commands/TimerHUDCommand.kt | 8 +- .../timerhud/config/TimerConfig.kt | 14 +-- .../timerhud/gui/DownloadConfirmGui.kt | 10 +- .../{queffe => qalcyo}/timerhud/gui/HUDGui.kt | 6 +- .../{queffe => qalcyo}/timerhud/hud/HUD.kt | 10 +- .../timerhud/listener/Listener.kt | 14 +-- .../timerhud/utils/APIUtil.kt | 4 +- .../timerhud/utils/Updater.kt | 12 +- .../timerhud/utils/Utils.kt | 2 +- src/main/resources/mcmod.info | 0 23 files changed, 53 insertions(+), 167 deletions(-) mode change 100644 => 100755 .github/workflows/gradle.yml mode change 100644 => 100755 .gitignore mode change 100644 => 100755 README.md mode change 100644 => 100755 build.gradle mode change 100644 => 100755 gradle.properties mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.jar mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.properties mode change 100644 => 100755 gradlew mode change 100644 => 100755 gradlew.bat mode change 100644 => 100755 settings.gradle delete mode 100644 src/main/java/xyz/queffe/timerhud/tweaker/TimerHUDLoadingPlugin.java rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/TimerHUD.kt (83%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/TimerTask.kt (83%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/commands/TimerHUDCommand.kt (84%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/config/TimerConfig.kt (94%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/gui/DownloadConfirmGui.kt (93%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/gui/HUDGui.kt (95%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/hud/HUD.kt (84%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/listener/Listener.kt (86%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/utils/APIUtil.kt (97%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/utils/Updater.kt (94%) mode change 100644 => 100755 rename src/main/kotlin/xyz/{queffe => qalcyo}/timerhud/utils/Utils.kt (97%) mode change 100644 => 100755 mode change 100644 => 100755 src/main/resources/mcmod.info diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 389c6e1..ae40761 --- a/build.gradle +++ b/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', diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/main/java/xyz/queffe/timerhud/tweaker/TimerHUDLoadingPlugin.java b/src/main/java/xyz/queffe/timerhud/tweaker/TimerHUDLoadingPlugin.java deleted file mode 100644 index 91fb8ea..0000000 --- a/src/main/java/xyz/queffe/timerhud/tweaker/TimerHUDLoadingPlugin.java +++ /dev/null @@ -1,114 +0,0 @@ -package xyz.queffe.timerhud.tweaker; - -import kotlin.KotlinVersion; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URI; -import java.util.Map; - -/** - * Adapted from Skytils under AGPLv3 - * https://github.com/Skytils/SkytilsMod/blob/1.x/LICENSE.md - */ -public class TimerHUDLoadingPlugin implements IFMLLoadingPlugin { - - public TimerHUDLoadingPlugin() { - if (!KotlinVersion.CURRENT.isAtLeast(1, 5, 0)) { - showMessage(new File(new File(KotlinVersion.class.getProtectionDomain().getCodeSource().getLocation().toString()).getParentFile().getParentFile().getName())); - } - } - - @Override - public String[] getASMTransformerClass() { - return new String[0]; - } - - @Override - public String getModContainerClass() { - return null; - } - - @Override - public String getSetupClass() { - return null; - } - - @Override - public void injectData(Map data) { - - } - - @Override - public String getAccessTransformerClass() { - return null; - } - - private void showMessage(File file) { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { - e.printStackTrace(); - } - - // This makes the JOptionPane show on taskbar and stay on top - JFrame frame = new JFrame(); - frame.setUndecorated(true); - frame.setAlwaysOnTop(true); - frame.setLocationRelativeTo(null); - frame.setVisible(true); - - JButton discordLink = new JButton("Join the Discord"); - discordLink.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent event) { - try { - Desktop.getDesktop().browse(new URI("https://inv.wtf/queffe")); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - JButton close = new JButton("Close"); - close.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - exit(); - } - }); - - Object[] options = new Object[]{discordLink, close}; - JOptionPane.showOptionDialog( - frame, - "

TimerHUD has detected a mod with an older version of Kotlin.
The culprit is " + file.toString() + ".
It packages version " + KotlinVersion.CURRENT + ".
In order to resolve this conflict you must make TimerHUD be
above this mod alphabetically in your mods folder.
This tricks Forge into loading TimerHUD first.
You can do this by renaming your TimerHUD jar to !TimerHUD.jar,
or by renaming the other mod's jar to start with a Z.
If you have already done this and are still getting this error,
ask for support in the Discord.

", - "TimerHUD Error", - JOptionPane.DEFAULT_OPTION, - JOptionPane.ERROR_MESSAGE, - null, - options, - options[0] - ); - exit(); - } - - /** - * Bypasses forges security manager to exit the jvm - */ - private void exit() { - try { - Class clazz = Class.forName("java.lang.Shutdown"); - Method m_exit = clazz.getDeclaredMethod("exit", int.class); - m_exit.setAccessible(true); - m_exit.invoke(null, 0); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } -} \ No newline at end of file diff --git a/src/main/kotlin/xyz/queffe/timerhud/TimerHUD.kt b/src/main/kotlin/xyz/qalcyo/timerhud/TimerHUD.kt old mode 100644 new mode 100755 similarity index 83% rename from src/main/kotlin/xyz/queffe/timerhud/TimerHUD.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/TimerHUD.kt index a2de615..2ad0b87 --- a/src/main/kotlin/xyz/queffe/timerhud/TimerHUD.kt +++ b/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) } diff --git a/src/main/kotlin/xyz/queffe/timerhud/TimerTask.kt b/src/main/kotlin/xyz/qalcyo/timerhud/TimerTask.kt old mode 100644 new mode 100755 similarity index 83% rename from src/main/kotlin/xyz/queffe/timerhud/TimerTask.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/TimerTask.kt index e18bebe..3420916 --- a/src/main/kotlin/xyz/queffe/timerhud/TimerTask.kt +++ b/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 { diff --git a/src/main/kotlin/xyz/queffe/timerhud/commands/TimerHUDCommand.kt b/src/main/kotlin/xyz/qalcyo/timerhud/commands/TimerHUDCommand.kt old mode 100644 new mode 100755 similarity index 84% rename from src/main/kotlin/xyz/queffe/timerhud/commands/TimerHUDCommand.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/commands/TimerHUDCommand.kt index 92ac2f4..91d77e6 --- a/src/main/kotlin/xyz/queffe/timerhud/commands/TimerHUDCommand.kt +++ b/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) { diff --git a/src/main/kotlin/xyz/queffe/timerhud/config/TimerConfig.kt b/src/main/kotlin/xyz/qalcyo/timerhud/config/TimerConfig.kt old mode 100644 new mode 100755 similarity index 94% rename from src/main/kotlin/xyz/queffe/timerhud/config/TimerConfig.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/config/TimerConfig.kt index 1c13593..4b92e8b --- a/src/main/kotlin/xyz/queffe/timerhud/config/TimerConfig.kt +++ b/src/main/kotlin/xyz/qalcyo/timerhud/config/TimerConfig.kt @@ -1,4 +1,4 @@ -package xyz.queffe.timerhud.config +package xyz.qalcyo.timerhud.config import gg.essential.api.EssentialAPI import gg.essential.vigilance.Vigilant @@ -6,12 +6,12 @@ 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 diff --git a/src/main/kotlin/xyz/queffe/timerhud/gui/DownloadConfirmGui.kt b/src/main/kotlin/xyz/qalcyo/timerhud/gui/DownloadConfirmGui.kt old mode 100644 new mode 100755 similarity index 93% rename from src/main/kotlin/xyz/queffe/timerhud/gui/DownloadConfirmGui.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/gui/DownloadConfirmGui.kt index b8ecdfd..528cbc3 --- a/src/main/kotlin/xyz/queffe/timerhud/gui/DownloadConfirmGui.kt +++ b/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 diff --git a/src/main/kotlin/xyz/queffe/timerhud/gui/HUDGui.kt b/src/main/kotlin/xyz/qalcyo/timerhud/gui/HUDGui.kt old mode 100644 new mode 100755 similarity index 95% rename from src/main/kotlin/xyz/queffe/timerhud/gui/HUDGui.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/gui/HUDGui.kt index 6ac9d1a..aa25a31 --- a/src/main/kotlin/xyz/queffe/timerhud/gui/HUDGui.kt +++ b/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 diff --git a/src/main/kotlin/xyz/queffe/timerhud/hud/HUD.kt b/src/main/kotlin/xyz/qalcyo/timerhud/hud/HUD.kt old mode 100644 new mode 100755 similarity index 84% rename from src/main/kotlin/xyz/queffe/timerhud/hud/HUD.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/hud/HUD.kt index 72eee7a..5bbca0c --- a/src/main/kotlin/xyz/queffe/timerhud/hud/HUD.kt +++ b/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 { diff --git a/src/main/kotlin/xyz/queffe/timerhud/listener/Listener.kt b/src/main/kotlin/xyz/qalcyo/timerhud/listener/Listener.kt old mode 100644 new mode 100755 similarity index 86% rename from src/main/kotlin/xyz/queffe/timerhud/listener/Listener.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/listener/Listener.kt index 3c08111..72cac13 --- a/src/main/kotlin/xyz/queffe/timerhud/listener/Listener.kt +++ b/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 diff --git a/src/main/kotlin/xyz/queffe/timerhud/utils/APIUtil.kt b/src/main/kotlin/xyz/qalcyo/timerhud/utils/APIUtil.kt old mode 100644 new mode 100755 similarity index 97% rename from src/main/kotlin/xyz/queffe/timerhud/utils/APIUtil.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/utils/APIUtil.kt index 2ee5a40..e38d051 --- a/src/main/kotlin/xyz/queffe/timerhud/utils/APIUtil.kt +++ b/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 diff --git a/src/main/kotlin/xyz/queffe/timerhud/utils/Updater.kt b/src/main/kotlin/xyz/qalcyo/timerhud/utils/Updater.kt old mode 100644 new mode 100755 similarity index 94% rename from src/main/kotlin/xyz/queffe/timerhud/utils/Updater.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/utils/Updater.kt index 1256126..e31a418 --- a/src/main/kotlin/xyz/queffe/timerhud/utils/Updater.kt +++ b/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("-")) diff --git a/src/main/kotlin/xyz/queffe/timerhud/utils/Utils.kt b/src/main/kotlin/xyz/qalcyo/timerhud/utils/Utils.kt old mode 100644 new mode 100755 similarity index 97% rename from src/main/kotlin/xyz/queffe/timerhud/utils/Utils.kt rename to src/main/kotlin/xyz/qalcyo/timerhud/utils/Utils.kt index 4fa4bc2..6a271d8 --- a/src/main/kotlin/xyz/queffe/timerhud/utils/Utils.kt +++ b/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 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info old mode 100644 new mode 100755