Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 13:13:35 +08:00
Code Issues Projects Releases Wiki Activity

Update gc to 3.3 (#1981)

Browse Source 
* 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:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/BattlePassCycleOuterClass.java
+82 -82
View File
@@ -19,13 +19,7 @@ public final class BattlePassCycleOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 cycle_idx = 3;</code>
* @return The cycleIdx.
*/
int getCycleIdx();
/**
* <code>uint32 end_time = 10;</code>
* <code>uint32 end_time = 5;</code>
* @return The endTime.
*/
int getEndTime();
@@ -35,6 +29,12 @@ public final class BattlePassCycleOuterClass {
* @return The beginTime.
*/
int getBeginTime();
/**
* <code>uint32 cycle_idx = 15;</code>
* @return The cycleIdx.
*/
int getCycleIdx();
}
/**
* Protobuf type {@code BattlePassCycle}
@@ -81,12 +81,7 @@ public final class BattlePassCycleOuterClass {
case 0:
done = true;
break;
case 24: {
cycleIdx_ = input.readUInt32();
break;
}
case 80: {
case 40: {
endTime_ = input.readUInt32();
break;
@@ -96,6 +91,11 @@ public final class BattlePassCycleOuterClass {
beginTime_ = input.readUInt32();
break;
}
case 120: {
cycleIdx_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,21 +128,10 @@ public final class BattlePassCycleOuterClass {
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.class, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder.class);
}
public static final int CYCLE_IDX_FIELD_NUMBER = 3;
private int cycleIdx_;
/**
* <code>uint32 cycle_idx = 3;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
public static final int END_TIME_FIELD_NUMBER = 10;
public static final int END_TIME_FIELD_NUMBER = 5;
private int endTime_;
/**
* <code>uint32 end_time = 10;</code>
* <code>uint32 end_time = 5;</code>
* @return The endTime.
*/
@java.lang.Override
@@ -161,6 +150,17 @@ public final class BattlePassCycleOuterClass {
return beginTime_;
}
public static final int CYCLE_IDX_FIELD_NUMBER = 15;
private int cycleIdx_;
/**
* <code>uint32 cycle_idx = 15;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -175,15 +175,15 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (cycleIdx_ != 0) {
output.writeUInt32(3, cycleIdx_);
}
if (endTime_ != 0) {
output.writeUInt32(10, endTime_);
output.writeUInt32(5, endTime_);
}
if (beginTime_ != 0) {
output.writeUInt32(13, beginTime_);
}
if (cycleIdx_ != 0) {
output.writeUInt32(15, cycleIdx_);
}
unknownFields.writeTo(output);
}
@@ -193,18 +193,18 @@ public final class BattlePassCycleOuterClass {
if (size != -1) return size;
size = 0;
if (cycleIdx_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, cycleIdx_);
}
if (endTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, endTime_);
.computeUInt32Size(5, endTime_);
}
if (beginTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, beginTime_);
}
if (cycleIdx_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, cycleIdx_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -220,12 +220,12 @@ public final class BattlePassCycleOuterClass {
}
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other = (emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle) obj;
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -237,12 +237,12 @@ public final class BattlePassCycleOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -376,12 +376,12 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
cycleIdx_ = 0;
endTime_ = 0;
beginTime_ = 0;
cycleIdx_ = 0;
return this;
}
@@ -408,9 +408,9 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle buildPartial() {
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle result = new emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle(this);
result.cycleIdx_ = cycleIdx_;
result.endTime_ = endTime_;
result.beginTime_ = beginTime_;
result.cycleIdx_ = cycleIdx_;
onBuilt();
return result;
}
@@ -459,15 +459,15 @@ public final class BattlePassCycleOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other) {
if (other == emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance()) return this;
if (other.getCycleIdx() != 0) {
setCycleIdx(other.getCycleIdx());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
if (other.getCycleIdx() != 0) {
setCycleIdx(other.getCycleIdx());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -497,40 +497,9 @@ public final class BattlePassCycleOuterClass {
return this;
}
private int cycleIdx_ ;
/**
* <code>uint32 cycle_idx = 3;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
/**
* <code>uint32 cycle_idx = 3;</code>
* @param value The cycleIdx to set.
* @return This builder for chaining.
*/
public Builder setCycleIdx(int value) {
cycleIdx_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cycle_idx = 3;</code>
* @return This builder for chaining.
*/
public Builder clearCycleIdx() {
cycleIdx_ = 0;
onChanged();
return this;
}
private int endTime_ ;
/**
* <code>uint32 end_time = 10;</code>
* <code>uint32 end_time = 5;</code>
* @return The endTime.
*/
@java.lang.Override
@@ -538,7 +507,7 @@ public final class BattlePassCycleOuterClass {
return endTime_;
}
/**
* <code>uint32 end_time = 10;</code>
* <code>uint32 end_time = 5;</code>
* @param value The endTime to set.
* @return This builder for chaining.
*/
@@ -549,7 +518,7 @@ public final class BattlePassCycleOuterClass {
return this;
}
/**
* <code>uint32 end_time = 10;</code>
* <code>uint32 end_time = 5;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
@@ -589,6 +558,37 @@ public final class BattlePassCycleOuterClass {
onChanged();
return this;
}
private int cycleIdx_ ;
/**
* <code>uint32 cycle_idx = 15;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
/**
* <code>uint32 cycle_idx = 15;</code>
* @param value The cycleIdx to set.
* @return This builder for chaining.
*/
public Builder setCycleIdx(int value) {
cycleIdx_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cycle_idx = 15;</code>
* @return This builder for chaining.
*/
public Builder clearCycleIdx() {
cycleIdx_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -657,8 +657,8 @@ public final class BattlePassCycleOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\025BattlePassCycle.proto\"J\n\017BattlePassCyc" +
"le\022\021\n\tcycle_idx\030\003 \001(\r\022\020\n\010end_time\030\n \001(\r\022" +
"\022\n\nbegin_time\030\r \001(\rB\033\n\031emu.grasscutter.n" +
"le\022\020\n\010end_time\030\005 \001(\r\022\022\n\nbegin_time\030\r \001(\r" +
"\022\021\n\tcycle_idx\030\017 \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -670,7 +670,7 @@ public final class BattlePassCycleOuterClass {
internal_static_BattlePassCycle_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassCycle_descriptor,
new java.lang.String[] { "CycleIdx", "EndTime", "BeginTime", });
new java.lang.String[] { "EndTime", "BeginTime", "CycleIdx", });
}
// @@protoc_insertion_point(outer_class_scope)