From f1f4b209260df7f55083c3d9316064e04a5ace02 Mon Sep 17 00:00:00 2001 From: WatchAndyTW Date: Sun, 14 Apr 2024 20:49:25 +0800 Subject: [PATCH] Support windy lua --- .gitignore | 1 + .../proto/WindSeedClientNotifyOuterClass.java | 600 +++++++++--------- .../proto/WindSeedType1NotifyOuterClass.java | 154 +++-- .../proto/WindSeedType2NotifyOuterClass.java | 62 +- .../proto/WindSeedType3NotifyOuterClass.java | 62 +- .../command/commands/WindyCommand.java | 34 + .../grasscutter/net/packet/PacketOpcodes.java | 6 +- 7 files changed, 444 insertions(+), 475 deletions(-) create mode 100644 src/main/java/emu/grasscutter/command/commands/WindyCommand.java diff --git a/.gitignore b/.gitignore index 0ee3fb69f24..7db9aad9b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,7 @@ tmp/ /language /languages /proto +/lua /*.jar /*.sh diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedClientNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedClientNotifyOuterClass.java index 086333852d0..fcff21e64ad 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedClientNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedClientNotifyOuterClass.java @@ -19,32 +19,32 @@ public interface WindSeedClientNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; * @return Whether the refreshNotify field is set. */ boolean hasRefreshNotify(); /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; * @return The refreshNotify. */ emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify getRefreshNotify(); /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotifyOrBuilder getRefreshNotifyOrBuilder(); /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; * @return Whether the addWindBulletNotify field is set. */ boolean hasAddWindBulletNotify(); /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; * @return The addWindBulletNotify. */ emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify getAddWindBulletNotify(); /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotifyOrBuilder getAddWindBulletNotifyOrBuilder(); @@ -66,11 +66,6 @@ public interface WindSeedClientNotifyOrBuilder extends public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.NotifyCase getNotifyCase(); } /** - * 
-   * CmdId: 28351
-   * Obf: HLBBDEJIMLI
-   *
- * * Protobuf type {@code WindSeedClientNotify} */ public static final class WindSeedClientNotify extends @@ -115,9 +110,9 @@ private WindSeedClientNotify( case 0: done = true; break; - case 18: { + case 34: { emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.Builder subBuilder = null; - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { subBuilder = ((emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_).toBuilder(); } notify_ = @@ -126,12 +121,12 @@ private WindSeedClientNotify( subBuilder.mergeFrom((emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_); notify_ = subBuilder.buildPartial(); } - notifyCase_ = 2; + notifyCase_ = 4; break; } - case 90: { + case 106: { emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.Builder subBuilder = null; - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { subBuilder = ((emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_).toBuilder(); } notify_ = @@ -140,7 +135,7 @@ private WindSeedClientNotify( subBuilder.mergeFrom((emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_); notify_ = subBuilder.buildPartial(); } - notifyCase_ = 11; + notifyCase_ = 13; break; } case 114: { @@ -194,16 +189,12 @@ public interface RefreshNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 refresh_num = 1; + * uint32 refresh_num = 4; * @return The refreshNum. */ int getRefreshNum(); } /** - * 
-     * Obf: NEABCKDIKBA
-     *
- * * Protobuf type {@code WindSeedClientNotify.RefreshNotify} */ public static final class RefreshNotify extends @@ -248,7 +239,7 @@ private RefreshNotify( case 0: done = true; break; - case 8: { + case 32: { refreshNum_ = input.readUInt32(); break; @@ -285,10 +276,10 @@ private RefreshNotify( emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.class, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.Builder.class); } - public static final int REFRESH_NUM_FIELD_NUMBER = 1; + public static final int REFRESH_NUM_FIELD_NUMBER = 4; private int refreshNum_; /** - * uint32 refresh_num = 1; + * uint32 refresh_num = 4; * @return The refreshNum. */ @java.lang.Override @@ -311,7 +302,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (refreshNum_ != 0) { - output.writeUInt32(1, refreshNum_); + output.writeUInt32(4, refreshNum_); } unknownFields.writeTo(output); } @@ -324,7 +315,7 @@ public int getSerializedSize() { size = 0; if (refreshNum_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, refreshNum_); + .computeUInt32Size(4, refreshNum_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -452,10 +443,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-       * Obf: NEABCKDIKBA
-       *
- * * Protobuf type {@code WindSeedClientNotify.RefreshNotify} */ public static final class Builder extends @@ -604,7 +591,7 @@ public Builder mergeFrom( private int refreshNum_ ; /** - * uint32 refresh_num = 1; + * uint32 refresh_num = 4; * @return The refreshNum. */ @java.lang.Override @@ -612,7 +599,7 @@ public int getRefreshNum() { return refreshNum_; } /** - * uint32 refresh_num = 1; + * uint32 refresh_num = 4; * @param value The refreshNum to set. * @return This builder for chaining. */ @@ -623,7 +610,7 @@ public Builder setRefreshNum(int value) { return this; } /** - * uint32 refresh_num = 1; + * uint32 refresh_num = 4; * @return This builder for chaining. */ public Builder clearRefreshNum() { @@ -690,37 +677,33 @@ public interface AddWindBulletNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; * @return Whether the seedPos field is set. */ boolean hasSeedPos(); /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; * @return The seedPos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getSeedPos(); /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSeedPosOrBuilder(); /** - * uint32 AACKLENGCOO = 5; - * @return The aACKLENGCOO. + * uint32 HCHIGHEKMPI = 12; + * @return The hCHIGHEKMPI. */ - int getAACKLENGCOO(); + int getHCHIGHEKMPI(); /** - * uint32 AAJBMHIIPBP = 9; - * @return The aAJBMHIIPBP. + * uint32 FJOPGEEAHNB = 1; + * @return The fJOPGEEAHNB. */ - int getAAJBMHIIPBP(); + int getFJOPGEEAHNB(); } /** - * 
-     * Obf: FENMFHPLEIM
-     *
- * * Protobuf type {@code WindSeedClientNotify.AddWindBulletNotify} */ public static final class AddWindBulletNotify extends @@ -765,12 +748,12 @@ private AddWindBulletNotify( case 0: done = true; break; - case 40: { + case 8: { - aACKLENGCOO_ = input.readUInt32(); + fJOPGEEAHNB_ = input.readUInt32(); break; } - case 66: { + case 42: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (seedPos_ != null) { subBuilder = seedPos_.toBuilder(); @@ -783,9 +766,9 @@ private AddWindBulletNotify( break; } - case 72: { + case 96: { - aAJBMHIIPBP_ = input.readUInt32(); + hCHIGHEKMPI_ = input.readUInt32(); break; } default: { @@ -820,10 +803,10 @@ private AddWindBulletNotify( emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.class, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.Builder.class); } - public static final int SEED_POS_FIELD_NUMBER = 8; + public static final int SEED_POS_FIELD_NUMBER = 5; private emu.grasscutter.net.proto.VectorOuterClass.Vector seedPos_; /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; * @return Whether the seedPos field is set. */ @java.lang.Override @@ -831,7 +814,7 @@ public boolean hasSeedPos() { return seedPos_ != null; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; * @return The seedPos. */ @java.lang.Override @@ -839,33 +822,33 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getSeedPos() { return seedPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : seedPos_; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSeedPosOrBuilder() { return getSeedPos(); } - public static final int AACKLENGCOO_FIELD_NUMBER = 5; - private int aACKLENGCOO_; + public static final int HCHIGHEKMPI_FIELD_NUMBER = 12; + private int hCHIGHEKMPI_; /** - * uint32 AACKLENGCOO = 5; - * @return The aACKLENGCOO. + * uint32 HCHIGHEKMPI = 12; + * @return The hCHIGHEKMPI. */ @java.lang.Override - public int getAACKLENGCOO() { - return aACKLENGCOO_; + public int getHCHIGHEKMPI() { + return hCHIGHEKMPI_; } - public static final int AAJBMHIIPBP_FIELD_NUMBER = 9; - private int aAJBMHIIPBP_; + public static final int FJOPGEEAHNB_FIELD_NUMBER = 1; + private int fJOPGEEAHNB_; /** - * uint32 AAJBMHIIPBP = 9; - * @return The aAJBMHIIPBP. + * uint32 FJOPGEEAHNB = 1; + * @return The fJOPGEEAHNB. */ @java.lang.Override - public int getAAJBMHIIPBP() { - return aAJBMHIIPBP_; + public int getFJOPGEEAHNB() { + return fJOPGEEAHNB_; } private byte memoizedIsInitialized = -1; @@ -882,14 +865,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (aACKLENGCOO_ != 0) { - output.writeUInt32(5, aACKLENGCOO_); + if (fJOPGEEAHNB_ != 0) { + output.writeUInt32(1, fJOPGEEAHNB_); } if (seedPos_ != null) { - output.writeMessage(8, getSeedPos()); + output.writeMessage(5, getSeedPos()); } - if (aAJBMHIIPBP_ != 0) { - output.writeUInt32(9, aAJBMHIIPBP_); + if (hCHIGHEKMPI_ != 0) { + output.writeUInt32(12, hCHIGHEKMPI_); } unknownFields.writeTo(output); } @@ -900,17 +883,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (aACKLENGCOO_ != 0) { + if (fJOPGEEAHNB_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, aACKLENGCOO_); + .computeUInt32Size(1, fJOPGEEAHNB_); } if (seedPos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getSeedPos()); + .computeMessageSize(5, getSeedPos()); } - if (aAJBMHIIPBP_ != 0) { + if (hCHIGHEKMPI_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, aAJBMHIIPBP_); + .computeUInt32Size(12, hCHIGHEKMPI_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -932,10 +915,10 @@ public boolean equals(final java.lang.Object obj) { if (!getSeedPos() .equals(other.getSeedPos())) return false; } - if (getAACKLENGCOO() - != other.getAACKLENGCOO()) return false; - if (getAAJBMHIIPBP() - != other.getAAJBMHIIPBP()) return false; + if (getHCHIGHEKMPI() + != other.getHCHIGHEKMPI()) return false; + if (getFJOPGEEAHNB() + != other.getFJOPGEEAHNB()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -951,10 +934,10 @@ public int hashCode() { hash = (37 * hash) + SEED_POS_FIELD_NUMBER; hash = (53 * hash) + getSeedPos().hashCode(); } - hash = (37 * hash) + AACKLENGCOO_FIELD_NUMBER; - hash = (53 * hash) + getAACKLENGCOO(); - hash = (37 * hash) + AAJBMHIIPBP_FIELD_NUMBER; - hash = (53 * hash) + getAAJBMHIIPBP(); + hash = (37 * hash) + HCHIGHEKMPI_FIELD_NUMBER; + hash = (53 * hash) + getHCHIGHEKMPI(); + hash = (37 * hash) + FJOPGEEAHNB_FIELD_NUMBER; + hash = (53 * hash) + getFJOPGEEAHNB(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1051,10 +1034,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-       * Obf: FENMFHPLEIM
-       *
- * * Protobuf type {@code WindSeedClientNotify.AddWindBulletNotify} */ public static final class Builder extends @@ -1098,9 +1077,9 @@ public Builder clear() { seedPos_ = null; seedPosBuilder_ = null; } - aACKLENGCOO_ = 0; + hCHIGHEKMPI_ = 0; - aAJBMHIIPBP_ = 0; + fJOPGEEAHNB_ = 0; return this; } @@ -1133,8 +1112,8 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo } else { result.seedPos_ = seedPosBuilder_.build(); } - result.aACKLENGCOO_ = aACKLENGCOO_; - result.aAJBMHIIPBP_ = aAJBMHIIPBP_; + result.hCHIGHEKMPI_ = hCHIGHEKMPI_; + result.fJOPGEEAHNB_ = fJOPGEEAHNB_; onBuilt(); return result; } @@ -1186,11 +1165,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.WindSeedClientNotifyOuterClas if (other.hasSeedPos()) { mergeSeedPos(other.getSeedPos()); } - if (other.getAACKLENGCOO() != 0) { - setAACKLENGCOO(other.getAACKLENGCOO()); + if (other.getHCHIGHEKMPI() != 0) { + setHCHIGHEKMPI(other.getHCHIGHEKMPI()); } - if (other.getAAJBMHIIPBP() != 0) { - setAAJBMHIIPBP(other.getAAJBMHIIPBP()); + if (other.getFJOPGEEAHNB() != 0) { + setFJOPGEEAHNB(other.getFJOPGEEAHNB()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1225,14 +1204,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> seedPosBuilder_; /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; * @return Whether the seedPos field is set. */ public boolean hasSeedPos() { return seedPosBuilder_ != null || seedPos_ != null; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; * @return The seedPos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getSeedPos() { @@ -1243,7 +1222,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getSeedPos() { } } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ public Builder setSeedPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (seedPosBuilder_ == null) { @@ -1259,7 +1238,7 @@ public Builder setSeedPos(emu.grasscutter.net.proto.VectorOuterClass.Vector valu return this; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ public Builder setSeedPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1273,7 +1252,7 @@ public Builder setSeedPos( return this; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ public Builder mergeSeedPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (seedPosBuilder_ == null) { @@ -1291,7 +1270,7 @@ public Builder mergeSeedPos(emu.grasscutter.net.proto.VectorOuterClass.Vector va return this; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ public Builder clearSeedPos() { if (seedPosBuilder_ == null) { @@ -1305,7 +1284,7 @@ public Builder clearSeedPos() { return this; } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSeedPosBuilder() { @@ -1313,7 +1292,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSeedPosBuild return getSeedPosFieldBuilder().getBuilder(); } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSeedPosOrBuilder() { if (seedPosBuilder_ != null) { @@ -1324,7 +1303,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSeedPosOrBu } } /** - * .Vector seed_pos = 8; + * .Vector seed_pos = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -1340,64 +1319,64 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSeedPosOrBu return seedPosBuilder_; } - private int aACKLENGCOO_ ; + private int hCHIGHEKMPI_ ; /** - * uint32 AACKLENGCOO = 5; - * @return The aACKLENGCOO. + * uint32 HCHIGHEKMPI = 12; + * @return The hCHIGHEKMPI. */ @java.lang.Override - public int getAACKLENGCOO() { - return aACKLENGCOO_; + public int getHCHIGHEKMPI() { + return hCHIGHEKMPI_; } /** - * uint32 AACKLENGCOO = 5; - * @param value The aACKLENGCOO to set. + * uint32 HCHIGHEKMPI = 12; + * @param value The hCHIGHEKMPI to set. * @return This builder for chaining. */ - public Builder setAACKLENGCOO(int value) { + public Builder setHCHIGHEKMPI(int value) { - aACKLENGCOO_ = value; + hCHIGHEKMPI_ = value; onChanged(); return this; } /** - * uint32 AACKLENGCOO = 5; + * uint32 HCHIGHEKMPI = 12; * @return This builder for chaining. */ - public Builder clearAACKLENGCOO() { + public Builder clearHCHIGHEKMPI() { - aACKLENGCOO_ = 0; + hCHIGHEKMPI_ = 0; onChanged(); return this; } - private int aAJBMHIIPBP_ ; + private int fJOPGEEAHNB_ ; /** - * uint32 AAJBMHIIPBP = 9; - * @return The aAJBMHIIPBP. + * uint32 FJOPGEEAHNB = 1; + * @return The fJOPGEEAHNB. */ @java.lang.Override - public int getAAJBMHIIPBP() { - return aAJBMHIIPBP_; + public int getFJOPGEEAHNB() { + return fJOPGEEAHNB_; } /** - * uint32 AAJBMHIIPBP = 9; - * @param value The aAJBMHIIPBP to set. + * uint32 FJOPGEEAHNB = 1; + * @param value The fJOPGEEAHNB to set. * @return This builder for chaining. */ - public Builder setAAJBMHIIPBP(int value) { + public Builder setFJOPGEEAHNB(int value) { - aAJBMHIIPBP_ = value; + fJOPGEEAHNB_ = value; onChanged(); return this; } /** - * uint32 AAJBMHIIPBP = 9; + * uint32 FJOPGEEAHNB = 1; * @return This builder for chaining. */ - public Builder clearAAJBMHIIPBP() { + public Builder clearFJOPGEEAHNB() { - aAJBMHIIPBP_ = 0; + fJOPGEEAHNB_ = 0; onChanged(); return this; } @@ -1459,28 +1438,24 @@ public interface AreaNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 area_id = 10; - * @return The areaId. + * bytes area_code = 7; + * @return The areaCode. */ - int getAreaId(); + com.google.protobuf.ByteString getAreaCode(); /** - * uint32 area_type = 6; + * uint32 area_type = 4; * @return The areaType. */ int getAreaType(); /** - * bytes area_code = 5; - * @return The areaCode. + * uint32 area_id = 5; + * @return The areaId. */ - com.google.protobuf.ByteString getAreaCode(); + int getAreaId(); } /** - * 
-     * Obf: IKBNJENCHHH
-     *
- * * Protobuf type {@code WindSeedClientNotify.AreaNotify} */ public static final class AreaNotify extends @@ -1526,19 +1501,19 @@ private AreaNotify( case 0: done = true; break; - case 42: { + case 32: { - areaCode_ = input.readBytes(); + areaType_ = input.readUInt32(); break; } - case 48: { + case 40: { - areaType_ = input.readUInt32(); + areaId_ = input.readUInt32(); break; } - case 80: { + case 58: { - areaId_ = input.readUInt32(); + areaCode_ = input.readBytes(); break; } default: { @@ -1573,21 +1548,21 @@ private AreaNotify( emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify.class, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify.Builder.class); } - public static final int AREA_ID_FIELD_NUMBER = 10; - private int areaId_; + public static final int AREA_CODE_FIELD_NUMBER = 7; + private com.google.protobuf.ByteString areaCode_; /** - * uint32 area_id = 10; - * @return The areaId. + * bytes area_code = 7; + * @return The areaCode. */ @java.lang.Override - public int getAreaId() { - return areaId_; + public com.google.protobuf.ByteString getAreaCode() { + return areaCode_; } - public static final int AREA_TYPE_FIELD_NUMBER = 6; + public static final int AREA_TYPE_FIELD_NUMBER = 4; private int areaType_; /** - * uint32 area_type = 6; + * uint32 area_type = 4; * @return The areaType. */ @java.lang.Override @@ -1595,15 +1570,15 @@ public int getAreaType() { return areaType_; } - public static final int AREA_CODE_FIELD_NUMBER = 5; - private com.google.protobuf.ByteString areaCode_; + public static final int AREA_ID_FIELD_NUMBER = 5; + private int areaId_; /** - * bytes area_code = 5; - * @return The areaCode. + * uint32 area_id = 5; + * @return The areaId. */ @java.lang.Override - public com.google.protobuf.ByteString getAreaCode() { - return areaCode_; + public int getAreaId() { + return areaId_; } private byte memoizedIsInitialized = -1; @@ -1620,14 +1595,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!areaCode_.isEmpty()) { - output.writeBytes(5, areaCode_); - } if (areaType_ != 0) { - output.writeUInt32(6, areaType_); + output.writeUInt32(4, areaType_); } if (areaId_ != 0) { - output.writeUInt32(10, areaId_); + output.writeUInt32(5, areaId_); + } + if (!areaCode_.isEmpty()) { + output.writeBytes(7, areaCode_); } unknownFields.writeTo(output); } @@ -1638,17 +1613,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!areaCode_.isEmpty()) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(5, areaCode_); - } if (areaType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, areaType_); + .computeUInt32Size(4, areaType_); } if (areaId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, areaId_); + .computeUInt32Size(5, areaId_); + } + if (!areaCode_.isEmpty()) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(7, areaCode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1665,12 +1640,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify other = (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify) obj; - if (getAreaId() - != other.getAreaId()) return false; - if (getAreaType() - != other.getAreaType()) return false; if (!getAreaCode() .equals(other.getAreaCode())) return false; + if (getAreaType() + != other.getAreaType()) return false; + if (getAreaId() + != other.getAreaId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1682,12 +1657,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AREA_ID_FIELD_NUMBER; - hash = (53 * hash) + getAreaId(); - hash = (37 * hash) + AREA_TYPE_FIELD_NUMBER; - hash = (53 * hash) + getAreaType(); hash = (37 * hash) + AREA_CODE_FIELD_NUMBER; hash = (53 * hash) + getAreaCode().hashCode(); + hash = (37 * hash) + AREA_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getAreaType(); + hash = (37 * hash) + AREA_ID_FIELD_NUMBER; + hash = (53 * hash) + getAreaId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1784,10 +1759,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-       * Obf: IKBNJENCHHH
-       *
- * * Protobuf type {@code WindSeedClientNotify.AreaNotify} */ public static final class Builder extends @@ -1825,11 +1796,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - areaId_ = 0; + areaCode_ = com.google.protobuf.ByteString.EMPTY; areaType_ = 0; - areaCode_ = com.google.protobuf.ByteString.EMPTY; + areaId_ = 0; return this; } @@ -1857,9 +1828,9 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify buildPartial() { emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify result = new emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify(this); - result.areaId_ = areaId_; - result.areaType_ = areaType_; result.areaCode_ = areaCode_; + result.areaType_ = areaType_; + result.areaId_ = areaId_; onBuilt(); return result; } @@ -1908,14 +1879,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify other) { if (other == emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify.getDefaultInstance()) return this; - if (other.getAreaId() != 0) { - setAreaId(other.getAreaId()); + if (other.getAreaCode() != com.google.protobuf.ByteString.EMPTY) { + setAreaCode(other.getAreaCode()); } if (other.getAreaType() != 0) { setAreaType(other.getAreaType()); } - if (other.getAreaCode() != com.google.protobuf.ByteString.EMPTY) { - setAreaCode(other.getAreaCode()); + if (other.getAreaId() != 0) { + setAreaId(other.getAreaId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1946,40 +1917,43 @@ public Builder mergeFrom( return this; } - private int areaId_ ; + private com.google.protobuf.ByteString areaCode_ = com.google.protobuf.ByteString.EMPTY; /** - * uint32 area_id = 10; - * @return The areaId. + * bytes area_code = 7; + * @return The areaCode. */ @java.lang.Override - public int getAreaId() { - return areaId_; + public com.google.protobuf.ByteString getAreaCode() { + return areaCode_; } /** - * uint32 area_id = 10; - * @param value The areaId to set. + * bytes area_code = 7; + * @param value The areaCode to set. * @return This builder for chaining. */ - public Builder setAreaId(int value) { - - areaId_ = value; + public Builder setAreaCode(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + areaCode_ = value; onChanged(); return this; } /** - * uint32 area_id = 10; + * bytes area_code = 7; * @return This builder for chaining. */ - public Builder clearAreaId() { + public Builder clearAreaCode() { - areaId_ = 0; + areaCode_ = getDefaultInstance().getAreaCode(); onChanged(); return this; } private int areaType_ ; /** - * uint32 area_type = 6; + * uint32 area_type = 4; * @return The areaType. */ @java.lang.Override @@ -1987,7 +1961,7 @@ public int getAreaType() { return areaType_; } /** - * uint32 area_type = 6; + * uint32 area_type = 4; * @param value The areaType to set. * @return This builder for chaining. */ @@ -1998,7 +1972,7 @@ public Builder setAreaType(int value) { return this; } /** - * uint32 area_type = 6; + * uint32 area_type = 4; * @return This builder for chaining. */ public Builder clearAreaType() { @@ -2008,36 +1982,33 @@ public Builder clearAreaType() { return this; } - private com.google.protobuf.ByteString areaCode_ = com.google.protobuf.ByteString.EMPTY; + private int areaId_ ; /** - * bytes area_code = 5; - * @return The areaCode. + * uint32 area_id = 5; + * @return The areaId. */ @java.lang.Override - public com.google.protobuf.ByteString getAreaCode() { - return areaCode_; + public int getAreaId() { + return areaId_; } /** - * bytes area_code = 5; - * @param value The areaCode to set. + * uint32 area_id = 5; + * @param value The areaId to set. * @return This builder for chaining. */ - public Builder setAreaCode(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - - areaCode_ = value; + public Builder setAreaId(int value) { + + areaId_ = value; onChanged(); return this; } /** - * bytes area_code = 5; + * uint32 area_id = 5; * @return This builder for chaining. */ - public Builder clearAreaCode() { + public Builder clearAreaId() { - areaCode_ = getDefaultInstance().getAreaCode(); + areaId_ = 0; onChanged(); return this; } @@ -2099,8 +2070,8 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo public enum NotifyCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { - REFRESH_NOTIFY(2), - ADD_WIND_BULLET_NOTIFY(11), + REFRESH_NOTIFY(4), + ADD_WIND_BULLET_NOTIFY(13), AREA_NOTIFY(14), NOTIFY_NOT_SET(0); private final int value; @@ -2119,8 +2090,8 @@ public static NotifyCase valueOf(int value) { public static NotifyCase forNumber(int value) { switch (value) { - case 2: return REFRESH_NOTIFY; - case 11: return ADD_WIND_BULLET_NOTIFY; + case 4: return REFRESH_NOTIFY; + case 13: return ADD_WIND_BULLET_NOTIFY; case 14: return AREA_NOTIFY; case 0: return NOTIFY_NOT_SET; default: return null; @@ -2137,63 +2108,63 @@ public int getNumber() { notifyCase_); } - public static final int REFRESH_NOTIFY_FIELD_NUMBER = 2; + public static final int REFRESH_NOTIFY_FIELD_NUMBER = 4; /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; * @return Whether the refreshNotify field is set. */ @java.lang.Override public boolean hasRefreshNotify() { - return notifyCase_ == 2; + return notifyCase_ == 4; } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; * @return The refreshNotify. */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify getRefreshNotify() { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance(); } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotifyOrBuilder getRefreshNotifyOrBuilder() { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance(); } - public static final int ADD_WIND_BULLET_NOTIFY_FIELD_NUMBER = 11; + public static final int ADD_WIND_BULLET_NOTIFY_FIELD_NUMBER = 13; /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; * @return Whether the addWindBulletNotify field is set. */ @java.lang.Override public boolean hasAddWindBulletNotify() { - return notifyCase_ == 11; + return notifyCase_ == 13; } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; * @return The addWindBulletNotify. */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify getAddWindBulletNotify() { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance(); } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotifyOrBuilder getAddWindBulletNotifyOrBuilder() { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance(); @@ -2244,11 +2215,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (notifyCase_ == 2) { - output.writeMessage(2, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_); + if (notifyCase_ == 4) { + output.writeMessage(4, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_); } - if (notifyCase_ == 11) { - output.writeMessage(11, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_); + if (notifyCase_ == 13) { + output.writeMessage(13, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_); } if (notifyCase_ == 14) { output.writeMessage(14, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AreaNotify) notify_); @@ -2262,13 +2233,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_); + .computeMessageSize(4, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_); } - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_); + .computeMessageSize(13, (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_); } if (notifyCase_ == 14) { size += com.google.protobuf.CodedOutputStream @@ -2291,11 +2262,11 @@ public boolean equals(final java.lang.Object obj) { if (!getNotifyCase().equals(other.getNotifyCase())) return false; switch (notifyCase_) { - case 2: + case 4: if (!getRefreshNotify() .equals(other.getRefreshNotify())) return false; break; - case 11: + case 13: if (!getAddWindBulletNotify() .equals(other.getAddWindBulletNotify())) return false; break; @@ -2318,11 +2289,11 @@ public int hashCode() { int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); switch (notifyCase_) { - case 2: + case 4: hash = (37 * hash) + REFRESH_NOTIFY_FIELD_NUMBER; hash = (53 * hash) + getRefreshNotify().hashCode(); break; - case 11: + case 13: hash = (37 * hash) + ADD_WIND_BULLET_NOTIFY_FIELD_NUMBER; hash = (53 * hash) + getAddWindBulletNotify().hashCode(); break; @@ -2429,11 +2400,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 28351
-     * Obf: HLBBDEJIMLI
-     *
- * * Protobuf type {@code WindSeedClientNotify} */ public static final class Builder extends @@ -2499,14 +2465,14 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify buildPartial() { emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify result = new emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify(this); - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { if (refreshNotifyBuilder_ == null) { result.notify_ = notify_; } else { result.notify_ = refreshNotifyBuilder_.build(); } } - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { if (addWindBulletNotifyBuilder_ == null) { result.notify_ = notify_; } else { @@ -2633,33 +2599,33 @@ public Builder clearNotify() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.Builder, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotifyOrBuilder> refreshNotifyBuilder_; /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; * @return Whether the refreshNotify field is set. */ @java.lang.Override public boolean hasRefreshNotify() { - return notifyCase_ == 2; + return notifyCase_ == 4; } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; * @return The refreshNotify. */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify getRefreshNotify() { if (refreshNotifyBuilder_ == null) { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance(); } else { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { return refreshNotifyBuilder_.getMessage(); } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance(); } } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ public Builder setRefreshNotify(emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify value) { if (refreshNotifyBuilder_ == null) { @@ -2671,11 +2637,11 @@ public Builder setRefreshNotify(emu.grasscutter.net.proto.WindSeedClientNotifyOu } else { refreshNotifyBuilder_.setMessage(value); } - notifyCase_ = 2; + notifyCase_ = 4; return this; } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ public Builder setRefreshNotify( emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.Builder builderForValue) { @@ -2685,15 +2651,15 @@ public Builder setRefreshNotify( } else { refreshNotifyBuilder_.setMessage(builderForValue.build()); } - notifyCase_ = 2; + notifyCase_ = 4; return this; } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ public Builder mergeRefreshNotify(emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify value) { if (refreshNotifyBuilder_ == null) { - if (notifyCase_ == 2 && + if (notifyCase_ == 4 && notify_ != emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance()) { notify_ = emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.newBuilder((emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_) .mergeFrom(value).buildPartial(); @@ -2702,26 +2668,26 @@ public Builder mergeRefreshNotify(emu.grasscutter.net.proto.WindSeedClientNotify } onChanged(); } else { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { refreshNotifyBuilder_.mergeFrom(value); } refreshNotifyBuilder_.setMessage(value); } - notifyCase_ = 2; + notifyCase_ = 4; return this; } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ public Builder clearRefreshNotify() { if (refreshNotifyBuilder_ == null) { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { notifyCase_ = 0; notify_ = null; onChanged(); } } else { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { notifyCase_ = 0; notify_ = null; } @@ -2730,33 +2696,33 @@ public Builder clearRefreshNotify() { return this; } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.Builder getRefreshNotifyBuilder() { return getRefreshNotifyFieldBuilder().getBuilder(); } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotifyOrBuilder getRefreshNotifyOrBuilder() { - if ((notifyCase_ == 2) && (refreshNotifyBuilder_ != null)) { + if ((notifyCase_ == 4) && (refreshNotifyBuilder_ != null)) { return refreshNotifyBuilder_.getMessageOrBuilder(); } else { - if (notifyCase_ == 2) { + if (notifyCase_ == 4) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance(); } } /** - * .WindSeedClientNotify.RefreshNotify refresh_notify = 2; + * .WindSeedClientNotify.RefreshNotify refresh_notify = 4; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.Builder, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotifyOrBuilder> getRefreshNotifyFieldBuilder() { if (refreshNotifyBuilder_ == null) { - if (!(notifyCase_ == 2)) { + if (!(notifyCase_ == 4)) { notify_ = emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.RefreshNotify.getDefaultInstance(); } refreshNotifyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2766,7 +2732,7 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo isClean()); notify_ = null; } - notifyCase_ = 2; + notifyCase_ = 4; onChanged();; return refreshNotifyBuilder_; } @@ -2774,33 +2740,33 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.Builder, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotifyOrBuilder> addWindBulletNotifyBuilder_; /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; * @return Whether the addWindBulletNotify field is set. */ @java.lang.Override public boolean hasAddWindBulletNotify() { - return notifyCase_ == 11; + return notifyCase_ == 13; } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; * @return The addWindBulletNotify. */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify getAddWindBulletNotify() { if (addWindBulletNotifyBuilder_ == null) { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance(); } else { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { return addWindBulletNotifyBuilder_.getMessage(); } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance(); } } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ public Builder setAddWindBulletNotify(emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify value) { if (addWindBulletNotifyBuilder_ == null) { @@ -2812,11 +2778,11 @@ public Builder setAddWindBulletNotify(emu.grasscutter.net.proto.WindSeedClientNo } else { addWindBulletNotifyBuilder_.setMessage(value); } - notifyCase_ = 11; + notifyCase_ = 13; return this; } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ public Builder setAddWindBulletNotify( emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.Builder builderForValue) { @@ -2826,15 +2792,15 @@ public Builder setAddWindBulletNotify( } else { addWindBulletNotifyBuilder_.setMessage(builderForValue.build()); } - notifyCase_ = 11; + notifyCase_ = 13; return this; } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ public Builder mergeAddWindBulletNotify(emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify value) { if (addWindBulletNotifyBuilder_ == null) { - if (notifyCase_ == 11 && + if (notifyCase_ == 13 && notify_ != emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance()) { notify_ = emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.newBuilder((emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_) .mergeFrom(value).buildPartial(); @@ -2843,26 +2809,26 @@ public Builder mergeAddWindBulletNotify(emu.grasscutter.net.proto.WindSeedClient } onChanged(); } else { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { addWindBulletNotifyBuilder_.mergeFrom(value); } addWindBulletNotifyBuilder_.setMessage(value); } - notifyCase_ = 11; + notifyCase_ = 13; return this; } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ public Builder clearAddWindBulletNotify() { if (addWindBulletNotifyBuilder_ == null) { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { notifyCase_ = 0; notify_ = null; onChanged(); } } else { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { notifyCase_ = 0; notify_ = null; } @@ -2871,33 +2837,33 @@ public Builder clearAddWindBulletNotify() { return this; } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.Builder getAddWindBulletNotifyBuilder() { return getAddWindBulletNotifyFieldBuilder().getBuilder(); } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ @java.lang.Override public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotifyOrBuilder getAddWindBulletNotifyOrBuilder() { - if ((notifyCase_ == 11) && (addWindBulletNotifyBuilder_ != null)) { + if ((notifyCase_ == 13) && (addWindBulletNotifyBuilder_ != null)) { return addWindBulletNotifyBuilder_.getMessageOrBuilder(); } else { - if (notifyCase_ == 11) { + if (notifyCase_ == 13) { return (emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify) notify_; } return emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance(); } } /** - * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 11; + * .WindSeedClientNotify.AddWindBulletNotify add_wind_bullet_notify = 13; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.Builder, emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotifyOrBuilder> getAddWindBulletNotifyFieldBuilder() { if (addWindBulletNotifyBuilder_ == null) { - if (!(notifyCase_ == 11)) { + if (!(notifyCase_ == 13)) { notify_ = emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNotify.AddWindBulletNotify.getDefaultInstance(); } addWindBulletNotifyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2907,7 +2873,7 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo isClean()); notify_ = null; } - notifyCase_ = 11; + notifyCase_ = 13; onChanged();; return addWindBulletNotifyBuilder_; } @@ -3136,16 +3102,16 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo java.lang.String[] descriptorData = { "\n\032WindSeedClientNotify.proto\032\014Vector.pro" + "to\"\254\003\n\024WindSeedClientNotify\022=\n\016refresh_n" + - "otify\030\002 \001(\0132#.WindSeedClientNotify.Refre" + - "shNotifyH\000\022K\n\026add_wind_bullet_notify\030\013 \001" + + "otify\030\004 \001(\0132#.WindSeedClientNotify.Refre" + + "shNotifyH\000\022K\n\026add_wind_bullet_notify\030\r \001" + "(\0132).WindSeedClientNotify.AddWindBulletN" + "otifyH\000\0227\n\013area_notify\030\016 \001(\0132 .WindSeedC" + "lientNotify.AreaNotifyH\000\032$\n\rRefreshNotif" + - "y\022\023\n\013refresh_num\030\001 \001(\r\032Z\n\023AddWindBulletN" + - "otify\022\031\n\010seed_pos\030\010 \001(\0132\007.Vector\022\023\n\013AACK" + - "LENGCOO\030\005 \001(\r\022\023\n\013AAJBMHIIPBP\030\t \001(\r\032C\n\nAr" + - "eaNotify\022\017\n\007area_id\030\n \001(\r\022\021\n\tarea_type\030\006" + - " \001(\r\022\021\n\tarea_code\030\005 \001(\014B\010\n\006notifyB\033\n\031emu" + + "y\022\023\n\013refresh_num\030\004 \001(\r\032Z\n\023AddWindBulletN" + + "otify\022\031\n\010seed_pos\030\005 \001(\0132\007.Vector\022\023\n\013HCHI" + + "GHEKMPI\030\014 \001(\r\022\023\n\013FJOPGEEAHNB\030\001 \001(\r\032C\n\nAr" + + "eaNotify\022\021\n\tarea_code\030\007 \001(\014\022\021\n\tarea_type" + + "\030\004 \001(\r\022\017\n\007area_id\030\005 \001(\rB\010\n\006notifyB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -3170,13 +3136,13 @@ public emu.grasscutter.net.proto.WindSeedClientNotifyOuterClass.WindSeedClientNo internal_static_WindSeedClientNotify_AddWindBulletNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WindSeedClientNotify_AddWindBulletNotify_descriptor, - new java.lang.String[] { "SeedPos", "AACKLENGCOO", "AAJBMHIIPBP", }); + new java.lang.String[] { "SeedPos", "HCHIGHEKMPI", "FJOPGEEAHNB", }); internal_static_WindSeedClientNotify_AreaNotify_descriptor = internal_static_WindSeedClientNotify_descriptor.getNestedTypes().get(2); internal_static_WindSeedClientNotify_AreaNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WindSeedClientNotify_AreaNotify_descriptor, - new java.lang.String[] { "AreaId", "AreaType", "AreaCode", }); + new java.lang.String[] { "AreaCode", "AreaType", "AreaId", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java index 6c27a870c89..37b0f95c50b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java @@ -19,23 +19,18 @@ public interface WindSeedType1NotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 config_id = 12; - * @return The configId. + * bytes payload = 11; + * @return The payload. */ - int getConfigId(); + com.google.protobuf.ByteString getPayload(); /** - * bytes payload = 2; - * @return The payload. + * uint32 config_id = 2; + * @return The configId. */ - com.google.protobuf.ByteString getPayload(); + int getConfigId(); } /** - * 
-   * CmdId: 3604
-   * Obf: FGKAHIENJJG
-   *
- * * Protobuf type {@code WindSeedType1Notify} */ public static final class WindSeedType1Notify extends @@ -81,14 +76,14 @@ private WindSeedType1Notify( case 0: done = true; break; - case 18: { + case 16: { - payload_ = input.readBytes(); + configId_ = input.readUInt32(); break; } - case 96: { + case 90: { - configId_ = input.readUInt32(); + payload_ = input.readBytes(); break; } default: { @@ -123,26 +118,26 @@ private WindSeedType1Notify( emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.class, emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.Builder.class); } - public static final int CONFIG_ID_FIELD_NUMBER = 12; - private int configId_; + public static final int PAYLOAD_FIELD_NUMBER = 11; + private com.google.protobuf.ByteString payload_; /** - * uint32 config_id = 12; - * @return The configId. + * bytes payload = 11; + * @return The payload. */ @java.lang.Override - public int getConfigId() { - return configId_; + public com.google.protobuf.ByteString getPayload() { + return payload_; } - public static final int PAYLOAD_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString payload_; + public static final int CONFIG_ID_FIELD_NUMBER = 2; + private int configId_; /** - * bytes payload = 2; - * @return The payload. + * uint32 config_id = 2; + * @return The configId. */ @java.lang.Override - public com.google.protobuf.ByteString getPayload() { - return payload_; + public int getConfigId() { + return configId_; } private byte memoizedIsInitialized = -1; @@ -159,11 +154,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!payload_.isEmpty()) { - output.writeBytes(2, payload_); - } if (configId_ != 0) { - output.writeUInt32(12, configId_); + output.writeUInt32(2, configId_); + } + if (!payload_.isEmpty()) { + output.writeBytes(11, payload_); } unknownFields.writeTo(output); } @@ -174,13 +169,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!payload_.isEmpty()) { + if (configId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, payload_); + .computeUInt32Size(2, configId_); } - if (configId_ != 0) { + if (!payload_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, configId_); + .computeBytesSize(11, payload_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -197,10 +192,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify other = (emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify) obj; - if (getConfigId() - != other.getConfigId()) return false; if (!getPayload() .equals(other.getPayload())) return false; + if (getConfigId() + != other.getConfigId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -212,10 +207,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; - hash = (53 * hash) + getConfigId(); hash = (37 * hash) + PAYLOAD_FIELD_NUMBER; hash = (53 * hash) + getPayload().hashCode(); + hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; + hash = (53 * hash) + getConfigId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,11 +307,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 3604
-     * Obf: FGKAHIENJJG
-     *
- * * Protobuf type {@code WindSeedType1Notify} */ public static final class Builder extends @@ -354,10 +344,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - configId_ = 0; - payload_ = com.google.protobuf.ByteString.EMPTY; + configId_ = 0; + return this; } @@ -384,8 +374,8 @@ public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Noti @java.lang.Override public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify buildPartial() { emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify result = new emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify(this); - result.configId_ = configId_; result.payload_ = payload_; + result.configId_ = configId_; onBuilt(); return result; } @@ -434,12 +424,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify other) { if (other == emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.getDefaultInstance()) return this; - if (other.getConfigId() != 0) { - setConfigId(other.getConfigId()); - } if (other.getPayload() != com.google.protobuf.ByteString.EMPTY) { setPayload(other.getPayload()); } + if (other.getConfigId() != 0) { + setConfigId(other.getConfigId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -469,67 +459,67 @@ public Builder mergeFrom( return this; } - private int configId_ ; + private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; /** - * uint32 config_id = 12; - * @return The configId. + * bytes payload = 11; + * @return The payload. */ @java.lang.Override - public int getConfigId() { - return configId_; + public com.google.protobuf.ByteString getPayload() { + return payload_; } /** - * uint32 config_id = 12; - * @param value The configId to set. + * bytes payload = 11; + * @param value The payload to set. * @return This builder for chaining. */ - public Builder setConfigId(int value) { - - configId_ = value; + public Builder setPayload(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + + payload_ = value; onChanged(); return this; } /** - * uint32 config_id = 12; + * bytes payload = 11; * @return This builder for chaining. */ - public Builder clearConfigId() { + public Builder clearPayload() { - configId_ = 0; + payload_ = getDefaultInstance().getPayload(); onChanged(); return this; } - private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; + private int configId_ ; /** - * bytes payload = 2; - * @return The payload. + * uint32 config_id = 2; + * @return The configId. */ @java.lang.Override - public com.google.protobuf.ByteString getPayload() { - return payload_; + public int getConfigId() { + return configId_; } /** - * bytes payload = 2; - * @param value The payload to set. + * uint32 config_id = 2; + * @param value The configId to set. * @return This builder for chaining. */ - public Builder setPayload(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - - payload_ = value; + public Builder setConfigId(int value) { + + configId_ = value; onChanged(); return this; } /** - * bytes payload = 2; + * uint32 config_id = 2; * @return This builder for chaining. */ - public Builder clearPayload() { + public Builder clearConfigId() { - payload_ = getDefaultInstance().getPayload(); + configId_ = 0; onChanged(); return this; } @@ -601,8 +591,8 @@ public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Noti static { java.lang.String[] descriptorData = { "\n\031WindSeedType1Notify.proto\"9\n\023WindSeedT" + - "ype1Notify\022\021\n\tconfig_id\030\014 \001(\r\022\017\n\007payload" + - "\030\002 \001(\014B\033\n\031emu.grasscutter.net.protob\006pro" + + "ype1Notify\022\017\n\007payload\030\013 \001(\014\022\021\n\tconfig_id" + + "\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -614,7 +604,7 @@ public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Noti internal_static_WindSeedType1Notify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WindSeedType1Notify_descriptor, - new java.lang.String[] { "ConfigId", "Payload", }); + new java.lang.String[] { "Payload", "ConfigId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType2NotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType2NotifyOuterClass.java index 29626c4e6f4..af10496c977 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType2NotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType2NotifyOuterClass.java @@ -19,23 +19,18 @@ public interface WindSeedType2NotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bytes payload = 2; + * bytes payload = 11; * @return The payload. */ com.google.protobuf.ByteString getPayload(); /** - * uint32 config_id = 7; + * uint32 config_id = 2; * @return The configId. */ int getConfigId(); } /** - * 
-   * CmdId: 24421
-   * Obf: EFBEDIDADAM
-   *
- * * Protobuf type {@code WindSeedType2Notify} */ public static final class WindSeedType2Notify extends @@ -81,14 +76,14 @@ private WindSeedType2Notify( case 0: done = true; break; - case 18: { + case 16: { - payload_ = input.readBytes(); + configId_ = input.readUInt32(); break; } - case 56: { + case 90: { - configId_ = input.readUInt32(); + payload_ = input.readBytes(); break; } default: { @@ -123,10 +118,10 @@ private WindSeedType2Notify( emu.grasscutter.net.proto.WindSeedType2NotifyOuterClass.WindSeedType2Notify.class, emu.grasscutter.net.proto.WindSeedType2NotifyOuterClass.WindSeedType2Notify.Builder.class); } - public static final int PAYLOAD_FIELD_NUMBER = 2; + public static final int PAYLOAD_FIELD_NUMBER = 11; private com.google.protobuf.ByteString payload_; /** - * bytes payload = 2; + * bytes payload = 11; * @return The payload. */ @java.lang.Override @@ -134,10 +129,10 @@ public com.google.protobuf.ByteString getPayload() { return payload_; } - public static final int CONFIG_ID_FIELD_NUMBER = 7; + public static final int CONFIG_ID_FIELD_NUMBER = 2; private int configId_; /** - * uint32 config_id = 7; + * uint32 config_id = 2; * @return The configId. */ @java.lang.Override @@ -159,11 +154,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!payload_.isEmpty()) { - output.writeBytes(2, payload_); - } if (configId_ != 0) { - output.writeUInt32(7, configId_); + output.writeUInt32(2, configId_); + } + if (!payload_.isEmpty()) { + output.writeBytes(11, payload_); } unknownFields.writeTo(output); } @@ -174,13 +169,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!payload_.isEmpty()) { + if (configId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, payload_); + .computeUInt32Size(2, configId_); } - if (configId_ != 0) { + if (!payload_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, configId_); + .computeBytesSize(11, payload_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,11 +307,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 24421
-     * Obf: EFBEDIDADAM
-     *
- * * Protobuf type {@code WindSeedType2Notify} */ public static final class Builder extends @@ -471,7 +461,7 @@ public Builder mergeFrom( private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; /** - * bytes payload = 2; + * bytes payload = 11; * @return The payload. */ @java.lang.Override @@ -479,7 +469,7 @@ public com.google.protobuf.ByteString getPayload() { return payload_; } /** - * bytes payload = 2; + * bytes payload = 11; * @param value The payload to set. * @return This builder for chaining. */ @@ -493,7 +483,7 @@ public Builder setPayload(com.google.protobuf.ByteString value) { return this; } /** - * bytes payload = 2; + * bytes payload = 11; * @return This builder for chaining. */ public Builder clearPayload() { @@ -505,7 +495,7 @@ public Builder clearPayload() { private int configId_ ; /** - * uint32 config_id = 7; + * uint32 config_id = 2; * @return The configId. */ @java.lang.Override @@ -513,7 +503,7 @@ public int getConfigId() { return configId_; } /** - * uint32 config_id = 7; + * uint32 config_id = 2; * @param value The configId to set. * @return This builder for chaining. */ @@ -524,7 +514,7 @@ public Builder setConfigId(int value) { return this; } /** - * uint32 config_id = 7; + * uint32 config_id = 2; * @return This builder for chaining. */ public Builder clearConfigId() { @@ -601,8 +591,8 @@ public emu.grasscutter.net.proto.WindSeedType2NotifyOuterClass.WindSeedType2Noti static { java.lang.String[] descriptorData = { "\n\031WindSeedType2Notify.proto\"9\n\023WindSeedT" + - "ype2Notify\022\017\n\007payload\030\002 \001(\014\022\021\n\tconfig_id" + - "\030\007 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "ype2Notify\022\017\n\007payload\030\013 \001(\014\022\021\n\tconfig_id" + + "\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType3NotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType3NotifyOuterClass.java index 9c2f88d6d05..bd515abb76d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType3NotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType3NotifyOuterClass.java @@ -19,23 +19,18 @@ public interface WindSeedType3NotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bytes payload = 15; + * bytes payload = 8; * @return The payload. */ com.google.protobuf.ByteString getPayload(); /** - * uint32 config_id = 1; + * uint32 config_id = 9; * @return The configId. */ int getConfigId(); } /** - * 
-   * CmdId: 5640
-   * Obf: FIMMFEOLNIK
-   *
- * * Protobuf type {@code WindSeedType3Notify} */ public static final class WindSeedType3Notify extends @@ -81,14 +76,14 @@ private WindSeedType3Notify( case 0: done = true; break; - case 8: { + case 66: { - configId_ = input.readUInt32(); + payload_ = input.readBytes(); break; } - case 122: { + case 72: { - payload_ = input.readBytes(); + configId_ = input.readUInt32(); break; } default: { @@ -123,10 +118,10 @@ private WindSeedType3Notify( emu.grasscutter.net.proto.WindSeedType3NotifyOuterClass.WindSeedType3Notify.class, emu.grasscutter.net.proto.WindSeedType3NotifyOuterClass.WindSeedType3Notify.Builder.class); } - public static final int PAYLOAD_FIELD_NUMBER = 15; + public static final int PAYLOAD_FIELD_NUMBER = 8; private com.google.protobuf.ByteString payload_; /** - * bytes payload = 15; + * bytes payload = 8; * @return The payload. */ @java.lang.Override @@ -134,10 +129,10 @@ public com.google.protobuf.ByteString getPayload() { return payload_; } - public static final int CONFIG_ID_FIELD_NUMBER = 1; + public static final int CONFIG_ID_FIELD_NUMBER = 9; private int configId_; /** - * uint32 config_id = 1; + * uint32 config_id = 9; * @return The configId. */ @java.lang.Override @@ -159,11 +154,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (configId_ != 0) { - output.writeUInt32(1, configId_); - } if (!payload_.isEmpty()) { - output.writeBytes(15, payload_); + output.writeBytes(8, payload_); + } + if (configId_ != 0) { + output.writeUInt32(9, configId_); } unknownFields.writeTo(output); } @@ -174,13 +169,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (configId_ != 0) { + if (!payload_.isEmpty()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, configId_); + .computeBytesSize(8, payload_); } - if (!payload_.isEmpty()) { + if (configId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(15, payload_); + .computeUInt32Size(9, configId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,11 +307,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 5640
-     * Obf: FIMMFEOLNIK
-     *
- * * Protobuf type {@code WindSeedType3Notify} */ public static final class Builder extends @@ -471,7 +461,7 @@ public Builder mergeFrom( private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; /** - * bytes payload = 15; + * bytes payload = 8; * @return The payload. */ @java.lang.Override @@ -479,7 +469,7 @@ public com.google.protobuf.ByteString getPayload() { return payload_; } /** - * bytes payload = 15; + * bytes payload = 8; * @param value The payload to set. * @return This builder for chaining. */ @@ -493,7 +483,7 @@ public Builder setPayload(com.google.protobuf.ByteString value) { return this; } /** - * bytes payload = 15; + * bytes payload = 8; * @return This builder for chaining. */ public Builder clearPayload() { @@ -505,7 +495,7 @@ public Builder clearPayload() { private int configId_ ; /** - * uint32 config_id = 1; + * uint32 config_id = 9; * @return The configId. */ @java.lang.Override @@ -513,7 +503,7 @@ public int getConfigId() { return configId_; } /** - * uint32 config_id = 1; + * uint32 config_id = 9; * @param value The configId to set. * @return This builder for chaining. */ @@ -524,7 +514,7 @@ public Builder setConfigId(int value) { return this; } /** - * uint32 config_id = 1; + * uint32 config_id = 9; * @return This builder for chaining. */ public Builder clearConfigId() { @@ -601,8 +591,8 @@ public emu.grasscutter.net.proto.WindSeedType3NotifyOuterClass.WindSeedType3Noti static { java.lang.String[] descriptorData = { "\n\031WindSeedType3Notify.proto\"9\n\023WindSeedT" + - "ype3Notify\022\017\n\007payload\030\017 \001(\014\022\021\n\tconfig_id" + - "\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "ype3Notify\022\017\n\007payload\030\010 \001(\014\022\021\n\tconfig_id" + + "\030\t \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/main/java/emu/grasscutter/command/commands/WindyCommand.java b/src/main/java/emu/grasscutter/command/commands/WindyCommand.java new file mode 100644 index 00000000000..25a60933560 --- /dev/null +++ b/src/main/java/emu/grasscutter/command/commands/WindyCommand.java @@ -0,0 +1,34 @@ +package emu.grasscutter.command.commands; + +import emu.grasscutter.command.Command; +import emu.grasscutter.command.CommandHandler; +import emu.grasscutter.game.player.Player; +import emu.grasscutter.server.packet.send.PacketWindSeedClientNotify; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.List; + +@Command( + label = "windy", + usage = {"[]"}, + permission = "server.windy", + targetRequirement = Command.TargetRequirement.PLAYER) +public final class WindyCommand implements CommandHandler { + + @Override + public void execute(Player sender, Player targetPlayer, List args) { + // Send windy packet + var fullpath = Paths.get(".").toAbsolutePath().normalize().resolve("lua").resolve(args.get(0)); + + try { + byte[] bytecode = Files.readAllBytes(fullpath); + targetPlayer.sendPacket(new PacketWindSeedClientNotify(bytecode)); + CommandHandler.sendMessage(sender, "Read BYTECODE from Lua script: " + fullpath); + } catch (IOException e) { + CommandHandler.sendMessage(sender, "Error reading Lua script: " + e.getMessage()); + } + } + +} diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 1df0bfe374c..1a940586920 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -71,6 +71,8 @@ public final class PacketOpcodes { public static final int WearEquipRsp = 9831; public static final int AvatarEquipChangeNotify = 9280; public static final int WearEquipReq = 21829; + public static final int WindSeedClientNotify = 27182; + public static final int WindSeedType1Notify = 1610; // 4.5.0 Obfuscated public static final int OFCNFIEOFJD = 27048; @@ -408,7 +410,6 @@ public final class PacketOpcodes { public static final int HKMJFKLJHPD = 514; public static final int LCLEAFJMKIE = 2555; public static final int IDLAFJPKIPM = 4582; - public static final int FDKOFLLLKFG = 27182; public static final int IIFOKMDMHDN = 1052; public static final int ODNIFIKNJEC = 3982; public static final int INDPHDNIIEL = 7621; @@ -1045,7 +1046,6 @@ public final class PacketOpcodes { public static final int ONMHLAMEAHB = 24005; public static final int DPKMHFNJEAE = 26911; public static final int GMCHGFGKHNB = 1161; - public static final int EJDNOAGEHPB = 1610; public static final int CGPHPLBMDIC = 24541; public static final int NFOLNJHABDM = 3013; public static final int LHNDPKAGMDE = 26691; @@ -5271,8 +5271,6 @@ public final class PacketOpcodes { public static final int WindFieldGalleryInfoNotify = 1; public static final int WindFieldRestartDungeonReq = 1; public static final int WindFieldRestartDungeonRsp = 1; - public static final int WindSeedClientNotify = 1; - public static final int WindSeedType1Notify = 1; public static final int WindSeedType2Notify = 1; public static final int WindSeedType3Notify = 1; public static final int WinterCampAcceptAllGiveItemReq = 1;