diff options
198 files changed, 524 insertions, 589 deletions
@@ -1,5 +1,5 @@ <h1 align = "center"> - Lorenz Mod: Mod for hypixel skyblock + SkyHanni: mod for hypixel skyblock </h1> <div align="center"> @@ -9,4 +9,4 @@ </div> -Lorenz Mod is a beta mod developed by hannibal2 to add new features to hypixel skyblock. It is in beta so expect bugs. +SkyHanni is a beta mod developed by hannibal2 to add new features to hypixel skyblock. It is in beta so expect bugs. diff --git a/build.gradle b/build.gradle index 0f4be2970..cfbc89e23 100644 --- a/build.gradle +++ b/build.gradle @@ -26,9 +26,9 @@ apply plugin: 'com.github.johnrengelman.shadow' sourceCompatibility = 1.8 targetCompatibility = 1.8 -version = '0.6' -group= 'at.lorenz.mod' -archivesBaseName = 'LorenzMod' +version = '0.1' +group= 'at.hannibal2.skyhanni' +archivesBaseName = 'SkyHanni' String mixinClassifier = 'dep' minecraft { @@ -56,13 +56,13 @@ compileJava { } mixin { - add sourceSets.main, 'mixins.lorenzmod.refmap.json' + add sourceSets.main, 'mixins.skyhanni.refmap.json' } jar { manifest.attributes( 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', - 'MixinConfigs': 'mixins.lorenzmod.json', + 'MixinConfigs': 'mixins.skyhanni.json', 'FMLCorePluginContainsFMLMod': true, 'ForceLoadAsMod': true ) diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 781bec184..09355383c 100644 --- a/src/main/java/at/lorenz/mod/LorenzMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -1,19 +1,19 @@ -package at.lorenz.mod; - -import at.lorenz.mod.bazaar.BazaarApi; -import at.lorenz.mod.bazaar.BazaarOrderHelper; -import at.lorenz.mod.chat.ChatFilter; -import at.lorenz.mod.chat.ChatManager; -import at.lorenz.mod.chat.PlayerChatFilter; -import at.lorenz.mod.config.Features; -import at.lorenz.mod.config.commands.Commands; -import at.lorenz.mod.dungeon.*; -import at.lorenz.mod.dungeon.damageindicator.DungeonBossDamageIndicator; -import at.lorenz.mod.items.HideNotClickableItems; -import at.lorenz.mod.items.ItemDisplayOverlayFeatures; -import at.lorenz.mod.items.abilitycooldown.ItemAbilityCooldown; -import at.lorenz.mod.misc.*; -import at.lorenz.mod.test.LorenzTest; +package at.hannibal2.skyhanni; + +import at.hannibal2.skyhanni.bazaar.BazaarApi; +import at.hannibal2.skyhanni.bazaar.BazaarOrderHelper; +import at.hannibal2.skyhanni.chat.ChatFilter; +import at.hannibal2.skyhanni.chat.ChatManager; +import at.hannibal2.skyhanni.chat.PlayerChatFilter; +import at.hannibal2.skyhanni.config.Features; +import at.hannibal2.skyhanni.config.commands.Commands; +import at.hannibal2.skyhanni.dungeon.*; +import at.hannibal2.skyhanni.dungeon.damageindicator.DungeonBossDamageIndicator; +import at.hannibal2.skyhanni.items.HideNotClickableItems; +import at.hannibal2.skyhanni.items.ItemDisplayOverlayFeatures; +import at.hannibal2.skyhanni.items.abilitycooldown.ItemAbilityCooldown; +import at.hannibal2.skyhanni.misc.*; +import at.hannibal2.skyhanni.test.LorenzTest; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.io.*; @@ -27,11 +27,11 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -@Mod(modid = LorenzMod.MODID, version = LorenzMod.VERSION) -public class LorenzMod { +@Mod(modid = SkyHanniMod.MODID, version = SkyHanniMod.VERSION) +public class SkyHanniMod { - public static final String MODID = "lorenzmod"; - public static final String VERSION = "0.6"; + public static final String MODID = "skyhanni"; + public static final String VERSION = "0."; public static Features feature; private File configFile; @@ -70,7 +70,7 @@ public class LorenzMod { MinecraftForge.EVENT_BUS.register(new LorenzTest()); MinecraftForge.EVENT_BUS.register(new ButtonOnPause()); - configDirectory = new File("mods/LorenzMod/config"); + configDirectory = new File("mods/SkyHanni/config"); try { //noinspection ResultOfMethodCallIgnored configDirectory.mkdir(); diff --git a/src/main/java/at/lorenz/mod/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarApi.kt index 28ce228e2..cbebe951c 100644 --- a/src/main/java/at/lorenz/mod/bazaar/BazaarApi.kt +++ b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarApi.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.bazaar +package at.hannibal2.skyhanni.bazaar -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils class BazaarApi { diff --git a/src/main/java/at/lorenz/mod/bazaar/BazaarData.kt b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt index a9f75370c..01300e67c 100644 --- a/src/main/java/at/lorenz/mod/bazaar/BazaarData.kt +++ b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt @@ -1,3 +1,3 @@ -package at.lorenz.mod.bazaar +package at.hannibal2.skyhanni.bazaar data class BazaarData(val apiName: String, val itemName: String, val sellPrice: Double, val buyPrice: Double)
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/bazaar/BazaarDataGrabber.kt b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarDataGrabber.kt index 9a23eb47b..1f2f1171a 100644 --- a/src/main/java/at/lorenz/mod/bazaar/BazaarDataGrabber.kt +++ b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarDataGrabber.kt @@ -1,8 +1,8 @@ -package at.lorenz.mod.bazaar +package at.hannibal2.skyhanni.bazaar -import at.lorenz.mod.utils.APIUtil -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.round +import at.hannibal2.skyhanni.utils.APIUtil +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.round import kotlin.concurrent.fixedRateTimer internal class BazaarDataGrabber(private var bazaarMap: MutableMap<String, BazaarData>) { @@ -37,7 +37,7 @@ internal class BazaarDataGrabber(private var bazaarMap: MutableMap<String, Bazaa } fun start() { - fixedRateTimer(name = "lorenz-bazaar-update", period = 1000L) { + fixedRateTimer(name = "skyhanni-bazaar-update", period = 1000L) { if (!LorenzUtils.inSkyblock) { return@fixedRateTimer } @@ -98,13 +98,11 @@ internal class BazaarDataGrabber(private var bazaarMap: MutableMap<String, Bazaa val sellPrice: Double = try { itemData["sell_summary"].asJsonArray[0].asJsonObject["pricePerUnit"].asDouble.round(1) } catch (e: Exception) { -// LorenzUtils.warning("Bazaar buy order for $itemName not found!") 0.0 } val buyPrice: Double = try { itemData["buy_summary"].asJsonArray[0].asJsonObject["pricePerUnit"].asDouble.round(1) } catch (e: Exception) { -// LorenzUtils.warning("Bazaar sell offers for $itemName not found!") 0.0 } diff --git a/src/main/java/at/lorenz/mod/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarOrderHelper.kt index 829c61838..eec055253 100644 --- a/src/main/java/at/lorenz/mod/bazaar/BazaarOrderHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarOrderHelper.kt @@ -1,10 +1,10 @@ -package at.lorenz.mod.bazaar +package at.hannibal2.skyhanni.bazaar -import at.lorenz.mod.events.GuiContainerEvent -import at.lorenz.mod.utils.ItemUtils.getLore -import at.lorenz.mod.utils.LorenzColor -import at.lorenz.mod.utils.RenderUtils.highlight -import at.lorenz.mod.LorenzMod +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.utils.ItemUtils.getLore +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.RenderUtils.highlight import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.client.renderer.GlStateManager import net.minecraft.inventory.ContainerChest @@ -23,7 +23,7 @@ class BazaarOrderHelper { @SubscribeEvent fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { - if (!LorenzMod.feature.bazaar.orderHelper) return + if (!SkyHanniMod.feature.bazaar.orderHelper) return if (event.gui !is GuiChest) return val guiChest = event.gui val chest = guiChest.inventorySlots as ContainerChest diff --git a/src/main/java/at/lorenz/mod/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/chat/ChatFilter.kt index f31297100..fc245405c 100644 --- a/src/main/java/at/lorenz/mod/chat/ChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/chat/ChatFilter.kt @@ -1,9 +1,9 @@ -package at.lorenz.mod.chat +package at.hannibal2.skyhanni.chat -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.matchRegex -import at.lorenz.mod.LorenzMod +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class ChatFilter { @@ -20,23 +20,23 @@ class ChatFilter { private fun block(message: String): String = when { message.startsWith("§aYou are playing on profile: §e") -> "profile"//TODO move into own class - lobby(message) && LorenzMod.feature.chat.hypixelHub -> "lobby" - empty(message) && LorenzMod.feature.chat.empty -> "empty" - warping(message) && LorenzMod.feature.chat.warping -> "warping" - welcome(message) && LorenzMod.feature.chat.welcome -> "welcome" - guild(message) && LorenzMod.feature.chat.others -> "guild" - killCombo(message) && LorenzMod.feature.chat.others -> "kill_combo" - bazaarAndAHMiniMessages(message) && LorenzMod.feature.chat.others -> "bz_ah_minis" - watchdogAnnouncement(message) && LorenzMod.feature.chat.others -> "watchdog" - slayer(message) && LorenzMod.feature.chat.others -> "slayer" - slayerDrop(message) && LorenzMod.feature.chat.others -> "slayer_drop" - uselessDrop(message) && LorenzMod.feature.chat.others -> "useless_drop" - uselessNotification(message) && LorenzMod.feature.chat.others -> "useless_notification" - party(message) && LorenzMod.feature.chat.others -> "party" - money(message) && LorenzMod.feature.chat.others -> "money" - winterIsland(message) && LorenzMod.feature.chat.others -> "winter_island" - uselessWarning(message) && LorenzMod.feature.chat.others -> "useless_warning" - friendJoin(message) && LorenzMod.feature.chat.others -> "friend_join" + lobby(message) && SkyHanniMod.feature.chat.hypixelHub -> "lobby" + empty(message) && SkyHanniMod.feature.chat.empty -> "empty" + warping(message) && SkyHanniMod.feature.chat.warping -> "warping" + welcome(message) && SkyHanniMod.feature.chat.welcome -> "welcome" + guild(message) && SkyHanniMod.feature.chat.others -> "guild" + killCombo(message) && SkyHanniMod.feature.chat.others -> "kill_combo" + bazaarAndAHMiniMessages(message) && SkyHanniMod.feature.chat.others -> "bz_ah_minis" + watchdogAnnouncement(message) && SkyHanniMod.feature.chat.others -> "watchdog" + slayer(message) && SkyHanniMod.feature.chat.others -> "slayer" + slayerDrop(message) && SkyHanniMod.feature.chat.others -> "slayer_drop" + uselessDrop(message) && SkyHanniMod.feature.chat.others -> "useless_drop" + uselessNotification(message) && SkyHanniMod.feature.chat.others -> "useless_notification" + party(message) && SkyHanniMod.feature.chat.others -> "party" + money(message) && SkyHanniMod.feature.chat.others -> "money" + winterIsland(message) && SkyHanniMod.feature.chat.others -> "winter_island" + uselessWarning(message) && SkyHanniMod.feature.chat.others -> "useless_warning" + friendJoin(message) && SkyHanniMod.feature.chat.others -> "friend_join" diff --git a/src/main/java/at/lorenz/mod/chat/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/chat/ChatManager.kt index c4ad5ee8d..c189caa3d 100644 --- a/src/main/java/at/lorenz/mod/chat/ChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/chat/ChatManager.kt @@ -1,10 +1,10 @@ -package at.lorenz.mod.chat +package at.hannibal2.skyhanni.chat -import at.lorenz.mod.events.LorenzActionBarEvent -import at.lorenz.mod.utils.LorenzLogger -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.events.PacketEvent -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.events.LorenzActionBarEvent +import at.hannibal2.skyhanni.utils.LorenzLogger +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.network.play.server.S02PacketChat import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/lorenz/mod/chat/PlayerChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/chat/PlayerChatFilter.kt index bee241b36..0159d77ec 100644 --- a/src/main/java/at/lorenz/mod/chat/PlayerChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/chat/PlayerChatFilter.kt @@ -1,11 +1,11 @@ -package at.lorenz.mod.chat - -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.LorenzLogger -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.removeColorCodes -import at.lorenz.mod.events.PlayerSendChatEvent -import at.lorenz.mod.LorenzMod +package at.hannibal2.skyhanni.chat + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.PlayerSendChatEvent +import at.hannibal2.skyhanni.utils.LorenzLogger +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class PlayerChatFilter { @@ -13,7 +13,7 @@ class PlayerChatFilter { @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!LorenzUtils.isOnHypixel) return - if (!LorenzMod.feature.chat.playerMessages) return + if (!SkyHanniMod.feature.chat.playerMessages) return if (shouldBlock(event.message)) { event.blockedReason = "player_chat" diff --git a/src/main/java/at/lorenz/mod/chat/PlayerMessageChannel.kt b/src/main/java/at/hannibal2/skyhanni/chat/PlayerMessageChannel.kt index 0e44b88f0..826b490de 100644 --- a/src/main/java/at/lorenz/mod/chat/PlayerMessageChannel.kt +++ b/src/main/java/at/hannibal2/skyhanni/chat/PlayerMessageChannel.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.chat +package at.hannibal2.skyhanni.chat enum class PlayerMessageChannel(val prefix: String) { diff --git a/src/main/java/at/lorenz/mod/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index cd7846394..90027ce4e 100644 --- a/src/main/java/at/lorenz/mod/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -1,19 +1,19 @@ -package at.lorenz.mod.config; - -import at.lorenz.mod.LorenzMod; -import at.lorenz.mod.config.config.ConfigEditor; -import at.lorenz.mod.config.core.GuiElement; -import at.lorenz.mod.config.core.GuiScreenElementWrapper; -import at.lorenz.mod.config.core.config.Position; -import at.lorenz.mod.config.core.config.annotations.*; -import at.lorenz.mod.config.core.config.gui.GuiPositionEditor; +package at.hannibal2.skyhanni.config; + +import at.hannibal2.skyhanni.config.core.GuiElement; +import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper; +import at.hannibal2.skyhanni.config.core.config.Position; +import at.hannibal2.skyhanni.config.core.config.annotations.*; +import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor; +import at.hannibal2.skyhanni.SkyHanniMod; +import at.hannibal2.skyhanni.config.config.ConfigEditor; import com.google.gson.annotations.Expose; import net.minecraft.client.Minecraft; public class Features { private void editOverlay(String activeConfig, int width, int height, Position position) { - Minecraft.getMinecraft().displayGuiScreen(new GuiPositionEditor(position, width, height, () -> {}, () -> {}, () -> LorenzMod.screenToOpen = new GuiScreenElementWrapper(new ConfigEditor(LorenzMod.feature, activeConfig)))); + Minecraft.getMinecraft().displayGuiScreen(new GuiPositionEditor(position, width, height, () -> {}, () -> {}, () -> SkyHanniMod.screenToOpen = new GuiScreenElementWrapper(new ConfigEditor(SkyHanniMod.feature, activeConfig)))); } public void executeRunnable(String runnableId) { @@ -254,7 +254,7 @@ public class Features { public boolean hideExpBottles = false; @Expose - @ConfigOption(name = "Config Button", desc = "Add a button to the pause menu to configure the Lorenz mod.") + @ConfigOption(name = "Config Button", desc = "Add a button to the pause menu to configure SkyHanni.") @ConfigEditorBoolean public boolean configButtonOnPause = true; } diff --git a/src/main/java/at/lorenz/mod/config/GuiTextures.java b/src/main/java/at/hannibal2/skyhanni/config/GuiTextures.java index e24f1879d..8f96fd9f2 100644 --- a/src/main/java/at/lorenz/mod/config/GuiTextures.java +++ b/src/main/java/at/hannibal2/skyhanni/config/GuiTextures.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config; +package at.hannibal2.skyhanni.config; import net.minecraft.util.ResourceLocation; @@ -6,27 +6,27 @@ public class GuiTextures { private GuiTextures() {} - public static final ResourceLocation DISCORD = new ResourceLocation("lorenzmod:discord.png"); + public static final ResourceLocation DISCORD = new ResourceLocation("skyhanni:discord.png"); - public static final ResourceLocation button_tex = new ResourceLocation("lorenzmod:button.png"); + public static final ResourceLocation button_tex = new ResourceLocation("skyhanni:button.png"); - public static final ResourceLocation button_white = new ResourceLocation("lorenzmod:button_white.png"); + public static final ResourceLocation button_white = new ResourceLocation("skyhanni:button_white.png"); - public static final ResourceLocation BAR = new ResourceLocation("lorenzmod:core/bar.png"); - public static final ResourceLocation OFF = new ResourceLocation("lorenzmod:core/toggle_off.png"); - public static final ResourceLocation ONE = new ResourceLocation("lorenzmod:core/toggle_1.png"); - public static final ResourceLocation TWO = new ResourceLocation("lorenzmod:core/toggle_2.png"); - public static final ResourceLocation THREE = new ResourceLocation("lorenzmod:core/toggle_3.png"); - public static final ResourceLocation ON = new ResourceLocation("lorenzmod:core/toggle_on.png"); - public static final ResourceLocation DELETE = new ResourceLocation("lorenzmod:core/delete.png"); + public static final ResourceLocation BAR = new ResourceLocation("skyhanni:core/bar.png"); + public static final ResourceLocation OFF = new ResourceLocation("skyhanni:core/toggle_off.png"); + public static final ResourceLocation ONE = new ResourceLocation("skyhanni:core/toggle_1.png"); + public static final ResourceLocation TWO = new ResourceLocation("skyhanni:core/toggle_2.png"); + public static final ResourceLocation THREE = new ResourceLocation("skyhanni:core/toggle_3.png"); + public static final ResourceLocation ON = new ResourceLocation("skyhanni:core/toggle_on.png"); + public static final ResourceLocation DELETE = new ResourceLocation("skyhanni:core/delete.png"); - public static final ResourceLocation slider_off_cap = new ResourceLocation("lorenzmod:core/slider/slider_off_cap.png"); - public static final ResourceLocation slider_off_notch = new ResourceLocation("lorenzmod:core/slider/slider_off_notch.png"); - public static final ResourceLocation slider_off_segment = new ResourceLocation("lorenzmod:core/slider/slider_off_segment.png"); - public static final ResourceLocation slider_on_cap = new ResourceLocation("lorenzmod:core/slider/slider_on_cap.png"); - public static final ResourceLocation slider_on_notch = new ResourceLocation("lorenzmod:core/slider/slider_on_notch.png"); - public static final ResourceLocation slider_on_segment = new ResourceLocation("lorenzmod:core/slider/slider_on_segment.png"); - public static final ResourceLocation slider_button_new = new ResourceLocation("lorenzmod:core/slider/slider_button.png"); + public static final ResourceLocation slider_off_cap = new ResourceLocation("skyhanni:core/slider/slider_off_cap.png"); + public static final ResourceLocation slider_off_notch = new ResourceLocation("skyhanni:core/slider/slider_off_notch.png"); + public static final ResourceLocation slider_off_segment = new ResourceLocation("skyhanni:core/slider/slider_off_segment.png"); + public static final ResourceLocation slider_on_cap = new ResourceLocation("skyhanni:core/slider/slider_on_cap.png"); + public static final ResourceLocation slider_on_notch = new ResourceLocation("skyhanni:core/slider/slider_on_notch.png"); + public static final ResourceLocation slider_on_segment = new ResourceLocation("skyhanni:core/slider/slider_on_segment.png"); + public static final ResourceLocation slider_button_new = new ResourceLocation("skyhanni:core/slider/slider_button.png"); - public static final ResourceLocation mapOverlay = new ResourceLocation("lorenzmod", "maps/map_overlay.png"); + public static final ResourceLocation mapOverlay = new ResourceLocation("skyhanni", "maps/map_overlay.png"); } diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java new file mode 100644 index 000000000..dbf4e12c9 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java @@ -0,0 +1,26 @@ +package at.hannibal2.skyhanni.config.commands; + +import at.hannibal2.skyhanni.SkyHanniMod; +import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper; +import at.hannibal2.skyhanni.config.config.ConfigEditor; +import net.minecraft.command.ICommandSender; +import net.minecraftforge.client.ClientCommandHandler; +import org.apache.commons.lang3.StringUtils; + +public class Commands { + + private static final SimpleCommand.ProcessCommandRunnable settingsRunnable = new SimpleCommand.ProcessCommandRunnable() { + public void processCommand(ICommandSender sender, String[] args) { + if (args.length > 0) { + SkyHanniMod.screenToOpen = new GuiScreenElementWrapper(new ConfigEditor(SkyHanniMod.feature, StringUtils.join(args, " "))); + } else { + SkyHanniMod.screenToOpen = new GuiScreenElementWrapper(new ConfigEditor(SkyHanniMod.feature)); + } + } + }; + + public static void init() { + ClientCommandHandler.instance.registerCommand(new SimpleCommand("sh", settingsRunnable)); + ClientCommandHandler.instance.registerCommand(new SimpleCommand("skyhanni", settingsRunnable)); + } +} diff --git a/src/main/java/at/lorenz/mod/config/commands/SimpleCommand.java b/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java index 170080a59..de03ee2bd 100644 --- a/src/main/java/at/lorenz/mod/config/commands/SimpleCommand.java +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.commands; +package at.hannibal2.skyhanni.config.commands; import java.util.List; import net.minecraft.command.CommandBase; diff --git a/src/main/java/at/lorenz/mod/config/config/ConfigEditor.java b/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java index 789c6506e..72e46ad1d 100644 --- a/src/main/java/at/lorenz/mod/config/config/ConfigEditor.java +++ b/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java @@ -1,18 +1,18 @@ -package at.lorenz.mod.config.config; - -import static at.lorenz.mod.config.GuiTextures.DISCORD; - -import at.lorenz.mod.LorenzMod; -import at.lorenz.mod.config.Features; -import at.lorenz.mod.config.core.GlScissorStack; -import at.lorenz.mod.config.core.GuiElement; -import at.lorenz.mod.config.core.config.gui.GuiOptionEditor; -import at.lorenz.mod.config.core.config.gui.GuiOptionEditorAccordion; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.lerp.LerpUtils; -import at.lorenz.mod.config.core.util.lerp.LerpingInteger; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +package at.hannibal2.skyhanni.config.config; + +import at.hannibal2.skyhanni.SkyHanniMod; +import at.hannibal2.skyhanni.config.Features; +import at.hannibal2.skyhanni.config.GuiTextures; +import at.hannibal2.skyhanni.config.core.GlScissorStack; +import at.hannibal2.skyhanni.config.core.GuiElement; +import at.hannibal2.skyhanni.config.core.config.gui.GuiOptionEditor; +import at.hannibal2.skyhanni.config.core.config.gui.GuiOptionEditorAccordion; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils; +import at.hannibal2.skyhanni.config.core.util.lerp.LerpingInteger; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; + import com.google.common.collect.Lists; import java.awt.*; import java.net.URI; @@ -30,8 +30,8 @@ import org.lwjgl.opengl.GL11; public class ConfigEditor extends GuiElement { - private static final ResourceLocation[] socialsIco = new ResourceLocation[] { DISCORD }; - private static final String[] socialsLink = new String[] { "https://discord.gg/NcvkPDBA6Y" }; + private static final ResourceLocation[] socialsIco = new ResourceLocation[] { GuiTextures.DISCORD }; + private static final String[] socialsLink = new String[] { "https://discord.gg/8DXVN4BJz3" }; private final long openedMillis; @@ -146,7 +146,7 @@ public class ConfigEditor extends GuiElement { RenderUtils.drawFloatingRectDark(x + 5, y + 5, xSize - 10, 20, false); FontRenderer fr = Minecraft.getMinecraft().fontRendererObj; - TextRenderUtils.drawStringCenteredScaledMaxWidth("LorenzMod " + LorenzMod.VERSION + " by " + EnumChatFormatting.RED + "hannibal2" + EnumChatFormatting.RESET + ", config by " + EnumChatFormatting.DARK_PURPLE + "Moulberry", fr, x + xSize / 2f, y + 15, false, 200, 0xa0a0a0); + TextRenderUtils.drawStringCenteredScaledMaxWidth("SkyHanni " + SkyHanniMod.VERSION + " by " + EnumChatFormatting.RED + "hannibal2" + EnumChatFormatting.RESET + ", config by " + EnumChatFormatting.DARK_PURPLE + "Moulberry", fr, x + xSize / 2f, y + 15, false, 200, 0xa0a0a0); RenderUtils.drawFloatingRectDark(x + 4, y + 49 - 20, 140, ySize - 54 + 20, false); diff --git a/src/main/java/at/lorenz/mod/config/core/BackgroundBlur.java b/src/main/java/at/hannibal2/skyhanni/config/core/BackgroundBlur.java index 780e02a1b..eb70e1282 100644 --- a/src/main/java/at/lorenz/mod/config/core/BackgroundBlur.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/BackgroundBlur.java @@ -1,6 +1,6 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; -import at.lorenz.mod.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/src/main/java/at/lorenz/mod/config/core/ChromaColour.java b/src/main/java/at/hannibal2/skyhanni/config/core/ChromaColour.java index b670ce081..d5966c975 100644 --- a/src/main/java/at/lorenz/mod/config/core/ChromaColour.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/ChromaColour.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; import java.awt.*; diff --git a/src/main/java/at/lorenz/mod/config/core/GlScissorStack.java b/src/main/java/at/hannibal2/skyhanni/config/core/GlScissorStack.java index e3758fb37..1bded14e6 100644 --- a/src/main/java/at/lorenz/mod/config/core/GlScissorStack.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/GlScissorStack.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; import java.util.LinkedList; import net.minecraft.client.Minecraft; diff --git a/src/main/java/at/lorenz/mod/config/core/GuiElement.java b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElement.java index a177089bc..6e30449ef 100644 --- a/src/main/java/at/lorenz/mod/config/core/GuiElement.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElement.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/at/lorenz/mod/config/core/GuiElementBoolean.java b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementBoolean.java index c944fe0af..02d57de4e 100644 --- a/src/main/java/at/lorenz/mod/config/core/GuiElementBoolean.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementBoolean.java @@ -1,8 +1,8 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; -import at.lorenz.mod.config.GuiTextures; -import at.lorenz.mod.config.core.util.lerp.LerpUtils; -import at.lorenz.mod.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.GuiTextures; +import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; import java.util.function.Consumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/at/lorenz/mod/config/core/GuiElementColour.java b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementColour.java index c1504fa12..1ab229a38 100644 --- a/src/main/java/at/lorenz/mod/config/core/GuiElementColour.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementColour.java @@ -1,7 +1,7 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import java.awt.*; import java.awt.image.BufferedImage; import java.util.function.Consumer; diff --git a/src/main/java/at/lorenz/mod/config/core/GuiElementTextField.java b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementTextField.java index d88d098fc..91ce080cf 100644 --- a/src/main/java/at/lorenz/mod/config/core/GuiElementTextField.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementTextField.java @@ -1,7 +1,7 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; -import at.lorenz.mod.config.core.util.StringUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.util.StringUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import java.awt.*; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/at/lorenz/mod/config/core/GuiScreenElementWrapper.java b/src/main/java/at/hannibal2/skyhanni/config/core/GuiScreenElementWrapper.java index 9f2aa8e6b..3dd5f19f6 100644 --- a/src/main/java/at/lorenz/mod/config/core/GuiScreenElementWrapper.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/GuiScreenElementWrapper.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core; +package at.hannibal2.skyhanni.config.core; import java.io.IOException; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/at/lorenz/mod/config/core/config/Config.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/Config.java index e223f34d6..c9f6ea5b2 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/Config.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/Config.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config; +package at.hannibal2.skyhanni.config.core.config; //public class Config { // // public void executeRunnable(String runnableId) {} diff --git a/src/main/java/at/lorenz/mod/config/core/config/KeybindHelper.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/KeybindHelper.java index 8cc8ce794..faa5022f2 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/KeybindHelper.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/KeybindHelper.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config; +package at.hannibal2.skyhanni.config.core.config; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/at/lorenz/mod/config/core/config/Position.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java index 993fe8567..b67139b7b 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/Position.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config; +package at.hannibal2.skyhanni.config.core.config; import com.google.gson.annotations.Expose; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/Category.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/Category.java index 296109574..8cb74ed1e 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/Category.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/Category.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigAccordionId.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigAccordionId.java index 6ca061d68..6eb9bc938 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigAccordionId.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigAccordionId.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorAccordion.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorAccordion.java index 519097a33..b8a446be2 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorAccordion.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorAccordion.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorBoolean.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorBoolean.java index 00ac8bdec..bdb65e090 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorBoolean.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorBoolean.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorButton.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorButton.java index 2dde81831..8a39660ec 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorButton.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorButton.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorColour.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorColour.java index 286c534d1..6d3da7061 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorColour.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorColour.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDraggableList.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDraggableList.java index 7c814ccc7..97ebe26ed 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDraggableList.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDraggableList.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDropdown.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDropdown.java index 5b36610cc..3b0256ee3 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDropdown.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDropdown.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorKeybind.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorKeybind.java index ae04da3a7..9153b3896 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorKeybind.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorKeybind.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorSlider.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorSlider.java index 04582a71d..32ff46581 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorSlider.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorSlider.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorStyle.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorStyle.java index 4048b28d2..d6d2d8a46 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorStyle.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorStyle.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorText.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorText.java index 649a8df26..2ce2277ca 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorText.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorText.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigOption.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigOption.java index 8a3fbafda..f3df0a9f1 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigOption.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigOption.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.config.annotations; +package at.hannibal2.skyhanni.config.core.config.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditor.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditor.java index 6bae7fa6e..4d1c2ff0a 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditor.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditor.java @@ -1,8 +1,8 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorAccordion.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorAccordion.java index d7f0b44b3..e2f6d3a4c 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorAccordion.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorAccordion.java @@ -1,8 +1,8 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorBoolean.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorBoolean.java index efb56c585..2425c11bd 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorBoolean.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorBoolean.java @@ -1,7 +1,7 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.GuiElementBoolean; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.GuiElementBoolean; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; public class GuiOptionEditorBoolean extends GuiOptionEditor { diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorButton.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java index 8d2b81bb7..78e96abfe 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorButton.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java @@ -1,11 +1,11 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import static at.lorenz.mod.config.GuiTextures.button_tex; +import static at.hannibal2.skyhanni.config.GuiTextures.button_tex; -import at.lorenz.mod.config.Features; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.Features; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.input.Mouse; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorColour.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorColour.java index ede551a2d..96e6b55b4 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorColour.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorColour.java @@ -1,11 +1,11 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import static at.lorenz.mod.config.GuiTextures.*; +import static at.hannibal2.skyhanni.config.GuiTextures.*; -import at.lorenz.mod.config.core.ChromaColour; -import at.lorenz.mod.config.core.GuiElementColour; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.ChromaColour; +import at.hannibal2.skyhanni.config.core.GuiElementColour; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.input.Mouse; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java index ddf5bdb48..5b6313626 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDraggableList.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java @@ -1,13 +1,14 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import static at.lorenz.mod.config.GuiTextures.DELETE; -import static at.lorenz.mod.config.GuiTextures.button_tex; +import static at.hannibal2.skyhanni.config.GuiTextures.DELETE; +import static at.hannibal2.skyhanni.config.GuiTextures.button_tex; + +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.utils.Utils; +import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.lerp.LerpUtils; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; -import at.lorenz.mod.config.utils.Utils; import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDropdown.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDropdown.java index be873550a..ebeecfe78 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDropdown.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDropdown.java @@ -1,8 +1,8 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorKeybind.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorKeybind.java index 730a96c34..53149ceb4 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorKeybind.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorKeybind.java @@ -1,11 +1,11 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import static at.lorenz.mod.config.GuiTextures.*; +import static at.hannibal2.skyhanni.config.GuiTextures.*; -import at.lorenz.mod.config.core.config.KeybindHelper; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.render.RenderUtils; -import at.lorenz.mod.config.core.util.render.TextRenderUtils; +import at.hannibal2.skyhanni.config.core.config.KeybindHelper; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.render.RenderUtils; +import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorSlider.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorSlider.java index 79448ac70..d010c378d 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorSlider.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorSlider.java @@ -1,8 +1,8 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.GuiElementTextField; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.core.util.GuiElementSlider; +import at.hannibal2.skyhanni.config.core.GuiElementTextField; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.util.GuiElementSlider; import net.minecraft.client.Minecraft; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorStyle.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorStyle.java index 43e769a83..2bcdc8339 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorStyle.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorStyle.java @@ -1,7 +1,7 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; -import at.lorenz.mod.config.textures.Textures; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.textures.Textures; import java.util.stream.Collectors; import org.lwjgl.input.Mouse; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorText.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorText.java index b35f9e60f..1279ee7e9 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorText.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorText.java @@ -1,7 +1,7 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; -import at.lorenz.mod.config.core.GuiElementTextField; -import at.lorenz.mod.config.core.config.struct.ConfigProcessor; +import at.hannibal2.skyhanni.config.core.GuiElementTextField; +import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor; import net.minecraft.client.Minecraft; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiPositionEditor.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java index ead75930c..7708c4ccd 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/gui/GuiPositionEditor.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java @@ -1,7 +1,8 @@ -package at.lorenz.mod.config.core.config.gui; +package at.hannibal2.skyhanni.config.core.config.gui; + +import at.hannibal2.skyhanni.config.core.config.Position; +import at.hannibal2.skyhanni.config.utils.Utils; -import at.lorenz.mod.config.core.config.Position; -import at.lorenz.mod.config.utils.Utils; import java.io.IOException; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/at/lorenz/mod/config/core/config/struct/ConfigProcessor.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java index 7b3ca616c..cce96b5b5 100644 --- a/src/main/java/at/lorenz/mod/config/core/config/struct/ConfigProcessor.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java @@ -1,8 +1,9 @@ -package at.lorenz.mod.config.core.config.struct; +package at.hannibal2.skyhanni.config.core.config.struct; + +import at.hannibal2.skyhanni.config.core.config.annotations.*; +import at.hannibal2.skyhanni.config.Features; +import at.hannibal2.skyhanni.config.core.config.gui.*; -import at.lorenz.mod.config.Features; -import at.lorenz.mod.config.core.config.annotations.*; -import at.lorenz.mod.config.core.config.gui.*; import com.google.gson.annotations.Expose; import java.lang.reflect.Field; import java.util.LinkedHashMap; diff --git a/src/main/java/at/lorenz/mod/config/core/util/GuiElementSlider.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java index 327e5a2f9..8f6c837a8 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/GuiElementSlider.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java @@ -1,9 +1,10 @@ -package at.lorenz.mod.config.core.util; +package at.hannibal2.skyhanni.config.core.util; -import static at.lorenz.mod.config.GuiTextures.*; +import static at.hannibal2.skyhanni.config.GuiTextures.*; + +import at.hannibal2.skyhanni.config.core.GuiElement; +import at.hannibal2.skyhanni.config.utils.Utils; -import at.lorenz.mod.config.core.GuiElement; -import at.lorenz.mod.config.utils.Utils; import java.util.function.Consumer; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/at/lorenz/mod/config/core/util/StringUtils.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/StringUtils.java index 5dfdfda2e..9f88a7c07 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/StringUtils.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/StringUtils.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.util; +package at.hannibal2.skyhanni.config.core.util; public class StringUtils { diff --git a/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpUtils.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpUtils.java index 4b73385cc..9fa20b839 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpUtils.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpUtils.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.util.lerp; +package at.hannibal2.skyhanni.config.core.util.lerp; public class LerpUtils { diff --git a/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingFloat.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingFloat.java index 880b2d03f..f76c73c9c 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingFloat.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingFloat.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.util.lerp; +package at.hannibal2.skyhanni.config.core.util.lerp; public class LerpingFloat { diff --git a/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingInteger.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingInteger.java index 4d0553275..a5d7ad9eb 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingInteger.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingInteger.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.util.lerp; +package at.hannibal2.skyhanni.config.core.util.lerp; public class LerpingInteger { diff --git a/src/main/java/at/lorenz/mod/config/core/util/render/RenderUtils.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/render/RenderUtils.java index 80948c43a..04d3f2ef8 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/render/RenderUtils.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/render/RenderUtils.java @@ -1,6 +1,6 @@ -package at.lorenz.mod.config.core.util.render; +package at.hannibal2.skyhanni.config.core.util.render; -import at.lorenz.mod.config.core.BackgroundBlur; +import at.hannibal2.skyhanni.config.core.BackgroundBlur; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/at/lorenz/mod/config/core/util/render/TextRenderUtils.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/render/TextRenderUtils.java index 4a54c37df..309bdb2bf 100644 --- a/src/main/java/at/lorenz/mod/config/core/util/render/TextRenderUtils.java +++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/render/TextRenderUtils.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.core.util.render; +package at.hannibal2.skyhanni.config.core.util.render; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/at/lorenz/mod/config/textures/TextureObject.java b/src/main/java/at/hannibal2/skyhanni/config/textures/TextureObject.java index 0d91c7428..1804299de 100644 --- a/src/main/java/at/lorenz/mod/config/textures/TextureObject.java +++ b/src/main/java/at/hannibal2/skyhanni/config/textures/TextureObject.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.textures; +package at.hannibal2.skyhanni.config.textures; import com.google.gson.JsonObject; import java.util.Arrays; @@ -32,6 +32,6 @@ public class TextureObject { } private static ResourceLocation resource(String path) { - return new ResourceLocation("lorenzmod", path); + return new ResourceLocation("skyhanni", path); } } diff --git a/src/main/java/at/lorenz/mod/config/textures/Textures.java b/src/main/java/at/hannibal2/skyhanni/config/textures/Textures.java index 914f19b04..dc6a0bdd0 100644 --- a/src/main/java/at/lorenz/mod/config/textures/Textures.java +++ b/src/main/java/at/hannibal2/skyhanni/config/textures/Textures.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.textures; +package at.hannibal2.skyhanni.config.textures; import com.google.common.collect.Lists; import com.google.gson.Gson; @@ -25,7 +25,6 @@ public class Textures implements IResourceManagerReloadListener { public static void setTexture(int selected) { if (selected >= styles.size() || selected < 0) { texture = DEFAULT_TEXTURE; - // LorenzMod.config.misc.style = 0; } else { texture = styles.get(selected); } @@ -37,7 +36,7 @@ public class Textures implements IResourceManagerReloadListener { styles.add(DEFAULT_TEXTURE); DEFAULT_TEXTURE.displayName = "Default"; try { - ResourceLocation stylesData = new ResourceLocation("lorenzmod:data/styles.json"); + ResourceLocation stylesData = new ResourceLocation("skyhanni:data/styles.json"); for (IResource resource : resourceManager.getAllResources(stylesData)) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8))) { @@ -51,6 +50,5 @@ public class Textures implements IResourceManagerReloadListener { } } } catch (Exception ignored) {} - // if (LorenzMod.config != null) setTexture(LorenzMod.config.misc.style); } } diff --git a/src/main/java/at/lorenz/mod/config/utils/Utils.java b/src/main/java/at/hannibal2/skyhanni/config/utils/Utils.java index 6af6c0243..e2c770a6d 100644 --- a/src/main/java/at/lorenz/mod/config/utils/Utils.java +++ b/src/main/java/at/hannibal2/skyhanni/config/utils/Utils.java @@ -1,4 +1,4 @@ -package at.lorenz.mod.config.utils; +package at.hannibal2.skyhanni.config.utils; import java.math.RoundingMode; import java.nio.FloatBuffer; @@ -40,13 +40,6 @@ public class Utils { return input.toLowerCase().replace(" ", "").replace(replace, ""); } - // public static boolean isPlayerHoldingRedstone(EntityPlayerSP player) { - // if (!LorenzMod.config.main.requireRedstone) return true; - // ArrayList<Item> redstoneItems = new ArrayList<>(Arrays.asList(Items.redstone, Items.repeater, Items.comparator, Item.getByNameOrId("minecraft:redstone_torch"))); - // if (player.getHeldItem() != null) return redstoneItems.contains(player.getHeldItem().getItem()); - // return false; - // } - public static boolean inRangeInclusive(int value, int min, int max) { return value <= max && value >= min; } diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonBossMessages.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonBossMessages.kt index 43c66e59c..0dbfbd732 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonBossMessages.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonBossMessages.kt @@ -1,9 +1,9 @@ -package at.lorenz.mod.dungeon +package at.hannibal2.skyhanni.dungeon -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.matchRegex +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class DungeonBossMessages { @@ -12,7 +12,7 @@ class DungeonBossMessages { fun onChatMessage(event: LorenzChatEvent) { if (!LorenzUtils.inSkyblock) return - if (!LorenzMod.feature.chat.dungeonBossMessages) return + if (!SkyHanniMod.feature.chat.dungeonBossMessages) return if (isBoss(event.message)) { event.blockedReason = "dungeon_boss" diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonChatFilter.kt index 65a187816..7f1f2d938 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonChatFilter.kt @@ -1,9 +1,9 @@ -package at.lorenz.mod.dungeon +package at.hannibal2.skyhanni.dungeon -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.LorenzUtils.matchRegex -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class DungeonChatFilter { @@ -12,7 +12,7 @@ class DungeonChatFilter { fun onChatMessage(event: LorenzChatEvent) { if (!LorenzUtils.inSkyblock) return - if (!LorenzMod.feature.chat.dungeonMessages) return + if (!SkyHanniMod.feature.chat.dungeonMessages) return val blockReason = block(event.message) if (blockReason != "") { diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonCleanEnd.kt index 04326c598..f668fc22d 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonCleanEnd.kt @@ -1,12 +1,12 @@ -package at.lorenz.mod.dungeon - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.CheckRenderEntityEvent -import at.lorenz.mod.events.DamageIndicatorFinalBossEvent -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.events.PacketEvent -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.matchRegex +package at.hannibal2.skyhanni.dungeon + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.CheckRenderEntityEvent +import at.hannibal2.skyhanni.events.DamageIndicatorFinalBossEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.entity.item.EntityArmorStand @@ -25,7 +25,7 @@ class DungeonCleanEnd { @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!LorenzUtils.inDungeons) return - if (!LorenzMod.feature.dungeon.cleanEnd) return + if (!SkyHanniMod.feature.dungeon.cleanEnd) return val message = event.message @@ -36,7 +36,7 @@ class DungeonCleanEnd { private fun shouldBlock(): Boolean { if (!LorenzUtils.inDungeons) return false - if (!LorenzMod.feature.dungeon.cleanEnd) return false + if (!SkyHanniMod.feature.dungeon.cleanEnd) return false if (!bossDone) return false @@ -63,7 +63,7 @@ class DungeonCleanEnd { @SubscribeEvent fun onHealthUpdatePacket(event: PacketEvent.ReceiveEvent) { if (!LorenzUtils.inDungeons) return - if (!LorenzMod.feature.dungeon.cleanEnd) return + if (!SkyHanniMod.feature.dungeon.cleanEnd) return if (bossDone) return if (lastBossId == -1) return @@ -92,7 +92,7 @@ class DungeonCleanEnd { if (entity == Minecraft.getMinecraft().thePlayer) return - if (LorenzMod.feature.dungeon.cleanEndF3IgnoreGuardians) { + if (SkyHanniMod.feature.dungeon.cleanEndF3IgnoreGuardians) { if (DungeonData.isOneOf("F3", "M3")) { if (entity is EntityGuardian) { if (entity.entityId != lastBossId) { diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonData.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonData.kt index 870bcaa50..eedf664a3 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonData.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonData.kt @@ -1,8 +1,8 @@ -package at.lorenz.mod.dungeon +package at.hannibal2.skyhanni.dungeon -import at.lorenz.mod.events.DungeonEnterEvent -import at.lorenz.mod.misc.ScoreboardData -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.events.DungeonEnterEvent +import at.hannibal2.skyhanni.misc.ScoreboardData +import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonDeathCounter.kt index 156b641c4..521dbeb6d 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonDeathCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonDeathCounter.kt @@ -1,11 +1,11 @@ -package at.lorenz.mod.dungeon - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.DungeonEnterEvent -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.GuiRender.renderString -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.matchRegex +package at.hannibal2.skyhanni.dungeon + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.DungeonEnterEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.GuiRender.renderString +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -88,10 +88,10 @@ class DungeonDeathCounter { fun renderOverlay(event: RenderGameOverlayEvent.Post) { if (!isEnabled()) return - LorenzMod.feature.dungeon.deathCounterDisplay.renderString(DungeonMilestoneDisplay.color + textToRender) + SkyHanniMod.feature.dungeon.deathCounterDisplay.renderString(DungeonMilestoneDisplay.color + textToRender) } private fun isEnabled(): Boolean { - return LorenzUtils.inDungeons && LorenzMod.feature.dungeon.deathCounter + return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.deathCounter } }
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonHighlightClickedBlocks.kt index e824eb714..ff0ca6931 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonHighlightClickedBlocks.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonHighlightClickedBlocks.kt @@ -1,12 +1,12 @@ -package at.lorenz.mod.dungeon - -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.events.PacketEvent -import at.lorenz.mod.utils.* -import at.lorenz.mod.utils.BlockUtils.getBlockAt -import at.lorenz.mod.utils.RenderUtils.drawColor -import at.lorenz.mod.utils.RenderUtils.drawString -import at.lorenz.mod.LorenzMod +package at.hannibal2.skyhanni.dungeon + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt +import at.hannibal2.skyhanni.utils.RenderUtils.drawColor +import at.hannibal2.skyhanni.utils.RenderUtils.drawString import net.minecraft.init.Blocks import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement import net.minecraftforge.client.event.RenderWorldLastEvent @@ -27,7 +27,7 @@ class DungeonHighlightClickedBlocks { @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { - if (!LorenzMod.feature.dungeon.highlightClickedBlocks) return + if (!SkyHanniMod.feature.dungeon.highlightClickedBlocks) return if (!LorenzUtils.inDungeons) return if (event.message == "§cYou hear the sound of something opening...") { @@ -37,7 +37,7 @@ class DungeonHighlightClickedBlocks { @SubscribeEvent fun onSendPacket(event: PacketEvent.SendEvent) { - if (!LorenzMod.feature.dungeon.highlightClickedBlocks) return + if (!SkyHanniMod.feature.dungeon.highlightClickedBlocks) return if (!LorenzUtils.inDungeons) return // TODO add // if (DungeonAPI.inBossRoom) return @@ -73,7 +73,7 @@ class DungeonHighlightClickedBlocks { @SubscribeEvent fun onWorldRender(event: RenderWorldLastEvent) { - if (!LorenzMod.feature.dungeon.highlightClickedBlocks) return + if (!SkyHanniMod.feature.dungeon.highlightClickedBlocks) return if (!LorenzUtils.inDungeons) return blocks.removeAll { System.currentTimeMillis() > it.time + 3000 } diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonMilestoneDisplay.kt index cad3ff56f..96bfba678 100644 --- a/src/main/java/at/lorenz/mod/dungeon/DungeonMilestoneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonMilestoneDisplay.kt @@ -1,12 +1,11 @@ -package at.lorenz.mod.dungeon - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.DungeonEnterEvent -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.misc.CurrentPetDisplay -import at.lorenz.mod.utils.GuiRender.renderString -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.matchRegex +package at.hannibal2.skyhanni.dungeon + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.DungeonEnterEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.GuiRender.renderString +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -88,10 +87,10 @@ class DungeonMilestoneDisplay { fun renderOverlay(event: RenderGameOverlayEvent.Post) { if (!isEnabled()) return - LorenzMod.feature.dungeon.milestoneDisplayPos.renderString(color + textToRender) + SkyHanniMod.feature.dungeon.milestoneDisplayPos.renderString(color + textToRender) } private fun isEnabled(): Boolean { - return LorenzUtils.inDungeons && LorenzMod.feature.dungeon.showMilestoneDisplay + return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.showMilestoneDisplay } }
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/dungeon/damageindicator/DungeonBossDamageIndicator.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/DungeonBossDamageIndicator.kt index f1cf83b9c..d9e149b7b 100644 --- a/src/main/java/at/lorenz/mod/dungeon/damageindicator/DungeonBossDamageIndicator.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/DungeonBossDamageIndicator.kt @@ -1,15 +1,15 @@ -package at.lorenz.mod.dungeon.damageindicator - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.dungeon.DungeonData -import at.lorenz.mod.events.DamageIndicatorFinalBossEvent -import at.lorenz.mod.events.DungeonEnterEvent -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.LorenzColor -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.baseMaxHealth -import at.lorenz.mod.utils.NumberUtil -import at.lorenz.mod.utils.RenderUtils +package at.hannibal2.skyhanni.dungeon.damageindicator + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.dungeon.DungeonData +import at.hannibal2.skyhanni.events.DamageIndicatorFinalBossEvent +import at.hannibal2.skyhanni.events.DungeonEnterEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth +import at.hannibal2.skyhanni.utils.NumberUtil +import at.hannibal2.skyhanni.utils.RenderUtils import net.minecraft.client.Minecraft import net.minecraft.client.renderer.GlStateManager import net.minecraft.entity.EntityLivingBase @@ -44,7 +44,7 @@ class DungeonBossDamageIndicator { @SubscribeEvent fun onWorldRender(event: RenderWorldLastEvent) { if (!LorenzUtils.inDungeons) return - if (!LorenzMod.feature.dungeon.bossDamageIndicator) return + if (!SkyHanniMod.feature.dungeon.bossDamageIndicator) return GlStateManager.disableDepth() GlStateManager.disableCull() diff --git a/src/main/java/at/lorenz/mod/dungeon/damageindicator/DungeonBossFinder.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/DungeonBossFinder.kt index 2b7e1b373..1d30a9d24 100644 --- a/src/main/java/at/lorenz/mod/dungeon/damageindicator/DungeonBossFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/DungeonBossFinder.kt @@ -1,12 +1,12 @@ -package at.lorenz.mod.dungeon.damageindicator - -import at.lorenz.mod.dungeon.DungeonData -import at.lorenz.mod.test.LorenzTest -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.baseMaxHealth -import at.lorenz.mod.utils.LorenzUtils.matchRegex -import at.lorenz.mod.utils.LorenzVec -import at.lorenz.mod.utils.getLorenzVec +package at.hannibal2.skyhanni.dungeon.damageindicator + +import at.hannibal2.skyhanni.dungeon.DungeonData +import at.hannibal2.skyhanni.test.LorenzTest +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex +import at.hannibal2.skyhanni.utils.LorenzVec +import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.entity.Entity @@ -162,7 +162,6 @@ class DungeonBossFinder { if (DungeonData.isOneOf("F5", "M5")) { if (entity is EntityOtherPlayerMP) { if (entity == floor5lividEntity) { -// ignoreBlocks(entity.getLorenzVec().distance(5.5, 69.0, -2.5) < 5) return EntityResult(floor5lividEntitySpawnTime, true, finalBoss = true) } } diff --git a/src/main/java/at/lorenz/mod/dungeon/damageindicator/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityData.kt index 4d60626fc..321addb8d 100644 --- a/src/main/java/at/lorenz/mod/dungeon/damageindicator/EntityData.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityData.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.dungeon.damageindicator +package at.hannibal2.skyhanni.dungeon.damageindicator -import at.lorenz.mod.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzColor import net.minecraft.entity.EntityLivingBase class EntityData(val entity: EntityLivingBase, val text: String, val color: LorenzColor, val time: Long, val ignoreBlocks: Boolean, val delayedStart: Long)
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/dungeon/damageindicator/EntityResult.kt b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityResult.kt index f0642b953..1831ebe70 100644 --- a/src/main/java/at/lorenz/mod/dungeon/damageindicator/EntityResult.kt +++ b/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityResult.kt @@ -1,3 +1,3 @@ -package at.lorenz.mod.dungeon.damageindicator +package at.hannibal2.skyhanni.dungeon.damageindicator class EntityResult(val delayedStart: Long = -1L, val ignoreBlocks: Boolean = false, val finalBoss: Boolean = false)
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/events/CheckRenderEntityEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CheckRenderEntityEvent.kt index b4b226e2b..bd9a816cb 100644 --- a/src/main/java/at/lorenz/mod/events/CheckRenderEntityEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/CheckRenderEntityEvent.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events import net.minecraft.client.renderer.culling.ICamera import net.minecraft.entity.Entity diff --git a/src/main/java/at/lorenz/mod/events/DamageIndicatorFinalBossEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt index 5b2715910..ffcde662a 100644 --- a/src/main/java/at/lorenz/mod/events/DamageIndicatorFinalBossEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt @@ -1,3 +1,3 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events class DamageIndicatorFinalBossEvent(val id: Int): LorenzEvent()
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/events/DungeonEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt index a1cb18101..819ae8c71 100644 --- a/src/main/java/at/lorenz/mod/events/DungeonEnterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt @@ -1,3 +1,3 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events class DungeonEnterEvent(dungeonFloor: String): LorenzEvent()
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/events/GuiContainerEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt index 4f43ab505..4b1df77a4 100644 --- a/src/main/java/at/lorenz/mod/events/GuiContainerEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Container diff --git a/src/main/java/at/lorenz/mod/events/GuiRenderItemEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderItemEvent.kt index a1af62c69..0741aac5c 100644 --- a/src/main/java/at/lorenz/mod/events/GuiRenderItemEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderItemEvent.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events import net.minecraft.client.gui.FontRenderer import net.minecraft.item.ItemStack diff --git a/src/main/java/at/lorenz/mod/events/LorenzActionBarEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzActionBarEvent.kt index ef7a8bc7b..e5e936fb0 100644 --- a/src/main/java/at/lorenz/mod/events/LorenzActionBarEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzActionBarEvent.kt @@ -1,3 +1,3 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events class LorenzActionBarEvent(val message: String) : LorenzEvent()
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/events/LorenzChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzChatEvent.kt index 3b0350918..2c7db6bd7 100644 --- a/src/main/java/at/lorenz/mod/events/LorenzChatEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzChatEvent.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events import net.minecraft.util.IChatComponent diff --git a/src/main/java/at/lorenz/mod/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt index facb18e2a..cc18898ee 100644 --- a/src/main/java/at/lorenz/mod/events/LorenzEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraftforge.common.MinecraftForge import net.minecraftforge.fml.common.eventhandler.Event @@ -14,7 +14,7 @@ abstract class LorenzEvent: Event() { MinecraftForge.EVENT_BUS.post(this) }.onFailure { it.printStackTrace() - LorenzUtils.chat("§cLorenz Mod caught and logged an ${it::class.simpleName ?: "error"} at ${eventName}.") + LorenzUtils.chat("§cSkyHanni caught and logged an ${it::class.simpleName ?: "error"} at ${eventName}.") }.getOrDefault(isCanceled) } }
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/events/PacketEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PacketEvent.kt index 3b8a26038..abdb79b39 100644 --- a/src/main/java/at/lorenz/mod/events/PacketEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/PacketEvent.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events import net.minecraft.network.Packet import net.minecraftforge.fml.common.eventhandler.Cancelable diff --git a/src/main/java/at/lorenz/mod/events/PlayerSendChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt index dd015e1cb..4ce9db1a8 100644 --- a/src/main/java/at/lorenz/mod/events/PlayerSendChatEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.events +package at.hannibal2.skyhanni.events -import at.lorenz.mod.chat.PlayerMessageChannel +import at.hannibal2.skyhanni.chat.PlayerMessageChannel class PlayerSendChatEvent( diff --git a/src/main/java/at/lorenz/mod/items/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt index 75a49b578..dd533b3d2 100644 --- a/src/main/java/at/lorenz/mod/items/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt @@ -1,15 +1,15 @@ -package at.lorenz.mod.items - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.bazaar.BazaarApi -import at.lorenz.mod.events.GuiContainerEvent -import at.lorenz.mod.utils.ItemUtils -import at.lorenz.mod.utils.ItemUtils.cleanName -import at.lorenz.mod.utils.ItemUtils.getLore -import at.lorenz.mod.utils.LorenzColor -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.removeColorCodes -import at.lorenz.mod.utils.RenderUtils.highlight +package at.hannibal2.skyhanni.items + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.bazaar.BazaarApi +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.utils.ItemUtils +import at.hannibal2.skyhanni.utils.ItemUtils.cleanName +import at.hannibal2.skyhanni.utils.ItemUtils.getLore +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes +import at.hannibal2.skyhanni.utils.RenderUtils.highlight import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.client.renderer.GlStateManager @@ -116,19 +116,9 @@ class HideNotClickableItems { if (hide(chestName, stack)) { event.isCanceled = true -// SoundQueue.addToQueue("note.bass", 0.5f, 1f) if (System.currentTimeMillis() > lastClickTime + 5_000) { lastClickTime = System.currentTimeMillis() -// EssentialAPI.getNotifications() -// .push( -// "§cThis item cannot be moved!", -// "§eClick here §fto disable this feature for 10 seconds!\n" + -// "§fOr disable it forever: §6/st §f+ '§6Hide Not Clickable Items§f'.", -// 5f, -// action = { -// bypassUntil = System.currentTimeMillis() + 10_000 -// }) } return } @@ -137,7 +127,7 @@ class HideNotClickableItems { private fun isDisabled(): Boolean { if (bypassUntil > System.currentTimeMillis()) return true - return !LorenzMod.feature.items.hideNotClickableItems + return !SkyHanniMod.feature.items.hideNotClickableItems } private fun hide(chestName: String, stack: ItemStack): Boolean { diff --git a/src/main/java/at/lorenz/mod/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt index 3d16af280..6f2073969 100644 --- a/src/main/java/at/lorenz/mod/items/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt @@ -1,14 +1,13 @@ -package at.lorenz.mod.items - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.GuiRenderItemEvent -import at.lorenz.mod.utils.ItemUtils -import at.lorenz.mod.utils.ItemUtils.cleanName -import at.lorenz.mod.utils.LorenzDebug -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.between -import at.lorenz.mod.utils.LorenzUtils.matchRegex -import at.lorenz.mod.utils.NumberUtil.romanToDecimal +package at.hannibal2.skyhanni.items + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.GuiRenderItemEvent +import at.hannibal2.skyhanni.utils.ItemUtils +import at.hannibal2.skyhanni.utils.ItemUtils.cleanName +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.between +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex +import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal import net.minecraft.client.renderer.GlStateManager import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -42,7 +41,7 @@ class ItemDisplayOverlayFeatures { private fun getStackTip(item: ItemStack): String { val name = item.cleanName() - if (LorenzMod.feature.items.displayMasterStarNumber) { + if (SkyHanniMod.feature.items.displayMasterStarNumber) { when (name) { "First Master Star" -> return "1" "Second Master Star" -> return "2" @@ -52,13 +51,13 @@ class ItemDisplayOverlayFeatures { } } - if (LorenzMod.feature.items.displayMasterSkullNumber) { + if (SkyHanniMod.feature.items.displayMasterSkullNumber) { if (name.matchRegex("(.*)Master Skull - Tier .")) { return name.substring(name.length - 1) } } - if (LorenzMod.feature.items.displayDungeonHeadFloor) { + if (SkyHanniMod.feature.items.displayDungeonHeadFloor) { if (name.contains("Golden ") || name.contains("Diamond ")) { when { name.contains("Bonzo") -> return "1" @@ -72,34 +71,22 @@ class ItemDisplayOverlayFeatures { } } - if (LorenzMod.feature.items.displayNewYearCakeNumber) { + if (SkyHanniMod.feature.items.displayNewYearCakeNumber) { if (name.startsWith("New Year Cake (")) { - try { - return "§b" + name.between("(Year ", ")") - } catch (e: IndexOutOfBoundsException) { - val message = "New Year Cake error in string: '$name': ${e.message}" - LorenzDebug.log(message) - LorenzUtils.error(message) - } + return "§b" + name.between("(Year ", ")") } } - if (LorenzMod.feature.items.displayPetLevel) { + if (SkyHanniMod.feature.items.displayPetLevel) { if (ItemUtils.isPet(name)) { - try { - val level = name.between("Lvl ", "] ").toInt() - if (level != ItemUtils.maxPetLevel(name)) { - return "$level" - } - } catch (e: java.lang.NumberFormatException) { - e.printStackTrace() - LorenzDebug.log("name: '$name'") - LorenzUtils.warning("NumberFormatException at lorenzItemDisplayPetLevel") + val level = name.between("Lvl ", "] ").toInt() + if (level != ItemUtils.maxPetLevel(name)) { + return "$level" } } } - if (LorenzMod.feature.items.displaySackName) { + if (SkyHanniMod.feature.items.displaySackName) { if (ItemUtils.isSack(name)) { val split = name.split(" ") val sackName = split[split.size - 2] @@ -107,7 +94,7 @@ class ItemDisplayOverlayFeatures { } } - if (LorenzMod.feature.items.displayMinionTier) { + if (SkyHanniMod.feature.items.displayMinionTier) { if (name.contains(" Minion ")) { val array = name.split(" ") val last = array[array.size - 1] diff --git a/src/main/java/at/lorenz/mod/items/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt index 6f4648817..708b81693 100644 --- a/src/main/java/at/lorenz/mod/items/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt @@ -1,13 +1,13 @@ -package at.lorenz.mod.items.abilitycooldown - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.GuiRenderItemEvent -import at.lorenz.mod.events.LorenzActionBarEvent -import at.lorenz.mod.utils.ItemUtils -import at.lorenz.mod.utils.ItemUtils.cleanName -import at.lorenz.mod.utils.LorenzColor -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.between +package at.hannibal2.skyhanni.items.abilitycooldown + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.GuiRenderItemEvent +import at.hannibal2.skyhanni.events.LorenzActionBarEvent +import at.hannibal2.skyhanni.utils.ItemUtils +import at.hannibal2.skyhanni.utils.ItemUtils.cleanName +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.between import net.minecraft.client.Minecraft import net.minecraft.client.renderer.GlStateManager import net.minecraft.item.ItemStack @@ -53,7 +53,7 @@ class ItemAbilityCooldown { } private fun isEnabled(): Boolean { - return LorenzUtils.inSkyblock && LorenzMod.feature.items.itemAbilityCooldown + return LorenzUtils.inSkyblock && SkyHanniMod.feature.items.itemAbilityCooldown } private fun click(ability: Ability) { diff --git a/src/main/java/at/lorenz/mod/items/abilitycooldown/WitherImpactDetection.kt b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt index e9f1d7eed..52caa59d0 100644 --- a/src/main/java/at/lorenz/mod/items/abilitycooldown/WitherImpactDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt @@ -1,9 +1,9 @@ -package at.lorenz.mod.items.abilitycooldown +package at.hannibal2.skyhanni.items.abilitycooldown -import at.lorenz.mod.events.PacketEvent -import at.lorenz.mod.utils.ItemUtil.asStringSet -import at.lorenz.mod.utils.ItemUtil.getExtraAttributes -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.utils.ItemUtil.asStringSet +import at.hannibal2.skyhanni.utils.ItemUtil.getExtraAttributes +import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.client.Minecraft import net.minecraft.init.Items import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement diff --git a/src/main/java/at/lorenz/mod/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt index 7b4785ee0..c42c304db 100644 --- a/src/main/java/at/lorenz/mod/misc/ButtonOnPause.kt +++ b/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt @@ -1,9 +1,9 @@ -package at.lorenz.mod.misc +package at.hannibal2.skyhanni.misc -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.config.config.ConfigEditor -import at.lorenz.mod.config.core.GuiScreenElementWrapper +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.config.ConfigEditor +import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper +import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.client.gui.GuiButton import net.minecraft.client.gui.GuiIngameMenu import net.minecraftforge.client.event.GuiScreenEvent @@ -16,10 +16,10 @@ class ButtonOnPause { fun onGuiAction(event: GuiScreenEvent.ActionPerformedEvent.Post) { if (!LorenzUtils.isOnHypixel) return - if (LorenzMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu && event.button.id == buttonId) { - LorenzMod.screenToOpen = GuiScreenElementWrapper( + if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu && event.button.id == buttonId) { + SkyHanniMod.screenToOpen = GuiScreenElementWrapper( ConfigEditor( - LorenzMod.feature + SkyHanniMod.feature ) ) } @@ -29,7 +29,7 @@ class ButtonOnPause { fun onGuiInitPost(event: GuiScreenEvent.InitGuiEvent.Post) { if (!LorenzUtils.isOnHypixel) return - if (LorenzMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu) { + if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu) { val x = event.gui.width - 105 val x2 = x + 100 var y = event.gui.height - 22 @@ -45,7 +45,7 @@ class ButtonOnPause { y2 = y + 20 } } - event.buttonList.add(GuiButton(buttonId, x, 0.coerceAtLeast(y), 100, 20, "Lorenz Mod")) + event.buttonList.add(GuiButton(buttonId, x, 0.coerceAtLeast(y), 100, 20, "SkyHanni")) } } }
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt index dcbbc1259..5adf570b5 100644 --- a/src/main/java/at/lorenz/mod/misc/CurrentPetDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt @@ -1,11 +1,11 @@ -package at.lorenz.mod.misc - -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.LorenzChatEvent -import at.lorenz.mod.utils.GuiRender.renderString -import at.lorenz.mod.utils.LorenzUtils -import at.lorenz.mod.utils.LorenzUtils.between -import at.lorenz.mod.utils.LorenzUtils.matchRegex +package at.hannibal2.skyhanni.misc + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.GuiRender.renderString +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.between +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -35,7 +35,7 @@ class CurrentPetDisplay { blocked = true } - if (blocked && LorenzMod.feature.misc.petDisplay) { + if (blocked && SkyHanniMod.feature.misc.petDisplay) { event.blockedReason = "pets" } } @@ -45,9 +45,9 @@ class CurrentPetDisplay { fun renderOverlay(event: RenderGameOverlayEvent.Post) { if (!LorenzUtils.inSkyblock) return - if (!LorenzMod.feature.misc.petDisplay) return + if (!SkyHanniMod.feature.misc.petDisplay) return if (currentPet == "") return - LorenzMod.feature.misc.petDisplayPos.renderString(currentPet) + SkyHanniMod.feature.misc.petDisplayPos.renderString(currentPet) } }
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/misc/ExpBottleOnGroundHider.kt b/src/main/java/at/hannibal2/skyhanni/misc/ExpBottleOnGroundHider.kt index 6b263cdd9..119160c4f 100644 --- a/src/main/java/at/lorenz/mod/misc/ExpBottleOnGroundHider.kt +++ b/src/main/java/at/hannibal2/skyhanni/misc/ExpBottleOnGroundHider.kt @@ -1,8 +1,8 @@ -package at.lorenz.mod.misc +package at.hannibal2.skyhanni.misc -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.events.CheckRenderEntityEvent -import at.lorenz.mod.utils.LorenzUtils +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.CheckRenderEntityEvent +import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.entity.item.EntityXPOrb import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -10,7 +10,7 @@ class ExpBottleOnGroundHider { @SubscribeEvent fun onCheckRender(event: CheckRenderEntityEvent<*>) { if (!LorenzUtils.inSkyblock) return - if (!LorenzMod.feature.misc.hideExpBottles) return + if (!SkyHanniMod.feature.misc.hideExpBottles) return if (event.entity is EntityXPOrb) { event.isCanceled = true diff --git a/src/main/java/at/lorenz/mod/misc/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt index e7c5a02f6..29fa2a242 100644 --- a/src/main/java/at/lorenz/mod/misc/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.misc +package at.hannibal2.skyhanni.misc -import at.lorenz.mod.events.PacketEvent +import at.hannibal2.skyhanni.events.PacketEvent import net.minecraft.client.Minecraft import net.minecraft.network.play.server.S38PacketPlayerListItem import net.minecraft.network.play.server.S3DPacketDisplayScoreboard diff --git a/src/main/java/at/lorenz/mod/misc/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt index e1735104d..166b6ce17 100644 --- a/src/main/java/at/lorenz/mod/misc/ScoreboardData.kt +++ b/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.misc +package at.hannibal2.skyhanni.misc -import at.lorenz.mod.utils.LorenzUtils.removeColorCodes +import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes import net.minecraft.client.Minecraft import net.minecraft.scoreboard.Score import net.minecraft.scoreboard.ScorePlayerTeam diff --git a/src/main/java/at/lorenz/mod/mixinhooks/GuiContainerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixinhooks/GuiContainerHook.kt index 101bb56a1..6f2c5c03e 100644 --- a/src/main/java/at/lorenz/mod/mixinhooks/GuiContainerHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixinhooks/GuiContainerHook.kt @@ -1,8 +1,8 @@ -package at.lorenz.mod.mixinhooks +package at.hannibal2.skyhanni.mixinhooks -import at.lorenz.mod.events.GuiContainerEvent -import at.lorenz.mod.events.GuiContainerEvent.CloseWindowEvent -import at.lorenz.mod.events.GuiContainerEvent.SlotClickEvent +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.events.GuiContainerEvent.CloseWindowEvent +import at.hannibal2.skyhanni.events.GuiContainerEvent.SlotClickEvent import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Slot import org.spongepowered.asm.mixin.injection.callback.CallbackInfo diff --git a/src/main/java/at/lorenz/mod/mixinhooks/NetHandlerPlayClientHook.kt b/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetHandlerPlayClientHook.kt index 41a59201e..57511d618 100644 --- a/src/main/java/at/lorenz/mod/mixinhooks/NetHandlerPlayClientHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetHandlerPlayClientHook.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixinhooks +package at.hannibal2.skyhanni.mixinhooks -import at.lorenz.mod.events.PacketEvent +import at.hannibal2.skyhanni.events.PacketEvent import net.minecraft.network.Packet import org.spongepowered.asm.mixin.injection.callback.CallbackInfo diff --git a/src/main/java/at/lorenz/mod/mixinhooks/NetworkManagerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetworkManagerHook.kt index 5f18be8d5..44746cfbf 100644 --- a/src/main/java/at/lorenz/mod/mixinhooks/NetworkManagerHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetworkManagerHook.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixinhooks +package at.hannibal2.skyhanni.mixinhooks -import at.lorenz.mod.events.PacketEvent +import at.hannibal2.skyhanni.events.PacketEvent import io.netty.channel.ChannelHandlerContext import net.minecraft.network.Packet import org.spongepowered.asm.mixin.injection.callback.CallbackInfo diff --git a/src/main/java/at/lorenz/mod/mixinhooks/RenderItemHook.kt b/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderItemHook.kt index f978fe823..3b8dd925d 100644 --- a/src/main/java/at/lorenz/mod/mixinhooks/RenderItemHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderItemHook.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixinhooks +package at.hannibal2.skyhanni.mixinhooks -import at.lorenz.mod.events.GuiRenderItemEvent +import at.hannibal2.skyhanni.events.GuiRenderItemEvent import net.minecraft.client.gui.FontRenderer import net.minecraft.item.ItemStack import net.minecraft.util.ResourceLocation diff --git a/src/main/java/at/lorenz/mod/mixinhooks/RenderManagerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderManagerHook.kt index 69242d651..a183a0caa 100644 --- a/src/main/java/at/lorenz/mod/mixinhooks/RenderManagerHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderManagerHook.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixinhooks +package at.hannibal2.skyhanni.mixinhooks -import at.lorenz.mod.events.CheckRenderEntityEvent +import at.hannibal2.skyhanni.events.CheckRenderEntityEvent import net.minecraft.client.renderer.culling.ICamera import net.minecraft.entity.Entity import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable diff --git a/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java b/src/main/java/at/hannibal2/skyhanni/mixins/MixinGuiContainer.java index 4bd09cda0..18997c33b 100644 --- a/src/main/java/at/lorenz/mod/mixins/MixinGuiContainer.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/MixinGuiContainer.java @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixins; +package at.hannibal2.skyhanni.mixins; -import at.lorenz.mod.mixinhooks.GuiContainerHook; +import at.hannibal2.skyhanni.mixinhooks.GuiContainerHook; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/at/lorenz/mod/mixins/MixinNetHandlerPlayClient.java b/src/main/java/at/hannibal2/skyhanni/mixins/MixinNetHandlerPlayClient.java index 08ddd69fa..3e91bdfe3 100644 --- a/src/main/java/at/lorenz/mod/mixins/MixinNetHandlerPlayClient.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/MixinNetHandlerPlayClient.java @@ -1,12 +1,10 @@ -package at.lorenz.mod.mixins; +package at.hannibal2.skyhanni.mixins; -import at.lorenz.mod.mixinhooks.NetHandlerPlayClientHookKt; +import at.hannibal2.skyhanni.mixinhooks.NetHandlerPlayClientHookKt; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; -import net.minecraft.entity.Entity; import net.minecraft.network.Packet; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.network.play.server.S0FPacketSpawnMob; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/at/lorenz/mod/mixins/MixinNetworkManager.java b/src/main/java/at/hannibal2/skyhanni/mixins/MixinNetworkManager.java index d8b2d0fd9..83f7f51bb 100644 --- a/src/main/java/at/lorenz/mod/mixins/MixinNetworkManager.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/MixinNetworkManager.java @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixins; +package at.hannibal2.skyhanni.mixins; -import at.lorenz.mod.mixinhooks.NetworkManagerHookKt; +import at.hannibal2.skyhanni.mixinhooks.NetworkManagerHookKt; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java b/src/main/java/at/hannibal2/skyhanni/mixins/MixinRenderItem.java index b03511271..e2dc8926c 100644 --- a/src/main/java/at/lorenz/mod/mixins/MixinRenderItem.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/MixinRenderItem.java @@ -1,9 +1,8 @@ -package at.lorenz.mod.mixins; +package at.hannibal2.skyhanni.mixins; -import at.lorenz.mod.mixinhooks.RenderItemHookKt; +import at.hannibal2.skyhanni.mixinhooks.RenderItemHookKt; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/at/lorenz/mod/mixins/MixinRenderManager.java b/src/main/java/at/hannibal2/skyhanni/mixins/MixinRenderManager.java index 918dce800..f57786a9b 100644 --- a/src/main/java/at/lorenz/mod/mixins/MixinRenderManager.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/MixinRenderManager.java @@ -1,6 +1,6 @@ -package at.lorenz.mod.mixins; +package at.hannibal2.skyhanni.mixins; -import at.lorenz.mod.mixinhooks.RenderManagerHookKt; +import at.hannibal2.skyhanni.mixinhooks.RenderManagerHookKt; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; diff --git a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt new file mode 100644 index 000000000..9cde01cc6 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt @@ -0,0 +1,28 @@ +package at.hannibal2.skyhanni.test + +import at.hannibal2.skyhanni.SkyHanniMod +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import at.hannibal2.skyhanni.utils.GuiRender.renderString +import at.hannibal2.skyhanni.utils.LorenzLogger +import net.minecraftforge.client.event.RenderGameOverlayEvent + +class LorenzTest { + + var log = LorenzLogger("debug/packets") + + companion object { + var enabled = false + var text = "" + + val debugLogger = LorenzLogger("debug/test") + } + + @SubscribeEvent + fun renderOverlay(event: RenderGameOverlayEvent.Post) { + if (!SkyHanniMod.feature.debug.enabled) return + + if (enabled) { + SkyHanniMod.feature.debug.testPos.renderString(text) + } + } +}
\ No newline at end of file diff --git a/src/main/java/at/lorenz/mod/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt index 7e0193f50..c321cf2d5 100644 --- a/src/main/java/at/lorenz/mod/utils/APIUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import com.google.gson.JsonObject import com.google.gson.JsonParser @@ -14,7 +14,7 @@ object APIUtil { private val parser = JsonParser() val builder: HttpClientBuilder = - HttpClients.custom().setUserAgent("LorenzMod") + HttpClients.custom().setUserAgent("SkyHanni") .setDefaultHeaders( mutableListOf( BasicHeader("Pragma", "no-cache"), @@ -39,7 +39,7 @@ object APIUtil { } } catch (ex: Throwable) { ex.printStackTrace() - LorenzUtils.error("Lorenz Mod ran into an ${ex::class.simpleName ?: "error"} whilst fetching a resource. See logs for more details.") + LorenzUtils.error("SkyHanni ran into an ${ex::class.simpleName ?: "error"} whilst fetching a resource. See logs for more details.") } finally { client.close() } diff --git a/src/main/java/at/lorenz/mod/utils/BlockUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt index d16194c70..368b06daf 100644 --- a/src/main/java/at/lorenz/mod/utils/BlockUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/BlockUtils.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import net.minecraft.block.Block import net.minecraft.client.Minecraft diff --git a/src/main/java/at/lorenz/mod/utils/GuiRender.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRender.kt index 03918fb66..221cbd9a2 100644 --- a/src/main/java/at/lorenz/mod/utils/GuiRender.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRender.kt @@ -1,7 +1,7 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils -import at.lorenz.mod.utils.LorenzUtils.removeColorCodes -import at.lorenz.mod.config.core.config.Position +import at.hannibal2.skyhanni.config.core.config.Position +import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes import net.minecraft.client.Minecraft import net.minecraft.client.gui.ScaledResolution import net.minecraft.client.renderer.GlStateManager diff --git a/src/main/java/at/lorenz/mod/utils/ItemUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtil.kt index 341b94ca8..d10adc06c 100644 --- a/src/main/java/at/lorenz/mod/utils/ItemUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtil.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import net.minecraft.init.Items import net.minecraft.item.ItemStack diff --git a/src/main/java/at/lorenz/mod/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index 6d5bf57da..b077c4121 100644 --- a/src/main/java/at/lorenz/mod/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -1,7 +1,7 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils -import at.lorenz.mod.utils.LorenzUtils.matchRegex -import at.lorenz.mod.utils.LorenzUtils.removeColorCodes +import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex +import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.item.ItemStack diff --git a/src/main/java/at/lorenz/mod/utils/LorenzColor.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt index e60d6d8d1..961ed57ec 100644 --- a/src/main/java/at/lorenz/mod/utils/LorenzColor.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import java.awt.Color diff --git a/src/main/java/at/lorenz/mod/utils/LorenzDebug.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzDebug.kt index 32e4ac6f0..5212dfc95 100644 --- a/src/main/java/at/lorenz/mod/utils/LorenzDebug.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzDebug.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils object LorenzDebug { diff --git a/src/main/java/at/lorenz/mod/utils/LorenzLogger.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzLogger.kt index 48bfc6099..23ca8df25 100644 --- a/src/main/java/at/lorenz/mod/utils/LorenzLogger.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzLogger.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils -import at.lorenz.mod.utils.LorenzUtils.formatCurrentTime +import at.hannibal2.skyhanni.utils.LorenzUtils.formatCurrentTime import java.io.File import java.io.IOException import java.text.SimpleDateFormat @@ -18,7 +18,7 @@ class LorenzLogger(filePath: String) { init { val format = SimpleDateFormat("yyyy_MM_dd/HH_mm_ss").formatCurrentTime() - PREFIX_PATH = "mods/LorenzMod/logs/$format/" + PREFIX_PATH = "mods/SkyHanni/logs/$format/" } } diff --git a/src/main/java/at/lorenz/mod/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index 875b41af5..13afe8ac2 100644 --- a/src/main/java/at/lorenz/mod/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -1,6 +1,6 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils -import at.lorenz.mod.misc.HypixelData +import at.hannibal2.skyhanni.misc.HypixelData import net.minecraft.client.Minecraft import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.SharedMonsterAttributes @@ -85,23 +85,6 @@ object LorenzUtils { while (message.endsWith("§r")) { message = message.substring(0, message.length - 2) } - -// if (!message.startsWith(LorenzUtils.DEBUG_PREFIX + "chat api got (123)")) { -// if (message.matchRegex("(.*)§r§7 \\((.{1,3})\\)")) { -// val indexOf = message.lastIndexOf("(") -//// LorenzAddons.testLogger.log("chat api got (123)!") -//// LorenzAddons.testLogger.log("before: '$message'") -// message = message.substring(0, indexOf - 5) -//// LorenzAddons.testLogger.log("after: '$message'") -//// LorenzAddons.testLogger.log("") -//// LorenzUtils.debug("chat api got (123)") -//// } else if (message.endsWith("§r§7 (2)")) { -////// LorenzAddons.testLogger.log("other variant: '$message'") -////// LorenzAddons.testLogger.log("") -//// LorenzUtils.debug("chat api got WRONG (123)") -// } -// } - return message } diff --git a/src/main/java/at/lorenz/mod/utils/LorenzVec.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt index 7dc29b369..bfc5f7228 100644 --- a/src/main/java/at/lorenz/mod/utils/LorenzVec.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzVec.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import net.minecraft.entity.Entity import net.minecraft.util.BlockPos diff --git a/src/main/java/at/lorenz/mod/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt index 12040bd07..891826a91 100644 --- a/src/main/java/at/lorenz/mod/utils/NumberUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import java.text.NumberFormat import java.util.* diff --git a/src/main/java/at/lorenz/mod/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index 2e422ed6a..763e4288e 100644 --- a/src/main/java/at/lorenz/mod/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -1,4 +1,4 @@ -package at.lorenz.mod.utils +package at.hannibal2.skyhanni.utils import net.minecraft.client.Minecraft import net.minecraft.client.gui.Gui diff --git a/src/main/java/at/lorenz/mod/config/commands/Commands.java b/src/main/java/at/lorenz/mod/config/commands/Commands.java deleted file mode 100644 index 05963ead6..000000000 --- a/src/main/java/at/lorenz/mod/config/commands/Commands.java +++ /dev/null @@ -1,31 +0,0 @@ -package at.lorenz.mod.config.commands; - -import at.lorenz.mod.LorenzMod; -import at.lorenz.mod.config.config.ConfigEditor; -import at.lorenz.mod.config.core.GuiScreenElementWrapper; -import net.minecraft.command.ICommandSender; -import net.minecraftforge.client.ClientCommandHandler; -import org.apache.commons.lang3.StringUtils; - -public class Commands { - - private static final boolean devMode = false; - - private static final SimpleCommand.ProcessCommandRunnable settingsRunnable = new SimpleCommand.ProcessCommandRunnable() { - public void processCommand(ICommandSender sender, String[] args) { - if (args.length > 0) { - LorenzMod.screenToOpen = new GuiScreenElementWrapper(new ConfigEditor(LorenzMod.feature, StringUtils.join(args, " "))); - } else { - LorenzMod.screenToOpen = new GuiScreenElementWrapper(new ConfigEditor(LorenzMod.feature)); - } - } - }; - - private static final SimpleCommand settingsCommand = new SimpleCommand("lm", settingsRunnable); - private static final SimpleCommand settingsCommand2 = new SimpleCommand("lorenzmod", settingsRunnable); - - public static void init() { - ClientCommandHandler.instance.registerCommand(settingsCommand); - ClientCommandHandler.instance.registerCommand(settingsCommand2); - } -} diff --git a/src/main/java/at/lorenz/mod/test/LorenzTest.kt b/src/main/java/at/lorenz/mod/test/LorenzTest.kt deleted file mode 100644 index 01ecf3dcd..000000000 --- a/src/main/java/at/lorenz/mod/test/LorenzTest.kt +++ /dev/null @@ -1,40 +0,0 @@ -package at.lorenz.mod.test - -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import at.lorenz.mod.LorenzMod -import at.lorenz.mod.utils.GuiRender.renderString -import at.lorenz.mod.utils.LorenzLogger -import net.minecraftforge.client.event.RenderGameOverlayEvent - -class LorenzTest { - - var log = LorenzLogger("debug/packets") - - companion object { - var enabled = false - var text = "" - - val debugLogger = LorenzLogger("debug/test") - } - @SubscribeEvent - fun renderOverlay(event: RenderGameOverlayEvent.Post) { - if (!LorenzMod.feature.debug.enabled) return - - if (enabled) { - LorenzMod.feature.debug.testPos.renderString(text) - } - } - -// @SubscribeEvent -// fun onReceivePacket(event: PacketEvent.ReceiveEvent) { -// if (!LorenzMod.feature.debug.enabled) return -// -// var packet = event.packet -// var javaClass = packet.javaClass -// var name = javaClass.name -// -// if (enabled) { -// log.log(name) -// } -// } -}
\ No newline at end of file diff --git a/src/main/resources/assets/skyhanni/bars.png b/src/main/resources/assets/skyhanni/bars.png Binary files differnew file mode 100644 index 000000000..edf1b70ed --- /dev/null +++ b/src/main/resources/assets/skyhanni/bars.png diff --git a/src/main/resources/assets/skyhanni/button.png b/src/main/resources/assets/skyhanni/button.png Binary files differnew file mode 100644 index 000000000..e96f4284c --- /dev/null +++ b/src/main/resources/assets/skyhanni/button.png diff --git a/src/main/resources/assets/skyhanni/button_white.png b/src/main/resources/assets/skyhanni/button_white.png Binary files differnew file mode 100644 index 000000000..7763716d0 --- /dev/null +++ b/src/main/resources/assets/skyhanni/button_white.png diff --git a/src/main/resources/assets/skyhanni/core/bar.png b/src/main/resources/assets/skyhanni/core/bar.png Binary files differnew file mode 100644 index 000000000..664c0f325 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/bar.png diff --git a/src/main/resources/assets/skyhanni/core/colour_selector_bar.png b/src/main/resources/assets/skyhanni/core/colour_selector_bar.png Binary files differnew file mode 100644 index 000000000..f176af90b --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/colour_selector_bar.png diff --git a/src/main/resources/assets/skyhanni/core/colour_selector_bar_alpha.png b/src/main/resources/assets/skyhanni/core/colour_selector_bar_alpha.png Binary files differnew file mode 100644 index 000000000..7a89510c3 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/colour_selector_bar_alpha.png diff --git a/src/main/resources/assets/skyhanni/core/colour_selector_chroma.png b/src/main/resources/assets/skyhanni/core/colour_selector_chroma.png Binary files differnew file mode 100644 index 000000000..ea273959b --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/colour_selector_chroma.png diff --git a/src/main/resources/assets/skyhanni/core/colour_selector_dot.png b/src/main/resources/assets/skyhanni/core/colour_selector_dot.png Binary files differnew file mode 100644 index 000000000..1150c8bb7 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/colour_selector_dot.png diff --git a/src/main/resources/assets/skyhanni/core/delete.png b/src/main/resources/assets/skyhanni/core/delete.png Binary files differnew file mode 100644 index 000000000..8183ee8f0 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/delete.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_button.png b/src/main/resources/assets/skyhanni/core/slider/slider_button.png Binary files differnew file mode 100644 index 000000000..d49d24adc --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_button.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_off_cap.png b/src/main/resources/assets/skyhanni/core/slider/slider_off_cap.png Binary files differnew file mode 100644 index 000000000..16c89f728 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_off_cap.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_off_notch.png b/src/main/resources/assets/skyhanni/core/slider/slider_off_notch.png Binary files differnew file mode 100644 index 000000000..cd7e1c54a --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_off_notch.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_off_segment.png b/src/main/resources/assets/skyhanni/core/slider/slider_off_segment.png Binary files differnew file mode 100644 index 000000000..ff0e6b919 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_off_segment.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_on_cap.png b/src/main/resources/assets/skyhanni/core/slider/slider_on_cap.png Binary files differnew file mode 100644 index 000000000..21e50b714 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_on_cap.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_on_notch.png b/src/main/resources/assets/skyhanni/core/slider/slider_on_notch.png Binary files differnew file mode 100644 index 000000000..947389dd6 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_on_notch.png diff --git a/src/main/resources/assets/skyhanni/core/slider/slider_on_segment.png b/src/main/resources/assets/skyhanni/core/slider/slider_on_segment.png Binary files differnew file mode 100644 index 000000000..86a311ba8 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/slider/slider_on_segment.png diff --git a/src/main/resources/assets/skyhanni/core/toggle_1.png b/src/main/resources/assets/skyhanni/core/toggle_1.png Binary files differnew file mode 100644 index 000000000..618e2c62a --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/toggle_1.png diff --git a/src/main/resources/assets/skyhanni/core/toggle_2.png b/src/main/resources/assets/skyhanni/core/toggle_2.png Binary files differnew file mode 100644 index 000000000..4bb5ee394 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/toggle_2.png diff --git a/src/main/resources/assets/skyhanni/core/toggle_3.png b/src/main/resources/assets/skyhanni/core/toggle_3.png Binary files differnew file mode 100644 index 000000000..50164cc30 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/toggle_3.png diff --git a/src/main/resources/assets/skyhanni/core/toggle_off.png b/src/main/resources/assets/skyhanni/core/toggle_off.png Binary files differnew file mode 100644 index 000000000..ed7d5e686 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/toggle_off.png diff --git a/src/main/resources/assets/skyhanni/core/toggle_on.png b/src/main/resources/assets/skyhanni/core/toggle_on.png Binary files differnew file mode 100644 index 000000000..68ce1c0c0 --- /dev/null +++ b/src/main/resources/assets/skyhanni/core/toggle_on.png diff --git a/src/main/resources/assets/skyhanni/dialogue.png b/src/main/resources/assets/skyhanni/dialogue.png Binary files differnew file mode 100644 index 000000000..b637193d1 --- /dev/null +++ b/src/main/resources/assets/skyhanni/dialogue.png diff --git a/src/main/resources/assets/lorenzmod/discord.png b/src/main/resources/assets/skyhanni/discord.png Binary files differindex 27962167d..27962167d 100644 --- a/src/main/resources/assets/lorenzmod/discord.png +++ b/src/main/resources/assets/skyhanni/discord.png diff --git a/src/main/resources/assets/skyhanni/dungeon.png b/src/main/resources/assets/skyhanni/dungeon.png Binary files differnew file mode 100644 index 000000000..4eb4fb641 --- /dev/null +++ b/src/main/resources/assets/skyhanni/dungeon.png diff --git a/src/main/resources/assets/skyhanni/maps/barn.png b/src/main/resources/assets/skyhanni/maps/barn.png Binary files differnew file mode 100644 index 000000000..45a830eac --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/barn.png diff --git a/src/main/resources/assets/skyhanni/maps/crystal.png b/src/main/resources/assets/skyhanni/maps/crystal.png Binary files differnew file mode 100644 index 000000000..7559f4039 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/crystal.png diff --git a/src/main/resources/assets/skyhanni/maps/dwarven.png b/src/main/resources/assets/skyhanni/maps/dwarven.png Binary files differnew file mode 100644 index 000000000..4c99ef644 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/dwarven.png diff --git a/src/main/resources/assets/skyhanni/maps/fort.png b/src/main/resources/assets/skyhanni/maps/fort.png Binary files differnew file mode 100644 index 000000000..35a3f3988 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/fort.png diff --git a/src/main/resources/assets/skyhanni/maps/hub.png b/src/main/resources/assets/skyhanni/maps/hub.png Binary files differnew file mode 100644 index 000000000..0f75d6f74 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/hub.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/adventurer.png b/src/main/resources/assets/skyhanni/maps/icons/adventurer.png Binary files differnew file mode 100644 index 000000000..0415d6ec0 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/adventurer.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/ah.png b/src/main/resources/assets/skyhanni/maps/icons/ah.png Binary files differnew file mode 100644 index 000000000..7881aa7e6 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/ah.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/armor.png b/src/main/resources/assets/skyhanni/maps/icons/armor.png Binary files differnew file mode 100644 index 000000000..406cabe5c --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/armor.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/balloon.png b/src/main/resources/assets/skyhanni/maps/icons/balloon.png Binary files differnew file mode 100644 index 000000000..12f649ff5 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/balloon.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/bank.png b/src/main/resources/assets/skyhanni/maps/icons/bank.png Binary files differnew file mode 100644 index 000000000..7ea62d48c --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/bank.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/bank_upgrader.png b/src/main/resources/assets/skyhanni/maps/icons/bank_upgrader.png Binary files differnew file mode 100644 index 000000000..041686a38 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/bank_upgrader.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/bar.png b/src/main/resources/assets/skyhanni/maps/icons/bar.png Binary files differnew file mode 100644 index 000000000..6e07819c2 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/bar.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/bazaar.png b/src/main/resources/assets/skyhanni/maps/icons/bazaar.png Binary files differnew file mode 100644 index 000000000..ce55f87ce --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/bazaar.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/blacksmith.png b/src/main/resources/assets/skyhanni/maps/icons/blacksmith.png Binary files differnew file mode 100644 index 000000000..3b67ce269 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/blacksmith.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/building.png b/src/main/resources/assets/skyhanni/maps/icons/building.png Binary files differnew file mode 100644 index 000000000..9f36f3138 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/building.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/community.png b/src/main/resources/assets/skyhanni/maps/icons/community.png Binary files differnew file mode 100644 index 000000000..8e93d2d94 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/community.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/crown.png b/src/main/resources/assets/skyhanni/maps/icons/crown.png Binary files differnew file mode 100644 index 000000000..08a9b02ee --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/crown.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/dark_ah.png b/src/main/resources/assets/skyhanni/maps/icons/dark_ah.png Binary files differnew file mode 100644 index 000000000..e8cc0d439 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/dark_ah.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/dark_bar.png b/src/main/resources/assets/skyhanni/maps/icons/dark_bar.png Binary files differnew file mode 100644 index 000000000..6aa2be485 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/dark_bar.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/dungeon_portal.png b/src/main/resources/assets/skyhanni/maps/icons/dungeon_portal.png Binary files differnew file mode 100644 index 000000000..b4cad6d33 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/dungeon_portal.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/enter.png b/src/main/resources/assets/skyhanni/maps/icons/enter.png Binary files differnew file mode 100644 index 000000000..53cb4cada --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/enter.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/exit.png b/src/main/resources/assets/skyhanni/maps/icons/exit.png Binary files differnew file mode 100644 index 000000000..13ba7db5f --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/exit.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/fairy.png b/src/main/resources/assets/skyhanni/maps/icons/fairy.png Binary files differnew file mode 100644 index 000000000..93ada2b78 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/fairy.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/fishing.png b/src/main/resources/assets/skyhanni/maps/icons/fishing.png Binary files differnew file mode 100644 index 000000000..eba133d97 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/fishing.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/fishing_merchant.png b/src/main/resources/assets/skyhanni/maps/icons/fishing_merchant.png Binary files differnew file mode 100644 index 000000000..b0fcfd179 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/fishing_merchant.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/lumber.png b/src/main/resources/assets/skyhanni/maps/icons/lumber.png Binary files differnew file mode 100644 index 000000000..9794416f4 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/lumber.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/maddox.png b/src/main/resources/assets/skyhanni/maps/icons/maddox.png Binary files differnew file mode 100644 index 000000000..cad345913 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/maddox.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/metal_merchants.png b/src/main/resources/assets/skyhanni/maps/icons/metal_merchants.png Binary files differnew file mode 100644 index 000000000..eb26bb2b3 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/metal_merchants.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/mine.png b/src/main/resources/assets/skyhanni/maps/icons/mine.png Binary files differnew file mode 100644 index 000000000..96dc07004 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/mine.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/painter.png b/src/main/resources/assets/skyhanni/maps/icons/painter.png Binary files differnew file mode 100644 index 000000000..5fe8d1bad --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/painter.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/pointer.png b/src/main/resources/assets/skyhanni/maps/icons/pointer.png Binary files differnew file mode 100644 index 000000000..f124963b7 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/pointer.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/portal.png b/src/main/resources/assets/skyhanni/maps/icons/portal.png Binary files differnew file mode 100644 index 000000000..cdc6b2e77 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/portal.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/puzzle.png b/src/main/resources/assets/skyhanni/maps/icons/puzzle.png Binary files differnew file mode 100644 index 000000000..7d1128ecb --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/puzzle.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/redstone.png b/src/main/resources/assets/skyhanni/maps/icons/redstone.png Binary files differnew file mode 100644 index 000000000..bbdc9ad67 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/redstone.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/reforge.png b/src/main/resources/assets/skyhanni/maps/icons/reforge.png Binary files differnew file mode 100644 index 000000000..672ce5a61 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/reforge.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/runes.png b/src/main/resources/assets/skyhanni/maps/icons/runes.png Binary files differnew file mode 100644 index 000000000..82b99aa7c --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/runes.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/scroll.png b/src/main/resources/assets/skyhanni/maps/icons/scroll.png Binary files differnew file mode 100644 index 000000000..ce2bd2bf9 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/scroll.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/special.png b/src/main/resources/assets/skyhanni/maps/icons/special.png Binary files differnew file mode 100644 index 000000000..0e3c8298d --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/special.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/tux.png b/src/main/resources/assets/skyhanni/maps/icons/tux.png Binary files differnew file mode 100644 index 000000000..d01f11686 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/tux.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/vet.png b/src/main/resources/assets/skyhanni/maps/icons/vet.png Binary files differnew file mode 100644 index 000000000..dc400650d --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/vet.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/warp.png b/src/main/resources/assets/skyhanni/maps/icons/warp.png Binary files differnew file mode 100644 index 000000000..f5f110eef --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/warp.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/weapon.png b/src/main/resources/assets/skyhanni/maps/icons/weapon.png Binary files differnew file mode 100644 index 000000000..00050931a --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/weapon.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/witch.png b/src/main/resources/assets/skyhanni/maps/icons/witch.png Binary files differnew file mode 100644 index 000000000..fd063e031 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/witch.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/wizard.png b/src/main/resources/assets/skyhanni/maps/icons/wizard.png Binary files differnew file mode 100644 index 000000000..5ccfe009b --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/wizard.png diff --git a/src/main/resources/assets/skyhanni/maps/icons/wool.png b/src/main/resources/assets/skyhanni/maps/icons/wool.png Binary files differnew file mode 100644 index 000000000..d6446f99f --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/icons/wool.png diff --git a/src/main/resources/assets/skyhanni/maps/map_overlay.png b/src/main/resources/assets/skyhanni/maps/map_overlay.png Binary files differnew file mode 100644 index 000000000..76d4ef275 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/map_overlay.png diff --git a/src/main/resources/assets/skyhanni/maps/mushroom.png b/src/main/resources/assets/skyhanni/maps/mushroom.png Binary files differnew file mode 100644 index 000000000..be97e3518 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/mushroom.png diff --git a/src/main/resources/assets/skyhanni/maps/park.png b/src/main/resources/assets/skyhanni/maps/park.png Binary files differnew file mode 100644 index 000000000..f70e03f46 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/park.png diff --git a/src/main/resources/assets/skyhanni/maps/readme.txt b/src/main/resources/assets/skyhanni/maps/readme.txt new file mode 100644 index 000000000..8a8aca2fe --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/readme.txt @@ -0,0 +1,4 @@ +Pack Devs please only change the colors on these maps +as changing the size may screw up the player offsets +and I dont want people to complain because their resourcepack changed the +map size. You can change everything else but dont change the size.
\ No newline at end of file diff --git a/src/main/resources/assets/skyhanni/maps/spidersden.png b/src/main/resources/assets/skyhanni/maps/spidersden.png Binary files differnew file mode 100644 index 000000000..066ddd226 --- /dev/null +++ b/src/main/resources/assets/skyhanni/maps/spidersden.png diff --git a/src/main/resources/assets/skyhanni/mines.png b/src/main/resources/assets/skyhanni/mines.png Binary files differnew file mode 100644 index 000000000..a4e61447e --- /dev/null +++ b/src/main/resources/assets/skyhanni/mines.png diff --git a/src/main/resources/assets/skyhanni/playerstats.png b/src/main/resources/assets/skyhanni/playerstats.png Binary files differnew file mode 100644 index 000000000..71a47b400 --- /dev/null +++ b/src/main/resources/assets/skyhanni/playerstats.png diff --git a/src/main/resources/assets/skyhanni/stats.png b/src/main/resources/assets/skyhanni/stats.png Binary files differnew file mode 100644 index 000000000..d93e6da5f --- /dev/null +++ b/src/main/resources/assets/skyhanni/stats.png diff --git a/src/main/resources/assets/skyhanni/twitter.png b/src/main/resources/assets/skyhanni/twitter.png Binary files differnew file mode 100644 index 000000000..5f249b80b --- /dev/null +++ b/src/main/resources/assets/skyhanni/twitter.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 2abae9d39..0525b26f1 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,7 +1,7 @@ [ { - "modid": "lorenzmod", - "name": "Lorenz Mod", + "modid": "skyhanni", + "name": "SkyHanni", "description": "Hypixel Skyblock Mod", "version": "${version}", "mcversion": "${mcversion}", diff --git a/src/main/resources/mixins.lorenzmod.json b/src/main/resources/mixins.skyhanni.json index fcbd5f82c..1177140bb 100644 --- a/src/main/resources/mixins.lorenzmod.json +++ b/src/main/resources/mixins.skyhanni.json @@ -1,6 +1,6 @@ { - "package": "at.lorenz.mod.mixins", - "refmap": "mixins.lorenzmod.refmap.json", + "package": "at.hannibal2.skyhanni.mixins", + "refmap": "mixins.skyhanni.refmap.json", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinGuiContainer", |
