Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 01:59:50 +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/SeaLampV3ShadowLevelInfoOuterClass.java
+89 -89
View File
@@ -19,26 +19,26 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 level_id = 12;</code>
* @return The levelId.
*/
int getLevelId();
/**
* <code>uint32 min_finish_time = 1;</code>
* <code>uint32 min_finish_time = 11;</code>
* @return The minFinishTime.
*/
int getMinFinishTime();
/**
* <code>bool is_open = 4;</code>
* <code>bool is_open = 3;</code>
* @return The isOpen.
*/
boolean getIsOpen();
/**
* <code>uint32 level_id = 1;</code>
* @return The levelId.
*/
int getLevelId();
}
/**
* <pre>
* Name: POIEKHBPNJL
* Obf: PGFAIDKGFLI
* </pre>
*
* Protobuf type {@code SeaLampV3ShadowLevelInfo}
@@ -87,17 +87,17 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
break;
case 8: {
minFinishTime_ = input.readUInt32();
levelId_ = input.readUInt32();
break;
}
case 32: {
case 24: {
isOpen_ = input.readBool();
break;
}
case 96: {
case 88: {
levelId_ = input.readUInt32();
minFinishTime_ = input.readUInt32();
break;
}
default: {
@@ -132,21 +132,10 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo.class, emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo.Builder.class);
}
public static final int LEVEL_ID_FIELD_NUMBER = 12;
private int levelId_;
/**
* <code>uint32 level_id = 12;</code>
* @return The levelId.
*/
@java.lang.Override
public int getLevelId() {
return levelId_;
}
public static final int MIN_FINISH_TIME_FIELD_NUMBER = 1;
public static final int MIN_FINISH_TIME_FIELD_NUMBER = 11;
private int minFinishTime_;
/**
* <code>uint32 min_finish_time = 1;</code>
* <code>uint32 min_finish_time = 11;</code>
* @return The minFinishTime.
*/
@java.lang.Override
@@ -154,10 +143,10 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return minFinishTime_;
}
public static final int IS_OPEN_FIELD_NUMBER = 4;
public static final int IS_OPEN_FIELD_NUMBER = 3;
private boolean isOpen_;
/**
* <code>bool is_open = 4;</code>
* <code>bool is_open = 3;</code>
* @return The isOpen.
*/
@java.lang.Override
@@ -165,6 +154,17 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return isOpen_;
}
public static final int LEVEL_ID_FIELD_NUMBER = 1;
private int levelId_;
/**
* <code>uint32 level_id = 1;</code>
* @return The levelId.
*/
@java.lang.Override
public int getLevelId() {
return levelId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -179,14 +179,14 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (minFinishTime_ != 0) {
output.writeUInt32(1, minFinishTime_);
if (levelId_ != 0) {
output.writeUInt32(1, levelId_);
}
if (isOpen_ != false) {
output.writeBool(4, isOpen_);
output.writeBool(3, isOpen_);
}
if (levelId_ != 0) {
output.writeUInt32(12, levelId_);
if (minFinishTime_ != 0) {
output.writeUInt32(11, minFinishTime_);
}
unknownFields.writeTo(output);
}
@@ -197,17 +197,17 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
if (size != -1) return size;
size = 0;
if (minFinishTime_ != 0) {
if (levelId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, minFinishTime_);
.computeUInt32Size(1, levelId_);
}
if (isOpen_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(4, isOpen_);
.computeBoolSize(3, isOpen_);
}
if (levelId_ != 0) {
if (minFinishTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, levelId_);
.computeUInt32Size(11, minFinishTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -224,12 +224,12 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
}
emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo other = (emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo) obj;
if (getLevelId()
!= other.getLevelId()) return false;
if (getMinFinishTime()
!= other.getMinFinishTime()) return false;
if (getIsOpen()
!= other.getIsOpen()) return false;
if (getLevelId()
!= other.getLevelId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,13 +241,13 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER;
hash = (53 * hash) + getLevelId();
hash = (37 * hash) + MIN_FINISH_TIME_FIELD_NUMBER;
hash = (53 * hash) + getMinFinishTime();
hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsOpen());
hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER;
hash = (53 * hash) + getLevelId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -345,7 +345,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
}
/**
* <pre>
* Name: POIEKHBPNJL
* Obf: PGFAIDKGFLI
* </pre>
*
* Protobuf type {@code SeaLampV3ShadowLevelInfo}
@@ -385,12 +385,12 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
levelId_ = 0;
minFinishTime_ = 0;
isOpen_ = false;
levelId_ = 0;
return this;
}
@@ -417,9 +417,9 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo buildPartial() {
emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo result = new emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo(this);
result.levelId_ = levelId_;
result.minFinishTime_ = minFinishTime_;
result.isOpen_ = isOpen_;
result.levelId_ = levelId_;
onBuilt();
return result;
}
@@ -468,15 +468,15 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo other) {
if (other == emu.grasscutter.net.proto.SeaLampV3ShadowLevelInfoOuterClass.SeaLampV3ShadowLevelInfo.getDefaultInstance()) return this;
if (other.getLevelId() != 0) {
setLevelId(other.getLevelId());
}
if (other.getMinFinishTime() != 0) {
setMinFinishTime(other.getMinFinishTime());
}
if (other.getIsOpen() != false) {
setIsOpen(other.getIsOpen());
}
if (other.getLevelId() != 0) {
setLevelId(other.getLevelId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -506,40 +506,9 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return this;
}
private int levelId_ ;
/**
* <code>uint32 level_id = 12;</code>
* @return The levelId.
*/
@java.lang.Override
public int getLevelId() {
return levelId_;
}
/**
* <code>uint32 level_id = 12;</code>
* @param value The levelId to set.
* @return This builder for chaining.
*/
public Builder setLevelId(int value) {
levelId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearLevelId() {
levelId_ = 0;
onChanged();
return this;
}
private int minFinishTime_ ;
/**
* <code>uint32 min_finish_time = 1;</code>
* <code>uint32 min_finish_time = 11;</code>
* @return The minFinishTime.
*/
@java.lang.Override
@@ -547,7 +516,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return minFinishTime_;
}
/**
* <code>uint32 min_finish_time = 1;</code>
* <code>uint32 min_finish_time = 11;</code>
* @param value The minFinishTime to set.
* @return This builder for chaining.
*/
@@ -558,7 +527,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return this;
}
/**
* <code>uint32 min_finish_time = 1;</code>
* <code>uint32 min_finish_time = 11;</code>
* @return This builder for chaining.
*/
public Builder clearMinFinishTime() {
@@ -570,7 +539,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
private boolean isOpen_ ;
/**
* <code>bool is_open = 4;</code>
* <code>bool is_open = 3;</code>
* @return The isOpen.
*/
@java.lang.Override
@@ -578,7 +547,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return isOpen_;
}
/**
* <code>bool is_open = 4;</code>
* <code>bool is_open = 3;</code>
* @param value The isOpen to set.
* @return This builder for chaining.
*/
@@ -589,7 +558,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
return this;
}
/**
* <code>bool is_open = 4;</code>
* <code>bool is_open = 3;</code>
* @return This builder for chaining.
*/
public Builder clearIsOpen() {
@@ -598,6 +567,37 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
onChanged();
return this;
}
private int levelId_ ;
/**
* <code>uint32 level_id = 1;</code>
* @return The levelId.
*/
@java.lang.Override
public int getLevelId() {
return levelId_;
}
/**
* <code>uint32 level_id = 1;</code>
* @param value The levelId to set.
* @return This builder for chaining.
*/
public Builder setLevelId(int value) {
levelId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearLevelId() {
levelId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -666,8 +666,8 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\036SeaLampV3ShadowLevelInfo.proto\"V\n\030SeaL" +
"ampV3ShadowLevelInfo\022\020\n\010level_id\030\014 \001(\r\022\027" +
"\n\017min_finish_time\030\001 \001(\r\022\017\n\007is_open\030\004 \001(\010" +
"ampV3ShadowLevelInfo\022\027\n\017min_finish_time\030" +
"\013 \001(\r\022\017\n\007is_open\030\003 \001(\010\022\020\n\010level_id\030\001 \001(\r" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +679,7 @@ public final class SeaLampV3ShadowLevelInfoOuterClass {
internal_static_SeaLampV3ShadowLevelInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SeaLampV3ShadowLevelInfo_descriptor,
new java.lang.String[] { "LevelId", "MinFinishTime", "IsOpen", });
new java.lang.String[] { "MinFinishTime", "IsOpen", "LevelId", });
}
// @@protoc_insertion_point(outer_class_scope)