Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 21:29:51 +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/HitTreeNotifyOuterClass.java
+116 -116
View File
@@ -19,45 +19,45 @@ public final class HitTreeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.Vector tree_pos = 12;</code>
* <code>uint32 tree_type = 6;</code>
* @return The treeType.
*/
int getTreeType();
/**
* <code>.Vector tree_pos = 14;</code>
* @return Whether the treePos field is set.
*/
boolean hasTreePos();
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
* @return The treePos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos();
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder();
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
* @return Whether the dropPos field is set.
*/
boolean hasDropPos();
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
* @return The dropPos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos();
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder();
/**
* <code>uint32 tree_type = 9;</code>
* @return The treeType.
*/
int getTreeType();
}
/**
* <pre>
* CmdId: 3035
* Name: DMADALIOKGO
* CmdId: 3420
* Obf: LDBJKFHJNKH
* </pre>
*
* Protobuf type {@code HitTreeNotify}
@@ -104,7 +104,12 @@ public final class HitTreeNotifyOuterClass {
case 0:
done = true;
break;
case 10: {
case 48: {
treeType_ = input.readUInt32();
break;
}
case 82: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (dropPos_ != null) {
subBuilder = dropPos_.toBuilder();
@@ -117,12 +122,7 @@ public final class HitTreeNotifyOuterClass {
break;
}
case 72: {
treeType_ = input.readUInt32();
break;
}
case 98: {
case 114: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (treePos_ != null) {
subBuilder = treePos_.toBuilder();
@@ -167,10 +167,21 @@ public final class HitTreeNotifyOuterClass {
emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.class, emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.Builder.class);
}
public static final int TREE_POS_FIELD_NUMBER = 12;
public static final int TREE_TYPE_FIELD_NUMBER = 6;
private int treeType_;
/**
* <code>uint32 tree_type = 6;</code>
* @return The treeType.
*/
@java.lang.Override
public int getTreeType() {
return treeType_;
}
public static final int TREE_POS_FIELD_NUMBER = 14;
private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
* @return Whether the treePos field is set.
*/
@java.lang.Override
@@ -178,7 +189,7 @@ public final class HitTreeNotifyOuterClass {
return treePos_ != null;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
* @return The treePos.
*/
@java.lang.Override
@@ -186,17 +197,17 @@ public final class HitTreeNotifyOuterClass {
return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
return getTreePos();
}
public static final int DROP_POS_FIELD_NUMBER = 1;
public static final int DROP_POS_FIELD_NUMBER = 10;
private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
* @return Whether the dropPos field is set.
*/
@java.lang.Override
@@ -204,7 +215,7 @@ public final class HitTreeNotifyOuterClass {
return dropPos_ != null;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
* @return The dropPos.
*/
@java.lang.Override
@@ -212,24 +223,13 @@ public final class HitTreeNotifyOuterClass {
return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
return getDropPos();
}
public static final int TREE_TYPE_FIELD_NUMBER = 9;
private int treeType_;
/**
* <code>uint32 tree_type = 9;</code>
* @return The treeType.
*/
@java.lang.Override
public int getTreeType() {
return treeType_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -244,14 +244,14 @@ public final class HitTreeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (dropPos_ != null) {
output.writeMessage(1, getDropPos());
}
if (treeType_ != 0) {
output.writeUInt32(9, treeType_);
output.writeUInt32(6, treeType_);
}
if (dropPos_ != null) {
output.writeMessage(10, getDropPos());
}
if (treePos_ != null) {
output.writeMessage(12, getTreePos());
output.writeMessage(14, getTreePos());
}
unknownFields.writeTo(output);
}
@@ -262,17 +262,17 @@ public final class HitTreeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (dropPos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, getDropPos());
}
if (treeType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, treeType_);
.computeUInt32Size(6, treeType_);
}
if (dropPos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, getDropPos());
}
if (treePos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, getTreePos());
.computeMessageSize(14, getTreePos());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -289,6 +289,8 @@ public final class HitTreeNotifyOuterClass {
}
emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other = (emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify) obj;
if (getTreeType()
!= other.getTreeType()) return false;
if (hasTreePos() != other.hasTreePos()) return false;
if (hasTreePos()) {
if (!getTreePos()
@@ -299,8 +301,6 @@ public final class HitTreeNotifyOuterClass {
if (!getDropPos()
.equals(other.getDropPos())) return false;
}
if (getTreeType()
!= other.getTreeType()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -312,6 +312,8 @@ public final class HitTreeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TREE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getTreeType();
if (hasTreePos()) {
hash = (37 * hash) + TREE_POS_FIELD_NUMBER;
hash = (53 * hash) + getTreePos().hashCode();
@@ -320,8 +322,6 @@ public final class HitTreeNotifyOuterClass {
hash = (37 * hash) + DROP_POS_FIELD_NUMBER;
hash = (53 * hash) + getDropPos().hashCode();
}
hash = (37 * hash) + TREE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getTreeType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -419,8 +419,8 @@ public final class HitTreeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 3035
* Name: DMADALIOKGO
* CmdId: 3420
* Obf: LDBJKFHJNKH
* </pre>
*
* Protobuf type {@code HitTreeNotify}
@@ -460,6 +460,8 @@ public final class HitTreeNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
treeType_ = 0;
if (treePosBuilder_ == null) {
treePos_ = null;
} else {
@@ -472,8 +474,6 @@ public final class HitTreeNotifyOuterClass {
dropPos_ = null;
dropPosBuilder_ = null;
}
treeType_ = 0;
return this;
}
@@ -500,6 +500,7 @@ public final class HitTreeNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify buildPartial() {
emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify result = new emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify(this);
result.treeType_ = treeType_;
if (treePosBuilder_ == null) {
result.treePos_ = treePos_;
} else {
@@ -510,7 +511,6 @@ public final class HitTreeNotifyOuterClass {
} else {
result.dropPos_ = dropPosBuilder_.build();
}
result.treeType_ = treeType_;
onBuilt();
return result;
}
@@ -559,15 +559,15 @@ public final class HitTreeNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other) {
if (other == emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.getDefaultInstance()) return this;
if (other.getTreeType() != 0) {
setTreeType(other.getTreeType());
}
if (other.hasTreePos()) {
mergeTreePos(other.getTreePos());
}
if (other.hasDropPos()) {
mergeDropPos(other.getDropPos());
}
if (other.getTreeType() != 0) {
setTreeType(other.getTreeType());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -597,18 +597,49 @@ public final class HitTreeNotifyOuterClass {
return this;
}
private int treeType_ ;
/**
* <code>uint32 tree_type = 6;</code>
* @return The treeType.
*/
@java.lang.Override
public int getTreeType() {
return treeType_;
}
/**
* <code>uint32 tree_type = 6;</code>
* @param value The treeType to set.
* @return This builder for chaining.
*/
public Builder setTreeType(int value) {
treeType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 tree_type = 6;</code>
* @return This builder for chaining.
*/
public Builder clearTreeType() {
treeType_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_;
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
* @return Whether the treePos field is set.
*/
public boolean hasTreePos() {
return treePosBuilder_ != null || treePos_ != null;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
* @return The treePos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
@@ -619,7 +650,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (treePosBuilder_ == null) {
@@ -635,7 +666,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
public Builder setTreePos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -649,7 +680,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (treePosBuilder_ == null) {
@@ -667,7 +698,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
public Builder clearTreePos() {
if (treePosBuilder_ == null) {
@@ -681,7 +712,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() {
@@ -689,7 +720,7 @@ public final class HitTreeNotifyOuterClass {
return getTreePosFieldBuilder().getBuilder();
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
if (treePosBuilder_ != null) {
@@ -700,7 +731,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector tree_pos = 12;</code>
* <code>.Vector tree_pos = 14;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -720,14 +751,14 @@ public final class HitTreeNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_;
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
* @return Whether the dropPos field is set.
*/
public boolean hasDropPos() {
return dropPosBuilder_ != null || dropPos_ != null;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
* @return The dropPos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() {
@@ -738,7 +769,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
public Builder setDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (dropPosBuilder_ == null) {
@@ -754,7 +785,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
public Builder setDropPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -768,7 +799,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
public Builder mergeDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (dropPosBuilder_ == null) {
@@ -786,7 +817,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
public Builder clearDropPos() {
if (dropPosBuilder_ == null) {
@@ -800,7 +831,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDropPosBuilder() {
@@ -808,7 +839,7 @@ public final class HitTreeNotifyOuterClass {
return getDropPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
if (dropPosBuilder_ != null) {
@@ -819,7 +850,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector drop_pos = 1;</code>
* <code>.Vector drop_pos = 10;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -834,37 +865,6 @@ public final class HitTreeNotifyOuterClass {
}
return dropPosBuilder_;
}
private int treeType_ ;
/**
* <code>uint32 tree_type = 9;</code>
* @return The treeType.
*/
@java.lang.Override
public int getTreeType() {
return treeType_;
}
/**
* <code>uint32 tree_type = 9;</code>
* @param value The treeType to set.
* @return This builder for chaining.
*/
public Builder setTreeType(int value) {
treeType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 tree_type = 9;</code>
* @return This builder for chaining.
*/
public Builder clearTreeType() {
treeType_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -933,9 +933,9 @@ public final class HitTreeNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\023HitTreeNotify.proto\032\014Vector.proto\"X\n\rH" +
"itTreeNotify\022\031\n\010tree_pos\030\014 \001(\0132\007.Vector\022" +
"\031\n\010drop_pos\030\001 \001(\0132\007.Vector\022\021\n\ttree_type\030" +
"\t \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
"itTreeNotify\022\021\n\ttree_type\030\006 \001(\r\022\031\n\010tree_" +
"pos\030\016 \001(\0132\007.Vector\022\031\n\010drop_pos\030\n \001(\0132\007.V" +
"ectorB\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -948,7 +948,7 @@ public final class HitTreeNotifyOuterClass {
internal_static_HitTreeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HitTreeNotify_descriptor,
new java.lang.String[] { "TreePos", "DropPos", "TreeType", });
new java.lang.String[] { "TreeType", "TreePos", "DropPos", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}