Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:54:14 +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/HomeFurnitureCustomSuiteDataOuterClass.java
+112 -112
View File
@@ -19,46 +19,46 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 guid = 6;</code>
* @return The guid.
*/
int getGuid();
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
* @return Whether the spawnPos field is set.
*/
boolean hasSpawnPos();
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
* @return The spawnPos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return A list containing the includedFurnitureIndexList.
*/
java.util.List<java.lang.Integer> getIncludedFurnitureIndexListList();
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return The count of includedFurnitureIndexList.
*/
int getIncludedFurnitureIndexListCount();
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @param index The index of the element to return.
* @return The includedFurnitureIndexList at the given index.
*/
int getIncludedFurnitureIndexList(int index);
/**
* <code>uint32 guid = 1;</code>
* @return The guid.
*/
int getGuid();
}
/**
* <pre>
* Name: LOBAFOGBMIA
* Obf: OHIFMEACCCK
* </pre>
*
* Protobuf type {@code HomeFurnitureCustomSuiteData}
@@ -107,7 +107,12 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
case 0:
done = true;
break;
case 10: {
case 8: {
guid_ = input.readUInt32();
break;
}
case 34: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (spawnPos_ != null) {
subBuilder = spawnPos_.toBuilder();
@@ -120,12 +125,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
break;
}
case 48: {
guid_ = input.readUInt32();
break;
}
case 88: {
case 104: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
includedFurnitureIndexList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -133,7 +133,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
includedFurnitureIndexList_.addInt(input.readInt32());
break;
}
case 90: {
case 106: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -181,21 +181,10 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.class, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder.class);
}
public static final int GUID_FIELD_NUMBER = 6;
private int guid_;
/**
* <code>uint32 guid = 6;</code>
* @return The guid.
*/
@java.lang.Override
public int getGuid() {
return guid_;
}
public static final int SPAWN_POS_FIELD_NUMBER = 1;
public static final int SPAWN_POS_FIELD_NUMBER = 4;
private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
* @return Whether the spawnPos field is set.
*/
@java.lang.Override
@@ -203,7 +192,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return spawnPos_ != null;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
* @return The spawnPos.
*/
@java.lang.Override
@@ -211,17 +200,17 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
return getSpawnPos();
}
public static final int INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER = 11;
public static final int INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER = 13;
private com.google.protobuf.Internal.IntList includedFurnitureIndexList_;
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return A list containing the includedFurnitureIndexList.
*/
@java.lang.Override
@@ -230,14 +219,14 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return includedFurnitureIndexList_;
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return The count of includedFurnitureIndexList.
*/
public int getIncludedFurnitureIndexListCount() {
return includedFurnitureIndexList_.size();
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @param index The index of the element to return.
* @return The includedFurnitureIndexList at the given index.
*/
@@ -246,6 +235,17 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
private int includedFurnitureIndexListMemoizedSerializedSize = -1;
public static final int GUID_FIELD_NUMBER = 1;
private int guid_;
/**
* <code>uint32 guid = 1;</code>
* @return The guid.
*/
@java.lang.Override
public int getGuid() {
return guid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -261,14 +261,14 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (spawnPos_ != null) {
output.writeMessage(1, getSpawnPos());
}
if (guid_ != 0) {
output.writeUInt32(6, guid_);
output.writeUInt32(1, guid_);
}
if (spawnPos_ != null) {
output.writeMessage(4, getSpawnPos());
}
if (getIncludedFurnitureIndexListList().size() > 0) {
output.writeUInt32NoTag(90);
output.writeUInt32NoTag(106);
output.writeUInt32NoTag(includedFurnitureIndexListMemoizedSerializedSize);
}
for (int i = 0; i < includedFurnitureIndexList_.size(); i++) {
@@ -283,13 +283,13 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
if (size != -1) return size;
size = 0;
if (spawnPos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, getSpawnPos());
}
if (guid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, guid_);
.computeUInt32Size(1, guid_);
}
if (spawnPos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getSpawnPos());
}
{
int dataSize = 0;
@@ -320,8 +320,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData other = (emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData) obj;
if (getGuid()
!= other.getGuid()) return false;
if (hasSpawnPos() != other.hasSpawnPos()) return false;
if (hasSpawnPos()) {
if (!getSpawnPos()
@@ -329,6 +327,8 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
if (!getIncludedFurnitureIndexListList()
.equals(other.getIncludedFurnitureIndexListList())) return false;
if (getGuid()
!= other.getGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -340,8 +340,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + GUID_FIELD_NUMBER;
hash = (53 * hash) + getGuid();
if (hasSpawnPos()) {
hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
hash = (53 * hash) + getSpawnPos().hashCode();
@@ -350,6 +348,8 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
hash = (37 * hash) + INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER;
hash = (53 * hash) + getIncludedFurnitureIndexListList().hashCode();
}
hash = (37 * hash) + GUID_FIELD_NUMBER;
hash = (53 * hash) + getGuid();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -447,7 +447,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
/**
* <pre>
* Name: LOBAFOGBMIA
* Obf: OHIFMEACCCK
* </pre>
*
* Protobuf type {@code HomeFurnitureCustomSuiteData}
@@ -487,8 +487,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
guid_ = 0;
if (spawnPosBuilder_ == null) {
spawnPos_ = null;
} else {
@@ -497,6 +495,8 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
includedFurnitureIndexList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
guid_ = 0;
return this;
}
@@ -524,7 +524,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData buildPartial() {
emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData result = new emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData(this);
int from_bitField0_ = bitField0_;
result.guid_ = guid_;
if (spawnPosBuilder_ == null) {
result.spawnPos_ = spawnPos_;
} else {
@@ -535,6 +534,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
bitField0_ = (bitField0_ & ~0x00000001);
}
result.includedFurnitureIndexList_ = includedFurnitureIndexList_;
result.guid_ = guid_;
onBuilt();
return result;
}
@@ -583,9 +583,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData other) {
if (other == emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.getDefaultInstance()) return this;
if (other.getGuid() != 0) {
setGuid(other.getGuid());
}
if (other.hasSpawnPos()) {
mergeSpawnPos(other.getSpawnPos());
}
@@ -599,6 +596,9 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
onChanged();
}
if (other.getGuid() != 0) {
setGuid(other.getGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -629,49 +629,18 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
private int bitField0_;
private int guid_ ;
/**
* <code>uint32 guid = 6;</code>
* @return The guid.
*/
@java.lang.Override
public int getGuid() {
return guid_;
}
/**
* <code>uint32 guid = 6;</code>
* @param value The guid to set.
* @return This builder for chaining.
*/
public Builder setGuid(int value) {
guid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 guid = 6;</code>
* @return This builder for chaining.
*/
public Builder clearGuid() {
guid_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnPosBuilder_;
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
* @return Whether the spawnPos field is set.
*/
public boolean hasSpawnPos() {
return spawnPosBuilder_ != null || spawnPos_ != null;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
* @return The spawnPos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
@@ -682,7 +651,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
public Builder setSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (spawnPosBuilder_ == null) {
@@ -698,7 +667,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
public Builder setSpawnPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -712,7 +681,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
public Builder mergeSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (spawnPosBuilder_ == null) {
@@ -730,7 +699,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
public Builder clearSpawnPos() {
if (spawnPosBuilder_ == null) {
@@ -744,7 +713,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnPosBuilder() {
@@ -752,7 +721,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return getSpawnPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
if (spawnPosBuilder_ != null) {
@@ -763,7 +732,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
}
/**
* <code>.Vector spawn_pos = 1;</code>
* <code>.Vector spawn_pos = 4;</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>
@@ -787,7 +756,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
}
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return A list containing the includedFurnitureIndexList.
*/
public java.util.List<java.lang.Integer>
@@ -796,14 +765,14 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
java.util.Collections.unmodifiableList(includedFurnitureIndexList_) : includedFurnitureIndexList_;
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return The count of includedFurnitureIndexList.
*/
public int getIncludedFurnitureIndexListCount() {
return includedFurnitureIndexList_.size();
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @param index The index of the element to return.
* @return The includedFurnitureIndexList at the given index.
*/
@@ -811,7 +780,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return includedFurnitureIndexList_.getInt(index);
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @param index The index to set the value at.
* @param value The includedFurnitureIndexList to set.
* @return This builder for chaining.
@@ -824,7 +793,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @param value The includedFurnitureIndexList to add.
* @return This builder for chaining.
*/
@@ -835,7 +804,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @param values The includedFurnitureIndexList to add.
* @return This builder for chaining.
*/
@@ -848,7 +817,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
return this;
}
/**
* <code>repeated int32 included_furniture_index_list = 11;</code>
* <code>repeated int32 included_furniture_index_list = 13;</code>
* @return This builder for chaining.
*/
public Builder clearIncludedFurnitureIndexList() {
@@ -857,6 +826,37 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
onChanged();
return this;
}
private int guid_ ;
/**
* <code>uint32 guid = 1;</code>
* @return The guid.
*/
@java.lang.Override
public int getGuid() {
return guid_;
}
/**
* <code>uint32 guid = 1;</code>
* @param value The guid to set.
* @return This builder for chaining.
*/
public Builder setGuid(int value) {
guid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 guid = 1;</code>
* @return This builder for chaining.
*/
public Builder clearGuid() {
guid_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -926,9 +926,9 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
java.lang.String[] descriptorData = {
"\n\"HomeFurnitureCustomSuiteData.proto\032\014Ve" +
"ctor.proto\"o\n\034HomeFurnitureCustomSuiteDa" +
"ta\022\014\n\004guid\030\006 \001(\r\022\032\n\tspawn_pos\030\001 \001(\0132\007.Ve" +
"ctor\022%\n\035included_furniture_index_list\030\013 " +
"\003(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
"ta\022\032\n\tspawn_pos\030\004 \001(\0132\007.Vector\022%\n\035includ" +
"ed_furniture_index_list\030\r \003(\005\022\014\n\004guid\030\001 " +
"\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -940,7 +940,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
internal_static_HomeFurnitureCustomSuiteData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeFurnitureCustomSuiteData_descriptor,
new java.lang.String[] { "Guid", "SpawnPos", "IncludedFurnitureIndexList", });
new java.lang.String[] { "SpawnPos", "IncludedFurnitureIndexList", "Guid", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}