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

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java
+89 -89
View File
@@ -19,35 +19,35 @@ public final class EvtBeingHitInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 frame_num = 1;</code>
* @return The frameNum.
* <code>uint32 peer_id = 10;</code>
* @return The peerId.
*/
int getFrameNum();
int getPeerId();
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
* @return Whether the attackResult field is set.
*/
boolean hasAttackResult();
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
* @return The attackResult.
*/
emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackResult();
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder();
/**
* <code>uint32 peer_id = 3;</code>
* @return The peerId.
* <code>uint32 frame_num = 5;</code>
* @return The frameNum.
*/
int getPeerId();
int getFrameNum();
}
/**
* <pre>
* Name: IHBAACKKKEC
* Name: CHCBEEGOBEN
* </pre>
*
* Protobuf type {@code EvtBeingHitInfo}
@@ -94,17 +94,17 @@ public final class EvtBeingHitInfoOuterClass {
case 0:
done = true;
break;
case 8: {
case 40: {
frameNum_ = input.readUInt32();
break;
}
case 24: {
case 80: {
peerId_ = input.readUInt32();
break;
}
case 66: {
case 122: {
emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder subBuilder = null;
if (attackResult_ != null) {
subBuilder = attackResult_.toBuilder();
@@ -149,21 +149,21 @@ public final class EvtBeingHitInfoOuterClass {
emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.class, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder.class);
}
public static final int FRAME_NUM_FIELD_NUMBER = 1;
private int frameNum_;
public static final int PEER_ID_FIELD_NUMBER = 10;
private int peerId_;
/**
* <code>uint32 frame_num = 1;</code>
* @return The frameNum.
* <code>uint32 peer_id = 10;</code>
* @return The peerId.
*/
@java.lang.Override
public int getFrameNum() {
return frameNum_;
public int getPeerId() {
return peerId_;
}
public static final int ATTACK_RESULT_FIELD_NUMBER = 8;
public static final int ATTACK_RESULT_FIELD_NUMBER = 15;
private emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult attackResult_;
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
* @return Whether the attackResult field is set.
*/
@java.lang.Override
@@ -171,7 +171,7 @@ public final class EvtBeingHitInfoOuterClass {
return attackResult_ != null;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
* @return The attackResult.
*/
@java.lang.Override
@@ -179,22 +179,22 @@ public final class EvtBeingHitInfoOuterClass {
return attackResult_ == null ? emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.getDefaultInstance() : attackResult_;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder() {
return getAttackResult();
}
public static final int PEER_ID_FIELD_NUMBER = 3;
private int peerId_;
public static final int FRAME_NUM_FIELD_NUMBER = 5;
private int frameNum_;
/**
* <code>uint32 peer_id = 3;</code>
* @return The peerId.
* <code>uint32 frame_num = 5;</code>
* @return The frameNum.
*/
@java.lang.Override
public int getPeerId() {
return peerId_;
public int getFrameNum() {
return frameNum_;
}
private byte memoizedIsInitialized = -1;
@@ -212,13 +212,13 @@ public final class EvtBeingHitInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (frameNum_ != 0) {
output.writeUInt32(1, frameNum_);
output.writeUInt32(5, frameNum_);
}
if (peerId_ != 0) {
output.writeUInt32(3, peerId_);
output.writeUInt32(10, peerId_);
}
if (attackResult_ != null) {
output.writeMessage(8, getAttackResult());
output.writeMessage(15, getAttackResult());
}
unknownFields.writeTo(output);
}
@@ -231,15 +231,15 @@ public final class EvtBeingHitInfoOuterClass {
size = 0;
if (frameNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, frameNum_);
.computeUInt32Size(5, frameNum_);
}
if (peerId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, peerId_);
.computeUInt32Size(10, peerId_);
}
if (attackResult_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, getAttackResult());
.computeMessageSize(15, getAttackResult());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -256,15 +256,15 @@ public final class EvtBeingHitInfoOuterClass {
}
emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo other = (emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo) obj;
if (getFrameNum()
!= other.getFrameNum()) return false;
if (getPeerId()
!= other.getPeerId()) return false;
if (hasAttackResult() != other.hasAttackResult()) return false;
if (hasAttackResult()) {
if (!getAttackResult()
.equals(other.getAttackResult())) return false;
}
if (getPeerId()
!= other.getPeerId()) return false;
if (getFrameNum()
!= other.getFrameNum()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -276,14 +276,14 @@ public final class EvtBeingHitInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + FRAME_NUM_FIELD_NUMBER;
hash = (53 * hash) + getFrameNum();
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId();
if (hasAttackResult()) {
hash = (37 * hash) + ATTACK_RESULT_FIELD_NUMBER;
hash = (53 * hash) + getAttackResult().hashCode();
}
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId();
hash = (37 * hash) + FRAME_NUM_FIELD_NUMBER;
hash = (53 * hash) + getFrameNum();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -381,7 +381,7 @@ public final class EvtBeingHitInfoOuterClass {
}
/**
* <pre>
* Name: IHBAACKKKEC
* Name: CHCBEEGOBEN
* </pre>
*
* Protobuf type {@code EvtBeingHitInfo}
@@ -421,7 +421,7 @@ public final class EvtBeingHitInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
frameNum_ = 0;
peerId_ = 0;
if (attackResultBuilder_ == null) {
attackResult_ = null;
@@ -429,7 +429,7 @@ public final class EvtBeingHitInfoOuterClass {
attackResult_ = null;
attackResultBuilder_ = null;
}
peerId_ = 0;
frameNum_ = 0;
return this;
}
@@ -457,13 +457,13 @@ public final class EvtBeingHitInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo buildPartial() {
emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo result = new emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo(this);
result.frameNum_ = frameNum_;
result.peerId_ = peerId_;
if (attackResultBuilder_ == null) {
result.attackResult_ = attackResult_;
} else {
result.attackResult_ = attackResultBuilder_.build();
}
result.peerId_ = peerId_;
result.frameNum_ = frameNum_;
onBuilt();
return result;
}
@@ -512,14 +512,14 @@ public final class EvtBeingHitInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo other) {
if (other == emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.getDefaultInstance()) return this;
if (other.getFrameNum() != 0) {
setFrameNum(other.getFrameNum());
if (other.getPeerId() != 0) {
setPeerId(other.getPeerId());
}
if (other.hasAttackResult()) {
mergeAttackResult(other.getAttackResult());
}
if (other.getPeerId() != 0) {
setPeerId(other.getPeerId());
if (other.getFrameNum() != 0) {
setFrameNum(other.getFrameNum());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -550,33 +550,33 @@ public final class EvtBeingHitInfoOuterClass {
return this;
}
private int frameNum_ ;
private int peerId_ ;
/**
* <code>uint32 frame_num = 1;</code>
* @return The frameNum.
* <code>uint32 peer_id = 10;</code>
* @return The peerId.
*/
@java.lang.Override
public int getFrameNum() {
return frameNum_;
public int getPeerId() {
return peerId_;
}
/**
* <code>uint32 frame_num = 1;</code>
* @param value The frameNum to set.
* <code>uint32 peer_id = 10;</code>
* @param value The peerId to set.
* @return This builder for chaining.
*/
public Builder setFrameNum(int value) {
public Builder setPeerId(int value) {
frameNum_ = value;
peerId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 frame_num = 1;</code>
* <code>uint32 peer_id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearFrameNum() {
public Builder clearPeerId() {
frameNum_ = 0;
peerId_ = 0;
onChanged();
return this;
}
@@ -585,14 +585,14 @@ public final class EvtBeingHitInfoOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder> attackResultBuilder_;
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
* @return Whether the attackResult field is set.
*/
public boolean hasAttackResult() {
return attackResultBuilder_ != null || attackResult_ != null;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
* @return The attackResult.
*/
public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackResult() {
@@ -603,7 +603,7 @@ public final class EvtBeingHitInfoOuterClass {
}
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
public Builder setAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult value) {
if (attackResultBuilder_ == null) {
@@ -619,7 +619,7 @@ public final class EvtBeingHitInfoOuterClass {
return this;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
public Builder setAttackResult(
emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder builderForValue) {
@@ -633,7 +633,7 @@ public final class EvtBeingHitInfoOuterClass {
return this;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
public Builder mergeAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult value) {
if (attackResultBuilder_ == null) {
@@ -651,7 +651,7 @@ public final class EvtBeingHitInfoOuterClass {
return this;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
public Builder clearAttackResult() {
if (attackResultBuilder_ == null) {
@@ -665,7 +665,7 @@ public final class EvtBeingHitInfoOuterClass {
return this;
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder getAttackResultBuilder() {
@@ -673,7 +673,7 @@ public final class EvtBeingHitInfoOuterClass {
return getAttackResultFieldBuilder().getBuilder();
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder() {
if (attackResultBuilder_ != null) {
@@ -684,7 +684,7 @@ public final class EvtBeingHitInfoOuterClass {
}
}
/**
* <code>.AttackResult attack_result = 8;</code>
* <code>.AttackResult attack_result = 15;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder>
@@ -700,33 +700,33 @@ public final class EvtBeingHitInfoOuterClass {
return attackResultBuilder_;
}
private int peerId_ ;
private int frameNum_ ;
/**
* <code>uint32 peer_id = 3;</code>
* @return The peerId.
* <code>uint32 frame_num = 5;</code>
* @return The frameNum.
*/
@java.lang.Override
public int getPeerId() {
return peerId_;
public int getFrameNum() {
return frameNum_;
}
/**
* <code>uint32 peer_id = 3;</code>
* @param value The peerId to set.
* <code>uint32 frame_num = 5;</code>
* @param value The frameNum to set.
* @return This builder for chaining.
*/
public Builder setPeerId(int value) {
public Builder setFrameNum(int value) {
peerId_ = value;
frameNum_ = value;
onChanged();
return this;
}
/**
* <code>uint32 peer_id = 3;</code>
* <code>uint32 frame_num = 5;</code>
* @return This builder for chaining.
*/
public Builder clearPeerId() {
public Builder clearFrameNum() {
peerId_ = 0;
frameNum_ = 0;
onChanged();
return this;
}
@@ -798,9 +798,9 @@ public final class EvtBeingHitInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\025EvtBeingHitInfo.proto\032\022AttackResult.pr" +
"oto\"[\n\017EvtBeingHitInfo\022\021\n\tframe_num\030\001 \001(" +
"\r\022$\n\rattack_result\030\010 \001(\0132\r.AttackResult\022" +
"\017\n\007peer_id\030\003 \001(\rB\033\n\031emu.grasscutter.net." +
"oto\"[\n\017EvtBeingHitInfo\022\017\n\007peer_id\030\n \001(\r\022" +
"$\n\rattack_result\030\017 \001(\0132\r.AttackResult\022\021\n" +
"\tframe_num\030\005 \001(\rB\033\n\031emu.grasscutter.net." +
"protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -813,7 +813,7 @@ public final class EvtBeingHitInfoOuterClass {
internal_static_EvtBeingHitInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_EvtBeingHitInfo_descriptor,
new java.lang.String[] { "FrameNum", "AttackResult", "PeerId", });
new java.lang.String[] { "PeerId", "AttackResult", "FrameNum", });
emu.grasscutter.net.proto.AttackResultOuterClass.getDescriptor();
}