Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:01:21 +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/PlayerGameTimeNotifyOuterClass.java
+94 -94
View File
@@ -19,27 +19,27 @@ public final class PlayerGameTimeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 uid = 15;</code>
* @return The uid.
*/
int getUid();
/**
* <code>uint32 game_time = 3;</code>
* <code>uint32 game_time = 6;</code>
* @return The gameTime.
*/
int getGameTime();
/**
* <code>bool is_home = 14;</code>
* <code>uint32 uid = 3;</code>
* @return The uid.
*/
int getUid();
/**
* <code>bool is_home = 7;</code>
* @return The isHome.
*/
boolean getIsHome();
}
/**
* <pre>
* CmdId: 159
* Name: PEAFHFCBPFF
* CmdId: 184
* Obf: LHPHBCOAAJI
* </pre>
*
* Protobuf type {@code PlayerGameTimeNotify}
@@ -88,19 +88,19 @@ public final class PlayerGameTimeNotifyOuterClass {
break;
case 24: {
uid_ = input.readUInt32();
break;
}
case 48: {
gameTime_ = input.readUInt32();
break;
}
case 112: {
case 56: {
isHome_ = input.readBool();
break;
}
case 120: {
uid_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +133,10 @@ public final class PlayerGameTimeNotifyOuterClass {
emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.class, emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.Builder.class);
}
public static final int UID_FIELD_NUMBER = 15;
private int uid_;
/**
* <code>uint32 uid = 15;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int GAME_TIME_FIELD_NUMBER = 3;
public static final int GAME_TIME_FIELD_NUMBER = 6;
private int gameTime_;
/**
* <code>uint32 game_time = 3;</code>
* <code>uint32 game_time = 6;</code>
* @return The gameTime.
*/
@java.lang.Override
@@ -155,10 +144,21 @@ public final class PlayerGameTimeNotifyOuterClass {
return gameTime_;
}
public static final int IS_HOME_FIELD_NUMBER = 14;
public static final int UID_FIELD_NUMBER = 3;
private int uid_;
/**
* <code>uint32 uid = 3;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int IS_HOME_FIELD_NUMBER = 7;
private boolean isHome_;
/**
* <code>bool is_home = 14;</code>
* <code>bool is_home = 7;</code>
* @return The isHome.
*/
@java.lang.Override
@@ -180,14 +180,14 @@ public final class PlayerGameTimeNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (uid_ != 0) {
output.writeUInt32(3, uid_);
}
if (gameTime_ != 0) {
output.writeUInt32(3, gameTime_);
output.writeUInt32(6, gameTime_);
}
if (isHome_ != false) {
output.writeBool(14, isHome_);
}
if (uid_ != 0) {
output.writeUInt32(15, uid_);
output.writeBool(7, isHome_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +198,17 @@ public final class PlayerGameTimeNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, uid_);
}
if (gameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, gameTime_);
.computeUInt32Size(6, gameTime_);
}
if (isHome_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(14, isHome_);
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, uid_);
.computeBoolSize(7, isHome_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,10 +225,10 @@ public final class PlayerGameTimeNotifyOuterClass {
}
emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify other = (emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify) obj;
if (getUid()
!= other.getUid()) return false;
if (getGameTime()
!= other.getGameTime()) return false;
if (getUid()
!= other.getUid()) return false;
if (getIsHome()
!= other.getIsHome()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +242,10 @@ public final class PlayerGameTimeNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (37 * hash) + IS_HOME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsHome());
@@ -346,8 +346,8 @@ public final class PlayerGameTimeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 159
* Name: PEAFHFCBPFF
* CmdId: 184
* Obf: LHPHBCOAAJI
* </pre>
*
* Protobuf type {@code PlayerGameTimeNotify}
@@ -387,10 +387,10 @@ public final class PlayerGameTimeNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
uid_ = 0;
gameTime_ = 0;
uid_ = 0;
isHome_ = false;
return this;
@@ -419,8 +419,8 @@ public final class PlayerGameTimeNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify buildPartial() {
emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify result = new emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify(this);
result.uid_ = uid_;
result.gameTime_ = gameTime_;
result.uid_ = uid_;
result.isHome_ = isHome_;
onBuilt();
return result;
@@ -470,12 +470,12 @@ public final class PlayerGameTimeNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify other) {
if (other == emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.getDefaultInstance()) return this;
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (other.getGameTime() != 0) {
setGameTime(other.getGameTime());
}
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (other.getIsHome() != false) {
setIsHome(other.getIsHome());
}
@@ -508,40 +508,9 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
private int uid_ ;
/**
* <code>uint32 uid = 15;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 15;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private int gameTime_ ;
/**
* <code>uint32 game_time = 3;</code>
* <code>uint32 game_time = 6;</code>
* @return The gameTime.
*/
@java.lang.Override
@@ -549,7 +518,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return gameTime_;
}
/**
* <code>uint32 game_time = 3;</code>
* <code>uint32 game_time = 6;</code>
* @param value The gameTime to set.
* @return This builder for chaining.
*/
@@ -560,7 +529,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
/**
* <code>uint32 game_time = 3;</code>
* <code>uint32 game_time = 6;</code>
* @return This builder for chaining.
*/
public Builder clearGameTime() {
@@ -570,9 +539,40 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
private int uid_ ;
/**
* <code>uint32 uid = 3;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 3;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 3;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private boolean isHome_ ;
/**
* <code>bool is_home = 14;</code>
* <code>bool is_home = 7;</code>
* @return The isHome.
*/
@java.lang.Override
@@ -580,7 +580,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return isHome_;
}
/**
* <code>bool is_home = 14;</code>
* <code>bool is_home = 7;</code>
* @param value The isHome to set.
* @return This builder for chaining.
*/
@@ -591,7 +591,7 @@ public final class PlayerGameTimeNotifyOuterClass {
return this;
}
/**
* <code>bool is_home = 14;</code>
* <code>bool is_home = 7;</code>
* @return This builder for chaining.
*/
public Builder clearIsHome() {
@@ -668,8 +668,8 @@ public final class PlayerGameTimeNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032PlayerGameTimeNotify.proto\"G\n\024PlayerGa" +
"meTimeNotify\022\013\n\003uid\030\017 \001(\r\022\021\n\tgame_time\030\003" +
" \001(\r\022\017\n\007is_home\030\016 \001(\010B\033\n\031emu.grasscutter" +
"meTimeNotify\022\021\n\tgame_time\030\006 \001(\r\022\013\n\003uid\030\003" +
" \001(\r\022\017\n\007is_home\030\007 \001(\010B\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +681,7 @@ public final class PlayerGameTimeNotifyOuterClass {
internal_static_PlayerGameTimeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerGameTimeNotify_descriptor,
new java.lang.String[] { "Uid", "GameTime", "IsHome", });
new java.lang.String[] { "GameTime", "Uid", "IsHome", });
}
// @@protoc_insertion_point(outer_class_scope)