Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:01:21 +08:00
Code Issues Projects Releases Wiki Activity

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityReqOuterClass.java
+181 -181
View File
@@ -19,42 +19,42 @@ public final class QuestCreateEntityReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.CreateEntityInfo entity = 2;</code>
* @return Whether the entity field is set.
* <code>bool is_rewind = 12;</code>
* @return The isRewind.
*/
boolean hasEntity();
/**
* <code>.CreateEntityInfo entity = 2;</code>
* @return The entity.
*/
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity();
/**
* <code>.CreateEntityInfo entity = 2;</code>
*/
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder();
boolean getIsRewind();
/**
* <code>uint32 quest_id = 5;</code>
* <code>uint32 quest_id = 15;</code>
* @return The questId.
*/
int getQuestId();
/**
* <code>uint32 parent_quest_id = 11;</code>
* <code>.CreateEntityInfo entity = 8;</code>
* @return Whether the entity field is set.
*/
boolean hasEntity();
/**
* <code>.CreateEntityInfo entity = 8;</code>
* @return The entity.
*/
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity();
/**
* <code>.CreateEntityInfo entity = 8;</code>
*/
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder();
/**
* <code>uint32 parent_quest_id = 2;</code>
* @return The parentQuestId.
*/
int getParentQuestId();
/**
* <code>bool is_rewind = 1;</code>
* @return The isRewind.
*/
boolean getIsRewind();
}
/**
* <pre>
* CmdId: 463
* Name: PAADNAFBNIB
* CmdId: 430
* Obf: BBJKMAIOOLD
* </pre>
*
* Protobuf type {@code QuestCreateEntityReq}
@@ -101,12 +101,12 @@ public final class QuestCreateEntityReqOuterClass {
case 0:
done = true;
break;
case 8: {
case 16: {
isRewind_ = input.readBool();
parentQuestId_ = input.readUInt32();
break;
}
case 18: {
case 66: {
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder subBuilder = null;
if (entity_ != null) {
subBuilder = entity_.toBuilder();
@@ -119,14 +119,14 @@ public final class QuestCreateEntityReqOuterClass {
break;
}
case 40: {
case 96: {
questId_ = input.readUInt32();
isRewind_ = input.readBool();
break;
}
case 88: {
case 120: {
parentQuestId_ = input.readUInt32();
questId_ = input.readUInt32();
break;
}
default: {
@@ -161,36 +161,21 @@ public final class QuestCreateEntityReqOuterClass {
emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq.class, emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq.Builder.class);
}
public static final int ENTITY_FIELD_NUMBER = 2;
private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
public static final int IS_REWIND_FIELD_NUMBER = 12;
private boolean isRewind_;
/**
* <code>.CreateEntityInfo entity = 2;</code>
* @return Whether the entity field is set.
* <code>bool is_rewind = 12;</code>
* @return The isRewind.
*/
@java.lang.Override
public boolean hasEntity() {
return entity_ != null;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* @return The entity.
*/
@java.lang.Override
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
return getEntity();
public boolean getIsRewind() {
return isRewind_;
}
public static final int QUEST_ID_FIELD_NUMBER = 5;
public static final int QUEST_ID_FIELD_NUMBER = 15;
private int questId_;
/**
* <code>uint32 quest_id = 5;</code>
* <code>uint32 quest_id = 15;</code>
* @return The questId.
*/
@java.lang.Override
@@ -198,10 +183,36 @@ public final class QuestCreateEntityReqOuterClass {
return questId_;
}
public static final int PARENT_QUEST_ID_FIELD_NUMBER = 11;
public static final int ENTITY_FIELD_NUMBER = 8;
private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
/**
* <code>.CreateEntityInfo entity = 8;</code>
* @return Whether the entity field is set.
*/
@java.lang.Override
public boolean hasEntity() {
return entity_ != null;
}
/**
* <code>.CreateEntityInfo entity = 8;</code>
* @return The entity.
*/
@java.lang.Override
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_;
}
/**
* <code>.CreateEntityInfo entity = 8;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
return getEntity();
}
public static final int PARENT_QUEST_ID_FIELD_NUMBER = 2;
private int parentQuestId_;
/**
* <code>uint32 parent_quest_id = 11;</code>
* <code>uint32 parent_quest_id = 2;</code>
* @return The parentQuestId.
*/
@java.lang.Override
@@ -209,17 +220,6 @@ public final class QuestCreateEntityReqOuterClass {
return parentQuestId_;
}
public static final int IS_REWIND_FIELD_NUMBER = 1;
private boolean isRewind_;
/**
* <code>bool is_rewind = 1;</code>
* @return The isRewind.
*/
@java.lang.Override
public boolean getIsRewind() {
return isRewind_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -234,17 +234,17 @@ public final class QuestCreateEntityReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (isRewind_ != false) {
output.writeBool(1, isRewind_);
if (parentQuestId_ != 0) {
output.writeUInt32(2, parentQuestId_);
}
if (entity_ != null) {
output.writeMessage(2, getEntity());
output.writeMessage(8, getEntity());
}
if (isRewind_ != false) {
output.writeBool(12, isRewind_);
}
if (questId_ != 0) {
output.writeUInt32(5, questId_);
}
if (parentQuestId_ != 0) {
output.writeUInt32(11, parentQuestId_);
output.writeUInt32(15, questId_);
}
unknownFields.writeTo(output);
}
@@ -255,21 +255,21 @@ public final class QuestCreateEntityReqOuterClass {
if (size != -1) return size;
size = 0;
if (isRewind_ != false) {
if (parentQuestId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(1, isRewind_);
.computeUInt32Size(2, parentQuestId_);
}
if (entity_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, getEntity());
.computeMessageSize(8, getEntity());
}
if (isRewind_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(12, isRewind_);
}
if (questId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, questId_);
}
if (parentQuestId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, parentQuestId_);
.computeUInt32Size(15, questId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -286,17 +286,17 @@ public final class QuestCreateEntityReqOuterClass {
}
emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq other = (emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq) obj;
if (getIsRewind()
!= other.getIsRewind()) return false;
if (getQuestId()
!= other.getQuestId()) return false;
if (hasEntity() != other.hasEntity()) return false;
if (hasEntity()) {
if (!getEntity()
.equals(other.getEntity())) return false;
}
if (getQuestId()
!= other.getQuestId()) return false;
if (getParentQuestId()
!= other.getParentQuestId()) return false;
if (getIsRewind()
!= other.getIsRewind()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -308,17 +308,17 @@ public final class QuestCreateEntityReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + IS_REWIND_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsRewind());
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
if (hasEntity()) {
hash = (37 * hash) + ENTITY_FIELD_NUMBER;
hash = (53 * hash) + getEntity().hashCode();
}
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestId();
hash = (37 * hash) + IS_REWIND_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsRewind());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -416,8 +416,8 @@ public final class QuestCreateEntityReqOuterClass {
}
/**
* <pre>
* CmdId: 463
* Name: PAADNAFBNIB
* CmdId: 430
* Obf: BBJKMAIOOLD
* </pre>
*
* Protobuf type {@code QuestCreateEntityReq}
@@ -457,18 +457,18 @@ public final class QuestCreateEntityReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isRewind_ = false;
questId_ = 0;
if (entityBuilder_ == null) {
entity_ = null;
} else {
entity_ = null;
entityBuilder_ = null;
}
questId_ = 0;
parentQuestId_ = 0;
isRewind_ = false;
return this;
}
@@ -495,14 +495,14 @@ public final class QuestCreateEntityReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq buildPartial() {
emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq result = new emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq(this);
result.isRewind_ = isRewind_;
result.questId_ = questId_;
if (entityBuilder_ == null) {
result.entity_ = entity_;
} else {
result.entity_ = entityBuilder_.build();
}
result.questId_ = questId_;
result.parentQuestId_ = parentQuestId_;
result.isRewind_ = isRewind_;
onBuilt();
return result;
}
@@ -551,18 +551,18 @@ public final class QuestCreateEntityReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq other) {
if (other == emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq.getDefaultInstance()) return this;
if (other.hasEntity()) {
mergeEntity(other.getEntity());
if (other.getIsRewind() != false) {
setIsRewind(other.getIsRewind());
}
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
}
if (other.hasEntity()) {
mergeEntity(other.getEntity());
}
if (other.getParentQuestId() != 0) {
setParentQuestId(other.getParentQuestId());
}
if (other.getIsRewind() != false) {
setIsRewind(other.getIsRewind());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -592,18 +592,80 @@ public final class QuestCreateEntityReqOuterClass {
return this;
}
private boolean isRewind_ ;
/**
* <code>bool is_rewind = 12;</code>
* @return The isRewind.
*/
@java.lang.Override
public boolean getIsRewind() {
return isRewind_;
}
/**
* <code>bool is_rewind = 12;</code>
* @param value The isRewind to set.
* @return This builder for chaining.
*/
public Builder setIsRewind(boolean value) {
isRewind_ = value;
onChanged();
return this;
}
/**
* <code>bool is_rewind = 12;</code>
* @return This builder for chaining.
*/
public Builder clearIsRewind() {
isRewind_ = false;
onChanged();
return this;
}
private int questId_ ;
/**
* <code>uint32 quest_id = 15;</code>
* @return The questId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
}
/**
* <code>uint32 quest_id = 15;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
public Builder setQuestId(int value) {
questId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 quest_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
questId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> entityBuilder_;
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
* @return Whether the entity field is set.
*/
public boolean hasEntity() {
return entityBuilder_ != null || entity_ != null;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
* @return The entity.
*/
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
@@ -614,7 +676,7 @@ public final class QuestCreateEntityReqOuterClass {
}
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) {
if (entityBuilder_ == null) {
@@ -630,7 +692,7 @@ public final class QuestCreateEntityReqOuterClass {
return this;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
public Builder setEntity(
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder builderForValue) {
@@ -644,7 +706,7 @@ public final class QuestCreateEntityReqOuterClass {
return this;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) {
if (entityBuilder_ == null) {
@@ -662,7 +724,7 @@ public final class QuestCreateEntityReqOuterClass {
return this;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
public Builder clearEntity() {
if (entityBuilder_ == null) {
@@ -676,7 +738,7 @@ public final class QuestCreateEntityReqOuterClass {
return this;
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder getEntityBuilder() {
@@ -684,7 +746,7 @@ public final class QuestCreateEntityReqOuterClass {
return getEntityFieldBuilder().getBuilder();
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
if (entityBuilder_ != null) {
@@ -695,7 +757,7 @@ public final class QuestCreateEntityReqOuterClass {
}
}
/**
* <code>.CreateEntityInfo entity = 2;</code>
* <code>.CreateEntityInfo entity = 8;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder>
@@ -711,40 +773,9 @@ public final class QuestCreateEntityReqOuterClass {
return entityBuilder_;
}
private int questId_ ;
/**
* <code>uint32 quest_id = 5;</code>
* @return The questId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
}
/**
* <code>uint32 quest_id = 5;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
public Builder setQuestId(int value) {
questId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 quest_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
questId_ = 0;
onChanged();
return this;
}
private int parentQuestId_ ;
/**
* <code>uint32 parent_quest_id = 11;</code>
* <code>uint32 parent_quest_id = 2;</code>
* @return The parentQuestId.
*/
@java.lang.Override
@@ -752,7 +783,7 @@ public final class QuestCreateEntityReqOuterClass {
return parentQuestId_;
}
/**
* <code>uint32 parent_quest_id = 11;</code>
* <code>uint32 parent_quest_id = 2;</code>
* @param value The parentQuestId to set.
* @return This builder for chaining.
*/
@@ -763,7 +794,7 @@ public final class QuestCreateEntityReqOuterClass {
return this;
}
/**
* <code>uint32 parent_quest_id = 11;</code>
* <code>uint32 parent_quest_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestId() {
@@ -772,37 +803,6 @@ public final class QuestCreateEntityReqOuterClass {
onChanged();
return this;
}
private boolean isRewind_ ;
/**
* <code>bool is_rewind = 1;</code>
* @return The isRewind.
*/
@java.lang.Override
public boolean getIsRewind() {
return isRewind_;
}
/**
* <code>bool is_rewind = 1;</code>
* @param value The isRewind to set.
* @return This builder for chaining.
*/
public Builder setIsRewind(boolean value) {
isRewind_ = value;
onChanged();
return this;
}
/**
* <code>bool is_rewind = 1;</code>
* @return This builder for chaining.
*/
public Builder clearIsRewind() {
isRewind_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -871,10 +871,10 @@ public final class QuestCreateEntityReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032QuestCreateEntityReq.proto\032\026CreateEnti" +
"tyInfo.proto\"w\n\024QuestCreateEntityReq\022!\n\006" +
"entity\030\002 \001(\0132\021.CreateEntityInfo\022\020\n\010quest" +
"_id\030\005 \001(\r\022\027\n\017parent_quest_id\030\013 \001(\r\022\021\n\tis" +
"_rewind\030\001 \001(\010B\033\n\031emu.grasscutter.net.pro" +
"tyInfo.proto\"w\n\024QuestCreateEntityReq\022\021\n\t" +
"is_rewind\030\014 \001(\010\022\020\n\010quest_id\030\017 \001(\r\022!\n\006ent" +
"ity\030\010 \001(\0132\021.CreateEntityInfo\022\027\n\017parent_q" +
"uest_id\030\002 \001(\rB\033\n\031emu.grasscutter.net.pro" +
"tob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -887,7 +887,7 @@ public final class QuestCreateEntityReqOuterClass {
internal_static_QuestCreateEntityReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_QuestCreateEntityReq_descriptor,
new java.lang.String[] { "Entity", "QuestId", "ParentQuestId", "IsRewind", });
new java.lang.String[] { "IsRewind", "QuestId", "Entity", "ParentQuestId", });
emu.grasscutter.net.proto.CreateEntityInfoOuterClass.getDescriptor();
}