mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 06:31:18 +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
+105
-99
@@ -19,29 +19,32 @@ public final class ResinChangeNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 6;</code>
|
||||
* @return The nextAddTimestamp.
|
||||
*/
|
||||
int getNextAddTimestamp();
|
||||
|
||||
/**
|
||||
* <code>uint32 cur_buy_count = 4;</code>
|
||||
* <code>uint32 cur_buy_count = 11;</code>
|
||||
* @return The curBuyCount.
|
||||
*/
|
||||
int getCurBuyCount();
|
||||
|
||||
/**
|
||||
* <code>uint32 cur_value = 12;</code>
|
||||
* <code>uint32 next_add_timestamp = 13;</code>
|
||||
* @return The nextAddTimestamp.
|
||||
*/
|
||||
int getNextAddTimestamp();
|
||||
|
||||
/**
|
||||
* <code>uint32 cur_value = 10;</code>
|
||||
* @return The curValue.
|
||||
*/
|
||||
int getCurValue();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 642
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 611;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ResinChangeNotify}
|
||||
@@ -88,21 +91,21 @@ public final class ResinChangeNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 32: {
|
||||
case 80: {
|
||||
|
||||
curValue_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
|
||||
curBuyCount_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 48: {
|
||||
case 104: {
|
||||
|
||||
nextAddTimestamp_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
|
||||
curValue_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -135,21 +138,10 @@ public final class ResinChangeNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.class, emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.Builder.class);
|
||||
}
|
||||
|
||||
public static final int NEXT_ADD_TIMESTAMP_FIELD_NUMBER = 6;
|
||||
private int nextAddTimestamp_;
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 6;</code>
|
||||
* @return The nextAddTimestamp.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getNextAddTimestamp() {
|
||||
return nextAddTimestamp_;
|
||||
}
|
||||
|
||||
public static final int CUR_BUY_COUNT_FIELD_NUMBER = 4;
|
||||
public static final int CUR_BUY_COUNT_FIELD_NUMBER = 11;
|
||||
private int curBuyCount_;
|
||||
/**
|
||||
* <code>uint32 cur_buy_count = 4;</code>
|
||||
* <code>uint32 cur_buy_count = 11;</code>
|
||||
* @return The curBuyCount.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -157,10 +149,21 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return curBuyCount_;
|
||||
}
|
||||
|
||||
public static final int CUR_VALUE_FIELD_NUMBER = 12;
|
||||
public static final int NEXT_ADD_TIMESTAMP_FIELD_NUMBER = 13;
|
||||
private int nextAddTimestamp_;
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 13;</code>
|
||||
* @return The nextAddTimestamp.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getNextAddTimestamp() {
|
||||
return nextAddTimestamp_;
|
||||
}
|
||||
|
||||
public static final int CUR_VALUE_FIELD_NUMBER = 10;
|
||||
private int curValue_;
|
||||
/**
|
||||
* <code>uint32 cur_value = 12;</code>
|
||||
* <code>uint32 cur_value = 10;</code>
|
||||
* @return The curValue.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -182,14 +185,14 @@ public final class ResinChangeNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (curValue_ != 0) {
|
||||
output.writeUInt32(10, curValue_);
|
||||
}
|
||||
if (curBuyCount_ != 0) {
|
||||
output.writeUInt32(4, curBuyCount_);
|
||||
output.writeUInt32(11, curBuyCount_);
|
||||
}
|
||||
if (nextAddTimestamp_ != 0) {
|
||||
output.writeUInt32(6, nextAddTimestamp_);
|
||||
}
|
||||
if (curValue_ != 0) {
|
||||
output.writeUInt32(12, curValue_);
|
||||
output.writeUInt32(13, nextAddTimestamp_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -200,17 +203,17 @@ public final class ResinChangeNotifyOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (curValue_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(10, curValue_);
|
||||
}
|
||||
if (curBuyCount_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(4, curBuyCount_);
|
||||
.computeUInt32Size(11, curBuyCount_);
|
||||
}
|
||||
if (nextAddTimestamp_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(6, nextAddTimestamp_);
|
||||
}
|
||||
if (curValue_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(12, curValue_);
|
||||
.computeUInt32Size(13, nextAddTimestamp_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -227,10 +230,10 @@ public final class ResinChangeNotifyOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify other = (emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify) obj;
|
||||
|
||||
if (getNextAddTimestamp()
|
||||
!= other.getNextAddTimestamp()) return false;
|
||||
if (getCurBuyCount()
|
||||
!= other.getCurBuyCount()) return false;
|
||||
if (getNextAddTimestamp()
|
||||
!= other.getNextAddTimestamp()) return false;
|
||||
if (getCurValue()
|
||||
!= other.getCurValue()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
@@ -244,10 +247,10 @@ public final class ResinChangeNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + NEXT_ADD_TIMESTAMP_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getNextAddTimestamp();
|
||||
hash = (37 * hash) + CUR_BUY_COUNT_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getCurBuyCount();
|
||||
hash = (37 * hash) + NEXT_ADD_TIMESTAMP_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getNextAddTimestamp();
|
||||
hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getCurValue();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
@@ -347,10 +350,13 @@ public final class ResinChangeNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 642
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 611;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code ResinChangeNotify}
|
||||
@@ -390,10 +396,10 @@ public final class ResinChangeNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
nextAddTimestamp_ = 0;
|
||||
|
||||
curBuyCount_ = 0;
|
||||
|
||||
nextAddTimestamp_ = 0;
|
||||
|
||||
curValue_ = 0;
|
||||
|
||||
return this;
|
||||
@@ -422,8 +428,8 @@ public final class ResinChangeNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify buildPartial() {
|
||||
emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify result = new emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify(this);
|
||||
result.nextAddTimestamp_ = nextAddTimestamp_;
|
||||
result.curBuyCount_ = curBuyCount_;
|
||||
result.nextAddTimestamp_ = nextAddTimestamp_;
|
||||
result.curValue_ = curValue_;
|
||||
onBuilt();
|
||||
return result;
|
||||
@@ -473,12 +479,12 @@ public final class ResinChangeNotifyOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify other) {
|
||||
if (other == emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.getDefaultInstance()) return this;
|
||||
if (other.getNextAddTimestamp() != 0) {
|
||||
setNextAddTimestamp(other.getNextAddTimestamp());
|
||||
}
|
||||
if (other.getCurBuyCount() != 0) {
|
||||
setCurBuyCount(other.getCurBuyCount());
|
||||
}
|
||||
if (other.getNextAddTimestamp() != 0) {
|
||||
setNextAddTimestamp(other.getNextAddTimestamp());
|
||||
}
|
||||
if (other.getCurValue() != 0) {
|
||||
setCurValue(other.getCurValue());
|
||||
}
|
||||
@@ -511,40 +517,9 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int nextAddTimestamp_ ;
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 6;</code>
|
||||
* @return The nextAddTimestamp.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getNextAddTimestamp() {
|
||||
return nextAddTimestamp_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 6;</code>
|
||||
* @param value The nextAddTimestamp to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setNextAddTimestamp(int value) {
|
||||
|
||||
nextAddTimestamp_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 6;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearNextAddTimestamp() {
|
||||
|
||||
nextAddTimestamp_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int curBuyCount_ ;
|
||||
/**
|
||||
* <code>uint32 cur_buy_count = 4;</code>
|
||||
* <code>uint32 cur_buy_count = 11;</code>
|
||||
* @return The curBuyCount.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -552,7 +527,7 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return curBuyCount_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 cur_buy_count = 4;</code>
|
||||
* <code>uint32 cur_buy_count = 11;</code>
|
||||
* @param value The curBuyCount to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -563,7 +538,7 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 cur_buy_count = 4;</code>
|
||||
* <code>uint32 cur_buy_count = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearCurBuyCount() {
|
||||
@@ -573,9 +548,40 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int nextAddTimestamp_ ;
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 13;</code>
|
||||
* @return The nextAddTimestamp.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getNextAddTimestamp() {
|
||||
return nextAddTimestamp_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 13;</code>
|
||||
* @param value The nextAddTimestamp to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setNextAddTimestamp(int value) {
|
||||
|
||||
nextAddTimestamp_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 next_add_timestamp = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearNextAddTimestamp() {
|
||||
|
||||
nextAddTimestamp_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int curValue_ ;
|
||||
/**
|
||||
* <code>uint32 cur_value = 12;</code>
|
||||
* <code>uint32 cur_value = 10;</code>
|
||||
* @return The curValue.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -583,7 +589,7 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return curValue_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 cur_value = 12;</code>
|
||||
* <code>uint32 cur_value = 10;</code>
|
||||
* @param value The curValue to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -594,7 +600,7 @@ public final class ResinChangeNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 cur_value = 12;</code>
|
||||
* <code>uint32 cur_value = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearCurValue() {
|
||||
@@ -671,8 +677,8 @@ public final class ResinChangeNotifyOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\027ResinChangeNotify.proto\"Y\n\021ResinChange" +
|
||||
"Notify\022\032\n\022next_add_timestamp\030\006 \001(\r\022\025\n\rcu" +
|
||||
"r_buy_count\030\004 \001(\r\022\021\n\tcur_value\030\014 \001(\rB\033\n\031" +
|
||||
"Notify\022\025\n\rcur_buy_count\030\013 \001(\r\022\032\n\022next_ad" +
|
||||
"d_timestamp\030\r \001(\r\022\021\n\tcur_value\030\n \001(\rB\033\n\031" +
|
||||
"emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -684,7 +690,7 @@ public final class ResinChangeNotifyOuterClass {
|
||||
internal_static_ResinChangeNotify_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_ResinChangeNotify_descriptor,
|
||||
new java.lang.String[] { "NextAddTimestamp", "CurBuyCount", "CurValue", });
|
||||
new java.lang.String[] { "CurBuyCount", "NextAddTimestamp", "CurValue", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user