Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-27 06:09: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/DestroyMaterialRspOuterClass.java
+82 -82
View File
@@ -19,34 +19,34 @@ public final class DestroyMaterialRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return A list containing the itemIdList.
*/
java.util.List<java.lang.Integer> getItemIdListList();
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return The count of itemIdList.
*/
int getItemIdListCount();
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
int getItemIdList(int index);
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return A list containing the itemCountList.
*/
java.util.List<java.lang.Integer> getItemCountListList();
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return The count of itemCountList.
*/
int getItemCountListCount();
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @param index The index of the element to return.
* @return The itemCountList at the given index.
*/
@@ -60,8 +60,8 @@ public final class DestroyMaterialRspOuterClass {
}
/**
* <pre>
* CmdId: 669
* Name: DCKDKJNEPCN
* CmdId: 670
* Obf: IGGKOFLKOID
* </pre>
*
* Protobuf type {@code DestroyMaterialRsp}
@@ -111,28 +111,7 @@ public final class DestroyMaterialRspOuterClass {
case 0:
done = true;
break;
case 24: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
}
itemIdList_.addInt(input.readUInt32());
break;
}
case 26: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
}
while (input.getBytesUntilLimit() > 0) {
itemIdList_.addInt(input.readUInt32());
}
input.popLimit(limit);
break;
}
case 56: {
case 40: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
itemCountList_ = newIntList();
mutable_bitField0_ |= 0x00000002;
@@ -140,7 +119,7 @@ public final class DestroyMaterialRspOuterClass {
itemCountList_.addInt(input.readUInt32());
break;
}
case 58: {
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -153,6 +132,27 @@ public final class DestroyMaterialRspOuterClass {
input.popLimit(limit);
break;
}
case 48: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
}
itemIdList_.addInt(input.readUInt32());
break;
}
case 50: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
}
while (input.getBytesUntilLimit() > 0) {
itemIdList_.addInt(input.readUInt32());
}
input.popLimit(limit);
break;
}
case 112: {
retcode_ = input.readInt32();
@@ -173,12 +173,12 @@ public final class DestroyMaterialRspOuterClass {
throw new com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_.makeImmutable(); // C
}
if (((mutable_bitField0_ & 0x00000002) != 0)) {
itemCountList_.makeImmutable(); // C
}
if (((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_.makeImmutable(); // C
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@@ -196,10 +196,10 @@ public final class DestroyMaterialRspOuterClass {
emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.class, emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.Builder.class);
}
public static final int ITEM_ID_LIST_FIELD_NUMBER = 3;
public static final int ITEM_ID_LIST_FIELD_NUMBER = 6;
private com.google.protobuf.Internal.IntList itemIdList_;
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return A list containing the itemIdList.
*/
@java.lang.Override
@@ -208,14 +208,14 @@ public final class DestroyMaterialRspOuterClass {
return itemIdList_;
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -224,10 +224,10 @@ public final class DestroyMaterialRspOuterClass {
}
private int itemIdListMemoizedSerializedSize = -1;
public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 7;
public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 5;
private com.google.protobuf.Internal.IntList itemCountList_;
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return A list containing the itemCountList.
*/
@java.lang.Override
@@ -236,14 +236,14 @@ public final class DestroyMaterialRspOuterClass {
return itemCountList_;
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return The count of itemCountList.
*/
public int getItemCountListCount() {
return itemCountList_.size();
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @param index The index of the element to return.
* @return The itemCountList at the given index.
*/
@@ -278,20 +278,20 @@ public final class DestroyMaterialRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (getItemIdListList().size() > 0) {
output.writeUInt32NoTag(26);
output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
}
for (int i = 0; i < itemIdList_.size(); i++) {
output.writeUInt32NoTag(itemIdList_.getInt(i));
}
if (getItemCountListList().size() > 0) {
output.writeUInt32NoTag(58);
output.writeUInt32NoTag(42);
output.writeUInt32NoTag(itemCountListMemoizedSerializedSize);
}
for (int i = 0; i < itemCountList_.size(); i++) {
output.writeUInt32NoTag(itemCountList_.getInt(i));
}
if (getItemIdListList().size() > 0) {
output.writeUInt32NoTag(50);
output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
}
for (int i = 0; i < itemIdList_.size(); i++) {
output.writeUInt32NoTag(itemIdList_.getInt(i));
}
if (retcode_ != 0) {
output.writeInt32(14, retcode_);
}
@@ -304,20 +304,6 @@ public final class DestroyMaterialRspOuterClass {
if (size != -1) return size;
size = 0;
{
int dataSize = 0;
for (int i = 0; i < itemIdList_.size(); i++) {
dataSize += com.google.protobuf.CodedOutputStream
.computeUInt32SizeNoTag(itemIdList_.getInt(i));
}
size += dataSize;
if (!getItemIdListList().isEmpty()) {
size += 1;
size += com.google.protobuf.CodedOutputStream
.computeInt32SizeNoTag(dataSize);
}
itemIdListMemoizedSerializedSize = dataSize;
}
{
int dataSize = 0;
for (int i = 0; i < itemCountList_.size(); i++) {
@@ -332,6 +318,20 @@ public final class DestroyMaterialRspOuterClass {
}
itemCountListMemoizedSerializedSize = dataSize;
}
{
int dataSize = 0;
for (int i = 0; i < itemIdList_.size(); i++) {
dataSize += com.google.protobuf.CodedOutputStream
.computeUInt32SizeNoTag(itemIdList_.getInt(i));
}
size += dataSize;
if (!getItemIdListList().isEmpty()) {
size += 1;
size += com.google.protobuf.CodedOutputStream
.computeInt32SizeNoTag(dataSize);
}
itemIdListMemoizedSerializedSize = dataSize;
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(14, retcode_);
@@ -475,8 +475,8 @@ public final class DestroyMaterialRspOuterClass {
}
/**
* <pre>
* CmdId: 669
* Name: DCKDKJNEPCN
* CmdId: 670
* Obf: IGGKOFLKOID
* </pre>
*
* Protobuf type {@code DestroyMaterialRsp}
@@ -669,7 +669,7 @@ public final class DestroyMaterialRspOuterClass {
}
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return A list containing the itemIdList.
*/
public java.util.List<java.lang.Integer>
@@ -678,14 +678,14 @@ public final class DestroyMaterialRspOuterClass {
java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -693,7 +693,7 @@ public final class DestroyMaterialRspOuterClass {
return itemIdList_.getInt(index);
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @param index The index to set the value at.
* @param value The itemIdList to set.
* @return This builder for chaining.
@@ -706,7 +706,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @param value The itemIdList to add.
* @return This builder for chaining.
*/
@@ -717,7 +717,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @param values The itemIdList to add.
* @return This builder for chaining.
*/
@@ -730,7 +730,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 item_id_list = 3;</code>
* <code>repeated uint32 item_id_list = 6;</code>
* @return This builder for chaining.
*/
public Builder clearItemIdList() {
@@ -748,7 +748,7 @@ public final class DestroyMaterialRspOuterClass {
}
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return A list containing the itemCountList.
*/
public java.util.List<java.lang.Integer>
@@ -757,14 +757,14 @@ public final class DestroyMaterialRspOuterClass {
java.util.Collections.unmodifiableList(itemCountList_) : itemCountList_;
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return The count of itemCountList.
*/
public int getItemCountListCount() {
return itemCountList_.size();
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @param index The index of the element to return.
* @return The itemCountList at the given index.
*/
@@ -772,7 +772,7 @@ public final class DestroyMaterialRspOuterClass {
return itemCountList_.getInt(index);
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @param index The index to set the value at.
* @param value The itemCountList to set.
* @return This builder for chaining.
@@ -785,7 +785,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @param value The itemCountList to add.
* @return This builder for chaining.
*/
@@ -796,7 +796,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @param values The itemCountList to add.
* @return This builder for chaining.
*/
@@ -809,7 +809,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 item_count_list = 7;</code>
* <code>repeated uint32 item_count_list = 5;</code>
* @return This builder for chaining.
*/
public Builder clearItemCountList() {
@@ -917,8 +917,8 @@ public final class DestroyMaterialRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030DestroyMaterialRsp.proto\"T\n\022DestroyMat" +
"erialRsp\022\024\n\014item_id_list\030\003 \003(\r\022\027\n\017item_c" +
"ount_list\030\007 \003(\r\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu." +
"erialRsp\022\024\n\014item_id_list\030\006 \003(\r\022\027\n\017item_c" +
"ount_list\030\005 \003(\r\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor