mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-08 13:13:36 +08:00
Update gc to 3.3 (#1981)
* replace the deprecated api * update proto * delete music game * fixed codes * fix costume switch * fix mail bug * Bump version number. * Re-add max boss chest number Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+160
-154
@@ -18,6 +18,18 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
// @@protoc_insertion_point(interface_extends:SetWidgetSlotRsp)
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 material_id = 4;</code>
|
||||
* @return The materialId.
|
||||
*/
|
||||
int getMaterialId();
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>repeated .WidgetSlotTag tag_list = 15;</code>
|
||||
* @return A list containing the tagList.
|
||||
@@ -48,34 +60,25 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
int getTagListValue(int index);
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 6;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>uint32 material_id = 1;</code>
|
||||
* @return The materialId.
|
||||
*/
|
||||
int getMaterialId();
|
||||
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return The enum numeric value on the wire for op.
|
||||
*/
|
||||
int getOpValue();
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return The op.
|
||||
*/
|
||||
emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 4277
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 4261;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SetWidgetSlotRsp}
|
||||
@@ -127,20 +130,20 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
break;
|
||||
case 8: {
|
||||
|
||||
materialId_ = input.readUInt32();
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 32: {
|
||||
|
||||
materialId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 40: {
|
||||
int rawValue = input.readEnum();
|
||||
|
||||
op_ = rawValue;
|
||||
break;
|
||||
}
|
||||
case 48: {
|
||||
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
int rawValue = input.readEnum();
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
@@ -199,6 +202,28 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.class, emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.Builder.class);
|
||||
}
|
||||
|
||||
public static final int MATERIAL_ID_FIELD_NUMBER = 4;
|
||||
private int materialId_;
|
||||
/**
|
||||
* <code>uint32 material_id = 4;</code>
|
||||
* @return The materialId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getMaterialId() {
|
||||
return materialId_;
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 1;
|
||||
private int retcode_;
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getRetcode() {
|
||||
return retcode_;
|
||||
}
|
||||
|
||||
public static final int TAG_LIST_FIELD_NUMBER = 15;
|
||||
private java.util.List<java.lang.Integer> tagList_;
|
||||
private static final com.google.protobuf.Internal.ListAdapter.Converter<
|
||||
@@ -257,39 +282,17 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
}
|
||||
private int tagListMemoizedSerializedSize;
|
||||
|
||||
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_;
|
||||
}
|
||||
|
||||
public static final int MATERIAL_ID_FIELD_NUMBER = 1;
|
||||
private int materialId_;
|
||||
/**
|
||||
* <code>uint32 material_id = 1;</code>
|
||||
* @return The materialId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getMaterialId() {
|
||||
return materialId_;
|
||||
}
|
||||
|
||||
public static final int OP_FIELD_NUMBER = 4;
|
||||
public static final int OP_FIELD_NUMBER = 5;
|
||||
private int op_;
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return The enum numeric value on the wire for op.
|
||||
*/
|
||||
@java.lang.Override public int getOpValue() {
|
||||
return op_;
|
||||
}
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return The op.
|
||||
*/
|
||||
@java.lang.Override public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
|
||||
@@ -313,14 +316,14 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(1, retcode_);
|
||||
}
|
||||
if (materialId_ != 0) {
|
||||
output.writeUInt32(1, materialId_);
|
||||
output.writeUInt32(4, materialId_);
|
||||
}
|
||||
if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
|
||||
output.writeEnum(4, op_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(6, retcode_);
|
||||
output.writeEnum(5, op_);
|
||||
}
|
||||
if (getTagListList().size() > 0) {
|
||||
output.writeUInt32NoTag(122);
|
||||
@@ -338,17 +341,17 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(1, retcode_);
|
||||
}
|
||||
if (materialId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(1, materialId_);
|
||||
.computeUInt32Size(4, materialId_);
|
||||
}
|
||||
if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(4, op_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(6, retcode_);
|
||||
.computeEnumSize(5, op_);
|
||||
}
|
||||
{
|
||||
int dataSize = 0;
|
||||
@@ -377,11 +380,11 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp other = (emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp) obj;
|
||||
|
||||
if (!tagList_.equals(other.tagList_)) return false;
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) return false;
|
||||
if (getMaterialId()
|
||||
!= other.getMaterialId()) return false;
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) return false;
|
||||
if (!tagList_.equals(other.tagList_)) return false;
|
||||
if (op_ != other.op_) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
@@ -394,14 +397,14 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getMaterialId();
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
if (getTagListCount() > 0) {
|
||||
hash = (37 * hash) + TAG_LIST_FIELD_NUMBER;
|
||||
hash = (53 * hash) + tagList_.hashCode();
|
||||
}
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getMaterialId();
|
||||
hash = (37 * hash) + OP_FIELD_NUMBER;
|
||||
hash = (53 * hash) + op_;
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -501,10 +504,13 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 4277
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 4261;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SetWidgetSlotRsp}
|
||||
@@ -544,12 +550,12 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
tagList_ = java.util.Collections.emptyList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
retcode_ = 0;
|
||||
|
||||
materialId_ = 0;
|
||||
|
||||
retcode_ = 0;
|
||||
|
||||
tagList_ = java.util.Collections.emptyList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
op_ = 0;
|
||||
|
||||
return this;
|
||||
@@ -579,13 +585,13 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
public emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp buildPartial() {
|
||||
emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp result = new emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp(this);
|
||||
int from_bitField0_ = bitField0_;
|
||||
result.materialId_ = materialId_;
|
||||
result.retcode_ = retcode_;
|
||||
if (((bitField0_ & 0x00000001) != 0)) {
|
||||
tagList_ = java.util.Collections.unmodifiableList(tagList_);
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
}
|
||||
result.tagList_ = tagList_;
|
||||
result.retcode_ = retcode_;
|
||||
result.materialId_ = materialId_;
|
||||
result.op_ = op_;
|
||||
onBuilt();
|
||||
return result;
|
||||
@@ -635,6 +641,12 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp other) {
|
||||
if (other == emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.getDefaultInstance()) return this;
|
||||
if (other.getMaterialId() != 0) {
|
||||
setMaterialId(other.getMaterialId());
|
||||
}
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
if (!other.tagList_.isEmpty()) {
|
||||
if (tagList_.isEmpty()) {
|
||||
tagList_ = other.tagList_;
|
||||
@@ -645,12 +657,6 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
}
|
||||
onChanged();
|
||||
}
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
if (other.getMaterialId() != 0) {
|
||||
setMaterialId(other.getMaterialId());
|
||||
}
|
||||
if (other.op_ != 0) {
|
||||
setOpValue(other.getOpValue());
|
||||
}
|
||||
@@ -684,6 +690,68 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
}
|
||||
private int bitField0_;
|
||||
|
||||
private int materialId_ ;
|
||||
/**
|
||||
* <code>uint32 material_id = 4;</code>
|
||||
* @return The materialId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getMaterialId() {
|
||||
return materialId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 material_id = 4;</code>
|
||||
* @param value The materialId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setMaterialId(int value) {
|
||||
|
||||
materialId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 material_id = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearMaterialId() {
|
||||
|
||||
materialId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 1;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getRetcode() {
|
||||
return retcode_;
|
||||
}
|
||||
/**
|
||||
* <code>int32 retcode = 1;</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 = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearRetcode() {
|
||||
|
||||
retcode_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private java.util.List<java.lang.Integer> tagList_ =
|
||||
java.util.Collections.emptyList();
|
||||
private void ensureTagListIsMutable() {
|
||||
@@ -824,78 +892,16 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
private int materialId_ ;
|
||||
/**
|
||||
* <code>uint32 material_id = 1;</code>
|
||||
* @return The materialId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getMaterialId() {
|
||||
return materialId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 material_id = 1;</code>
|
||||
* @param value The materialId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setMaterialId(int value) {
|
||||
|
||||
materialId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 material_id = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearMaterialId() {
|
||||
|
||||
materialId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int op_ = 0;
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return The enum numeric value on the wire for op.
|
||||
*/
|
||||
@java.lang.Override public int getOpValue() {
|
||||
return op_;
|
||||
}
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @param value The enum numeric value on the wire for op to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -906,7 +912,7 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return The op.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -916,7 +922,7 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
|
||||
}
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @param value The op to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -930,7 +936,7 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.WidgetSlotOp op = 4;</code>
|
||||
* <code>.WidgetSlotOp op = 5;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearOp() {
|
||||
@@ -1008,9 +1014,9 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026SetWidgetSlotRsp.proto\032\022WidgetSlotOp.p" +
|
||||
"roto\032\023WidgetSlotTag.proto\"u\n\020SetWidgetSl" +
|
||||
"otRsp\022 \n\010tag_list\030\017 \003(\0162\016.WidgetSlotTag\022" +
|
||||
"\017\n\007retcode\030\006 \001(\005\022\023\n\013material_id\030\001 \001(\r\022\031\n" +
|
||||
"\002op\030\004 \001(\0162\r.WidgetSlotOpB\033\n\031emu.grasscut" +
|
||||
"otRsp\022\023\n\013material_id\030\004 \001(\r\022\017\n\007retcode\030\001 " +
|
||||
"\001(\005\022 \n\010tag_list\030\017 \003(\0162\016.WidgetSlotTag\022\031\n" +
|
||||
"\002op\030\005 \001(\0162\r.WidgetSlotOpB\033\n\031emu.grasscut" +
|
||||
"ter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -1024,7 +1030,7 @@ public final class SetWidgetSlotRspOuterClass {
|
||||
internal_static_SetWidgetSlotRsp_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_SetWidgetSlotRsp_descriptor,
|
||||
new java.lang.String[] { "TagList", "Retcode", "MaterialId", "Op", });
|
||||
new java.lang.String[] { "MaterialId", "Retcode", "TagList", "Op", });
|
||||
emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user