conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public ActionPropertyObjectEntity<?> getSelectorAction(FormEntity entity, Version version) {
Property<P> property = propertyObject.property;
GroupObjectEntity groupObject = getNFToDraw(entity, version);
if(groupObject != null) {
ImMap<P, ObjectEntity> groupObjects = prop... |
<<<<<<<
InputStream inputStream = fileData.getInputStream();
boolean done = ftpClient.storeFile(remoteFile, inputStream);
=======
InputStream inputStream = new FileInputStream(file);
boolean done = ftpClient.storeFile(properties.remoteFil... |
<<<<<<<
=======
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.*;
>>>>>>>
<<<<<<<
=======
Integer timeout = (Integer) context.getBL().LM.timeoutHttp.read(context);
HttpResponse response = readHTTP(context, connectionString, timeout, bodyUr... |
<<<<<<<
return BaseUtils.immutableCast(getStoredProperties().filterOrder(new SFunctionSet<Property>() {
public boolean contains(Property property) {
boolean recalculate;
try {
recalculate = reflectionLM.disableClassesTableColumn.read(dataSession, r... |
<<<<<<<
this.scrub.value = MathHelper.clamp(this.scrub.value, 0, this.scrub.max);
=======
this.scrub.value = MathHelper.clamp_int(this.scrub.value, this.scrub.min, this.scrub.max);
>>>>>>>
this.scrub.value = MathHelper.clamp(this.scrub.value, this.scrub.min, this.scrub... |
<<<<<<<
import lsfusion.base.BaseUtils;
import lsfusion.base.MutableObject;
import lsfusion.base.Result;
=======
import lsfusion.base.mutability.MutableObject;
>>>>>>>
import lsfusion.base.BaseUtils;
import lsfusion.base.mutability.MutableObject;
import lsfusion.base.Result; |
<<<<<<<
x1 = MathHelper.clamp(x1, 0, 1);
x2 = MathHelper.clamp(x2, 0, 1);
=======
e = h == 0 ? e : Math.max(Math.min(e, 1 / h * e), 0.00001F);
x1 = MathHelper.clamp_float(x1, 0, 1);
x2 = MathHelper.clamp_float(x2, 0, 1);
>>>>>>>
... |
<<<<<<<
import lsfusion.server.logics.property.actions.flow.*;
import lsfusion.server.logics.property.actions.integration.FormIntegrationType;
import lsfusion.server.logics.property.actions.integration.IntegrationFormEntity;
import lsfusion.server.logics.property.actions.integration.exporting.ExportActionProperty;
impo... |
<<<<<<<
package lsfusion.server.logics.scripted.proxy;
import lsfusion.server.classes.DateClass;
import lsfusion.server.classes.DateTimeClass;
import lsfusion.server.classes.IntegralClass;
import lsfusion.server.classes.TimeClass;
import lsfusion.server.data.type.Type;
import lsfusion.server.form.view.PropertyDrawView... |
<<<<<<<
Long result = (Long) businessLogics.authenticationLM.computerHostname.read(session, new DataObject(strHostName));
if (result != null) {
DataObject addObject = session.addObject(businessLogics.authenticationLM.computer);
businessLogics.authenticationLM.host... |
<<<<<<<
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
=======
>>>>>>>
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
<<<<<<<
import android.util.SparseArray;
=======
>>>>>>>
import android.util.SparseArra... |
<<<<<<<
static
{
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
/* Registering per fixture panels */
PANELS.put(IdleFixture.class, new GuiIdleFixturePanel(font));
PANELS.put(PathFixture.class, new GuiPathFixturePanel(font));
PANELS.put(LookFixture.class, new ... |
<<<<<<<
import java.util.GregorianCalendar;
import java.util.UUID;
=======
import java.util.HashMap;
>>>>>>>
import java.util.GregorianCalendar;
import java.util.UUID;
import java.util.HashMap;
<<<<<<<
VALID_AUTHORITY, false, mockCache);
=======
TEST_AUTHORITY, false,
... |
<<<<<<<
redirectUri = checkInputParameters(resource, clientId, redirectUri, callback);
final String requestId = Telemetry.registerNewRequest();
final APIEvent apiEvent = createApiEvent(mContext, clientId, requestId, EventStrings.ACQUIRE_TOKEN_1);
apiEvent.setLoginHint(loginHint);
... |
<<<<<<<
Logger.v(TAG, "Id token is returned, parsing id token.");
IdToken tokenParsed = parseIdToken(rawIdToken);
if (tokenParsed != null) {
tenantId = tokenParsed.mTenantId;
userinfo = new UserInfo(tokenParsed);... |
<<<<<<<
final String queryParam, final AuthenticationRequest request, UIEvent uiEvent) {
=======
final AuthenticationRequest request) {
>>>>>>>
final AuthenticationRequest request, final UIEvent uiEvent) {
<<<<<<<
mQue... |
<<<<<<<
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Calendar;
import java.util.Date;
=======
>>>>>>>
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Calendar;
import java.util.Date;
<<<<<<<
private ITokenCacheStore mTokenCacheStore;
=======
pr... |
<<<<<<<
//check if the redirect URL is under SSL protected
if(!url.toLowerCase(Locale.US).startsWith(AuthenticationConstants.Broker.REDIRECT_SSL_PREFIX)) {
Logger.e(TAG + methodName, "The webview was redirected to an non-SSL protected URL.", "", ADALError.WEBVIEW_RED... |
<<<<<<<
import java.io.OutputStream;
import java.net.HttpURLConnection;
=======
import java.lang.reflect.InvocationTargetException;
import java.net.HttpURLConnection;
>>>>>>>
import java.io.OutputStream;
import java.net.HttpURLConnection;
<<<<<<<
=======
import com.google.gson.Gson;
import com.microsoft.aad.adal... |
<<<<<<<
import junit.framework.Assert;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.Signature;
import android.os.Build;
import... |
<<<<<<<
public AuthenticationContext(Context appContext, String authority, boolean validateAuthority,
ITokenCacheStore tokenCacheStore) {
mAppContext = appContext;
mAuthority = authority;
mValidateAuthority = validateAuthority;
mCache = tokenCacheStore;
=======
publ... |
<<<<<<<
// Create the Web View to show the page
=======
Logger.v(TAG, "OnCreate redirectUrl:" + mRedirectUrl);
// Create the Web View to show the page
>>>>>>>
// Create the Web View to show the page
<<<<<<<
=======
// Disable hardware acceleration in WebVi... |
<<<<<<<
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
=======
import com.consol.citrus.message.MessageHandler;
import com.consol.citrus.server.AbstractServer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.*;
import org.springframework.context.Appli... |
<<<<<<<
@Test
public void testVarAsPrintStatement() throws Exception {
parse("var print;", rule("variableStatement"));
}
@Test
public void testPrintStatement() throws Exception {
parse("print (x);", rule("statement"));
}
=======
@Test
public void testFunctionDeclarati... |
<<<<<<<
import io.scalecube.transport.Address;
import io.scalecube.transport.Message;
import io.scalecube.transport.Transport;
import io.scalecube.transport.TransportConfig;
import java.nio.ByteBuffer;
=======
import io.scalecube.cluster.transport.api.Address;
import io.scalecube.cluster.transport.api.Message;
import... |
<<<<<<<
import io.scalecube.transport.Address;
import io.scalecube.transport.Transport;
import io.scalecube.transport.TransportConfig;
import java.nio.ByteBuffer;
=======
import io.scalecube.cluster.transport.api.Address;
import io.scalecube.cluster.transport.api.Transport;
import io.scalecube.cluster.transport.api.T... |
<<<<<<<
import io.scalecube.cluster.metadata.MetadataCodec;
import io.scalecube.transport.Address;
import io.scalecube.transport.MessageCodec;
import io.scalecube.transport.TransportConfig;
import java.nio.ByteBuffer;
=======
import io.scalecube.cluster.transport.api.Address;
import io.scalecube.cluster.transport.api... |
<<<<<<<
this.remove.drawButton(this.modifiers.editor.mc, mouseX, mouseY, partialTicks);
=======
if (mouseX >= this.area.x && mouseY >= this.area.y && mouseX <= this.area.x + this.area.w && mouseY <= this.area.y + h)
{
this.remove.drawButton(this.modifiers.editor.mc, mouseX, mouseY)... |
<<<<<<<
@Test
public void shouldCompareJSONArrays() {
assertThat(readByJsonOrg("[{\"a\":1}, {\"a\":2}, {\"a\":2}]"), jsonEquals(readByJsonOrg("[{\"a\":1}, {\"a\":2}, {\"a\":2}]")));
}
=======
@Test
public void testEqualsResource() throws Exception {
assertThat("{\"test\":1}", json... |
<<<<<<<
@Nullable
public WalletAccount getAccount(String id) {
return accounts.get(id);
=======
public WalletPocket getPocket(CoinType coinType) {
lock.lock();
try {
return checkNotNull(pockets.get(coinType), "Requested pocket does not exist");
} finally {
... |
<<<<<<<
import com.coinomi.core.coins.BurstMain;
=======
import com.coinomi.core.coins.CanadaeCoinMain;
>>>>>>>
import com.coinomi.core.coins.BurstMain;
import com.coinomi.core.coins.CanadaeCoinMain;
<<<<<<<
import com.coinomi.core.coins.NxtMain;
import com.coinomi.core.coins.PeercoinMain;
import com.coinomi.core.c... |
<<<<<<<
VERTCOIN_MAIN(VertcoinMain.get()),
=======
NEOSCOIN_TEST(NeoscoinTest.get())
JUMBUCKS_MAIN(JumbucksMain.get()),
>>>>>>>
VERTCOIN_MAIN(VertcoinMain.get()),
JUMBUCKS_MAIN(JumbucksMain.get()), |
<<<<<<<
COINS_ICONS.put(CoinID.NXT_MAIN.getCoinType(), R.drawable.nxt);
=======
COINS_ICONS.put(CoinID.JUMBUCKS_MAIN.getCoinType(), R.drawable.jumbucks);
>>>>>>>
COINS_ICONS.put(CoinID.NXT_MAIN.getCoinType(), R.drawable.nxt);
COINS_ICONS.put(CoinID.JUMBUCKS_MAIN.getCoinType(), R.drawa... |
<<<<<<<
=======
import java.security.SignatureException;
>>>>>>>
import java.security.SignatureException;
<<<<<<<
=======
import static com.coinomi.core.Preconditions.checkArgument;
>>>>>>> |
<<<<<<<
COINS_ICONS.put(CoinID.NOVACOIN_MAIN.getCoinType(), R.drawable.novacoin);
=======
COINS_ICONS.put(CoinID.CANADAECOIN_MAIN.getCoinType(), R.drawable.canadaecoin);
>>>>>>>
COINS_ICONS.put(CoinID.NOVACOIN_MAIN.getCoinType(), R.drawable.novacoin);
COINS_ICONS.put(CoinID.CANADAECOI... |
<<<<<<<
Position prev = new Position(0, 0, 0, 0, 0);
Position next = new Position(0, 0, 0, 0, 0);
EntityPlayer player = runner.outside.active ? runner.outside.camera : this.mc.player;
=======
EntityPlayer player = runner.outside.active ? runner.outside.camera : this.mc.thePlayer;
>>>... |
<<<<<<<
private void check(TokenType expectedTokenType, TokenType tokenType) {
if (tokenType != expectedTokenType) {
throw new TagExpressionException("Syntax error. Expected %s", tokenType.toString().toLowerCase());
}
}
=======
>>>>>>>
private void check(TokenType expectedTo... |
<<<<<<<
this.value = MathHelper.clamp(this.value, this.min, this.max);
=======
this.value = MathHelper.clamp_int(this.value, this.min, this.max);
this.scroll = 0;
this.scale = 1;
>>>>>>>
this.value = MathHelper.clamp(this.value, this.min, this.max);
this.scroll = 0;
... |
<<<<<<<
=======
/**
* Spinner for selecting the account for the transaction
*/
private Spinner mAccountsSpinner;
/**
* Spinner for selecting the account to split the transaction with
*/
private Spinner mSplitAccountSpinner;
/**
* Accounts database adapter.
* Used for getting list of transacti... |
<<<<<<<
public BudgetsDbAdapter(SQLiteDatabase db) {
super(db, BudgetEntry.TABLE_NAME, new String[]{
BudgetEntry.COLUMN_NAME,
BudgetEntry.COLUMN_DESCRIPTION,
BudgetEntry.COLUMN_RECURRENCE_UID,
BudgetEntry.COLUMN_NUM_PERIODS
});
... |
<<<<<<<
/* Display flight speed */
if (this.flight.enabled)
{
String speed = String.format(this.stringSpeed + ": %.1f", this.flight.speed);
int width = this.fontRenderer.getStringWidth(speed);
int x = this.width - 10 - width;
... |
<<<<<<<
import org.gnucash.android.db.adapter.DatabaseAdapter;
=======
import org.gnucash.android.db.adapter.BooksDbAdapter;
import org.gnucash.android.db.adapter.CommoditiesDbAdapter;
>>>>>>>
import org.gnucash.android.db.adapter.BooksDbAdapter;
import org.gnucash.android.db.adapter.CommoditiesDbAdapter;
import org... |
<<<<<<<
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.BufferBuilder;
=======
>>>>>>>
import net.minecraft.client.renderer.BufferBuilder;
<<<<<<<
public void update(GuiScreen screen)
{
super.update(screen);
int x = this.area.x + this.area.w - 80;
th... |
<<<<<<<
import org.gnucash.android.ui.util.AmountInputFormatter;
import org.gnucash.android.ui.util.CalculatorKeyboard;
=======
import org.gnucash.android.ui.util.CalculatorEditText;
>>>>>>>
import org.gnucash.android.ui.util.CalculatorEditText;
import org.gnucash.android.ui.util.CalculatorKeyboard;
<<<<<<<
pub... |
<<<<<<<
public char getChar() {
return delegate.getChar();
}
@Override
public char getChar(long index) {
assert index <= Integer.MAX_VALUE;
return delegate.getChar((int) index);
}
@Override
public short getShort() {
return delegate.getShort();
}
@O... |
<<<<<<<
private final Type alpha = new TypeVar("a");
private final Type beta = new TypeVar("b");
=======
>>>>>>>
<<<<<<<
assertEquals("[Int -> Int]", this.expr.analyze(this.env).toHaskellType());
=======
assertEquals("[Int -> Int]", this.expr.analyze(this.env).prune().toHaskellType());
>>... |
<<<<<<<
import nl.utwente.group10.ui.components.blocks.RGBBlock;
import nl.utwente.group10.ui.components.blocks.SliderBlock;
=======
import nl.utwente.group10.ui.components.blocks.GraphBlock;
>>>>>>>
import nl.utwente.group10.ui.components.blocks.RGBBlock;
import nl.utwente.group10.ui.components.blocks.SliderBlock;
... |
<<<<<<<
public List<OutputAnchor> getAllOutputs() {
return ImmutableList.of(this.fun);
=======
public List<InputAnchor> getAllInputs() {
return ImmutableList.of();
}
@Override
public Optional <OutputAnchor> getOutputAnchor() {
return Optional.of(this.fun);
>>>>>>>
pub... |
<<<<<<<
=======
import java.util.ArrayList;
>>>>>>>
import java.util.ArrayList;
<<<<<<<
@FXML
private Pane anchorSpace;
=======
@FXML protected Pane anchorSpace;
>>>>>>>
@FXML
private Pane anchorSpace;
<<<<<<<
@FXML
private Pane outputSpace;
=======
@FXML protected Pane outputS... |
<<<<<<<
@Override
public Node asNode() {
return this;
}
@Override
public ToplevelPane getToplevel() {
return this;
}
=======
@Override
public void expandToFit(Bounds bounds) {
// The toplevel is large enough to fit practical everything
}
>>>>>>>
@Over... |
<<<<<<<
import javafx.fxml.Initializable;
=======
import nl.utwente.group10.ui.CustomUIPane;
import nl.utwente.group10.ui.gestures.GestureCallBack;
import nl.utwente.group10.ui.gestures.UIEvent;
import javafx.event.EventType;
import javafx.scene.Node;
>>>>>>>
import javafx.fxml.Initializable;
import nl.utwente.grou... |
<<<<<<<
this.flight.speed += Math.copySign(0.1F, scroll);
this.flight.speed = MathHelper.clamp(this.flight.speed, 0.1F, 50F);
=======
float factor = 1000;
boolean zoomIn = scroll > 0;
if ((zoomIn && this.flight.speed <= 10) || (!zoomIn && this.flight.speed ... |
<<<<<<<
/** The output of this Block. **/
private OutputAnchor output;
=======
>>>>>>>
<<<<<<<
/** Returns the {@link OutputAnchor} for this block. */
public final OutputAnchor getOutputAnchor() {
return output;
}
/** Returns the parent pane of this component. */
=======
/** R... |
<<<<<<<
/** Gesture to create Events for this FunctionBlock. **/
private CustomGesture gesture;
=======
>>>>>>>
<<<<<<<
gesture = new CustomGesture(this, this);
=======
>>>>>>>
<<<<<<<
public final String getName() {
=======
@Override
public String getName() {
>>>>>>>
public final String getName() { |
<<<<<<<
Point2D menuPos = this.wrapper.getPane().screenToLocal(new Point2D(event.getScreenX(), event.getScreenY()));
this.wrapper.getPane().showFunctionMenuAt(menuPos.getX(), menuPos.getY(), true);
=======
Point2D menuPos = this.wrapper.getToplevel().screenToLocal(new Point2D(event.getScreenX(... |
<<<<<<<
=======
import nl.utwente.group10.ui.CustomUIPane;
/**
* Recent versions of JavaFX ship with their own Alert dialogs, but those can't
* be added to the TactilePane directly. This CustomAlert dialog can.
*/
>>>>>>>
import nl.utwente.group10.ui.CustomUIPane;
/**
* Recent versions of JavaFX ship with thei... |
<<<<<<<
/**
* Optional for the Connection this anchor is connected to.
*/
private Optional<Connection> up;
/**
* @param block The Block this anchor is connected to.
* @param pane The parent pane this Anchor resides on.
* @throws IOException when the FXML definitions cannot be loade... |
<<<<<<<
public String getName()
=======
public int getRequiredPermissionLevel()
{
return 0;
}
@Override
public String getCommandName()
>>>>>>>
public int getRequiredPermissionLevel()
{
return 0;
}
@Override
public String getName() |
<<<<<<<
=======
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.collections.ObservableList;
>>>>>>>
import javafx.beans.property.IntegerProperty;
import javafx.beans.pr... |
<<<<<<<
List<InputAnchor> getInputs();
=======
public List<InputAnchor> getAllInputs();
/**
* @return Only the active (as specified with the bowtie) inputs.
*/
public List<InputAnchor> getActiveInputs();
>>>>>>>
List<InputAnchor> getAllInputs();
/**
* @return Only the act... |
<<<<<<<
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import com.google.common.base.Splitter;
=======
>>>>>>>
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import com.google.common.base.Split... |
<<<<<<<
this.scroll = MathHelper.clamp(this.scroll, 0, this.scrollSize - this.h);
=======
this.scroll = MathHelper.clamp_int(this.scroll, 0, this.scrollSize - size);
>>>>>>>
this.scroll = MathHelper.clamp(this.scroll, 0, this.scrollSize - size); |
<<<<<<<
assertEquals(this.integer.toHaskellType(), v.analyze(new Env()).toHaskellType());
assertEquals("10", v.toHaskell());
=======
assertEquals(this.integer.toHaskellType(), v.analyze(new Env()).prune().toHaskellType());
assertEquals("(10)", v.toHaskell());
>>>>>>>
assertEqu... |
<<<<<<<
* Gets the user specified plugin download directory from the CLI option and sets this in the configuration class
=======
* Outputs information about plugin yaml file option selected from CLI Option
*
* @return plugin yaml file passed in through CLI, or null if user did not pass in a yaml f... |
<<<<<<<
public static final boolean debugWindow2x = true;
public static final Class<?> classLoader = Main.instance.getClass();
=======
public static boolean debugWindow2x = false;
>>>>>>>
public static boolean debugWindow2x = false;
public static final Class<?> classLoader = Main.instance.getClass(); |
<<<<<<<
onResize = EventSubmitter.create();
onResize$ = onResize.map((newSize) -> {
disp.r.size = new int[] { newSize[0], newSize[1] };
if (disp.r.size[0] <= 0)
disp.r.size[0] = 1;
if (disp.r.size[1] <= 0)
disp.r.size[1] = 1;
=======
onResize = BehaviorSubject.create();
onResize$ = onResize.d... |
<<<<<<<
import it.cavallium.warppi.event.TouchEndEvent;
import it.cavallium.warppi.event.TouchMoveEvent;
import it.cavallium.warppi.event.TouchPoint;
import it.cavallium.warppi.event.TouchStartEvent;
import it.cavallium.warppi.gui.graphicengine.GraphicEngine;
import it.cavallium.warppi.util.EventSubmitter;
import it.un... |
<<<<<<<
void create(Runnable object);
EventSubscriber<Integer[]> onResize();
=======
Observable<Integer[]> onResize();
>>>>>>>
EventSubscriber<Integer[]> onResize(); |
<<<<<<<
private float calculateMaxTabSpacing(@Nullable final AbstractItem item) {
float totalSpace = getArithmetics().getSize(Axis.DRAGGING_AXIS, tabContainer) -
(getTabSwitcher().getLayout() == Layout.PHONE_PORTRAIT &&
getModel().areToolbarsShown() ? toolbar.getHeigh... |
<<<<<<<
toolbar = (Toolbar) getTabSwitcher().findViewById(R.id.primary_toolbar);
tabContainer = (ViewGroup) getTabSwitcher().findViewById(R.id.tab_container);
=======
toolbar = getTabSwitcher().findViewById(R.id.primary_toolbar);
>>>>>>>
toolbar = getTabSwitcher().find... |
<<<<<<<
private View inflateChildView(@NonNull final ViewGroup parent, final int viewType) {
View child = childViews.get(viewType);
if (child == null) {
LayoutInflater inflater = LayoutInflater.from(getContext());
child = getDecorator().onInflateView(inflater, parent, viewTy... |
<<<<<<<
import java.awt.image.BufferedImage;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import net.runelite.api.Client;
import net.runelite.api.DecorativeObject;
import net.runelite.api.NPC;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
import n... |
<<<<<<<
eventBus.post(DiscordDisconnected.class, new DiscordDisconnected(errorCode, message));
=======
log.debug("Discord disconnected {}: {}", errorCode, message);
eventBus.post(new DiscordDisconnected(errorCode, message));
>>>>>>>
log.debug("Discord disconnected {}: {}", errorCode, message);
eventBus.pos... |
<<<<<<<
/* Currently Minema supports client side /minema command which
* record video */
if (Aperture.proxy.config.camera_minema)
{
ClientCommandHandler.instance.executeCommand(this.mc.player, "/minema enable");
}
this.position.se... |
<<<<<<<
=======
import java.util.Arrays;
import javax.inject.Inject;
>>>>>>>
import java.util.Arrays;
<<<<<<<
@Override
protected void startUp()
{
rightClick = false;
middleClick = false;
menuHasEntries = false;
client.setCameraPitchRelaxerEnabled(cameraConfig.relaxCameraPitch());
keyManager.registerK... |
<<<<<<<
=======
import java.awt.Color;
import javax.inject.Singleton;
import lombok.AccessLevel;
import net.runelite.api.Player;
import net.runelite.api.geometry.Geometry;
>>>>>>>
<<<<<<<
import net.runelite.api.geometry.Geometry;
=======
import net.runelite.client.Notifier;
>>>>>>>
import net.runelite.api.geome... |
<<<<<<<
=======
private void addSubscriptions()
{
eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged);
eventBus.subscribe(PlayerDeath.class, this, this::onPlayerDeath);
eventBus.subscribe(GameTick.class, this, this::onGameTick);
eventBus.subscribe(GameStateChanged.class, this, this::onGameS... |
<<<<<<<
private static final ImageIcon RESET_ICON;
private static final ImageIcon RESET_ICON_FADED;
private static final ImageIcon RESET_ICON_HOVER;
=======
private static final ImageIcon COLLAPSE_ICON;
private static final ImageIcon EXPAND_ICON;
>>>>>>>
private static final ImageIcon RESET_ICON;
private sta... |
<<<<<<<
Entity getEntity1();
Entity getEntity2();
Model getModelA();
Model getModelB();
=======
/**
* Gets the convex hull of the objects model.
*
* @return the convex hull
* @see net.runelite.api.model.Jarvis
*/
Shape getConvexHull();
Shape getConvexHull2();
Renderable getRenderable1();
Renderab... |
<<<<<<<
/*
* Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source |
<<<<<<<
@Override
protected void startUp() throws Exception
{
eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged);
eventBus.subscribe(GameTick.class, this, this::onGameTick);
}
@Override
protected void shutDown() throws Exception
{
eventBus.unregister(this);
}
private void onGame... |
<<<<<<<
name = "Clan chat info",
description = "Clan Chat Information (eg. when joining a channel)",
titleSection = "opaqueTitle"
=======
name = "Friends chat info",
description = "Friends Chat Information (eg. when joining a channel)",
section = opaqueSection
>>>>>>>
name = "Friends chat info",
desc... |
<<<<<<<
import java.net.Authenticator;
import java.net.PasswordAuthentication;
=======
import java.nio.file.Paths;
>>>>>>>
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.nio.file.Paths;
<<<<<<<
import net.runelite.client.events.ExternalPluginsLoaded;
=======
import net.runelite... |
<<<<<<<
import net.runelite.api.Sprite;
import net.runelite.api.events.ConfigChanged;
=======
import net.runelite.api.SpritePixels;
import net.runelite.client.events.ConfigChanged;
>>>>>>>
import net.runelite.api.Sprite; |
<<<<<<<
import javax.inject.Singleton;
=======
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_ADAMANT;
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_BLACK;
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_BRONZE;
import static net.runelite.api.AnimationID.MINING_MOTHERLODE_CRY... |
<<<<<<<
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
=======
import java.text.DecimalFormat;
>>>>>>>
import java.lang.reflect.InvocationTargetException;... |
<<<<<<<
TZHAAR("Tzhaar", ItemID.ENSOULED_TZHAAR_HEAD,
Collections.singletonList("Tz-"), Collections.emptyList(), false),
VAMPIRES("Vampires", ItemID.STAKE,
asList("Vampyre", "Vyrewatch", "Vampire"), Collections.emptyList()),
=======
TZHAAR("Tzhaar", ItemID.ENSOULED_TZHAAR_HEAD),
UNDEAD_DRUIDS("Undead Druids",... |
<<<<<<<
private static final Injector injector = RuneLite.getInjector();
private static final Client client = injector.getInstance(Client.class);
public static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class);
private static final OverlayManager overlayManager = injector.getInstance(Over... |
<<<<<<<
import net.runelite.api.ItemDefinition;
=======
import net.runelite.api.Constants;
import net.runelite.api.ItemComposition;
import net.runelite.api.ItemID;
>>>>>>>
import net.runelite.api.ItemDefinition;
import net.runelite.api.ItemID; |
<<<<<<<
private static HealthBarOverride healthBarOverride;
@Inject
private static boolean printMenuActions;
@Inject
@Override
public void setPrintMenuActions(boolean yes)
{
printMenuActions = yes;
}
@Inject
=======
>>>>>>>
private static HealthBarOverride healthBarOverride;
@Inject
private static ... |
<<<<<<<
PYRAMID_PLUNDER_SARCO_OPEN(2362),
PYRAMID_PLUNDER_CHEST_OPEN(2363),
=======
PYRAMID_PLUNDER_ROOM_LOCATION(2365),
>>>>>>>
PYRAMID_PLUNDER_SARCO_OPEN(2362),
PYRAMID_PLUNDER_CHEST_OPEN(2363),
PYRAMID_PLUNDER_ROOM_LOCATION(2365), |
<<<<<<<
@Nullable final Boolean showDate,
=======
final LootTrackerPriceType priceType,
final boolean showPriceType,
>>>>>>>
final LootTrackerPriceType priceType,
final boolean showPriceType,
@Nullable final Boolean showDate, |
<<<<<<<
import java.util.regex.Matcher;
=======
import java.util.List;
>>>>>>>
import java.util.regex.Matcher;
import java.util.List;
<<<<<<<
@Inject
private EventBus eventBus;
=======
@Inject
private ConfigManager configManager;
>>>>>>>
@Inject
private EventBus eventBus;
@Inject
private ConfigManager... |
<<<<<<<
* Small hack to prevent plugins checking for specific messages to match
*
=======
* Small hack to prevent plugins checking for specific messages to match. This works because the "—" character
* cannot be seen in-game. This replacement preserves wrapping on chat history messages.
>>>>>>>
* Small hac... |
<<<<<<<
ignoredItems = Text.fromCSV(config.getIgnoredItems());
ignoredNPCs = Text.fromCSV(config.getIgnoredNPCs());
=======
updateConfig();
ignoredItems = Text.fromCSV(this.getIgnoredItems);
>>>>>>>
ignoredItems = Text.fromCSV(config.getIgnoredItems());
ignoredNPCs = Text.fromCSV(config.getIgnoredNPCs()... |
<<<<<<<
=======
graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 13 : 6),
yLocation + yOffset);
graphics.setColor(config.fontColor());
>>>>>>>
graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 13 : 6),
yLocation + yOffset);
... |
<<<<<<<
import net.runelite.api.WorldType;
import net.runelite.api.WallObject;
=======
import net.runelite.api.coords.WorldPoint;
>>>>>>>
import net.runelite.api.WorldType;
import net.runelite.api.WallObject;
import net.runelite.api.coords.WorldPoint;
<<<<<<<
if (this.interactionIdle && checkInteractionIdle(waitD... |
<<<<<<<
@Import("VarpDefinition_get")
RSVarpDefinition getVarpDefinition(int id);
=======
@Construct
RSTileItem newTileItem();
@Construct
RSNodeDeque newNodeDeque();
@Import("updateItemPile")
void updateItemPile(int localX, int localY);
>>>>>>>
@Import("VarpDefinition_get")
RSVarpDefinition getVarpDef... |
<<<<<<<
=======
initDatabase();
>>>>>>>
initDatabase();
<<<<<<<
final int killCount = killCountMap.getOrDefault(eventType.toUpperCase(), -1);
if (this.saveLoot)
=======
if (lootTrackerClient != null && this.saveLoot)
>>>>>>>
if (this.saveLoot) |
<<<<<<<
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.ExperienceChanged;
=======
>>>>>>>
import net.runelite.api.events.ConfigChanged;
<<<<<<<
void onExperienceChanged(ExperienceChanged event)
=======
@Subscribe
public void onStatChanged(StatChanged statChanged)
>>>>>>>
void on... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.