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

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/PlayerChatReqOuterClass.java
+105 -95
View File
@@ -19,27 +19,32 @@ public final class PlayerChatReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 channelId = 5;</code>
* @return The channelId.
*/
int getChannelId();
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
* @return Whether the chatInfo field is set.
*/
boolean hasChatInfo();
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
* @return The chatInfo.
*/
emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo();
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder();
/**
* <code>uint32 channel_id = 15;</code>
* @return The channelId.
*/
int getChannelId();
}
/**
* <pre>
* Name: NFIKNDINCMM
* CmdId: 3125
* </pre>
*
* Protobuf type {@code PlayerChatReq}
*/
public static final class PlayerChatReq extends
@@ -84,12 +89,7 @@ public final class PlayerChatReqOuterClass {
case 0:
done = true;
break;
case 40: {
channelId_ = input.readUInt32();
break;
}
case 98: {
case 42: {
emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder subBuilder = null;
if (chatInfo_ != null) {
subBuilder = chatInfo_.toBuilder();
@@ -102,6 +102,11 @@ public final class PlayerChatReqOuterClass {
break;
}
case 120: {
channelId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -134,21 +139,10 @@ public final class PlayerChatReqOuterClass {
emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq.class, emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq.Builder.class);
}
public static final int CHANNELID_FIELD_NUMBER = 5;
private int channelId_;
/**
* <code>uint32 channelId = 5;</code>
* @return The channelId.
*/
@java.lang.Override
public int getChannelId() {
return channelId_;
}
public static final int CHATINFO_FIELD_NUMBER = 12;
public static final int CHAT_INFO_FIELD_NUMBER = 5;
private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
* @return Whether the chatInfo field is set.
*/
@java.lang.Override
@@ -156,7 +150,7 @@ public final class PlayerChatReqOuterClass {
return chatInfo_ != null;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
* @return The chatInfo.
*/
@java.lang.Override
@@ -164,13 +158,24 @@ public final class PlayerChatReqOuterClass {
return chatInfo_ == null ? emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance() : chatInfo_;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
return getChatInfo();
}
public static final int CHANNEL_ID_FIELD_NUMBER = 15;
private int channelId_;
/**
* <code>uint32 channel_id = 15;</code>
* @return The channelId.
*/
@java.lang.Override
public int getChannelId() {
return channelId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -185,11 +190,11 @@ public final class PlayerChatReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (channelId_ != 0) {
output.writeUInt32(5, channelId_);
}
if (chatInfo_ != null) {
output.writeMessage(12, getChatInfo());
output.writeMessage(5, getChatInfo());
}
if (channelId_ != 0) {
output.writeUInt32(15, channelId_);
}
unknownFields.writeTo(output);
}
@@ -200,13 +205,13 @@ public final class PlayerChatReqOuterClass {
if (size != -1) return size;
size = 0;
if (channelId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, channelId_);
}
if (chatInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, getChatInfo());
.computeMessageSize(5, getChatInfo());
}
if (channelId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, channelId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -223,13 +228,13 @@ public final class PlayerChatReqOuterClass {
}
emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq other = (emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq) obj;
if (getChannelId()
!= other.getChannelId()) return false;
if (hasChatInfo() != other.hasChatInfo()) return false;
if (hasChatInfo()) {
if (!getChatInfo()
.equals(other.getChatInfo())) return false;
}
if (getChannelId()
!= other.getChannelId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,12 +246,12 @@ public final class PlayerChatReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CHANNELID_FIELD_NUMBER;
hash = (53 * hash) + getChannelId();
if (hasChatInfo()) {
hash = (37 * hash) + CHATINFO_FIELD_NUMBER;
hash = (37 * hash) + CHAT_INFO_FIELD_NUMBER;
hash = (53 * hash) + getChatInfo().hashCode();
}
hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
hash = (53 * hash) + getChannelId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -343,6 +348,11 @@ public final class PlayerChatReqOuterClass {
return builder;
}
/**
* <pre>
* Name: NFIKNDINCMM
* CmdId: 3125
* </pre>
*
* Protobuf type {@code PlayerChatReq}
*/
public static final class Builder extends
@@ -380,14 +390,14 @@ public final class PlayerChatReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
channelId_ = 0;
if (chatInfoBuilder_ == null) {
chatInfo_ = null;
} else {
chatInfo_ = null;
chatInfoBuilder_ = null;
}
channelId_ = 0;
return this;
}
@@ -414,12 +424,12 @@ public final class PlayerChatReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq buildPartial() {
emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq result = new emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq(this);
result.channelId_ = channelId_;
if (chatInfoBuilder_ == null) {
result.chatInfo_ = chatInfo_;
} else {
result.chatInfo_ = chatInfoBuilder_.build();
}
result.channelId_ = channelId_;
onBuilt();
return result;
}
@@ -468,12 +478,12 @@ public final class PlayerChatReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq other) {
if (other == emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq.getDefaultInstance()) return this;
if (other.getChannelId() != 0) {
setChannelId(other.getChannelId());
}
if (other.hasChatInfo()) {
mergeChatInfo(other.getChatInfo());
}
if (other.getChannelId() != 0) {
setChannelId(other.getChannelId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -503,49 +513,18 @@ public final class PlayerChatReqOuterClass {
return this;
}
private int channelId_ ;
/**
* <code>uint32 channelId = 5;</code>
* @return The channelId.
*/
@java.lang.Override
public int getChannelId() {
return channelId_;
}
/**
* <code>uint32 channelId = 5;</code>
* @param value The channelId to set.
* @return This builder for chaining.
*/
public Builder setChannelId(int value) {
channelId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 channelId = 5;</code>
* @return This builder for chaining.
*/
public Builder clearChannelId() {
channelId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> chatInfoBuilder_;
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
* @return Whether the chatInfo field is set.
*/
public boolean hasChatInfo() {
return chatInfoBuilder_ != null || chatInfo_ != null;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
* @return The chatInfo.
*/
public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
@@ -556,7 +535,7 @@ public final class PlayerChatReqOuterClass {
}
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
public Builder setChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
if (chatInfoBuilder_ == null) {
@@ -572,7 +551,7 @@ public final class PlayerChatReqOuterClass {
return this;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
public Builder setChatInfo(
emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -586,7 +565,7 @@ public final class PlayerChatReqOuterClass {
return this;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
public Builder mergeChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
if (chatInfoBuilder_ == null) {
@@ -604,7 +583,7 @@ public final class PlayerChatReqOuterClass {
return this;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
public Builder clearChatInfo() {
if (chatInfoBuilder_ == null) {
@@ -618,7 +597,7 @@ public final class PlayerChatReqOuterClass {
return this;
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder() {
@@ -626,7 +605,7 @@ public final class PlayerChatReqOuterClass {
return getChatInfoFieldBuilder().getBuilder();
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
if (chatInfoBuilder_ != null) {
@@ -637,7 +616,7 @@ public final class PlayerChatReqOuterClass {
}
}
/**
* <code>.ChatInfo chatInfo = 12;</code>
* <code>.ChatInfo chat_info = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder>
@@ -652,6 +631,37 @@ public final class PlayerChatReqOuterClass {
}
return chatInfoBuilder_;
}
private int channelId_ ;
/**
* <code>uint32 channel_id = 15;</code>
* @return The channelId.
*/
@java.lang.Override
public int getChannelId() {
return channelId_;
}
/**
* <code>uint32 channel_id = 15;</code>
* @param value The channelId to set.
* @return This builder for chaining.
*/
public Builder setChannelId(int value) {
channelId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 channel_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearChannelId() {
channelId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -719,10 +729,10 @@ public final class PlayerChatReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023PlayerChatReq.proto\032\016ChatInfo.proto\"?\n" +
"\rPlayerChatReq\022\021\n\tchannelId\030\005 \001(\r\022\033\n\010cha" +
"tInfo\030\014 \001(\0132\t.ChatInfoB\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
"\n\023PlayerChatReq.proto\032\016ChatInfo.proto\"A\n" +
"\rPlayerChatReq\022\034\n\tchat_info\030\005 \001(\0132\t.Chat" +
"Info\022\022\n\nchannel_id\030\017 \001(\rB\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -734,7 +744,7 @@ public final class PlayerChatReqOuterClass {
internal_static_PlayerChatReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerChatReq_descriptor,
new java.lang.String[] { "ChannelId", "ChatInfo", });
new java.lang.String[] { "ChatInfo", "ChannelId", });
emu.grasscutter.net.proto.ChatInfoOuterClass.getDescriptor();
}