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)));
>>>>>>>
world.setBlockState(destPos.offset(dir), LensPiston.unWaterlog(srcState));
data.mapping.put(s.getPos(), 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", mirrorUrl, artifactPath);
<<<<<<<
getLog().debug("Attempting to download from and write to:");
getLog().debug(" WrapperUrl: " + wrapperUrl);
getLog().debug(" Destination: " + destination.getAbsolutePath());
=======
>>>>>>>
getLog().debug("Attempting to download from and write to:");
getLog().debug(" WrapperUrl: " + wrapperUrl);
getLog().debug(" Destination: " + destination.getAbsolutePath());
<<<<<<<
overwriteDistributionUrl(rootDirectory, getDistributionUrl(mirrorUrl));
=======
overwriteMavenWrapperProperties(rootDirectory);
>>>>>>>
overwriteDistributionUrl(rootDirectory, getDistributionUrl(mirrorUrl));
overwriteMavenWrapperProperties(rootDirectory);
<<<<<<<
protected String getDistributionUrl(String mirrorUrl) {
if (isNullOrEmpty(distributionUrl) && !isNullOrEmpty(maven)) {
distributionUrl = String.format("%s/org/apache/maven/apache-maven/%s/apache-maven-%s-bin.zip", mirrorUrl, maven, maven);
=======
private String getDownloadBaseUrl() {
// if overridden
if (!isNullOrEmpty(downloadBaseUrl)) {
return downloadBaseUrl;
}
return DEFAULT_DOWNLOAD_BASE_URL;
}
protected String getDistributionUrl() {
// if overridden
if (!isNullOrEmpty(distributionUrl)) {
return distributionUrl;
>>>>>>>
// protected String getDistributionUrl(String mirrorUrl) {
// if (isNullOrEmpty(distributionUrl) && !isNullOrEmpty(maven)) {
// distributionUrl = String.format("%s/org/apache/maven/apache-maven/%s/apache-maven-%s-bin.zip", mirrorUrl, maven, maven);
private String getDownloadBaseUrl() {
// if overridden
if (!isNullOrEmpty(downloadBaseUrl)) {
return downloadBaseUrl;
}
return DEFAULT_DOWNLOAD_BASE_URL;
}
protected String getDistributionUrl() {
// if overridden
if (!isNullOrEmpty(distributionUrl)) {
return distributionUrl; |
<<<<<<<
=======
ser = defaultImpl;
if (ser == null) {
ser = StdKeySerializers.getStdKeySerializer(config, keyType.getRawClass(), false);
// As per [databind#47], also need to support @JsonValue
if (ser == null) {
AnnotatedMember am = beanDesc.findJsonValueAccessor();
if (am != null) {
final Class<?> rawType = am.getRawType();
JsonSerializer<?> delegate = StdKeySerializers.getStdKeySerializer(config,
rawType, true);
if (config.canOverrideAccessModifiers()) {
ClassUtil.checkAndFixAccess(am.getMember(),
config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
}
// null -> no TypeSerializer for key-serializer use case
ser = new JsonValueSerializer(am, null, delegate);
} else {
ser = StdKeySerializers.getFallbackKeySerializer(config, keyType.getRawClass());
}
}
}
}
}
// [databind#120]: Allow post-processing
if (_factoryConfig.hasSerializerModifiers()) {
for (BeanSerializerModifier mod : _factoryConfig.serializerModifiers()) {
ser = mod.modifyKeySerializer(config, keyType, beanDesc, ser);
}
}
return (JsonSerializer<Object>) ser;
}
// Old method: to be removed from 3.0 -- similar to above but can't look for "keyUsing"
@Override
@SuppressWarnings("unchecked")
@Deprecated // since 2.11
public JsonSerializer<Object> createKeySerializer(SerializationConfig config,
JavaType keyType, JsonSerializer<Object> defaultImpl)
{
BeanDescription beanDesc = config.introspect(keyType);
JsonSerializer<?> ser = null;
if (_factoryConfig.hasKeySerializers()) {
for (Serializers serializers : _factoryConfig.keySerializers()) {
ser = serializers.findSerializer(config, keyType, beanDesc);
if (ser != null) {
break;
}
}
}
if (ser == null) {
ser = defaultImpl;
if (ser == null) {
>>>>>>>
<<<<<<<
JsonSerializer<Object> ser = findSerializerFromAnnotation(ctxt, valueAccessor);
JavaType valueType = valueAccessor.getType();
// note: must get different `BeanDescription` since valueType different
TypeSerializer vts = ctxt.findTypeSerializer(valueType);
return new JsonValueSerializer(type, valueType, /* static typing */ false,
vts, ser, valueAccessor);
=======
final JavaType valueType = valueAccessor.getType();
JsonSerializer<Object> valueSerializer = findSerializerFromAnnotation(prov, valueAccessor);
if (valueSerializer == null) {
valueSerializer = valueType.getValueHandler();
}
TypeSerializer typeSerializer = valueType.getTypeHandler();
if (typeSerializer == null) {
typeSerializer = createTypeSerializer(prov.getConfig(), valueType);
}
return new JsonValueSerializer(valueAccessor, typeSerializer, valueSerializer);
>>>>>>>
JsonSerializer<Object> ser = findSerializerFromAnnotation(ctxt, valueAccessor);
JavaType valueType = valueAccessor.getType();
TypeSerializer vts = ctxt.findTypeSerializer(valueType);
return new JsonValueSerializer(type, valueType, /* static typing */ false,
vts, ser, valueAccessor); |
<<<<<<<
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), "hello".getBytes().length,
>>>>>>>
httpManager.asyncPost("http://www.baidu.com",
"hello".getBytes(), null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
<<<<<<<
httpManager.asyncPost("http://up.qiniu.com", "hello".getBytes(), null,
UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
=======
httpManager.asyncPost(null,"http://up.qiniu.com", "hello".getBytes(), null,
UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
>>>>>>>
httpManager.asyncPost("http://up.qiniu.com", "hello".getBytes(), null,
UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
<<<<<<<
httpManager.asyncPost("http://httpbin.org/status/500", "hello".getBytes(),
null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
=======
httpManager.asyncPost(null,"http://httpbin.org/status/500", "hello".getBytes(),
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
>>>>>>>
httpManager.asyncPost("http://httpbin.org/status/500", "hello".getBytes(),
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
<<<<<<<
httpManager.asyncPost("http://no-domain.qiniu.com", "hello".getBytes(),
null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
=======
httpManager.asyncPost(null,"http://no-domain.qiniu.com", "hello".getBytes(),
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
>>>>>>>
httpManager.asyncPost("http://no-domain.qiniu.com", "hello".getBytes(),
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
<<<<<<<
httpManager.asyncPost("http://124.160.115.112", "hello".getBytes(),
x, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
=======
httpManager.asyncPost(null,"http://218.98.28.29", "hello".getBytes(),
x, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
>>>>>>>
httpManager.asyncPost("http://124.160.115.112", "hello".getBytes(),
x, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
<<<<<<<
c.asyncPost("http://upproxy1.qiniu.com", "hello".getBytes(),
x, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
=======
c.asyncPost(null,"http://upproxy1.qiniu.com", "hello".getBytes(),
x, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
>>>>>>>
c.asyncPost("http://upproxy1.qiniu.com", "hello".getBytes(),
x, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length, |
<<<<<<<
private void uploadRestData(final ResumeUploadCompleteHandler completeHandler){
=======
private void uploadRestBlock(UploadBlockCompleteHandler completeHandler) {
>>>>>>>
private void uploadRestData(final ResumeUploadCompleteHandler completeHandler) {
<<<<<<<
if (uploadFileInfo == null){
if (uploadDataErrorResponseInfo == null){
uploadDataErrorResponseInfo = ResponseInfo.invalidArgument("file error");
uploadDataErrorResponse = uploadDataErrorResponseInfo.response;
}
=======
if (uploadFileInfo == null) {
setErrorResponse(ResponseInfo.invalidArgument("file error"), null);
>>>>>>>
if (uploadFileInfo == null) {
setErrorResponse(ResponseInfo.invalidArgument("file error"), null);
<<<<<<<
if (currentRegion == null){
if (uploadDataErrorResponseInfo == null){
uploadDataErrorResponseInfo = ResponseInfo.invalidArgument("server error");
uploadDataErrorResponse = uploadDataErrorResponseInfo.response;
}
=======
if (currentRegion == null) {
setErrorResponse(ResponseInfo.noUsableHostError("region server error"), null);
>>>>>>>
if (currentRegion == null) {
setErrorResponse(ResponseInfo.invalidArgument("server error"), null);
<<<<<<<
protected RequestTransaction createUploadRequestTransaction(){
=======
private void makeBlock(final UploadFileInfo.UploadBlock block,
final UploadFileInfo.UploadData chunk,
final RequestProgressHandler progressHandler,
final UploadBlockCompleteHandler completeHandler) {
chunk.data = getDataWithChunk(chunk, block);
if (chunk.data == null) {
setErrorResponse(ResponseInfo.localIOError("get chunk data error"), null);
completeHandler.complete();
return;
}
chunk.isUploading = true;
chunk.isCompleted = false;
final RequestTransaction transaction = createUploadRequestTransaction();
transaction.makeBlock(block.offset, block.size, chunk.data, true, progressHandler, new RequestTransaction.RequestCompleteHandler() {
@Override
public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics, JSONObject response) {
chunk.data = null;
addRegionRequestMetricsOfOneFlow(requestMetrics);
destroyUploadRequestTransaction(transaction);
String blockContext = null;
if (response != null) {
try {
blockContext = response.getString("ctx");
} catch (JSONException e) {
}
}
if (responseInfo.isOK() && blockContext != null) {
block.context = blockContext;
chunk.isUploading = false;
chunk.isCompleted = true;
recordUploadInfo();
uploadRestBlock(completeHandler);
} else {
chunk.isUploading = false;
chunk.isCompleted = false;
setErrorResponse(responseInfo, response);
completeHandler.complete();
}
}
});
}
private void makeFile(final UploadFileCompleteHandler completeHandler) {
UploadFileInfo uploadFileInfo = getUploadFileInfo();
final RequestTransaction transaction = createUploadRequestTransaction();
ArrayList<String> contextsList = uploadFileInfo.allBlocksContexts();
String[] contexts = contextsList.toArray(new String[contextsList.size()]);
transaction.makeFile(uploadFileInfo.size, fileName, contexts, true, new RequestTransaction.RequestCompleteHandler() {
@Override
public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics, JSONObject response) {
addRegionRequestMetricsOfOneFlow(requestMetrics);
destroyUploadRequestTransaction(transaction);
completeHandler.complete(responseInfo, response);
}
});
}
private void setErrorResponse(ResponseInfo responseInfo, JSONObject response) {
if (uploadBlockErrorResponseInfo == null || (responseInfo != null && responseInfo.statusCode != ResponseInfo.NoUsableHostError)) {
uploadBlockErrorResponseInfo = responseInfo;
if (response == null && responseInfo != null) {
uploadBlockErrorResponse = responseInfo.response;
} else {
uploadBlockErrorResponse = response;
}
}
}
private RequestTransaction createUploadRequestTransaction() {
>>>>>>>
private void setErrorResponse(ResponseInfo responseInfo, JSONObject response) {
if (uploadDataErrorResponseInfo == null || (responseInfo != null && responseInfo.statusCode != ResponseInfo.NoUsableHostError)) {
uploadDataErrorResponseInfo = responseInfo;
if (response == null && responseInfo != null) {
uploadDataErrorResponse = responseInfo.response;
} else {
uploadDataErrorResponse = response;
}
}
}
@Override
protected RequestTransaction createUploadRequestTransaction() {
<<<<<<<
private interface ResumeUploadCompleteHandler{
=======
private void destroyUploadRequestTransaction(RequestTransaction transaction) {
if (transaction != null) {
uploadTransactions.remove(transaction);
}
}
private byte[] getDataWithChunk(UploadFileInfo.UploadData chunk,
UploadFileInfo.UploadBlock block) {
RandomAccessFile randomAccessFile = getRandomAccessFile();
if (randomAccessFile == null || chunk == null || block == null) {
return null;
}
byte[] data = new byte[(int) chunk.size];
try {
randomAccessFile.seek((chunk.offset + block.offset));
randomAccessFile.read(data, 0, (int) chunk.size);
} catch (IOException e) {
data = null;
}
return data;
}
private interface UploadBlockCompleteHandler {
>>>>>>>
@Override
protected void destroyUploadRequestTransaction(RequestTransaction transaction) {
if (transaction != null) {
uploadTransactions.remove(transaction);
}
}
private interface ResumeUploadCompleteHandler {
<<<<<<<
=======
private interface UploadFileCompleteHandler {
void complete(ResponseInfo responseInfo, JSONObject response);
}
>>>>>>> |
<<<<<<<
"[μ΄λ λ€, , μκ°, μ, , νλ€, , κ², , μ λ§λ‘, , λ§, μ΄, , λλ€, γ
γ
]",
processorWithSpace.tokenizeToStrings(text).toString()
);
assertEquals(
"[μ΄λ°, μκ°, μ, νλ, κ², μ λ§λ‘, λ§, μ΄, λ, λ, γ
γ
]",
=======
"[μ΄λ°, μκ°, μ, νλ, κ², μ λ§λ‘, λ§, μ΄, λλ, γ
γ
]",
>>>>>>>
"[μ΄λ λ€, , μκ°, μ, , νλ€, , κ², , μ λ§λ‘, , λ§, μ΄, , λλ€, γ
γ
]",
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, false, true); // fetchComnposite=false, checkAccess=true
=======
return dms.instantiateAssociation(model);
>>>>>>>
return dms.instantiateAssociation(model, true); // checkAccess=true |
<<<<<<<
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
<<<<<<<
return assoc != null ? instantiateAssociation(assoc, fetchComposite, true) : null; // checkAccess=true
=======
return assoc != null ? instantiateAssociation(assoc) : null;
>>>>>>>
return assoc != null ? instantiateAssociation(assoc, true) : null; // checkAccess=true
<<<<<<<
return assoc != null ? instantiateAssociation(assoc, fetchComposite, true) : null; // checkAccess=true
=======
return assoc != null ? instantiateAssociation(assoc) : null;
>>>>>>>
return assoc != null ? instantiateAssociation(assoc, true) : null; // checkAccess=true
<<<<<<<
new SimpleValue("dm4.core.topic_type")), false, false); // fetchComposite=false, checkAccess=false
=======
new SimpleValue("dm4.core.topic_type")));
>>>>>>>
new SimpleValue("dm4.core.topic_type")), false); // checkAccess=false
<<<<<<<
new SimpleValue("dm4.core.assoc_type")), false, false); // fetchComposite=false, checkAccess=false
=======
new SimpleValue("dm4.core.assoc_type")));
>>>>>>>
new SimpleValue("dm4.core.assoc_type")), false); // checkAccess=false
<<<<<<<
Topic instantiateTopic(TopicModel model, boolean fetchComposite, boolean checkAccess) {
checkAccess(model, checkAccess);
fetchCompositeValue(model, fetchComposite);
=======
Topic instantiateTopic(TopicModel model) {
>>>>>>>
Topic instantiateTopic(TopicModel model, boolean checkAccess) {
checkAccess(model, checkAccess);
<<<<<<<
try {
topics.add(instantiateTopic(model, fetchComposite, true)); // checkAccess=true
} catch (AccessControlException e) {
// don't add topic to result and continue
}
=======
topics.add(instantiateTopic(model));
>>>>>>>
try {
topics.add(instantiateTopic(model, true)); // checkAccess=true
} catch (AccessControlException e) {
// don't add topic to result and continue
}
<<<<<<<
RelatedTopic instantiateRelatedTopic(RelatedTopicModel model, boolean fetchComposite,
boolean fetchRelatingComposite,
boolean checkAccess) {
checkAccess(model, checkAccess);
fetchCompositeValue(model, fetchComposite, fetchRelatingComposite);
=======
RelatedTopic instantiateRelatedTopic(RelatedTopicModel model) {
>>>>>>>
RelatedTopic instantiateRelatedTopic(RelatedTopicModel model, boolean checkAccess) {
checkAccess(model, checkAccess);
<<<<<<<
try {
relTopics.add(instantiateRelatedTopic(model, fetchComposite, fetchRelatingComposite, true));
// checkAccess=true
} catch (AccessControlException e) {
// don't add topic to result and continue
}
=======
relTopics.add(instantiateRelatedTopic(model));
>>>>>>>
try {
relTopics.add(instantiateRelatedTopic(model, true)); // checkAccess=true
} catch (AccessControlException e) {
// don't add topic to result and continue
}
<<<<<<<
try {
assocs.add(instantiateAssociation(model, fetchComposite, true)); // checkAccess=true
} catch (AccessControlException e) {
// don't add association to result and continue
}
=======
assocs.add(instantiateAssociation(model));
>>>>>>>
try {
assocs.add(instantiateAssociation(model, true)); // checkAccess=true
} catch (AccessControlException e) {
// don't add association to result and continue
}
<<<<<<<
RelatedAssociation instantiateRelatedAssociation(RelatedAssociationModel model, boolean fetchComposite,
boolean fetchRelatingComposite,
boolean checkAccess) {
checkAccess(model, checkAccess);
if (fetchComposite || fetchRelatingComposite) {
// ### TODO
throw new RuntimeException("not yet implemented");
}
=======
RelatedAssociation instantiateRelatedAssociation(RelatedAssociationModel model) {
>>>>>>>
RelatedAssociation instantiateRelatedAssociation(RelatedAssociationModel model, boolean checkAccess) {
checkAccess(model, checkAccess);
<<<<<<<
try {
relAssocs.add(instantiateRelatedAssociation(model, fetchComposite, fetchRelatingComposite, true));
// checkAccess=true
} catch (AccessControlException e) {
// don't add association to result and continue
}
=======
relAssocs.add(instantiateRelatedAssociation(model));
>>>>>>>
try {
relAssocs.add(instantiateRelatedAssociation(model, true)); // checkAccess=true
} catch (AccessControlException e) {
// don't add association to result and continue
}
<<<<<<<
private void checkAccess(TopicModel model, boolean checkAccess) {
if (checkAccess) {
fireEvent(CoreEvent.PRE_GET_TOPIC, model.getId()); // throws AccessControlException
}
}
private void checkAccess(AssociationModel model, boolean checkAccess) {
if (checkAccess) {
fireEvent(CoreEvent.PRE_GET_ASSOCIATION, model.getId()); // throws AccessControlException
}
}
// ---
private void fetchCompositeValue(DeepaMehtaObjectModel model, boolean fetchComposite) {
if (fetchComposite) {
valueStorage.fetchCompositeValue(model);
}
}
private void fetchCompositeValue(RelatedTopicModel model, boolean fetchComposite, boolean fetchRelatingComposite) {
fetchCompositeValue(model, fetchComposite);
if (fetchRelatingComposite) {
valueStorage.fetchCompositeValue(model.getRelatingAssociation());
}
}
// ---
=======
>>>>>>>
private void checkAccess(TopicModel model, boolean checkAccess) {
if (checkAccess) {
fireEvent(CoreEvent.PRE_GET_TOPIC, model.getId()); // throws AccessControlException
}
}
private void checkAccess(AssociationModel model, boolean checkAccess) {
if (checkAccess) {
fireEvent(CoreEvent.PRE_GET_ASSOCIATION, model.getId()); // throws AccessControlException
}
}
// --- |
<<<<<<<
} 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:");
<<<<<<<
// Note: an exception thrown from here is swallowed by the container without reporting
// and let File Install retry to start the bundle endlessly.
=======
>>>>>>>
// Note: an exception thrown from here is swallowed by the container without reporting
// and let File Install retry to start the bundle endlessly.
<<<<<<<
private void installPlugin(BundleContext context) {
DeepaMehtaTransaction tx = dms.beginTx();
=======
private void installPlugin() {
Transaction tx = dms.beginTx();
>>>>>>>
private void installPlugin() {
DeepaMehtaTransaction tx = dms.beginTx(); |
<<<<<<<
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) : null; // checkAccess=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 object, Role role, Permissions permissions) {
TopicModel aclEntry = aclEntryModel(role, permissions);
facetsService.updateFacets(object, "dm4.accesscontrol.acl_facet", asList(aclEntry), null, null);
=======
public void createACLEntry(Topic topic, Role role, Permissions permissions) {
TopicModel aclEntry = createAclEntryModel(role, permissions);
// Note: acl_facet is a multi-facet. So we must pass a (one-element) list.
facetsService.updateFacets(topic, "dm4.accesscontrol.acl_facet", asList(aclEntry), null, null);
>>>>>>>
public void createACLEntry(DeepaMehtaObject object, Role role, Permissions permissions) {
TopicModel aclEntry = createAclEntryModel(role, permissions);
// Note: acl_facet is a multi-facet. So we must pass a (one-element) list.
facetsService.updateFacets(object, "dm4.accesscontrol.acl_facet", asList(aclEntry), null, null);
<<<<<<<
/**
* Prerequisite: username is not <code>null</code>.
*/
private Topic getUserAccount(Topic username) {
Topic userAccount = username.getRelatedTopic("dm4.core.composition", "dm4.core.part", "dm4.core.whole",
"dm4.accesscontrol.user_account", true, false, null); // fetchComposite=true, fetchRelatingComposite=false
if (userAccount == null) {
throw new RuntimeException("Data inconsistency: there is no User Account topic for username \"" +
username.getSimpleValue() + "\" (username=" + username + ")");
}
return userAccount;
}
// ---
/**
* Retrieves the "Username" topic for the specified username.
*
* @return The retrieved Username (a Topic of type "Username" / <code>dm4.accesscontrol.username</code>),
* or <code>null</code> if no such Username topic exists.
*/
private Topic getUsername(String username) {
return dms.getTopic("dm4.accesscontrol.username", new SimpleValue(username), false, null);
}
private Topic getUsername(HttpSession session) {
Topic username = (Topic) session.getAttribute("username");
if (username == null) {
throw new RuntimeException("Session data inconsistency: \"username\" attribute is missing");
}
return username;
}
// ---
/**
* Retrieves the "Username" topic for the "admin" user.
* If the "admin" user doesn't exist an exception is thrown.
*
* @return The retrieved Username (a Topic of type "Username" / <code>dm4.accesscontrol.username</code>).
*/
private Topic getAdminUser() {
Topic username = getUsername(DEFAULT_USERNAME);
if (username == null) {
throw new RuntimeException("The \"" + DEFAULT_USERNAME + "\" user doesn't exist");
}
return username;
}
// ---
/**
* Assigns the logged in user as the creator of the specified object.
* If no user is logged in, the default user ("admin") is assigned.
*/
private void assignCreator(DeepaMehtaObject object) {
=======
private void setCreator(Topic topic) {
>>>>>>>
/**
* Assigns the logged in user as the creator of the specified object.
* If no user is logged in, the default user ("admin") is assigned.
*/
private void assignCreator(DeepaMehtaObject object) {
<<<<<<<
logger.fine("Assigning a creator to " + info(object) + " failed (no user is logged in). " +
"The default user (\"admin\") is assigned instead.");
username = getAdminUser();
=======
logger.fine("Assigning a creator to " + info(topic) + " failed " +
"(no user is logged in). Assigning user \"admin\" instead.");
username = fetchAdminUser();
>>>>>>>
logger.fine("Assigning a creator to " + info(object) + " failed (no user is logged in). " +
"The default user (\"admin\") is assigned instead.");
username = fetchAdminUser();
<<<<<<<
/**
* Assigns the specified user as the creator of the specified object.
*/
private void assignCreator(DeepaMehtaObject object, long usernameId) {
facetsService.updateFacet(object, "dm4.accesscontrol.creator_facet", creatorModel(usernameId), null, null);
=======
private void setCreator(Topic topic, long usernameId) {
facetsService.updateFacet(topic, "dm4.accesscontrol.creator_facet", createCreatorModel(usernameId), null, null);
>>>>>>>
/**
* Assigns the specified user as the creator of the specified object.
*/
private void assignCreator(DeepaMehtaObject object, long usernameId) {
TopicModel creatorValue = createCreatorModel(usernameId);
facetsService.updateFacet(object, "dm4.accesscontrol.creator_facet", creatorValue, null, null);
<<<<<<<
private boolean hasPermission(Topic username, Operation operation, DeepaMehtaObject object) {
logger.fine("Determining permission for " + userInfo(username) + " to " + operation + " " + info(object));
for (RelatedTopic aclEntry : getACLEntries(object)) {
=======
private boolean hasPermission(Topic username, Operation operation, Topic topic) {
logger.fine("Determining permission for " + userInfo(username) + " to " + operation + " " + info(topic));
for (RelatedTopic aclEntry : fetchACLEntries(topic)) {
>>>>>>>
private boolean hasPermission(Topic username, Operation operation, DeepaMehtaObject object) {
logger.fine("Determining permission for " + userInfo(username) + " to " + operation + " " + info(object));
for (RelatedTopic aclEntry : fetchACLEntries(object)) {
<<<<<<<
/**
* Retrieves all ACL entries of the specified object.
*/
private Set<RelatedTopic> getACLEntries(DeepaMehtaObject object) {
return facetsService.getFacets(object, "dm4.accesscontrol.acl_facet");
}
/**
* For the specified ACL entry: reads out the "allowed" value for the specified operation.
* If no "allowed" value is set for that operation <code>false</code> is returned.
*/
private boolean allowed(Topic aclEntry, Operation operation) {
for (TopicModel permission : aclEntry.getCompositeValue().getTopics("dm4.accesscontrol.permission")) {
if (permission.getCompositeValue().getTopic("dm4.accesscontrol.operation").getUri().equals(operation.uri)) {
return permission.getCompositeValue().getBoolean("dm4.accesscontrol.allowed");
}
}
return false;
}
// ---
=======
>>>>>>>
<<<<<<<
CompositeValue permissions = getPermissions(object);
=======
CompositeValue permissions = permissions(topic);
>>>>>>>
CompositeValue permissions = permissions(object);
<<<<<<<
private CompositeValue getPermissions(DeepaMehtaObject object) {
=======
private CompositeValue permissions(Topic topic) {
>>>>>>>
private CompositeValue permissions(DeepaMehtaObject object) { |
<<<<<<<
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.AccessControlException;
import de.deepamehta.core.service.accesscontrol.Operation;
<<<<<<<
object.setProperty(PROP_CREATOR, username, true); // addToIndex=true
tx.success();
=======
object.setProperty(URI_CREATOR, username, true); // addToIndex=true
>>>>>>>
object.setProperty(PROP_CREATOR, username, true); // addToIndex=true
<<<<<<<
object.setProperty(PROP_OWNER, username, true); // addToIndex=true
tx.success();
=======
object.setProperty(URI_OWNER, username, true); // addToIndex=true
>>>>>>>
object.setProperty(PROP_OWNER, username, true); // addToIndex=true
<<<<<<<
object.setProperty(PROP_ACL, acl.toJSON().toString(), false); // addToIndex=false
tx.success();
=======
object.setProperty(URI_ACL, acl.toJSON().toString(), false); // addToIndex=false
>>>>>>>
object.setProperty(PROP_ACL, acl.toJSON().toString(), false); // addToIndex=false |
<<<<<<<
// === Traversal ===
// --- Association Retrieval ---
@Override
public RelatedAssociation getRelatedAssociation(String assocTypeUri, String myRoleTypeUri,
String othersRoleTypeUri, String othersAssocTypeUri) {
RelatedAssociationModel assoc = dms.storageDecorator.fetchTopicRelatedAssociation(getId(), assocTypeUri,
myRoleTypeUri, othersRoleTypeUri, othersAssocTypeUri);
return assoc != null ? dms.instantiateRelatedAssociation(assoc, true) : null; // checkAccess=true
}
@Override
public List<RelatedAssociation> getRelatedAssociations(String assocTypeUri, String myRoleTypeUri,
String othersRoleTypeUri, String othersAssocTypeUri) {
List<RelatedAssociationModel> assocs = dms.storageDecorator.fetchTopicRelatedAssociations(getId(), assocTypeUri,
myRoleTypeUri, othersRoleTypeUri, othersAssocTypeUri);
return dms.instantiateRelatedAssociations(assocs);
}
=======
>>>>>>> |
<<<<<<<
logger.info("========== Starting DeepaMehta 3 Core ==========");
dms = new EmbeddedService(new HGStorageBridge(openDB()));
=======
=== Starting bundle \"DeepaMehta 3 Core\" ==========");
dms = new EmbeddedService(openDB());
=======
logger.info("========== Starting bundle \"DeepaMehta 3 Core\" ==========");
dms = new EmbeddedService(openDB(), context);
>>>>>>>
logger.info("========== Starting bundle \"DeepaMehta 3 Core\" ==========");
dms = new EmbeddedService(new HGStorageBridge(openDB()), context);
<<<<<<<
//
context.addFrameworkListener(this);
} catch (Exception e) {
logger.severe("Activation of DeepaMehta 3 Core failed:");
=======
} catch (RuntimeException e) {
logger.severe("DeepaMehta core service can't be activated:");
>>>>>>>
} catch (Exception e) {
logger.severe("Activation of DeepaMehta 3 Core failed:");
<<<<<<<
// Note: an exception thrown from here is swallowed by the container without reporting
// and let File Install retry to start the bundle endlessly.
=======
>>>>>>>
// Note: an exception thrown from here is swallowed by the container without reporting
// and let File Install retry to start the bundle endlessly. |
<<<<<<<
=======
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_CAPABILITY, null).getEmc();
String emcLabel = I18n.format("pe.emc.emc_tooltip_prefix");
this.fontRenderer.drawString(emcLabel, 6, this.ySize - 104, 4210752);
String emc = TransmutationEMCFormatter.EMCFormat(emcAmount);
>>>>>>>
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(IKnowledgeProvider::getEmc).orElse(0.0);
String emcLabel = I18n.format("pe.emc.emc_tooltip_prefix");
this.fontRenderer.drawString(emcLabel, 6, this.ySize - 104, 4210752);
String emc = TransmutationEMCFormatter.EMCFormat(emcAmount);
<<<<<<<
=======
@Override
protected void actionPerformed(GuiButton button)
{
String srch = this.textBoxFilter.getText().toLowerCase(Locale.ROOT);
if (button.id == 1)
{
if (inv.searchpage != 0)
{
inv.searchpage--;
}
}
else if (button.id == 2)
{
if (!(inv.knowledge.size() <= 12))
{
inv.searchpage++;
}
}
inv.filter = srch;
inv.updateClientTargets();
}
@Override
protected void renderHoveredToolTip(int mouseX, int mouseY) {
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY, null).getEmc();
if (emcAmount < 1e12) {
super.renderHoveredToolTip(mouseX, mouseY);
return;
}
int emcLeft = (this.width - this.xSize) / 2;
int emcRight = emcLeft + 82;
int emcTop = 95 + (this.height - this.ySize) / 2;
int emcBottom = emcTop + 15;
if (mouseX > emcLeft && mouseX < emcRight && mouseY > emcTop && mouseY < emcBottom) {
String emcAsString = I18n.format("pe.emc.emc_tooltip_prefix") + " " + Constants.EMC_FORMATTER.format(emcAmount);
drawHoveringText(Arrays.asList(emcAsString), mouseX, mouseY);
} else {
super.renderHoveredToolTip(mouseX, mouseY);
}
}
>>>>>>>
@Override
protected void renderHoveredToolTip(int mouseX, int mouseY) {
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(IKnowledgeProvider::getEmc).orElse(0.0);
if (emcAmount < 1e12) {
super.renderHoveredToolTip(mouseX, mouseY);
return;
}
int emcLeft = (this.width - this.xSize) / 2;
int emcRight = emcLeft + 82;
int emcTop = 95 + (this.height - this.ySize) / 2;
int emcBottom = emcTop + 15;
if (mouseX > emcLeft && mouseX < emcRight && mouseY > emcTop && mouseY < emcBottom) {
String emcAsString = I18n.format("pe.emc.emc_tooltip_prefix") + " " + Constants.EMC_FORMATTER.format(emcAmount);
drawHoveringText(Arrays.asList(emcAsString), mouseX, mouseY);
} else {
super.renderHoveredToolTip(mouseX, mouseY);
}
} |
<<<<<<<
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(hashset);
this.explosionSize = f;
net.minecraftforge.event.ForgeEventFactory.onExplosionDetonate(this.worldObj, this, Collections.<Entity>emptyList(), this.explosionSize);
>>>>>>>
this.func_180343_e().addAll(hashset);
ReflectionHelper.setExplosionSize(this, initialSize);
net.minecraftforge.event.ForgeEventFactory.onExplosionDetonate(this.worldObj, this, Collections.<Entity>emptyList(), ReflectionHelper.getExplosionSize(this)); |
<<<<<<<
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.projecte.utils.PEKeybind;
<<<<<<<
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.input.Keyboard;
=======
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; |
<<<<<<<
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, ItemStack stack, EntityPlayer player, Tag<Block> tag, long emcCost, EnumHand hand) |
<<<<<<<
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.HiddenFractionArithmetic;
<<<<<<<
List<IEMCMapper<NormalizedSimpleStack, Integer>> emcMappers = Arrays.asList(
new OreDictionaryMapper(),
new LazyMapper(),
new Chisel2Mapper(),
APICustomEMCMapper.instance,
new CustomEMCMapper(),
new CraftingMapper(),
new moze_intel.projecte.emc.mappers.FluidMapper(),
new SmeltingMapper()
);
GraphMapper<NormalizedSimpleStack, Integer> graphMapper = new SimpleGraphMapper<NormalizedSimpleStack, Integer>(new IntArithmetic());
=======
List<IEMCMapper<NormalizedSimpleStack, Integer>> emcMappers = Arrays.asList(
new OreDictionaryMapper(),
new LazyMapper(),
APICustomEMCMapper.instance,
new CustomEMCMapper(),
new CraftingMapper(),
new moze_intel.projecte.emc.mappers.FluidMapper(),
new SmeltingMapper()
);
IValueGenerator<NormalizedSimpleStack, Integer> graphMapper = new FractionToIntegerTranslator<NormalizedSimpleStack>(new SimpleGraphMapper<NormalizedSimpleStack, Fraction>(new HiddenFractionArithmetic()));
>>>>>>>
List<IEMCMapper<NormalizedSimpleStack, Integer>> emcMappers = Arrays.asList(
new OreDictionaryMapper(),
new LazyMapper(),
new Chisel2Mapper(),
APICustomEMCMapper.instance,
new CustomEMCMapper(),
new CraftingMapper(),
new moze_intel.projecte.emc.mappers.FluidMapper(),
new SmeltingMapper()
);
IValueGenerator<NormalizedSimpleStack, Integer> graphMapper = new FractionToIntegerTranslator<NormalizedSimpleStack>(new SimpleGraphMapper<NormalizedSimpleStack, Fraction>(new HiddenFractionArithmetic())); |
<<<<<<<
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, "projecte:item.peuncharge", 1.0F, 1.0F);
stack.setItemDamage(0);
=======
stack.setMetadata(0);
>>>>>>>
player.worldObj.playSoundAtEntity(player, "projecte:item.peuncharge", 1.0F, 1.0F);
stack.setMetadata(0); |
<<<<<<<
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.NEIPhiloSmeltingHandler;
import moze_intel.projecte.integration.NEI.NEIWorldTransmuteHandler;
import net.minecraftforge.fml.common.Loader;
=======
import cpw.mods.fml.common.Loader;
import moze_intel.projecte.integration.MineTweaker.TweakInit;
import moze_intel.projecte.integration.NEI.NEIInit;
>>>>>>>
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.NEIPhiloSmeltingHandler;
import moze_intel.projecte.integration.NEI.NEIWorldTransmuteHandler;
import net.minecraftforge.fml.common.Loader;
import moze_intel.projecte.integration.NEI.NEIInit; |
<<<<<<<
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 || !this.worldObj.isBlockLoaded(new BlockPos(this)))
=======
if (ticksExisted > 400 || this.isInWater() || !this.worldObj.blockExists(((int) this.posX), ((int) this.posY), ((int) this.posZ)))
>>>>>>>
if (ticksExisted > 400 || this.isInWater() || !this.worldObj.isBlockLoaded(new BlockPos(this))) |
<<<<<<<
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().stackTagCompound);
Transmutation.setEmc(player, emc);
>>>>>>>
writeToNBT(player.getHeldItem().getTagCompound());
Transmutation.setEmc(player, emc); |
<<<<<<<
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);
long emcAmount = inv.getAvailableEMC();
>>>>>>>
this.font.drawString(I18n.format("pe.transmutation.transmute"), 6, 8, 4210752);
long emcAmount = inv.getAvailableEMC();
<<<<<<<
double emcAmount = inv.player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(IKnowledgeProvider::getEmc).orElse(0.0);
=======
long emcAmount = inv.getAvailableEMC();
>>>>>>>
long emcAmount = inv.getAvailableEMC(); |
<<<<<<<
=======
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, ItemStack>) FurnaceRecipes.instance().getSmeltingList()).entrySet()))
=======
for (Entry<ItemStack, ItemStack> entry : (((HashMap<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList()).entrySet()))
>>>>>>>
for (Entry<ItemStack, ItemStack> entry : (((HashMap<ItemStack, ItemStack>) FurnaceRecipes.instance().getSmeltingList()).entrySet())) |
<<<<<<<
=======
@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) {
return (desc == null) ? PropertyMetadata.STD_REQUIRED_OR_OPTIONAL
: PropertyMetadata.STD_REQUIRED_OR_OPTIONAL.withDescription(desc);
}
return PropertyMetadata.construct(b, desc, idx, def);
}
>>>>>>> |
<<<<<<<
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 NBTTagCompound());
}
AlchChestTile tile = ((AlchChestTile) world.getTileEntity(pos));
<<<<<<<
byte coolDown = stack.getTagCompound().getByte("Cooldown");
=======
if (!stack.hasTagCompound())
{
stack.setTagCompound(new NBTTagCompound());
}
byte coolDown = stack.stackTagCompound.getByte("Cooldown");
>>>>>>>
if (!stack.hasTagCompound())
{
stack.setTagCompound(new NBTTagCompound());
}
byte coolDown = stack.getTagCompound().getByte("Cooldown"); |
<<<<<<<
=======
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.IChatComponent;
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import java.util.Arrays;
=======
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import java.util.Arrays;
<<<<<<<
public void sendUpdate()
{
worldObj.markBlockForUpdate(pos);
}
=======
>>>>>>> |
<<<<<<<
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;
>>>>>>>
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 item
long toSend = this.getStoredEmc() < emcGen ? this.getStoredEmc() : emcGen; |
<<<<<<<
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.getCommandSenderName(), this.getStoredEmc());
PacketHandler.sendTo(new SyncTableEMCPKT(this.getStoredEmc()), (EntityPlayerMP) this.player);
=======
Transmutation.setEmc(player, this.getStoredEmc());
Transmutation.sync(player);
>>>>>>>
Transmutation.setEmc(player, this.getStoredEmc());
Transmutation.sync(player); |
<<<<<<<
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), this.getPosition().add(3, 3, 3)))
{
Block block = this.worldObj.getBlockState(pos).getBlock();
boolean flag = false;
if (block == Blocks.lava)
{
this.worldObj.setBlockState(pos, Blocks.obsidian.getDefaultState());
}
else if (block == Blocks.flowing_lava)
{
this.worldObj.setBlockState(pos, Blocks.cobblestone.getDefaultState());
}
else
{
continue;
}
this.worldObj.playSoundAtEntity(this, "random.fizz", 0.5F, 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.8F);
}
=======
if (getThrower() instanceof EntityPlayerMP)
{
EntityPlayerMP player = ((EntityPlayerMP) getThrower());
for (int x = (int) (this.posX - 3); x <= this.posX + 3; x++)
for (int y = (int) (this.posY - 3); y <= this.posY + 3; y++)
for (int z = (int) (this.posZ - 3); z <= this.posZ + 3; z++)
{
Block block = this.worldObj.getBlock(x, y, z);
if (block == Blocks.lava)
{
PlayerHelper.checkedReplaceBlock(player, x, y, z, Blocks.obsidian, 0);
this.worldObj.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.fizz", 0.5F, 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.8F);
}
else if (block == Blocks.flowing_lava)
{
PlayerHelper.checkedReplaceBlock(player, x, y, z, Blocks.cobblestone, 0);
this.worldObj.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.fizz", 0.5F, 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.8F);
}
}
}
>>>>>>>
if (getThrower() instanceof EntityPlayerMP) {
EntityPlayerMP player = ((EntityPlayerMP) getThrower());
for (BlockPos pos : WorldHelper.getPositionsFromCorners(this.getPosition().add(-3, -3, -3), this.getPosition().add(3, 3, 3)))
{
Block block = this.worldObj.getBlockState(pos).getBlock();
if (block == Blocks.lava)
{
PlayerHelper.checkedReplaceBlock(player, pos, Blocks.obsidian.getDefaultState());
}
else if (block == Blocks.flowing_lava)
{
PlayerHelper.checkedReplaceBlock(player, pos, Blocks.cobblestone.getDefaultState());
}
else
{
continue;
}
this.worldObj.playSoundAtEntity(this, "random.fizz", 0.5F, 2.6F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.8F);
}
}
<<<<<<<
this.worldObj.setBlockState(pos, Blocks.flowing_water.getDefaultState());
=======
PlayerHelper.checkedPlaceBlock(((EntityPlayerMP) getThrower()), mop.blockX + dir.offsetX, mop.blockY + dir.offsetY, mop.blockZ + dir.offsetZ, Blocks.flowing_water, 0);
>>>>>>>
PlayerHelper.checkedPlaceBlock(((EntityPlayerMP) getThrower()), pos, Blocks.flowing_water.getDefaultState()); |
<<<<<<<
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.projecte.gameObjs.items.ItemPE;
import moze_intel.projecte.handlers.PlayerChecks;
import moze_intel.projecte.utils.IFireProtectionItem;
import moze_intel.projecte.utils.IFlightItem;
import moze_intel.projecte.utils.PlayerHelper;
import moze_intel.projecte.utils.WorldHelper;
=======
import moze_intel.projecte.api.IExtraFunction;
import moze_intel.projecte.api.IFireProtectionItem;
import moze_intel.projecte.api.IFlightItem;
import moze_intel.projecte.api.IModeChanger;
import moze_intel.projecte.api.IProjectileShooter;
import moze_intel.projecte.gameObjs.entity.EntityFireProjectile;
import moze_intel.projecte.gameObjs.entity.EntitySWRGProjectile;
import moze_intel.projecte.gameObjs.items.ItemPE;
import moze_intel.projecte.handlers.PlayerChecks;
import moze_intel.projecte.utils.PlayerHelper;
import moze_intel.projecte.utils.WorldHelper;
>>>>>>>
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.EntitySWRGProjectile;
import moze_intel.projecte.gameObjs.items.ItemPE;
import moze_intel.projecte.handlers.PlayerChecks;
import moze_intel.projecte.utils.IFireProtectionItem;
import moze_intel.projecte.utils.IFlightItem;
import moze_intel.projecte.utils.PlayerHelper;
import moze_intel.projecte.utils.WorldHelper; |
<<<<<<<
=======
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.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
>>>>>>>
import net.minecraft.entity.Entity;
<<<<<<<
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
=======
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
>>>>>>>
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n; |
<<<<<<<
=======
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.common.collect.Lists;
<<<<<<<
public void fromBytes(ByteBuf buf)
=======
public void fromBytes(ByteBuf buf)
{
applyImmediately = buf.readBoolean();
List<ItemStack> l = Lists.newArrayList();
for (int i = 0; i < 16; i++) {
l.add(ByteBufUtils.readItemStack(buf));
}
this.outslots = l;
}
@Override
public void toBytes(ByteBuf buf)
>>>>>>>
public void fromBytes(ByteBuf buf)
{
applyImmediately = buf.readBoolean();
List<ItemStack> l = Lists.newArrayList();
for (int i = 0; i < 16; i++) {
l.add(ByteBufUtils.readItemStack(buf));
}
this.outslots = l;
}
@Override
public void toBytes(ByteBuf buf) |
<<<<<<<
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.CustomEMCParser;
import moze_intel.projecte.emc.EMCMapper;
import moze_intel.projecte.emc.ThreadReloadEMCMap;
import moze_intel.projecte.handlers.TileEntityHandler;
import moze_intel.projecte.network.PacketHandler;
<<<<<<<
sender.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("pe.command.reload.started")));
EMCMapper.clearMaps();
CustomEMCParser.readUserData();
EMCMapper.map();
TileEntityHandler.checkAllCondensers(sender.getEntityWorld());
sender.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("pe.command.reload.success")));
PacketHandler.sendFragmentedEmcPacketToAll();
=======
sender.addChatMessage(new ChatComponentText("[ProjectE] Reloading EMC registrations..."));
ThreadReloadEMCMap.runEMCRemap(false, sender.getEntityWorld());
>>>>>>>
sender.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("pe.command.reload.started")));
ThreadReloadEMCMap.runEMCRemap(false, sender.getEntityWorld()); |
<<<<<<<
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.deserializeNBT(nbt.getCompoundTag("AuxSlots"));
unprocessedEMC = nbt.getDouble("UnprocessedEMC");
>>>>>>>
super.read(nbt);
storedFuelEmc = nbt.getLong("FuelEMC");
input.deserializeNBT(nbt.getCompound("Input"));
auxSlots.deserializeNBT(nbt.getCompound("AuxSlots"));
unprocessedEMC = nbt.getDouble("UnprocessedEMC");
<<<<<<<
nbt = super.write(nbt);
nbt.putDouble("FuelEMC", storedFuelEmc);
nbt.put("Input", input.serializeNBT());
nbt.put("AuxSlots", auxSlots.serializeNBT());
=======
nbt = super.writeToNBT(nbt);
nbt.setLong("FuelEMC", storedFuelEmc);
nbt.setTag("Input", input.serializeNBT());
nbt.setTag("AuxSlots", auxSlots.serializeNBT());
nbt.setDouble("UnprocessedEMC", unprocessedEMC);
>>>>>>>
nbt = super.write(nbt);
nbt.putLong("FuelEMC", storedFuelEmc);
nbt.put("Input", input.serializeNBT());
nbt.put("AuxSlots", auxSlots.serializeNBT());
nbt.putDouble("UnprocessedEMC", unprocessedEMC);
<<<<<<<
public double provideEMC(@Nonnull Direction side, double toExtract)
=======
public long provideEMC(@Nonnull EnumFacing side, long toExtract)
>>>>>>>
public long provideEMC(@Nonnull Direction side, long toExtract)
<<<<<<<
public double acceptEMC(@Nonnull Direction side, double toAccept)
=======
public long acceptEMC(@Nonnull EnumFacing side, long toAccept)
>>>>>>>
public long acceptEMC(@Nonnull Direction side, long toAccept) |
<<<<<<<
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.IEmcProvider;
>>>>>>>
import moze_intel.projecte.gameObjs.ObjHandler;
import moze_intel.projecte.gameObjs.items.ItemPE;
import moze_intel.projecte.api.item.IItemEmc;
import moze_intel.projecte.api.tile.IEmcAcceptor;
import moze_intel.projecte.api.tile.IEmcProvider;
<<<<<<<
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import java.util.Arrays;
=======
import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import java.util.Arrays;
import net.minecraft.util.MathHelper;
<<<<<<<
PacketHandler.sendToAllAround(new RelaySyncPKT(displayEmc, displayKleinEmc, displayRawEmc, this),
new TargetPoint(this.worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 6));
=======
PacketHandler.sendToAllAround(new RelaySyncPKT(displayEmc, displayChargingEmc, displayRawEmc, this.xCoord, this.yCoord, this.zCoord),
new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 6));
>>>>>>>
PacketHandler.sendToAllAround(new RelaySyncPKT(displayEmc, displayChargingEmc, displayRawEmc, this),
new TargetPoint(this.worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 6));
<<<<<<<
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value) {}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
Arrays.fill(inventory, null);
}
@Override
public boolean isRequestingEmc()
{
return true;
}
@Override
public int[] getSlotsForFace(EnumFacing side)
=======
public int[] getAccessibleSlotsFromSide(int side)
>>>>>>>
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value) {}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
Arrays.fill(inventory, null);
}
@Override
public int[] getSlotsForFace(EnumFacing side) |
<<<<<<<
});
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(TileEntityType<?> type, int sizeInv, long maxEmc, long chargeRate) |
<<<<<<<
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
<<<<<<<
public CollectorMK1Tile(TileEntityType<?> type, int maxEmc, int emcGen)
=======
public CollectorMK1Tile(long maxEmc, long emcGen)
>>>>>>>
public CollectorMK1Tile(TileEntityType<?> type, long maxEmc, long emcGen)
<<<<<<<
@Nonnull
@Override
public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
{
return new CollectorMK1Container(playerInventory, this);
}
@Nonnull
@Override
public String getGuiID()
{
return getType().getRegistryName().toString();
}
@Nonnull
@Override
public ITextComponent getName()
{
return new TextComponentString(getGuiID());
}
@Override
public boolean hasCustomName()
{
return false;
}
@Nullable
@Override
public ITextComponent getCustomName()
{
return null;
}
=======
@Override
public double acceptEMC(@Nonnull EnumFacing side, double toAccept)
{
if (hasFuel || hasChargeableItem)
{
//Collector accepts EMC from providers if it has fuel/chargeable. Otherwise it sends it to providers
double toAdd = Math.min(maximumEMC - currentEMC, toAccept);
currentEMC += toAdd;
return toAdd;
}
return 0;
}
>>>>>>>
@Nonnull
@Override
public Container createContainer(InventoryPlayer playerInventory, EntityPlayer playerIn)
{
return new CollectorMK1Container(playerInventory, this);
}
@Nonnull
@Override
public String getGuiID()
{
return getType().getRegistryName().toString();
}
@Nonnull
@Override
public ITextComponent getName()
{
return new TextComponentString(getGuiID());
}
@Override
public boolean hasCustomName()
{
return false;
}
@Nullable
@Override
public ITextComponent getCustomName()
{
return null;
}
@Override
public double acceptEMC(@Nonnull EnumFacing side, double toAccept)
{
if (hasFuel || hasChargeableItem)
{
//Collector accepts EMC from providers if it has fuel/chargeable. Otherwise it sends it to providers
double toAdd = Math.min(maximumEMC - currentEMC, toAccept);
currentEMC += toAdd;
return toAdd;
}
return 0;
} |
<<<<<<<
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.player.EntityPlayer; |
<<<<<<<
=======
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_intel.projecte.api.tile.IEmcProvider;
import moze_intel.projecte.api.tile.TileEmcBase;
>>>>>>>
import com.google.common.base.Predicates;
import com.google.common.collect.Maps;
import moze_intel.projecte.api.tile.IEmcAcceptor;
import moze_intel.projecte.api.tile.IEmcProvider;
import moze_intel.projecte.api.tile.TileEmcBase;
<<<<<<<
import moze_intel.projecte.utils.EMCHelper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.server.gui.IUpdatePlayerListBox;
=======
import moze_intel.projecte.utils.WorldHelper;
>>>>>>>
import moze_intel.projecte.utils.WorldHelper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.server.gui.IUpdatePlayerListBox;
<<<<<<<
@Override
public boolean shouldRefresh(World world, BlockPos pos, IBlockState state, IBlockState newState)
{
return state.getBlock() != newState.getBlock();
}
@Override
public void setEmc(double value)
{
this.emc = value <= maxAmount ? value : maxAmount;
}
@Override
public void addEmc(double amount)
{
emc += amount;
if (emc > maxAmount)
{
emc = maxAmount;
}
else if (emc < 0)
{
emc = 0;
}
this.markDirty();
}
public void addEmcWithPKT(double amount)
{
addEmc(amount);
sendUpdatePKT();
}
public void addEmc(ItemStack stack)
=======
public boolean hasMaxedEmc()
>>>>>>>
@Override
public boolean shouldRefresh(World world, BlockPos pos, IBlockState state, IBlockState newState)
{
return state.getBlock() != newState.getBlock();
}
public boolean hasMaxedEmc()
<<<<<<<
PacketHandler.sendToAllAround(new TileEmcSyncPKT(emc, this),
new NetworkRegistry.TargetPoint(worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 64));
=======
if (this instanceof RelayMK1Tile && entry.getValue() instanceof RelayMK1Tile)
{
continue;
}
double provide = ((IEmcProvider) this).provideEMC(entry.getKey().getOpposite(), emcPer);
double remain = provide - ((IEmcAcceptor) entry.getValue()).acceptEMC(entry.getKey(), provide);
this.addEMC(remain);
>>>>>>>
if (this instanceof RelayMK1Tile && entry.getValue() instanceof RelayMK1Tile)
{
continue;
}
double provide = ((IEmcProvider) this).provideEMC(entry.getKey().getOpposite(), emcPer);
double remain = provide - ((IEmcAcceptor) entry.getValue()).acceptEMC(entry.getKey(), provide);
this.addEMC(remain); |
<<<<<<<
writeToNBT(player.getHeldItem().getTagCompound());
Transmutation.setStoredEmc(this.player.getCommandSenderName(), emc);
=======
if (!player.worldObj.isRemote)
{
writeToNBT(player.getHeldItem().stackTagCompound);
Transmutation.setStoredEmc(player.getCommandSenderName(), emc);
}
>>>>>>>
if (!player.worldObj.isRemote)
{
writeToNBT(player.getHeldItem().getTagCompound());
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.registerIcon(this.getTexture("fuels", names[i]));
}
>>>>>>> |
<<<<<<<
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.minecraft.block.IGrowable;
import net.minecraft.block.state.IBlockState;
<<<<<<<
import net.minecraftforge.fml.common.registry.VillagerRegistry;
=======
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.common.util.ForgeDirection;
>>>>>>>
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.fml.common.registry.VillagerRegistry; |
<<<<<<<
=======
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.FMLInterModComms;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
>>>>>>>
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.FMLInterModComms;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
<<<<<<<
import moze_intel.projecte.manual.ManualPageHandler;
=======
import moze_intel.projecte.impl.IMCHandler;
>>>>>>>
import moze_intel.projecte.manual.ManualPageHandler;
import moze_intel.projecte.impl.IMCHandler; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
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();
<<<<<<<
=======
GameRegistry.registerItem(manual, manual.getUnlocalizedName());
>>>>>>>
GameRegistry.registerItem(manual, manual.getUnlocalizedName());
<<<<<<<
=======
//Manual
GameRegistry.addShapelessRecipe(new ItemStack(manual, 1, 0), Items.book, matter);
>>>>>>>
//Manual
GameRegistry.addShapelessRecipe(new ItemStack(manual, 1, 0), Items.book, matter);
<<<<<<<
=======
>>>>>>>
<<<<<<<
MAP.put(input, output);
GameRegistry.addRecipe(new RecipesShapelessHidden(output, philosStone, input, input, input, input, input, input, input, new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE)));
=======
GameRegistry.addShapelessRecipe(output, philosStone, input, input, input, input, input, input, input, new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE));
>>>>>>>
MAP.put(input, output);
GameRegistry.addRecipe(new RecipesShapelessHidden(output, philosStone, input, input, input, input, input, input, input, new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE))); |
<<<<<<<
=======
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.projecte.playerData.AlchBagProps;
import moze_intel.projecte.playerData.Transmutation;
import moze_intel.projecte.playerData.TransmutationProps;
import moze_intel.projecte.rendering.ChestItemRenderer;
>>>>>>>
import moze_intel.projecte.playerData.AlchBagProps;
import moze_intel.projecte.playerData.Transmutation;
import moze_intel.projecte.playerData.TransmutationProps;
<<<<<<<
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.EnumDyeColor;
=======
>>>>>>>
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.EnumDyeColor;
<<<<<<<
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.registry.GameRegistry;
=======
>>>>>>>
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.registry.GameRegistry; |
<<<<<<<
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.invContainsItem(inv, new ItemStack(ObjHandler.voidRing, 1, 1)))
{
AxisAlignedBB bBox = player.boundingBox.expand(7, 7, 7);
List<EntityItem> itemList = world.getEntitiesWithinAABB(EntityItem.class, bBox);
for (EntityItem item : itemList)
{
item.delayBeforeCanPickup = 0;
WorldHelper.gravitateEntityTowards(item, player.posX, player.posY, player.posZ);
}
List<EntityLootBall> lootBallList = world.getEntitiesWithinAABB(EntityLootBall.class, bBox);
for (EntityLootBall ball : lootBallList)
{
WorldHelper.gravitateEntityTowards(ball, player.posX, player.posY, player.posZ);
}
}
=======
>>>>>>>
<<<<<<<
ItemStack gemDensity = ItemHelper.getStackFromInv(((AlchBagContainer) player.openContainer).inventory, new ItemStack(ObjHandler.eternalDensity, 1, 1));
ItemStack voidRing = ItemHelper.getStackFromInv(((AlchBagContainer) player.openContainer).inventory, new ItemStack(ObjHandler.voidRing, 1, 1));
if (gemDensity != null)
=======
for (int i = 0; i < inv.length; i++) // Do not use foreach - to avoid desync
>>>>>>>
for (int i = 0; i < inv.length; i++) // Do not use foreach - to avoid desync
<<<<<<<
else if (voidRing != null)
{
VoidRing.condense(voidRing, ((AlchBagContainer) player.openContainer).inventory.getInventory());
}
}
else
{
ItemStack gemDensity = ItemHelper.getStackFromInv(inv, new ItemStack(ObjHandler.eternalDensity, 1, 1));
ItemStack voidRing = ItemHelper.getStackFromInv(inv, new ItemStack(ObjHandler.voidRing, 1, 1));
if (gemDensity != null)
=======
if (!player.worldObj.isRemote)
>>>>>>>
if (!player.worldObj.isRemote) |
<<<<<<<
=======
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.common.collect.Lists;
<<<<<<<
ctx.getServerHandler().playerEntity.mcServer.addScheduledTask(new Runnable() {
@Override
public void run() {
if (ctx.getServerHandler().playerEntity.openContainer instanceof TransmutationContainer)
{
TransmutationContainer container = ((TransmutationContainer) ctx.getServerHandler().playerEntity.openContainer);
if (pkt.applyImmediately)
{
container.transmutationInventory.writeIntoOutputSlots(pkt.outslots);
PELogger.logFatal("Wrote Output Slots from UpdatePacket immediately");
}
else
{
try
{
container.transmutationInventory.serverOutputSlotUpdates.put(pkt.outslots);
} catch (InterruptedException e)
{
e.printStackTrace();
}
PELogger.logFatal("Got Output Slots from UpdatePacket... Size: " + container.transmutationInventory.serverOutputSlotUpdates.size());
}
}
}
});
=======
if (ctx.getServerHandler().playerEntity.openContainer instanceof TransmutationContainer)
{
TransmutationContainer container = ((TransmutationContainer) ctx.getServerHandler().playerEntity.openContainer);
container.transmutationInventory.writeIntoOutputSlot(pkt.slot, pkt.itemStack);
}
>>>>>>>
ctx.getServerHandler().playerEntity.mcServer.addScheduledTask(new Runnable() {
@Override
public void run() {
if (ctx.getServerHandler().playerEntity.openContainer instanceof TransmutationContainer)
{
TransmutationContainer container = ((TransmutationContainer) ctx.getServerHandler().playerEntity.openContainer);
container.transmutationInventory.writeIntoOutputSlot(pkt.slot, pkt.itemStack);
}
}
}); |
<<<<<<<
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);
double set = tag.getDouble("EMC");
=======
super.readFromNBT(tag);
long set = tag.getLong("EMC");
>>>>>>>
super.read(tag);
long set = tag.getLong("EMC"); |
<<<<<<<
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(transmutationInventory, 4, 70, 50));
this.addSlot(new SlotInput(transmutationInventory, 5, 34, 59));
this.addSlot(new SlotInput(transmutationInventory, 6, 52, 59));
this.addSlot(new SlotInput(transmutationInventory, 7, 43, 77));
this.addSlot(new SlotLock(transmutationInventory, 8, 158, 50));
this.addSlot(new SlotConsume(transmutationInventory, 9, 107, 97));
this.addSlot(new SlotUnlearn(transmutationInventory, 10, 89, 97));
this.addSlot(new SlotOutput(transmutationInventory, 11, 123, 30));
this.addSlot(new SlotOutput(transmutationInventory, 12, 140, 13));
this.addSlot(new SlotOutput(transmutationInventory, 13, 158, 9));
this.addSlot(new SlotOutput(transmutationInventory, 14, 176, 13));
this.addSlot(new SlotOutput(transmutationInventory, 15, 193, 30));
this.addSlot(new SlotOutput(transmutationInventory, 16, 199, 50));
this.addSlot(new SlotOutput(transmutationInventory, 17, 193, 70));
this.addSlot(new SlotOutput(transmutationInventory, 18, 176, 87));
this.addSlot(new SlotOutput(transmutationInventory, 19, 158, 91));
this.addSlot(new SlotOutput(transmutationInventory, 20, 140, 87));
this.addSlot(new SlotOutput(transmutationInventory, 21, 123, 70));
this.addSlot(new SlotOutput(transmutationInventory, 22, 116, 50));
this.addSlot(new SlotOutput(transmutationInventory, 23, 158, 31));
this.addSlot(new SlotOutput(transmutationInventory, 24, 139, 50));
this.addSlot(new SlotOutput(transmutationInventory, 25, 177, 50));
this.addSlot(new SlotOutput(transmutationInventory, 26, 158, 69));
=======
this.addSlotToContainer(new SlotInput(transmutationInventory, 0, 43, 23));
this.addSlotToContainer(new SlotInput(transmutationInventory, 1, 34, 41));
this.addSlotToContainer(new SlotInput(transmutationInventory, 2, 52, 41));
this.addSlotToContainer(new SlotInput(transmutationInventory, 3, 16, 50));
this.addSlotToContainer(new SlotInput(transmutationInventory, 4, 70, 50));
this.addSlotToContainer(new SlotInput(transmutationInventory, 5, 34, 59));
this.addSlotToContainer(new SlotInput(transmutationInventory, 6, 52, 59));
this.addSlotToContainer(new SlotInput(transmutationInventory, 7, 43, 77));
this.addSlotToContainer(new SlotLock(transmutationInventory, 8, 158, 50));
this.addSlotToContainer(new SlotConsume(transmutationInventory, 9, 107, 97));
this.addSlotToContainer(new SlotUnlearn(transmutationInventory, 10, 89, 97));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 11, 158, 9));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 12, 176, 13));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 13, 193, 30));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 14, 199, 50));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 15, 193, 70));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 16, 176, 87));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 17, 158, 91));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 18, 140, 87));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 19, 123, 70));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 20, 116, 50));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 21, 123, 30));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 22, 140, 13));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 23, 158, 31));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 24, 177, 50));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 25, 158, 69));
this.addSlotToContainer(new SlotOutput(transmutationInventory, 26, 139, 50));
>>>>>>>
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(transmutationInventory, 4, 70, 50));
this.addSlot(new SlotInput(transmutationInventory, 5, 34, 59));
this.addSlot(new SlotInput(transmutationInventory, 6, 52, 59));
this.addSlot(new SlotInput(transmutationInventory, 7, 43, 77));
this.addSlot(new SlotLock(transmutationInventory, 8, 158, 50));
this.addSlot(new SlotConsume(transmutationInventory, 9, 107, 97));
this.addSlot(new SlotUnlearn(transmutationInventory, 10, 89, 97));
this.addSlot(new SlotOutput(transmutationInventory, 11, 158, 9));
this.addSlot(new SlotOutput(transmutationInventory, 12, 176, 13));
this.addSlot(new SlotOutput(transmutationInventory, 13, 193, 30));
this.addSlot(new SlotOutput(transmutationInventory, 14, 199, 50));
this.addSlot(new SlotOutput(transmutationInventory, 15, 193, 70));
this.addSlot(new SlotOutput(transmutationInventory, 16, 176, 87));
this.addSlot(new SlotOutput(transmutationInventory, 17, 158, 91));
this.addSlot(new SlotOutput(transmutationInventory, 18, 140, 87));
this.addSlot(new SlotOutput(transmutationInventory, 19, 123, 70));
this.addSlot(new SlotOutput(transmutationInventory, 20, 116, 50));
this.addSlot(new SlotOutput(transmutationInventory, 21, 123, 30));
this.addSlot(new SlotOutput(transmutationInventory, 22, 140, 13));
this.addSlot(new SlotOutput(transmutationInventory, 23, 158, 31));
this.addSlot(new SlotOutput(transmutationInventory, 24, 177, 50));
this.addSlot(new SlotOutput(transmutationInventory, 25, 158, 69));
this.addSlot(new SlotOutput(transmutationInventory, 26, 139, 50)); |
<<<<<<<
=======
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 RenderSnowball(mc.getRenderManager(), ObjHandler.lavaOrb, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityMobRandomizer.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.mobRandomizer, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLensProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.lensExplosive, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLootBall.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.lootBall, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityNovaCatalystPrimed.class, new NovaCatalystRenderer(mc.getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(EntityNovaCataclysmPrimed.class, new NovaCataclysmRenderer(mc.getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(EntityFireProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.fireProjectile, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLightningProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.windProjectile, mc.getRenderItem()));
}
=======
RenderingRegistry.registerEntityRenderingHandler(EntityWaterProjectile.class, new RenderSnowball(ObjHandler.waterOrb));
RenderingRegistry.registerEntityRenderingHandler(EntityLavaProjectile.class, new RenderSnowball(ObjHandler.lavaOrb));
RenderingRegistry.registerEntityRenderingHandler(EntityLootBall.class, new RenderSnowball(ObjHandler.lootBall));
RenderingRegistry.registerEntityRenderingHandler(EntityMobRandomizer.class, new RenderSnowball(ObjHandler.mobRandomizer));
RenderingRegistry.registerEntityRenderingHandler(EntityLensProjectile.class, new RenderSnowball(ObjHandler.lensExplosive));
RenderingRegistry.registerEntityRenderingHandler(EntityNovaCatalystPrimed.class, new NovaCatalystRenderer());
RenderingRegistry.registerEntityRenderingHandler(EntityNovaCataclysmPrimed.class, new NovaCataclysmRenderer());
RenderingRegistry.registerEntityRenderingHandler(EntityFireProjectile.class, new RenderSnowball(ObjHandler.fireProjectile));
RenderingRegistry.registerEntityRenderingHandler(EntitySWRGProjectile.class, new RenderSnowball(ObjHandler.windProjectile));
}
>>>>>>>
Minecraft mc = FMLClientHandler.instance().getClient();
RenderingRegistry.registerEntityRenderingHandler(EntityWaterProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.waterOrb, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLavaProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.lavaOrb, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityMobRandomizer.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.mobRandomizer, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLensProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.lensExplosive, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityLootBall.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.lootBall, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityNovaCatalystPrimed.class, new NovaCatalystRenderer(mc.getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(EntityNovaCataclysmPrimed.class, new NovaCataclysmRenderer(mc.getRenderManager()));
RenderingRegistry.registerEntityRenderingHandler(EntityFireProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.fireProjectile, mc.getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntitySWRGProjectile.class, new RenderSnowball(mc.getRenderManager(), ObjHandler.windProjectile, mc.getRenderItem()));
} |
<<<<<<<
=======
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.getBlockHardness(world, pos);
if (block.isAir(world, pos) || hardness >= 50.0F || hardness == -1.0F)
{
continue;
}
if (!consumeFuel(player, stack, 8, true))
{
break;
}
if (!hasAction)
{
hasAction = true;
}
List<ItemStack> list = WorldHelper.getBlockDrops(world, player, world.getBlockState(pos), stack, pos);
if (list != null && list.size() > 0)
{
drops.addAll(list);
}
world.setBlockToAir(pos);
if (world.rand.nextInt(8) == 0)
{
PacketHandler.sendToAllAround(new ParticlePKT(EnumParticleTypes.SMOKE_LARGE, pos.getX(), pos.getY(), pos.getZ()), new NetworkRegistry.TargetPoint(world.provider.getDimensionId(), pos.getX(), pos.getY() + 1, pos.getZ(), 32));
}
}
=======
for (int x = (int) box.minX; x <= box.maxX; x++)
for (int y = (int) box.minY; y <= box.maxY; y++)
for (int z = (int) box.minZ; z <= box.maxZ; z++)
{
Block block = world.getBlock(x, y, z);
float hardness = block.getBlockHardness(world, x, y, z);
if (block == Blocks.air || hardness >= 50.0F || hardness == -1.0F)
{
continue;
}
if (!consumeFuel(player, stack, 8, true))
{
break;
}
if (!hasAction)
{
hasAction = true;
}
if (PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), x, y, z))
{
List<ItemStack> list = WorldHelper.getBlockDrops(world, player, block, stack, x, y, z);
if (list != null && list.size() > 0)
{
drops.addAll(list);
}
world.setBlockToAir(x, y, z);
if (world.rand.nextInt(8) == 0)
{
PacketHandler.sendToAllAround(new ParticlePKT("largesmoke", x, y, z), new TargetPoint(world.provider.dimensionId, x, y + 1, z, 32));
}
}
}
>>>>>>>
for (BlockPos pos : WorldHelper.getPositionsFromBox(box))
{
Block block = world.getBlockState(pos).getBlock();
float hardness = block.getBlockHardness(world, pos);
if (block.isAir(world, pos) || hardness >= 50.0F || hardness == -1.0F)
{
continue;
}
if (!consumeFuel(player, stack, 8, true))
{
break;
}
if (!hasAction)
{
hasAction = true;
}
if (PlayerHelper.hasBreakPermission(((EntityPlayerMP) player), pos))
{
List<ItemStack> list = WorldHelper.getBlockDrops(world, player, world.getBlockState(pos), stack, pos);
if (list != null && list.size() > 0)
{
drops.addAll(list);
}
world.setBlockToAir(pos);
if (world.rand.nextInt(8) == 0)
{
PacketHandler.sendToAllAround(new ParticlePKT(EnumParticleTypes.SMOKE_LARGE, pos.getX(), pos.getY(), pos.getZ()), new NetworkRegistry.TargetPoint(world.provider.getDimensionId(), pos.getX(), pos.getY() + 1, pos.getZ(), 32));
}
}
List<ItemStack> list = WorldHelper.getBlockDrops(world, player, world.getBlockState(pos), stack, pos);
if (list != null && list.size() > 0)
{
drops.addAll(list);
}
world.setBlockToAir(pos);
if (world.rand.nextInt(8) == 0)
{
PacketHandler.sendToAllAround(new ParticlePKT(EnumParticleTypes.SMOKE_LARGE, pos.getX(), pos.getY(), pos.getZ()), new NetworkRegistry.TargetPoint(world.provider.getDimensionId(), pos.getX(), pos.getY() + 1, pos.getZ(), 32));
}
} |
<<<<<<<
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.offset(mop.sideHit));
=======
placeWater(world, player, i, j, k);
>>>>>>>
placeWater(world, player, blockPosHit.offset(mop.sideHit));
<<<<<<<
if (!world.isRemote && !material.isSolid() && !material.isLiquid())
{
world.destroyBlock(pos, true);
}
world.setBlockState(pos, Blocks.flowing_water.getDefaultState());
=======
PlayerHelper.checkedPlaceBlock(((EntityPlayerMP) player), i, j, k, Blocks.flowing_water, 0);
>>>>>>>
if (!world.isRemote && !material.isSolid() && !material.isLiquid())
{
world.destroyBlock(pos, true);
}
world.setBlockState(pos, Blocks.flowing_water.getDefaultState());
PlayerHelper.checkedPlaceBlock(((EntityPlayerMP) player), pos, Blocks.flowing_water.getDefaultState()); |
<<<<<<<
=======
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.minecraftforge.fml.common.Optional;
<<<<<<<
if (coolCooldown == 0) {
TileEntity tile = world.getTileEntity(pos);
AxisAlignedBB aabb = ((DMPedestalTile) tile).getEffectBounds();
=======
DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(x, y, z));
if (tile.getActivityCooldown() == 0) {
AxisAlignedBB aabb = tile.getEffectBounds();
>>>>>>>
DMPedestalTile tile = ((DMPedestalTile) world.getTileEntity(pos));
if (tile.getActivityCooldown() == 0) {
AxisAlignedBB aabb = tile.getEffectBounds(); |
<<<<<<<
=======
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)
{
}
=======
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons (IIconRegister par1IconRegister)
{
String type = this.armorPiece.name.toLowerCase();
this.itemIcon = par1IconRegister.registerIcon("projecte:dm_armor/"+type);
}
>>>>>>>
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.logDebug("** SENT FULL BAG DATA **");
>>>>>>>
PacketHandler.sendTo(new SyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPacket()), (EntityPlayerMP) player);
PELogger.logDebug("** SENT FULL BAG DATA **");
<<<<<<<
PacketHandler.sendTo(new SyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPartialPacket(color)), (EntityPlayerMP) player);
PELogger.logInfo("** SENT PARTIAL BAG DATA **");
=======
PacketHandler.sendTo(new ClientSyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPartialPacket(color)), (EntityPlayerMP) player);
PELogger.logDebug("** SENT PARTIAL BAG DATA **");
>>>>>>>
PacketHandler.sendTo(new SyncBagDataPKT(AlchBagProps.getDataFor(player).saveForPartialPacket(color)), (EntityPlayerMP) player);
PELogger.logDebug("** SENT PARTIAL BAG DATA **"); |
<<<<<<<
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 static final long[] RELAY_KLEIN_CHARGE_RATE = new long[] {16, 48, 160};
public static final float[] COLLECTOR_LIGHT_VALS = new float[] {0.4375F, 0.6875F, 1.0F};
>>>>>>>
public static final long[] MAX_KLEIN_EMC = new long[] {50000, 200000, 800000, 3200000, 12800000, 51200000};
public static final long[] RELAY_KLEIN_CHARGE_RATE = new long[] {16, 48, 160}; |
<<<<<<<
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', Blocks.redstone_torch, 'G', Items.glowstone_dust, 'D', Items.diamond, 'P', philosStone);
>>>>>>>
GameRegistry.addRecipe(new ItemStack(confuseTorch, 2), "RDR", "DPD", "GGG", 'R', Blocks.REDSTONE_TORCH, 'G', Items.GLOWSTONE_DUST, 'D', Items.DIAMOND, 'P', philosStone);
<<<<<<<
if (ProjectEConfig.enableAlcChest)
{
GameRegistry.addRecipe(new ItemStack(alchChest), "LMH", "SDS", "ICI", 'D', diamondReplacement, 'L', new ItemStack(covalence, 1, 0), 'M', new ItemStack(covalence, 1, 1), 'H', new ItemStack(covalence, 1, 2), 'S', Blocks.STONE, 'I', Items.IRON_INGOT, 'C', Blocks.CHEST);
}
=======
GameRegistry.addRecipe(new ItemStack(alchChest), "LMH", "SDS", "ICI", 'D', diamondReplacement, 'L', new ItemStack(covalence, 1, 0), 'M', new ItemStack(covalence, 1, 1), 'H', new ItemStack(covalence, 1, 2), 'S', Blocks.stone, 'I', Items.iron_ingot, 'C', Blocks.chest);
>>>>>>>
GameRegistry.addRecipe(new ItemStack(alchChest), "LMH", "SDS", "ICI", 'D', diamondReplacement, 'L', new ItemStack(covalence, 1, 0), 'M', new ItemStack(covalence, 1, 1), 'H', new ItemStack(covalence, 1, 2), 'S', Blocks.STONE, 'I', Items.IRON_INGOT, 'C', Blocks.CHEST);
<<<<<<<
if (ProjectEConfig.enableCondenser)
{
GameRegistry.addRecipe(new ItemStack(condenser), "ODO", "DCD", "ODO", 'D', Items.DIAMOND, 'O', new ItemStack(Blocks.OBSIDIAN), 'C', new ItemStack(alchChest));
}
=======
GameRegistry.addRecipe(new ItemStack(condenser), "ODO", "DCD", "ODO", 'D', Items.diamond, 'O', new ItemStack(Blocks.obsidian), 'C', new ItemStack(alchChest));
>>>>>>>
GameRegistry.addRecipe(new ItemStack(condenser), "ODO", "DCD", "ODO", 'D', Items.DIAMOND, 'O', new ItemStack(Blocks.OBSIDIAN), 'C', new ItemStack(alchChest));
<<<<<<<
if (ProjectEConfig.enableTransTable)
{
GameRegistry.addRecipe(new ItemStack(transmuteStone), "OSO", "SPS", "OSO", 'S', Blocks.STONE, 'O', Blocks.OBSIDIAN, 'P', philosStone);
}
=======
GameRegistry.addRecipe(new ItemStack(transmuteStone), "OSO", "SPS", "OSO", 'S', Blocks.stone, 'O', Blocks.obsidian, 'P', philosStone);
>>>>>>>
GameRegistry.addRecipe(new ItemStack(transmuteStone), "OSO", "SPS", "OSO", 'S', Blocks.STONE, 'O', Blocks.OBSIDIAN, 'P', philosStone);
<<<<<<<
if (ProjectEConfig.enableDarkFurnace)
{
GameRegistry.addRecipe(new ItemStack(dmFurnaceOff), "DDD", "DFD", "DDD", 'D', new ItemStack(matterBlock, 1, 0), 'F', Blocks.FURNACE);
}
if (ProjectEConfig.enableRedFurnace)
{
GameRegistry.addRecipe(new ItemStack(rmFurnaceOff), "XRX", "RFR", 'R', new ItemStack(matterBlock, 1, 1), 'F', dmFurnaceOff);
}
=======
GameRegistry.addRecipe(new ItemStack(dmFurnaceOff), "DDD", "DFD", "DDD", 'D', new ItemStack(matterBlock, 1, 0), 'F', Blocks.furnace);
GameRegistry.addRecipe(new ItemStack(rmFurnaceOff), "XRX", "RFR", 'R', new ItemStack(matterBlock, 1, 1), 'F', dmFurnaceOff);
>>>>>>>
GameRegistry.addRecipe(new ItemStack(dmFurnaceOff), "DDD", "DFD", "DDD", 'D', new ItemStack(matterBlock, 1, 0), 'F', Blocks.FURNACE);
GameRegistry.addRecipe(new ItemStack(rmFurnaceOff), "XRX", "RFR", 'R', new ItemStack(matterBlock, 1, 1), 'F', dmFurnaceOff);
<<<<<<<
if (ProjectEConfig.enableCollector)
{
GameRegistry.addRecipe(new ItemStack(energyCollector), "GTG", "GDG", "GFG", 'G', Blocks.GLOWSTONE, 'F', Blocks.FURNACE, 'D', diamondBlockReplacement, 'T', Blocks.GLASS);
}
if (ProjectEConfig.enableCollector2)
{
GameRegistry.addRecipe(new ItemStack(collectorMK2), "GDG", "GCG", "GGG", 'G', Blocks.GLOWSTONE, 'C', energyCollector, 'D', matter);
}
if (ProjectEConfig.enableCollector3)
{
GameRegistry.addRecipe(new ItemStack(collectorMK3), "GRG", "GCG", "GGG", 'G', Blocks.GLOWSTONE, 'C', collectorMK2, 'R', new ItemStack(matter, 1, 1));
}
=======
GameRegistry.addRecipe(new ItemStack(energyCollector), "GTG", "GDG", "GFG", 'G', Blocks.glowstone, 'F', Blocks.furnace, 'D', diamondBlockReplacement, 'T', Blocks.glass);
GameRegistry.addRecipe(new ItemStack(collectorMK2), "GDG", "GCG", "GGG", 'G', Blocks.glowstone, 'C', energyCollector, 'D', matter);
GameRegistry.addRecipe(new ItemStack(collectorMK3), "GRG", "GCG", "GGG", 'G', Blocks.glowstone, 'C', collectorMK2, 'R', new ItemStack(matter, 1, 1));
>>>>>>>
GameRegistry.addRecipe(new ItemStack(energyCollector), "GTG", "GDG", "GFG", 'G', Blocks.GLOWSTONE, 'F', Blocks.FURNACE, 'D', diamondBlockReplacement, 'T', Blocks.GLASS);
GameRegistry.addRecipe(new ItemStack(collectorMK2), "GDG", "GCG", "GGG", 'G', Blocks.GLOWSTONE, 'C', energyCollector, 'D', matter);
GameRegistry.addRecipe(new ItemStack(collectorMK3), "GRG", "GCG", "GGG", 'G', Blocks.GLOWSTONE, 'C', collectorMK2, 'R', new ItemStack(matter, 1, 1));
<<<<<<<
if (ProjectEConfig.enableRelay)
{
GameRegistry.addRecipe(new ItemStack(relay), "OSO", "ODO", "OOO", 'S', Blocks.GLASS, 'D', Blocks.DIAMOND_BLOCK, 'O', Blocks.OBSIDIAN);
}
if (ProjectEConfig.enableRelay2)
{
GameRegistry.addRecipe(new ItemStack(relayMK2), "ODO", "OAO", "OOO", 'A', relay, 'D', matter, 'O', Blocks.OBSIDIAN);
}
if (ProjectEConfig.enableRelay3)
{
GameRegistry.addRecipe(new ItemStack(relayMK3), "ORO", "OAO", "OOO", 'A', relayMK2, 'R', new ItemStack(matter, 1, 1), 'O', Blocks.OBSIDIAN);
}
=======
GameRegistry.addRecipe(new ItemStack(relay), "OSO", "ODO", "OOO", 'S', Blocks.glass, 'D', Blocks.diamond_block, 'O', Blocks.obsidian);
GameRegistry.addRecipe(new ItemStack(relayMK2), "ODO", "OAO", "OOO", 'A', relay, 'D', matter, 'O', Blocks.obsidian);
GameRegistry.addRecipe(new ItemStack(relayMK3), "ORO", "OAO", "OOO", 'A', relayMK2, 'R', new ItemStack(matter, 1, 1), 'O', Blocks.obsidian);
>>>>>>>
GameRegistry.addRecipe(new ItemStack(relay), "OSO", "ODO", "OOO", 'S', Blocks.GLASS, 'D', Blocks.DIRT, 'O', Blocks.OBSIDIAN);
GameRegistry.addRecipe(new ItemStack(relayMK2), "ODO", "OAO", "OOO", 'A', relay, 'D', matter, 'O', Blocks.OBSIDIAN);
GameRegistry.addRecipe(new ItemStack(relayMK3), "ORO", "OAO", "OOO", 'A', relayMK2, 'R', new ItemStack(matter, 1, 1), 'O', Blocks.OBSIDIAN); |
<<<<<<<
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.IFireProtectionItem;
import moze_intel.projecte.api.item.IPedestalItem;
import moze_intel.projecte.api.item.IProjectileShooter;
>>>>>>>
import moze_intel.projecte.utils.IFireProtectionItem;
import moze_intel.projecte.api.item.IPedestalItem;
import moze_intel.projecte.api.item.IProjectileShooter; |
<<<<<<<
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.minecraftforge.fml.relauncher.SideOnly;
<<<<<<<
//End IFluidContainerItem
=======
/** End IFluidContainerItem **/
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register)
{
this.itemIcon = register.registerIcon(this.getTexture("rings", "evertide_amulet"));//"ee2:rings/evertide_amulet");
}
>>>>>>>
/** End IFluidContainerItem **/ |
<<<<<<<
registerProcessor.process(new InstanceReplicationTask(name, Action.Register, info, null, true) {
public EurekaHttpResponse<Void> execute() {
return replicationClient.register(info);
}
});
=======
long expiryTime = System.currentTimeMillis() + info.getLeaseInfo().getRenewalIntervalInSecs() * 1000;
batchingDispatcher.process(
taskId("register", info),
new InstanceReplicationTask(targetHost, Action.Register, info, null, true) {
public HttpResponse<Void> execute() {
return replicationClient.register(info);
}
},
expiryTime
);
>>>>>>>
long expiryTime = System.currentTimeMillis() + info.getLeaseInfo().getRenewalIntervalInSecs() * 1000;
batchingDispatcher.process(
taskId("register", info),
new InstanceReplicationTask(targetHost, Action.Register, info, null, true) {
public EurekaHttpResponse<Void> execute() {
return replicationClient.register(info);
}
},
expiryTime
);
<<<<<<<
cancelProcessor.process(new InstanceReplicationTask(name, Action.Cancel, appName, id) {
@Override
public EurekaHttpResponse<Void> execute() {
return replicationClient.cancel(appName, id);
}
=======
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
batchingDispatcher.process(
taskId("cancel", appName, id),
new InstanceReplicationTask(targetHost, Action.Cancel, appName, id) {
@Override
public HttpResponse<Void> execute() {
return replicationClient.cancel(appName, id);
}
>>>>>>>
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
batchingDispatcher.process(
taskId("cancel", appName, id),
new InstanceReplicationTask(targetHost, Action.Cancel, appName, id) {
@Override
public EurekaHttpResponse<Void> execute() {
return replicationClient.cancel(appName, id);
}
<<<<<<<
asgStatusProcessor.process(new AsgReplicationTask(name, Action.StatusUpdate, asgName, newStatus) {
public EurekaHttpResponse<?> execute() {
return replicationClient.statusUpdate(asgName, newStatus);
}
});
=======
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
nonBatchingDispatcher.process(
asgName,
new AsgReplicationTask(targetHost, Action.StatusUpdate, asgName, newStatus) {
public HttpResponse<?> execute() {
return replicationClient.statusUpdate(asgName, newStatus);
}
},
expiryTime
);
>>>>>>>
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
nonBatchingDispatcher.process(
asgName,
new AsgReplicationTask(targetHost, Action.StatusUpdate, asgName, newStatus) {
public EurekaHttpResponse<?> execute() {
return replicationClient.statusUpdate(asgName, newStatus);
}
},
expiryTime
);
<<<<<<<
statusProcessor.process(new InstanceReplicationTask(name, Action.StatusUpdate, info, null, false) {
@Override
public EurekaHttpResponse<Void> execute() {
return replicationClient.statusUpdate(appName, id, newStatus, info);
}
});
=======
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
batchingDispatcher.process(
taskId("statusUpdate", appName, id),
new InstanceReplicationTask(targetHost, Action.StatusUpdate, info, null, false) {
@Override
public HttpResponse<Void> execute() {
return replicationClient.statusUpdate(appName, id, newStatus, info);
}
},
expiryTime
);
>>>>>>>
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
batchingDispatcher.process(
taskId("statusUpdate", appName, id),
new InstanceReplicationTask(targetHost, Action.StatusUpdate, info, null, false) {
@Override
public EurekaHttpResponse<Void> execute() {
return replicationClient.statusUpdate(appName, id, newStatus, info);
}
},
expiryTime
);
<<<<<<<
statusProcessor.process(new InstanceReplicationTask(name, Action.DeleteStatusOverride, info, null, false) {
@Override
public EurekaHttpResponse<Void> execute() {
return replicationClient.deleteStatusOverride(appName, id, info);
}
});
=======
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
batchingDispatcher.process(
taskId("deleteStatusOverride", appName, id),
new InstanceReplicationTask(targetHost, Action.DeleteStatusOverride, info, null, false) {
@Override
public HttpResponse<Void> execute() {
return replicationClient.deleteStatusOverride(appName, id, info);
}
},
expiryTime);
>>>>>>>
long expiryTime = System.currentTimeMillis() + maxProcessingDelayMs;
batchingDispatcher.process(
taskId("deleteStatusOverride", appName, id),
new InstanceReplicationTask(targetHost, Action.DeleteStatusOverride, info, null, false) {
@Override
public EurekaHttpResponse<Void> execute() {
return replicationClient.deleteStatusOverride(appName, id, info);
}
},
expiryTime); |
<<<<<<<
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.transport.EurekaHttpResponse;
<<<<<<<
private void executeSingle(List<ReplicationTask> tasks) {
for (ReplicationTask task : tasks) {
long lastNetworkErrorTime = 0;
boolean done;
do {
done = true;
try {
if (isLate(task)) {
continue;
}
DynamicCounter.increment("Single_" + task.getAction().name() + "_tries");
EurekaHttpResponse<?> httpResponse = task.execute();
int statusCode = httpResponse.getStatusCode();
Object entity = httpResponse.getEntity();
if (logger.isDebugEnabled()) {
logger.debug("Replication task {} completed with status {}, (includes entity {})", task.getTaskName(), statusCode, entity != null);
}
if (isSuccess(statusCode)) {
DynamicCounter.increment("Single_" + task.getAction().name() + "_success");
task.handleSuccess();
} else {
DynamicCounter.increment("Single_" + task.getAction().name() + "_failure");
task.handleFailure(statusCode, entity);
}
} catch (Throwable e) {
if (isNetworkConnectException(e)) {
long now = System.currentTimeMillis();
// We want to retry eagerly, but without flooding log file with tons of error entries.
// As tasks are executed by a pool of threads the error logging multiplies. For example:
// 20 threads * 100ms delay == 200 error entries / sec worst case
// Still we would like to see the exception samples, so we print samples at regular intervals.
if (now - lastNetworkErrorTime > 10000) {
lastNetworkErrorTime = now;
logger.error("Network level connection to peer " + peerId + " for task " + task.getTaskName() + "; retrying after delay", e);
}
try {
Thread.sleep(retrySleepTimeMs);
} catch (InterruptedException ignore) {
}
DynamicCounter.increment(task.getAction().name() + "_retries");
done = false;
} else {
logger.error(peerId + ": " + task.getTaskName() + "Not re-trying this exception because it does not seem to be a network exception", e);
}
}
} while (!done);
=======
@Override
public ProcessingResult process(ReplicationTask task) {
try {
HttpResponse<?> httpResponse = task.execute();
int statusCode = httpResponse.getStatusCode();
Object entity = httpResponse.getEntity();
if (logger.isDebugEnabled()) {
logger.debug("Replication task {} completed with status {}, (includes entity {})", task.getTaskName(), statusCode, entity != null);
}
if (isSuccess(statusCode)) {
task.handleSuccess();
} else if (statusCode == 503) {
logger.debug("Server busy (503) reply for task {}", task.getTaskName());
return ProcessingResult.Congestion;
} else {
task.handleFailure(statusCode, entity);
return ProcessingResult.PermanentError;
}
} catch (Throwable e) {
if (isNetworkConnectException(e)) {
logNetworkErrorSample(task, e);
return ProcessingResult.TransientError;
} else {
logger.error(peerId + ": " + task.getTaskName() + "Not re-trying this exception because it does not seem to be a network exception", e);
return ProcessingResult.PermanentError;
}
>>>>>>>
@Override
public ProcessingResult process(ReplicationTask task) {
try {
EurekaHttpResponse<?> httpResponse = task.execute();
int statusCode = httpResponse.getStatusCode();
Object entity = httpResponse.getEntity();
if (logger.isDebugEnabled()) {
logger.debug("Replication task {} completed with status {}, (includes entity {})", task.getTaskName(), statusCode, entity != null);
}
if (isSuccess(statusCode)) {
task.handleSuccess();
} else if (statusCode == 503) {
logger.debug("Server busy (503) reply for task {}", task.getTaskName());
return ProcessingResult.Congestion;
} else {
task.handleFailure(statusCode, entity);
return ProcessingResult.PermanentError;
}
} catch (Throwable e) {
if (isNetworkConnectException(e)) {
logNetworkErrorSample(task, e);
return ProcessingResult.TransientError;
} else {
logger.error(peerId + ": " + task.getTaskName() + "Not re-trying this exception because it does not seem to be a network exception", e);
return ProcessingResult.PermanentError;
}
<<<<<<<
if (list.getReplicationList().isEmpty()) {
return;
}
Action action = list.getReplicationList().get(0).getAction();
DynamicCounter.increment("Batch_" + action + "_tries");
long lastNetworkErrorTime = 0;
boolean done;
do {
done = true;
try {
EurekaHttpResponse<ReplicationListResponse> response = replicationClient.submitBatchUpdates(list);
int statusCode = response.getStatusCode();
if (!isSuccess(statusCode)) {
if (statusCode == 503) {
logger.warn("Server busy (503) HTTP status code received from the peer {}; rescheduling tasks after delay", peerId);
rescheduleAfterDelay(tasks);
} else {
// Unexpected error returned from the server. This should ideally never happen.
logger.error("Batch update failure with HTTP status code {}; discarding {} replication tasks", statusCode, tasks.size());
}
return;
=======
try {
HttpResponse<ReplicationListResponse> response = replicationClient.submitBatchUpdates(list);
int statusCode = response.getStatusCode();
if (!isSuccess(statusCode)) {
if (statusCode == 503) {
logger.warn("Server busy (503) HTTP status code received from the peer {}; rescheduling tasks after delay", peerId);
return ProcessingResult.Congestion;
} else {
// Unexpected error returned from the server. This should ideally never happen.
logger.error("Batch update failure with HTTP status code {}; discarding {} replication tasks", statusCode, tasks.size());
return ProcessingResult.PermanentError;
>>>>>>>
try {
EurekaHttpResponse<ReplicationListResponse> response = replicationClient.submitBatchUpdates(list);
int statusCode = response.getStatusCode();
if (!isSuccess(statusCode)) {
if (statusCode == 503) {
logger.warn("Server busy (503) HTTP status code received from the peer {}; rescheduling tasks after delay", peerId);
return ProcessingResult.Congestion;
} else {
// Unexpected error returned from the server. This should ideally never happen.
logger.error("Batch update failure with HTTP status code {}; discarding {} replication tasks", statusCode, tasks.size());
return ProcessingResult.PermanentError; |
<<<<<<<
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.EurekaJerseyClient;
import com.netflix.discovery.shared.EurekaJerseyClient.EurekaJerseyClientBuilder;
<<<<<<<
private final EurekaAccept clientAccept;
private final JerseyClient discoveryJerseyClient;
=======
private String appPathIdentifier;
private boolean isRegisteredWithDiscovery = false;
private EurekaJerseyClient discoveryJerseyClient;
private AtomicReference<String> lastQueryRedirect = new AtomicReference<String>();
private AtomicReference<String> lastRegisterRedirect = new AtomicReference<String>();
private ApacheHttpClient4 discoveryApacheClient;
protected static EurekaClientConfig clientConfig;
>>>>>>>
private final EurekaAccept clientAccept;
private EurekaJerseyClient discoveryJerseyClient;
<<<<<<<
private InstanceInfoReplicator instanceInfoReplicator;
=======
private volatile long lastSuccessfulRegistryFetchTimestamp = -1;
private volatile long lastSuccessfulHeartbeatTimestamp = -1;
>>>>>>>
private volatile long lastSuccessfulRegistryFetchTimestamp = -1;
private volatile long lastSuccessfulHeartbeatTimestamp = -1;
private InstanceInfoReplicator instanceInfoReplicator;
<<<<<<<
DiscoveryJerseyProvider discoveryJerseyProvider = new DiscoveryJerseyProvider(
CodecWrappers.getEncoder(clientConfig.getEncoderName()),
CodecWrappers.resolveDecoder(clientConfig.getDecoderName(), clientConfig.getClientDataAccept())
);
clientAccept = EurekaAccept.fromString(clientConfig.getClientDataAccept());
=======
EurekaJerseyClientBuilder clientBuilder = new EurekaJerseyClientBuilder()
.withUserAgent("Java EurekaClient")
.withConnectionTimeout(clientConfig.getEurekaServerConnectTimeoutSeconds() * 1000)
.withReadTimeout(clientConfig.getEurekaServerReadTimeoutSeconds() * 1000)
.withMaxConnectionsPerHost(clientConfig.getEurekaServerTotalConnectionsPerHost())
.withMaxTotalConnections(clientConfig.getEurekaServerTotalConnections())
.withConnectionIdleTimeout(clientConfig.getEurekaConnectionIdleTimeoutSeconds());
>>>>>>>
EurekaJerseyClientBuilder clientBuilder = new EurekaJerseyClientBuilder()
.withUserAgent("Java EurekaClient")
.withConnectionTimeout(clientConfig.getEurekaServerConnectTimeoutSeconds() * 1000)
.withReadTimeout(clientConfig.getEurekaServerReadTimeoutSeconds() * 1000)
.withMaxConnectionsPerHost(clientConfig.getEurekaServerTotalConnectionsPerHost())
.withMaxTotalConnections(clientConfig.getEurekaServerTotalConnections())
.withConnectionIdleTimeout(clientConfig.getEurekaConnectionIdleTimeoutSeconds());
DiscoveryJerseyProvider discoveryJerseyProvider = new DiscoveryJerseyProvider(
CodecWrappers.getEncoder(clientConfig.getEncoderName()),
CodecWrappers.resolveDecoder(clientConfig.getDecoderName(), clientConfig.getClientDataAccept())
);
clientAccept = EurekaAccept.fromString(clientConfig.getClientDataAccept());
<<<<<<<
discoveryJerseyClient = new JerseyClient(
clientConfig.getEurekaServerConnectTimeoutSeconds() * 1000,
clientConfig.getEurekaServerReadTimeoutSeconds() * 1000,
clientConfig.getEurekaConnectionIdleTimeoutSeconds(),
JerseyClientConfigBuilder.newSystemSSLClientConfigBuilder()
.withClientName("DiscoveryClient-HTTPClient-System")
.withMaxConnectionsPerHost(clientConfig.getEurekaServerTotalConnectionsPerHost())
.withMaxTotalConnections(clientConfig.getEurekaServerTotalConnections())
.withDiscoveryJerseyProvider(discoveryJerseyProvider)
.build()
);
=======
clientBuilder.withClientName("DiscoveryClient-HTTPClient-System")
.withSystemSSLConfiguration();
>>>>>>>
clientBuilder.withClientName("DiscoveryClient-HTTPClient-System")
.withSystemSSLConfiguration(); |
<<<<<<<
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.discovery.shared.transport.EurekaHttpResponse;
import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl.Action; |
<<<<<<<
@Override
public int getRoute53BindRebindRetries() {
return configInstance.getIntProperty(
namespace + "route53BindRebindRetries", 3).get();
}
@Override
public int getRoute53BindingRetryIntervalMs() {
return configInstance.getIntProperty(
namespace + "route53BindRebindRetryIntervalMs", (5 * 60 * 1000))
.get();
}
@Override
public long getRoute53DomainTTL() {
return configInstance.getLongProperty(
namespace + "route53DomainTTL", 30l)
.get();
}
@Override
public AwsBindingStrategy getBindingStrategy() {
return AwsBindingStrategy.valueOf(configInstance.getStringProperty(namespace + "awsBindingStrategy", AwsBindingStrategy.EIP.name()).get().toUpperCase());
}
=======
@Override
public String getExperimental(String name) {
return configInstance.getStringProperty(namespace + "experimental." + name, null).get();
}
>>>>>>>
@Override
public String getExperimental(String name) {
return configInstance.getStringProperty(namespace + "experimental." + name, null).get();
}
@Override
public int getRoute53BindRebindRetries() {
return configInstance.getIntProperty(
namespace + "route53BindRebindRetries", 3).get();
}
@Override
public int getRoute53BindingRetryIntervalMs() {
return configInstance.getIntProperty(
namespace + "route53BindRebindRetryIntervalMs", (5 * 60 * 1000))
.get();
}
@Override
public long getRoute53DomainTTL() {
return configInstance.getLongProperty(
namespace + "route53DomainTTL", 30l)
.get();
}
@Override
public AwsBindingStrategy getBindingStrategy() {
return AwsBindingStrategy.valueOf(configInstance.getStringProperty(namespace + "awsBindingStrategy", AwsBindingStrategy.EIP.name()).get().toUpperCase());
} |
<<<<<<<
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 {@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)
*/
<<<<<<<
=======
/**
* Convenience method equivalent to
*<pre>
* Boolean.TRUE.equals(getLenient())
*</pre>
* that is, returns {@code true} if (and only if) leniency has been explicitly
* set to {code true}; but not if it is undefined.
*
* @since 2.9
*/
>>>>>>>
/**
* Convenience method equivalent to
*<pre>
* Boolean.TRUE.equals(getLenient())
*</pre>
* that is, returns {@code true} if (and only if) leniency has been explicitly
* set to {code true}; but not if it is undefined.
*/ |
<<<<<<<
=======
*
* @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 (only useful for mix-in annotations to "mask" annotation |
<<<<<<<
import com.reactnativecommunity.netinfo.NetInfoPackage;
=======
import org.reactnative.camera.RNCameraPackage;
>>>>>>>
import com.reactnativecommunity.netinfo.NetInfoPackage;
import org.reactnative.camera.RNCameraPackage;
<<<<<<<
new NetInfoPackage(),
=======
new 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,
DefaultTyping.NON_FINAL)
.build();
Path input = Paths.get("/tmp", "foo.txt");
>>>>>>>
.activateDefaultTyping(NoCheckSubTypeValidator.instance,
DefaultTyping.NON_FINAL)
.build();
Path input = Paths.get(isWindows() ? "c:/tmp" : "/tmp", "foo.txt"); |
<<<<<<<
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;
import it.unibz.inf.ontop.model.term.NonFunctionalTerm;
import it.unibz.inf.ontop.model.term.Variable;
import java.util.Optional;
>>>>>>>
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import it.unibz.inf.ontop.iq.node.VariableNullability;
import it.unibz.inf.ontop.model.term.ImmutableTerm;
import it.unibz.inf.ontop.model.term.NonFunctionalTerm;
import it.unibz.inf.ontop.model.term.Variable;
import java.util.Optional;
<<<<<<<
boolean isInjective(ImmutableList<? extends ImmutableTerm> arguments, ImmutableSet<Variable> nonNullVariables);
=======
FunctionalTermNullability evaluateNullability(ImmutableList<? extends NonFunctionalTerm> arguments,
VariableNullability childNullability);
interface FunctionalTermNullability {
boolean isNullable();
/**
* When the nullability of a functional term is bound to the nullability
* of a variable
*/
Optional<Variable> getBoundVariable();
}
>>>>>>>
boolean isInjective(ImmutableList<? extends ImmutableTerm> arguments, ImmutableSet<Variable> nonNullVariables);
FunctionalTermNullability evaluateNullability(ImmutableList<? extends NonFunctionalTerm> arguments,
VariableNullability childNullability);
interface FunctionalTermNullability {
boolean isNullable();
/**
* When the nullability of a functional term is bound to the nullability
* of a variable
*/
Optional<Variable> getBoundVariable();
} |
<<<<<<<
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.SemanticIndexURIMap;
>>>>>>>
import org.semanticweb.ontop.owlrefplatform.core.DBConnector;
import org.semanticweb.ontop.owlrefplatform.core.IQuest;
import org.semanticweb.ontop.owlrefplatform.core.Quest;
import org.semanticweb.ontop.owlrefplatform.core.QuestPreferences;
import org.semanticweb.ontop.owlrefplatform.core.abox.SemanticIndexURIMap;
<<<<<<<
public IQuest create(Ontology tBox, @Nullable OBDAModel mappings, @Nullable DBMetadata metadata,
Properties config);
=======
public IQuest create(Ontology tBox, @Nullable OBDAModel mappings, @Nullable DBMetadata metadata,
QuestPreferences config);
>>>>>>>
public IQuest create(Ontology tBox, @Nullable OBDAModel mappings, @Nullable DBMetadata metadata,
QuestPreferences config);
<<<<<<<
public NativeQueryGenerator create(DBMetadata metadata, OBDADataSource dataSource, Map<String, Integer> uriRefIds);
public DBConnector create(OBDADataSource obdaDataSource, IQuest questInstance);
=======
public NativeQueryGenerator create(DBMetadata metadata, OBDADataSource dataSource, SemanticIndexURIMap uriRefIds);
>>>>>>>
public NativeQueryGenerator create(DBMetadata metadata, OBDADataSource dataSource, SemanticIndexURIMap uriRefIds);
public DBConnector create(OBDADataSource obdaDataSource, IQuest questInstance); |
<<<<<<<
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;
<<<<<<< HEAD:ontop-protege/src/main/java/it/unibz/inf/ontop/protege/views/MappingsManagerView.java
import it.unibz.inf.ontop.protege.core.OBDAModelWrapper;
=======
import it.unibz.inf.ontop.protege.core.OBDAModelManager;
>>>>>>> v3/package-names-changed:ontop-protege/src/main/java/it/unibz/inf/ontop/protege/views/MappingsManagerView.java
import org.protege.editor.owl.OWLEditorKit;
import org.protege.editor.owl.model.selection.OWLSelectionModelListener;
import org.protege.editor.owl.ui.view.AbstractOWLViewComponent;
import org.protege.editor.owl.ui.view.Findable;
<<<<<<< HEAD:ontop-protege/src/main/java/it/unibz/inf/ontop/protege/views/MappingsManagerView.java
import it.unibz.inf.ontop.injection.NativeQueryLanguageComponentFactory;
import it.unibz.inf.ontop.io.TargetQueryVocabularyValidator;
import it.unibz.inf.ontop.model.impl.OBDAModelImpl;
import it.unibz.inf.ontop.owlapi3.TargetQueryValidator;
import it.unibz.inf.ontop.protege.core.OBDAModelManager;
=======
=======
>>>>>>>
<<<<<<<
import it.unibz.inf.ontop.owlapi3.TargetQueryValidator;
>>>>>>> v3/package-names-changed:ontop-protege/src/main/java/it/unibz/inf/ontop/protege/views/MappingsManagerView.java
=======
import it.unibz.inf.ontop.owlapi.TargetQueryValidator;
import it.unibz.inf.ontop.owlapi.TargetQueryValidator;
import it.unibz.inf.ontop.protege.core.OBDAModelManager;
>>>>>>>
import it.unibz.inf.ontop.owlapi.TargetQueryValidator;
import it.unibz.inf.ontop.owlapi.TargetQueryValidator;
import it.unibz.inf.ontop.protege.core.OBDAModelManager;
<<<<<<<
datasourceSelector = new DatasourceSelector(controller.getActiveOBDAModelWrapper());
datasourceSelector.addDatasourceListListener(mappingPanel);
// Construt the layout of the panel.
JPanel selectorPanel = new JPanel();
selectorPanel.setLayout(new GridBagLayout());
JLabel label = new JLabel("Select datasource: ");
label.setFont(new Font("Dialog", Font.BOLD, 12));
label.setForeground(new Color(53,113,163));
// label.setBackground(new java.awt.Color(153, 153, 153));
// label.setFont(new java.awt.Font("Arial", 1, 11));
// label.setForeground(new java.awt.Color(153, 153, 153));
label.setPreferredSize(new Dimension(119, 14));
GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new Insets(5, 5, 5, 5);
selectorPanel.add(label, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new Insets(5, 5, 5, 5);
selectorPanel.add(datasourceSelector, gridBagConstraints);
selectorPanel.setBorder(new TitledBorder("Datasource selection"));
=======
if (obdaModel.getSources().size() > 0) {
mappingPanel.datasourceChanged(mappingPanel.getSelectedSource(), obdaModel.getSources().get(0));
}
>>>>>>>
if (obdaModel.getSources().size() > 0) {
mappingPanel.datasourceChanged(mappingPanel.getSelectedSource(), obdaModel.getSources().get(0));
}
<<<<<<<
OBDAModelWrapper obdaModel = controller.getActiveOBDAModelWrapper();
TargetQueryVocabularyValidator validator = new TargetQueryValidator(obdaModel.getCurrentImmutableOBDAModel());
=======
obdaModel = controller.getActiveOBDAModel();
TargetQueryVocabularyValidator validator = new TargetQueryValidator(obdaModel.getOntologyVocabulary());
>>>>>>>
obdaModel = controller.getActiveOBDAModelWrapper();
TargetQueryVocabularyValidator validator = new TargetQueryValidator(obdaModel.getOntologyVocabulary()); |
<<<<<<<
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;
<<<<<<<
List<Variable> targetVariables = extractVariablesFromTargetAtom(targetAtom);
=======
List<VariableImpl> targetVariables;
try {
targetVariables = extractVariablesFromTargetAtom(targetAtom);
}
/**
* If the assumption of having only variables is violated,
* the substitution is cancelled.
*/
catch (NonVariableException e) {
throw new SubstitutionUtilities.SubstitutionException();
}
>>>>>>>
List<Variable> targetVariables = extractVariablesFromTargetAtom(targetAtom);
<<<<<<<
private static List<Variable> extractVariablesFromTargetAtom(final Function targetAtom) {
List<Option<Variable>> variableList = List.iterableList(targetAtom.getTerms()).map(new F<Term, Option<Variable>>() {
=======
private static List<VariableImpl> extractVariablesFromTargetAtom(final Function targetAtom) throws NonVariableException {
return List.iterableList(targetAtom.getTerms()).map(new F<Term, VariableImpl>() {
>>>>>>>
private static List<Variable> extractVariablesFromTargetAtom(final Function targetAtom) {
List<Option<Variable>> variableList = List.iterableList(targetAtom.getTerms()).map(new F<Term, Option<Variable>>() {
<<<<<<<
return Option.none();
=======
throw new NonVariableException("The target atom must be only composed of (possibly typed) variables. Bad term: " + term);
>>>>>>>
return Option.none(); |
<<<<<<<
=======
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;
>>>>>>>
<<<<<<<
InputQueryFactory inputQueryFactory, TermFactory termFactory,
RDF rdfFactory, SubstitutionFactory substitutionFactory, JDBCStatementInitializer statementInitializer,
OntopSystemSQLSettings settings) {
=======
DBParameters dbParameters,
InputQueryFactory inputQueryFactory, TermFactory termFactory, TypeFactory typeFactory,
RDF rdfFactory, SubstitutionFactory substitutionFactory, OntopSystemSQLSettings settings) {
>>>>>>>
InputQueryFactory inputQueryFactory, TermFactory termFactory,
RDF rdfFactory, SubstitutionFactory substitutionFactory,
JDBCStatementInitializer statementInitializer,
OntopSystemSQLSettings settings) {
<<<<<<<
=======
this.dbParameters = dbParameters;
>>>>>>> |
<<<<<<<
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.
*
* @since 2.6
*
* @deprecated Since 2.7
*/
@Deprecated
public JavaType constructSimpleType(Class<?> rawType, Class<?> parameterTarget,
JavaType[] parameterTypes)
{
return constructSimpleType(rawType, parameterTypes);
}
/**
* Method for constructing a {@link ReferenceType} instance with given type parameter
* (type MUST take one and only one type parameter)
*<p>
* NOTE: type modifiers are NOT called on constructed type itself.
*
* @since 2.6
*/
>>>>>>>
/**
* Method for constructing a {@link ReferenceType} instance with given type parameter
* (type MUST take one and only one type parameter)
*<p>
* NOTE: type modifiers are NOT called on constructed type itself.
*/
<<<<<<<
=======
*
* @return Fully resolved type for given base type and type parameters
>>>>>>>
*
* @return Fully resolved type for given base type and type parameters |
<<<<<<<
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.functionsymbol.ExpressionOperation;
import it.unibz.inf.ontop.model.term.functionsymbol.Predicate;
import it.unibz.inf.ontop.spec.mapping.parser.exception.IllegalJoinException;
>>>>>>>
import it.unibz.inf.ontop.spec.mapping.parser.exception.IllegalJoinException;
import it.unibz.inf.ontop.model.type.TermType; |
<<<<<<<
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 org.semanticweb.ontop.owlrefplatform.core.QuestConstants;
import org.semanticweb.ontop.owlrefplatform.core.QuestPreferences;
import org.semanticweb.ontop.owlrefplatform.core.QuestStatement;
import org.semanticweb.ontop.owlrefplatform.core.abox.EquivalentTriplePredicateIterator;
>>>>>>>
import org.semanticweb.ontop.owlapi3.OWLAPI3TranslatorUtility;
import org.semanticweb.ontop.owlrefplatform.core.IQuest;
import org.semanticweb.ontop.owlrefplatform.core.QuestConnection;
import org.semanticweb.ontop.owlrefplatform.core.QuestConstants;
import org.semanticweb.ontop.owlrefplatform.core.QuestPreferences;
import org.semanticweb.ontop.owlrefplatform.core.QuestStatement;
import org.semanticweb.ontop.owlrefplatform.core.abox.EquivalentTriplePredicateIterator;
<<<<<<<
private final QuestComponentFactory componentFactory;
=======
>>>>>>>
private final QuestComponentFactory componentFactory; |
<<<<<<<
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.ontop.mapping.MappingParser;
import it.unibz.inf.ontop.model.OBDAException;
=======
import it.unibz.inf.ontop.io.ModelIOManager;
import it.unibz.inf.ontop.model.OBDADataFactory;
import it.unibz.inf.ontop.model.OBDADataSource;
import it.unibz.inf.ontop.model.OBDAModel;
import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl;
>>>>>>>
import it.unibz.inf.ontop.injection.OBDAProperties;
<<<<<<<
import it.unibz.inf.ontop.owlrefplatform.core.QuestPreferences;
import it.unibz.inf.ontop.r2rml.R2RMLMappingParser;
=======
import it.unibz.inf.ontop.owlrefplatform.core.QuestPreferences;
import it.unibz.inf.ontop.owlrefplatform.owlapi.*;
import it.unibz.inf.ontop.r2rml.R2RMLReader;
import org.junit.Before;
import org.junit.Test;
>>>>>>>
import it.unibz.inf.ontop.owlrefplatform.core.QuestPreferences;
import it.unibz.inf.ontop.owlrefplatform.owlapi.*;
import it.unibz.inf.ontop.owlrefplatform.core.R2RMLQuestPreferences;
import org.junit.Before;
import org.junit.Test;
<<<<<<<
=======
private OBDADataFactory fac;
>>>>>>>
<<<<<<<
private void runTests(Properties p, String query, int numberResults, String mappingFile) throws Exception {
=======
private void runTests(QuestPreferences p, String query, int numberResults) throws Exception {
>>>>>>>
private void runTests(QuestPreferences prefs, String query, int numberResults,
String mappingFile) throws Exception {
<<<<<<<
QuestOWLFactory factory = new QuestOWLFactory(new File(mappingFile), new QuestPreferences(p));
QuestOWL reasoner = factory.createReasoner(ontology, new SimpleConfiguration());
=======
QuestOWLFactory factory = new QuestOWLFactory();
QuestOWLConfiguration config = QuestOWLConfiguration.builder().obdaModel(obdaModel).preferences(p).build();
QuestOWL reasoner = factory.createReasoner(ontology, config);
>>>>>>>
QuestOWLFactory factory = new QuestOWLFactory();
QuestOWLConfiguration config = QuestOWLConfiguration.builder()
.nativeOntopMappingFile(new File(mappingFile))
.preferences(prefs)
.build();
QuestOWL reasoner = factory.createReasoner(ontology, config);
<<<<<<<
Properties p = new Properties();
p.setProperty(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setProperty(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
p.setProperty(QuestPreferences.OPTIMIZE_TBOX_SIGMA, "true");
=======
// Loading the OBDA data
obdaModel = fac.getOBDAModel();
ModelIOManager ioManager = new ModelIOManager(obdaModel);
ioManager.load(obdaFile);
QuestPreferences p = new QuestPreferences();
p.setCurrentValueOf(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setCurrentValueOf(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
>>>>>>>
QuestPreferences p = new QuestPreferences();
<<<<<<<
Properties p = new Properties();
p.setProperty(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setProperty(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
p.setProperty(QuestPreferences.OPTIMIZE_TBOX_SIGMA, "true");
=======
QuestPreferences p = new QuestPreferences();
p.setCurrentValueOf(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setCurrentValueOf(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
OBDADataFactory f = OBDADataFactoryImpl.getInstance();
// String sourceUrl = "http://example.org/customOBDA";
URI obdaURI = new File(r2rmlFile).toURI();
String sourceUrl = obdaURI.toString();
OBDADataSource dataSource = f.getJDBCDataSource(sourceUrl, jdbcurl,
username, password, driverclass);
log.info("Loading r2rml file");
// Creating a new instance of the reasoner
>>>>>>>
Properties p = new Properties();
p.setProperty(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setProperty(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
<<<<<<<
Properties p = new Properties();
p.setProperty(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setProperty(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
p.setProperty(QuestPreferences.OPTIMIZE_TBOX_SIGMA, "true");
=======
// Loading the OBDA data
obdaModel = fac.getOBDAModel();
ModelIOManager ioManager = new ModelIOManager(obdaModel);
ioManager.load(obdaErroredFile);
QuestPreferences p = new QuestPreferences();
p.setCurrentValueOf(QuestPreferences.ABOX_MODE, QuestConstants.VIRTUAL);
p.setCurrentValueOf(QuestPreferences.OPTIMIZE_EQUIVALENCES, "true");
>>>>>>>
QuestPreferences p = new QuestPreferences(); |
<<<<<<<
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.unibz.inf.ontop.model.OBDAMappingAxiom;
import it.unibz.inf.ontop.model.Predicate;
import it.unibz.inf.ontop.model.Term;
import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl;
import it.unibz.inf.ontop.ontology.DataPropertyExpression;
import it.unibz.inf.ontop.ontology.OClass;
import it.unibz.inf.ontop.ontology.ObjectPropertyExpression;
import it.unibz.inf.ontop.ontology.OntologyFactory;
import it.unibz.inf.ontop.ontology.impl.OntologyFactoryImpl;
import it.unibz.inf.ontop.owlrefplatform.core.dagjgrapht.TBoxReasoner;
=======
import it.unibz.inf.ontop.model.*;
import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl;
import it.unibz.inf.ontop.ontology.DataPropertyExpression;
import it.unibz.inf.ontop.ontology.ImmutableOntologyVocabulary;
import it.unibz.inf.ontop.ontology.OClass;
import it.unibz.inf.ontop.ontology.ObjectPropertyExpression;
import it.unibz.inf.ontop.owlrefplatform.core.dagjgrapht.TBoxReasoner;
>>>>>>>
import com.google.common.collect.ImmutableList;
import it.unibz.inf.ontop.injection.NativeQueryLanguageComponentFactory;
import it.unibz.inf.ontop.model.*;
import it.unibz.inf.ontop.model.impl.OBDADataFactoryImpl;
import it.unibz.inf.ontop.ontology.DataPropertyExpression;
import it.unibz.inf.ontop.ontology.ImmutableOntologyVocabulary;
import it.unibz.inf.ontop.ontology.OClass;
import it.unibz.inf.ontop.ontology.ObjectPropertyExpression;
import it.unibz.inf.ontop.owlrefplatform.core.dagjgrapht.TBoxReasoner;
<<<<<<<
this.nativeQLFactory = nativeQLFactory;
=======
this.voc = voc;
>>>>>>>
this.voc = voc;
this.nativeQLFactory = nativeQLFactory;
<<<<<<<
CQIE targetQuery = (CQIE) mapping.getTargetQuery();
CQIE newTargetQuery = replaceEquivalences(targetQuery, false);
result.add(nativeQLFactory.create(mapping.getId(), mapping.getSourceQuery(), newTargetQuery));
=======
List<Function> targetQuery = mapping.getTargetQuery();
List<Function> newTargetQuery = replaceEquivalences(targetQuery);
result.add(dfac.getRDBMSMappingAxiom(mapping.getId(), mapping.getSourceQuery(), newTargetQuery));
>>>>>>>
List<Function> targetQuery = mapping.getTargetQuery();
List<Function> newTargetQuery = replaceEquivalences(targetQuery);
result.add(nativeQLFactory.create(mapping.getId(), mapping.getSourceQuery(), newTargetQuery)); |
<<<<<<<
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> mappingAxioms = new ArrayList<>();
for (int i = 0; i < tables.size(); i++) {
TableDefinition td = tables.get(i);
mappingAxioms.addAll(getMapping(td, metadata, baseuri));
=======
Collection<TableDefinition> tables = metadata.getTables();
List<OBDAMappingAxiom> mappingAxioms = new ArrayList<OBDAMappingAxiom>();
for (TableDefinition td : tables) {
model.addMappings(sourceUri, getMapping(td, metadata, baseuri));
>>>>>>>
Collection<TableDefinition> tables = metadata.getTables();
List<OBDAMappingAxiom> mappingAxioms = new ArrayList<>();
for (TableDefinition td : tables) {
mappingAxioms.addAll(getMapping(td, metadata, baseuri)); |
<<<<<<<
_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-Aug-2017, tatu: Ideally would test handling of 3rd party types, too,
// but would require adding dependencies. This may be practical when
// checking done by module, but for now let's not do that for databind.
/*
public void testSpringTypes1737() throws Exception
{
_testTypes1737("org.springframework.aop.support.AbstractBeanFactoryPointcutAdvisor");
_testTypes1737("org.springframework.beans.factory.config.PropertyPathFactoryBean");
}
public void testC3P0Types1737() throws Exception
{
_testTypes1737("com.mchange.v2.c3p0.JndiRefForwardingDataSource");
_testTypes1737("com.mchange.v2.c3p0.WrapperConnectionPoolDataSource");
}
*/
private void _testTypes1737(Class<?> nasty) throws Exception {
_testTypes1737(nasty.getName());
}
private void _testTypes1737(String clsName) throws Exception
{
// While usually exploited via default typing let's not require
// it here; mechanism still the same
String json = aposToQuotes(
"{'v':['"+clsName+"','/tmp/foobar.txt']}"
);
try {
MAPPER.readValue(json, PolyWrapper.class);
fail("Should not pass");
} catch (JsonMappingException e) {
_verifySecurityException(e, clsName);
}
}
protected void _verifySecurityException(Throwable t, String clsName) throws Exception
{
// 17-Aug-2017, tatu: Expected type more granular in 2.9 (over 2.8)
_verifyException(t, JsonMappingException.class,
"Illegal type",
"to deserialize",
"prevented for security reasons");
verifyException(t, clsName);
}
protected void _verifyException(Throwable t, Class<?> expExcType,
String... patterns) throws Exception
{
Class<?> actExc = t.getClass();
if (!expExcType.isAssignableFrom(actExc)) {
fail("Expected Exception of type '"+expExcType.getName()+"', got '"
+actExc.getName()+"', message: "+t.getMessage());
}
for (String pattern : patterns) {
verifyException(t, pattern);
=======
_verifySecurityException(e, clsName);
}
}
// // // Tests for [databind#1737]
public void testJDKTypes1737() throws Exception
{
_testIllegalType(java.util.logging.FileHandler.class);
_testIllegalType(java.rmi.server.UnicastRemoteObject.class);
}
// // // Tests for [databind#1855]
public void testJDKTypes1855() throws Exception
{
// apparently included by JDK?
_testIllegalType("com.sun.org.apache.bcel.internal.util.ClassLoader");
}
// 17-Aug-2017, tatu: Ideally would test handling of 3rd party types, too,
// but would require adding dependencies. This may be practical when
// checking done by module, but for now let's not do that for databind.
/*
public void testSpringTypes1737() throws Exception
{
_testIllegalType("org.springframework.aop.support.AbstractBeanFactoryPointcutAdvisor");
_testIllegalType("org.springframework.beans.factory.config.PropertyPathFactoryBean");
}
public void testC3P0Types1737() throws Exception
{
_testIllegalType("com.mchange.v2.c3p0.JndiRefForwardingDataSource");
_testIllegalType("com.mchange.v2.c3p0.WrapperConnectionPoolDataSource");
}
*/
private void _testIllegalType(Class<?> nasty) throws Exception {
_testIllegalType(nasty.getName());
}
private void _testIllegalType(String clsName) throws Exception
{
// While usually exploited via default typing let's not require
// it here; mechanism still the same
String json = aposToQuotes(
"{'v':['"+clsName+"','/tmp/foobar.txt']}"
);
try {
MAPPER.readValue(json, PolyWrapper.class);
fail("Should not pass");
} catch (JsonMappingException e) {
_verifySecurityException(e, clsName);
}
}
protected void _verifySecurityException(Throwable t, String clsName) throws Exception
{
// 17-Aug-2017, tatu: Expected type more granular in 2.9 (over 2.8)
_verifyException(t, JsonMappingException.class,
"Illegal type",
"to deserialize",
"prevented for security reasons");
verifyException(t, clsName);
}
protected void _verifyException(Throwable t, Class<?> expExcType,
String... patterns) throws Exception
{
Class<?> actExc = t.getClass();
if (!expExcType.isAssignableFrom(actExc)) {
fail("Expected Exception of type '"+expExcType.getName()+"', got '"
+actExc.getName()+"', message: "+t.getMessage());
}
for (String pattern : patterns) {
verifyException(t, pattern);
>>>>>>>
_verifySecurityException(e, clsName);
}
}
// // // Tests for [databind#1737]
public void testJDKTypes1737() throws Exception
{
_testIllegalType(java.util.logging.FileHandler.class);
_testIllegalType(java.rmi.server.UnicastRemoteObject.class);
}
// // // Tests for [databind#1855]
public void testJDKTypes1855() throws Exception
{
// apparently included by JDK?
_testIllegalType("com.sun.org.apache.bcel.internal.util.ClassLoader");
}
// 17-Aug-2017, tatu: Ideally would test handling of 3rd party types, too,
// but would require adding dependencies. This may be practical when
// checking done by module, but for now let's not do that for databind.
/*
public void testSpringTypes1737() throws Exception
{
_testIllegalType("org.springframework.aop.support.AbstractBeanFactoryPointcutAdvisor");
_testIllegalType("org.springframework.beans.factory.config.PropertyPathFactoryBean");
}
public void testC3P0Types1737() throws Exception
{
_testTypes1737("com.mchange.v2.c3p0.JndiRefForwardingDataSource");
_testTypes1737("com.mchange.v2.c3p0.WrapperConnectionPoolDataSource");
}
*/
private void _testIllegalType(Class<?> nasty) throws Exception {
_testIllegalType(nasty.getName());
}
private void _testIllegalType(String clsName) throws Exception
{
// While usually exploited via default typing let's not require
// it here; mechanism still the same
String json = aposToQuotes(
"{'v':['"+clsName+"','/tmp/foobar.txt']}"
);
try {
MAPPER.readValue(json, PolyWrapper.class);
fail("Should not pass");
} catch (JsonMappingException e) {
_verifySecurityException(e, clsName);
}
}
protected void _verifySecurityException(Throwable t, String clsName) throws Exception
{
// 17-Aug-2017, tatu: Expected type more granular in 2.9 (over 2.8)
_verifyException(t, JsonMappingException.class,
"Illegal type",
"to deserialize",
"prevented for security reasons");
verifyException(t, clsName);
}
protected void _verifyException(Throwable t, Class<?> expExcType,
String... patterns) throws Exception
{
Class<?> actExc = t.getClass();
if (!expExcType.isAssignableFrom(actExc)) {
fail("Expected Exception of type '"+expExcType.getName()+"', got '"
+actExc.getName()+"', message: "+t.getMessage());
}
for (String pattern : patterns) {
verifyException(t, pattern); |
<<<<<<<
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.*;
>>>>>>>
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 it.unibz.krdb.sql.UniqueConstraint;
=======
import it.unibz.krdb.sql.api.Attribute;
import junit.framework.TestCase;
>>>>>>>
import it.unibz.krdb.sql.UniqueConstraint;
import junit.framework.TestCase;
<<<<<<<
import junit.framework.TestCase;
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.