Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:54:14 +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/BattlePassCycleOuterClass.java
+122 -122
View File
@@ -19,26 +19,26 @@ public final class BattlePassCycleOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 end_time = 12;</code>
* @return The endTime.
* <code>uint32 begin_time = 14;</code>
* @return The beginTime.
*/
int getEndTime();
int getBeginTime();
/**
* <code>uint32 cycle_idx = 13;</code>
* <code>uint32 cycle_idx = 7;</code>
* @return The cycleIdx.
*/
int getCycleIdx();
/**
* <code>uint32 begin_time = 11;</code>
* @return The beginTime.
* <code>uint32 end_time = 8;</code>
* @return The endTime.
*/
int getBeginTime();
int getEndTime();
}
/**
* <pre>
* Name: JNLPHKAEDIO
* Obf: OIFDHDIINHH
* </pre>
*
* Protobuf type {@code BattlePassCycle}
@@ -85,19 +85,19 @@ public final class BattlePassCycleOuterClass {
case 0:
done = true;
break;
case 88: {
case 56: {
beginTime_ = input.readUInt32();
cycleIdx_ = input.readUInt32();
break;
}
case 96: {
case 64: {
endTime_ = input.readUInt32();
break;
}
case 104: {
case 112: {
cycleIdx_ = input.readUInt32();
beginTime_ = input.readUInt32();
break;
}
default: {
@@ -132,21 +132,21 @@ public final class BattlePassCycleOuterClass {
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.class, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder.class);
}
public static final int END_TIME_FIELD_NUMBER = 12;
private int endTime_;
public static final int BEGIN_TIME_FIELD_NUMBER = 14;
private int beginTime_;
/**
* <code>uint32 end_time = 12;</code>
* @return The endTime.
* <code>uint32 begin_time = 14;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
public int getBeginTime() {
return beginTime_;
}
public static final int CYCLE_IDX_FIELD_NUMBER = 13;
public static final int CYCLE_IDX_FIELD_NUMBER = 7;
private int cycleIdx_;
/**
* <code>uint32 cycle_idx = 13;</code>
* <code>uint32 cycle_idx = 7;</code>
* @return The cycleIdx.
*/
@java.lang.Override
@@ -154,15 +154,15 @@ public final class BattlePassCycleOuterClass {
return cycleIdx_;
}
public static final int BEGIN_TIME_FIELD_NUMBER = 11;
private int beginTime_;
public static final int END_TIME_FIELD_NUMBER = 8;
private int endTime_;
/**
* <code>uint32 begin_time = 11;</code>
* @return The beginTime.
* <code>uint32 end_time = 8;</code>
* @return The endTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
public int getEndTime() {
return endTime_;
}
private byte memoizedIsInitialized = -1;
@@ -179,14 +179,14 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (beginTime_ != 0) {
output.writeUInt32(11, beginTime_);
if (cycleIdx_ != 0) {
output.writeUInt32(7, cycleIdx_);
}
if (endTime_ != 0) {
output.writeUInt32(12, endTime_);
output.writeUInt32(8, endTime_);
}
if (cycleIdx_ != 0) {
output.writeUInt32(13, cycleIdx_);
if (beginTime_ != 0) {
output.writeUInt32(14, beginTime_);
}
unknownFields.writeTo(output);
}
@@ -197,17 +197,17 @@ public final class BattlePassCycleOuterClass {
if (size != -1) return size;
size = 0;
if (beginTime_ != 0) {
if (cycleIdx_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, beginTime_);
.computeUInt32Size(7, cycleIdx_);
}
if (endTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, endTime_);
.computeUInt32Size(8, endTime_);
}
if (cycleIdx_ != 0) {
if (beginTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, cycleIdx_);
.computeUInt32Size(14, beginTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -224,12 +224,12 @@ public final class BattlePassCycleOuterClass {
}
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other = (emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle) obj;
if (getEndTime()
!= other.getEndTime()) return false;
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,12 +241,12 @@ public final class BattlePassCycleOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -344,7 +344,7 @@ public final class BattlePassCycleOuterClass {
}
/**
* <pre>
* Name: JNLPHKAEDIO
* Obf: OIFDHDIINHH
* </pre>
*
* Protobuf type {@code BattlePassCycle}
@@ -384,11 +384,11 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
endTime_ = 0;
beginTime_ = 0;
cycleIdx_ = 0;
beginTime_ = 0;
endTime_ = 0;
return this;
}
@@ -416,9 +416,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.endTime_ = endTime_;
result.cycleIdx_ = cycleIdx_;
result.beginTime_ = beginTime_;
result.cycleIdx_ = cycleIdx_;
result.endTime_ = endTime_;
onBuilt();
return result;
}
@@ -467,14 +467,14 @@ 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.getEndTime() != 0) {
setEndTime(other.getEndTime());
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
if (other.getCycleIdx() != 0) {
setCycleIdx(other.getCycleIdx());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -505,71 +505,9 @@ public final class BattlePassCycleOuterClass {
return this;
}
private int endTime_ ;
/**
* <code>uint32 end_time = 12;</code>
* @return The endTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
}
/**
* <code>uint32 end_time = 12;</code>
* @param value The endTime to set.
* @return This builder for chaining.
*/
public Builder setEndTime(int value) {
endTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 end_time = 12;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
endTime_ = 0;
onChanged();
return this;
}
private int cycleIdx_ ;
/**
* <code>uint32 cycle_idx = 13;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
/**
* <code>uint32 cycle_idx = 13;</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 = 13;</code>
* @return This builder for chaining.
*/
public Builder clearCycleIdx() {
cycleIdx_ = 0;
onChanged();
return this;
}
private int beginTime_ ;
/**
* <code>uint32 begin_time = 11;</code>
* <code>uint32 begin_time = 14;</code>
* @return The beginTime.
*/
@java.lang.Override
@@ -577,7 +515,7 @@ public final class BattlePassCycleOuterClass {
return beginTime_;
}
/**
* <code>uint32 begin_time = 11;</code>
* <code>uint32 begin_time = 14;</code>
* @param value The beginTime to set.
* @return This builder for chaining.
*/
@@ -588,7 +526,7 @@ public final class BattlePassCycleOuterClass {
return this;
}
/**
* <code>uint32 begin_time = 11;</code>
* <code>uint32 begin_time = 14;</code>
* @return This builder for chaining.
*/
public Builder clearBeginTime() {
@@ -597,6 +535,68 @@ public final class BattlePassCycleOuterClass {
onChanged();
return this;
}
private int cycleIdx_ ;
/**
* <code>uint32 cycle_idx = 7;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
/**
* <code>uint32 cycle_idx = 7;</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 = 7;</code>
* @return This builder for chaining.
*/
public Builder clearCycleIdx() {
cycleIdx_ = 0;
onChanged();
return this;
}
private int endTime_ ;
/**
* <code>uint32 end_time = 8;</code>
* @return The endTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
}
/**
* <code>uint32 end_time = 8;</code>
* @param value The endTime to set.
* @return This builder for chaining.
*/
public Builder setEndTime(int value) {
endTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 end_time = 8;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
endTime_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -665,8 +665,8 @@ public final class BattlePassCycleOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\025BattlePassCycle.proto\"J\n\017BattlePassCyc" +
"le\022\020\n\010end_time\030\014 \001(\r\022\021\n\tcycle_idx\030\r \001(\r\022" +
"\022\n\nbegin_time\030\013 \001(\rB\033\n\031emu.grasscutter.n" +
"le\022\022\n\nbegin_time\030\016 \001(\r\022\021\n\tcycle_idx\030\007 \001(" +
"\r\022\020\n\010end_time\030\010 \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +678,7 @@ public final class BattlePassCycleOuterClass {
internal_static_BattlePassCycle_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassCycle_descriptor,
new java.lang.String[] { "EndTime", "CycleIdx", "BeginTime", });
new java.lang.String[] { "BeginTime", "CycleIdx", "EndTime", });
}
// @@protoc_insertion_point(outer_class_scope)