conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
Path outputVariantsFile = output.resolve(fileName + ".variants." + format + extension);
// Metadata file must be in JSON format
final Path outputMetaFile = output.resolve(fileName + ".file.json" + extension);
=======
// Close at the end!
final MalformedVariantHandler ma... |
<<<<<<<
public CohortMongoDBIterator(MongoCursor mongoCursor, ClientSession clientSession, AnnotableConverter<? extends Annotable> converter,
Function<Document, Document> filter, SampleMongoDBAdaptor sampleMongoDBAdaptor, long studyUid, String user,
... |
<<<<<<<
index = analysisFileIndexer.index(fileId, outDirId, backend, sessionId, this.getQueryOptions());
} catch (CatalogManagerException | CatalogIOManagerException | IOException e) {
=======
index = analysisFileIndexer.index(fileId, outDirId, storageEngine, sessionId, queryOptions);
... |
<<<<<<<
coverage = meanCoverage(path, workspace, region, windowSize);
queryResultId = "Get coverage";
=======
chunkFrequency = chunkFrequencyManager.query(region, path, windowSize);
}
if (coverage == null) {
coverage = new RegionCoverage(region, chunkFr... |
<<<<<<<
import org.opencb.biodata.tools.alignment.stats.AlignmentGlobalStats;
import org.opencb.biodata.tools.commons.ChunkFrequencyManager;
=======
>>>>>>>
<<<<<<<
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
=======
>>>>>>>
<<<<<<<
// 2. Calculate stats and store in a ... |
<<<<<<<
public OpenCGAResult<Long> count(final Query query, final String user, final StudyAclEntry.StudyPermissions studyPermissions)
throws CatalogDBException, CatalogAuthorizationException {
return count(null, query, user, studyPermissions);
}
private OpenCGAResult<Long> count(ClientS... |
<<<<<<<
public class VariantFetcher implements AutoCloseable {
=======
@Deprecated
public class VariantFetcher {
>>>>>>>
@Deprecated
public class VariantFetcher implements AutoCloseable {
<<<<<<<
throws CatalogException, StorageManagerException, IOException {
VariantDBAdaptor variantDBAdaptor = ... |
<<<<<<<
import org.opencb.opencga.core.models.common.Enums;
import org.opencb.opencga.core.response.OpenCGAResult;
=======
import org.opencb.opencga.core.models.job.JobInternal;
>>>>>>>
import org.opencb.opencga.core.models.job.JobInternal;
import org.opencb.opencga.core.response.OpenCGAResult; |
<<<<<<<
=======
public String getCatalogDatabase() {
String database;
if (StringUtils.isNotEmpty(catalogConfiguration.getDatabasePrefix())) {
if (!catalogConfiguration.getDatabasePrefix().endsWith("_")) {
database = catalogConfiguration.getDatabasePrefix() + "_catalog";... |
<<<<<<<
if (file.getIndex() != null && file.getIndex().getStatus() != null && file.getIndex().getStatus().getName() != null
&& file.getIndex().getStatus().getName().equals(FileIndex.IndexStatus.READY)) {
// assertTrue(studyConfiguration.getIndexedFiles().contains(id));
// ... |
<<<<<<<
public void searchIndexSamples(String study, List<String> samples, String sessionId)
throws StorageEngineException, IOException, SolrException,
=======
public void searchIndexSamples(String study, List<String> samples, QueryOptions queryOptions, String sessionId)
throws Storage... |
<<<<<<<
=======
import org.opencb.commons.datastore.core.QueryResponse;
>>>>>>>
<<<<<<<
public DataResponse<AnnotationSet> createAnnotationSet(String id, String variableSetId, String annotationSetName,
=======
@Deprecated
public QueryResponse<AnnotationSet> createAnnotationSet(String studyId, String i... |
<<<<<<<
import org.opencb.opencga.catalog.db.api.CatalogIndividualDBAdaptor;
=======
>>>>>>>
import org.opencb.opencga.catalog.db.api.CatalogIndividualDBAdaptor;
<<<<<<<
return individualDBAdaptor.createIndividual(studyId, new Individual(0, name, fatherId, motherId, family, gender, null, null, null, Collect... |
<<<<<<<
=======
import org.opencb.opencga.catalog.exceptions.CatalogException;
import org.opencb.opencga.catalog.models.update.FileUpdateParams;
>>>>>>>
import org.opencb.opencga.catalog.exceptions.CatalogException;
import org.opencb.opencga.catalog.models.update.FileUpdateParams;
<<<<<<<
=======
... |
<<<<<<<
sampleObject.put(PRIVATE_CREATION_DATE, TimeUtils.toDate(sample.getCreationDate()));
=======
sampleObject.put(PERMISSION_RULES_APPLIED, Collections.emptyList());
>>>>>>>
sampleObject.put(PRIVATE_CREATION_DATE, TimeUtils.toDate(sample.getCreationDate()));
sampleObject.put(PERMI... |
<<<<<<<
ObjectMapper mapper = jsonMapperBuilder()
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
DefaultTyping.NON_FINAL)
=======
ObjectMapper mapper = JsonMapper.builder()
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
... |
<<<<<<<
private void printVcf(VariantQueryResult<Variant> variantQueryResult, Iterator<VariantProto.Variant> variantIterator, String study, List<String> samples, List<String> annotations, PrintStream outputStream) {
// logger.debug("Samples from variantQueryResult: {}", variantQueryResult.getSamples());
// ... |
<<<<<<<
return authorizationManager.setAcls(resource.getStudy().getUid(), resource.getResourceList().stream().map(File::getUid)
.collect(Collectors.toList()), members, permissions, Entity.FILE);
=======
// Todo: Remove this in 1.4
List<St... |
<<<<<<<
public OpenCGAResult<Long> count(final Query query, final String user, final StudyAclEntry.StudyPermissions studyPermissions)
=======
public QueryResult<Long> count(long studyUid, final Query query, final String user,
final StudyAclEntry.StudyPermissions studyPermiss... |
<<<<<<<
import org.opencb.biodata.models.variant.avro.PopulationFrequency;
import org.opencb.datastore.core.*;
=======
import org.opencb.biodata.models.variation.PopulationFrequency;
import org.opencb.datastore.core.ObjectMap;
import org.opencb.datastore.core.Query;
import org.opencb.datastore.core.QueryOptions;
impo... |
<<<<<<<
ParamUtils.checkParameter(groupId, "group name");
=======
List<String> userList = StringUtils.isNotEmpty(users) ? Arrays.asList(users.split(",")) : Collections.emptyList();
return createGroup(studyStr, new Group(groupId, userList), sessionId);
}
public QueryResult<Group> creat... |
<<<<<<<
TeamInterpretationAnalysis teamAnalysis = new TeamInterpretationAnalysis(clinicalAnalysisId, studyStr, panelList, moi,
teamAnalysisOptions, opencgaHome, sessionId);
=======
TeamAnalysis teamAnalysis = new TeamAnalysis(clinicalAnalysisId, panelList, moi, ... |
<<<<<<<
import org.apache.solr.common.SolrException;
=======
import org.apache.commons.lang3.tuple.Pair;
>>>>>>>
import org.apache.commons.lang3.tuple.Pair;
import org.apache.solr.common.SolrException; |
<<<<<<<
@Test
public void allTests() throws CatalogManagerException, IOException {
createUserTest();
getUserTest();
loginTest();
logoutTest();
changePasswordTest();
createProjectTest();
getProjectTest();
getProjectIdTest();
getAllProjects()... |
<<<<<<<
jobStatus.put(jobId, Enums.ExecutionStatus.RUNNING);
Command com = new Command(getCommandLine(commandLine, stdout, stderr, token));
=======
jobStatus.put(jobId, Job.JobStatus.RUNNING);
Command com = new Command(getCommandLine(commandLine, stdout, stderr));
>>>>... |
<<<<<<<
MAPPER.writeValueAsString(new Empty());
fail("Should fail");
} catch (JsonMappingException e) {
=======
serializeAsString(mapper, new Empty());
} catch (InvalidDefinitionException e) {
>>>>>>>
MAPPER.writeValueAsString(new Empty());
... |
<<<<<<<
/* We do some defaulting for abstract Map classes and
* interfaces, to avoid having to use exact types or annotations in
* cases where the most common concrete Maps will do.
*/
@SuppressWarnings("rawtypes")
final static HashMap<String, Class<? extends Map>> _mapFallbacks =
... |
<<<<<<<
public DataResponse<T> update(String id, @Nullable String study, ObjectMap params) throws IOException {
=======
public QueryResponse<T> update(String id, @Nullable String study, ObjectMap bodyParams) throws IOException {
>>>>>>>
public DataResponse<T> update(String id, @Nullable String study, Obj... |
<<<<<<<
public abstract QueryResult<Project> createProject(String userId, Project project) throws CatalogDBException, JsonProcessingException;
=======
boolean projectExists(int projectId);
QueryResult<Project> createProject(String userId, Project project) throws CatalogManagerException, JsonProcessingExc... |
<<<<<<<
logger.debug("POST");
if (!variantSourceWritten.getAndSet(true)) {
if (writeStudyConfiguration) {
writeStudyConfiguration();
}
if (writeVariantSource) {
writeSourceSummary(source);
}
}
=======
logge... |
<<<<<<<
private RestResponse<Job> bwa() throws ClientException {
ObjectMap params = new AlignmentAnalysisWSService.BwaRunParams(
=======
private RestResponse<Job> bwa() throws IOException {
ObjectMap params = new AlignmentWebService.BwaRunParams(
>>>>>>>
private RestResponse<Job> bwa() th... |
<<<<<<<
import org.opencb.opencga.catalog.models.Job;
=======
>>>>>>>
<<<<<<<
import org.opencb.opencga.storage.core.local.AlignmentStorageManager;
=======
>>>>>>>
import org.opencb.opencga.storage.core.local.AlignmentStorageManager; |
<<<<<<<
INTERNAL_DATASTORES("internal.datastores", TEXT_ARRAY, ""),
=======
INTERNAL("internal", TEXT_ARRAY, ""),
>>>>>>>
INTERNAL_DATASTORES("internal.datastores", TEXT_ARRAY, ""),
INTERNAL("internal", TEXT_ARRAY, ""), |
<<<<<<<
import org.opencb.opencga.core.SgeManager;
import org.opencb.opencga.core.models.Job;
=======
import org.opencb.opencga.core.models.Job;
import org.opencb.opencga.catalog.monitor.executors.SgeManager;
>>>>>>>
import org.opencb.opencga.catalog.monitor.executors.SgeManager;
import org.opencb.opencga.core.model... |
<<<<<<<
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
=======
import java.util.concurrent.TimeUnit;
>>>>>>>
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
imp... |
<<<<<<<
FacetQueryResult result = catalogSolrManager.facetedQuery(study, CatalogSolrManager.COHORT_SOLR_COLLECTION, query, options,
userId);
auditManager.auditFacet(userId, Enums.Resource.COHORT, study.getId(), study.getUuid(), auditParams,
=======
DataResult<Fa... |
<<<<<<<
@Parameter(names = {"-d", "--database"}, description = "DataBase name", required = false, arity = 1)
public String dbName;
}
=======
public void printUsage(){
if(getCommand().isEmpty()) {
System.err.println("");
System.err.println("Program: Open... |
<<<<<<<
.append(PRIVATE_UID, studyId)
.append(QueryParams.GROUP_NAME.key(), new Document("$ne", group.getName()));
=======
.append(PRIVATE_ID, studyId)
.append(QueryParams.GROUP_ID.key(), new Document("$ne", group.getId()));
>>>>>>>
.app... |
<<<<<<<
if (Enums.ExecutionStatus.RUNNING.equals(executionStatus.getName())) {
AnalysisResult result = readAnalysisResult(Paths.get(job.getTmpDir().getUri()));
=======
if (Job.JobStatus.RUNNING.equals(jobStatus.getName())) {
String analysisId = String.valueOf(job.getAttributes(... |
<<<<<<<
=======
import org.opencb.commons.datastore.core.DataResult;
import org.opencb.commons.datastore.core.ObjectMap;
>>>>>>>
import org.opencb.commons.datastore.core.DataResult;
import org.opencb.commons.datastore.core.ObjectMap;
<<<<<<<
import org.opencb.opencga.analysis.clinical.interpretation.TieringInterpre... |
<<<<<<<
case VariantCommandOptions.SampleEligibilityCommandOptions.SAMPLE_ELIGIBILITY_RUN_COMMAND:
sampleEligibility();
break;
=======
case MUTATIONAL_SIGNATURE_RUN_COMMAND:
mutationalSignature();
break;
>>>>>>>
case ... |
<<<<<<<
List<FileReferenceParam> files, Map<String, Family.FamiliarRelationship> roleToProband,
ClinicalAnalystParam analyst, ClinicalAnalysisInternal internal, Interpretation interpretation,
List<Interpretation> secondaryIn... |
<<<<<<<
return userManager.create(id, name, email, password, organization, diskQuota, options,
configuration.getAdmin().getPassword());
=======
return userManager.create(id, name, email, password, organization, quota, options,
catalogConfiguration.getAdmin().getPassword... |
<<<<<<<
import org.opencb.opencga.core.SolrException;
import org.opencb.opencga.core.models.*;
=======
import org.opencb.opencga.core.models.DataStore;
import org.opencb.opencga.core.models.File;
import org.opencb.opencga.core.models.Sample;
import org.opencb.opencga.core.models.Study;
>>>>>>>
import org.opencb.open... |
<<<<<<<
List<DBObject> cohorts = statsConverter.convertCohortsToStorageType(cohortStats, studyId, fileId); // TODO remove when we remove fileId
// List cohorts = statsConverter.convertCohortsToStorageType(cohortStats, variantSource.getStudyId()); // TODO use when we remove fileId
... |
<<<<<<<
/*
* 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 |
<<<<<<<
import org.opencb.opencga.catalog.auth.authentication.AuthenticationManager;
import org.opencb.opencga.catalog.auth.authentication.CatalogAuthenticationManager;
import org.opencb.opencga.catalog.auth.authentication.LDAPAuthenticationManager;
import org.opencb.opencga.catalog.auth.authentication.LDAPUtils;
====... |
<<<<<<<
public boolean isAlive() throws IOException {
try {
return solrClient.ping().getResponse().get("status").equals("OK");
} catch (SolrException | SolrServerException e) {
logger.trace("Failed isAlive", e);
}
return false;
}
@Deprecated
=======
... |
<<<<<<<
import org.opencb.opencga.storage.core.StorageManagerException;
=======
import org.opencb.opencga.storage.core.StorageManagerFactory;
>>>>>>>
import org.opencb.opencga.storage.core.StorageManagerException;
import org.opencb.opencga.storage.core.StorageManagerFactory;
<<<<<<<
String commandLine = cre... |
<<<<<<<
import org.opencb.opencga.core.common.TimeUtils;
import org.opencb.opencga.core.exception.AnalysisException;
=======
import org.opencb.opencga.core.analysis.result.Status;
import org.opencb.opencga.core.common.JacksonUtils;
>>>>>>>
import org.opencb.opencga.core.analysis.result.Status;
import org.opencb.open... |
<<<<<<<
public OpenCGAResult<Long> count(final Query query, final String user, final StudyAclEntry.StudyPermissions studyPermissions)
=======
public QueryResult<Long> count(long studyUid, final Query query, final String user,
final StudyAclEntry.StudyPermissions studyPermiss... |
<<<<<<<
import org.opencb.opencga.catalog.utils.Constants;
import org.opencb.opencga.core.models.acls.AclParams;
=======
>>>>>>>
import org.opencb.opencga.catalog.utils.Constants; |
<<<<<<<
=======
* Variables Methods
*/
@Override
public QueryResult<VariableSet> createVariableSet(int studyId, String name, Boolean unique,
String description, Map<String, Object> attributes,
... |
<<<<<<<
=======
import java.util.concurrent.atomic.AtomicBoolean;
>>>>>>>
import java.util.concurrent.atomic.AtomicBoolean;
import org.opencb.biodata.formats.io.FileFormatException;
<<<<<<<
import org.opencb.opencga.storage.core.variant.FileStudyConfigurationManager;
import org.opencb.opencga.storage.core.variant.S... |
<<<<<<<
import com.beust.jcommander.ParameterDescription;
import com.beust.jcommander.ParameterException;
=======
>>>>>>>
import com.beust.jcommander.ParameterDescription;
<<<<<<<
public void parse(String[] args) throws ParameterException {
jCommander.parse(args);
}
public String getCommand() ... |
<<<<<<<
import org.opencb.opencga.core.tools.result.ExecutionResultManager;
import org.opencb.opencga.core.tools.result.ExecutionResult;
import org.opencb.opencga.core.tools.result.Status;
=======
>>>>>>> |
<<<<<<<
@ApiOperation(value = "Update some sample attributes", position = 6)
public Response updateByPost(
@ApiParam(value = "sampleId", required = true) @PathParam("sample") String sampleStr,
@ApiParam(value = "Study [[user@]project:]study where study and project can be either the id or... |
<<<<<<<
public void execute(String jobId, String commandLine, Path stdout, Path stderr, String token) throws Exception {
jobStatus.put(jobId, Enums.ExecutionStatus.QUEUED);
=======
public void execute(String jobId, String commandLine, Path stdout, Path stderr) throws Exception {
jobStatus.put(... |
<<<<<<<
SampleIndexQuery sampleIndexQuery = SampleIndexQueryParser.parseSampleIndexQuery(query, scm);
studyConfiguration = scm.getStudyConfiguration(sampleIndexQuery.getStudy(), null).first();
=======
SampleIndexQuery sampleIndexQuery = SampleIndexQuery.extractSampleIndexQuery(query, metadataM... |
<<<<<<<
public boolean canStabaliseInfusion(World world, BlockPos pos) {
return true;
=======
public boolean canStabaliseInfusion(World world, int x, int y, int z) {
return ConfigHandler.enableThaumcraftStablizers;
>>>>>>>
public boolean canStabaliseInfusion(World world, BlockPos pos) {
return ConfigHandler... |
<<<<<<<
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.state.EnumProperty;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.registry.RegistryNamespaced;
import net.minecraft.util.registry.Registry... |
<<<<<<<
import vazkii.botania.common.fixers.AttachedWills;
import vazkii.botania.common.fixers.CraftyCrateTE;
import vazkii.botania.common.fixers.FlattenItems;
import vazkii.botania.common.fixers.FlattenNBT;
=======
import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin;
import vazkii.botania.common.i... |
<<<<<<<
GlStateManager.pushMatrix();
GlStateManager.disableDepth();
GlStateManager.disableTexture2D();
GlStateManager.enableBlend();
=======
GL11.glPushMatrix();
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_LIGHTI... |
<<<<<<<
import com.fasterxml.jackson.databind.util.LookupCache;
import com.fasterxml.jackson.databind.util.SimpleLookupCache;
=======
>>>>>>>
<<<<<<<
private static final long serialVersionUID = 3L;
=======
private static final long serialVersionUID = 2L;
>>>>>>>
private static final long serialVersi... |
<<<<<<<
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
=======
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
>>>>>>>
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net... |
<<<<<<<
boolean remote = supertile.getWorld().isRemote;
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
=======
int slowdown = getSlowdownFactor(... |
<<<<<<<
boolean light = GL11.glGetBoolean(GL11.GL_LIGHTING);
GlStateManager.disableLighting();
=======
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_LIGHTING);
>>>>>>>
GL11.glPushAttrib(GL11.GL_LIGHTING);
GlStateManager.disableLighting();
<<<<<<<
if(light)
GlStateManager.enableLighti... |
<<<<<<<
=======
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerItemAppendMeta(this, SUBTYPES, LibItemNames.COSMETIC);
}
>>>>>>>
<<<<<<<
=======
renderStack = stack;
if (stack.getItemDamage() >= SUBTYPES || stack.getItemDamage() < 0) return;
Variants variant = Va... |
<<<<<<<
boolean armor = event.entityPlayer.getCurrentArmor(1) != null;
GlStateManager.translate(0F, 0.2F, 0F);
=======
GL11.glTranslatef(0F, 0.2F, 0F);
>>>>>>>
GlStateManager.translate(0F, 0.2F, 0F); |
<<<<<<<
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
=======
import net.minecraftforge.comm... |
<<<<<<<
private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, int steps, boolean leaves) {
=======
/**
* Adds a new block swapper to the provided world as the provided player.
* Block swappers are only added on the server, and a marker instance
... |
<<<<<<<
@SubscribeEvent
public static void gatherData(GatherDataEvent evt) {
evt.getGenerator().addProvider(new BlockLootProvider(evt.getGenerator()));
evt.getGenerator().addProvider(new BlockTagProvider(evt.getGenerator()));
evt.getGenerator().addProvider(new ItemTagProvider(evt.getGene... |
<<<<<<<
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.drawable.IDrawable;
import mezz.jei.api.gui.drawable.IDrawableStatic;
import mezz.jei.api.gui.ingredient.I... |
<<<<<<<
public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
ItemStack stack = player.getHeldItem(hand);
if(!stack.isEmpty() && stack.getItem() instanceof ItemDye) {
DyeColor newColor = ((ItemDye) stack.getItem()).color;
DyeColo... |
<<<<<<<
world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F);
=======
if(player == null) {
world.playSound(null, getPos(), ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F);
} else {
world.playSound(null, player.posX, player.posY, player.posZ... |
<<<<<<<
final int types = 23;
=======
final int types = 24;
IIcon[] icons;
>>>>>>>
final int types = 24; |
<<<<<<<
registerDyesPetals();
registerRunes();
registerBows();
=======
registerItemModelMetas(rune, LibItemNames.RUNE, 16);
registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32);
registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9);
>>>>>... |
<<<<<<<
=======
import vazkii.botania.api.state.enums.AltarVariant;
import vazkii.botania.api.state.enums.PoolVariant;
import vazkii.botania.client.core.handler.CorporeaInputHandler;
>>>>>>>
import vazkii.botania.client.core.handler.CorporeaInputHandler;
<<<<<<<
import vazkii.botania.common.lib.LibBlockNames;
====... |
<<<<<<<
public static boolean rfApiLoaded = false;
=======
public static boolean storageDrawersLoaded = false;
>>>>>>>
public static boolean rfApiLoaded = false;
public static boolean storageDrawersLoaded = false;
<<<<<<<
rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy");
=======
storageDrawe... |
<<<<<<<
public int getLightValue(@Nonnull BlockState state, ILightReader world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
TileAltar tile = (TileAltar) world.getTileEntity(pos);
return tile != null && tile.getFluid() == F... |
<<<<<<<
GlStateManager.depthMask(false);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F);
if(isLightingEnabled)
GlStateManager.disableLighting();
=======
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glDepthMa... |
<<<<<<<
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
=======
import vazkii.botania.common.lib.LibItemNames;
import static vazkii.botania.common.item.ModItems.*;
>>>>>>>
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import static va... |
<<<<<<<
List<String> playersWhoAttacked = new ArrayList<>();
=======
List<UUID> playersWhoAttacked = new ArrayList();
>>>>>>>
List<UUID> playersWhoAttacked = new ArrayList<>();
<<<<<<<
if(!playersWhoAttacked.contains(player.getName()))
playersWhoAttacked.add(player.getName());
=======
if(!playersWhoA... |
<<<<<<<
=======
import net.minecraft.block.BlockDirt;
import net.minecraft.block.BlockStem;
>>>>>>>
import net.minecraft.block.BlockStem;
<<<<<<<
import net.minecraft.util.IItemProvider;
import net.minecraft.util.IStringSerializable;
=======
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumPartic... |
<<<<<<<
boolean armor = event.entityPlayer.getCurrentArmor(1) != null;
GlStateManager.translate(0F, 0.2F, 0F);
=======
GL11.glTranslatef(0F, 0.2F, 0F);
>>>>>>>
GlStateManager.translate(0F, 0.2F, 0F); |
<<<<<<<
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
=======
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
>>>>>>>
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registrie... |
<<<<<<<
if(diluted) {
String s = StatCollector.translateToLocal("botaniamisc.pay2win");
mc.fontRendererObj.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, y + 20, 0xFF8888);
}
GlStateManager.disableLighting();
GlStateManager.disableBlend();
... |
<<<<<<<
GlStateManager.color(1F, 1F, 1F, 0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2);
=======
float a = 0.1F + (1 - par1Entity.getDataWatcher().getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY)) * 0.8F;
GL11.glColor4f(1F, 1F, 1F, (0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * ... |
<<<<<<<
public SettableBeanProperty withValueDeserializer(JsonDeserializer<?> deser) {
return new FieldProperty(this, deser, _nullProvider);
}
@Override
public SettableBeanProperty withNullProvider(NullValueProvider nva) {
return new FieldProperty(this, _valueDeserializer, nva);
======... |
<<<<<<<
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
=======
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
>>>>>>>
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
<<<<<<<
MinecraftForge.EVENT_BUS.register(new Mu... |
<<<<<<<
if(block == Blocks.beacon && isTruePlayer(player) && !par3World.isRemote) {
if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) {
player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
=======
if(block == ... |
<<<<<<<
Color c = Color.getHSBColor(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F);
r = (float) c.getRed() / 255F;
g = (float) c.getGreen() / 255F;
b = (float) c.getBlue() / 255F;
=======
Color c = Color.getHSBColor(tile.getWorldObj().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F);
r... |
<<<<<<<
IInventory inv = InventoryHelper.getInventory(worldObj, getPos());
if(inv == null)
inv = InventoryHelper.getInventory(worldObj, getPos());
=======
IInventory inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 1, zCoord);
if(inv == null || inv instanceof TileCorporeaFunnel)
inv = Inven... |
<<<<<<<
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityAnimal> animals = supertile.getWorld().getEntitiesWithinAABB(EntityAnimal.class, new... |
<<<<<<<
Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "scribing_tools"));
manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000);
=======
Item inkwell = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemIn... |
<<<<<<<
import net.minecraft.block.Block;
=======
import javax.annotation.Nonnull;
>>>>>>>
import net.minecraft.block.Block;
import javax.annotation.Nonnull;
<<<<<<<
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IBlockReader;
=======
import net.minecraft.util.text.TextComponentTranslation;
... |
<<<<<<<
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
=======
import vazkii.botania.api.BotaniaAPI;
>>>>>>>
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import vazkii.botania.api.BotaniaAPI;
<<<<<<<
if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true) && ... |
<<<<<<<
GlStateManager.color(1F, 1F, 1F, a);
GlStateManager.translate(d0, d1, d2);
boolean inf = tileentity.getWorld() == null ? forceMeta == 1 : tileentity.getBlockMetadata() == 1;
boolean dil = tileentity.getWorld() == null ? forceMeta == 2 : tileentity.getBlockMetadata() == 2;
=======
GL11.glColor4f(1F, ... |
<<<<<<<
bindToUsernameS(player.getName(), stack);
=======
bindToUUIDS(player.getUniqueID(), stack);
>>>>>>>
bindToUUIDS(player.getUniqueID(), stack);
<<<<<<<
return isRightPlayer(player.getName(), stack);
=======
if(hasUUIDS(stack))
return isRightPlayer(player.getUniqueID(), stack);
return isRightP... |
<<<<<<<
if(!isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos()))
entity.world.createExplosion(entity, entity.getX(), entity.getY(), entity.getZ(),
=======
if(!isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos())) {
Entity cause = entity.getThrower() != null ? entity.getThr... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.