conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private final ItemIdentificationPlugin plugin;
=======
private final ItemIdentificationConfig config;
private final ItemManager itemManager;
>>>>>>>
private final ItemIdentificationPlugin plugin;
private final ItemManager itemManager; |
<<<<<<<
else if (itemId == ItemID.XERICS_TALISMAN)
{
if (!config.showXericTalismanCharges())
{
return;
}
charges = config.xericTalisman();
}
else if (itemId == ItemID.SOUL_BEARER)
{
if (!config.showSoulBearerCharges())
{
return;
}
charges = config.soulBearer();
}
else if (i... |
<<<<<<<
private final Map<Integer, ItemDefinition> results = new LinkedHashMap<>();
=======
private final Map<Integer, ItemComposition> results = new LinkedHashMap<>();
>>>>>>>
private final Map<Integer, ItemDefinition> results = new LinkedHashMap<>();
<<<<<<<
item.setName("<col=ff9040>" + itemDefinition.getN... |
<<<<<<<
=======
private final File sessionFile;
private final AccountClient accountClient;
>>>>>>>
private final AccountClient accountClient;
<<<<<<<
private SessionManager(EventBus eventBus, WSClient wsClient)
=======
private SessionManager(
@Named("sessionfile") File sessionfile,
ConfigManager configMa... |
<<<<<<<
Sprite createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted, int scale);
=======
@Nullable
SpritePixels createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted, int scale);
>>>>>>>
@Nullable
Sprite createItemSpr... |
<<<<<<<
private static final int WALK = MenuAction.WALK.getId();
=======
private static final int CAST_ON_ITEM = MenuAction.SPELL_CAST_ON_GROUND_ITEM.getId();
private static final String TELEGRAB_TEXT = ColorUtil.wrapWithColorTag("Telekinetic Grab", Color.GREEN) + ColorUtil.prependColorTag(" -> ", Color.WHITE);
... |
<<<<<<<
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.n52.iceland.coding.decode.Decoder;
import org.n52.iceland.coding.decode.DecoderKey;
import org.n52.iceland.exception.CodedException;
import org.n52.iceland.exception.ows.InvalidParameterValueException;
import org.n52.iceland.exception.ows.Miss... |
<<<<<<<
private int previousTimerValue;
=======
private WintertodtNotifyMode notifyCondition;
private Color damageNotificationColor;
>>>>>>>
private int previousTimerValue;
private WintertodtNotifyMode notifyCondition;
private Color damageNotificationColor; |
<<<<<<<
@Inject
private EventBus eventBus;
=======
@Getter
@Inject
private ColorPickerManager colorPickerManager;
>>>>>>>
@Getter
@Inject
private ColorPickerManager colorPickerManager;
@Inject
private EventBus eventBus; |
<<<<<<<
public static final int FULLSCREEN_CONTAINER_TLI = 165;
=======
public static final int FULLSCREEN_CONTAINER_TLI = 165;
>>>>>>>
public static final int FULLSCREEN_CONTAINER_TLI = 165;
<<<<<<<
=======
public static final int SETTINGS_SIDE_GROUP_ID = 116;
public static final int SETTINGS_GROUP_ID = 13... |
<<<<<<<
import net.runelite.client.util.StackFormatter;
=======
import net.runelite.client.util.QuantityFormatter;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
>>>>>>>
import net.runelite.client.util.QuantityFormatter... |
<<<<<<<
/**
* Used when getting High Alchemy value - multiplied by general store price.
*/
public static final float HIGH_ALCHEMY_CONSTANT = 0.6f;
=======
/**
* Width of a standard item sprite
*/
public static final int ITEM_SPRITE_WIDTH = 36;
/**
* Height of a standard item sprite
*/
public stat... |
<<<<<<<
public RuneLiteModule(final Supplier<Applet> clientLoader, boolean developerMode)
=======
public RuneLiteModule(Supplier<Applet> clientLoader, boolean developerMode, File sessionfile, File config)
>>>>>>>
public RuneLiteModule(final Supplier<Applet> clientLoader, File config) |
<<<<<<<
else if (plugin.getRoomBlacklist().contains(room.getBoss().getName().toLowerCase())
|| plugin.isEnableRotationWhitelist() && bossCount > bossMatches)
=======
else if (plugin.getRoomBlacklist().contains(room.getName().toLowerCase())
|| config.enableRotationWhitelist() && bossCount > boss... |
<<<<<<<
/* Display flight speed */
if (this.flight.enabled)
{
String speed = String.format(this.stringSpeed + ": %.1f", this.flight.speed);
int width = this.fontRendererObj.getStringWidth(speed);
int x = this.width - 10 - width;
... |
<<<<<<<
=======
//------------------------------------------------------------//
// Skilling
//------------------------------------------------------------//
/* @ConfigItem(
keyName = "easyConstruction",
name = "Easy Construction",
description = "Makes 'Remove'/'Build' the default option for listed item ... |
<<<<<<<
@Inject
private EventBus eventBus;
=======
@Inject
private PvpToolsPlugin pvpTools;
@Inject
private PvpToolsConfig pvpToolsConfig;
>>>>>>>
@Inject
private EventBus eventBus;
@Inject
private PvpToolsPlugin pvpTools;
@Inject
private PvpToolsConfig pvpToolsConfig;
<<<<<<<
eventBus.unregiste... |
<<<<<<<
import org.jetbrains.annotations.NotNull;
=======
import okhttp3.OkHttpClient;
>>>>>>>
import org.jetbrains.annotations.NotNull;
import okhttp3.OkHttpClient;
<<<<<<<
=======
@Value
private static class ImageKey
{
private final int itemId;
private final int itemQuantity;
private final boolean stac... |
<<<<<<<
=======
private final boolean developerMode;
private final boolean safeMode;
>>>>>>>
private final boolean safeMode;
<<<<<<<
=======
@Named("developerMode") final boolean developerMode,
@Named("safeMode") final boolean safeMode,
>>>>>>>
@Named("safeMode") final boolean safeMode,
<<<<<<<
======... |
<<<<<<<
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.HitsplatApplied;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.PlayerDespawned;
=======
import net.runelite.client.events.ConfigChanged;
>>>>>>>
import net.runel... |
<<<<<<<
import java.awt.Image;
import lombok.AccessLevel;
=======
>>>>>>>
import lombok.AccessLevel;
<<<<<<<
IndicatorIndicator(final GameIndicator indicator, final Image image, final Plugin plugin)
=======
IndicatorIndicator(GameIndicator indicator, Plugin plugin)
>>>>>>>
IndicatorIndicator(final GameIndicat... |
<<<<<<<
=======
import java.io.File;
import java.io.IOException;
>>>>>>>
import java.io.File;
<<<<<<<
import net.runelite.api.Client;
=======
import javax.inject.Named;
import net.runelite.client.RuneLite;
>>>>>>>
import javax.inject.Named;
import net.runelite.api.Client;
import net.runelite.client.RuneLite;
<<... |
<<<<<<<
import java.awt.Component;
import java.awt.Dimension;
=======
import java.awt.Component;
import java.awt.Container;
import java.awt.EventQueue;
>>>>>>>
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.EventQueue; |
<<<<<<<
import com.dianping.puma.core.entity.PumaTask;
import com.dianping.puma.core.entity.SrcDBInstance;
=======
import com.dianping.puma.biz.entity.PumaTask;
import com.dianping.puma.biz.entity.SrcDBInstance;
import com.dianping.puma.core.model.event.EventCenter;
import com.dianping.puma.core.storage.holder.Binlog... |
<<<<<<<
import net.runelite.client.plugins.loottracker.localstorage.LTItemEntry;
import net.runelite.client.plugins.loottracker.localstorage.LTRecord;
import net.runelite.client.plugins.loottracker.localstorage.LootRecordWriter;
=======
import net.runelite.client.task.Schedule;
>>>>>>>
import net.runelite.client.plu... |
<<<<<<<
import net.runelite.client.plugins.menuentryswapper.util.teleEquippedMode;
=======
import net.runelite.client.plugins.menuentryswapper.util.ConstructionCapeMode;
import static net.runelite.client.util.MenuUtil.swap;
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
else if (this.getSwapTanning && o... |
<<<<<<<
/*
* Copyright (c) 2018, Psikoi <https://github.com/Psikoi>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright not... |
<<<<<<<
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
=======
import com.google.common.base.Joiner;
>>>>>>>
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
<<<<<<<
import java.awt.Color;
import java... |
<<<<<<<
@ObfuscatedName("mk")
=======
@ObfuscatedName("qb")
@ObfuscatedGetter(
intValue = -910754411
)
@Export("currentTrackGroupId")
static int currentTrackGroupId;
@ObfuscatedName("mo")
>>>>>>>
@ObfuscatedName("mk")
<<<<<<<
@Export("meslayerContinueWidget")
static Widget meslayerContinueWidget;
=====... |
<<<<<<<
public static final int CRYSTALLINE_RAT_DEATH = 8334;
public static final int CRYSTALLINE_BAT_DEATH = 4917;
public static final int CRYSTALLINE_WOLF_DEATH = 8335;
public static final int CRYSTALLINE_SPIDER_DEATH = 8338;
public static final int CRYSTALLINE_UNICORN_DEATH = 6377;
public static final int CRYS... |
<<<<<<<
import net.runelite.client.util.NonScheduledExecutorServiceExceptionLogger;
import net.runelite.http.api.RuneLiteAPI;
import okhttp3.Cache;
=======
import net.runelite.http.api.chat.ChatClient;
>>>>>>>
import net.runelite.client.util.NonScheduledExecutorServiceExceptionLogger;
import net.runelite.http.api.ch... |
<<<<<<<
import java.util.Arrays;
import javax.imageio.ImageIO;
import javax.inject.Inject;
import javax.naming.directory.SearchResult;
=======
import java.lang.reflect.Type;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
>>>>>>>
import java.util.Arrays;
import javax.imageio... |
<<<<<<<
@Subscribe
=======
private void addSubscriptions()
{
eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged);
eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged);
eventBus.subscribe(GameTick.class, this, this::onGameTick);
eventBus.subscribe(PlayerDeath.class, th... |
<<<<<<<
static final int MULTICOMBAT_INDICATOR = 21;
static final int BANK_PIN = 22;
static final int CLAN_CHAT_TAB = 32;
static final int FRIENDS_TAB = 34;
static final int IGNORES_TAB = 33;
static final int LOGOUT_TAB = 35;
static final int OPTIONS_TAB = 36;
static final int EMOTES_TAB = 37;
static ... |
<<<<<<<
import net.runelite.client.config.ConfigTitleSection;
import net.runelite.client.config.Title;
=======
import net.runelite.client.config.Units;
>>>>>>>
import net.runelite.client.config.ConfigTitleSection;
import net.runelite.client.config.Title;
import net.runelite.client.config.Units; |
<<<<<<<
import net.runelite.client.plugins.menuentryswapper.BankComparableEntry;
import net.runelite.client.plugins.menuentryswapper.EquipmentComparableEntry;
=======
import static net.runelite.client.plugins.runecraft.AbyssRifts.*;
>>>>>>>
import net.runelite.client.plugins.menuentryswapper.BankComparableEntry;
imp... |
<<<<<<<
import java.util.HashMap;
=======
import java.nio.charset.StandardCharsets;
import java.util.List;
>>>>>>>
import java.util.HashMap;
import java.nio.charset.StandardCharsets;
<<<<<<<
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken<HashMap<Integer, Integer[]>>() {}.getType());
=... |
<<<<<<<
import com.google.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.events.ConfigChanged;
=======
import net.runelite.client.events.ConfigChanged;
>>>>>>>
import com.google.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter; |
<<<<<<<
import net.runelite.client.eventbus.Subscribe;
import org.junit.After;
=======
import okhttp3.OkHttpClient;
import okhttp3.Request;
>>>>>>>
import net.runelite.client.eventbus.Subscribe;
import okhttp3.OkHttpClient;
import org.junit.After;
<<<<<<<
private ExecutorService executorService;
private Set<Clas... |
<<<<<<<
SKULL(SpriteID.PLAYER_KILLER_SKULL_523, GameTimerImageType.SPRITE, "Skull", 20, ChronoUnit.MINUTES),
ANTIPOISON(ItemID.ANTIPOISON4, GameTimerImageType.ITEM, "Antipoison"),
ANTIVENOM(ItemID.ANTIVENOM4, GameTimerImageType.ITEM, "Anti-venom"),
DRAGON_FIRE_SHIELD(ItemID.DRAGONFIRE_SHIELD_11284, GameTimerImageTy... |
<<<<<<<
import com.google.common.annotations.VisibleForTesting;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.inject.Inject;
=======
>>>>>>>
import com.google.common.annotations.VisibleForTesting;
import java.awt.Color;
import java.awt.Dimension... |
<<<<<<<
@Autowired
private LionService lionService;
@Autowired
private PumaTaskTargetDao pumaTaskTargetDao;
@Autowired
private PumaServerService pumaServerService;
private final String env = EnvZooKeeperConfig.getEnv();
private static final Pattern JDBC_URL_PATTERN = Pattern.compile("jdbc:mysql://([^:]+:\\d... |
<<<<<<<
private boolean hasOverlay(final Skill skill)
{
return overlayManager.anyMatch(o -> o instanceof XpInfoBoxOverlay && ((XpInfoBoxOverlay) o).getSkill() == skill);
}
private void onConfigChanged(ConfigChanged event)
{
if (!event.getGroup().equals("xpTracker"))
{
return;
}
updateConfig();
}
... |
<<<<<<<
import javax.annotation.Nullable;
import javax.inject.Singleton;
=======
>>>>>>>
import javax.annotation.Nullable;
import javax.inject.Singleton;
<<<<<<<
import lombok.AccessLevel;
=======
import javax.swing.JPopupMenu;
import javax.swing.JToggleButton;
import javax.swing.SwingUtilities;
import javax.swin... |
<<<<<<<
public static final int PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID = 243;
public static final int DIALOG_MINIGAME_GROUP_ID = 229;
public static final int CLAN_CHAT_GROUP_ID = 7;
=======
public static final int FRIENDS_CHAT_GROUP_ID = 7;
>>>>>>>
public static final int PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID = ... |
<<<<<<<
screenshotPlugin.setScreenshotRewards(true);
screenshotPlugin.setScreenshotLevels(true);
screenshotPlugin.setScreenshotValuableDrop(true);
screenshotPlugin.setScreenshotUntradeableDrop(true);
=======
when(screenshotConfig.screenshotLevels()).thenReturn(true);
when(screenshotConfig.screenshotValuab... |
<<<<<<<
/**
* Changes the parent ID for the widget
*/
void setParentId(int id);
/**
* Changes the ID of the widget
*/
void setId(int id);
/**
* Sets the index of this element
*/
void setIndex(int index);
/**
* Seems like this needs to set to true when creating new widgets
*/
void setIsIf3(bo... |
<<<<<<<
/*
* Copyright (c) 2020, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
... |
<<<<<<<
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
=======
import java.util.List;
>>>>>>>
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
<<<<<<... |
<<<<<<<
import lombok.AccessLevel;
import lombok.Getter;
=======
import lombok.AccessLevel;
import lombok.Setter;
>>>>>>>
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter; |
<<<<<<<
import java.io.IOException;
=======
import java.awt.image.BufferedImage;
import java.io.File;
import javax.imageio.ImageIO;
>>>>>>>
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
<<<<<<<
import javax.inject.Singleton;
import javax.sound.sa... |
<<<<<<<
import net.runelite.client.util.StackFormatter;
=======
import net.runelite.client.util.QuantityFormatter;
import net.runelite.client.util.Text;
>>>>>>>
import net.runelite.client.util.QuantityFormatter; |
<<<<<<<
=======
public static final int HALLOWED_SEPULCHRE_TIMER_GROUP_ID = 668;
public static final int BANK_PIN_GROUP_ID = 213;
>>>>>>>
public static final int HALLOWED_SEPULCHRE_TIMER_GROUP_ID = 668;
<<<<<<<
=======
static class HallowedSepulchreTimer
{
static final int CONTAINER = 2;
}
static class ... |
<<<<<<<
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
=======
>>>>>>>
import net.runelite.api.events.ConfigChanged;
<<<<<<<
eventBus.unregister(this);
lastEventTick = 0;
=======
lastNotificationTick = 0;
>>>>>>>
eventBus.unregister(this);
lastNotificationTick ... |
<<<<<<<
@Subscribe
=======
private void addSubscriptions()
{
eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged);
eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged);
eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged);
eventBus.subscribe(MenuO... |
<<<<<<<
configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, runeLitePlusConfig, chatColorConfig);
=======
configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, chatColorConfig, colorPickerManager);
>>>>>>>
configPanel = new ConfigP... |
<<<<<<<
import com.dianping.puma.comparison.model.TaskResult;
=======
import com.dianping.puma.comparison.TaskResult;
import com.dianping.puma.comparison.manager.utils.ThreadPool;
>>>>>>>
import com.dianping.puma.comparison.model.TaskResult;
import com.dianping.puma.comparison.manager.utils.ThreadPool; |
<<<<<<<
=======
@Value
private static class ImageKey
{
private final int itemId;
private final int itemQuantity;
private final boolean stackable;
}
@Value
private static class OutlineKey
{
private final int itemId;
private final int itemQuantity;
private final Color outlineColor;
}
private fina... |
<<<<<<<
=======
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.ConfigChanged;
>>>>>>>
import net.runelite.client.events.ConfigChanged;
<<<<<<<
eventBus.subscribe(PluginChanged.class, this, this::onPluginChanged);
eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOp... |
<<<<<<<
import org.apache.commons.dbutils.QueryRunner;
import org.apache.commons.dbutils.handlers.ArrayHandler;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
=======
>>>>>>>
<<<<<<<
import com.dianping.puma.stora... |
<<<<<<<
import net.runelite.api.events.ConfigChanged;
=======
import net.runelite.api.Varbits;
import net.runelite.api.events.ItemContainerChanged;
>>>>>>>
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.Varbits;
import net.runelite.api.events.ItemContainerChanged;
<<<<<<<
@Inject
private Ev... |
<<<<<<<
private DevToolsButton logMenuActions;
=======
private DevToolsButton soundEffects;
>>>>>>>
private DevToolsButton soundEffects;
private DevToolsButton logMenuActions; |
<<<<<<<
public static final int GAUNTLET_MAP_GROUP_ID = 638;
=======
public static final int HALLOWED_SEPULCHRE_TIMER_GROUP_ID = 668;
public static final int HEALTH_OVERLAY_BAR_GROUP_ID = 303;
>>>>>>>
public static final int GAUNTLET_MAP_GROUP_ID = 638;
public static final int HALLOWED_SEPULCHRE_TIMER_GROUP_ID ... |
<<<<<<<
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
... |
<<<<<<<
/**
* Adds a MenuEntry to the current menu.
*/
void insertMenuItem(String action, String target, int opcode, int identifier, int argument1, int argument2, boolean forceLeftClick);
void setSelectedItemID(int id);
void setSelectedItemWidget(int widgetID);
void setSelectedItemSlot(int idx);
int getS... |
<<<<<<<
=======
import com.google.inject.Provides;
import java.util.Arrays;
import java.util.stream.Stream;
>>>>>>>
import com.google.inject.Provides;
<<<<<<<
if (ev.getOp() == 6)
=======
if (ev.getOp() == searchIndex + 1)
>>>>>>>
if (ev.getOp() == searchIndex + 1) |
<<<<<<<
&& !isTradeable(itemManager.getItemDefinition(id)) && wildyLevel <= DEEP_WILDY
&& (wildyLevel <= 0 || ItemReclaimCost.of(id) != null))
=======
&& !isTradeable(itemManager.getItemComposition(id))
&& (wildyLevel <= 0
|| LockedItem.getBaseIdFromLockedId(id) != null
|| (wildyLevel <= DEE... |
<<<<<<<
private final DiscordPlugin plugin;
private final PartyService party;
private final RuneLiteProperties properties;
=======
private final DiscordConfig config;
private PartyService party;
>>>>>>>
private final DiscordPlugin plugin;
private final PartyService party;
<<<<<<<
private DiscordState(final ... |
<<<<<<<
static final int MULTICOMBAT_INDICATOR = 21;
static final int BANK_PIN = 22;
static final int FRIENDS_CHAT_TAB = 33;
static final int FRIENDS_TAB = 35;
static final int IGNORES_TAB = 34;
static final int LOGOUT_TAB = 36;
static final int OPTIONS_TAB = 37;
static final int EMOTES_TAB = 38;
stat... |
<<<<<<<
import net.runelite.api.Prayer;
import net.runelite.api.Skill;
import net.runelite.api.SkullIcon;
import net.runelite.api.VarPlayer;
=======
>>>>>>>
import net.runelite.api.Skill;
import net.runelite.api.SkullIcon;
import net.runelite.api.VarPlayer; |
<<<<<<<
public boolean submitHost(int world, String location, House house) throws IOException
{
HttpUrl url = RuneLiteAPI.getOpenOSRSApiBase().newBuilder()
.addPathSegment("chat")
.addPathSegment("hosts")
.addQueryParameter("world", Integer.toString(world))
.addQueryParameter("location", location)
.... |
<<<<<<<
@Inject
private EventBus eventBus;
=======
@Inject
private ColorPickerManager colorPickerManager;
>>>>>>>
@Inject
private ColorPickerManager colorPickerManager;
@Inject
private EventBus eventBus;
<<<<<<<
addSubscriptions();
configPanel = new ConfigPanel(pluginManager, configManager, executo... |
<<<<<<<
@ConfigTitleSection(
keyName = "uiTitle",
name = "User interface",
description = "",
position = 1
)
default Title uiTitle()
{
return new Title();
}
=======
String GROUP_NAME = "runelite";
>>>>>>>
String GROUP_NAME = "runelite";
@ConfigTitleSection(
keyName = "uiTitle",
name = "User i... |
<<<<<<<
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashMultiset;
=======
import com.google.common.base.Strings;
>>>>>>>
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashMultiset;
import com.google.common.base.Strings;
<<<<<<<
... |
<<<<<<<
public static final int JEWELLERY_BOX_GROUP_ID = 590;
public static final int OPTIONS_GROUP_ID = 261;
public static final int THEATRE_OF_BLOOD_PARTY_GROUP_ID = 28;
public static final int GWD_KC_GROUP_ID = 406;
=======
public static final int ADVENTURE_LOG_ID = 187;
public static final int COUNTERS_LOG_... |
<<<<<<<
@Dependency(module = "Algebra.Ring.Solver", name = "RingTerm.var") CoreConstructor varTerm;
@Dependency(module = "Algebra.Ring.Solver", name = "RingTerm.coef") CoreConstructor coefTerm;
@Dependency(module = "Algebra.Ring.Solver", name = "RingTerm.:ide") CoreConstructor... |
<<<<<<<
import net.runelite.api.Varbits;
import net.runelite.api.WorldType;
=======
>>>>>>>
import net.runelite.api.Varbits;
<<<<<<<
import net.runelite.client.plugins.PluginType;
import net.runelite.client.plugins.screenshot.imgur.ImageUploadRequest;
import net.runelite.client.plugins.screenshot.imgur.ImageUploadR... |
<<<<<<<
private static final Pattern XERIC_CHECK_CHARGE_PATTERN = Pattern.compile(
"talisman has (\\d+|one) charges?");
private static final Pattern XERIC_RECHARGEWIDGET_PATTERN = Pattern.compile(
"Your talisman now has (\\d+|one) charges?\\.");
private static final Pattern XERIC_OUT_OF_CHARGES = Pattern.compile... |
<<<<<<<
import java.util.EnumSet;
=======
import net.runelite.api.Actor;
>>>>>>>
import java.util.EnumSet;
import net.runelite.api.Actor;
<<<<<<<
plugin.onGameTick(GameTick.INSTANCE);
=======
plugin.onGameTick(new GameTick());
>>>>>>>
plugin.onGameTick(GameTick.INSTANCE);
<<<<<<<
plugin.onGameTick(GameT... |
<<<<<<<
import net.runelite.client.ui.overlay.tooltip.Tooltip;
import net.runelite.client.ui.overlay.tooltip.TooltipManager;
import net.runelite.client.util.ImageUtil;
=======
import net.runelite.client.util.HotkeyListener;
>>>>>>>
import net.runelite.client.ui.overlay.tooltip.Tooltip;
import net.runelite.client.ui.... |
<<<<<<<
=======
// Hespori loot handling
private static final String HESPORI_LOOTED_MESSAGE = "You have successfully cleared this patch for new crops.";
private static final String HESPORI_EVENT = "Hespori";
private static final int HESPORI_REGION = 5021;
// Gauntlet loot handling
private static final String G... |
<<<<<<<
SCORPIONS("Scorpions", ItemID.ENSOULED_SCORPION_HEAD,
asList("Scorpia"), Collections.emptyList()),
=======
CHAOS_DRUIDS("Chaos druids", ItemID.ELDER_CHAOS_HOOD, "Elder Chaos druid", "Chaos druid"),
BANDITS("Bandits", ItemID.BANDIT, "Bandit"),
MAGIC_AXES("Magic axes", ItemID.IRON_BATTLEAXE, "Magic axe"),... |
<<<<<<<
import javax.inject.Singleton;
=======
import lombok.AllArgsConstructor;
import lombok.Getter;
>>>>>>>
import javax.inject.Singleton;
import lombok.AllArgsConstructor;
import lombok.Getter;
<<<<<<<
final ItemDefinition c = itemManager.getItemDefinition(i.getId());
=======
>>>>>>>
final ItemDefinit... |
<<<<<<<
htpasswdFile = ".htpasswd";
enabledPlainText = false;
=======
htpasswdFile = "htpasswd";
String os = System.getProperty("os.name").toLowerCase();
enabledPlainTextPwd = os.startsWith("windows") || os.startsWith("netware");
usersAuthorizedForEverything = false;
}
public HtpasswdAuth... |
<<<<<<<
import lombok.AllArgsConstructor;
import lombok.Builder;
=======
import com.google.gson.annotations.SerializedName;
>>>>>>>
import lombok.AllArgsConstructor;
import lombok.Builder;
import com.google.gson.annotations.SerializedName; |
<<<<<<<
=======
import org.springframework.ide.eclipse.boot.dash.cloudfoundry.CloudFoundryRunTargetType;
import org.springframework.ide.eclipse.boot.dash.cloudfoundry.client.v2.DefaultCloudFoundryClientFactoryV2;
>>>>>>>
<<<<<<<
=======
import org.springframework.ide.eclipse.boot.dash.model.runtargettypes.RunTarg... |
<<<<<<<
import java.util.Map.Entry;
import java.util.Set;
=======
>>>>>>>
import java.util.Map.Entry; |
<<<<<<<
Set<IProject> projectsToDeploy,
RunState runOrDebug) {
=======
Map<IProject, BootDashElement> projectsToDeploy,
RunState runOrDebug,
DebugSupport debugSupport) {
>>>>>>>
Set<IProject> projectsToDeploy,
RunState runOrDebug,
DebugSupport debugSupport) {
<<<<<<<
}
=======
this.deb... |
<<<<<<<
=======
//Test for 'utilities' which may eventually be moved if we reuse them elsewhere
// (the test should also move then!)
OrderBasedComparatorTest.class,
DeploymentProperties2Yaml.class,
Yaml2DeploymentProperties.class,
ManifestCompareMergeTests.class
>>>>>>> |
<<<<<<<
import org.apache.pulsar.client.api.Schema;
=======
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Reader;
>>>>>>>
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Reader;
<<<<<<<
private final PulsarSpaceCache pcache;
private final... |
<<<<<<<
private final HashMap<String, Object> driverConfMap = new HashMap<>();
private final HashMap<String, Object> schemaConfMap = new HashMap<>();
private final HashMap<String, Object> clientConfMap = new HashMap<>();
private final HashMap<String, Object> producerConfMap = new HashMap<>();
privat... |
<<<<<<<
public PulsarSpace(String name, PulsarNBClientConf pulsarClientConf) {
this.name = name;
=======
public PulsarSpace( String name, PulsarNBClientConf pulsarClientConf, String pulsarSvcUrl ) {
this.spaceName = name;
>>>>>>>
public PulsarSpace(String name, PulsarNBClientConf pulsarCl... |
<<<<<<<
import com.manydesigns.elements.fields.PasswordField;
import com.manydesigns.elements.forms.FieldSet;
=======
>>>>>>>
<<<<<<<
import com.manydesigns.portofino.systemModel.users.Group;
import com.manydesigns.portofino.systemModel.users.Password;
=======
>>>>>>>
<<<<<<<
import java.util.List;
import java... |
<<<<<<<
import com.manydesigns.elements.reflection.JavaClassAccessor;
import com.manydesigns.elements.reflection.PropertyAccessor;
import com.manydesigns.elements.util.ReflectionUtil;
=======
>>>>>>>
import com.manydesigns.elements.reflection.JavaClassAccessor;
import com.manydesigns.elements.reflection.PropertyAcce... |
<<<<<<<
=======
// Return to search
//**************************************************************************
public String returnToSearch() {
setupMetadata();
return RETURN_TO_SEARCH;
}
//**************************************************************************
>>>>>>>
<<<... |
<<<<<<<
=======
//**************************************************************************
// Constants
//**************************************************************************
public final static String REDIRECT_TO_TABLE = "redirectToTable";
public final static String NO_TABLES = "noTables... |
<<<<<<<
=======
import com.manydesigns.portofino.scripting.ScriptingUtil;
import com.manydesigns.portofino.stripes.NoCacheStreamingResolution;
>>>>>>>
import com.manydesigns.portofino.stripes.NoCacheStreamingResolution; |
<<<<<<<
import com.manydesigns.portofino.model.site.UseCaseNode;
import com.manydesigns.portofino.model.site.usecases.UseCase;
=======
import com.manydesigns.portofino.model.selectionproviders.ModelSelectionProvider;
import com.manydesigns.portofino.model.selectionproviders.SelectionProperty;
import com.manydesigns.p... |
<<<<<<<
} catch (NoSuchFieldException e) {
logger.warn("No state field in emailQueue",e);
=======
} catch (Throwable e) {
LogUtil.warning(logger, "cannot create emailQueue", e);
>>>>>>>
} catch (Throwable e) {
logger.warn("cannot create emailQueue", e);
<<... |
<<<<<<<
public void notifyEvents( Iterable<UnitOfWorkEvent> events )
=======
public void initialize()
throws ConstructionException
{
}
public void notifyChanges( Iterable<EntityState> entityStates )
>>>>>>>
public void initialize()
throws ConstructionException
{
}
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.