diff options
4 files changed, 31 insertions, 0 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java index 83e4b703..c3313375 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java @@ -807,4 +807,13 @@ public class SlotLocking { if (eventSlotNumber == 36 && pairingSlotNumber == 8) return true; return false; } + + public void resetSlotLocking() { + String profileName = SBInfo.getInstance().currentProfile; + if (profileName == null) profileName = "generic"; + SlotLockProfile slotLockProfile = config.profileData.get(profileName); + if (slotLockProfile != null) { + slotLockProfile.slotLockData[0] = new SlotLockData(); + } + } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java index 930e76ee..7132c5f8 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -254,6 +254,9 @@ public class NEUConfig extends Config { case 27: IQTest.testIQ(); return; + case 28: + executeRunnableCommand("/neuresetslotlocking"); + return; default: System.err.printf("Unknown runnableId = %d in category %s%n", runnableId, activeConfigCategory); } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/SlotLocking.java b/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/SlotLocking.java index e373747f..6c1added 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/SlotLocking.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/separatesections/SlotLocking.java @@ -21,6 +21,7 @@ package io.github.moulberry.notenoughupdates.options.separatesections; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; import io.github.moulberry.moulconfig.annotations.ConfigEditorInfoText; import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; @@ -117,4 +118,15 @@ public class SlotLocking { minStep = 1 ) public float slotLockSoundVol = 20; + + @Expose + @ConfigOption( + name = "Resets Locked Slots", + desc = "Runs §e/neuresetslotlocking" + ) + @ConfigEditorButton( + runnableId = 28, + buttonText = "Reset" + ) + public float resetSlotLocking = 39; } diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt index 5d2f156f..7c0432a7 100644 --- a/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt +++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/commands/dev/SimpleDevCommands.kt @@ -26,6 +26,7 @@ import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe import io.github.moulberry.notenoughupdates.dungeons.DungeonWin import io.github.moulberry.notenoughupdates.events.RegisterBrigadierCommandEvent import io.github.moulberry.notenoughupdates.miscfeatures.NullzeeSphere +import io.github.moulberry.notenoughupdates.miscfeatures.SlotLocking import io.github.moulberry.notenoughupdates.util.brigadier.* import net.minecraft.client.entity.EntityPlayerSP import net.minecraft.event.ClickEvent @@ -104,5 +105,11 @@ class SimpleDevCommands { } } }.withHelp("Reload the NEU data repository from network") + event.command("neuresetslotlocking") { + thenExecute { + SlotLocking.getInstance().resetSlotLocking() + reply("Reset NEU slot locking") + } + }.withHelp("Resets locked slots") } } |