Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 06:13:37 +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/WinterCampGetCanGiveFriendItemRspOuterClass.java
+109 -109
View File
@@ -19,39 +19,39 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>
getItemListList();
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index);
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
int getItemListCount();
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList();
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index);
/**
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 8328
* Name: IMMLFIOGPAJ
* CmdId: 8470
* Obf: HMJHEIFDELL
* </pre>
*
* Protobuf type {@code WinterCampGetCanGiveFriendItemRsp}
@@ -100,7 +100,12 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
case 0:
done = true;
break;
case 18: {
case 48: {
retcode_ = input.readInt32();
break;
}
case 74: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
mutable_bitField0_ |= 0x00000001;
@@ -109,11 +114,6 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
break;
}
case 88: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,28 +149,17 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp.class, emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 11;
private int retcode_;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int ITEM_LIST_FIELD_NUMBER = 2;
public static final int ITEM_LIST_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
return itemList_;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
@@ -178,21 +167,21 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return itemList_;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public int getItemListCount() {
return itemList_.size();
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
return itemList_.get(index);
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
@@ -200,6 +189,17 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return itemList_.get(index);
}
public static final int RETCODE_FIELD_NUMBER = 6;
private int retcode_;
/**
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -214,11 +214,11 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < itemList_.size(); i++) {
output.writeMessage(2, itemList_.get(i));
}
if (retcode_ != 0) {
output.writeInt32(11, retcode_);
output.writeInt32(6, retcode_);
}
for (int i = 0; i < itemList_.size(); i++) {
output.writeMessage(9, itemList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -229,13 +229,13 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
if (size != -1) return size;
size = 0;
for (int i = 0; i < itemList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, itemList_.get(i));
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, retcode_);
.computeInt32Size(6, retcode_);
}
for (int i = 0; i < itemList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, itemList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -252,10 +252,10 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp other = (emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (!getItemListList()
.equals(other.getItemListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -267,12 +267,12 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (getItemListCount() > 0) {
hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -370,8 +370,8 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
/**
* <pre>
* CmdId: 8328
* Name: IMMLFIOGPAJ
* CmdId: 8470
* Obf: HMJHEIFDELL
* </pre>
*
* Protobuf type {@code WinterCampGetCanGiveFriendItemRsp}
@@ -412,14 +412,14 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
if (itemListBuilder_ == null) {
itemList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
itemListBuilder_.clear();
}
retcode_ = 0;
return this;
}
@@ -447,7 +447,6 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
public emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp buildPartial() {
emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp result = new emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp(this);
int from_bitField0_ = bitField0_;
result.retcode_ = retcode_;
if (itemListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
itemList_ = java.util.Collections.unmodifiableList(itemList_);
@@ -457,6 +456,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
} else {
result.itemList_ = itemListBuilder_.build();
}
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -505,9 +505,6 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp other) {
if (other == emu.grasscutter.net.proto.WinterCampGetCanGiveFriendItemRspOuterClass.WinterCampGetCanGiveFriendItemRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (itemListBuilder_ == null) {
if (!other.itemList_.isEmpty()) {
if (itemList_.isEmpty()) {
@@ -534,6 +531,9 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
}
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -564,37 +564,6 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
private int bitField0_;
private int retcode_ ;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 11;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 11;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_ =
java.util.Collections.emptyList();
private void ensureItemListIsMutable() {
@@ -608,7 +577,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_;
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
if (itemListBuilder_ == null) {
@@ -618,7 +587,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public int getItemListCount() {
if (itemListBuilder_ == null) {
@@ -628,7 +597,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
if (itemListBuilder_ == null) {
@@ -638,7 +607,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -655,7 +624,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -669,7 +638,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
if (itemListBuilder_ == null) {
@@ -685,7 +654,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -702,7 +671,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -716,7 +685,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -730,7 +699,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder addAllItemList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -745,7 +714,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder clearItemList() {
if (itemListBuilder_ == null) {
@@ -758,7 +727,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public Builder removeItemList(int index) {
if (itemListBuilder_ == null) {
@@ -771,14 +740,14 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder(
int index) {
return getItemListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index) {
@@ -788,7 +757,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList() {
@@ -799,14 +768,14 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() {
return getItemListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder(
int index) {
@@ -814,7 +783,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam item_list = 2;</code>
* <code>repeated .ItemParam item_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder>
getItemListBuilderList() {
@@ -834,6 +803,37 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
}
return itemListBuilder_;
}
private int retcode_ ;
/**
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 6;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 6;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,8 +903,8 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
java.lang.String[] descriptorData = {
"\n\'WinterCampGetCanGiveFriendItemRsp.prot" +
"o\032\017ItemParam.proto\"S\n!WinterCampGetCanGi" +
"veFriendItemRsp\022\017\n\007retcode\030\013 \001(\005\022\035\n\titem" +
"_list\030\002 \003(\0132\n.ItemParamB\033\n\031emu.grasscutt" +
"veFriendItemRsp\022\035\n\titem_list\030\t \003(\0132\n.Ite" +
"mParam\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -917,7 +917,7 @@ public final class WinterCampGetCanGiveFriendItemRspOuterClass {
internal_static_WinterCampGetCanGiveFriendItemRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WinterCampGetCanGiveFriendItemRsp_descriptor,
new java.lang.String[] { "Retcode", "ItemList", });
new java.lang.String[] { "ItemList", "Retcode", });
emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
}