conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
world.setBlockState(destPos.offset(dir), srcState);
data.mapping.put(s.getPos(), destPos.offset(dir));
=======
world.setBlockState(destPos.offset(dir), LensPiston.unWaterlog(srcState));
mappedPositions.put(s, GlobalPos.of(world.getDimension().getType(), destPos.offset(dir))... |
<<<<<<<
private static final ArrayList<ExpansionSoundChip> expnSound = new ArrayList<ExpansionSoundChip>();
=======
private final ArrayList<ExpansionSoundChip> expnSound = new ArrayList<>();
>>>>>>>
private static final ArrayList<ExpansionSoundChip> expnSound = new ArrayList<>(); |
<<<<<<<
String mirrorUrl = getMirrorAllOrCentralURL();
String wrapperUrl = String.format("%s/%s", mirrorUrl, artifactPath);
=======
String wrapperUrl = getDownloadBaseUrl() + "/" + artifactPath;
>>>>>>>
String mirrorUrl = getMirrorAllOrCentralURL();
String wrapperUrl = String.format("%s/%s", mirr... |
<<<<<<<
=======
ser = defaultImpl;
if (ser == null) {
ser = StdKeySerializers.getStdKeySerializer(config, keyType.getRawClass(), false);
// As per [databind#47], also need to support @JsonValue
if (ser == null) {
... |
<<<<<<<
httpManager.asyncPost("http://www.baidu.com",
"hello".getBytes(), null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
=======
httpManager.asyncPost(null,"http://www.baidu.com",
"hello".getBytes(), null, UpToken.parse(TestConfig.commonToken), "he... |
<<<<<<<
private void uploadRestData(final ResumeUploadCompleteHandler completeHandler){
=======
private void uploadRestBlock(UploadBlockCompleteHandler completeHandler) {
>>>>>>>
private void uploadRestData(final ResumeUploadCompleteHandler completeHandler) {
<<<<<<<
if (uploadFileInfo == null){... |
<<<<<<<
"[이렇다, , 생각, 을, , 하다, , 게, , 정말로, , 말, 이, , 되다, ㅋㅋ]",
processorWithSpace.tokenizeToStrings(text).toString()
);
assertEquals(
"[이런, 생각, 을, 하는, 게, 정말로, 말, 이, 되, 니, ㅋㅋ]",
=======
"[이런, 생각, 을, 하는, 게, 정말로, 말, 이, 되니, ㅋㅋ]",
>>>>>>>
"[이렇다, , 생각, 을, , 하다, , 게, ... |
<<<<<<<
return dms.instantiateTopic(model, false, true); // fetchComnposite=false, checkAccess=true
=======
return dms.instantiateTopic(model);
>>>>>>>
return dms.instantiateTopic(model, true); // checkAccess=true
<<<<<<<
return dms.instantiateAssociation(model, ... |
<<<<<<<
return topic != null ? instantiateTopic(topic, fetchComposite, true) : null; // checkAccess=true
=======
return topic != null ? instantiateTopic(topic) : null;
>>>>>>>
return topic != null ? instantiateTopic(topic, true) : null; // checkAccess=true
<... |
<<<<<<<
} catch (Exception e) {
logger.severe("Activation of " + this + " failed:");
=======
} catch (RuntimeException e) {
logger.severe("Starting " + this + " failed:");
>>>>>>>
} catch (Exception e) {
logger.severe("Starting " + this + " failed:");
<<<<... |
<<<<<<<
CompositeValueModel comp = topic.getCompositeValueModel();
=======
//
CompositeValue comp = topic.getCompositeValue();
>>>>>>>
//
CompositeValueModel comp = topic.getCompositeValueModel(); |
<<<<<<<
import de.deepamehta.core.service.Cookies;
import de.deepamehta.core.service.Directives;
=======
>>>>>>>
import de.deepamehta.core.service.Cookies; |
<<<<<<<
return topic != null ? dms.instantiateRelatedTopic(topic, fetchComposite, fetchRelatingComposite, true) : null;
// checkAccess=true
=======
return topic != null ? dms.instantiateRelatedTopic(topic) : null;
>>>>>>>
return topic != null ? dms.instantiateRelatedTopic(topic, true)... |
<<<<<<<
=======
import javax.ws.rs.CookieParam;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
>>>>>>>
import javax.ws.rs.Path;
<<<<<<<
=======
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
>>>>>>>
import javax.ws.rs.Produces;
<<<<<<<
public void createACLEntry(DeepaMehtaObject objec... |
<<<<<<<
import de.deepamehta.core.service.accesscontrol.AccessControlException;
import de.deepamehta.core.service.accesscontrol.Operation;
=======
import de.deepamehta.core.service.Transactional;
>>>>>>>
import de.deepamehta.core.service.Transactional;
import de.deepamehta.core.service.accesscontrol.AccessControlExc... |
<<<<<<<
// === Traversal ===
// --- Association Retrieval ---
@Override
public RelatedAssociation getRelatedAssociation(String assocTypeUri, String myRoleTypeUri,
String othersRoleTypeUri, String othersAssocTypeUri) {
RelatedAssociationModel ... |
<<<<<<<
logger.info("========== Starting DeepaMehta 3 Core ==========");
dms = new EmbeddedService(new HGStorageBridge(openDB()));
=======
=== Starting bundle \"DeepaMehta 3 Core\" ==========");
dms = new EmbeddedService(openDB());
=======
logger.info("========== Startin... |
<<<<<<<
=======
import moze_intel.projecte.utils.EMCHelper;
import moze_intel.projecte.utils.ItemHelper;
>>>>>>>
import moze_intel.projecte.utils.EMCHelper;
import moze_intel.projecte.utils.ItemHelper; |
<<<<<<<
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(IKnowledgeProvider::getEmc).orElse(0.0);
String emc = I18n.format("pe.emc.emc_tooltip_prefix") + " " + Constants.EMC_FORMATTER.format(emcAmount);
=======
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CA... |
<<<<<<<
import java.util.HashSet;
=======
import java.util.ArrayList;
import java.util.Collections;
>>>>>>>
import java.util.HashSet;
import java.util.Collections;
<<<<<<<
this.func_180343_e().addAll(hashset);
ReflectionHelper.setExplosionSize(this, initialSize);
=======
this.affectedBlockPositions.addAll(h... |
<<<<<<<
import moze_intel.projecte.utils.ItemHelper;
import moze_intel.projecte.utils.KeyHelper;
=======
import moze_intel.projecte.utils.Coordinates;
import moze_intel.projecte.utils.PEKeybind;
import moze_intel.projecte.utils.MetaBlock;
>>>>>>>
import moze_intel.projecte.utils.ItemHelper;
import moze_intel.project... |
<<<<<<<
protected void clearTagAOE(World world, ItemStack stack, EntityPlayer player, Tag<Block> tag, int emcCost, EnumHand hand)
=======
protected void clearOdAOE(World world, ItemStack stack, EntityPlayer player, String odName, long emcCost, EnumHand hand)
>>>>>>>
protected void clearTagAOE(World world, ItemSta... |
<<<<<<<
import moze_intel.projecte.emc.arithmetics.IntArithmetic;
import moze_intel.projecte.emc.mappers.Chisel2Mapper;
=======
import moze_intel.projecte.emc.arithmetics.HiddenFractionArithmetic;
>>>>>>>
import moze_intel.projecte.emc.mappers.Chisel2Mapper;
import moze_intel.projecte.emc.arithmetics.HiddenFractionA... |
<<<<<<<
player.worldObj.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F);
stack.setItemDamage(1);
=======
stack.setMetadata(1);
>>>>>>>
player.worldObj.playSoundAtEntity(player, "projecte:item.peheal", 1.0F, 1.0F);
stack.setMetadata(1);
<<<<<<<
player.worldObj.playSoundAtEntity(player... |
<<<<<<<
import codechicken.nei.api.API;
// todo 1.8 restore when MT updates import moze_intel.projecte.integration.MineTweaker.TweakInit;
import moze_intel.projecte.integration.NEI.NEIAlchBagHandler;
import moze_intel.projecte.integration.NEI.NEIKleinStarHandler;
import moze_intel.projecte.integration.NEI.NEIPhiloSmelt... |
<<<<<<<
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumParticleTypes;
=======
>>>>>>>
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumParticleTypes;
<<<<<<<
if (ticksExisted > 400 || this.isInWater() || shooter == null |... |
<<<<<<<
import java.util.Arrays;
=======
import java.util.ArrayList;
>>>>>>>
import java.util.Arrays;
import java.util.ArrayList;
<<<<<<<
writeToNBT(player.getHeldItem().getTagCompound());
Transmutation.setStoredEmc(player.getCommandSenderName(), emc);
=======
writeToNBT(player.getHeldItem().stackTagC... |
<<<<<<<
this.font.drawString(I18n.format("pe.transmutation.transmute"), 6, 8, 4210752);
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(IKnowledgeProvider::getEmc).orElse(0.0);
=======
this.fontRenderer.drawString(I18n.format("pe.transmutation.transmute"), 6, 8, 4210752);
lon... |
<<<<<<<
=======
import com.google.common.collect.Maps;
import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
>>>>>>>
import com.google.common.collect.Maps;
<<<<<<<
for (Entry<ItemStack, ItemStack> entry : (((Map<ItemStack, It... |
<<<<<<<
=======
@Override
public PropertyMetadata getMetadata() {
final Boolean b = _findRequired();
final String desc = _findDescription();
final Integer idx = _findIndex();
final String def = _findDefaultValue();
if (b == null && idx == null && def == null) {
... |
<<<<<<<
import moze_intel.projecte.api.IPedestalItem;
=======
import cpw.mods.fml.common.Optional;
import moze_intel.projecte.api.item.IPedestalItem;
>>>>>>>
import moze_intel.projecte.api.item.IPedestalItem; |
<<<<<<<
import moze_intel.projecte.api.IProjectileShooter;
=======
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import moze_intel.projecte.api.item.IProjectileShooter;
>>>>>>>
import moze_intel.projecte.api.item.IProjectileShooter; |
<<<<<<<
AlchChestTile tile = ((AlchChestTile) world.getTileEntity(pos));
=======
if (!stack.hasTagCompound())
{
stack.setTagCompound(new NBTTagCompound());
}
AlchChestTile tile = ((AlchChestTile) world.getTileEntity(x, y, z));
>>>>>>>
if (!stack.hasTagCompound())
{
stack.setTagCompound(new NBTTa... |
<<<<<<<
=======
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import moze_intel.projecte.api.tile.IEmcAcceptor;
>>>>>>>
import moze_intel.projecte.api.tile.IEmcAcceptor;
<<<<<<<
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ICha... |
<<<<<<<
import moze_intel.projecte.api.IFlightItem;
import moze_intel.projecte.api.IPedestalItem;
=======
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import moze_intel.projecte.utils.IFlightItem;
import moze_intel.projecte.api.item.IPedestalItem;
... |
<<<<<<<
long toSend = this.getStoredEmc() < emcGen ? this.getStoredEmc() : emcGen;
=======
//Only send EMC when we are not upgrading fuel or charging an item
double toSend = this.getStoredEmc() < emcGen ? this.getStoredEmc() : emcGen;
>>>>>>>
//Only send EMC when we are not upgrading fuel or charging an ... |
<<<<<<<
import moze_intel.projecte.network.PacketHandler;
import moze_intel.projecte.network.packets.SyncTableEMCPKT;
=======
>>>>>>>
<<<<<<<
import java.util.Arrays;
=======
import java.util.ArrayList;
>>>>>>>
import java.util.Arrays;
import java.util.ArrayList;
<<<<<<<
Transmutation.setStoredEmc(player.get... |
<<<<<<<
import moze_intel.projecte.utils.WorldHelper;
=======
import moze_intel.projecte.utils.PlayerHelper;
>>>>>>>
import moze_intel.projecte.utils.WorldHelper;
import moze_intel.projecte.utils.PlayerHelper;
<<<<<<<
for (BlockPos pos : WorldHelper.getPositionsFromCorners(this.getPosition().add(-3, -3, -3), thi... |
<<<<<<<
import moze_intel.projecte.api.item.IExtraFunction;
import moze_intel.projecte.api.item.IModeChanger;
import moze_intel.projecte.api.item.IProjectileShooter;
import moze_intel.projecte.gameObjs.entity.EntityFireProjectile;
import moze_intel.projecte.gameObjs.entity.EntityLightningProjectile;
import moze_intel.p... |
<<<<<<<
=======
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import moze_intel.projecte.PECore;
import moze_intel.projecte.api.item.IModeChanger;
>>>>>>>
import moze_intel.projecte.PECore;
import moze_intel.projecte.api.item.IModeChanger;
<<<<<<<
=======
import net.minecraft.clien... |
<<<<<<<
=======
import com.google.common.collect.Lists;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
>>>>>>>
import com.google.commo... |
<<<<<<<
import moze_intel.projecte.config.CustomEMCParser;
import moze_intel.projecte.emc.EMCMapper;
import moze_intel.projecte.handlers.TileEntityHandler;
import moze_intel.projecte.network.PacketHandler;
=======
import moze_intel.projecte.emc.ThreadReloadEMCMap;
>>>>>>>
import moze_intel.projecte.config.CustomEMCP... |
<<<<<<<
super.read(nbt);
storedFuelEmc = nbt.getDouble("FuelEMC");
input.deserializeNBT(nbt.getCompound("Input"));
auxSlots.deserializeNBT(nbt.getCompound("AuxSlots"));
=======
super.readFromNBT(nbt);
storedFuelEmc = nbt.getLong("FuelEMC");
input.deserializeNBT(nbt.getCompoundTag("Input"));
auxSlots.d... |
<<<<<<<
import moze_intel.projecte.gameObjs.ObjHandler;
import moze_intel.projecte.gameObjs.items.ItemPE;
=======
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import moze_intel.projecte.api.item.IItemEmc;
import moze_intel.projecte.api.tile.IEmcAcceptor;
import moze_intel.projecte.api.tile.IEmcProv... |
<<<<<<<
});
private final int chargeRate;
=======
};
private final long chargeRate;
>>>>>>>
});
private final long chargeRate;
<<<<<<<
RelayMK1Tile(TileEntityType<?> type, int sizeInv, int maxEmc, int chargeRate)
=======
RelayMK1Tile(int sizeInv, long maxEmc, long chargeRate)
>>>>>>>
RelayMK1Tile(TileEn... |
<<<<<<<
public class CollectorMK1Tile extends TileEmc implements IEmcProvider, IInteractionObject
=======
public class CollectorMK1Tile extends TileEmc implements IEmcProvider, IEmcAcceptor
>>>>>>>
public class CollectorMK1Tile extends TileEmc implements IEmcProvider, IEmcAcceptor, IInteractionObject
<<<<<<<
publi... |
<<<<<<<
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.EnumDyeColor;
=======
import net.minecraft.entity.player.EntityPlayer;
>>>>>>>
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.entity.pl... |
<<<<<<<
=======
import moze_intel.projecte.gameObjs.tiles.DMPedestalTile;
import moze_intel.projecte.manual.ManualPageHandler;
>>>>>>>
import moze_intel.projecte.manual.ManualPageHandler; |
<<<<<<<
import moze_intel.projecte.api.tile.ITileEmc;
import moze_intel.projecte.network.PacketHandler;
import moze_intel.projecte.network.packets.TileEmcSyncPKT;
=======
import com.google.common.base.Predicates;
import com.google.common.collect.Maps;
import moze_intel.projecte.api.tile.IEmcAcceptor;
import moze_inte... |
<<<<<<<
writeToNBT(player.getHeldItem().getTagCompound());
Transmutation.setStoredEmc(this.player.getCommandSenderName(), emc);
=======
if (!player.worldObj.isRemote)
{
writeToNBT(player.getHeldItem().stackTagCompound);
Transmutation.setStoredEmc(player.getCommandSenderName(), emc);
}
>>>>>>>
... |
<<<<<<<
=======
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1)
{
return icons[MathHelper.clamp_int(par1, 0, 2)];
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register)
{
icons = new IIcon[3];
for (int i = 0; i < 3; i++)
icons[i] = register.registerIc... |
<<<<<<<
import net.minecraft.block.state.IBlockState;
=======
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.IGrowable;
>>>>>>>
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.BlockNetherWart;
import net.minecr... |
<<<<<<<
=======
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterMo... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
public static final HashMap<ItemStack, ItemStack> MAP = Maps.newHashMap();
=======
public static Item manual = new PEManual();
>>>>>>>
public static Item manual = new PEManual();
public static final HashMap<ItemStack, ItemStack> MAP = Maps.newHashMap();
<<<<<<<
======... |
<<<<<<<
=======
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
>>>>>>>
<<<<<<<
=======
import moze_intel.projecte.gameObjs.tiles.DMPedestalTile;
import moze_intel.p... |
<<<<<<<
import moze_intel.projecte.gameObjs.entity.EntityLootBall;
import moze_intel.projecte.gameObjs.items.rings.RingToggle;
import moze_intel.projecte.gameObjs.items.rings.VoidRing;
=======
>>>>>>>
<<<<<<<
if (ItemHelper.invContainsItem(inv, new ItemStack(ObjHandler.blackHole, 1, 1))
|| ItemHelper.invCo... |
<<<<<<<
=======
import cpw.mods.fml.common.Optional;
import moze_intel.projecte.api.IAlchBagItem;
>>>>>>>
import moze_intel.projecte.api.IAlchBagItem; |
<<<<<<<
import com.google.common.collect.Lists;
=======
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
>>>>>>>
import com.google.commo... |
<<<<<<<
super(type);
setMaximumEMC(Double.MAX_VALUE);
=======
setMaximumEMC(Long.MAX_VALUE);
>>>>>>>
super(type);
setMaximumEMC(Long.MAX_VALUE);
<<<<<<<
tag.putDouble("EMC", currentEMC);
=======
tag.setLong("EMC", currentEMC);
>>>>>>>
tag.putLong("EMC", currentEMC);
<<<<<<<
super.read(tag);
... |
<<<<<<<
this.addSlot(new SlotInput(transmutationInventory, 0, 43, 23));
this.addSlot(new SlotInput(transmutationInventory, 1, 34, 41));
this.addSlot(new SlotInput(transmutationInventory, 2, 52, 41));
this.addSlot(new SlotInput(transmutationInventory, 3, 16, 50));
this.addSlot(new SlotInput(transmutationInvent... |
<<<<<<<
=======
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
>>>>>>>
import net.minecraft.entity.player.EntityPlayerMP; |
<<<<<<<
Minecraft mc = FMLClientHandler.instance().getClient();
RenderingRegistry.registerEntityRenderingHandler(EntityWaterProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.waterOrb, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLavaProjectile.class, new Render... |
<<<<<<<
=======
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
>>>>>>>
import net.minecraft.entity.player.EntityPlayerMP;
<<<<<<<
for (BlockPos pos : WorldHelper.getPositionsFromBox(box))
{
Block block = world.getBlockState(pos).getBlock();
float hardness = block... |
<<<<<<<
placeWater(world, blockPosHit.offset(mop.sideHit));
PlayerHelper.swingItem(((EntityPlayerMP) player));
=======
placeWater(world, i, j, k);
PlayerHelper.swingItem(player);
>>>>>>>
placeWater(world, blockPosHit.offset(mop.sideHit));
PlayerHelper.swingItem(player); |
<<<<<<<
public double provideEMC(@Nonnull Direction side, double toExtract)
=======
public long provideEMC(@Nonnull EnumFacing side, long toExtract)
>>>>>>>
public long provideEMC(@Nonnull Direction side, long toExtract) |
<<<<<<<
import moze_intel.projecte.emc.collector.DumpToFileCollector;
=======
import moze_intel.projecte.api.event.EMCRemapEvent;
>>>>>>>
import moze_intel.projecte.emc.collector.DumpToFileCollector;
import moze_intel.projecte.api.event.EMCRemapEvent; |
<<<<<<<
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
=======
import net.minecraft.client.renderer.texture.IIconRegister;
>>>>>>>
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
<<<<<<<
placeWater(world, blockPosHit.offs... |
<<<<<<<
=======
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
>>>>>>>
<<<<<<<
=======
import net.minecraft.client.renderer.texture.IIconRegister;
>>>>>>>
<<<<<<<
import net.minecraftforge.fml.common.Optional;
=======
>>>>>>>
import net.mine... |
<<<<<<<
=======
import moze_intel.projecte.utils.EnumArmorType;
import net.minecraft.client.renderer.texture.IIconRegister;
>>>>>>>
import moze_intel.projecte.utils.EnumArmorType;
<<<<<<<
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
{
}
=======
... |
<<<<<<<
PacketHandler.sendTo(new SyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPacket()), (EntityPlayerMP) player);
PELogger.logInfo("** SENT FULL BAG DATA **");
=======
PacketHandler.sendTo(new ClientSyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPacket()), (EntityPlayerMP) player);
PELogger.l... |
<<<<<<<
public static final int[] MAX_KLEIN_EMC = new int[] {50000, 200000, 800000, 3200000, 12800000, 51200000};
public static final int[] RELAY_KLEIN_CHARGE_RATE = new int[] {16, 48, 160};
=======
public static final long[] MAX_KLEIN_EMC = new long[] {50000, 200000, 800000, 3200000, 12800000, 51200000};
public... |
<<<<<<<
if (ProjectEConfig.enableITorch)
{
GameRegistry.addRecipe(new ItemStack(confuseTorch, 2), "RDR", "DPD", "GGG", 'R', Blocks.REDSTONE_TORCH, 'G', Items.GLOWSTONE_DUST, 'D', Items.DIAMOND, 'P', philosStone);
}
=======
GameRegistry.addRecipe(new ItemStack(confuseTorch, 2), "RDR", "DPD", "GGG", 'R', Blo... |
<<<<<<<
import moze_intel.projecte.api.IFireProtectionItem;
import moze_intel.projecte.api.IPedestalItem;
import moze_intel.projecte.api.IProjectileShooter;
=======
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import moze_intel.projecte.utils.IFir... |
<<<<<<<
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard;
=======
>>>>>>>
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftf... |
<<<<<<<
registerProcessor.process(new InstanceReplicationTask(name, Action.Register, info, null, true) {
public EurekaHttpResponse<Void> execute() {
return replicationClient.register(info);
}
});
=======
long expiryTime = System.currentTimeMillis() + inf... |
<<<<<<<
import com.netflix.discovery.shared.transport.EurekaHttpResponse;
import com.netflix.eureka.EurekaServerConfig;
import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl.Action;
=======
import com.netflix.discovery.shared.EurekaHttpClient.HttpResponse;
>>>>>>>
import com.netflix.discovery.shared.trans... |
<<<<<<<
import com.netflix.discovery.shared.JerseyClient;
import com.netflix.discovery.shared.JerseyClientConfigBuilder;
=======
import com.netflix.discovery.shared.EurekaJerseyClient;
import com.netflix.discovery.shared.EurekaJerseyClient.EurekaJerseyClientBuilder;
>>>>>>>
import com.netflix.discovery.shared.Eureka... |
<<<<<<<
import com.netflix.discovery.shared.transport.EurekaHttpResponse;
import com.netflix.eureka.PeerAwareInstanceRegistryImpl.Action;
=======
import com.netflix.discovery.shared.EurekaHttpClient.HttpResponse;
import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl.Action;
>>>>>>>
import com.netflix.disc... |
<<<<<<<
@Override
public int getRoute53BindRebindRetries() {
return configInstance.getIntProperty(
namespace + "route53BindRebindRetries", 3).get();
}
@Override
public int getRoute53BindingRetryIntervalMs() {
return configInstance.getIntProperty(
na... |
<<<<<<<
import java.util.Arrays;
=======
import java.util.Date;
>>>>>>>
import java.util.Arrays;
import java.util.Date; |
<<<<<<<
=======
/**
* @return {@code Boolean.TRUE} if explicitly set to true; {@code Boolean.FALSE}
* if explicit set to false; or {@code null} if not set either way (assuming
* "default leniency" for the context)
*
* @since 2.9
*/
>>>>>>>
/**... |
<<<<<<<
=======
*
* @return True if annotation is enabled (normal case); false if it is to
* be ignored (only useful for mix-in annotations to "mask" annotation
*
* @since 2.9
>>>>>>>
*
* @return True if annotation is enabled (normal case); false if it is to
* be ignored (... |
<<<<<<<
import com.reactnativecommunity.netinfo.NetInfoPackage;
=======
import org.reactnative.camera.RNCameraPackage;
>>>>>>>
import com.reactnativecommunity.netinfo.NetInfoPackage;
import org.reactnative.camera.RNCameraPackage;
<<<<<<<
new NetInfoPackage(),
=======
new RNCameraPackage(),... |
<<<<<<<
.enableDefaultTyping(NoCheckSubTypeValidator.instance,
DefaultTyping.NON_FINAL)
.build();
Path input = Paths.get(isWindows() ? "c:/tmp" : "/tmp", "foo.txt");
=======
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
... |
<<<<<<<
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import it.unibz.inf.ontop.model.term.ImmutableTerm;
import it.unibz.inf.ontop.model.term.Variable;
=======
import com.google.common.collect.ImmutableList;
import it.unibz.inf.ontop.iq.node.VariableNullability;
impo... |
<<<<<<<
import org.semanticweb.ontop.owlrefplatform.core.QuestPreferences;
=======
import org.semanticweb.ontop.ontology.OClass;
>>>>>>>
import org.semanticweb.ontop.owlrefplatform.core.QuestPreferences;
import org.semanticweb.ontop.ontology.OClass; |
<<<<<<<
import org.semanticweb.ontop.owlrefplatform.core.DBConnector;
import org.semanticweb.ontop.owlrefplatform.core.IQuest;
=======
import org.semanticweb.ontop.owlrefplatform.core.IQuest;
import org.semanticweb.ontop.owlrefplatform.core.QuestPreferences;
import org.semanticweb.ontop.owlrefplatform.core.abox.Seman... |
<<<<<<<
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.util.List;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
... |
<<<<<<<
import org.semanticweb.ontop.model.impl.TermUtils;
import org.semanticweb.ontop.owlrefplatform.core.basicoperations.Substitution;
=======
import org.semanticweb.ontop.model.impl.VariableImpl;
import org.semanticweb.ontop.model.Substitution;
>>>>>>>
import org.semanticweb.ontop.model.impl.TermUtils;
<<<<<<<
... |
<<<<<<<
=======
import it.unibz.inf.ontop.dbschema.DBMetadata;
import it.unibz.inf.ontop.dbschema.DBParameters;
>>>>>>>
import it.unibz.inf.ontop.dbschema.DBMetadata;
import it.unibz.inf.ontop.dbschema.DBParameters;
<<<<<<<
=======
private final DBParameters dbParameters;
>>>>>>>
<<<<<<<
InputQueryFacto... |
<<<<<<<
s */
=======
*<p>
* NOTE: type modifiers are NOT called on constructed type itself.
*/
>>>>>>>
*<p>
* NOTE: type modifiers are NOT called on constructed type itself.
*/
<<<<<<<
=======
/**
* Method for constructing a type instance with specified parameterization.... |
<<<<<<<
import it.unibz.inf.ontop.model.term.functionsymbol.ExpressionOperation;
=======
>>>>>>>
import it.unibz.inf.ontop.model.term.Term;
import it.unibz.inf.ontop.model.term.functionsymbol.ExpressionOperation;
<<<<<<<
import it.unibz.inf.ontop.model.type.TermType;
=======
import it.unibz.inf.ontop.model.term.f... |
<<<<<<<
import org.semanticweb.ontop.owlapi3.OWLAPI3Translator;
import org.semanticweb.ontop.owlrefplatform.core.*;
=======
import org.semanticweb.ontop.owlapi3.OWLAPI3TranslatorUtility;
import org.semanticweb.ontop.owlrefplatform.core.Quest;
import org.semanticweb.ontop.owlrefplatform.core.QuestConnection;
import or... |
<<<<<<<
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Properties;
import it.unibz.inf.ontop.owlrefplatform.owlapi3.*;
import org.junit.Before;
import org.junit.Test;
import it.unibz.inf.ontop.injection.OBDAProperties;
import it.unibz.inf.... |
<<<<<<<
import it.unibz.inf.ontop.spec.mapping.PrefixManager;
=======
import it.unibz.inf.ontop.model.atom.AtomFactory;
import it.unibz.inf.ontop.querymanager.*;
>>>>>>>
import it.unibz.inf.ontop.querymanager.*; |
<<<<<<<
import com.google.common.collect.ImmutableList;
import it.unibz.inf.ontop.injection.NativeQueryLanguageComponentFactory;
import it.unibz.inf.ontop.model.Function;
import it.unibz.inf.ontop.model.CQIE;
import it.unibz.inf.ontop.model.DatalogProgram;
import it.unibz.inf.ontop.model.OBDADataFactory;
import it.unib... |
<<<<<<<
import java.util.*;
=======
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
>>>>>>>
import java.util.*;
<<<<<<<
List<TableDefinition> tables = metadata.getTableList();
List<OBDAMappingAxiom> mappingA... |
<<<<<<<
_verifySecurityException(e, clsName);
}
}
// // // Tests for [databind#1737]
public void testJDKTypes1737() throws Exception
{
_testTypes1737(java.util.logging.FileHandler.class);
_testTypes1737(java.rmi.server.UnicastRemoteObject.class);
}
// 17-Au... |
<<<<<<<
import it.unibz.inf.ontop.model.term.RDFLiteralConstant;
=======
import it.unibz.inf.ontop.model.term.ValueConstant;
import org.apache.commons.rdf.api.IRI;
>>>>>>>
import it.unibz.inf.ontop.model.term.RDFLiteralConstant;
import org.apache.commons.rdf.api.IRI; |
<<<<<<<
import it.unibz.krdb.obda.model.Function;
import it.unibz.krdb.obda.model.CQIE;
import it.unibz.krdb.obda.model.DatalogProgram;
import it.unibz.krdb.obda.model.OBDADataFactory;
import it.unibz.krdb.obda.model.Term;
=======
import com.google.common.collect.Multimap;
import it.unibz.krdb.obda.model.*;
>>>>>>>... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.