Skip to content

Commit aa804dc

Browse files
SychicMy-Name-Is-Jeff
authored andcommitted
fix: use exposed methods instead of access transformer for command manager
1 parent f485076 commit aa804dc

File tree

5 files changed

+2
-44
lines changed

5 files changed

+2
-44
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ loom {
7979
}
8080
forge {
8181
mixinConfig("mixins.skytils.json", "mixins.skytils-events.json")
82-
accessTransformer("src/main/resources/META-INF/accesstransformer.cfg")
8382
}
8483
mixin {
8584
defaultRefmapName = "mixins.skytils.refmap.json"
@@ -182,7 +181,6 @@ tasks {
182181
attributes(
183182
mapOf(
184183
"Main-Class" to "SkytilsInstallerFrame",
185-
"FMLAT" to "accesstransformer.cfg",
186184
"FMLCorePlugin" to "gg.skytils.skytilsmod.tweaker.SkytilsLoadingPlugin",
187185
"FMLCorePluginContainsFMLMod" to true,
188186
"ForceLoadAsMod" to true,

src/main/java/gg/skytils/skytilsmod/mixins/transformers/accessors/AccessorLoadController.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/kotlin/gg/skytils/skytilsmod/features/impl/handlers/CommandManager.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import gg.essential.universal.UChat
2222
import gg.skytils.skytilsmod.Skytils.Companion.mc
2323
import gg.skytils.skytilsmod.events.impl.SendChatMessageEvent
2424
import gg.skytils.skytilsmod.mixins.transformers.accessors.AccessorCommandHandler
25-
import gg.skytils.skytilsmod.mixins.transformers.accessors.AccessorLoadController
2625
import gg.skytils.skytilsmod.utils.ObservableAddEvent
2726
import gg.skytils.skytilsmod.utils.ObservableClearEvent
2827
import gg.skytils.skytilsmod.utils.ObservableRemoveEvent
@@ -37,10 +36,6 @@ object CommandManager {
3736
ClientCommandHandler.instance as AccessorCommandHandler
3837
}
3938

40-
val loadController by lazy {
41-
Loader.instance().modController as AccessorLoadController
42-
}
43-
4439
val aliasMap = mutableMapOf<ICommand, String>()
4540

4641
fun setup(listeningSet: ObservableSet<ICommand>) {
@@ -67,11 +62,9 @@ object CommandManager {
6762
}
6863

6964
fun registerCommandHelper(command: ICommand) {
70-
val clazzName = command.javaClass.name
71-
val pkg = clazzName.substringBeforeLast('.')
72-
val owners = loadController.packageOwners[pkg].distinct()
65+
val owners = Loader.instance().modList.filter { command.javaClass.`package`.name in it.ownedPackages }
7366
if (owners.size != 1) {
74-
println("WARNING! Command $clazzName has ${owners.size}; owners: $owners")
67+
println("WARNING! Command ${command.commandName} has ${owners.size}; owners: $owners")
7568
}
7669

7770
val owner = owners.firstOrNull()

src/main/resources/META-INF/accesstransformer.cfg

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/resources/mixins.skytils.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"accessors.AccessorGuiMainMenu",
2121
"accessors.AccessorGuiNewChat",
2222
"accessors.AccessorGuiStreamUnavailable",
23-
"accessors.AccessorLoadController",
2423
"accessors.AccessorMinecraft",
2524
"accessors.AccessorModelDragon",
2625
"accessors.AccessorRenderItem",

0 commit comments

Comments
 (0)