Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-27 14:29:54 +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/PlayerEnterDungeonReqOuterClass.java
+96 -96
View File
@@ -19,36 +19,36 @@ public final class PlayerEnterDungeonReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 point_id = 12;</code>
* @return The pointId.
*/
int getPointId();
/**
* <code>uint32 dungeon_id = 14;</code>
* <code>uint32 dungeon_id = 15;</code>
* @return The dungeonId.
*/
int getDungeonId();
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>uint32 point_id = 13;</code>
* @return The pointId.
*/
int getPointId();
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
* @return Whether the enterPosInfo field is set.
*/
boolean hasEnterPosInfo();
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
* @return The enterPosInfo.
*/
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo();
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder();
}
/**
* <pre>
* CmdId: 989
* Name: CJLIPEPDAHP
* CmdId: 902
* Obf: EECBNNIALIE
* </pre>
*
* Protobuf type {@code PlayerEnterDungeonReq}
@@ -95,7 +95,7 @@ public final class PlayerEnterDungeonReqOuterClass {
case 0:
done = true;
break;
case 50: {
case 74: {
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder subBuilder = null;
if (enterPosInfo_ != null) {
subBuilder = enterPosInfo_.toBuilder();
@@ -108,12 +108,12 @@ public final class PlayerEnterDungeonReqOuterClass {
break;
}
case 96: {
case 104: {
pointId_ = input.readUInt32();
break;
}
case 112: {
case 120: {
dungeonId_ = input.readUInt32();
break;
@@ -150,21 +150,10 @@ public final class PlayerEnterDungeonReqOuterClass {
emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.class, emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.Builder.class);
}
public static final int POINT_ID_FIELD_NUMBER = 12;
private int pointId_;
/**
* <code>uint32 point_id = 12;</code>
* @return The pointId.
*/
@java.lang.Override
public int getPointId() {
return pointId_;
}
public static final int DUNGEON_ID_FIELD_NUMBER = 14;
public static final int DUNGEON_ID_FIELD_NUMBER = 15;
private int dungeonId_;
/**
* <code>uint32 dungeon_id = 14;</code>
* <code>uint32 dungeon_id = 15;</code>
* @return The dungeonId.
*/
@java.lang.Override
@@ -172,10 +161,21 @@ public final class PlayerEnterDungeonReqOuterClass {
return dungeonId_;
}
public static final int ENTER_POS_INFO_FIELD_NUMBER = 6;
public static final int POINT_ID_FIELD_NUMBER = 13;
private int pointId_;
/**
* <code>uint32 point_id = 13;</code>
* @return The pointId.
*/
@java.lang.Override
public int getPointId() {
return pointId_;
}
public static final int ENTER_POS_INFO_FIELD_NUMBER = 9;
private emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo enterPosInfo_;
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
* @return Whether the enterPosInfo field is set.
*/
@java.lang.Override
@@ -183,7 +183,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return enterPosInfo_ != null;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
* @return The enterPosInfo.
*/
@java.lang.Override
@@ -191,7 +191,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return enterPosInfo_ == null ? emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.getDefaultInstance() : enterPosInfo_;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder() {
@@ -213,13 +213,13 @@ public final class PlayerEnterDungeonReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (enterPosInfo_ != null) {
output.writeMessage(6, getEnterPosInfo());
output.writeMessage(9, getEnterPosInfo());
}
if (pointId_ != 0) {
output.writeUInt32(12, pointId_);
output.writeUInt32(13, pointId_);
}
if (dungeonId_ != 0) {
output.writeUInt32(14, dungeonId_);
output.writeUInt32(15, dungeonId_);
}
unknownFields.writeTo(output);
}
@@ -232,15 +232,15 @@ public final class PlayerEnterDungeonReqOuterClass {
size = 0;
if (enterPosInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getEnterPosInfo());
.computeMessageSize(9, getEnterPosInfo());
}
if (pointId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, pointId_);
.computeUInt32Size(13, pointId_);
}
if (dungeonId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, dungeonId_);
.computeUInt32Size(15, dungeonId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -257,10 +257,10 @@ public final class PlayerEnterDungeonReqOuterClass {
}
emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq other = (emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq) obj;
if (getPointId()
!= other.getPointId()) return false;
if (getDungeonId()
!= other.getDungeonId()) return false;
if (getPointId()
!= other.getPointId()) return false;
if (hasEnterPosInfo() != other.hasEnterPosInfo()) return false;
if (hasEnterPosInfo()) {
if (!getEnterPosInfo()
@@ -277,10 +277,10 @@ public final class PlayerEnterDungeonReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
hash = (53 * hash) + getPointId();
hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
hash = (53 * hash) + getDungeonId();
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
hash = (53 * hash) + getPointId();
if (hasEnterPosInfo()) {
hash = (37 * hash) + ENTER_POS_INFO_FIELD_NUMBER;
hash = (53 * hash) + getEnterPosInfo().hashCode();
@@ -382,8 +382,8 @@ public final class PlayerEnterDungeonReqOuterClass {
}
/**
* <pre>
* CmdId: 989
* Name: CJLIPEPDAHP
* CmdId: 902
* Obf: EECBNNIALIE
* </pre>
*
* Protobuf type {@code PlayerEnterDungeonReq}
@@ -423,10 +423,10 @@ public final class PlayerEnterDungeonReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
pointId_ = 0;
dungeonId_ = 0;
pointId_ = 0;
if (enterPosInfoBuilder_ == null) {
enterPosInfo_ = null;
} else {
@@ -459,8 +459,8 @@ public final class PlayerEnterDungeonReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq buildPartial() {
emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq result = new emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq(this);
result.pointId_ = pointId_;
result.dungeonId_ = dungeonId_;
result.pointId_ = pointId_;
if (enterPosInfoBuilder_ == null) {
result.enterPosInfo_ = enterPosInfo_;
} else {
@@ -514,12 +514,12 @@ public final class PlayerEnterDungeonReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq other) {
if (other == emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.getDefaultInstance()) return this;
if (other.getPointId() != 0) {
setPointId(other.getPointId());
}
if (other.getDungeonId() != 0) {
setDungeonId(other.getDungeonId());
}
if (other.getPointId() != 0) {
setPointId(other.getPointId());
}
if (other.hasEnterPosInfo()) {
mergeEnterPosInfo(other.getEnterPosInfo());
}
@@ -552,40 +552,9 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
private int pointId_ ;
/**
* <code>uint32 point_id = 12;</code>
* @return The pointId.
*/
@java.lang.Override
public int getPointId() {
return pointId_;
}
/**
* <code>uint32 point_id = 12;</code>
* @param value The pointId to set.
* @return This builder for chaining.
*/
public Builder setPointId(int value) {
pointId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 point_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearPointId() {
pointId_ = 0;
onChanged();
return this;
}
private int dungeonId_ ;
/**
* <code>uint32 dungeon_id = 14;</code>
* <code>uint32 dungeon_id = 15;</code>
* @return The dungeonId.
*/
@java.lang.Override
@@ -593,7 +562,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return dungeonId_;
}
/**
* <code>uint32 dungeon_id = 14;</code>
* <code>uint32 dungeon_id = 15;</code>
* @param value The dungeonId to set.
* @return This builder for chaining.
*/
@@ -604,7 +573,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
/**
* <code>uint32 dungeon_id = 14;</code>
* <code>uint32 dungeon_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearDungeonId() {
@@ -614,18 +583,49 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
private int pointId_ ;
/**
* <code>uint32 point_id = 13;</code>
* @return The pointId.
*/
@java.lang.Override
public int getPointId() {
return pointId_;
}
/**
* <code>uint32 point_id = 13;</code>
* @param value The pointId to set.
* @return This builder for chaining.
*/
public Builder setPointId(int value) {
pointId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 point_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearPointId() {
pointId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo enterPosInfo_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder> enterPosInfoBuilder_;
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
* @return Whether the enterPosInfo field is set.
*/
public boolean hasEnterPosInfo() {
return enterPosInfoBuilder_ != null || enterPosInfo_ != null;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
* @return The enterPosInfo.
*/
public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo() {
@@ -636,7 +636,7 @@ public final class PlayerEnterDungeonReqOuterClass {
}
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
public Builder setEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo value) {
if (enterPosInfoBuilder_ == null) {
@@ -652,7 +652,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
public Builder setEnterPosInfo(
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder builderForValue) {
@@ -666,7 +666,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
public Builder mergeEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo value) {
if (enterPosInfoBuilder_ == null) {
@@ -684,7 +684,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
public Builder clearEnterPosInfo() {
if (enterPosInfoBuilder_ == null) {
@@ -698,7 +698,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return this;
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder getEnterPosInfoBuilder() {
@@ -706,7 +706,7 @@ public final class PlayerEnterDungeonReqOuterClass {
return getEnterPosInfoFieldBuilder().getBuilder();
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder() {
if (enterPosInfoBuilder_ != null) {
@@ -717,7 +717,7 @@ public final class PlayerEnterDungeonReqOuterClass {
}
}
/**
* <code>.DungeonEnterPosInfo enter_pos_info = 6;</code>
* <code>.DungeonEnterPosInfo enter_pos_info = 9;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder>
@@ -801,8 +801,8 @@ public final class PlayerEnterDungeonReqOuterClass {
java.lang.String[] descriptorData = {
"\n\033PlayerEnterDungeonReq.proto\032\031DungeonEn" +
"terPosInfo.proto\"k\n\025PlayerEnterDungeonRe" +
"q\022\020\n\010point_id\030\014 \001(\r\022\022\n\ndungeon_id\030\016 \001(\r\022" +
",\n\016enter_pos_info\030\006 \001(\0132\024.DungeonEnterPo" +
"q\022\022\n\ndungeon_id\030\017 \001(\r\022\020\n\010point_id\030\r \001(\r\022" +
",\n\016enter_pos_info\030\t \001(\0132\024.DungeonEnterPo" +
"sInfoB\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
};
@@ -816,7 +816,7 @@ public final class PlayerEnterDungeonReqOuterClass {
internal_static_PlayerEnterDungeonReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerEnterDungeonReq_descriptor,
new java.lang.String[] { "PointId", "DungeonId", "EnterPosInfo", });
new java.lang.String[] { "DungeonId", "PointId", "EnterPosInfo", });
emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.getDescriptor();
}