temporarily remove vigilance customizer

Polyfrost · Mar 5, 2022 · e98ca72 · e98ca72
1 parent e6bdd48
commit e98ca72
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 352 deletions.
diff --git a/src/main/java/net/wyvest/redaction/mixin/VigilancePaletteMixin.java b/src/main/java/net/wyvest/redaction/mixin/VigilancePaletteMixin.java
diff --git a/src/main/kotlin/net/wyvest/redaction/Redaction.kt b/src/main/kotlin/net/wyvest/redaction/Redaction.kt
@@ -3,21 +3,18 @@ package net.wyvest.redaction
 import cc.woverflow.onecore.utils.Updater
 import cc.woverflow.onecore.utils.command
 import cc.woverflow.onecore.utils.openScreen
-import gg.essential.api.utils.Multithreading
 import net.minecraft.client.Minecraft
 import net.minecraftforge.common.MinecraftForge.EVENT_BUS
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
 import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
 import net.wyvest.redaction.config.RedactionConfig
-import net.wyvest.redaction.config.VigilanceConfig
 import net.wyvest.redaction.features.BlackBar
 import net.wyvest.redaction.features.ParticleManager
 import net.wyvest.redaction.features.ServerManager
 import net.wyvest.redaction.features.hitbox.Hitboxes
 import net.wyvest.redaction.gui.HitboxPreviewGUI
-import net.wyvest.redaction.plugin.RedactionMixinPlugin
 import java.io.File
 
 @Mod(
@@ -40,7 +37,6 @@ object Redaction {
     private fun onFMLPreInitialization(event: FMLPreInitializationEvent) {
         if (!modDir.exists())
             modDir.mkdirs()
-        Multithreading.runAsync { RedactionMixinPlugin.shouldApplyVigilanceMixin }
         Updater.addToUpdater(event.sourceFile, NAME, ID, VERSION, "W-OVERFLOW/REDACTION")
     }
 
@@ -55,12 +51,6 @@ object Redaction {
                 HitboxPreviewGUI().openScreen()
             }
         }
-
-        command("vigilance", aliases = arrayListOf("vigilant")) {
-            main {
-                VigilanceConfig.openScreen()
-            }
-        }
         EVENT_BUS.register(ParticleManager)
         EVENT_BUS.register(ServerManager)
         Hitboxes.initialize()

diff --git a/src/main/kotlin/net/wyvest/redaction/config/RedactionConfig.kt b/src/main/kotlin/net/wyvest/redaction/config/RedactionConfig.kt
@@ -1,6 +1,5 @@
 package net.wyvest.redaction.config
 
-import cc.woverflow.onecore.utils.openScreen
 import gg.essential.api.EssentialAPI
 import gg.essential.api.utils.Multithreading
 import gg.essential.vigilance.Vigilant
@@ -148,14 +147,6 @@ object RedactionConfig : Vigilant(File(Redaction.modDir, "${Redaction.ID}.toml")
     )
     var textColor = 0
 
-    @Property(
-        type = PropertyType.BUTTON,
-        name = "Vigilance Customizer GUI",
-        description = "Show the Vigilance Customizer GUI.",
-        category = "Vigilance Customizer"
-    )
-    fun openVigilanceGUI() = VigilanceConfig.openScreen()
-
     init {
         initialize()
         registerListener("particles") { newValue: Int ->

diff --git a/src/main/kotlin/net/wyvest/redaction/config/VigilanceConfig.kt b/src/main/kotlin/net/wyvest/redaction/config/VigilanceConfig.kt