diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
8 files changed, 19 insertions, 19 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt index e750245b9..421b7b951 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt @@ -5,8 +5,8 @@ import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.KeyboardManager import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.OSUtils -import io.github.moulberry.moulconfig.internal.GlScissorStack -import io.github.moulberry.moulconfig.internal.RenderUtils +import io.github.notenoughupdates.moulconfig.internal.GlScissorStack +import io.github.notenoughupdates.moulconfig.internal.RenderUtils import io.github.moulberry.notenoughupdates.util.Utils import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiScreen diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatPeek.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatPeek.kt index 2d275d9b6..b896904b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatPeek.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatPeek.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui import at.hannibal2.skyhanni.utils.KeyboardManager.isKeyHeld import at.hannibal2.skyhanni.utils.NEUItems -import io.github.moulberry.moulconfig.gui.GuiScreenElementWrapper +import io.github.notenoughupdates.moulconfig.gui.GuiScreenElementWrapper import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiEditSign import org.lwjgl.input.Keyboard diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index 018867116..fd73ec730 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.renderables.Renderable -import io.github.moulberry.moulconfig.observer.Property +import io.github.notenoughupdates.moulconfig.observer.Property import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiEditSign import net.minecraftforge.client.event.GuiOpenEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt index 0d504e459..ae7d22c41 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigFeatures.kt @@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigFileType import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.utils.ChatUtils -import io.github.moulberry.moulconfig.processor.ConfigProcessorDriver +import io.github.notenoughupdates.moulconfig.processor.ConfigProcessorDriver import net.minecraft.client.Minecraft import net.minecraft.command.CommandBase import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -28,7 +28,7 @@ object DefaultConfigFeatures { val knownToggles = SkyHanniMod.knownFeaturesData.knownFeatures val updated = SkyHanniMod.version !in knownToggles val processor = FeatureToggleProcessor() - ConfigProcessorDriver.processConfig(SkyHanniMod.feature.javaClass, SkyHanniMod.feature, processor) + ConfigProcessorDriver(processor).processConfig(SkyHanniMod.feature) knownToggles[SkyHanniMod.version] = processor.allOptions.map { it.path } SkyHanniMod.configManager.saveConfig(ConfigFileType.KNOWN_FEATURES, "Updated known feature flags") if (!SkyHanniMod.feature.storage.hasPlayedBefore) { @@ -51,7 +51,7 @@ object DefaultConfigFeatures { fun onCommand(old: String, new: String) { val processor = FeatureToggleProcessor() - ConfigProcessorDriver.processConfig(SkyHanniMod.feature.javaClass, SkyHanniMod.feature, processor) + ConfigProcessorDriver(processor).processConfig(SkyHanniMod.feature) var optionList = processor.orderedOptions val knownToggles = SkyHanniMod.knownFeaturesData.knownFeatures val togglesInNewVersion = knownToggles[new] diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt index d878d9665..c1420bc8c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/DefaultConfigOptionGui.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.features.misc.massconfiguration -import io.github.moulberry.moulconfig.internal.GlScissorStack -import io.github.moulberry.moulconfig.internal.RenderUtils -import io.github.moulberry.moulconfig.internal.TextRenderUtils +import io.github.notenoughupdates.moulconfig.internal.GlScissorStack +import io.github.notenoughupdates.moulconfig.internal.RenderUtils +import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils import io.github.moulberry.notenoughupdates.util.Utils import net.minecraft.client.gui.GuiScreen import net.minecraft.client.gui.ScaledResolution diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt index 7cf0db710..2b33885c1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/FeatureToggleProcessor.kt @@ -1,10 +1,10 @@ package at.hannibal2.skyhanni.features.misc.massconfiguration import at.hannibal2.skyhanni.config.FeatureToggle -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean -import io.github.moulberry.moulconfig.annotations.ConfigOption -import io.github.moulberry.moulconfig.observer.Property -import io.github.moulberry.moulconfig.processor.ConfigStructureReader +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption +import io.github.notenoughupdates.moulconfig.observer.Property +import io.github.notenoughupdates.moulconfig.processor.ConfigStructureReader import java.lang.reflect.Field import java.lang.reflect.ParameterizedType import java.util.Stack @@ -88,4 +88,4 @@ class FeatureToggleProcessor : ConfigStructureReader { override fun emitGuiOverlay(baseObject: Any?, field: Field?, option: ConfigOption?) { } -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt index e92d6bdf3..057c0dfdc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.features.misc.update import at.hannibal2.skyhanni.SkyHanniMod -import io.github.moulberry.moulconfig.gui.GuiOptionEditor -import io.github.moulberry.moulconfig.internal.TextRenderUtils -import io.github.moulberry.moulconfig.processor.ProcessedOption +import io.github.notenoughupdates.moulconfig.gui.GuiOptionEditor +import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils +import io.github.notenoughupdates.moulconfig.processor.ProcessedOption import io.github.moulberry.notenoughupdates.itemeditor.GuiElementButton import net.minecraft.client.Minecraft import net.minecraft.client.renderer.GlStateManager diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt index b96533cc6..0377e1467 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/UpdateManager.kt @@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle import at.hannibal2.skyhanni.utils.LorenzLogger import com.google.gson.JsonElement -import io.github.moulberry.moulconfig.processor.MoulConfigProcessor +import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor import io.github.moulberry.notenoughupdates.util.ApiUtil import io.github.moulberry.notenoughupdates.util.MinecraftExecutor import moe.nea.libautoupdate.CurrentVersion |