Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 07:33:33 +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/MichiaeMatsuriChestPositionInfoOuterClass.java
+101 -101
View File
@@ -19,35 +19,35 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 config_id = 15;</code>
* @return The configId.
* <code>uint32 group_id = 2;</code>
* @return The groupId.
*/
int getConfigId();
int getGroupId();
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
* @return Whether the pos field is set.
*/
boolean hasPos();
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
* @return The pos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
/**
* <code>uint32 group_id = 11;</code>
* @return The groupId.
* <code>uint32 config_id = 5;</code>
* @return The configId.
*/
int getGroupId();
int getConfigId();
}
/**
* <pre>
* Name: MAJFAAEEPGI
* Obf: NGFDAJNNCKL
* </pre>
*
* Protobuf type {@code MichiaeMatsuriChestPositionInfo}
@@ -94,7 +94,17 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
case 0:
done = true;
break;
case 66: {
case 16: {
groupId_ = input.readUInt32();
break;
}
case 40: {
configId_ = input.readUInt32();
break;
}
case 90: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (pos_ != null) {
subBuilder = pos_.toBuilder();
@@ -107,16 +117,6 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
break;
}
case 88: {
groupId_ = input.readUInt32();
break;
}
case 120: {
configId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,21 +149,21 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo.class, emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo.Builder.class);
}
public static final int CONFIG_ID_FIELD_NUMBER = 15;
private int configId_;
public static final int GROUP_ID_FIELD_NUMBER = 2;
private int groupId_;
/**
* <code>uint32 config_id = 15;</code>
* @return The configId.
* <code>uint32 group_id = 2;</code>
* @return The groupId.
*/
@java.lang.Override
public int getConfigId() {
return configId_;
public int getGroupId() {
return groupId_;
}
public static final int POS_FIELD_NUMBER = 8;
public static final int POS_FIELD_NUMBER = 11;
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
* @return Whether the pos field is set.
*/
@java.lang.Override
@@ -171,7 +171,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return pos_ != null;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
* @return The pos.
*/
@java.lang.Override
@@ -179,22 +179,22 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
return getPos();
}
public static final int GROUP_ID_FIELD_NUMBER = 11;
private int groupId_;
public static final int CONFIG_ID_FIELD_NUMBER = 5;
private int configId_;
/**
* <code>uint32 group_id = 11;</code>
* @return The groupId.
* <code>uint32 config_id = 5;</code>
* @return The configId.
*/
@java.lang.Override
public int getGroupId() {
return groupId_;
public int getConfigId() {
return configId_;
}
private byte memoizedIsInitialized = -1;
@@ -211,14 +211,14 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (pos_ != null) {
output.writeMessage(8, getPos());
}
if (groupId_ != 0) {
output.writeUInt32(11, groupId_);
output.writeUInt32(2, groupId_);
}
if (configId_ != 0) {
output.writeUInt32(15, configId_);
output.writeUInt32(5, configId_);
}
if (pos_ != null) {
output.writeMessage(11, getPos());
}
unknownFields.writeTo(output);
}
@@ -229,17 +229,17 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
if (size != -1) return size;
size = 0;
if (pos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, getPos());
}
if (groupId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, groupId_);
.computeUInt32Size(2, groupId_);
}
if (configId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, configId_);
.computeUInt32Size(5, configId_);
}
if (pos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, getPos());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -256,15 +256,15 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
}
emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo other = (emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo) obj;
if (getConfigId()
!= other.getConfigId()) return false;
if (getGroupId()
!= other.getGroupId()) return false;
if (hasPos() != other.hasPos()) return false;
if (hasPos()) {
if (!getPos()
.equals(other.getPos())) return false;
}
if (getGroupId()
!= other.getGroupId()) return false;
if (getConfigId()
!= other.getConfigId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -276,14 +276,14 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
hash = (53 * hash) + getConfigId();
hash = (37 * hash) + GROUP_ID_FIELD_NUMBER;
hash = (53 * hash) + getGroupId();
if (hasPos()) {
hash = (37 * hash) + POS_FIELD_NUMBER;
hash = (53 * hash) + getPos().hashCode();
}
hash = (37 * hash) + GROUP_ID_FIELD_NUMBER;
hash = (53 * hash) + getGroupId();
hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
hash = (53 * hash) + getConfigId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -381,7 +381,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
}
/**
* <pre>
* Name: MAJFAAEEPGI
* Obf: NGFDAJNNCKL
* </pre>
*
* Protobuf type {@code MichiaeMatsuriChestPositionInfo}
@@ -421,7 +421,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
configId_ = 0;
groupId_ = 0;
if (posBuilder_ == null) {
pos_ = null;
@@ -429,7 +429,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
pos_ = null;
posBuilder_ = null;
}
groupId_ = 0;
configId_ = 0;
return this;
}
@@ -457,13 +457,13 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo buildPartial() {
emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo result = new emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo(this);
result.configId_ = configId_;
result.groupId_ = groupId_;
if (posBuilder_ == null) {
result.pos_ = pos_;
} else {
result.pos_ = posBuilder_.build();
}
result.groupId_ = groupId_;
result.configId_ = configId_;
onBuilt();
return result;
}
@@ -512,14 +512,14 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo other) {
if (other == emu.grasscutter.net.proto.MichiaeMatsuriChestPositionInfoOuterClass.MichiaeMatsuriChestPositionInfo.getDefaultInstance()) return this;
if (other.getConfigId() != 0) {
setConfigId(other.getConfigId());
if (other.getGroupId() != 0) {
setGroupId(other.getGroupId());
}
if (other.hasPos()) {
mergePos(other.getPos());
}
if (other.getGroupId() != 0) {
setGroupId(other.getGroupId());
if (other.getConfigId() != 0) {
setConfigId(other.getConfigId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -550,33 +550,33 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return this;
}
private int configId_ ;
private int groupId_ ;
/**
* <code>uint32 config_id = 15;</code>
* @return The configId.
* <code>uint32 group_id = 2;</code>
* @return The groupId.
*/
@java.lang.Override
public int getConfigId() {
return configId_;
public int getGroupId() {
return groupId_;
}
/**
* <code>uint32 config_id = 15;</code>
* @param value The configId to set.
* <code>uint32 group_id = 2;</code>
* @param value The groupId to set.
* @return This builder for chaining.
*/
public Builder setConfigId(int value) {
public Builder setGroupId(int value) {
configId_ = value;
groupId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 config_id = 15;</code>
* <code>uint32 group_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearConfigId() {
public Builder clearGroupId() {
configId_ = 0;
groupId_ = 0;
onChanged();
return this;
}
@@ -585,14 +585,14 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
* @return Whether the pos field is set.
*/
public boolean hasPos() {
return posBuilder_ != null || pos_ != null;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
* @return The pos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -603,7 +603,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
}
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
@@ -619,7 +619,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return this;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
public Builder setPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -633,7 +633,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return this;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
@@ -651,7 +651,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return this;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
public Builder clearPos() {
if (posBuilder_ == null) {
@@ -665,7 +665,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return this;
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
@@ -673,7 +673,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return getPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
if (posBuilder_ != null) {
@@ -684,7 +684,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
}
}
/**
* <code>.Vector pos = 8;</code>
* <code>.Vector pos = 11;</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>
@@ -700,33 +700,33 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
return posBuilder_;
}
private int groupId_ ;
private int configId_ ;
/**
* <code>uint32 group_id = 11;</code>
* @return The groupId.
* <code>uint32 config_id = 5;</code>
* @return The configId.
*/
@java.lang.Override
public int getGroupId() {
return groupId_;
public int getConfigId() {
return configId_;
}
/**
* <code>uint32 group_id = 11;</code>
* @param value The groupId to set.
* <code>uint32 config_id = 5;</code>
* @param value The configId to set.
* @return This builder for chaining.
*/
public Builder setGroupId(int value) {
public Builder setConfigId(int value) {
groupId_ = value;
configId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 group_id = 11;</code>
* <code>uint32 config_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearGroupId() {
public Builder clearConfigId() {
groupId_ = 0;
configId_ = 0;
onChanged();
return this;
}
@@ -799,8 +799,8 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
java.lang.String[] descriptorData = {
"\n%MichiaeMatsuriChestPositionInfo.proto\032" +
"\014Vector.proto\"\\\n\037MichiaeMatsuriChestPosi" +
"tionInfo\022\021\n\tconfig_id\030\017 \001(\r\022\024\n\003pos\030\010 \001(\013" +
"2\007.Vector\022\020\n\010group_id\030\013 \001(\rB\033\n\031emu.grass" +
"tionInfo\022\020\n\010group_id\030\002 \001(\r\022\024\n\003pos\030\013 \001(\0132" +
"\007.Vector\022\021\n\tconfig_id\030\005 \001(\rB\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -813,7 +813,7 @@ public final class MichiaeMatsuriChestPositionInfoOuterClass {
internal_static_MichiaeMatsuriChestPositionInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_MichiaeMatsuriChestPositionInfo_descriptor,
new java.lang.String[] { "ConfigId", "Pos", "GroupId", });
new java.lang.String[] { "GroupId", "Pos", "ConfigId", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}