Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,32 @@ public interface MicrobotConfig extends Config
)
String generalSection = "generalSection";

String keyDisableLevelUpInterface = "disableLevelUpInterface";
@ConfigItem(
keyName = keyDisableLevelUpInterface,
name = "Disable level-up interface",
description = "Automatically close the level-up interface when it appears",
position = 0,
section = generalSection
)
default boolean disableLevelUpInterface()
{
return true;
}

String keyDisableWorldSwitcherConfirmation = "disableWorldSwitcherConfirmation";
@ConfigItem(
keyName = keyDisableWorldSwitcherConfirmation,
name = "Disable world switcher confirmation",
description = "Automatically disable the world switcher confirmation prompt",
position = 1,
section = generalSection
)
default boolean disableWorldSwitcherConfirmation()
{
return true;
}

@ConfigSection(
name = "Logging",
description = "Game chat logging configuration",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,50 @@
package net.runelite.client.plugins.microbot.util.events;

import net.runelite.client.config.ConfigManager;
import net.runelite.client.plugins.microbot.BlockingEvent;
import net.runelite.client.plugins.microbot.BlockingEventPriority;
import net.runelite.client.plugins.microbot.Microbot;
import net.runelite.client.plugins.microbot.MicrobotConfig;
import net.runelite.client.plugins.microbot.util.settings.Rs2Settings;

public class DisableLevelUpInterfaceEvent implements BlockingEvent {
@Override
public boolean validate()
{
return isConfigEnabled() && Microbot.isLoggedIn() && Rs2Settings.isLevelUpNotificationsEnabled();
}

@Override
public boolean validate() {
return Microbot.isLoggedIn() && Rs2Settings.isLevelUpNotificationsEnabled();
}
@Override
public boolean execute()
{
if (!isConfigEnabled())
{
return true;
}

@Override
public boolean execute() {
var result = Rs2Settings.disableLevelUpNotifications();
if (result) {
return true;
}
return !validate();
}
var result = Rs2Settings.disableLevelUpNotifications();
if (result)
{
return true;
}
return !validate();
}

@Override
public BlockingEventPriority priority() {
return BlockingEventPriority.HIGH;
}
private boolean isConfigEnabled()
{
ConfigManager configManager = Microbot.getConfigManager();
if (configManager == null)
{
return true;
}

MicrobotConfig config = configManager.getConfig(MicrobotConfig.class);
return config == null || config.disableLevelUpInterface();
}

@Override
public BlockingEventPriority priority()
{
return BlockingEventPriority.HIGH;
}
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,42 @@
package net.runelite.client.plugins.microbot.util.events;

import net.runelite.client.config.ConfigManager;
import net.runelite.client.plugins.microbot.BlockingEvent;
import net.runelite.client.plugins.microbot.BlockingEventPriority;
import net.runelite.client.plugins.microbot.Microbot;
import net.runelite.client.plugins.microbot.MicrobotConfig;
import net.runelite.client.plugins.microbot.util.settings.Rs2Settings;

public class DisableWorldSwitcherConfirmationEvent implements BlockingEvent
{
@Override
public boolean validate()
{
return Microbot.isLoggedIn() && Rs2Settings.isWorldSwitcherConfirmationEnabled();
return isConfigEnabled() && Microbot.isLoggedIn() && Rs2Settings.isWorldSwitcherConfirmationEnabled();
}

@Override
public boolean execute()
{
if (!isConfigEnabled())
{
return true;
}
return Rs2Settings.disableWorldSwitcherConfirmation();
}

private boolean isConfigEnabled()
{
ConfigManager configManager = Microbot.getConfigManager();
if (configManager == null)
{
return true;
}

MicrobotConfig config = configManager.getConfig(MicrobotConfig.class);
return config == null || config.disableWorldSwitcherConfirmation();
}

@Override
public BlockingEventPriority priority()
{
Expand Down