Update to support game version 2.2.0

README.md

@@ -1,7 +1,7 @@
-![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%202.1.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%202.2.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
 <div align="center"><img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Melledy/LunarCore?logo=java&style=for-the-badge"> <img alt="GitHub" src="https://img.shields.io/github/license/Melledy/LunarCore?style=for-the-badge"> <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/Melledy/LunarCore?style=for-the-badge"> <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/Melledy/LunarCore/build.yml?branch=development&logo=github&style=for-the-badge"></div>
 
-<div align="center"><a href="https://discord.gg/cfPKJ6N5hw"><img alt="Discord - Grasscutter" src="https://img.shields.io/discord/1163718404067303444?label=Discord&logo=discord&style=for-the-badge"></a></div>
+<div align="center"><a href="https://discord.gg/cfPKJ6N5hw"><img alt="Discord - LunarCore" src="https://img.shields.io/discord/1163718404067303444?label=Discord&logo=discord&style=for-the-badge"></a></div>
 
 [EN](README.md) | [简中](docs/README_zh-CN.md) | [繁中](docs/README_zh-TW.md) | [JP](docs/README_ja-JP.md) | [RU](docs/README_ru-RU.md) | [FR](docs/README_fr-FR.md) | [KR](docs/README_ko-KR.md) | [VI](docs/README_vi-VI.md)
 

src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java

@@ -19,15 +19,15 @@ public final class ActivateFarmElementCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 entity_id = 4;</code>
-     */
-    private int entityId;
-
-    /**
-     * <code>optional uint32 world_level = 15;</code>
+     * <code>optional uint32 world_level = 11;</code>
      */
     private int worldLevel;
 
+    /**
+     * <code>optional uint32 entity_id = 14;</code>
+     */
+    private int entityId;
+
     private ActivateFarmElementCsReq() {
     }
 
@@ -39,62 +39,25 @@ public final class ActivateFarmElementCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 4;</code>
-     * @return whether the entityId field is set
+     * <code>optional uint32 world_level = 11;</code>
+     * @return whether the worldLevel field is set
      */
-    public boolean hasEntityId() {
+    public boolean hasWorldLevel() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 entity_id = 4;</code>
-     * @return this
-     */
-    public ActivateFarmElementCsReq clearEntityId() {
-      bitField0_ &= ~0x00000001;
-      entityId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 entity_id = 4;</code>
-     * @return the entityId
-     */
-    public int getEntityId() {
-      return entityId;
-    }
-
-    /**
-     * <code>optional uint32 entity_id = 4;</code>
-     * @param value the entityId to set
-     * @return this
-     */
-    public ActivateFarmElementCsReq setEntityId(final int value) {
-      bitField0_ |= 0x00000001;
-      entityId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 world_level = 15;</code>
-     * @return whether the worldLevel field is set
-     */
-    public boolean hasWorldLevel() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 world_level = 15;</code>
+     * <code>optional uint32 world_level = 11;</code>
      * @return this
      */
     public ActivateFarmElementCsReq clearWorldLevel() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       worldLevel = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 world_level = 15;</code>
+     * <code>optional uint32 world_level = 11;</code>
      * @return the worldLevel
      */
     public int getWorldLevel() {
@@ -102,23 +65,60 @@ public final class ActivateFarmElementCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 world_level = 15;</code>
+     * <code>optional uint32 world_level = 11;</code>
      * @param value the worldLevel to set
      * @return this
      */
     public ActivateFarmElementCsReq setWorldLevel(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       worldLevel = value;
       return this;
     }
 
+    /**
+     * <code>optional uint32 entity_id = 14;</code>
+     * @return whether the entityId field is set
+     */
+    public boolean hasEntityId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 entity_id = 14;</code>
+     * @return this
+     */
+    public ActivateFarmElementCsReq clearEntityId() {
+      bitField0_ &= ~0x00000002;
+      entityId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 entity_id = 14;</code>
+     * @return the entityId
+     */
+    public int getEntityId() {
+      return entityId;
+    }
+
+    /**
+     * <code>optional uint32 entity_id = 14;</code>
+     * @param value the entityId to set
+     * @return this
+     */
+    public ActivateFarmElementCsReq setEntityId(final int value) {
+      bitField0_ |= 0x00000002;
+      entityId = value;
+      return this;
+    }
+
     @Override
     public ActivateFarmElementCsReq copyFrom(final ActivateFarmElementCsReq other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        entityId = other.entityId;
         worldLevel = other.worldLevel;
+        entityId = other.entityId;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class ActivateFarmElementCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasEntityId()) {
-        setEntityId(other.entityId);
-      }
       if (other.hasWorldLevel()) {
         setWorldLevel(other.worldLevel);
       }
+      if (other.hasEntityId()) {
+        setEntityId(other.entityId);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class ActivateFarmElementCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      entityId = 0;
       worldLevel = 0;
+      entityId = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class ActivateFarmElementCsReqOuterClass {
       }
       ActivateFarmElementCsReq other = (ActivateFarmElementCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasEntityId() || entityId == other.entityId)
-        && (!hasWorldLevel() || worldLevel == other.worldLevel);
+        && (!hasWorldLevel() || worldLevel == other.worldLevel)
+        && (!hasEntityId() || entityId == other.entityId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(entityId);
+        output.writeRawByte((byte) 88);
+        output.writeUInt32NoTag(worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
-        output.writeUInt32NoTag(worldLevel);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(entityId);
       }
     }
 
@@ -190,10 +190,10 @@ public final class ActivateFarmElementCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class ActivateFarmElementCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
-            // entityId
-            entityId = input.readUInt32();
+          case 88: {
+            // worldLevel
+            worldLevel = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 112) {
               break;
             }
           }
-          case 120: {
-            // worldLevel
-            worldLevel = input.readUInt32();
+          case 112: {
+            // entityId
+            entityId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ActivateFarmElementCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.entityId, entityId);
+        output.writeUInt32(FieldNames.worldLevel, worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.worldLevel, worldLevel);
+        output.writeUInt32(FieldNames.entityId, entityId);
       }
       output.endObject();
     }
@@ -256,11 +256,11 @@ public final class ActivateFarmElementCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -2102099874:
-          case -740565257: {
-            if (input.isAtField(FieldNames.entityId)) {
+          case 440007442:
+          case 1305257111: {
+            if (input.isAtField(FieldNames.worldLevel)) {
               if (!input.trySkipNullValue()) {
-                entityId = input.readUInt32();
+                worldLevel = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -268,11 +268,11 @@ public final class ActivateFarmElementCsReqOuterClass {
             }
             break;
           }
-          case 440007442:
-          case 1305257111: {
-            if (input.isAtField(FieldNames.worldLevel)) {
+          case -2102099874:
+          case -740565257: {
+            if (input.isAtField(FieldNames.entityId)) {
               if (!input.trySkipNullValue()) {
-                worldLevel = input.readUInt32();
+                entityId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -333,9 +333,9 @@ public final class ActivateFarmElementCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName entityId = FieldName.forField("entityId", "entity_id");
-
       static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+
+      static final FieldName entityId = FieldName.forField("entityId", "entity_id");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java

@@ -19,19 +19,19 @@ public final class ActivateFarmElementScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
+     * <code>optional uint32 entity_id = 3;</code>
      */
-    private int worldLevel;
+    private int entityId;
 
     /**
-     * <code>optional uint32 retcode = 5;</code>
+     * <code>optional uint32 retcode = 9;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 entity_id = 7;</code>
+     * <code>optional uint32 world_level = 14;</code>
      */
-    private int entityId;
+    private int worldLevel;
 
     private ActivateFarmElementScRsp() {
     }
@@ -44,44 +44,44 @@ public final class ActivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @return whether the worldLevel field is set
+     * <code>optional uint32 entity_id = 3;</code>
+     * @return whether the entityId field is set
      */
-    public boolean hasWorldLevel() {
+    public boolean hasEntityId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
+     * <code>optional uint32 entity_id = 3;</code>
      * @return this
      */
-    public ActivateFarmElementScRsp clearWorldLevel() {
+    public ActivateFarmElementScRsp clearEntityId() {
       bitField0_ &= ~0x00000001;
-      worldLevel = 0;
+      entityId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @return the worldLevel
+     * <code>optional uint32 entity_id = 3;</code>
+     * @return the entityId
      */
-    public int getWorldLevel() {
-      return worldLevel;
+    public int getEntityId() {
+      return entityId;
     }
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @param value the worldLevel to set
+     * <code>optional uint32 entity_id = 3;</code>
+     * @param value the entityId to set
      * @return this
      */
-    public ActivateFarmElementScRsp setWorldLevel(final int value) {
+    public ActivateFarmElementScRsp setEntityId(final int value) {
       bitField0_ |= 0x00000001;
-      worldLevel = value;
+      entityId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 retcode = 5;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -89,7 +89,7 @@ public final class ActivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 5;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @return this
      */
     public ActivateFarmElementScRsp clearRetcode() {
@@ -99,7 +99,7 @@ public final class ActivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 5;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -107,7 +107,7 @@ public final class ActivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 5;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -118,39 +118,39 @@ public final class ActivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 7;</code>
-     * @return whether the entityId field is set
+     * <code>optional uint32 world_level = 14;</code>
+     * @return whether the worldLevel field is set
      */
-    public boolean hasEntityId() {
+    public boolean hasWorldLevel() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * <code>optional uint32 entity_id = 7;</code>
+     * <code>optional uint32 world_level = 14;</code>
      * @return this
      */
-    public ActivateFarmElementScRsp clearEntityId() {
+    public ActivateFarmElementScRsp clearWorldLevel() {
       bitField0_ &= ~0x00000004;
-      entityId = 0;
+      worldLevel = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 entity_id = 7;</code>
-     * @return the entityId
+     * <code>optional uint32 world_level = 14;</code>
+     * @return the worldLevel
      */
-    public int getEntityId() {
-      return entityId;
+    public int getWorldLevel() {
+      return worldLevel;
     }
 
     /**
-     * <code>optional uint32 entity_id = 7;</code>
-     * @param value the entityId to set
+     * <code>optional uint32 world_level = 14;</code>
+     * @param value the worldLevel to set
      * @return this
      */
-    public ActivateFarmElementScRsp setEntityId(final int value) {
+    public ActivateFarmElementScRsp setWorldLevel(final int value) {
       bitField0_ |= 0x00000004;
-      entityId = value;
+      worldLevel = value;
       return this;
     }
 
@@ -159,9 +159,9 @@ public final class ActivateFarmElementScRspOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        worldLevel = other.worldLevel;
-        retcode = other.retcode;
         entityId = other.entityId;
+        retcode = other.retcode;
+        worldLevel = other.worldLevel;
       }
       return this;
     }
@@ -172,14 +172,14 @@ public final class ActivateFarmElementScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasWorldLevel()) {
-        setWorldLevel(other.worldLevel);
+      if (other.hasEntityId()) {
+        setEntityId(other.entityId);
       }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
-      if (other.hasEntityId()) {
-        setEntityId(other.entityId);
+      if (other.hasWorldLevel()) {
+        setWorldLevel(other.worldLevel);
       }
       return this;
     }
@@ -191,9 +191,9 @@ public final class ActivateFarmElementScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      worldLevel = 0;
-      retcode = 0;
       entityId = 0;
+      retcode = 0;
+      worldLevel = 0;
       return this;
     }
 
@@ -217,24 +217,24 @@ public final class ActivateFarmElementScRspOuterClass {
       }
       ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasWorldLevel() || worldLevel == other.worldLevel)
+        && (!hasEntityId() || entityId == other.entityId)
         && (!hasRetcode() || retcode == other.retcode)
-        && (!hasEntityId() || entityId == other.entityId);
+        && (!hasWorldLevel() || worldLevel == other.worldLevel);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(worldLevel);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(entityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(entityId);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(worldLevel);
       }
     }
 
@@ -242,13 +242,13 @@ public final class ActivateFarmElementScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
       }
       return size;
     }
@@ -260,27 +260,27 @@ public final class ActivateFarmElementScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
-            // worldLevel
-            worldLevel = input.readUInt32();
+          case 24: {
+            // entityId
+            entityId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 72) {
               break;
             }
           }
-          case 40: {
+          case 72: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 112) {
               break;
             }
           }
-          case 56: {
-            // entityId
-            entityId = input.readUInt32();
+          case 112: {
+            // worldLevel
+            worldLevel = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 0) {
@@ -305,13 +305,13 @@ public final class ActivateFarmElementScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.worldLevel, worldLevel);
+        output.writeUInt32(FieldNames.entityId, entityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.entityId, entityId);
+        output.writeUInt32(FieldNames.worldLevel, worldLevel);
       }
       output.endObject();
     }
@@ -323,11 +323,11 @@ public final class ActivateFarmElementScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 440007442:
-          case 1305257111: {
-            if (input.isAtField(FieldNames.worldLevel)) {
+          case -2102099874:
+          case -740565257: {
+            if (input.isAtField(FieldNames.entityId)) {
               if (!input.trySkipNullValue()) {
-                worldLevel = input.readUInt32();
+                entityId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -346,11 +346,11 @@ public final class ActivateFarmElementScRspOuterClass {
             }
             break;
           }
-          case -2102099874:
-          case -740565257: {
-            if (input.isAtField(FieldNames.entityId)) {
+          case 440007442:
+          case 1305257111: {
+            if (input.isAtField(FieldNames.worldLevel)) {
               if (!input.trySkipNullValue()) {
-                entityId = input.readUInt32();
+                worldLevel = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -411,11 +411,11 @@ public final class ActivateFarmElementScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+      static final FieldName entityId = FieldName.forField("entityId", "entity_id");
 
       static final FieldName retcode = FieldName.forField("retcode");
 
-      static final FieldName entityId = FieldName.forField("entityId", "entity_id");
+      static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java

@@ -19,22 +19,22 @@ public final class ActivityScheduleInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional int64 begin_time = 1;</code>
-     */
-    private long beginTime;
-
-    /**
-     * <code>optional int64 end_time = 5;</code>
+     * <code>optional int64 end_time = 9;</code>
      */
     private long endTime;
 
     /**
-     * <code>optional uint32 module_id = 2;</code>
+     * <code>optional int64 begin_time = 13;</code>
+     */
+    private long beginTime;
+
+    /**
+     * <code>optional uint32 module_id = 3;</code>
      */
     private int moduleId;
 
     /**
-     * <code>optional uint32 activity_id = 13;</code>
+     * <code>optional uint32 activity_id = 6;</code>
      */
     private int activityId;
 
@@ -49,62 +49,25 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional int64 begin_time = 1;</code>
-     * @return whether the beginTime field is set
+     * <code>optional int64 end_time = 9;</code>
+     * @return whether the endTime field is set
      */
-    public boolean hasBeginTime() {
+    public boolean hasEndTime() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional int64 begin_time = 1;</code>
-     * @return this
-     */
-    public ActivityScheduleInfo clearBeginTime() {
-      bitField0_ &= ~0x00000001;
-      beginTime = 0L;
-      return this;
-    }
-
-    /**
-     * <code>optional int64 begin_time = 1;</code>
-     * @return the beginTime
-     */
-    public long getBeginTime() {
-      return beginTime;
-    }
-
-    /**
-     * <code>optional int64 begin_time = 1;</code>
-     * @param value the beginTime to set
-     * @return this
-     */
-    public ActivityScheduleInfo setBeginTime(final long value) {
-      bitField0_ |= 0x00000001;
-      beginTime = value;
-      return this;
-    }
-
-    /**
-     * <code>optional int64 end_time = 5;</code>
-     * @return whether the endTime field is set
-     */
-    public boolean hasEndTime() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional int64 end_time = 5;</code>
+     * <code>optional int64 end_time = 9;</code>
      * @return this
      */
     public ActivityScheduleInfo clearEndTime() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       endTime = 0L;
       return this;
     }
 
     /**
-     * <code>optional int64 end_time = 5;</code>
+     * <code>optional int64 end_time = 9;</code>
      * @return the endTime
      */
     public long getEndTime() {
@@ -112,18 +75,55 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional int64 end_time = 5;</code>
+     * <code>optional int64 end_time = 9;</code>
      * @param value the endTime to set
      * @return this
      */
     public ActivityScheduleInfo setEndTime(final long value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       endTime = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 module_id = 2;</code>
+     * <code>optional int64 begin_time = 13;</code>
+     * @return whether the beginTime field is set
+     */
+    public boolean hasBeginTime() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional int64 begin_time = 13;</code>
+     * @return this
+     */
+    public ActivityScheduleInfo clearBeginTime() {
+      bitField0_ &= ~0x00000002;
+      beginTime = 0L;
+      return this;
+    }
+
+    /**
+     * <code>optional int64 begin_time = 13;</code>
+     * @return the beginTime
+     */
+    public long getBeginTime() {
+      return beginTime;
+    }
+
+    /**
+     * <code>optional int64 begin_time = 13;</code>
+     * @param value the beginTime to set
+     * @return this
+     */
+    public ActivityScheduleInfo setBeginTime(final long value) {
+      bitField0_ |= 0x00000002;
+      beginTime = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 module_id = 3;</code>
      * @return whether the moduleId field is set
      */
     public boolean hasModuleId() {
@@ -131,7 +131,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 module_id = 2;</code>
+     * <code>optional uint32 module_id = 3;</code>
      * @return this
      */
     public ActivityScheduleInfo clearModuleId() {
@@ -141,7 +141,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 module_id = 2;</code>
+     * <code>optional uint32 module_id = 3;</code>
      * @return the moduleId
      */
     public int getModuleId() {
@@ -149,7 +149,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 module_id = 2;</code>
+     * <code>optional uint32 module_id = 3;</code>
      * @param value the moduleId to set
      * @return this
      */
@@ -160,7 +160,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 activity_id = 13;</code>
+     * <code>optional uint32 activity_id = 6;</code>
      * @return whether the activityId field is set
      */
     public boolean hasActivityId() {
@@ -168,7 +168,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 activity_id = 13;</code>
+     * <code>optional uint32 activity_id = 6;</code>
      * @return this
      */
     public ActivityScheduleInfo clearActivityId() {
@@ -178,7 +178,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 activity_id = 13;</code>
+     * <code>optional uint32 activity_id = 6;</code>
      * @return the activityId
      */
     public int getActivityId() {
@@ -186,7 +186,7 @@ public final class ActivityScheduleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 activity_id = 13;</code>
+     * <code>optional uint32 activity_id = 6;</code>
      * @param value the activityId to set
      * @return this
      */
@@ -201,8 +201,8 @@ public final class ActivityScheduleInfoOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        beginTime = other.beginTime;
         endTime = other.endTime;
+        beginTime = other.beginTime;
         moduleId = other.moduleId;
         activityId = other.activityId;
       }
@@ -215,12 +215,12 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasBeginTime()) {
-        setBeginTime(other.beginTime);
-      }
       if (other.hasEndTime()) {
         setEndTime(other.endTime);
       }
+      if (other.hasBeginTime()) {
+        setBeginTime(other.beginTime);
+      }
       if (other.hasModuleId()) {
         setModuleId(other.moduleId);
       }
@@ -237,8 +237,8 @@ public final class ActivityScheduleInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      beginTime = 0L;
       endTime = 0L;
+      beginTime = 0L;
       moduleId = 0;
       activityId = 0;
       return this;
@@ -264,8 +264,8 @@ public final class ActivityScheduleInfoOuterClass {
       }
       ActivityScheduleInfo other = (ActivityScheduleInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasBeginTime() || beginTime == other.beginTime)
         && (!hasEndTime() || endTime == other.endTime)
+        && (!hasBeginTime() || beginTime == other.beginTime)
         && (!hasModuleId() || moduleId == other.moduleId)
         && (!hasActivityId() || activityId == other.activityId);
     }
@@ -273,19 +273,19 @@ public final class ActivityScheduleInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeInt64NoTag(beginTime);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 72);
         output.writeInt64NoTag(endTime);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeInt64NoTag(beginTime);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(moduleId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(activityId);
       }
     }
@@ -294,10 +294,10 @@ public final class ActivityScheduleInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
+        size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
+        size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId);
@@ -315,34 +315,34 @@ public final class ActivityScheduleInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // beginTime
-            beginTime = input.readInt64();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 40) {
-              break;
-            }
-          }
-          case 40: {
+          case 72: {
             // endTime
             endTime = input.readInt64();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 16) {
-              break;
-            }
-          }
-          case 16: {
-            // moduleId
-            moduleId = input.readUInt32();
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
             if (tag != 104) {
               break;
             }
           }
           case 104: {
+            // beginTime
+            beginTime = input.readInt64();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 24) {
+              break;
+            }
+          }
+          case 24: {
+            // moduleId
+            moduleId = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 48) {
+              break;
+            }
+          }
+          case 48: {
             // activityId
             activityId = input.readUInt32();
             bitField0_ |= 0x00000008;
@@ -369,10 +369,10 @@ public final class ActivityScheduleInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeInt64(FieldNames.beginTime, beginTime);
+        output.writeInt64(FieldNames.endTime, endTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeInt64(FieldNames.endTime, endTime);
+        output.writeInt64(FieldNames.beginTime, beginTime);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.moduleId, moduleId);
@@ -390,11 +390,11 @@ public final class ActivityScheduleInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1072839914:
-          case 1112183971: {
-            if (input.isAtField(FieldNames.beginTime)) {
+          case -1607243192:
+          case 1725551537: {
+            if (input.isAtField(FieldNames.endTime)) {
               if (!input.trySkipNullValue()) {
-                beginTime = input.readInt64();
+                endTime = input.readInt64();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -402,11 +402,11 @@ public final class ActivityScheduleInfoOuterClass {
             }
             break;
           }
-          case -1607243192:
-          case 1725551537: {
-            if (input.isAtField(FieldNames.endTime)) {
+          case -1072839914:
+          case 1112183971: {
+            if (input.isAtField(FieldNames.beginTime)) {
               if (!input.trySkipNullValue()) {
-                endTime = input.readInt64();
+                beginTime = input.readInt64();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -491,10 +491,10 @@ public final class ActivityScheduleInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
-
       static final FieldName endTime = FieldName.forField("endTime", "end_time");
 
+      static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
+
       static final FieldName moduleId = FieldName.forField("moduleId", "module_id");
 
       static final FieldName activityId = FieldName.forField("activityId", "activity_id");

src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class ApplyFriendCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 uid = 9;</code>
+     * <code>optional uint32 uid = 7;</code>
      */
     private int uid;
 
@@ -39,7 +39,7 @@ public final class ApplyFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 9;</code>
+     * <code>optional uint32 uid = 7;</code>
      * @return whether the uid field is set
      */
     public boolean hasUid() {
@@ -47,7 +47,7 @@ public final class ApplyFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 9;</code>
+     * <code>optional uint32 uid = 7;</code>
      * @return this
      */
     public ApplyFriendCsReq clearUid() {
@@ -57,7 +57,7 @@ public final class ApplyFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 9;</code>
+     * <code>optional uint32 uid = 7;</code>
      * @return the uid
      */
     public int getUid() {
@@ -65,7 +65,7 @@ public final class ApplyFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 9;</code>
+     * <code>optional uint32 uid = 7;</code>
      * @param value the uid to set
      * @return this
      */
@@ -202,7 +202,7 @@ public final class ApplyFriendCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(uid);
       }
       if ((bitField0_ & 0x00000002) != 0) {
@@ -230,7 +230,7 @@ public final class ApplyFriendCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
+          case 56: {
             // uid
             uid = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java

@@ -0,0 +1,301 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import java.io.IOException;
+import us.hebi.quickbuf.FieldName;
+import us.hebi.quickbuf.InvalidProtocolBufferException;
+import us.hebi.quickbuf.JsonSink;
+import us.hebi.quickbuf.JsonSource;
+import us.hebi.quickbuf.MessageFactory;
+import us.hebi.quickbuf.ProtoMessage;
+import us.hebi.quickbuf.ProtoSink;
+import us.hebi.quickbuf.ProtoSource;
+import us.hebi.quickbuf.RepeatedInt;
+
+public final class AssistMonsterWaveOuterClass {
+  /**
+   * Protobuf type {@code AssistMonsterWave}
+   */
+  public static final class AssistMonsterWave extends ProtoMessage<AssistMonsterWave> implements Cloneable {
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     */
+    private final RepeatedInt entityIdList = RepeatedInt.newEmptyInstance();
+
+    private AssistMonsterWave() {
+    }
+
+    /**
+     * @return a new empty instance of {@code AssistMonsterWave}
+     */
+    public static AssistMonsterWave newInstance() {
+      return new AssistMonsterWave();
+    }
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     * @return whether the entityIdList field is set
+     */
+    public boolean hasEntityIdList() {
+      return (bitField0_ & 0x00000001) != 0;
+    }
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     * @return this
+     */
+    public AssistMonsterWave clearEntityIdList() {
+      bitField0_ &= ~0x00000001;
+      entityIdList.clear();
+      return this;
+    }
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableEntityIdList()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public RepeatedInt getEntityIdList() {
+      return entityIdList;
+    }
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public RepeatedInt getMutableEntityIdList() {
+      bitField0_ |= 0x00000001;
+      return entityIdList;
+    }
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     * @param value the entityIdList to add
+     * @return this
+     */
+    public AssistMonsterWave addEntityIdList(final int value) {
+      bitField0_ |= 0x00000001;
+      entityIdList.add(value);
+      return this;
+    }
+
+    /**
+     * <code>repeated uint32 entity_id_list = 10;</code>
+     * @param values the entityIdList to add
+     * @return this
+     */
+    public AssistMonsterWave addAllEntityIdList(final int... values) {
+      bitField0_ |= 0x00000001;
+      entityIdList.addAll(values);
+      return this;
+    }
+
+    @Override
+    public AssistMonsterWave copyFrom(final AssistMonsterWave other) {
+      cachedSize = other.cachedSize;
+      if ((bitField0_ | other.bitField0_) != 0) {
+        bitField0_ = other.bitField0_;
+        entityIdList.copyFrom(other.entityIdList);
+      }
+      return this;
+    }
+
+    @Override
+    public AssistMonsterWave mergeFrom(final AssistMonsterWave other) {
+      if (other.isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      if (other.hasEntityIdList()) {
+        getMutableEntityIdList().addAll(other.entityIdList);
+      }
+      return this;
+    }
+
+    @Override
+    public AssistMonsterWave clear() {
+      if (isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      bitField0_ = 0;
+      entityIdList.clear();
+      return this;
+    }
+
+    @Override
+    public AssistMonsterWave clearQuick() {
+      if (isEmpty()) {
+        return this;
+      }
+      cachedSize = -1;
+      bitField0_ = 0;
+      entityIdList.clear();
+      return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (o == this) {
+        return true;
+      }
+      if (!(o instanceof AssistMonsterWave)) {
+        return false;
+      }
+      AssistMonsterWave other = (AssistMonsterWave) o;
+      return bitField0_ == other.bitField0_
+        && (!hasEntityIdList() || entityIdList.equals(other.entityIdList));
+    }
+
+    @Override
+    public void writeTo(final ProtoSink output) throws IOException {
+      if ((bitField0_ & 0x00000001) != 0) {
+        for (int i = 0; i < entityIdList.length(); i++) {
+          output.writeRawByte((byte) 80);
+          output.writeUInt32NoTag(entityIdList.array()[i]);
+        }
+      }
+    }
+
+    @Override
+    protected int computeSerializedSize() {
+      int size = 0;
+      if ((bitField0_ & 0x00000001) != 0) {
+        size += (1 * entityIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(entityIdList);
+      }
+      return size;
+    }
+
+    @Override
+    @SuppressWarnings("fallthrough")
+    public AssistMonsterWave mergeFrom(final ProtoSource input) throws IOException {
+      // Enabled Fall-Through Optimization (QuickBuffers)
+      int tag = input.readTag();
+      while (true) {
+        switch (tag) {
+          case 82: {
+            // entityIdList [packed=true]
+            input.readPackedUInt32(entityIdList, tag);
+            bitField0_ |= 0x00000001;
+            tag = input.readTag();
+            if (tag != 0) {
+              break;
+            }
+          }
+          case 0: {
+            return this;
+          }
+          default: {
+            if (!input.skipField(tag)) {
+              return this;
+            }
+            tag = input.readTag();
+            break;
+          }
+          case 80: {
+            // entityIdList [packed=false]
+            tag = input.readRepeatedUInt32(entityIdList, tag);
+            bitField0_ |= 0x00000001;
+            break;
+          }
+        }
+      }
+    }
+
+    @Override
+    public void writeTo(final JsonSink output) throws IOException {
+      output.beginObject();
+      if ((bitField0_ & 0x00000001) != 0) {
+        output.writeRepeatedUInt32(FieldNames.entityIdList, entityIdList);
+      }
+      output.endObject();
+    }
+
+    @Override
+    public AssistMonsterWave mergeFrom(final JsonSource input) throws IOException {
+      if (!input.beginObject()) {
+        return this;
+      }
+      while (!input.isAtEnd()) {
+        switch (input.readFieldHash()) {
+          case 432358940:
+          case -607564570: {
+            if (input.isAtField(FieldNames.entityIdList)) {
+              if (!input.trySkipNullValue()) {
+                input.readRepeatedUInt32(entityIdList);
+                bitField0_ |= 0x00000001;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          default: {
+            input.skipUnknownField();
+            break;
+          }
+        }
+      }
+      input.endObject();
+      return this;
+    }
+
+    @Override
+    public AssistMonsterWave clone() {
+      return new AssistMonsterWave().copyFrom(this);
+    }
+
+    @Override
+    public boolean isEmpty() {
+      return ((bitField0_) == 0);
+    }
+
+    public static AssistMonsterWave parseFrom(final byte[] data) throws
+        InvalidProtocolBufferException {
+      return ProtoMessage.mergeFrom(new AssistMonsterWave(), data).checkInitialized();
+    }
+
+    public static AssistMonsterWave parseFrom(final ProtoSource input) throws IOException {
+      return ProtoMessage.mergeFrom(new AssistMonsterWave(), input).checkInitialized();
+    }
+
+    public static AssistMonsterWave parseFrom(final JsonSource input) throws IOException {
+      return ProtoMessage.mergeFrom(new AssistMonsterWave(), input).checkInitialized();
+    }
+
+    /**
+     * @return factory for creating AssistMonsterWave messages
+     */
+    public static MessageFactory<AssistMonsterWave> getFactory() {
+      return AssistMonsterWaveFactory.INSTANCE;
+    }
+
+    private enum AssistMonsterWaveFactory implements MessageFactory<AssistMonsterWave> {
+      INSTANCE;
+
+      @Override
+      public AssistMonsterWave create() {
+        return AssistMonsterWave.newInstance();
+      }
+    }
+
+    /**
+     * Contains name constants used for serializing JSON
+     */
+    static class FieldNames {
+      static final FieldName entityIdList = FieldName.forField("entityIdList", "entity_id_list");
+    }
+  }
+}

src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java

@@ -19,25 +19,25 @@ public final class AssistSimpleInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 dressed_skin_id = 4;</code>
-     */
-    private int dressedSkinId;
-
-    /**
-     * <code>optional uint32 avatar_id = 10;</code>
+     * <code>optional uint32 avatar_id = 7;</code>
      */
     private int avatarId;
 
     /**
-     * <code>optional uint32 pos = 13;</code>
-     */
-    private int pos;
-
-    /**
-     * <code>optional uint32 level = 15;</code>
+     * <code>optional uint32 level = 8;</code>
      */
     private int level;
 
+    /**
+     * <code>optional uint32 dressed_skin_id = 11;</code>
+     */
+    private int dressedSkinId;
+
+    /**
+     * <code>optional uint32 pos = 14;</code>
+     */
+    private int pos;
+
     private AssistSimpleInfo() {
     }
 
@@ -49,62 +49,25 @@ public final class AssistSimpleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 dressed_skin_id = 4;</code>
-     * @return whether the dressedSkinId field is set
+     * <code>optional uint32 avatar_id = 7;</code>
+     * @return whether the avatarId field is set
      */
-    public boolean hasDressedSkinId() {
+    public boolean hasAvatarId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 dressed_skin_id = 4;</code>
-     * @return this
-     */
-    public AssistSimpleInfo clearDressedSkinId() {
-      bitField0_ &= ~0x00000001;
-      dressedSkinId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 dressed_skin_id = 4;</code>
-     * @return the dressedSkinId
-     */
-    public int getDressedSkinId() {
-      return dressedSkinId;
-    }
-
-    /**
-     * <code>optional uint32 dressed_skin_id = 4;</code>
-     * @param value the dressedSkinId to set
-     * @return this
-     */
-    public AssistSimpleInfo setDressedSkinId(final int value) {
-      bitField0_ |= 0x00000001;
-      dressedSkinId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 avatar_id = 10;</code>
-     * @return whether the avatarId field is set
-     */
-    public boolean hasAvatarId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 avatar_id = 10;</code>
+     * <code>optional uint32 avatar_id = 7;</code>
      * @return this
      */
     public AssistSimpleInfo clearAvatarId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       avatarId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 avatar_id = 10;</code>
+     * <code>optional uint32 avatar_id = 7;</code>
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -112,73 +75,36 @@ public final class AssistSimpleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 10;</code>
+     * <code>optional uint32 avatar_id = 7;</code>
      * @param value the avatarId to set
      * @return this
      */
     public AssistSimpleInfo setAvatarId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       avatarId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 pos = 13;</code>
-     * @return whether the pos field is set
-     */
-    public boolean hasPos() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 pos = 13;</code>
-     * @return this
-     */
-    public AssistSimpleInfo clearPos() {
-      bitField0_ &= ~0x00000004;
-      pos = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 pos = 13;</code>
-     * @return the pos
-     */
-    public int getPos() {
-      return pos;
-    }
-
-    /**
-     * <code>optional uint32 pos = 13;</code>
-     * @param value the pos to set
-     * @return this
-     */
-    public AssistSimpleInfo setPos(final int value) {
-      bitField0_ |= 0x00000004;
-      pos = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 level = 15;</code>
+     * <code>optional uint32 level = 8;</code>
      * @return whether the level field is set
      */
     public boolean hasLevel() {
-      return (bitField0_ & 0x00000008) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional uint32 level = 15;</code>
+     * <code>optional uint32 level = 8;</code>
      * @return this
      */
     public AssistSimpleInfo clearLevel() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000002;
       level = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 level = 15;</code>
+     * <code>optional uint32 level = 8;</code>
      * @return the level
      */
     public int getLevel() {
@@ -186,25 +112,99 @@ public final class AssistSimpleInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 level = 15;</code>
+     * <code>optional uint32 level = 8;</code>
      * @param value the level to set
      * @return this
      */
     public AssistSimpleInfo setLevel(final int value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000002;
       level = value;
       return this;
     }
 
+    /**
+     * <code>optional uint32 dressed_skin_id = 11;</code>
+     * @return whether the dressedSkinId field is set
+     */
+    public boolean hasDressedSkinId() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 dressed_skin_id = 11;</code>
+     * @return this
+     */
+    public AssistSimpleInfo clearDressedSkinId() {
+      bitField0_ &= ~0x00000004;
+      dressedSkinId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 dressed_skin_id = 11;</code>
+     * @return the dressedSkinId
+     */
+    public int getDressedSkinId() {
+      return dressedSkinId;
+    }
+
+    /**
+     * <code>optional uint32 dressed_skin_id = 11;</code>
+     * @param value the dressedSkinId to set
+     * @return this
+     */
+    public AssistSimpleInfo setDressedSkinId(final int value) {
+      bitField0_ |= 0x00000004;
+      dressedSkinId = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 pos = 14;</code>
+     * @return whether the pos field is set
+     */
+    public boolean hasPos() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * <code>optional uint32 pos = 14;</code>
+     * @return this
+     */
+    public AssistSimpleInfo clearPos() {
+      bitField0_ &= ~0x00000008;
+      pos = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 pos = 14;</code>
+     * @return the pos
+     */
+    public int getPos() {
+      return pos;
+    }
+
+    /**
+     * <code>optional uint32 pos = 14;</code>
+     * @param value the pos to set
+     * @return this
+     */
+    public AssistSimpleInfo setPos(final int value) {
+      bitField0_ |= 0x00000008;
+      pos = value;
+      return this;
+    }
+
     @Override
     public AssistSimpleInfo copyFrom(final AssistSimpleInfo other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        dressedSkinId = other.dressedSkinId;
         avatarId = other.avatarId;
-        pos = other.pos;
         level = other.level;
+        dressedSkinId = other.dressedSkinId;
+        pos = other.pos;
       }
       return this;
     }
@@ -215,18 +215,18 @@ public final class AssistSimpleInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasDressedSkinId()) {
-        setDressedSkinId(other.dressedSkinId);
-      }
       if (other.hasAvatarId()) {
         setAvatarId(other.avatarId);
       }
-      if (other.hasPos()) {
-        setPos(other.pos);
-      }
       if (other.hasLevel()) {
         setLevel(other.level);
       }
+      if (other.hasDressedSkinId()) {
+        setDressedSkinId(other.dressedSkinId);
+      }
+      if (other.hasPos()) {
+        setPos(other.pos);
+      }
       return this;
     }
 
@@ -237,10 +237,10 @@ public final class AssistSimpleInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      dressedSkinId = 0;
       avatarId = 0;
-      pos = 0;
       level = 0;
+      dressedSkinId = 0;
+      pos = 0;
       return this;
     }
 
@@ -264,29 +264,29 @@ public final class AssistSimpleInfoOuterClass {
       }
       AssistSimpleInfo other = (AssistSimpleInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId)
         && (!hasAvatarId() || avatarId == other.avatarId)
-        && (!hasPos() || pos == other.pos)
-        && (!hasLevel() || level == other.level);
+        && (!hasLevel() || level == other.level)
+        && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId)
+        && (!hasPos() || pos == other.pos);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(dressedSkinId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(avatarId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(level);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 104);
-        output.writeUInt32NoTag(pos);
+        output.writeRawByte((byte) 88);
+        output.writeUInt32NoTag(dressedSkinId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 120);
-        output.writeUInt32NoTag(level);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(pos);
       }
     }
 
@@ -294,16 +294,16 @@ public final class AssistSimpleInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(pos);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(pos);
       }
       return size;
     }
@@ -315,36 +315,36 @@ public final class AssistSimpleInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
-            // dressedSkinId
-            dressedSkinId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 80) {
-              break;
-            }
-          }
-          case 80: {
+          case 56: {
             // avatarId
             avatarId = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 64) {
               break;
             }
           }
-          case 104: {
-            // pos
-            pos = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 120) {
-              break;
-            }
-          }
-          case 120: {
+          case 64: {
             // level
             level = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 88) {
+              break;
+            }
+          }
+          case 88: {
+            // dressedSkinId
+            dressedSkinId = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 112) {
+              break;
+            }
+          }
+          case 112: {
+            // pos
+            pos = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
             if (tag != 0) {
@@ -369,16 +369,16 @@ public final class AssistSimpleInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.avatarId, avatarId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.level, level);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.pos, pos);
+        output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.level, level);
+        output.writeUInt32(FieldNames.pos, pos);
       }
       output.endObject();
     }
@@ -390,35 +390,12 @@ public final class AssistSimpleInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -407000018:
-          case 2012697844: {
-            if (input.isAtField(FieldNames.dressedSkinId)) {
-              if (!input.trySkipNullValue()) {
-                dressedSkinId = input.readUInt32();
-                bitField0_ |= 0x00000001;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 1787287636:
           case -428636735: {
             if (input.isAtField(FieldNames.avatarId)) {
               if (!input.trySkipNullValue()) {
                 avatarId = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case 111188: {
-            if (input.isAtField(FieldNames.pos)) {
-              if (!input.trySkipNullValue()) {
-                pos = input.readUInt32();
-                bitField0_ |= 0x00000004;
+                bitField0_ |= 0x00000001;
               }
             } else {
               input.skipUnknownField();
@@ -429,6 +406,29 @@ public final class AssistSimpleInfoOuterClass {
             if (input.isAtField(FieldNames.level)) {
               if (!input.trySkipNullValue()) {
                 level = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -407000018:
+          case 2012697844: {
+            if (input.isAtField(FieldNames.dressedSkinId)) {
+              if (!input.trySkipNullValue()) {
+                dressedSkinId = input.readUInt32();
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 111188: {
+            if (input.isAtField(FieldNames.pos)) {
+              if (!input.trySkipNullValue()) {
+                pos = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -489,13 +489,13 @@ public final class AssistSimpleInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id");
-
       static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
 
-      static final FieldName pos = FieldName.forField("pos");
-
       static final FieldName level = FieldName.forField("level");
+
+      static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id");
+
+      static final FieldName pos = FieldName.forField("pos");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java

@@ -19,12 +19,12 @@ public final class AvatarExpUpCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 base_avatar_id = 13;</code>
+     * <code>optional uint32 base_avatar_id = 5;</code>
      */
     private int baseAvatarId;
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 1;</code>
+     * <code>optional .ItemCostList item_cost_list = 6;</code>
      */
     private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 13;</code>
+     * <code>optional uint32 base_avatar_id = 5;</code>
      * @return whether the baseAvatarId field is set
      */
     public boolean hasBaseAvatarId() {
@@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 13;</code>
+     * <code>optional uint32 base_avatar_id = 5;</code>
      * @return this
      */
     public AvatarExpUpCsReq clearBaseAvatarId() {
@@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 13;</code>
+     * <code>optional uint32 base_avatar_id = 5;</code>
      * @return the baseAvatarId
      */
     public int getBaseAvatarId() {
@@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 13;</code>
+     * <code>optional uint32 base_avatar_id = 5;</code>
      * @param value the baseAvatarId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 1;</code>
+     * <code>optional .ItemCostList item_cost_list = 6;</code>
      * @return whether the itemCostList field is set
      */
     public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 1;</code>
+     * <code>optional .ItemCostList item_cost_list = 6;</code>
      * @return this
      */
     public AvatarExpUpCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 1;</code>
+     * <code>optional .ItemCostList item_cost_list = 6;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 1;</code>
+     * <code>optional .ItemCostList item_cost_list = 6;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class AvatarExpUpCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 1;</code>
+     * <code>optional .ItemCostList item_cost_list = 6;</code>
      * @param value the itemCostList to set
      * @return this
      */
@@ -198,11 +198,11 @@ public final class AvatarExpUpCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 10);
+        output.writeRawByte((byte) 50);
         output.writeMessageNoTag(itemCostList);
       }
     }
@@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 40: {
             // baseAvatarId
             baseAvatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 10) {
+            if (tag != 50) {
               break;
             }
           }
-          case 10: {
+          case 50: {
             // itemCostList
             input.readMessage(itemCostList);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java

@@ -20,12 +20,12 @@ public final class AvatarExpUpScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 10;</code>
      */
     private int retcode;
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      */
     private final RepeatedMessage<PileItemOuterClass.PileItem> returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory());
 
@@ -40,7 +40,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return this
      */
     public AvatarExpUpScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      * @return whether the returnItemList field is set
      */
     public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      * @return this
      */
     public AvatarExpUpScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      * @param value the returnItemList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 9;</code>
+     * <code>repeated .PileItem return_item_list = 1;</code>
      * @param values the returnItemList to add
      * @return this
      */
@@ -210,12 +210,12 @@ public final class AvatarExpUpScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < returnItemList.length(); i++) {
-          output.writeRawByte((byte) 74);
+          output.writeRawByte((byte) 10);
           output.writeMessageNoTag(returnItemList.get(i));
         }
       }
@@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 56: {
+          case 80: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 74) {
+            if (tag != 10) {
               break;
             }
           }
-          case 74: {
+          case 10: {
             // returnItemList
             tag = input.readRepeatedMessage(returnItemList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java

@@ -20,7 +20,7 @@ public final class AvatarSyncOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      */
     private final RepeatedMessage<AvatarOuterClass.Avatar> avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory());
 
@@ -35,7 +35,7 @@ public final class AvatarSyncOuterClass {
     }
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      * @return whether the avatarList field is set
      */
     public boolean hasAvatarList() {
@@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass {
     }
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      * @return this
      */
     public AvatarSync clearAvatarList() {
@@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass {
     }
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class AvatarSyncOuterClass {
     }
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class AvatarSyncOuterClass {
     }
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      * @param value the avatarList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass {
     }
 
     /**
-     * <code>repeated .Avatar avatar_list = 13;</code>
+     * <code>repeated .Avatar avatar_list = 5;</code>
      * @param values the avatarList to add
      * @return this
      */
@@ -163,7 +163,7 @@ public final class AvatarSyncOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < avatarList.length(); i++) {
-          output.writeRawByte((byte) 106);
+          output.writeRawByte((byte) 42);
           output.writeMessageNoTag(avatarList.get(i));
         }
       }
@@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 106: {
+          case 42: {
             // avatarList
             tag = input.readRepeatedMessage(avatarList, tag);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/BattleTargetOuterClass.java

@@ -28,11 +28,6 @@ public final class BattleTargetOuterClass {
      */
     private int progress;
 
-    /**
-     * <code>optional uint32 CDLKMKKOGLL = 3;</code>
-     */
-    private int cDLKMKKOGLL;
-
     private BattleTarget() {
     }
 
@@ -117,43 +112,6 @@ public final class BattleTargetOuterClass {
       return this;
     }
 
-    /**
-     * <code>optional uint32 CDLKMKKOGLL = 3;</code>
-     * @return whether the cDLKMKKOGLL field is set
-     */
-    public boolean hasCDLKMKKOGLL() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 CDLKMKKOGLL = 3;</code>
-     * @return this
-     */
-    public BattleTarget clearCDLKMKKOGLL() {
-      bitField0_ &= ~0x00000004;
-      cDLKMKKOGLL = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 CDLKMKKOGLL = 3;</code>
-     * @return the cDLKMKKOGLL
-     */
-    public int getCDLKMKKOGLL() {
-      return cDLKMKKOGLL;
-    }
-
-    /**
-     * <code>optional uint32 CDLKMKKOGLL = 3;</code>
-     * @param value the cDLKMKKOGLL to set
-     * @return this
-     */
-    public BattleTarget setCDLKMKKOGLL(final int value) {
-      bitField0_ |= 0x00000004;
-      cDLKMKKOGLL = value;
-      return this;
-    }
-
     @Override
     public BattleTarget copyFrom(final BattleTarget other) {
       cachedSize = other.cachedSize;
@@ -161,7 +119,6 @@ public final class BattleTargetOuterClass {
         bitField0_ = other.bitField0_;
         id = other.id;
         progress = other.progress;
-        cDLKMKKOGLL = other.cDLKMKKOGLL;
       }
       return this;
     }
@@ -178,9 +135,6 @@ public final class BattleTargetOuterClass {
       if (other.hasProgress()) {
         setProgress(other.progress);
       }
-      if (other.hasCDLKMKKOGLL()) {
-        setCDLKMKKOGLL(other.cDLKMKKOGLL);
-      }
       return this;
     }
 
@@ -193,7 +147,6 @@ public final class BattleTargetOuterClass {
       bitField0_ = 0;
       id = 0;
       progress = 0;
-      cDLKMKKOGLL = 0;
       return this;
     }
 
@@ -218,8 +171,7 @@ public final class BattleTargetOuterClass {
       BattleTarget other = (BattleTarget) o;
       return bitField0_ == other.bitField0_
         && (!hasId() || id == other.id)
-        && (!hasProgress() || progress == other.progress)
-        && (!hasCDLKMKKOGLL() || cDLKMKKOGLL == other.cDLKMKKOGLL);
+        && (!hasProgress() || progress == other.progress);
     }
 
     @Override
@@ -232,10 +184,6 @@ public final class BattleTargetOuterClass {
         output.writeRawByte((byte) 16);
         output.writeUInt32NoTag(progress);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(cDLKMKKOGLL);
-      }
     }
 
     @Override
@@ -247,9 +195,6 @@ public final class BattleTargetOuterClass {
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(progress);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(cDLKMKKOGLL);
-      }
       return size;
     }
 
@@ -274,15 +219,6 @@ public final class BattleTargetOuterClass {
             progress = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 24) {
-              break;
-            }
-          }
-          case 24: {
-            // cDLKMKKOGLL
-            cDLKMKKOGLL = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
             if (tag != 0) {
               break;
             }
@@ -310,9 +246,6 @@ public final class BattleTargetOuterClass {
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.progress, progress);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.cDLKMKKOGLL, cDLKMKKOGLL);
-      }
       output.endObject();
     }
 
@@ -345,17 +278,6 @@ public final class BattleTargetOuterClass {
             }
             break;
           }
-          case -1138288731: {
-            if (input.isAtField(FieldNames.cDLKMKKOGLL)) {
-              if (!input.trySkipNullValue()) {
-                cDLKMKKOGLL = input.readUInt32();
-                bitField0_ |= 0x00000004;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           default: {
             input.skipUnknownField();
             break;
@@ -411,8 +333,6 @@ public final class BattleTargetOuterClass {
       static final FieldName id = FieldName.forField("id");
 
       static final FieldName progress = FieldName.forField("progress");
-
-      static final FieldName cDLKMKKOGLL = FieldName.forField("CDLKMKKOGLL");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java

@@ -21,12 +21,12 @@ public final class BoardDataSyncOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      */
     private final Utf8String signature = Utf8String.newEmptyInstance();
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      */
     private final RepeatedMessage<HeadIconOuterClass.HeadIcon> unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory());
 
@@ -41,7 +41,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @return whether the signature field is set
      */
     public boolean hasSignature() {
@@ -49,7 +49,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @return this
      */
     public BoardDataSync clearSignature() {
@@ -59,7 +59,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @return the signature
      */
     public String getSignature() {
@@ -67,7 +67,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @return internal {@code Utf8String} representation of signature for reading
      */
     public Utf8String getSignatureBytes() {
@@ -75,7 +75,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @return internal {@code Utf8String} representation of signature for modifications
      */
     public Utf8String getMutableSignatureBytes() {
@@ -84,7 +84,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @param value the signature to set
      * @return this
      */
@@ -95,7 +95,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>optional string signature = 15;</code>
+     * <code>optional string signature = 13;</code>
      * @param value the signature to set
      * @return this
      */
@@ -106,7 +106,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      * @return whether the unlockedHeadIconList field is set
      */
     public boolean hasUnlockedHeadIconList() {
@@ -114,7 +114,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      * @return this
      */
     public BoardDataSync clearUnlockedHeadIconList() {
@@ -124,7 +124,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -138,7 +138,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -152,7 +152,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      * @param value the unlockedHeadIconList to add
      * @return this
      */
@@ -163,7 +163,7 @@ public final class BoardDataSyncOuterClass {
     }
 
     /**
-     * <code>repeated .HeadIcon unlocked_head_icon_list = 9;</code>
+     * <code>repeated .HeadIcon unlocked_head_icon_list = 7;</code>
      * @param values the unlockedHeadIconList to add
      * @return this
      */
@@ -240,12 +240,12 @@ public final class BoardDataSyncOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 122);
+        output.writeRawByte((byte) 106);
         output.writeStringNoTag(signature);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < unlockedHeadIconList.length(); i++) {
-          output.writeRawByte((byte) 74);
+          output.writeRawByte((byte) 58);
           output.writeMessageNoTag(unlockedHeadIconList.get(i));
         }
       }
@@ -270,16 +270,16 @@ public final class BoardDataSyncOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 122: {
+          case 106: {
             // signature
             input.readString(signature);
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 74) {
+            if (tag != 58) {
               break;
             }
           }
-          case 74: {
+          case 58: {
             // unlockedHeadIconList
             tag = input.readRepeatedMessage(unlockedHeadIconList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java

@@ -22,37 +22,37 @@ public final class BuffInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint64 add_time_ms = 5;</code>
+     * <code>optional uint64 add_time_ms = 8;</code>
      */
     private long addTimeMs;
 
     /**
-     * <code>optional float life_time = 10;</code>
+     * <code>optional float life_time = 9;</code>
      */
     private float lifeTime;
 
     /**
-     * <code>optional uint32 base_avatar_id = 4;</code>
-     */
-    private int baseAvatarId;
-
-    /**
-     * <code>optional uint32 buff_id = 8;</code>
-     */
-    private int buffId;
-
-    /**
-     * <code>optional uint32 count = 11;</code>
+     * <code>optional uint32 count = 1;</code>
      */
     private int count;
 
     /**
-     * <code>optional uint32 level = 13;</code>
+     * <code>optional uint32 buff_id = 5;</code>
+     */
+    private int buffId;
+
+    /**
+     * <code>optional uint32 base_avatar_id = 11;</code>
+     */
+    private int baseAvatarId;
+
+    /**
+     * <code>optional uint32 level = 14;</code>
      */
     private int level;
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      */
     private final RepeatedMessage<DynamicValuesEntry> dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory());
 
@@ -67,7 +67,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint64 add_time_ms = 5;</code>
+     * <code>optional uint64 add_time_ms = 8;</code>
      * @return whether the addTimeMs field is set
      */
     public boolean hasAddTimeMs() {
@@ -75,7 +75,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint64 add_time_ms = 5;</code>
+     * <code>optional uint64 add_time_ms = 8;</code>
      * @return this
      */
     public BuffInfo clearAddTimeMs() {
@@ -85,7 +85,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint64 add_time_ms = 5;</code>
+     * <code>optional uint64 add_time_ms = 8;</code>
      * @return the addTimeMs
      */
     public long getAddTimeMs() {
@@ -93,7 +93,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint64 add_time_ms = 5;</code>
+     * <code>optional uint64 add_time_ms = 8;</code>
      * @param value the addTimeMs to set
      * @return this
      */
@@ -104,7 +104,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional float life_time = 10;</code>
+     * <code>optional float life_time = 9;</code>
      * @return whether the lifeTime field is set
      */
     public boolean hasLifeTime() {
@@ -112,7 +112,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional float life_time = 10;</code>
+     * <code>optional float life_time = 9;</code>
      * @return this
      */
     public BuffInfo clearLifeTime() {
@@ -122,7 +122,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional float life_time = 10;</code>
+     * <code>optional float life_time = 9;</code>
      * @return the lifeTime
      */
     public float getLifeTime() {
@@ -130,7 +130,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional float life_time = 10;</code>
+     * <code>optional float life_time = 9;</code>
      * @param value the lifeTime to set
      * @return this
      */
@@ -141,44 +141,44 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 4;</code>
-     * @return whether the baseAvatarId field is set
+     * <code>optional uint32 count = 1;</code>
+     * @return whether the count field is set
      */
-    public boolean hasBaseAvatarId() {
+    public boolean hasCount() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 4;</code>
+     * <code>optional uint32 count = 1;</code>
      * @return this
      */
-    public BuffInfo clearBaseAvatarId() {
+    public BuffInfo clearCount() {
       bitField0_ &= ~0x00000004;
-      baseAvatarId = 0;
+      count = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 4;</code>
-     * @return the baseAvatarId
+     * <code>optional uint32 count = 1;</code>
+     * @return the count
      */
-    public int getBaseAvatarId() {
-      return baseAvatarId;
+    public int getCount() {
+      return count;
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 4;</code>
-     * @param value the baseAvatarId to set
+     * <code>optional uint32 count = 1;</code>
+     * @param value the count to set
      * @return this
      */
-    public BuffInfo setBaseAvatarId(final int value) {
+    public BuffInfo setCount(final int value) {
       bitField0_ |= 0x00000004;
-      baseAvatarId = value;
+      count = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 buff_id = 8;</code>
+     * <code>optional uint32 buff_id = 5;</code>
      * @return whether the buffId field is set
      */
     public boolean hasBuffId() {
@@ -186,7 +186,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 8;</code>
+     * <code>optional uint32 buff_id = 5;</code>
      * @return this
      */
     public BuffInfo clearBuffId() {
@@ -196,7 +196,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 8;</code>
+     * <code>optional uint32 buff_id = 5;</code>
      * @return the buffId
      */
     public int getBuffId() {
@@ -204,7 +204,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 8;</code>
+     * <code>optional uint32 buff_id = 5;</code>
      * @param value the buffId to set
      * @return this
      */
@@ -215,44 +215,44 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 11;</code>
-     * @return whether the count field is set
+     * <code>optional uint32 base_avatar_id = 11;</code>
+     * @return whether the baseAvatarId field is set
      */
-    public boolean hasCount() {
+    public boolean hasBaseAvatarId() {
       return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * <code>optional uint32 count = 11;</code>
+     * <code>optional uint32 base_avatar_id = 11;</code>
      * @return this
      */
-    public BuffInfo clearCount() {
+    public BuffInfo clearBaseAvatarId() {
       bitField0_ &= ~0x00000010;
-      count = 0;
+      baseAvatarId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 count = 11;</code>
-     * @return the count
+     * <code>optional uint32 base_avatar_id = 11;</code>
+     * @return the baseAvatarId
      */
-    public int getCount() {
-      return count;
+    public int getBaseAvatarId() {
+      return baseAvatarId;
     }
 
     /**
-     * <code>optional uint32 count = 11;</code>
-     * @param value the count to set
+     * <code>optional uint32 base_avatar_id = 11;</code>
+     * @param value the baseAvatarId to set
      * @return this
      */
-    public BuffInfo setCount(final int value) {
+    public BuffInfo setBaseAvatarId(final int value) {
       bitField0_ |= 0x00000010;
-      count = value;
+      baseAvatarId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 level = 13;</code>
+     * <code>optional uint32 level = 14;</code>
      * @return whether the level field is set
      */
     public boolean hasLevel() {
@@ -260,7 +260,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 level = 13;</code>
+     * <code>optional uint32 level = 14;</code>
      * @return this
      */
     public BuffInfo clearLevel() {
@@ -270,7 +270,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 level = 13;</code>
+     * <code>optional uint32 level = 14;</code>
      * @return the level
      */
     public int getLevel() {
@@ -278,7 +278,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 level = 13;</code>
+     * <code>optional uint32 level = 14;</code>
      * @param value the level to set
      * @return this
      */
@@ -289,7 +289,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      * @return whether the dynamicValues field is set
      */
     public boolean hasDynamicValues() {
@@ -297,7 +297,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      * @return this
      */
     public BuffInfo clearDynamicValues() {
@@ -307,7 +307,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -321,7 +321,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -335,7 +335,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      * @param value the dynamicValues to add
      * @return this
      */
@@ -346,7 +346,7 @@ public final class BuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 1;</code>
+     * <code>repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4;</code>
      * @param values the dynamicValues to add
      * @return this
      */
@@ -363,9 +363,9 @@ public final class BuffInfoOuterClass {
         bitField0_ = other.bitField0_;
         addTimeMs = other.addTimeMs;
         lifeTime = other.lifeTime;
-        baseAvatarId = other.baseAvatarId;
-        buffId = other.buffId;
         count = other.count;
+        buffId = other.buffId;
+        baseAvatarId = other.baseAvatarId;
         level = other.level;
         dynamicValues.copyFrom(other.dynamicValues);
       }
@@ -384,14 +384,14 @@ public final class BuffInfoOuterClass {
       if (other.hasLifeTime()) {
         setLifeTime(other.lifeTime);
       }
-      if (other.hasBaseAvatarId()) {
-        setBaseAvatarId(other.baseAvatarId);
+      if (other.hasCount()) {
+        setCount(other.count);
       }
       if (other.hasBuffId()) {
         setBuffId(other.buffId);
       }
-      if (other.hasCount()) {
-        setCount(other.count);
+      if (other.hasBaseAvatarId()) {
+        setBaseAvatarId(other.baseAvatarId);
       }
       if (other.hasLevel()) {
         setLevel(other.level);
@@ -411,9 +411,9 @@ public final class BuffInfoOuterClass {
       bitField0_ = 0;
       addTimeMs = 0L;
       lifeTime = 0F;
-      baseAvatarId = 0;
-      buffId = 0;
       count = 0;
+      buffId = 0;
+      baseAvatarId = 0;
       level = 0;
       dynamicValues.clear();
       return this;
@@ -442,9 +442,9 @@ public final class BuffInfoOuterClass {
       return bitField0_ == other.bitField0_
         && (!hasAddTimeMs() || addTimeMs == other.addTimeMs)
         && (!hasLifeTime() || ProtoUtil.isEqual(lifeTime, other.lifeTime))
-        && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
-        && (!hasBuffId() || buffId == other.buffId)
         && (!hasCount() || count == other.count)
+        && (!hasBuffId() || buffId == other.buffId)
+        && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
         && (!hasLevel() || level == other.level)
         && (!hasDynamicValues() || dynamicValues.equals(other.dynamicValues));
     }
@@ -452,32 +452,32 @@ public final class BuffInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 64);
         output.writeUInt64NoTag(addTimeMs);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 85);
+        output.writeRawByte((byte) 77);
         output.writeFloatNoTag(lifeTime);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(baseAvatarId);
+        output.writeRawByte((byte) 8);
+        output.writeUInt32NoTag(count);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(buffId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(count);
+        output.writeUInt32NoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(level);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         for (int i = 0; i < dynamicValues.length(); i++) {
-          output.writeRawByte((byte) 10);
+          output.writeRawByte((byte) 34);
           output.writeMessageNoTag(dynamicValues.get(i));
         }
       }
@@ -493,13 +493,13 @@ public final class BuffInfoOuterClass {
         size += 5;
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
@@ -517,34 +517,34 @@ public final class BuffInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
+          case 64: {
             // addTimeMs
             addTimeMs = input.readUInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 85) {
+            if (tag != 77) {
               break;
             }
           }
-          case 85: {
+          case 77: {
             // lifeTime
             lifeTime = input.readFloat();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 8) {
               break;
             }
           }
-          case 32: {
-            // baseAvatarId
-            baseAvatarId = input.readUInt32();
+          case 8: {
+            // count
+            count = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 40) {
               break;
             }
           }
-          case 64: {
+          case 40: {
             // buffId
             buffId = input.readUInt32();
             bitField0_ |= 0x00000008;
@@ -554,24 +554,24 @@ public final class BuffInfoOuterClass {
             }
           }
           case 88: {
-            // count
-            count = input.readUInt32();
+            // baseAvatarId
+            baseAvatarId = input.readUInt32();
             bitField0_ |= 0x00000010;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 112) {
               break;
             }
           }
-          case 104: {
+          case 112: {
             // level
             level = input.readUInt32();
             bitField0_ |= 0x00000020;
             tag = input.readTag();
-            if (tag != 10) {
+            if (tag != 34) {
               break;
             }
           }
-          case 10: {
+          case 34: {
             // dynamicValues
             tag = input.readRepeatedMessage(dynamicValues, tag);
             bitField0_ |= 0x00000040;
@@ -603,13 +603,13 @@ public final class BuffInfoOuterClass {
         output.writeFloat(FieldNames.lifeTime, lifeTime);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
+        output.writeUInt32(FieldNames.count, count);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.buffId, buffId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeUInt32(FieldNames.count, count);
+        output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
       }
       if ((bitField0_ & 0x00000020) != 0) {
         output.writeUInt32(FieldNames.level, level);
@@ -651,11 +651,10 @@ public final class BuffInfoOuterClass {
             }
             break;
           }
-          case 118022725:
-          case -1756826157: {
-            if (input.isAtField(FieldNames.baseAvatarId)) {
+          case 94851343: {
+            if (input.isAtField(FieldNames.count)) {
               if (!input.trySkipNullValue()) {
-                baseAvatarId = input.readUInt32();
+                count = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -675,10 +674,11 @@ public final class BuffInfoOuterClass {
             }
             break;
           }
-          case 94851343: {
-            if (input.isAtField(FieldNames.count)) {
+          case 118022725:
+          case -1756826157: {
+            if (input.isAtField(FieldNames.baseAvatarId)) {
               if (!input.trySkipNullValue()) {
-                count = input.readUInt32();
+                baseAvatarId = input.readUInt32();
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -1119,11 +1119,11 @@ public final class BuffInfoOuterClass {
 
       static final FieldName lifeTime = FieldName.forField("lifeTime", "life_time");
 
-      static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+      static final FieldName count = FieldName.forField("count");
 
       static final FieldName buffId = FieldName.forField("buffId", "buff_id");
 
-      static final FieldName count = FieldName.forField("count");
+      static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
 
       static final FieldName level = FieldName.forField("level");
 

src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java

@@ -19,24 +19,24 @@ public final class BuyGoodsCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 goods_num = 4;</code>
+     * <code>optional uint32 goods_num = 3;</code>
      */
     private int goodsNum;
 
     /**
-     * <code>optional uint32 shop_id = 5;</code>
+     * <code>optional uint32 goods_id = 8;</code>
      */
-    private int shopId;
+    private int goodsId;
 
     /**
-     * <code>optional uint32 item_id = 14;</code>
+     * <code>optional uint32 item_id = 9;</code>
      */
     private int itemId;
 
     /**
-     * <code>optional uint32 goods_id = 15;</code>
+     * <code>optional uint32 shop_id = 11;</code>
      */
-    private int goodsId;
+    private int shopId;
 
     private BuyGoodsCsReq() {
     }
@@ -49,7 +49,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 goods_num = 4;</code>
+     * <code>optional uint32 goods_num = 3;</code>
      * @return whether the goodsNum field is set
      */
     public boolean hasGoodsNum() {
@@ -57,7 +57,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 goods_num = 4;</code>
+     * <code>optional uint32 goods_num = 3;</code>
      * @return this
      */
     public BuyGoodsCsReq clearGoodsNum() {
@@ -67,7 +67,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 goods_num = 4;</code>
+     * <code>optional uint32 goods_num = 3;</code>
      * @return the goodsNum
      */
     public int getGoodsNum() {
@@ -75,7 +75,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 goods_num = 4;</code>
+     * <code>optional uint32 goods_num = 3;</code>
      * @param value the goodsNum to set
      * @return this
      */
@@ -86,44 +86,44 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 shop_id = 5;</code>
-     * @return whether the shopId field is set
+     * <code>optional uint32 goods_id = 8;</code>
+     * @return whether the goodsId field is set
      */
-    public boolean hasShopId() {
+    public boolean hasGoodsId() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional uint32 shop_id = 5;</code>
+     * <code>optional uint32 goods_id = 8;</code>
      * @return this
      */
-    public BuyGoodsCsReq clearShopId() {
+    public BuyGoodsCsReq clearGoodsId() {
       bitField0_ &= ~0x00000002;
-      shopId = 0;
+      goodsId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 shop_id = 5;</code>
-     * @return the shopId
+     * <code>optional uint32 goods_id = 8;</code>
+     * @return the goodsId
      */
-    public int getShopId() {
-      return shopId;
+    public int getGoodsId() {
+      return goodsId;
     }
 
     /**
-     * <code>optional uint32 shop_id = 5;</code>
-     * @param value the shopId to set
+     * <code>optional uint32 goods_id = 8;</code>
+     * @param value the goodsId to set
      * @return this
      */
-    public BuyGoodsCsReq setShopId(final int value) {
+    public BuyGoodsCsReq setGoodsId(final int value) {
       bitField0_ |= 0x00000002;
-      shopId = value;
+      goodsId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 item_id = 14;</code>
+     * <code>optional uint32 item_id = 9;</code>
      * @return whether the itemId field is set
      */
     public boolean hasItemId() {
@@ -131,7 +131,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 item_id = 14;</code>
+     * <code>optional uint32 item_id = 9;</code>
      * @return this
      */
     public BuyGoodsCsReq clearItemId() {
@@ -141,7 +141,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 item_id = 14;</code>
+     * <code>optional uint32 item_id = 9;</code>
      * @return the itemId
      */
     public int getItemId() {
@@ -149,7 +149,7 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 item_id = 14;</code>
+     * <code>optional uint32 item_id = 9;</code>
      * @param value the itemId to set
      * @return this
      */
@@ -160,39 +160,39 @@ public final class BuyGoodsCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 goods_id = 15;</code>
-     * @return whether the goodsId field is set
+     * <code>optional uint32 shop_id = 11;</code>
+     * @return whether the shopId field is set
      */
-    public boolean hasGoodsId() {
+    public boolean hasShopId() {
       return (bitField0_ & 0x00000008) != 0;
     }
 
     /**
-     * <code>optional uint32 goods_id = 15;</code>
+     * <code>optional uint32 shop_id = 11;</code>
      * @return this
      */
-    public BuyGoodsCsReq clearGoodsId() {
+    public BuyGoodsCsReq clearShopId() {
       bitField0_ &= ~0x00000008;
-      goodsId = 0;
+      shopId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 goods_id = 15;</code>
-     * @return the goodsId
+     * <code>optional uint32 shop_id = 11;</code>
+     * @return the shopId
      */
-    public int getGoodsId() {
-      return goodsId;
+    public int getShopId() {
+      return shopId;
     }
 
     /**
-     * <code>optional uint32 goods_id = 15;</code>
-     * @param value the goodsId to set
+     * <code>optional uint32 shop_id = 11;</code>
+     * @param value the shopId to set
      * @return this
      */
-    public BuyGoodsCsReq setGoodsId(final int value) {
+    public BuyGoodsCsReq setShopId(final int value) {
       bitField0_ |= 0x00000008;
-      goodsId = value;
+      shopId = value;
       return this;
     }
 
@@ -202,9 +202,9 @@ public final class BuyGoodsCsReqOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         goodsNum = other.goodsNum;
-        shopId = other.shopId;
-        itemId = other.itemId;
         goodsId = other.goodsId;
+        itemId = other.itemId;
+        shopId = other.shopId;
       }
       return this;
     }
@@ -218,14 +218,14 @@ public final class BuyGoodsCsReqOuterClass {
       if (other.hasGoodsNum()) {
         setGoodsNum(other.goodsNum);
       }
-      if (other.hasShopId()) {
-        setShopId(other.shopId);
+      if (other.hasGoodsId()) {
+        setGoodsId(other.goodsId);
       }
       if (other.hasItemId()) {
         setItemId(other.itemId);
       }
-      if (other.hasGoodsId()) {
-        setGoodsId(other.goodsId);
+      if (other.hasShopId()) {
+        setShopId(other.shopId);
       }
       return this;
     }
@@ -238,9 +238,9 @@ public final class BuyGoodsCsReqOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       goodsNum = 0;
-      shopId = 0;
-      itemId = 0;
       goodsId = 0;
+      itemId = 0;
+      shopId = 0;
       return this;
     }
 
@@ -265,28 +265,28 @@ public final class BuyGoodsCsReqOuterClass {
       BuyGoodsCsReq other = (BuyGoodsCsReq) o;
       return bitField0_ == other.bitField0_
         && (!hasGoodsNum() || goodsNum == other.goodsNum)
-        && (!hasShopId() || shopId == other.shopId)
+        && (!hasGoodsId() || goodsId == other.goodsId)
         && (!hasItemId() || itemId == other.itemId)
-        && (!hasGoodsId() || goodsId == other.goodsId);
+        && (!hasShopId() || shopId == other.shopId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(goodsNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(shopId);
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(goodsId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 112);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(itemId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 120);
-        output.writeUInt32NoTag(goodsId);
+        output.writeRawByte((byte) 88);
+        output.writeUInt32NoTag(shopId);
       }
     }
 
@@ -297,13 +297,13 @@ public final class BuyGoodsCsReqOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
       }
       return size;
     }
@@ -315,36 +315,36 @@ public final class BuyGoodsCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 24: {
             // goodsNum
             goodsNum = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 64) {
               break;
             }
           }
-          case 40: {
-            // shopId
-            shopId = input.readUInt32();
+          case 64: {
+            // goodsId
+            goodsId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 72) {
               break;
             }
           }
-          case 112: {
+          case 72: {
             // itemId
             itemId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 88) {
               break;
             }
           }
-          case 120: {
-            // goodsId
-            goodsId = input.readUInt32();
+          case 88: {
+            // shopId
+            shopId = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
             if (tag != 0) {
@@ -372,13 +372,13 @@ public final class BuyGoodsCsReqOuterClass {
         output.writeUInt32(FieldNames.goodsNum, goodsNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.shopId, shopId);
+        output.writeUInt32(FieldNames.goodsId, goodsId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.itemId, itemId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.goodsId, goodsId);
+        output.writeUInt32(FieldNames.shopId, shopId);
       }
       output.endObject();
     }
@@ -402,11 +402,11 @@ public final class BuyGoodsCsReqOuterClass {
             }
             break;
           }
-          case -903151951:
-          case 2067081988: {
-            if (input.isAtField(FieldNames.shopId)) {
+          case 207037201:
+          case 2123207332: {
+            if (input.isAtField(FieldNames.goodsId)) {
               if (!input.trySkipNullValue()) {
-                shopId = input.readUInt32();
+                goodsId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -426,11 +426,11 @@ public final class BuyGoodsCsReqOuterClass {
             }
             break;
           }
-          case 207037201:
-          case 2123207332: {
-            if (input.isAtField(FieldNames.goodsId)) {
+          case -903151951:
+          case 2067081988: {
+            if (input.isAtField(FieldNames.shopId)) {
               if (!input.trySkipNullValue()) {
-                goodsId = input.readUInt32();
+                shopId = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -492,11 +492,11 @@ public final class BuyGoodsCsReqOuterClass {
     static class FieldNames {
       static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num");
 
-      static final FieldName shopId = FieldName.forField("shopId", "shop_id");
+      static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
 
       static final FieldName itemId = FieldName.forField("itemId", "item_id");
 
-      static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
+      static final FieldName shopId = FieldName.forField("shopId", "shop_id");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java

@@ -19,27 +19,27 @@ public final class BuyGoodsScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
-     */
-    private int retcode;
-
-    /**
-     * <code>optional uint32 goods_buy_times = 9;</code>
-     */
-    private int goodsBuyTimes;
-
-    /**
-     * <code>optional uint32 shop_id = 11;</code>
-     */
-    private int shopId;
-
-    /**
-     * <code>optional uint32 goods_id = 12;</code>
+     * <code>optional uint32 goods_id = 1;</code>
      */
     private int goodsId;
 
     /**
-     * <code>optional .ItemList return_item_list = 1;</code>
+     * <code>optional uint32 shop_id = 3;</code>
+     */
+    private int shopId;
+
+    /**
+     * <code>optional uint32 goods_buy_times = 8;</code>
+     */
+    private int goodsBuyTimes;
+
+    /**
+     * <code>optional uint32 retcode = 12;</code>
+     */
+    private int retcode;
+
+    /**
+     * <code>optional .ItemList return_item_list = 2;</code>
      */
     private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
 
@@ -54,136 +54,25 @@ public final class BuyGoodsScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
-     * @return whether the retcode field is set
+     * <code>optional uint32 goods_id = 1;</code>
+     * @return whether the goodsId field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasGoodsId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
-     * @return this
-     */
-    public BuyGoodsScRsp clearRetcode() {
-      bitField0_ &= ~0x00000001;
-      retcode = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
-     * @return the retcode
-     */
-    public int getRetcode() {
-      return retcode;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
-     * @param value the retcode to set
-     * @return this
-     */
-    public BuyGoodsScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000001;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 goods_buy_times = 9;</code>
-     * @return whether the goodsBuyTimes field is set
-     */
-    public boolean hasGoodsBuyTimes() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 goods_buy_times = 9;</code>
-     * @return this
-     */
-    public BuyGoodsScRsp clearGoodsBuyTimes() {
-      bitField0_ &= ~0x00000002;
-      goodsBuyTimes = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 goods_buy_times = 9;</code>
-     * @return the goodsBuyTimes
-     */
-    public int getGoodsBuyTimes() {
-      return goodsBuyTimes;
-    }
-
-    /**
-     * <code>optional uint32 goods_buy_times = 9;</code>
-     * @param value the goodsBuyTimes to set
-     * @return this
-     */
-    public BuyGoodsScRsp setGoodsBuyTimes(final int value) {
-      bitField0_ |= 0x00000002;
-      goodsBuyTimes = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 shop_id = 11;</code>
-     * @return whether the shopId field is set
-     */
-    public boolean hasShopId() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 shop_id = 11;</code>
-     * @return this
-     */
-    public BuyGoodsScRsp clearShopId() {
-      bitField0_ &= ~0x00000004;
-      shopId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 shop_id = 11;</code>
-     * @return the shopId
-     */
-    public int getShopId() {
-      return shopId;
-    }
-
-    /**
-     * <code>optional uint32 shop_id = 11;</code>
-     * @param value the shopId to set
-     * @return this
-     */
-    public BuyGoodsScRsp setShopId(final int value) {
-      bitField0_ |= 0x00000004;
-      shopId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 goods_id = 12;</code>
-     * @return whether the goodsId field is set
-     */
-    public boolean hasGoodsId() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * <code>optional uint32 goods_id = 12;</code>
+     * <code>optional uint32 goods_id = 1;</code>
      * @return this
      */
     public BuyGoodsScRsp clearGoodsId() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000001;
       goodsId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 goods_id = 12;</code>
+     * <code>optional uint32 goods_id = 1;</code>
      * @return the goodsId
      */
     public int getGoodsId() {
@@ -191,18 +80,129 @@ public final class BuyGoodsScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 goods_id = 12;</code>
+     * <code>optional uint32 goods_id = 1;</code>
      * @param value the goodsId to set
      * @return this
      */
     public BuyGoodsScRsp setGoodsId(final int value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000001;
       goodsId = value;
       return this;
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 1;</code>
+     * <code>optional uint32 shop_id = 3;</code>
+     * @return whether the shopId field is set
+     */
+    public boolean hasShopId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 shop_id = 3;</code>
+     * @return this
+     */
+    public BuyGoodsScRsp clearShopId() {
+      bitField0_ &= ~0x00000002;
+      shopId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 shop_id = 3;</code>
+     * @return the shopId
+     */
+    public int getShopId() {
+      return shopId;
+    }
+
+    /**
+     * <code>optional uint32 shop_id = 3;</code>
+     * @param value the shopId to set
+     * @return this
+     */
+    public BuyGoodsScRsp setShopId(final int value) {
+      bitField0_ |= 0x00000002;
+      shopId = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 goods_buy_times = 8;</code>
+     * @return whether the goodsBuyTimes field is set
+     */
+    public boolean hasGoodsBuyTimes() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 goods_buy_times = 8;</code>
+     * @return this
+     */
+    public BuyGoodsScRsp clearGoodsBuyTimes() {
+      bitField0_ &= ~0x00000004;
+      goodsBuyTimes = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 goods_buy_times = 8;</code>
+     * @return the goodsBuyTimes
+     */
+    public int getGoodsBuyTimes() {
+      return goodsBuyTimes;
+    }
+
+    /**
+     * <code>optional uint32 goods_buy_times = 8;</code>
+     * @param value the goodsBuyTimes to set
+     * @return this
+     */
+    public BuyGoodsScRsp setGoodsBuyTimes(final int value) {
+      bitField0_ |= 0x00000004;
+      goodsBuyTimes = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 12;</code>
+     * @return whether the retcode field is set
+     */
+    public boolean hasRetcode() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 12;</code>
+     * @return this
+     */
+    public BuyGoodsScRsp clearRetcode() {
+      bitField0_ &= ~0x00000008;
+      retcode = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 12;</code>
+     * @return the retcode
+     */
+    public int getRetcode() {
+      return retcode;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 12;</code>
+     * @param value the retcode to set
+     * @return this
+     */
+    public BuyGoodsScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000008;
+      retcode = value;
+      return this;
+    }
+
+    /**
+     * <code>optional .ItemList return_item_list = 2;</code>
      * @return whether the returnItemList field is set
      */
     public boolean hasReturnItemList() {
@@ -210,7 +210,7 @@ public final class BuyGoodsScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 1;</code>
+     * <code>optional .ItemList return_item_list = 2;</code>
      * @return this
      */
     public BuyGoodsScRsp clearReturnItemList() {
@@ -220,7 +220,7 @@ public final class BuyGoodsScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 1;</code>
+     * <code>optional .ItemList return_item_list = 2;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public final class BuyGoodsScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 1;</code>
+     * <code>optional .ItemList return_item_list = 2;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public final class BuyGoodsScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 1;</code>
+     * <code>optional .ItemList return_item_list = 2;</code>
      * @param value the returnItemList to set
      * @return this
      */
@@ -263,10 +263,10 @@ public final class BuyGoodsScRspOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        retcode = other.retcode;
-        goodsBuyTimes = other.goodsBuyTimes;
-        shopId = other.shopId;
         goodsId = other.goodsId;
+        shopId = other.shopId;
+        goodsBuyTimes = other.goodsBuyTimes;
+        retcode = other.retcode;
         returnItemList.copyFrom(other.returnItemList);
       }
       return this;
@@ -278,17 +278,17 @@ public final class BuyGoodsScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
-      if (other.hasGoodsBuyTimes()) {
-        setGoodsBuyTimes(other.goodsBuyTimes);
+      if (other.hasGoodsId()) {
+        setGoodsId(other.goodsId);
       }
       if (other.hasShopId()) {
         setShopId(other.shopId);
       }
-      if (other.hasGoodsId()) {
-        setGoodsId(other.goodsId);
+      if (other.hasGoodsBuyTimes()) {
+        setGoodsBuyTimes(other.goodsBuyTimes);
+      }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
       }
       if (other.hasReturnItemList()) {
         getMutableReturnItemList().mergeFrom(other.returnItemList);
@@ -303,10 +303,10 @@ public final class BuyGoodsScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      retcode = 0;
-      goodsBuyTimes = 0;
-      shopId = 0;
       goodsId = 0;
+      shopId = 0;
+      goodsBuyTimes = 0;
+      retcode = 0;
       returnItemList.clear();
       return this;
     }
@@ -332,33 +332,33 @@ public final class BuyGoodsScRspOuterClass {
       }
       BuyGoodsScRsp other = (BuyGoodsScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasRetcode() || retcode == other.retcode)
-        && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes)
-        && (!hasShopId() || shopId == other.shopId)
         && (!hasGoodsId() || goodsId == other.goodsId)
+        && (!hasShopId() || shopId == other.shopId)
+        && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes)
+        && (!hasRetcode() || retcode == other.retcode)
         && (!hasReturnItemList() || returnItemList.equals(other.returnItemList));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 8);
+        output.writeUInt32NoTag(goodsId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(goodsBuyTimes);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(shopId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(shopId);
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(goodsBuyTimes);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(goodsId);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 10);
+        output.writeRawByte((byte) 18);
         output.writeMessageNoTag(returnItemList);
       }
     }
@@ -367,16 +367,16 @@ public final class BuyGoodsScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList);
@@ -391,27 +391,27 @@ public final class BuyGoodsScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 56: {
-            // retcode
-            retcode = input.readUInt32();
+          case 8: {
+            // goodsId
+            goodsId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 72) {
+            if (tag != 24) {
               break;
             }
           }
-          case 72: {
-            // goodsBuyTimes
-            goodsBuyTimes = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
+          case 24: {
             // shopId
             shopId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 64) {
+              break;
+            }
+          }
+          case 64: {
+            // goodsBuyTimes
+            goodsBuyTimes = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 96) {
@@ -419,15 +419,15 @@ public final class BuyGoodsScRspOuterClass {
             }
           }
           case 96: {
-            // goodsId
-            goodsId = input.readUInt32();
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 10) {
+            if (tag != 18) {
               break;
             }
           }
-          case 10: {
+          case 18: {
             // returnItemList
             input.readMessage(returnItemList);
             bitField0_ |= 0x00000010;
@@ -454,16 +454,16 @@ public final class BuyGoodsScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.goodsId, goodsId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.shopId, shopId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.goodsId, goodsId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeMessage(FieldNames.returnItemList, returnItemList);
@@ -478,10 +478,11 @@ public final class BuyGoodsScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case 207037201:
+          case 2123207332: {
+            if (input.isAtField(FieldNames.goodsId)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                goodsId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -489,23 +490,23 @@ public final class BuyGoodsScRspOuterClass {
             }
             break;
           }
-          case -1410858538:
-          case -230536540: {
-            if (input.isAtField(FieldNames.goodsBuyTimes)) {
-              if (!input.trySkipNullValue()) {
-                goodsBuyTimes = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case -903151951:
           case 2067081988: {
             if (input.isAtField(FieldNames.shopId)) {
               if (!input.trySkipNullValue()) {
                 shopId = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -1410858538:
+          case -230536540: {
+            if (input.isAtField(FieldNames.goodsBuyTimes)) {
+              if (!input.trySkipNullValue()) {
+                goodsBuyTimes = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -513,11 +514,10 @@ public final class BuyGoodsScRspOuterClass {
             }
             break;
           }
-          case 207037201:
-          case 2123207332: {
-            if (input.isAtField(FieldNames.goodsId)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                goodsId = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -589,13 +589,13 @@ public final class BuyGoodsScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName retcode = FieldName.forField("retcode");
-
-      static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times");
+      static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
 
       static final FieldName shopId = FieldName.forField("shopId", "shop_id");
 
-      static final FieldName goodsId = FieldName.forField("goodsId", "goods_id");
+      static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times");
+
+      static final FieldName retcode = FieldName.forField("retcode");
 
       static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list");
     }

src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java

@@ -18,38 +18,38 @@ public final class ChallengeInfoOuterClass {
   public static final class ChallengeInfo extends ProtoMessage<ChallengeInfo> implements Cloneable {
     private static final long serialVersionUID = 0L;
 
+    /**
+     * <code>optional uint32 score = 2;</code>
+     */
+    private int score;
+
     /**
      * <code>optional uint32 score_two = 4;</code>
      */
     private int scoreTwo;
 
-    /**
-     * <code>optional uint32 challenge_id = 9;</code>
-     */
-    private int challengeId;
-
-    /**
-     * <code>optional uint32 score = 12;</code>
-     */
-    private int score;
-
     /**
      * <code>optional uint32 round_count = 13;</code>
      */
     private int roundCount;
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 1;</code>
+     * <code>optional uint32 challenge_id = 14;</code>
      */
-    private int extraLineupType;
+    private int challengeId;
 
     /**
-     * <code>optional .ChallengeStatus status = 11;</code>
+     * <code>optional .ChallengeStatus status = 6;</code>
      */
     private int status;
 
     /**
-     * <code>optional .ChallengeStoryInfo story_info = 3;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     */
+    private int extraLineupType;
+
+    /**
+     * <code>optional .ChallengeStoryInfo story_info = 9;</code>
      */
     private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo storyInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance();
 
@@ -63,12 +63,49 @@ public final class ChallengeInfoOuterClass {
       return new ChallengeInfo();
     }
 
+    /**
+     * <code>optional uint32 score = 2;</code>
+     * @return whether the score field is set
+     */
+    public boolean hasScore() {
+      return (bitField0_ & 0x00000001) != 0;
+    }
+
+    /**
+     * <code>optional uint32 score = 2;</code>
+     * @return this
+     */
+    public ChallengeInfo clearScore() {
+      bitField0_ &= ~0x00000001;
+      score = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 score = 2;</code>
+     * @return the score
+     */
+    public int getScore() {
+      return score;
+    }
+
+    /**
+     * <code>optional uint32 score = 2;</code>
+     * @param value the score to set
+     * @return this
+     */
+    public ChallengeInfo setScore(final int value) {
+      bitField0_ |= 0x00000001;
+      score = value;
+      return this;
+    }
+
     /**
      * <code>optional uint32 score_two = 4;</code>
      * @return whether the scoreTwo field is set
      */
     public boolean hasScoreTwo() {
-      return (bitField0_ & 0x00000001) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
@@ -76,7 +113,7 @@ public final class ChallengeInfoOuterClass {
      * @return this
      */
     public ChallengeInfo clearScoreTwo() {
-      bitField0_ &= ~0x00000001;
+      bitField0_ &= ~0x00000002;
       scoreTwo = 0;
       return this;
     }
@@ -95,82 +132,8 @@ public final class ChallengeInfoOuterClass {
      * @return this
      */
     public ChallengeInfo setScoreTwo(final int value) {
-      bitField0_ |= 0x00000001;
-      scoreTwo = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 challenge_id = 9;</code>
-     * @return whether the challengeId field is set
-     */
-    public boolean hasChallengeId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 challenge_id = 9;</code>
-     * @return this
-     */
-    public ChallengeInfo clearChallengeId() {
-      bitField0_ &= ~0x00000002;
-      challengeId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 challenge_id = 9;</code>
-     * @return the challengeId
-     */
-    public int getChallengeId() {
-      return challengeId;
-    }
-
-    /**
-     * <code>optional uint32 challenge_id = 9;</code>
-     * @param value the challengeId to set
-     * @return this
-     */
-    public ChallengeInfo setChallengeId(final int value) {
       bitField0_ |= 0x00000002;
-      challengeId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 score = 12;</code>
-     * @return whether the score field is set
-     */
-    public boolean hasScore() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 score = 12;</code>
-     * @return this
-     */
-    public ChallengeInfo clearScore() {
-      bitField0_ &= ~0x00000004;
-      score = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 score = 12;</code>
-     * @return the score
-     */
-    public int getScore() {
-      return score;
-    }
-
-    /**
-     * <code>optional uint32 score = 12;</code>
-     * @param value the score to set
-     * @return this
-     */
-    public ChallengeInfo setScore(final int value) {
-      bitField0_ |= 0x00000004;
-      score = value;
+      scoreTwo = value;
       return this;
     }
 
@@ -179,7 +142,7 @@ public final class ChallengeInfoOuterClass {
      * @return whether the roundCount field is set
      */
     public boolean hasRoundCount() {
-      return (bitField0_ & 0x00000008) != 0;
+      return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
@@ -187,7 +150,7 @@ public final class ChallengeInfoOuterClass {
      * @return this
      */
     public ChallengeInfo clearRoundCount() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000004;
       roundCount = 0;
       return this;
     }
@@ -206,93 +169,68 @@ public final class ChallengeInfoOuterClass {
      * @return this
      */
     public ChallengeInfo setRoundCount(final int value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       roundCount = value;
       return this;
     }
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 1;</code>
-     * @return whether the extraLineupType field is set
+     * <code>optional uint32 challenge_id = 14;</code>
+     * @return whether the challengeId field is set
      */
-    public boolean hasExtraLineupType() {
+    public boolean hasChallengeId() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * <code>optional uint32 challenge_id = 14;</code>
+     * @return this
+     */
+    public ChallengeInfo clearChallengeId() {
+      bitField0_ &= ~0x00000008;
+      challengeId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 challenge_id = 14;</code>
+     * @return the challengeId
+     */
+    public int getChallengeId() {
+      return challengeId;
+    }
+
+    /**
+     * <code>optional uint32 challenge_id = 14;</code>
+     * @param value the challengeId to set
+     * @return this
+     */
+    public ChallengeInfo setChallengeId(final int value) {
+      bitField0_ |= 0x00000008;
+      challengeId = value;
+      return this;
+    }
+
+    /**
+     * <code>optional .ChallengeStatus status = 6;</code>
+     * @return whether the status field is set
+     */
+    public boolean hasStatus() {
       return (bitField0_ & 0x00000010) != 0;
     }
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 1;</code>
-     * @return this
-     */
-    public ChallengeInfo clearExtraLineupType() {
-      bitField0_ &= ~0x00000010;
-      extraLineupType = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 1;</code>
-     * @return the extraLineupType
-     */
-    public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
-      return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType);
-    }
-
-    /**
-     * Gets the value of the internal enum store. The result is
-     * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber().
-     *
-     * @return numeric wire representation
-     */
-    public int getExtraLineupTypeValue() {
-      return extraLineupType;
-    }
-
-    /**
-     * Sets the value of the internal enum store. This does not
-     * do any validity checks, so be sure to use appropriate value
-     * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value
-     * can cause {@link ChallengeInfo#getExtraLineupType()} to return null
-     *
-     * @param value the numeric wire value to set
-     * @return this
-     */
-    public ChallengeInfo setExtraLineupTypeValue(final int value) {
-      bitField0_ |= 0x00000010;
-      extraLineupType = value;
-      return this;
-    }
-
-    /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 1;</code>
-     * @param value the extraLineupType to set
-     * @return this
-     */
-    public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) {
-      bitField0_ |= 0x00000010;
-      extraLineupType = value.getNumber();
-      return this;
-    }
-
-    /**
-     * <code>optional .ChallengeStatus status = 11;</code>
-     * @return whether the status field is set
-     */
-    public boolean hasStatus() {
-      return (bitField0_ & 0x00000020) != 0;
-    }
-
-    /**
-     * <code>optional .ChallengeStatus status = 11;</code>
+     * <code>optional .ChallengeStatus status = 6;</code>
      * @return this
      */
     public ChallengeInfo clearStatus() {
-      bitField0_ &= ~0x00000020;
+      bitField0_ &= ~0x00000010;
       status = 0;
       return this;
     }
 
     /**
-     * <code>optional .ChallengeStatus status = 11;</code>
+     * <code>optional .ChallengeStatus status = 6;</code>
      * @return the status
      */
     public ChallengeStatusOuterClass.ChallengeStatus getStatus() {
@@ -319,24 +257,86 @@ public final class ChallengeInfoOuterClass {
      * @return this
      */
     public ChallengeInfo setStatusValue(final int value) {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       status = value;
       return this;
     }
 
     /**
-     * <code>optional .ChallengeStatus status = 11;</code>
+     * <code>optional .ChallengeStatus status = 6;</code>
      * @param value the status to set
      * @return this
      */
     public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       status = value.getNumber();
       return this;
     }
 
     /**
-     * <code>optional .ChallengeStoryInfo story_info = 3;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * @return whether the extraLineupType field is set
+     */
+    public boolean hasExtraLineupType() {
+      return (bitField0_ & 0x00000020) != 0;
+    }
+
+    /**
+     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * @return this
+     */
+    public ChallengeInfo clearExtraLineupType() {
+      bitField0_ &= ~0x00000020;
+      extraLineupType = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * @return the extraLineupType
+     */
+    public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
+      return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType);
+    }
+
+    /**
+     * Gets the value of the internal enum store. The result is
+     * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber().
+     *
+     * @return numeric wire representation
+     */
+    public int getExtraLineupTypeValue() {
+      return extraLineupType;
+    }
+
+    /**
+     * Sets the value of the internal enum store. This does not
+     * do any validity checks, so be sure to use appropriate value
+     * constants from {@link ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value
+     * can cause {@link ChallengeInfo#getExtraLineupType()} to return null
+     *
+     * @param value the numeric wire value to set
+     * @return this
+     */
+    public ChallengeInfo setExtraLineupTypeValue(final int value) {
+      bitField0_ |= 0x00000020;
+      extraLineupType = value;
+      return this;
+    }
+
+    /**
+     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * @param value the extraLineupType to set
+     * @return this
+     */
+    public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) {
+      bitField0_ |= 0x00000020;
+      extraLineupType = value.getNumber();
+      return this;
+    }
+
+    /**
+     * <code>optional .ChallengeStoryInfo story_info = 9;</code>
      * @return whether the storyInfo field is set
      */
     public boolean hasStoryInfo() {
@@ -344,7 +344,7 @@ public final class ChallengeInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryInfo story_info = 3;</code>
+     * <code>optional .ChallengeStoryInfo story_info = 9;</code>
      * @return this
      */
     public ChallengeInfo clearStoryInfo() {
@@ -354,7 +354,7 @@ public final class ChallengeInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryInfo story_info = 3;</code>
+     * <code>optional .ChallengeStoryInfo story_info = 9;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -368,7 +368,7 @@ public final class ChallengeInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryInfo story_info = 3;</code>
+     * <code>optional .ChallengeStoryInfo story_info = 9;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -382,7 +382,7 @@ public final class ChallengeInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryInfo story_info = 3;</code>
+     * <code>optional .ChallengeStoryInfo story_info = 9;</code>
      * @param value the storyInfo to set
      * @return this
      */
@@ -397,12 +397,12 @@ public final class ChallengeInfoOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        scoreTwo = other.scoreTwo;
-        challengeId = other.challengeId;
         score = other.score;
+        scoreTwo = other.scoreTwo;
         roundCount = other.roundCount;
-        extraLineupType = other.extraLineupType;
+        challengeId = other.challengeId;
         status = other.status;
+        extraLineupType = other.extraLineupType;
         storyInfo.copyFrom(other.storyInfo);
       }
       return this;
@@ -414,24 +414,24 @@ public final class ChallengeInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasScoreTwo()) {
-        setScoreTwo(other.scoreTwo);
-      }
-      if (other.hasChallengeId()) {
-        setChallengeId(other.challengeId);
-      }
       if (other.hasScore()) {
         setScore(other.score);
       }
+      if (other.hasScoreTwo()) {
+        setScoreTwo(other.scoreTwo);
+      }
       if (other.hasRoundCount()) {
         setRoundCount(other.roundCount);
       }
-      if (other.hasExtraLineupType()) {
-        setExtraLineupTypeValue(other.extraLineupType);
+      if (other.hasChallengeId()) {
+        setChallengeId(other.challengeId);
       }
       if (other.hasStatus()) {
         setStatusValue(other.status);
       }
+      if (other.hasExtraLineupType()) {
+        setExtraLineupTypeValue(other.extraLineupType);
+      }
       if (other.hasStoryInfo()) {
         getMutableStoryInfo().mergeFrom(other.storyInfo);
       }
@@ -445,12 +445,12 @@ public final class ChallengeInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      scoreTwo = 0;
-      challengeId = 0;
       score = 0;
+      scoreTwo = 0;
       roundCount = 0;
-      extraLineupType = 0;
+      challengeId = 0;
       status = 0;
+      extraLineupType = 0;
       storyInfo.clear();
       return this;
     }
@@ -476,43 +476,43 @@ public final class ChallengeInfoOuterClass {
       }
       ChallengeInfo other = (ChallengeInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
-        && (!hasChallengeId() || challengeId == other.challengeId)
         && (!hasScore() || score == other.score)
+        && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
         && (!hasRoundCount() || roundCount == other.roundCount)
-        && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
+        && (!hasChallengeId() || challengeId == other.challengeId)
         && (!hasStatus() || status == other.status)
+        && (!hasExtraLineupType() || extraLineupType == other.extraLineupType)
         && (!hasStoryInfo() || storyInfo.equals(other.storyInfo));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
+        output.writeRawByte((byte) 16);
+        output.writeUInt32NoTag(score);
+      }
+      if ((bitField0_ & 0x00000002) != 0) {
         output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(scoreTwo);
       }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(challengeId);
-      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(score);
-      }
-      if ((bitField0_ & 0x00000008) != 0) {
         output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(roundCount);
       }
-      if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeEnumNoTag(extraLineupType);
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(challengeId);
       }
-      if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 88);
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeRawByte((byte) 48);
         output.writeEnumNoTag(status);
       }
+      if ((bitField0_ & 0x00000020) != 0) {
+        output.writeRawByte((byte) 96);
+        output.writeEnumNoTag(extraLineupType);
+      }
       if ((bitField0_ & 0x00000040) != 0) {
-        output.writeRawByte((byte) 26);
+        output.writeRawByte((byte) 74);
         output.writeMessageNoTag(storyInfo);
       }
     }
@@ -521,22 +521,22 @@ public final class ChallengeInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(score);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
+      }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
+        size += 1 + ProtoSink.computeEnumSizeNoTag(status);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += 1 + ProtoSink.computeEnumSizeNoTag(status);
+        size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo);
@@ -551,29 +551,20 @@ public final class ChallengeInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
+          case 16: {
+            // score
+            score = input.readUInt32();
+            bitField0_ |= 0x00000001;
+            tag = input.readTag();
+            if (tag != 32) {
+              break;
+            }
+          }
           case 32: {
             // scoreTwo
             scoreTwo = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 72) {
-              break;
-            }
-          }
-          case 72: {
-            // challengeId
-            challengeId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 96) {
-              break;
-            }
-          }
-          case 96: {
-            // score
-            score = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
             if (tag != 104) {
               break;
             }
@@ -581,37 +572,46 @@ public final class ChallengeInfoOuterClass {
           case 104: {
             // roundCount
             roundCount = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 112) {
+              break;
+            }
+          }
+          case 112: {
+            // challengeId
+            challengeId = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 8) {
+            if (tag != 48) {
               break;
             }
           }
-          case 8: {
-            // extraLineupType
-            final int value = input.readInt32();
-            if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
-              extraLineupType = value;
-              bitField0_ |= 0x00000010;
-            }
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
+          case 48: {
             // status
             final int value = input.readInt32();
             if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) {
               status = value;
-              bitField0_ |= 0x00000020;
+              bitField0_ |= 0x00000010;
             }
             tag = input.readTag();
-            if (tag != 26) {
+            if (tag != 96) {
               break;
             }
           }
-          case 26: {
+          case 96: {
+            // extraLineupType
+            final int value = input.readInt32();
+            if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {
+              extraLineupType = value;
+              bitField0_ |= 0x00000020;
+            }
+            tag = input.readTag();
+            if (tag != 74) {
+              break;
+            }
+          }
+          case 74: {
             // storyInfo
             input.readMessage(storyInfo);
             bitField0_ |= 0x00000040;
@@ -638,22 +638,22 @@ public final class ChallengeInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.challengeId, challengeId);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.score, score);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.roundCount, roundCount);
       }
+      if ((bitField0_ & 0x00000008) != 0) {
+        output.writeUInt32(FieldNames.challengeId, challengeId);
+      }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
+        output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter());
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter());
+        output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter());
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeMessage(FieldNames.storyInfo, storyInfo);
@@ -668,11 +668,10 @@ public final class ChallengeInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -485512614:
-          case 2129303327: {
-            if (input.isAtField(FieldNames.scoreTwo)) {
+          case 109264530: {
+            if (input.isAtField(FieldNames.score)) {
               if (!input.trySkipNullValue()) {
-                scoreTwo = input.readUInt32();
+                score = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -680,11 +679,11 @@ public final class ChallengeInfoOuterClass {
             }
             break;
           }
-          case -689112866:
-          case 112359031: {
-            if (input.isAtField(FieldNames.challengeId)) {
+          case -485512614:
+          case 2129303327: {
+            if (input.isAtField(FieldNames.scoreTwo)) {
               if (!input.trySkipNullValue()) {
-                challengeId = input.readUInt32();
+                scoreTwo = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -692,22 +691,23 @@ public final class ChallengeInfoOuterClass {
             }
             break;
           }
-          case 109264530: {
-            if (input.isAtField(FieldNames.score)) {
-              if (!input.trySkipNullValue()) {
-                score = input.readUInt32();
-                bitField0_ |= 0x00000004;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case -171935711:
           case -244677858: {
             if (input.isAtField(FieldNames.roundCount)) {
               if (!input.trySkipNullValue()) {
                 roundCount = input.readUInt32();
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -689112866:
+          case 112359031: {
+            if (input.isAtField(FieldNames.challengeId)) {
+              if (!input.trySkipNullValue()) {
+                challengeId = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -715,6 +715,22 @@ public final class ChallengeInfoOuterClass {
             }
             break;
           }
+          case -892481550: {
+            if (input.isAtField(FieldNames.status)) {
+              if (!input.trySkipNullValue()) {
+                final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter());
+                if (value != null) {
+                  status = value.getNumber();
+                  bitField0_ |= 0x00000010;
+                } else {
+                  input.skipUnknownEnumValue();
+                }
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           case -468135527:
           case -1144475077: {
             if (input.isAtField(FieldNames.extraLineupType)) {
@@ -722,22 +738,6 @@ public final class ChallengeInfoOuterClass {
                 final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter());
                 if (value != null) {
                   extraLineupType = value.getNumber();
-                  bitField0_ |= 0x00000010;
-                } else {
-                  input.skipUnknownEnumValue();
-                }
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -892481550: {
-            if (input.isAtField(FieldNames.status)) {
-              if (!input.trySkipNullValue()) {
-                final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter());
-                if (value != null) {
-                  status = value.getNumber();
                   bitField0_ |= 0x00000020;
                 } else {
                   input.skipUnknownEnumValue();
@@ -812,18 +812,18 @@ public final class ChallengeInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
-
-      static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
-
       static final FieldName score = FieldName.forField("score");
 
+      static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
+
       static final FieldName roundCount = FieldName.forField("roundCount", "round_count");
 
-      static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
+      static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
 
       static final FieldName status = FieldName.forField("status");
 
+      static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type");
+
       static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info");
     }
   }

src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java

@@ -19,7 +19,7 @@ public final class ChallengeLineupNotifyOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 3;</code>
      */
     private int extraLineupType;
 
@@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 3;</code>
      * @return whether the extraLineupType field is set
      */
     public boolean hasExtraLineupType() {
@@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 3;</code>
      * @return this
      */
     public ChallengeLineupNotify clearExtraLineupType() {
@@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 3;</code>
      * @return the extraLineupType
      */
     public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() {
@@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ExtraLineupType extra_lineup_type = 12;</code>
+     * <code>optional .ExtraLineupType extra_lineup_type = 3;</code>
      * @param value the extraLineupType to set
      * @return this
      */
@@ -155,7 +155,7 @@ public final class ChallengeLineupNotifyOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 24);
         output.writeEnumNoTag(extraLineupType);
       }
     }
@@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 96: {
+          case 24: {
             // extraLineupType
             final int value = input.readInt32();
             if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) {

src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java

@@ -19,25 +19,30 @@ public final class ChallengeOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 taken_reward = 7;</code>
-     */
-    private int takenReward;
-
-    /**
-     * <code>optional uint32 score = 9;</code>
-     */
-    private int score;
-
-    /**
-     * <code>optional uint32 challenge_id = 10;</code>
+     * <code>optional uint32 challenge_id = 1;</code>
      */
     private int challengeId;
 
     /**
-     * <code>optional uint32 stars = 13;</code>
+     * <code>optional uint32 GEHGEGOFDDM = 5;</code>
+     */
+    private int gEHGEGOFDDM;
+
+    /**
+     * <code>optional uint32 score = 7;</code>
+     */
+    private int score;
+
+    /**
+     * <code>optional uint32 stars = 8;</code>
      */
     private int stars;
 
+    /**
+     * <code>optional uint32 taken_reward = 13;</code>
+     */
+    private int takenReward;
+
     private Challenge() {
     }
 
@@ -49,99 +54,25 @@ public final class ChallengeOuterClass {
     }
 
     /**
-     * <code>optional uint32 taken_reward = 7;</code>
-     * @return whether the takenReward field is set
+     * <code>optional uint32 challenge_id = 1;</code>
+     * @return whether the challengeId field is set
      */
-    public boolean hasTakenReward() {
+    public boolean hasChallengeId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 taken_reward = 7;</code>
-     * @return this
-     */
-    public Challenge clearTakenReward() {
-      bitField0_ &= ~0x00000001;
-      takenReward = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 taken_reward = 7;</code>
-     * @return the takenReward
-     */
-    public int getTakenReward() {
-      return takenReward;
-    }
-
-    /**
-     * <code>optional uint32 taken_reward = 7;</code>
-     * @param value the takenReward to set
-     * @return this
-     */
-    public Challenge setTakenReward(final int value) {
-      bitField0_ |= 0x00000001;
-      takenReward = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 score = 9;</code>
-     * @return whether the score field is set
-     */
-    public boolean hasScore() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 score = 9;</code>
-     * @return this
-     */
-    public Challenge clearScore() {
-      bitField0_ &= ~0x00000002;
-      score = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 score = 9;</code>
-     * @return the score
-     */
-    public int getScore() {
-      return score;
-    }
-
-    /**
-     * <code>optional uint32 score = 9;</code>
-     * @param value the score to set
-     * @return this
-     */
-    public Challenge setScore(final int value) {
-      bitField0_ |= 0x00000002;
-      score = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 challenge_id = 10;</code>
-     * @return whether the challengeId field is set
-     */
-    public boolean hasChallengeId() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 challenge_id = 10;</code>
+     * <code>optional uint32 challenge_id = 1;</code>
      * @return this
      */
     public Challenge clearChallengeId() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000001;
       challengeId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 challenge_id = 10;</code>
+     * <code>optional uint32 challenge_id = 1;</code>
      * @return the challengeId
      */
     public int getChallengeId() {
@@ -149,18 +80,92 @@ public final class ChallengeOuterClass {
     }
 
     /**
-     * <code>optional uint32 challenge_id = 10;</code>
+     * <code>optional uint32 challenge_id = 1;</code>
      * @param value the challengeId to set
      * @return this
      */
     public Challenge setChallengeId(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000001;
       challengeId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 stars = 13;</code>
+     * <code>optional uint32 GEHGEGOFDDM = 5;</code>
+     * @return whether the gEHGEGOFDDM field is set
+     */
+    public boolean hasGEHGEGOFDDM() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 GEHGEGOFDDM = 5;</code>
+     * @return this
+     */
+    public Challenge clearGEHGEGOFDDM() {
+      bitField0_ &= ~0x00000002;
+      gEHGEGOFDDM = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 GEHGEGOFDDM = 5;</code>
+     * @return the gEHGEGOFDDM
+     */
+    public int getGEHGEGOFDDM() {
+      return gEHGEGOFDDM;
+    }
+
+    /**
+     * <code>optional uint32 GEHGEGOFDDM = 5;</code>
+     * @param value the gEHGEGOFDDM to set
+     * @return this
+     */
+    public Challenge setGEHGEGOFDDM(final int value) {
+      bitField0_ |= 0x00000002;
+      gEHGEGOFDDM = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 score = 7;</code>
+     * @return whether the score field is set
+     */
+    public boolean hasScore() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 score = 7;</code>
+     * @return this
+     */
+    public Challenge clearScore() {
+      bitField0_ &= ~0x00000004;
+      score = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 score = 7;</code>
+     * @return the score
+     */
+    public int getScore() {
+      return score;
+    }
+
+    /**
+     * <code>optional uint32 score = 7;</code>
+     * @param value the score to set
+     * @return this
+     */
+    public Challenge setScore(final int value) {
+      bitField0_ |= 0x00000004;
+      score = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 stars = 8;</code>
      * @return whether the stars field is set
      */
     public boolean hasStars() {
@@ -168,7 +173,7 @@ public final class ChallengeOuterClass {
     }
 
     /**
-     * <code>optional uint32 stars = 13;</code>
+     * <code>optional uint32 stars = 8;</code>
      * @return this
      */
     public Challenge clearStars() {
@@ -178,7 +183,7 @@ public final class ChallengeOuterClass {
     }
 
     /**
-     * <code>optional uint32 stars = 13;</code>
+     * <code>optional uint32 stars = 8;</code>
      * @return the stars
      */
     public int getStars() {
@@ -186,7 +191,7 @@ public final class ChallengeOuterClass {
     }
 
     /**
-     * <code>optional uint32 stars = 13;</code>
+     * <code>optional uint32 stars = 8;</code>
      * @param value the stars to set
      * @return this
      */
@@ -196,15 +201,53 @@ public final class ChallengeOuterClass {
       return this;
     }
 
+    /**
+     * <code>optional uint32 taken_reward = 13;</code>
+     * @return whether the takenReward field is set
+     */
+    public boolean hasTakenReward() {
+      return (bitField0_ & 0x00000010) != 0;
+    }
+
+    /**
+     * <code>optional uint32 taken_reward = 13;</code>
+     * @return this
+     */
+    public Challenge clearTakenReward() {
+      bitField0_ &= ~0x00000010;
+      takenReward = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 taken_reward = 13;</code>
+     * @return the takenReward
+     */
+    public int getTakenReward() {
+      return takenReward;
+    }
+
+    /**
+     * <code>optional uint32 taken_reward = 13;</code>
+     * @param value the takenReward to set
+     * @return this
+     */
+    public Challenge setTakenReward(final int value) {
+      bitField0_ |= 0x00000010;
+      takenReward = value;
+      return this;
+    }
+
     @Override
     public Challenge copyFrom(final Challenge other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        takenReward = other.takenReward;
-        score = other.score;
         challengeId = other.challengeId;
+        gEHGEGOFDDM = other.gEHGEGOFDDM;
+        score = other.score;
         stars = other.stars;
+        takenReward = other.takenReward;
       }
       return this;
     }
@@ -215,18 +258,21 @@ public final class ChallengeOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasTakenReward()) {
-        setTakenReward(other.takenReward);
+      if (other.hasChallengeId()) {
+        setChallengeId(other.challengeId);
+      }
+      if (other.hasGEHGEGOFDDM()) {
+        setGEHGEGOFDDM(other.gEHGEGOFDDM);
       }
       if (other.hasScore()) {
         setScore(other.score);
       }
-      if (other.hasChallengeId()) {
-        setChallengeId(other.challengeId);
-      }
       if (other.hasStars()) {
         setStars(other.stars);
       }
+      if (other.hasTakenReward()) {
+        setTakenReward(other.takenReward);
+      }
       return this;
     }
 
@@ -237,10 +283,11 @@ public final class ChallengeOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      takenReward = 0;
-      score = 0;
       challengeId = 0;
+      gEHGEGOFDDM = 0;
+      score = 0;
       stars = 0;
+      takenReward = 0;
       return this;
     }
 
@@ -264,47 +311,55 @@ public final class ChallengeOuterClass {
       }
       Challenge other = (Challenge) o;
       return bitField0_ == other.bitField0_
-        && (!hasTakenReward() || takenReward == other.takenReward)
-        && (!hasScore() || score == other.score)
         && (!hasChallengeId() || challengeId == other.challengeId)
-        && (!hasStars() || stars == other.stars);
+        && (!hasGEHGEGOFDDM() || gEHGEGOFDDM == other.gEHGEGOFDDM)
+        && (!hasScore() || score == other.score)
+        && (!hasStars() || stars == other.stars)
+        && (!hasTakenReward() || takenReward == other.takenReward);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(takenReward);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(score);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(challengeId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(gEHGEGOFDDM);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 56);
+        output.writeUInt32NoTag(score);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(stars);
       }
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(takenReward);
+      }
     }
 
     @Override
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(score);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gEHGEGOFDDM);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(score);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
       }
+      if ((bitField0_ & 0x00000010) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward);
+      }
       return size;
     }
 
@@ -315,37 +370,46 @@ public final class ChallengeOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 56: {
-            // takenReward
-            takenReward = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 72) {
-              break;
-            }
-          }
-          case 72: {
-            // score
-            score = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 80) {
-              break;
-            }
-          }
-          case 80: {
+          case 8: {
             // challengeId
             challengeId = input.readUInt32();
+            bitField0_ |= 0x00000001;
+            tag = input.readTag();
+            if (tag != 40) {
+              break;
+            }
+          }
+          case 40: {
+            // gEHGEGOFDDM
+            gEHGEGOFDDM = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 56) {
+              break;
+            }
+          }
+          case 56: {
+            // score
+            score = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
+            if (tag != 64) {
+              break;
+            }
+          }
+          case 64: {
+            // stars
+            stars = input.readUInt32();
+            bitField0_ |= 0x00000008;
+            tag = input.readTag();
             if (tag != 104) {
               break;
             }
           }
           case 104: {
-            // stars
-            stars = input.readUInt32();
-            bitField0_ |= 0x00000008;
+            // takenReward
+            takenReward = input.readUInt32();
+            bitField0_ |= 0x00000010;
             tag = input.readTag();
             if (tag != 0) {
               break;
@@ -369,17 +433,20 @@ public final class ChallengeOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.takenReward, takenReward);
+        output.writeUInt32(FieldNames.challengeId, challengeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.score, score);
+        output.writeUInt32(FieldNames.gEHGEGOFDDM, gEHGEGOFDDM);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.challengeId, challengeId);
+        output.writeUInt32(FieldNames.score, score);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.stars, stars);
       }
+      if ((bitField0_ & 0x00000010) != 0) {
+        output.writeUInt32(FieldNames.takenReward, takenReward);
+      }
       output.endObject();
     }
 
@@ -390,11 +457,11 @@ public final class ChallengeOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1216849622:
-          case -1923526233: {
-            if (input.isAtField(FieldNames.takenReward)) {
+          case -689112866:
+          case 112359031: {
+            if (input.isAtField(FieldNames.challengeId)) {
               if (!input.trySkipNullValue()) {
-                takenReward = input.readUInt32();
+                challengeId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -402,22 +469,21 @@ public final class ChallengeOuterClass {
             }
             break;
           }
+          case 1704714807: {
+            if (input.isAtField(FieldNames.gEHGEGOFDDM)) {
+              if (!input.trySkipNullValue()) {
+                gEHGEGOFDDM = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           case 109264530: {
             if (input.isAtField(FieldNames.score)) {
               if (!input.trySkipNullValue()) {
                 score = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -689112866:
-          case 112359031: {
-            if (input.isAtField(FieldNames.challengeId)) {
-              if (!input.trySkipNullValue()) {
-                challengeId = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -436,6 +502,18 @@ public final class ChallengeOuterClass {
             }
             break;
           }
+          case 1216849622:
+          case -1923526233: {
+            if (input.isAtField(FieldNames.takenReward)) {
+              if (!input.trySkipNullValue()) {
+                takenReward = input.readUInt32();
+                bitField0_ |= 0x00000010;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           default: {
             input.skipUnknownField();
             break;
@@ -488,13 +566,15 @@ public final class ChallengeOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward");
+      static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
+
+      static final FieldName gEHGEGOFDDM = FieldName.forField("GEHGEGOFDDM");
 
       static final FieldName score = FieldName.forField("score");
 
-      static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
-
       static final FieldName stars = FieldName.forField("stars");
+
+      static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java

@@ -19,12 +19,12 @@ public final class ChallengeRewardOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint64 taken_challenge_reward = 10;</code>
+     * <code>optional uint64 taken_challenge_reward = 11;</code>
      */
     private long takenChallengeReward;
 
     /**
-     * <code>optional uint32 group_id = 12;</code>
+     * <code>optional uint32 group_id = 4;</code>
      */
     private int groupId;
 
@@ -39,7 +39,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint64 taken_challenge_reward = 10;</code>
+     * <code>optional uint64 taken_challenge_reward = 11;</code>
      * @return whether the takenChallengeReward field is set
      */
     public boolean hasTakenChallengeReward() {
@@ -47,7 +47,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint64 taken_challenge_reward = 10;</code>
+     * <code>optional uint64 taken_challenge_reward = 11;</code>
      * @return this
      */
     public ChallengeReward clearTakenChallengeReward() {
@@ -57,7 +57,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint64 taken_challenge_reward = 10;</code>
+     * <code>optional uint64 taken_challenge_reward = 11;</code>
      * @return the takenChallengeReward
      */
     public long getTakenChallengeReward() {
@@ -65,7 +65,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint64 taken_challenge_reward = 10;</code>
+     * <code>optional uint64 taken_challenge_reward = 11;</code>
      * @param value the takenChallengeReward to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 12;</code>
+     * <code>optional uint32 group_id = 4;</code>
      * @return whether the groupId field is set
      */
     public boolean hasGroupId() {
@@ -84,7 +84,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 12;</code>
+     * <code>optional uint32 group_id = 4;</code>
      * @return this
      */
     public ChallengeReward clearGroupId() {
@@ -94,7 +94,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 12;</code>
+     * <code>optional uint32 group_id = 4;</code>
      * @return the groupId
      */
     public int getGroupId() {
@@ -102,7 +102,7 @@ public final class ChallengeRewardOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 12;</code>
+     * <code>optional uint32 group_id = 4;</code>
      * @param value the groupId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class ChallengeRewardOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 88);
         output.writeUInt64NoTag(takenChallengeReward);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(groupId);
       }
     }
@@ -205,16 +205,16 @@ public final class ChallengeRewardOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 80: {
+          case 88: {
             // takenChallengeReward
             takenChallengeReward = input.readUInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 32) {
               break;
             }
           }
-          case 96: {
+          case 32: {
             // groupId
             groupId = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java

@@ -19,32 +19,32 @@ public final class ChallengeSettleNotifyOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 challenge_score = 2;</code>
-     */
-    private int challengeScore;
-
-    /**
-     * <code>optional uint32 challenge_id = 5;</code>
-     */
-    private int challengeId;
-
-    /**
-     * <code>optional uint32 score_two = 10;</code>
-     */
-    private int scoreTwo;
-
-    /**
-     * <code>optional uint32 stars = 14;</code>
+     * <code>optional uint32 stars = 1;</code>
      */
     private int stars;
 
     /**
-     * <code>optional bool is_win = 11;</code>
+     * <code>optional uint32 challenge_id = 3;</code>
+     */
+    private int challengeId;
+
+    /**
+     * <code>optional uint32 challenge_score = 10;</code>
+     */
+    private int challengeScore;
+
+    /**
+     * <code>optional uint32 score_two = 12;</code>
+     */
+    private int scoreTwo;
+
+    /**
+     * <code>optional bool is_win = 5;</code>
      */
     private boolean isWin;
 
     /**
-     * <code>optional .ItemList reward = 12;</code>
+     * <code>optional .ItemList reward = 14;</code>
      */
     private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance();
 
@@ -59,44 +59,44 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional uint32 challenge_score = 2;</code>
-     * @return whether the challengeScore field is set
+     * <code>optional uint32 stars = 1;</code>
+     * @return whether the stars field is set
      */
-    public boolean hasChallengeScore() {
+    public boolean hasStars() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 challenge_score = 2;</code>
+     * <code>optional uint32 stars = 1;</code>
      * @return this
      */
-    public ChallengeSettleNotify clearChallengeScore() {
+    public ChallengeSettleNotify clearStars() {
       bitField0_ &= ~0x00000001;
-      challengeScore = 0;
+      stars = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 challenge_score = 2;</code>
-     * @return the challengeScore
+     * <code>optional uint32 stars = 1;</code>
+     * @return the stars
      */
-    public int getChallengeScore() {
-      return challengeScore;
+    public int getStars() {
+      return stars;
     }
 
     /**
-     * <code>optional uint32 challenge_score = 2;</code>
-     * @param value the challengeScore to set
+     * <code>optional uint32 stars = 1;</code>
+     * @param value the stars to set
      * @return this
      */
-    public ChallengeSettleNotify setChallengeScore(final int value) {
+    public ChallengeSettleNotify setStars(final int value) {
       bitField0_ |= 0x00000001;
-      challengeScore = value;
+      stars = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 challenge_id = 5;</code>
+     * <code>optional uint32 challenge_id = 3;</code>
      * @return whether the challengeId field is set
      */
     public boolean hasChallengeId() {
@@ -104,7 +104,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional uint32 challenge_id = 5;</code>
+     * <code>optional uint32 challenge_id = 3;</code>
      * @return this
      */
     public ChallengeSettleNotify clearChallengeId() {
@@ -114,7 +114,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional uint32 challenge_id = 5;</code>
+     * <code>optional uint32 challenge_id = 3;</code>
      * @return the challengeId
      */
     public int getChallengeId() {
@@ -122,7 +122,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional uint32 challenge_id = 5;</code>
+     * <code>optional uint32 challenge_id = 3;</code>
      * @param value the challengeId to set
      * @return this
      */
@@ -133,25 +133,62 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional uint32 score_two = 10;</code>
-     * @return whether the scoreTwo field is set
+     * <code>optional uint32 challenge_score = 10;</code>
+     * @return whether the challengeScore field is set
      */
-    public boolean hasScoreTwo() {
+    public boolean hasChallengeScore() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * <code>optional uint32 score_two = 10;</code>
+     * <code>optional uint32 challenge_score = 10;</code>
+     * @return this
+     */
+    public ChallengeSettleNotify clearChallengeScore() {
+      bitField0_ &= ~0x00000004;
+      challengeScore = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 challenge_score = 10;</code>
+     * @return the challengeScore
+     */
+    public int getChallengeScore() {
+      return challengeScore;
+    }
+
+    /**
+     * <code>optional uint32 challenge_score = 10;</code>
+     * @param value the challengeScore to set
+     * @return this
+     */
+    public ChallengeSettleNotify setChallengeScore(final int value) {
+      bitField0_ |= 0x00000004;
+      challengeScore = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 score_two = 12;</code>
+     * @return whether the scoreTwo field is set
+     */
+    public boolean hasScoreTwo() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * <code>optional uint32 score_two = 12;</code>
      * @return this
      */
     public ChallengeSettleNotify clearScoreTwo() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000008;
       scoreTwo = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 score_two = 10;</code>
+     * <code>optional uint32 score_two = 12;</code>
      * @return the scoreTwo
      */
     public int getScoreTwo() {
@@ -159,55 +196,18 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional uint32 score_two = 10;</code>
+     * <code>optional uint32 score_two = 12;</code>
      * @param value the scoreTwo to set
      * @return this
      */
     public ChallengeSettleNotify setScoreTwo(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000008;
       scoreTwo = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 stars = 14;</code>
-     * @return whether the stars field is set
-     */
-    public boolean hasStars() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * <code>optional uint32 stars = 14;</code>
-     * @return this
-     */
-    public ChallengeSettleNotify clearStars() {
-      bitField0_ &= ~0x00000008;
-      stars = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 stars = 14;</code>
-     * @return the stars
-     */
-    public int getStars() {
-      return stars;
-    }
-
-    /**
-     * <code>optional uint32 stars = 14;</code>
-     * @param value the stars to set
-     * @return this
-     */
-    public ChallengeSettleNotify setStars(final int value) {
-      bitField0_ |= 0x00000008;
-      stars = value;
-      return this;
-    }
-
-    /**
-     * <code>optional bool is_win = 11;</code>
+     * <code>optional bool is_win = 5;</code>
      * @return whether the isWin field is set
      */
     public boolean hasIsWin() {
@@ -215,7 +215,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional bool is_win = 11;</code>
+     * <code>optional bool is_win = 5;</code>
      * @return this
      */
     public ChallengeSettleNotify clearIsWin() {
@@ -225,7 +225,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional bool is_win = 11;</code>
+     * <code>optional bool is_win = 5;</code>
      * @return the isWin
      */
     public boolean getIsWin() {
@@ -233,7 +233,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional bool is_win = 11;</code>
+     * <code>optional bool is_win = 5;</code>
      * @param value the isWin to set
      * @return this
      */
@@ -244,7 +244,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 12;</code>
+     * <code>optional .ItemList reward = 14;</code>
      * @return whether the reward field is set
      */
     public boolean hasReward() {
@@ -252,7 +252,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 12;</code>
+     * <code>optional .ItemList reward = 14;</code>
      * @return this
      */
     public ChallengeSettleNotify clearReward() {
@@ -262,7 +262,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 12;</code>
+     * <code>optional .ItemList reward = 14;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -276,7 +276,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 12;</code>
+     * <code>optional .ItemList reward = 14;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -290,7 +290,7 @@ public final class ChallengeSettleNotifyOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 12;</code>
+     * <code>optional .ItemList reward = 14;</code>
      * @param value the reward to set
      * @return this
      */
@@ -305,10 +305,10 @@ public final class ChallengeSettleNotifyOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        challengeScore = other.challengeScore;
-        challengeId = other.challengeId;
-        scoreTwo = other.scoreTwo;
         stars = other.stars;
+        challengeId = other.challengeId;
+        challengeScore = other.challengeScore;
+        scoreTwo = other.scoreTwo;
         isWin = other.isWin;
         reward.copyFrom(other.reward);
       }
@@ -321,18 +321,18 @@ public final class ChallengeSettleNotifyOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasChallengeScore()) {
-        setChallengeScore(other.challengeScore);
+      if (other.hasStars()) {
+        setStars(other.stars);
       }
       if (other.hasChallengeId()) {
         setChallengeId(other.challengeId);
       }
+      if (other.hasChallengeScore()) {
+        setChallengeScore(other.challengeScore);
+      }
       if (other.hasScoreTwo()) {
         setScoreTwo(other.scoreTwo);
       }
-      if (other.hasStars()) {
-        setStars(other.stars);
-      }
       if (other.hasIsWin()) {
         setIsWin(other.isWin);
       }
@@ -349,10 +349,10 @@ public final class ChallengeSettleNotifyOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      challengeScore = 0;
-      challengeId = 0;
-      scoreTwo = 0;
       stars = 0;
+      challengeId = 0;
+      challengeScore = 0;
+      scoreTwo = 0;
       isWin = false;
       reward.clear();
       return this;
@@ -379,10 +379,10 @@ public final class ChallengeSettleNotifyOuterClass {
       }
       ChallengeSettleNotify other = (ChallengeSettleNotify) o;
       return bitField0_ == other.bitField0_
-        && (!hasChallengeScore() || challengeScore == other.challengeScore)
-        && (!hasChallengeId() || challengeId == other.challengeId)
-        && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
         && (!hasStars() || stars == other.stars)
+        && (!hasChallengeId() || challengeId == other.challengeId)
+        && (!hasChallengeScore() || challengeScore == other.challengeScore)
+        && (!hasScoreTwo() || scoreTwo == other.scoreTwo)
         && (!hasIsWin() || isWin == other.isWin)
         && (!hasReward() || reward.equals(other.reward));
     }
@@ -390,27 +390,27 @@ public final class ChallengeSettleNotifyOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
-        output.writeUInt32NoTag(challengeScore);
+        output.writeRawByte((byte) 8);
+        output.writeUInt32NoTag(stars);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(challengeId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 80);
-        output.writeUInt32NoTag(scoreTwo);
+        output.writeUInt32NoTag(challengeScore);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 112);
-        output.writeUInt32NoTag(stars);
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(scoreTwo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 40);
         output.writeBoolNoTag(isWin);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 98);
+        output.writeRawByte((byte) 114);
         output.writeMessageNoTag(reward);
       }
     }
@@ -419,16 +419,16 @@ public final class ChallengeSettleNotifyOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(stars);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         size += 2;
@@ -446,16 +446,16 @@ public final class ChallengeSettleNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
-            // challengeScore
-            challengeScore = input.readUInt32();
+          case 8: {
+            // stars
+            stars = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 40) {
+            if (tag != 24) {
               break;
             }
           }
-          case 40: {
+          case 24: {
             // challengeId
             challengeId = input.readUInt32();
             bitField0_ |= 0x00000002;
@@ -465,33 +465,33 @@ public final class ChallengeSettleNotifyOuterClass {
             }
           }
           case 80: {
-            // scoreTwo
-            scoreTwo = input.readUInt32();
+            // challengeScore
+            challengeScore = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 112) {
+            if (tag != 96) {
               break;
             }
           }
-          case 112: {
-            // stars
-            stars = input.readUInt32();
+          case 96: {
+            // scoreTwo
+            scoreTwo = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 40) {
               break;
             }
           }
-          case 88: {
+          case 40: {
             // isWin
             isWin = input.readBool();
             bitField0_ |= 0x00000010;
             tag = input.readTag();
-            if (tag != 98) {
+            if (tag != 114) {
               break;
             }
           }
-          case 98: {
+          case 114: {
             // reward
             input.readMessage(reward);
             bitField0_ |= 0x00000020;
@@ -518,16 +518,16 @@ public final class ChallengeSettleNotifyOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.challengeScore, challengeScore);
+        output.writeUInt32(FieldNames.stars, stars);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.challengeId, challengeId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
+        output.writeUInt32(FieldNames.challengeScore, challengeScore);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeUInt32(FieldNames.stars, stars);
+        output.writeUInt32(FieldNames.scoreTwo, scoreTwo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
         output.writeBool(FieldNames.isWin, isWin);
@@ -545,11 +545,10 @@ public final class ChallengeSettleNotifyOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 591599599:
-          case 1517684662: {
-            if (input.isAtField(FieldNames.challengeScore)) {
+          case 109757537: {
+            if (input.isAtField(FieldNames.stars)) {
               if (!input.trySkipNullValue()) {
-                challengeScore = input.readUInt32();
+                stars = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -569,11 +568,11 @@ public final class ChallengeSettleNotifyOuterClass {
             }
             break;
           }
-          case -485512614:
-          case 2129303327: {
-            if (input.isAtField(FieldNames.scoreTwo)) {
+          case 591599599:
+          case 1517684662: {
+            if (input.isAtField(FieldNames.challengeScore)) {
               if (!input.trySkipNullValue()) {
-                scoreTwo = input.readUInt32();
+                challengeScore = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -581,10 +580,11 @@ public final class ChallengeSettleNotifyOuterClass {
             }
             break;
           }
-          case 109757537: {
-            if (input.isAtField(FieldNames.stars)) {
+          case -485512614:
+          case 2129303327: {
+            if (input.isAtField(FieldNames.scoreTwo)) {
               if (!input.trySkipNullValue()) {
-                stars = input.readUInt32();
+                scoreTwo = input.readUInt32();
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -668,13 +668,13 @@ public final class ChallengeSettleNotifyOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score");
+      static final FieldName stars = FieldName.forField("stars");
 
       static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id");
 
-      static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
+      static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score");
 
-      static final FieldName stars = FieldName.forField("stars");
+      static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two");
 
       static final FieldName isWin = FieldName.forField("isWin", "is_win");
 

src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java

@@ -20,7 +20,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      */
     private final RepeatedInt buffList = RepeatedInt.newEmptyInstance();
 
@@ -35,7 +35,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      * @return whether the buffList field is set
      */
     public boolean hasBuffList() {
@@ -43,7 +43,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      * @return this
      */
     public ChallengeStoryBuffInfo clearBuffList() {
@@ -53,7 +53,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      * @param value the buffList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated uint32 buff_list = 6;</code>
+     * <code>repeated uint32 buff_list = 1;</code>
      * @param values the buffList to add
      * @return this
      */
@@ -163,7 +163,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < buffList.length(); i++) {
-          output.writeRawByte((byte) 48);
+          output.writeRawByte((byte) 8);
           output.writeUInt32NoTag(buffList.array()[i]);
         }
       }
@@ -185,7 +185,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 50: {
+          case 10: {
             // buffList [packed=true]
             input.readPackedUInt32(buffList, tag);
             bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class ChallengeStoryBuffInfoOuterClass {
             tag = input.readTag();
             break;
           }
-          case 48: {
+          case 8: {
             // buffList [packed=false]
             tag = input.readRepeatedUInt32(buffList, tag);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java

@@ -19,7 +19,7 @@ public final class ChallengeStoryInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 1;</code>
+     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 5;</code>
      */
     private final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo curStoryBuffs = ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo.newInstance();
 
@@ -45,7 +45,7 @@ public final class ChallengeStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 1;</code>
+     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 5;</code>
      * @return whether the curStoryBuffs field is set
      */
     public boolean hasCurStoryBuffs() {
@@ -53,7 +53,7 @@ public final class ChallengeStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 1;</code>
+     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 5;</code>
      * @return this
      */
     public ChallengeStoryInfo clearCurStoryBuffs() {
@@ -63,7 +63,7 @@ public final class ChallengeStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 1;</code>
+     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 5;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -77,7 +77,7 @@ public final class ChallengeStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 1;</code>
+     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 5;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -91,7 +91,7 @@ public final class ChallengeStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 1;</code>
+     * <code>optional .ChallengeStoryBuffInfo cur_story_buffs = 5;</code>
      * @param value the curStoryBuffs to set
      * @return this
      */
@@ -162,7 +162,7 @@ public final class ChallengeStoryInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 10);
+        output.writeRawByte((byte) 42);
         output.writeMessageNoTag(curStoryBuffs);
       }
     }
@@ -183,7 +183,7 @@ public final class ChallengeStoryInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 10: {
+          case 42: {
             // curStoryBuffs
             input.readMessage(curStoryBuffs);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 slot = 1;</code>
+     * <code>optional uint32 slot = 14;</code>
      */
     private int slot;
 
@@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 1;</code>
+     * <code>optional uint32 slot = 14;</code>
      * @return whether the slot field is set
      */
     public boolean hasSlot() {
@@ -42,7 +42,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 1;</code>
+     * <code>optional uint32 slot = 14;</code>
      * @return this
      */
     public ChangeLineupLeaderCsReq clearSlot() {
@@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 1;</code>
+     * <code>optional uint32 slot = 14;</code>
      * @return the slot
      */
     public int getSlot() {
@@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 1;</code>
+     * <code>optional uint32 slot = 14;</code>
      * @param value the slot to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(slot);
       }
     }
@@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 112: {
             // slot
             slot = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java

@@ -19,15 +19,15 @@ public final class ChangeLineupLeaderScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
-     */
-    private int retcode;
-
-    /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 12;</code>
      */
     private int slot;
 
+    /**
+     * <code>optional uint32 retcode = 14;</code>
+     */
+    private int retcode;
+
     private ChangeLineupLeaderScRsp() {
     }
 
@@ -39,62 +39,25 @@ public final class ChangeLineupLeaderScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @return whether the retcode field is set
+     * <code>optional uint32 slot = 12;</code>
+     * @return whether the slot field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasSlot() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @return this
-     */
-    public ChangeLineupLeaderScRsp clearRetcode() {
-      bitField0_ &= ~0x00000001;
-      retcode = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @return the retcode
-     */
-    public int getRetcode() {
-      return retcode;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @param value the retcode to set
-     * @return this
-     */
-    public ChangeLineupLeaderScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000001;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 slot = 8;</code>
-     * @return whether the slot field is set
-     */
-    public boolean hasSlot() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 12;</code>
      * @return this
      */
     public ChangeLineupLeaderScRsp clearSlot() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       slot = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 12;</code>
      * @return the slot
      */
     public int getSlot() {
@@ -102,23 +65,60 @@ public final class ChangeLineupLeaderScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 12;</code>
      * @param value the slot to set
      * @return this
      */
     public ChangeLineupLeaderScRsp setSlot(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       slot = value;
       return this;
     }
 
+    /**
+     * <code>optional uint32 retcode = 14;</code>
+     * @return whether the retcode field is set
+     */
+    public boolean hasRetcode() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 14;</code>
+     * @return this
+     */
+    public ChangeLineupLeaderScRsp clearRetcode() {
+      bitField0_ &= ~0x00000002;
+      retcode = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 14;</code>
+     * @return the retcode
+     */
+    public int getRetcode() {
+      return retcode;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 14;</code>
+     * @param value the retcode to set
+     * @return this
+     */
+    public ChangeLineupLeaderScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000002;
+      retcode = value;
+      return this;
+    }
+
     @Override
     public ChangeLineupLeaderScRsp copyFrom(final ChangeLineupLeaderScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        retcode = other.retcode;
         slot = other.slot;
+        retcode = other.retcode;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class ChangeLineupLeaderScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       if (other.hasSlot()) {
         setSlot(other.slot);
       }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class ChangeLineupLeaderScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      retcode = 0;
       slot = 0;
+      retcode = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class ChangeLineupLeaderScRspOuterClass {
       }
       ChangeLineupLeaderScRsp other = (ChangeLineupLeaderScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasRetcode() || retcode == other.retcode)
-        && (!hasSlot() || slot == other.slot);
+        && (!hasSlot() || slot == other.slot)
+        && (!hasRetcode() || retcode == other.retcode);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
-        output.writeUInt32NoTag(slot);
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(retcode);
       }
     }
 
@@ -190,10 +190,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(slot);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class ChangeLineupLeaderScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
-            // retcode
-            retcode = input.readUInt32();
+          case 96: {
+            // slot
+            slot = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 112) {
               break;
             }
           }
-          case 64: {
-            // slot
-            slot = input.readUInt32();
+          case 112: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.slot, slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.slot, slot);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       output.endObject();
     }
@@ -256,10 +256,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case 3533310: {
+            if (input.isAtField(FieldNames.slot)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                slot = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -267,10 +267,10 @@ public final class ChangeLineupLeaderScRspOuterClass {
             }
             break;
           }
-          case 3533310: {
-            if (input.isAtField(FieldNames.slot)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                slot = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -331,9 +331,9 @@ public final class ChangeLineupLeaderScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName retcode = FieldName.forField("retcode");
-
       static final FieldName slot = FieldName.forField("slot");
+
+      static final FieldName retcode = FieldName.forField("retcode");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java

@@ -19,12 +19,12 @@ public final class ChargerInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 group_id = 6;</code>
+     * <code>optional uint32 group_id = 12;</code>
      */
     private int groupId;
 
     /**
-     * <code>optional uint32 unk_int = 11;</code>
+     * <code>optional uint32 unk_int = 14;</code>
      */
     private int unkInt;
 
@@ -39,7 +39,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 6;</code>
+     * <code>optional uint32 group_id = 12;</code>
      * @return whether the groupId field is set
      */
     public boolean hasGroupId() {
@@ -47,7 +47,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 6;</code>
+     * <code>optional uint32 group_id = 12;</code>
      * @return this
      */
     public ChargerInfo clearGroupId() {
@@ -57,7 +57,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 6;</code>
+     * <code>optional uint32 group_id = 12;</code>
      * @return the groupId
      */
     public int getGroupId() {
@@ -65,7 +65,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 group_id = 6;</code>
+     * <code>optional uint32 group_id = 12;</code>
      * @param value the groupId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 unk_int = 11;</code>
+     * <code>optional uint32 unk_int = 14;</code>
      * @return whether the unkInt field is set
      */
     public boolean hasUnkInt() {
@@ -84,7 +84,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 unk_int = 11;</code>
+     * <code>optional uint32 unk_int = 14;</code>
      * @return this
      */
     public ChargerInfo clearUnkInt() {
@@ -94,7 +94,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 unk_int = 11;</code>
+     * <code>optional uint32 unk_int = 14;</code>
      * @return the unkInt
      */
     public int getUnkInt() {
@@ -102,7 +102,7 @@ public final class ChargerInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 unk_int = 11;</code>
+     * <code>optional uint32 unk_int = 14;</code>
      * @param value the unkInt to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class ChargerInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(groupId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(unkInt);
       }
     }
@@ -205,16 +205,16 @@ public final class ChargerInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 96: {
             // groupId
             groupId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 112) {
               break;
             }
           }
-          case 88: {
+          case 112: {
             // unkInt
             unkInt = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChatOuterClass.java

@@ -20,12 +20,12 @@ public final class ChatOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint64 sent_time = 15;</code>
+     * <code>optional uint64 sent_time = 1;</code>
      */
     private long sentTime;
 
     /**
-     * <code>optional uint32 sender_uid = 4;</code>
+     * <code>optional uint32 sender_uid = 9;</code>
      */
     private int senderUid;
 
@@ -35,12 +35,12 @@ public final class ChatOuterClass {
     private int emote;
 
     /**
-     * <code>optional .MsgType msg_type = 10;</code>
+     * <code>optional .MsgType msg_type = 7;</code>
      */
     private int msgType;
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      */
     private final Utf8String text = Utf8String.newEmptyInstance();
 
@@ -55,7 +55,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint64 sent_time = 15;</code>
+     * <code>optional uint64 sent_time = 1;</code>
      * @return whether the sentTime field is set
      */
     public boolean hasSentTime() {
@@ -63,7 +63,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint64 sent_time = 15;</code>
+     * <code>optional uint64 sent_time = 1;</code>
      * @return this
      */
     public Chat clearSentTime() {
@@ -73,7 +73,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint64 sent_time = 15;</code>
+     * <code>optional uint64 sent_time = 1;</code>
      * @return the sentTime
      */
     public long getSentTime() {
@@ -81,7 +81,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint64 sent_time = 15;</code>
+     * <code>optional uint64 sent_time = 1;</code>
      * @param value the sentTime to set
      * @return this
      */
@@ -92,7 +92,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint32 sender_uid = 4;</code>
+     * <code>optional uint32 sender_uid = 9;</code>
      * @return whether the senderUid field is set
      */
     public boolean hasSenderUid() {
@@ -100,7 +100,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint32 sender_uid = 4;</code>
+     * <code>optional uint32 sender_uid = 9;</code>
      * @return this
      */
     public Chat clearSenderUid() {
@@ -110,7 +110,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint32 sender_uid = 4;</code>
+     * <code>optional uint32 sender_uid = 9;</code>
      * @return the senderUid
      */
     public int getSenderUid() {
@@ -118,7 +118,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional uint32 sender_uid = 4;</code>
+     * <code>optional uint32 sender_uid = 9;</code>
      * @param value the senderUid to set
      * @return this
      */
@@ -166,7 +166,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional .MsgType msg_type = 10;</code>
+     * <code>optional .MsgType msg_type = 7;</code>
      * @return whether the msgType field is set
      */
     public boolean hasMsgType() {
@@ -174,7 +174,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional .MsgType msg_type = 10;</code>
+     * <code>optional .MsgType msg_type = 7;</code>
      * @return this
      */
     public Chat clearMsgType() {
@@ -184,7 +184,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional .MsgType msg_type = 10;</code>
+     * <code>optional .MsgType msg_type = 7;</code>
      * @return the msgType
      */
     public MsgTypeOuterClass.MsgType getMsgType() {
@@ -217,7 +217,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional .MsgType msg_type = 10;</code>
+     * <code>optional .MsgType msg_type = 7;</code>
      * @param value the msgType to set
      * @return this
      */
@@ -228,7 +228,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @return whether the text field is set
      */
     public boolean hasText() {
@@ -236,7 +236,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @return this
      */
     public Chat clearText() {
@@ -246,7 +246,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @return the text
      */
     public String getText() {
@@ -254,7 +254,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @return internal {@code Utf8String} representation of text for reading
      */
     public Utf8String getTextBytes() {
@@ -262,7 +262,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @return internal {@code Utf8String} representation of text for modifications
      */
     public Utf8String getMutableTextBytes() {
@@ -271,7 +271,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @param value the text to set
      * @return this
      */
@@ -282,7 +282,7 @@ public final class ChatOuterClass {
     }
 
     /**
-     * <code>optional string text = 8;</code>
+     * <code>optional string text = 15;</code>
      * @param value the text to set
      * @return this
      */
@@ -376,11 +376,11 @@ public final class ChatOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 8);
         output.writeUInt64NoTag(sentTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(senderUid);
       }
       if ((bitField0_ & 0x00000004) != 0) {
@@ -388,11 +388,11 @@ public final class ChatOuterClass {
         output.writeUInt32NoTag(emote);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 56);
         output.writeEnumNoTag(msgType);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 66);
+        output.writeRawByte((byte) 122);
         output.writeStringNoTag(text);
       }
     }
@@ -425,16 +425,16 @@ public final class ChatOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 8: {
             // sentTime
             sentTime = input.readUInt64();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 72) {
               break;
             }
           }
-          case 32: {
+          case 72: {
             // senderUid
             senderUid = input.readUInt32();
             bitField0_ |= 0x00000002;
@@ -448,11 +448,11 @@ public final class ChatOuterClass {
             emote = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 80) {
+            if (tag != 56) {
               break;
             }
           }
-          case 80: {
+          case 56: {
             // msgType
             final int value = input.readInt32();
             if (MsgTypeOuterClass.MsgType.forNumber(value) != null) {
@@ -460,11 +460,11 @@ public final class ChatOuterClass {
               bitField0_ |= 0x00000008;
             }
             tag = input.readTag();
-            if (tag != 66) {
+            if (tag != 122) {
               break;
             }
           }
-          case 66: {
+          case 122: {
             // text
             input.readString(text);
             bitField0_ |= 0x00000010;

src/generated/main/emu/lunarcore/proto/ChessRogueAvatarInfoOuterClass.java

@@ -20,12 +20,12 @@ public final class ChessRogueAvatarInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .RogueAvatarReviveCost revive_cost = 15;</code>
+     * <code>optional .RogueAvatarReviveCost revive_cost = 3;</code>
      */
     private final RogueAvatarReviveCostOuterClass.RogueAvatarReviveCost reviveCost = RogueAvatarReviveCostOuterClass.RogueAvatarReviveCost.newInstance();
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      */
     private final RepeatedMessage<ChessRogueAvatarOuterClass.ChessRogueAvatar> chessRogueAvatar = RepeatedMessage.newEmptyInstance(ChessRogueAvatarOuterClass.ChessRogueAvatar.getFactory());
 
@@ -40,7 +40,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>optional .RogueAvatarReviveCost revive_cost = 15;</code>
+     * <code>optional .RogueAvatarReviveCost revive_cost = 3;</code>
      * @return whether the reviveCost field is set
      */
     public boolean hasReviveCost() {
@@ -48,7 +48,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>optional .RogueAvatarReviveCost revive_cost = 15;</code>
+     * <code>optional .RogueAvatarReviveCost revive_cost = 3;</code>
      * @return this
      */
     public ChessRogueAvatarInfo clearReviveCost() {
@@ -58,7 +58,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>optional .RogueAvatarReviveCost revive_cost = 15;</code>
+     * <code>optional .RogueAvatarReviveCost revive_cost = 3;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -72,7 +72,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>optional .RogueAvatarReviveCost revive_cost = 15;</code>
+     * <code>optional .RogueAvatarReviveCost revive_cost = 3;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -86,7 +86,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>optional .RogueAvatarReviveCost revive_cost = 15;</code>
+     * <code>optional .RogueAvatarReviveCost revive_cost = 3;</code>
      * @param value the reviveCost to set
      * @return this
      */
@@ -98,7 +98,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      * @return whether the chessRogueAvatar field is set
      */
     public boolean hasChessRogueAvatar() {
@@ -106,7 +106,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      * @return this
      */
     public ChessRogueAvatarInfo clearChessRogueAvatar() {
@@ -116,7 +116,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -130,7 +130,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -145,7 +145,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      * @param value the chessRogueAvatar to add
      * @return this
      */
@@ -157,7 +157,7 @@ public final class ChessRogueAvatarInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 3;</code>
+     * <code>repeated .ChessRogueAvatar chess_rogue_avatar = 5;</code>
      * @param values the chessRogueAvatar to add
      * @return this
      */
@@ -235,12 +235,12 @@ public final class ChessRogueAvatarInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 122);
+        output.writeRawByte((byte) 26);
         output.writeMessageNoTag(reviveCost);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < chessRogueAvatar.length(); i++) {
-          output.writeRawByte((byte) 26);
+          output.writeRawByte((byte) 42);
           output.writeMessageNoTag(chessRogueAvatar.get(i));
         }
       }
@@ -265,16 +265,16 @@ public final class ChessRogueAvatarInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 122: {
+          case 26: {
             // reviveCost
             input.readMessage(reviveCost);
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 26) {
+            if (tag != 42) {
               break;
             }
           }
-          case 26: {
+          case 42: {
             // chessRogueAvatar
             tag = input.readRepeatedMessage(chessRogueAvatar, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChessRogueAvatarOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueAvatarOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 avatar_id = 7;</code>
+     * <code>optional uint32 avatar_id = 6;</code>
      */
     private int avatarId;
 
@@ -34,7 +34,7 @@ public final class ChessRogueAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 7;</code>
+     * <code>optional uint32 avatar_id = 6;</code>
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -42,7 +42,7 @@ public final class ChessRogueAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 7;</code>
+     * <code>optional uint32 avatar_id = 6;</code>
      * @return this
      */
     public ChessRogueAvatar clearAvatarId() {
@@ -52,7 +52,7 @@ public final class ChessRogueAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 7;</code>
+     * <code>optional uint32 avatar_id = 6;</code>
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -60,7 +60,7 @@ public final class ChessRogueAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 7;</code>
+     * <code>optional uint32 avatar_id = 6;</code>
      * @param value the avatarId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class ChessRogueAvatarOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(avatarId);
       }
     }
@@ -150,7 +150,7 @@ public final class ChessRogueAvatarOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 56: {
+          case 48: {
             // avatarId
             avatarId = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueBuffDataOuterClass.java

@@ -20,7 +20,7 @@ public final class ChessRogueBuffDataOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      */
     private final RepeatedMessage<RogueBuffDataOuterClass.RogueBuffData> buffList = RepeatedMessage.newEmptyInstance(RogueBuffDataOuterClass.RogueBuffData.getFactory());
 
@@ -35,7 +35,7 @@ public final class ChessRogueBuffDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      * @return whether the buffList field is set
      */
     public boolean hasBuffList() {
@@ -43,7 +43,7 @@ public final class ChessRogueBuffDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      * @return this
      */
     public ChessRogueBuffData clearBuffList() {
@@ -53,7 +53,7 @@ public final class ChessRogueBuffDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ChessRogueBuffDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ChessRogueBuffDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      * @param value the buffList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class ChessRogueBuffDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueBuffData buff_list = 13;</code>
+     * <code>repeated .RogueBuffData buff_list = 12;</code>
      * @param values the buffList to add
      * @return this
      */
@@ -164,7 +164,7 @@ public final class ChessRogueBuffDataOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < buffList.length(); i++) {
-          output.writeRawByte((byte) 106);
+          output.writeRawByte((byte) 98);
           output.writeMessageNoTag(buffList.get(i));
         }
       }
@@ -186,7 +186,7 @@ public final class ChessRogueBuffDataOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 106: {
+          case 98: {
             // buffList
             tag = input.readRepeatedMessage(buffList, tag);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueBuffInfoOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueBuffInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .ChessRogueBuffData buff_data = 1;</code>
+     * <code>optional .ChessRogueBuffData buff_data = 12;</code>
      */
     private final ChessRogueBuffDataOuterClass.ChessRogueBuffData buffData = ChessRogueBuffDataOuterClass.ChessRogueBuffData.newInstance();
 
@@ -34,7 +34,7 @@ public final class ChessRogueBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueBuffData buff_data = 1;</code>
+     * <code>optional .ChessRogueBuffData buff_data = 12;</code>
      * @return whether the buffData field is set
      */
     public boolean hasBuffData() {
@@ -42,7 +42,7 @@ public final class ChessRogueBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueBuffData buff_data = 1;</code>
+     * <code>optional .ChessRogueBuffData buff_data = 12;</code>
      * @return this
      */
     public ChessRogueBuffInfo clearBuffData() {
@@ -52,7 +52,7 @@ public final class ChessRogueBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueBuffData buff_data = 1;</code>
+     * <code>optional .ChessRogueBuffData buff_data = 12;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class ChessRogueBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueBuffData buff_data = 1;</code>
+     * <code>optional .ChessRogueBuffData buff_data = 12;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class ChessRogueBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueBuffData buff_data = 1;</code>
+     * <code>optional .ChessRogueBuffData buff_data = 12;</code>
      * @param value the buffData to set
      * @return this
      */
@@ -151,7 +151,7 @@ public final class ChessRogueBuffInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 10);
+        output.writeRawByte((byte) 98);
         output.writeMessageNoTag(buffData);
       }
     }
@@ -172,7 +172,7 @@ public final class ChessRogueBuffInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 10: {
+          case 98: {
             // buffData
             input.readMessage(buffData);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueCellInfoOuterClass.java

@@ -24,12 +24,12 @@ public final class ChessRogueCellInfoOuterClass {
      *  61
      * </pre>
      *
-     * <code>optional uint32 BIEJGDGAOBL = 1;</code>
+     * <code>optional uint32 BIEJGDGAOBL = 8;</code>
      */
     private int bIEJGDGAOBL;
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      */
     private final RepeatedMessage<ChessRogueCellOuterClass.ChessRogueCell> query = RepeatedMessage.newEmptyInstance(ChessRogueCellOuterClass.ChessRogueCell.getFactory());
 
@@ -48,7 +48,7 @@ public final class ChessRogueCellInfoOuterClass {
      *  61
      * </pre>
      *
-     * <code>optional uint32 BIEJGDGAOBL = 1;</code>
+     * <code>optional uint32 BIEJGDGAOBL = 8;</code>
      * @return whether the bIEJGDGAOBL field is set
      */
     public boolean hasBIEJGDGAOBL() {
@@ -60,7 +60,7 @@ public final class ChessRogueCellInfoOuterClass {
      *  61
      * </pre>
      *
-     * <code>optional uint32 BIEJGDGAOBL = 1;</code>
+     * <code>optional uint32 BIEJGDGAOBL = 8;</code>
      * @return this
      */
     public ChessRogueCellInfo clearBIEJGDGAOBL() {
@@ -74,7 +74,7 @@ public final class ChessRogueCellInfoOuterClass {
      *  61
      * </pre>
      *
-     * <code>optional uint32 BIEJGDGAOBL = 1;</code>
+     * <code>optional uint32 BIEJGDGAOBL = 8;</code>
      * @return the bIEJGDGAOBL
      */
     public int getBIEJGDGAOBL() {
@@ -86,7 +86,7 @@ public final class ChessRogueCellInfoOuterClass {
      *  61
      * </pre>
      *
-     * <code>optional uint32 BIEJGDGAOBL = 1;</code>
+     * <code>optional uint32 BIEJGDGAOBL = 8;</code>
      * @param value the bIEJGDGAOBL to set
      * @return this
      */
@@ -97,7 +97,7 @@ public final class ChessRogueCellInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      * @return whether the query field is set
      */
     public boolean hasQuery() {
@@ -105,7 +105,7 @@ public final class ChessRogueCellInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      * @return this
      */
     public ChessRogueCellInfo clearQuery() {
@@ -115,7 +115,7 @@ public final class ChessRogueCellInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -129,7 +129,7 @@ public final class ChessRogueCellInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -143,7 +143,7 @@ public final class ChessRogueCellInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      * @param value the query to add
      * @return this
      */
@@ -154,7 +154,7 @@ public final class ChessRogueCellInfoOuterClass {
     }
 
     /**
-     * <code>repeated .ChessRogueCell query = 7;</code>
+     * <code>repeated .ChessRogueCell query = 1;</code>
      * @param values the query to add
      * @return this
      */
@@ -230,12 +230,12 @@ public final class ChessRogueCellInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(bIEJGDGAOBL);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < query.length(); i++) {
-          output.writeRawByte((byte) 58);
+          output.writeRawByte((byte) 10);
           output.writeMessageNoTag(query.get(i));
         }
       }
@@ -260,16 +260,16 @@ public final class ChessRogueCellInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 64: {
             // bIEJGDGAOBL
             bIEJGDGAOBL = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 58) {
+            if (tag != 10) {
               break;
             }
           }
-          case 58: {
+          case 10: {
             // query
             tag = input.readRepeatedMessage(query, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChessRogueCellUpdateNotifyOuterClass.java

@@ -21,19 +21,19 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * EOKIACEIBBD IFMNJMMMJCM = 8;
+     * LCMLACLKNDI HFBFDNEMJED = 6;
      * </pre>
      *
-     * <code>optional uint32 cell_room_id = 4;</code>
+     * <code>optional uint32 cell_room_id = 15;</code>
      */
     private int cellRoomId;
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      */
     private final RepeatedMessage<ChessRogueCellOuterClass.ChessRogueCell> cellInfo = RepeatedMessage.newEmptyInstance(ChessRogueCellOuterClass.ChessRogueCell.getFactory());
 
@@ -49,10 +49,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * EOKIACEIBBD IFMNJMMMJCM = 8;
+     * LCMLACLKNDI HFBFDNEMJED = 6;
      * </pre>
      *
-     * <code>optional uint32 cell_room_id = 4;</code>
+     * <code>optional uint32 cell_room_id = 15;</code>
      * @return whether the cellRoomId field is set
      */
     public boolean hasCellRoomId() {
@@ -61,10 +61,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * EOKIACEIBBD IFMNJMMMJCM = 8;
+     * LCMLACLKNDI HFBFDNEMJED = 6;
      * </pre>
      *
-     * <code>optional uint32 cell_room_id = 4;</code>
+     * <code>optional uint32 cell_room_id = 15;</code>
      * @return this
      */
     public ChessRogueCellUpdateNotify clearCellRoomId() {
@@ -75,10 +75,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * EOKIACEIBBD IFMNJMMMJCM = 8;
+     * LCMLACLKNDI HFBFDNEMJED = 6;
      * </pre>
      *
-     * <code>optional uint32 cell_room_id = 4;</code>
+     * <code>optional uint32 cell_room_id = 15;</code>
      * @return the cellRoomId
      */
     public int getCellRoomId() {
@@ -87,10 +87,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * EOKIACEIBBD IFMNJMMMJCM = 8;
+     * LCMLACLKNDI HFBFDNEMJED = 6;
      * </pre>
      *
-     * <code>optional uint32 cell_room_id = 4;</code>
+     * <code>optional uint32 cell_room_id = 15;</code>
      * @param value the cellRoomId to set
      * @return this
      */
@@ -102,10 +102,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      * @return whether the cellInfo field is set
      */
     public boolean hasCellInfo() {
@@ -114,10 +114,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      * @return this
      */
     public ChessRogueCellUpdateNotify clearCellInfo() {
@@ -128,10 +128,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -146,10 +146,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,10 +164,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      * @param value the cellInfo to add
      * @return this
      */
@@ -180,10 +180,10 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
 
     /**
      * <pre>
-     * MMKEKJCAHGP reason = 1;
+     * JGJCJHMAKKA reason = 11;
      * </pre>
      *
-     * <code>repeated .ChessRogueCell cell_info = 6;</code>
+     * <code>repeated .ChessRogueCell cell_info = 3;</code>
      * @param values the cellInfo to add
      * @return this
      */
@@ -260,12 +260,12 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(cellRoomId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < cellInfo.length(); i++) {
-          output.writeRawByte((byte) 50);
+          output.writeRawByte((byte) 26);
           output.writeMessageNoTag(cellInfo.get(i));
         }
       }
@@ -290,16 +290,16 @@ public final class ChessRogueCellUpdateNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 120: {
             // cellRoomId
             cellRoomId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 50) {
+            if (tag != 26) {
               break;
             }
           }
-          case 50: {
+          case 26: {
             // cellInfo
             tag = input.readRepeatedMessage(cellInfo, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChessRogueConfirmRollScRspOuterClass.java

@@ -19,12 +19,12 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 13;</code>
+     * <code>optional uint32 retcode = 11;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional .ChessRogueNousDice nous_dice = 5;</code>
+     * <code>optional .ChessRogueNousDice nous_dice = 14;</code>
      */
     private final ChessRogueNousDiceOuterClass.ChessRogueNousDice nousDice = ChessRogueNousDiceOuterClass.ChessRogueNousDice.newInstance();
 
@@ -39,7 +39,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 13;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 13;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @return this
      */
     public ChessRogueConfirmRollScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 13;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -65,7 +65,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 13;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueNousDice nous_dice = 5;</code>
+     * <code>optional .ChessRogueNousDice nous_dice = 14;</code>
      * @return whether the nousDice field is set
      */
     public boolean hasNousDice() {
@@ -84,7 +84,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueNousDice nous_dice = 5;</code>
+     * <code>optional .ChessRogueNousDice nous_dice = 14;</code>
      * @return this
      */
     public ChessRogueConfirmRollScRsp clearNousDice() {
@@ -94,7 +94,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueNousDice nous_dice = 5;</code>
+     * <code>optional .ChessRogueNousDice nous_dice = 14;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueNousDice nous_dice = 5;</code>
+     * <code>optional .ChessRogueNousDice nous_dice = 14;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueNousDice nous_dice = 5;</code>
+     * <code>optional .ChessRogueNousDice nous_dice = 14;</code>
      * @param value the nousDice to set
      * @return this
      */
@@ -199,11 +199,11 @@ public final class ChessRogueConfirmRollScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 114);
         output.writeMessageNoTag(nousDice);
       }
     }
@@ -227,16 +227,16 @@ public final class ChessRogueConfirmRollScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 88: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 114) {
               break;
             }
           }
-          case 42: {
+          case 114: {
             // nousDice
             input.readMessage(nousDice);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChessRogueInfoOuterClass.java

@@ -19,15 +19,15 @@ public final class ChessRogueInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .LineupInfo lineup = 4;</code>
-     */
-    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
-
-    /**
-     * <code>optional .SceneInfo scene = 6;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      */
     private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
 
+    /**
+     * <code>optional .LineupInfo lineup = 7;</code>
+     */
+    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+
     private ChessRogueInfo() {
     }
 
@@ -39,82 +39,25 @@ public final class ChessRogueInfoOuterClass {
     }
 
     /**
-     * <code>optional .LineupInfo lineup = 4;</code>
-     * @return whether the lineup field is set
+     * <code>optional .SceneInfo scene = 5;</code>
+     * @return whether the scene field is set
      */
-    public boolean hasLineup() {
+    public boolean hasScene() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional .LineupInfo lineup = 4;</code>
-     * @return this
-     */
-    public ChessRogueInfo clearLineup() {
-      bitField0_ &= ~0x00000001;
-      lineup.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 4;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableLineup()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public LineupInfoOuterClass.LineupInfo getLineup() {
-      return lineup;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 4;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
-      bitField0_ |= 0x00000001;
-      return lineup;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 4;</code>
-     * @param value the lineup to set
-     * @return this
-     */
-    public ChessRogueInfo setLineup(final LineupInfoOuterClass.LineupInfo value) {
-      bitField0_ |= 0x00000001;
-      lineup.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 6;</code>
-     * @return whether the scene field is set
-     */
-    public boolean hasScene() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 6;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      * @return this
      */
     public ChessRogueInfo clearScene() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       scene.clear();
       return this;
     }
 
     /**
-     * <code>optional .SceneInfo scene = 6;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -128,7 +71,7 @@ public final class ChessRogueInfoOuterClass {
     }
 
     /**
-     * <code>optional .SceneInfo scene = 6;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -137,28 +80,85 @@ public final class ChessRogueInfoOuterClass {
      * @return internal storage object for modifications
      */
     public SceneInfoOuterClass.SceneInfo getMutableScene() {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       return scene;
     }
 
     /**
-     * <code>optional .SceneInfo scene = 6;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      * @param value the scene to set
      * @return this
      */
     public ChessRogueInfo setScene(final SceneInfoOuterClass.SceneInfo value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       scene.copyFrom(value);
       return this;
     }
 
+    /**
+     * <code>optional .LineupInfo lineup = 7;</code>
+     * @return whether the lineup field is set
+     */
+    public boolean hasLineup() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 7;</code>
+     * @return this
+     */
+    public ChessRogueInfo clearLineup() {
+      bitField0_ &= ~0x00000002;
+      lineup.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 7;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableLineup()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public LineupInfoOuterClass.LineupInfo getLineup() {
+      return lineup;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 7;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+      bitField0_ |= 0x00000002;
+      return lineup;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 7;</code>
+     * @param value the lineup to set
+     * @return this
+     */
+    public ChessRogueInfo setLineup(final LineupInfoOuterClass.LineupInfo value) {
+      bitField0_ |= 0x00000002;
+      lineup.copyFrom(value);
+      return this;
+    }
+
     @Override
     public ChessRogueInfo copyFrom(final ChessRogueInfo other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        lineup.copyFrom(other.lineup);
         scene.copyFrom(other.scene);
+        lineup.copyFrom(other.lineup);
       }
       return this;
     }
@@ -169,12 +169,12 @@ public final class ChessRogueInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasLineup()) {
-        getMutableLineup().mergeFrom(other.lineup);
-      }
       if (other.hasScene()) {
         getMutableScene().mergeFrom(other.scene);
       }
+      if (other.hasLineup()) {
+        getMutableLineup().mergeFrom(other.lineup);
+      }
       return this;
     }
 
@@ -185,8 +185,8 @@ public final class ChessRogueInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      lineup.clear();
       scene.clear();
+      lineup.clear();
       return this;
     }
 
@@ -197,8 +197,8 @@ public final class ChessRogueInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      lineup.clearQuick();
       scene.clearQuick();
+      lineup.clearQuick();
       return this;
     }
 
@@ -212,19 +212,19 @@ public final class ChessRogueInfoOuterClass {
       }
       ChessRogueInfo other = (ChessRogueInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasLineup() || lineup.equals(other.lineup))
-        && (!hasScene() || scene.equals(other.scene));
+        && (!hasScene() || scene.equals(other.scene))
+        && (!hasLineup() || lineup.equals(other.lineup));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 34);
-        output.writeMessageNoTag(lineup);
+        output.writeRawByte((byte) 42);
+        output.writeMessageNoTag(scene);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 50);
-        output.writeMessageNoTag(scene);
+        output.writeRawByte((byte) 58);
+        output.writeMessageNoTag(lineup);
       }
     }
 
@@ -232,10 +232,10 @@ public final class ChessRogueInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
       }
       return size;
     }
@@ -247,18 +247,18 @@ public final class ChessRogueInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 34: {
-            // lineup
-            input.readMessage(lineup);
+          case 42: {
+            // scene
+            input.readMessage(scene);
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 50) {
+            if (tag != 58) {
               break;
             }
           }
-          case 50: {
-            // scene
-            input.readMessage(scene);
+          case 58: {
+            // lineup
+            input.readMessage(lineup);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -283,10 +283,10 @@ public final class ChessRogueInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeMessage(FieldNames.lineup, lineup);
+        output.writeMessage(FieldNames.scene, scene);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.scene, scene);
+        output.writeMessage(FieldNames.lineup, lineup);
       }
       output.endObject();
     }
@@ -298,10 +298,10 @@ public final class ChessRogueInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1102671473: {
-            if (input.isAtField(FieldNames.lineup)) {
+          case 109254796: {
+            if (input.isAtField(FieldNames.scene)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(lineup);
+                input.readMessage(scene);
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -309,10 +309,10 @@ public final class ChessRogueInfoOuterClass {
             }
             break;
           }
-          case 109254796: {
-            if (input.isAtField(FieldNames.scene)) {
+          case -1102671473: {
+            if (input.isAtField(FieldNames.lineup)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(scene);
+                input.readMessage(lineup);
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -373,9 +373,9 @@ public final class ChessRogueInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName lineup = FieldName.forField("lineup");
-
       static final FieldName scene = FieldName.forField("scene");
+
+      static final FieldName lineup = FieldName.forField("lineup");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ChessRogueMiracleDataOuterClass.java

@@ -20,7 +20,7 @@ public final class ChessRogueMiracleDataOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      */
     private final RepeatedMessage<RogueMiracleOuterClass.RogueMiracle> miracleList = RepeatedMessage.newEmptyInstance(RogueMiracleOuterClass.RogueMiracle.getFactory());
 
@@ -35,7 +35,7 @@ public final class ChessRogueMiracleDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      * @return whether the miracleList field is set
      */
     public boolean hasMiracleList() {
@@ -43,7 +43,7 @@ public final class ChessRogueMiracleDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      * @return this
      */
     public ChessRogueMiracleData clearMiracleList() {
@@ -53,7 +53,7 @@ public final class ChessRogueMiracleDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class ChessRogueMiracleDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class ChessRogueMiracleDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      * @param value the miracleList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class ChessRogueMiracleDataOuterClass {
     }
 
     /**
-     * <code>repeated .RogueMiracle miracle_list = 15;</code>
+     * <code>repeated .RogueMiracle miracle_list = 11;</code>
      * @param values the miracleList to add
      * @return this
      */
@@ -164,7 +164,7 @@ public final class ChessRogueMiracleDataOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < miracleList.length(); i++) {
-          output.writeRawByte((byte) 122);
+          output.writeRawByte((byte) 90);
           output.writeMessageNoTag(miracleList.get(i));
         }
       }
@@ -186,7 +186,7 @@ public final class ChessRogueMiracleDataOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 122: {
+          case 90: {
             // miracleList
             tag = input.readRepeatedMessage(miracleList, tag);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueMiracleInfoOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .ChessRogueMiracleData miracle_data = 11;</code>
+     * <code>optional .ChessRogueMiracleData miracle_data = 13;</code>
      */
     private final ChessRogueMiracleDataOuterClass.ChessRogueMiracleData miracleData = ChessRogueMiracleDataOuterClass.ChessRogueMiracleData.newInstance();
 
@@ -34,7 +34,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueMiracleData miracle_data = 11;</code>
+     * <code>optional .ChessRogueMiracleData miracle_data = 13;</code>
      * @return whether the miracleData field is set
      */
     public boolean hasMiracleData() {
@@ -42,7 +42,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueMiracleData miracle_data = 11;</code>
+     * <code>optional .ChessRogueMiracleData miracle_data = 13;</code>
      * @return this
      */
     public ChessRogueMiracleInfo clearMiracleData() {
@@ -52,7 +52,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueMiracleData miracle_data = 11;</code>
+     * <code>optional .ChessRogueMiracleData miracle_data = 13;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueMiracleData miracle_data = 11;</code>
+     * <code>optional .ChessRogueMiracleData miracle_data = 13;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueMiracleData miracle_data = 11;</code>
+     * <code>optional .ChessRogueMiracleData miracle_data = 13;</code>
      * @param value the miracleData to set
      * @return this
      */
@@ -151,7 +151,7 @@ public final class ChessRogueMiracleInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 106);
         output.writeMessageNoTag(miracleData);
       }
     }
@@ -172,7 +172,7 @@ public final class ChessRogueMiracleInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 90: {
+          case 106: {
             // miracleData
             input.readMessage(miracleData);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueMoneyInfoOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueMoneyInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 money = 15;</code>
+     * <code>optional uint32 money = 14;</code>
      */
     private int money;
 
@@ -34,7 +34,7 @@ public final class ChessRogueMoneyInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 money = 15;</code>
+     * <code>optional uint32 money = 14;</code>
      * @return whether the money field is set
      */
     public boolean hasMoney() {
@@ -42,7 +42,7 @@ public final class ChessRogueMoneyInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 money = 15;</code>
+     * <code>optional uint32 money = 14;</code>
      * @return this
      */
     public ChessRogueMoneyInfo clearMoney() {
@@ -52,7 +52,7 @@ public final class ChessRogueMoneyInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 money = 15;</code>
+     * <code>optional uint32 money = 14;</code>
      * @return the money
      */
     public int getMoney() {
@@ -60,7 +60,7 @@ public final class ChessRogueMoneyInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 money = 15;</code>
+     * <code>optional uint32 money = 14;</code>
      * @param value the money to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class ChessRogueMoneyInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(money);
       }
     }
@@ -150,7 +150,7 @@ public final class ChessRogueMoneyInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 112: {
             // money
             money = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueNousMainStoryInfoOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 story_id = 10;</code>
+     * <code>optional uint32 story_id = 4;</code>
      */
     private int storyId;
 
@@ -28,7 +28,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
      *  2 finished
      * </pre>
      *
-     * <code>optional uint32 status = 11;</code>
+     * <code>optional uint32 status = 5;</code>
      */
     private int status;
 
@@ -43,7 +43,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 story_id = 10;</code>
+     * <code>optional uint32 story_id = 4;</code>
      * @return whether the storyId field is set
      */
     public boolean hasStoryId() {
@@ -51,7 +51,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 story_id = 10;</code>
+     * <code>optional uint32 story_id = 4;</code>
      * @return this
      */
     public ChessRogueNousMainStoryInfo clearStoryId() {
@@ -61,7 +61,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 story_id = 10;</code>
+     * <code>optional uint32 story_id = 4;</code>
      * @return the storyId
      */
     public int getStoryId() {
@@ -69,7 +69,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 story_id = 10;</code>
+     * <code>optional uint32 story_id = 4;</code>
      * @param value the storyId to set
      * @return this
      */
@@ -84,7 +84,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
      *  2 finished
      * </pre>
      *
-     * <code>optional uint32 status = 11;</code>
+     * <code>optional uint32 status = 5;</code>
      * @return whether the status field is set
      */
     public boolean hasStatus() {
@@ -96,7 +96,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
      *  2 finished
      * </pre>
      *
-     * <code>optional uint32 status = 11;</code>
+     * <code>optional uint32 status = 5;</code>
      * @return this
      */
     public ChessRogueNousMainStoryInfo clearStatus() {
@@ -110,7 +110,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
      *  2 finished
      * </pre>
      *
-     * <code>optional uint32 status = 11;</code>
+     * <code>optional uint32 status = 5;</code>
      * @return the status
      */
     public int getStatus() {
@@ -122,7 +122,7 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
      *  2 finished
      * </pre>
      *
-     * <code>optional uint32 status = 11;</code>
+     * <code>optional uint32 status = 5;</code>
      * @param value the status to set
      * @return this
      */
@@ -197,11 +197,11 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(storyId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(status);
       }
     }
@@ -225,16 +225,16 @@ public final class ChessRogueNousMainStoryInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 80: {
+          case 32: {
             // storyId
             storyId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 40) {
               break;
             }
           }
-          case 88: {
+          case 40: {
             // status
             status = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ChessRogueNousSubStoryInfoOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 sub_story_id = 4;</code>
+     * <code>optional uint32 sub_story_id = 5;</code>
      */
     private int subStoryId;
 
@@ -34,7 +34,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 sub_story_id = 4;</code>
+     * <code>optional uint32 sub_story_id = 5;</code>
      * @return whether the subStoryId field is set
      */
     public boolean hasSubStoryId() {
@@ -42,7 +42,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 sub_story_id = 4;</code>
+     * <code>optional uint32 sub_story_id = 5;</code>
      * @return this
      */
     public ChessRogueNousSubStoryInfo clearSubStoryId() {
@@ -52,7 +52,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 sub_story_id = 4;</code>
+     * <code>optional uint32 sub_story_id = 5;</code>
      * @return the subStoryId
      */
     public int getSubStoryId() {
@@ -60,7 +60,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 sub_story_id = 4;</code>
+     * <code>optional uint32 sub_story_id = 5;</code>
      * @param value the subStoryId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(subStoryId);
       }
     }
@@ -150,7 +150,7 @@ public final class ChessRogueNousSubStoryInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 40: {
             // subStoryId
             subStoryId = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java

@@ -19,7 +19,7 @@ public final class ChessRogueNousValueOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 value = 13;</code>
+     * <code>optional uint32 value = 6;</code>
      */
     private int value_;
 
@@ -34,7 +34,7 @@ public final class ChessRogueNousValueOuterClass {
     }
 
     /**
-     * <code>optional uint32 value = 13;</code>
+     * <code>optional uint32 value = 6;</code>
      * @return whether the value_ field is set
      */
     public boolean hasValue() {
@@ -42,7 +42,7 @@ public final class ChessRogueNousValueOuterClass {
     }
 
     /**
-     * <code>optional uint32 value = 13;</code>
+     * <code>optional uint32 value = 6;</code>
      * @return this
      */
     public ChessRogueNousValue clearValue() {
@@ -52,7 +52,7 @@ public final class ChessRogueNousValueOuterClass {
     }
 
     /**
-     * <code>optional uint32 value = 13;</code>
+     * <code>optional uint32 value = 6;</code>
      * @return the value_
      */
     public int getValue() {
@@ -60,7 +60,7 @@ public final class ChessRogueNousValueOuterClass {
     }
 
     /**
-     * <code>optional uint32 value = 13;</code>
+     * <code>optional uint32 value = 6;</code>
      * @param value the value_ to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class ChessRogueNousValueOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(value_);
       }
     }
@@ -150,7 +150,7 @@ public final class ChessRogueNousValueOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 104: {
+          case 48: {
             // value_
             value_ = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java

@@ -19,25 +19,15 @@ public final class ChessRogueSelectCellScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 JNBHLHFBBBJ = 5;</code>
-     */
-    private int jNBHLHFBBBJ;
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 2;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 cell_id = 13;</code>
+     * <code>optional uint32 cell_id = 12;</code>
      */
     private int cellId;
 
-    /**
-     * <code>optional .LLJFPKKLGAK NDGOHDPDKAD = 10;</code>
-     */
-    private final LLJFPKKLGAKOuterClass.LLJFPKKLGAK nDGOHDPDKAD = LLJFPKKLGAKOuterClass.LLJFPKKLGAK.newInstance();
-
     private ChessRogueSelectCellScRsp() {
     }
 
@@ -49,62 +39,25 @@ public final class ChessRogueSelectCellScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 JNBHLHFBBBJ = 5;</code>
-     * @return whether the jNBHLHFBBBJ field is set
+     * <code>optional uint32 retcode = 2;</code>
+     * @return whether the retcode field is set
      */
-    public boolean hasJNBHLHFBBBJ() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 JNBHLHFBBBJ = 5;</code>
-     * @return this
-     */
-    public ChessRogueSelectCellScRsp clearJNBHLHFBBBJ() {
-      bitField0_ &= ~0x00000001;
-      jNBHLHFBBBJ = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 JNBHLHFBBBJ = 5;</code>
-     * @return the jNBHLHFBBBJ
-     */
-    public int getJNBHLHFBBBJ() {
-      return jNBHLHFBBBJ;
-    }
-
-    /**
-     * <code>optional uint32 JNBHLHFBBBJ = 5;</code>
-     * @param value the jNBHLHFBBBJ to set
-     * @return this
-     */
-    public ChessRogueSelectCellScRsp setJNBHLHFBBBJ(final int value) {
-      bitField0_ |= 0x00000001;
-      jNBHLHFBBBJ = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @return this
      */
     public ChessRogueSelectCellScRsp clearRetcode() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       retcode = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -112,36 +65,36 @@ public final class ChessRogueSelectCellScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @param value the retcode to set
      * @return this
      */
     public ChessRogueSelectCellScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       retcode = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 cell_id = 13;</code>
+     * <code>optional uint32 cell_id = 12;</code>
      * @return whether the cellId field is set
      */
     public boolean hasCellId() {
-      return (bitField0_ & 0x00000004) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional uint32 cell_id = 13;</code>
+     * <code>optional uint32 cell_id = 12;</code>
      * @return this
      */
     public ChessRogueSelectCellScRsp clearCellId() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       cellId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 cell_id = 13;</code>
+     * <code>optional uint32 cell_id = 12;</code>
      * @return the cellId
      */
     public int getCellId() {
@@ -149,82 +102,23 @@ public final class ChessRogueSelectCellScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 cell_id = 13;</code>
+     * <code>optional uint32 cell_id = 12;</code>
      * @param value the cellId to set
      * @return this
      */
     public ChessRogueSelectCellScRsp setCellId(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       cellId = value;
       return this;
     }
 
-    /**
-     * <code>optional .LLJFPKKLGAK NDGOHDPDKAD = 10;</code>
-     * @return whether the nDGOHDPDKAD field is set
-     */
-    public boolean hasNDGOHDPDKAD() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * <code>optional .LLJFPKKLGAK NDGOHDPDKAD = 10;</code>
-     * @return this
-     */
-    public ChessRogueSelectCellScRsp clearNDGOHDPDKAD() {
-      bitField0_ &= ~0x00000008;
-      nDGOHDPDKAD.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .LLJFPKKLGAK NDGOHDPDKAD = 10;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableNDGOHDPDKAD()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public LLJFPKKLGAKOuterClass.LLJFPKKLGAK getNDGOHDPDKAD() {
-      return nDGOHDPDKAD;
-    }
-
-    /**
-     * <code>optional .LLJFPKKLGAK NDGOHDPDKAD = 10;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public LLJFPKKLGAKOuterClass.LLJFPKKLGAK getMutableNDGOHDPDKAD() {
-      bitField0_ |= 0x00000008;
-      return nDGOHDPDKAD;
-    }
-
-    /**
-     * <code>optional .LLJFPKKLGAK NDGOHDPDKAD = 10;</code>
-     * @param value the nDGOHDPDKAD to set
-     * @return this
-     */
-    public ChessRogueSelectCellScRsp setNDGOHDPDKAD(final LLJFPKKLGAKOuterClass.LLJFPKKLGAK value) {
-      bitField0_ |= 0x00000008;
-      nDGOHDPDKAD.copyFrom(value);
-      return this;
-    }
-
     @Override
     public ChessRogueSelectCellScRsp copyFrom(final ChessRogueSelectCellScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        jNBHLHFBBBJ = other.jNBHLHFBBBJ;
         retcode = other.retcode;
         cellId = other.cellId;
-        nDGOHDPDKAD.copyFrom(other.nDGOHDPDKAD);
       }
       return this;
     }
@@ -235,18 +129,12 @@ public final class ChessRogueSelectCellScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasJNBHLHFBBBJ()) {
-        setJNBHLHFBBBJ(other.jNBHLHFBBBJ);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
       if (other.hasCellId()) {
         setCellId(other.cellId);
       }
-      if (other.hasNDGOHDPDKAD()) {
-        getMutableNDGOHDPDKAD().mergeFrom(other.nDGOHDPDKAD);
-      }
       return this;
     }
 
@@ -257,10 +145,8 @@ public final class ChessRogueSelectCellScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      jNBHLHFBBBJ = 0;
       retcode = 0;
       cellId = 0;
-      nDGOHDPDKAD.clear();
       return this;
     }
 
@@ -271,7 +157,6 @@ public final class ChessRogueSelectCellScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      nDGOHDPDKAD.clearQuick();
       return this;
     }
 
@@ -285,47 +170,31 @@ public final class ChessRogueSelectCellScRspOuterClass {
       }
       ChessRogueSelectCellScRsp other = (ChessRogueSelectCellScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasJNBHLHFBBBJ() || jNBHLHFBBBJ == other.jNBHLHFBBBJ)
         && (!hasRetcode() || retcode == other.retcode)
-        && (!hasCellId() || cellId == other.cellId)
-        && (!hasNDGOHDPDKAD() || nDGOHDPDKAD.equals(other.nDGOHDPDKAD));
+        && (!hasCellId() || cellId == other.cellId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(jNBHLHFBBBJ);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 16);
         output.writeUInt32NoTag(retcode);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 104);
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(cellId);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 82);
-        output.writeMessageNoTag(nDGOHDPDKAD);
-      }
     }
 
     @Override
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(jNBHLHFBBBJ);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(nDGOHDPDKAD);
-      }
       return size;
     }
 
@@ -336,37 +205,19 @@ public final class ChessRogueSelectCellScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
-            // jNBHLHFBBBJ
-            jNBHLHFBBBJ = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
+          case 16: {
             // retcode
             retcode = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 96) {
               break;
             }
           }
-          case 104: {
+          case 96: {
             // cellId
             cellId = input.readUInt32();
-            bitField0_ |= 0x00000004;
-            tag = input.readTag();
-            if (tag != 82) {
-              break;
-            }
-          }
-          case 82: {
-            // nDGOHDPDKAD
-            input.readMessage(nDGOHDPDKAD);
-            bitField0_ |= 0x00000008;
+            bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
               break;
@@ -390,17 +241,11 @@ public final class ChessRogueSelectCellScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.jNBHLHFBBBJ, jNBHLHFBBBJ);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.cellId, cellId);
       }
-      if ((bitField0_ & 0x00000008) != 0) {
-        output.writeMessage(FieldNames.nDGOHDPDKAD, nDGOHDPDKAD);
-      }
       output.endObject();
     }
 
@@ -411,22 +256,11 @@ public final class ChessRogueSelectCellScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 480596488: {
-            if (input.isAtField(FieldNames.jNBHLHFBBBJ)) {
-              if (!input.trySkipNullValue()) {
-                jNBHLHFBBBJ = input.readUInt32();
-                bitField0_ |= 0x00000001;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 1097936398: {
             if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
                 retcode = input.readUInt32();
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000001;
               }
             } else {
               input.skipUnknownField();
@@ -438,18 +272,7 @@ public final class ChessRogueSelectCellScRspOuterClass {
             if (input.isAtField(FieldNames.cellId)) {
               if (!input.trySkipNullValue()) {
                 cellId = input.readUInt32();
-                bitField0_ |= 0x00000004;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -939934496: {
-            if (input.isAtField(FieldNames.nDGOHDPDKAD)) {
-              if (!input.trySkipNullValue()) {
-                input.readMessage(nDGOHDPDKAD);
-                bitField0_ |= 0x00000008;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -509,13 +332,9 @@ public final class ChessRogueSelectCellScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName jNBHLHFBBBJ = FieldName.forField("JNBHLHFBBBJ");
-
       static final FieldName retcode = FieldName.forField("retcode");
 
       static final FieldName cellId = FieldName.forField("cellId", "cell_id");
-
-      static final FieldName nDGOHDPDKAD = FieldName.forField("NDGOHDPDKAD");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ChessRogueStartScRspOuterClass.java

@@ -24,34 +24,34 @@ public final class ChessRogueStartScRspOuterClass {
     private int retcode;
 
     /**
-     * <code>optional .LineupInfo lineup = 1;</code>
-     */
-    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     */
-    private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
-
-    /**
-     * <code>optional .ChessRogueCellInfo cell_info = 7;</code>
-     */
-    private final ChessRogueCellInfoOuterClass.ChessRogueCellInfo cellInfo = ChessRogueCellInfoOuterClass.ChessRogueCellInfo.newInstance();
-
-    /**
-     * <code>optional .ChessRogueCurrentInfo current_info = 10;</code>
+     * <code>optional .ChessRogueCurrentInfo current_info = 1;</code>
      */
     private final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo currentInfo = ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo.newInstance();
 
+    /**
+     * <code>optional .LineupInfo lineup = 8;</code>
+     */
+    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+
+    /**
+     * <code>optional .ChessRogueCellInfo cell_info = 13;</code>
+     */
+    private final ChessRogueCellInfoOuterClass.ChessRogueCellInfo cellInfo = ChessRogueCellInfoOuterClass.ChessRogueCellInfo.newInstance();
+
     /**
      * <pre>
-     * HLODEEONDBF OBGFEMEOJCE = 13;
+     * PEEHMMLEDMP build_query = 3;
      * </pre>
      *
-     * <code>optional .ChessRogueInfo chess_rogue_info = 11;</code>
+     * <code>optional .ChessRogueInfo chess_rogue_info = 14;</code>
      */
     private final ChessRogueInfoOuterClass.ChessRogueInfo chessRogueInfo = ChessRogueInfoOuterClass.ChessRogueInfo.newInstance();
 
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     */
+    private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+
     private ChessRogueStartScRsp() {
     }
 
@@ -100,197 +100,25 @@ public final class ChessRogueStartScRspOuterClass {
     }
 
     /**
-     * <code>optional .LineupInfo lineup = 1;</code>
-     * @return whether the lineup field is set
+     * <code>optional .ChessRogueCurrentInfo current_info = 1;</code>
+     * @return whether the currentInfo field is set
      */
-    public boolean hasLineup() {
+    public boolean hasCurrentInfo() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional .LineupInfo lineup = 1;</code>
-     * @return this
-     */
-    public ChessRogueStartScRsp clearLineup() {
-      bitField0_ &= ~0x00000002;
-      lineup.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 1;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableLineup()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public LineupInfoOuterClass.LineupInfo getLineup() {
-      return lineup;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 1;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
-      bitField0_ |= 0x00000002;
-      return lineup;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 1;</code>
-     * @param value the lineup to set
-     * @return this
-     */
-    public ChessRogueStartScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
-      bitField0_ |= 0x00000002;
-      lineup.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     * @return whether the scene field is set
-     */
-    public boolean hasScene() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     * @return this
-     */
-    public ChessRogueStartScRsp clearScene() {
-      bitField0_ &= ~0x00000004;
-      scene.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableScene()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public SceneInfoOuterClass.SceneInfo getScene() {
-      return scene;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public SceneInfoOuterClass.SceneInfo getMutableScene() {
-      bitField0_ |= 0x00000004;
-      return scene;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     * @param value the scene to set
-     * @return this
-     */
-    public ChessRogueStartScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
-      bitField0_ |= 0x00000004;
-      scene.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * <code>optional .ChessRogueCellInfo cell_info = 7;</code>
-     * @return whether the cellInfo field is set
-     */
-    public boolean hasCellInfo() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * <code>optional .ChessRogueCellInfo cell_info = 7;</code>
-     * @return this
-     */
-    public ChessRogueStartScRsp clearCellInfo() {
-      bitField0_ &= ~0x00000008;
-      cellInfo.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .ChessRogueCellInfo cell_info = 7;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableCellInfo()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getCellInfo() {
-      return cellInfo;
-    }
-
-    /**
-     * <code>optional .ChessRogueCellInfo cell_info = 7;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getMutableCellInfo() {
-      bitField0_ |= 0x00000008;
-      return cellInfo;
-    }
-
-    /**
-     * <code>optional .ChessRogueCellInfo cell_info = 7;</code>
-     * @param value the cellInfo to set
-     * @return this
-     */
-    public ChessRogueStartScRsp setCellInfo(
-        final ChessRogueCellInfoOuterClass.ChessRogueCellInfo value) {
-      bitField0_ |= 0x00000008;
-      cellInfo.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * <code>optional .ChessRogueCurrentInfo current_info = 10;</code>
-     * @return whether the currentInfo field is set
-     */
-    public boolean hasCurrentInfo() {
-      return (bitField0_ & 0x00000010) != 0;
-    }
-
-    /**
-     * <code>optional .ChessRogueCurrentInfo current_info = 10;</code>
+     * <code>optional .ChessRogueCurrentInfo current_info = 1;</code>
      * @return this
      */
     public ChessRogueStartScRsp clearCurrentInfo() {
-      bitField0_ &= ~0x00000010;
+      bitField0_ &= ~0x00000002;
       currentInfo.clear();
       return this;
     }
 
     /**
-     * <code>optional .ChessRogueCurrentInfo current_info = 10;</code>
+     * <code>optional .ChessRogueCurrentInfo current_info = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -304,7 +132,7 @@ public final class ChessRogueStartScRspOuterClass {
     }
 
     /**
-     * <code>optional .ChessRogueCurrentInfo current_info = 10;</code>
+     * <code>optional .ChessRogueCurrentInfo current_info = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -313,54 +141,169 @@ public final class ChessRogueStartScRspOuterClass {
      * @return internal storage object for modifications
      */
     public ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo getMutableCurrentInfo() {
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000002;
       return currentInfo;
     }
 
     /**
-     * <code>optional .ChessRogueCurrentInfo current_info = 10;</code>
+     * <code>optional .ChessRogueCurrentInfo current_info = 1;</code>
      * @param value the currentInfo to set
      * @return this
      */
     public ChessRogueStartScRsp setCurrentInfo(
         final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo value) {
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000002;
       currentInfo.copyFrom(value);
       return this;
     }
 
     /**
-     * <pre>
-     * HLODEEONDBF OBGFEMEOJCE = 13;
-     * </pre>
-     *
-     * <code>optional .ChessRogueInfo chess_rogue_info = 11;</code>
-     * @return whether the chessRogueInfo field is set
+     * <code>optional .LineupInfo lineup = 8;</code>
+     * @return whether the lineup field is set
      */
-    public boolean hasChessRogueInfo() {
-      return (bitField0_ & 0x00000020) != 0;
+    public boolean hasLineup() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 8;</code>
+     * @return this
+     */
+    public ChessRogueStartScRsp clearLineup() {
+      bitField0_ &= ~0x00000004;
+      lineup.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 8;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableLineup()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public LineupInfoOuterClass.LineupInfo getLineup() {
+      return lineup;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 8;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+      bitField0_ |= 0x00000004;
+      return lineup;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 8;</code>
+     * @param value the lineup to set
+     * @return this
+     */
+    public ChessRogueStartScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
+      bitField0_ |= 0x00000004;
+      lineup.copyFrom(value);
+      return this;
+    }
+
+    /**
+     * <code>optional .ChessRogueCellInfo cell_info = 13;</code>
+     * @return whether the cellInfo field is set
+     */
+    public boolean hasCellInfo() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * <code>optional .ChessRogueCellInfo cell_info = 13;</code>
+     * @return this
+     */
+    public ChessRogueStartScRsp clearCellInfo() {
+      bitField0_ &= ~0x00000008;
+      cellInfo.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .ChessRogueCellInfo cell_info = 13;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableCellInfo()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getCellInfo() {
+      return cellInfo;
+    }
+
+    /**
+     * <code>optional .ChessRogueCellInfo cell_info = 13;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public ChessRogueCellInfoOuterClass.ChessRogueCellInfo getMutableCellInfo() {
+      bitField0_ |= 0x00000008;
+      return cellInfo;
+    }
+
+    /**
+     * <code>optional .ChessRogueCellInfo cell_info = 13;</code>
+     * @param value the cellInfo to set
+     * @return this
+     */
+    public ChessRogueStartScRsp setCellInfo(
+        final ChessRogueCellInfoOuterClass.ChessRogueCellInfo value) {
+      bitField0_ |= 0x00000008;
+      cellInfo.copyFrom(value);
+      return this;
     }
 
     /**
      * <pre>
-     * HLODEEONDBF OBGFEMEOJCE = 13;
+     * PEEHMMLEDMP build_query = 3;
      * </pre>
      *
-     * <code>optional .ChessRogueInfo chess_rogue_info = 11;</code>
+     * <code>optional .ChessRogueInfo chess_rogue_info = 14;</code>
+     * @return whether the chessRogueInfo field is set
+     */
+    public boolean hasChessRogueInfo() {
+      return (bitField0_ & 0x00000010) != 0;
+    }
+
+    /**
+     * <pre>
+     * PEEHMMLEDMP build_query = 3;
+     * </pre>
+     *
+     * <code>optional .ChessRogueInfo chess_rogue_info = 14;</code>
      * @return this
      */
     public ChessRogueStartScRsp clearChessRogueInfo() {
-      bitField0_ &= ~0x00000020;
+      bitField0_ &= ~0x00000010;
       chessRogueInfo.clear();
       return this;
     }
 
     /**
      * <pre>
-     * HLODEEONDBF OBGFEMEOJCE = 13;
+     * PEEHMMLEDMP build_query = 3;
      * </pre>
      *
-     * <code>optional .ChessRogueInfo chess_rogue_info = 11;</code>
+     * <code>optional .ChessRogueInfo chess_rogue_info = 14;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -375,10 +318,10 @@ public final class ChessRogueStartScRspOuterClass {
 
     /**
      * <pre>
-     * HLODEEONDBF OBGFEMEOJCE = 13;
+     * PEEHMMLEDMP build_query = 3;
      * </pre>
      *
-     * <code>optional .ChessRogueInfo chess_rogue_info = 11;</code>
+     * <code>optional .ChessRogueInfo chess_rogue_info = 14;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -387,37 +330,94 @@ public final class ChessRogueStartScRspOuterClass {
      * @return internal storage object for modifications
      */
     public ChessRogueInfoOuterClass.ChessRogueInfo getMutableChessRogueInfo() {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       return chessRogueInfo;
     }
 
     /**
      * <pre>
-     * HLODEEONDBF OBGFEMEOJCE = 13;
+     * PEEHMMLEDMP build_query = 3;
      * </pre>
      *
-     * <code>optional .ChessRogueInfo chess_rogue_info = 11;</code>
+     * <code>optional .ChessRogueInfo chess_rogue_info = 14;</code>
      * @param value the chessRogueInfo to set
      * @return this
      */
     public ChessRogueStartScRsp setChessRogueInfo(
         final ChessRogueInfoOuterClass.ChessRogueInfo value) {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000010;
       chessRogueInfo.copyFrom(value);
       return this;
     }
 
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     * @return whether the scene field is set
+     */
+    public boolean hasScene() {
+      return (bitField0_ & 0x00000020) != 0;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     * @return this
+     */
+    public ChessRogueStartScRsp clearScene() {
+      bitField0_ &= ~0x00000020;
+      scene.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableScene()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public SceneInfoOuterClass.SceneInfo getScene() {
+      return scene;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public SceneInfoOuterClass.SceneInfo getMutableScene() {
+      bitField0_ |= 0x00000020;
+      return scene;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     * @param value the scene to set
+     * @return this
+     */
+    public ChessRogueStartScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
+      bitField0_ |= 0x00000020;
+      scene.copyFrom(value);
+      return this;
+    }
+
     @Override
     public ChessRogueStartScRsp copyFrom(final ChessRogueStartScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         retcode = other.retcode;
-        lineup.copyFrom(other.lineup);
-        scene.copyFrom(other.scene);
-        cellInfo.copyFrom(other.cellInfo);
         currentInfo.copyFrom(other.currentInfo);
+        lineup.copyFrom(other.lineup);
+        cellInfo.copyFrom(other.cellInfo);
         chessRogueInfo.copyFrom(other.chessRogueInfo);
+        scene.copyFrom(other.scene);
       }
       return this;
     }
@@ -431,21 +431,21 @@ public final class ChessRogueStartScRspOuterClass {
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
+      if (other.hasCurrentInfo()) {
+        getMutableCurrentInfo().mergeFrom(other.currentInfo);
+      }
       if (other.hasLineup()) {
         getMutableLineup().mergeFrom(other.lineup);
       }
-      if (other.hasScene()) {
-        getMutableScene().mergeFrom(other.scene);
-      }
       if (other.hasCellInfo()) {
         getMutableCellInfo().mergeFrom(other.cellInfo);
       }
-      if (other.hasCurrentInfo()) {
-        getMutableCurrentInfo().mergeFrom(other.currentInfo);
-      }
       if (other.hasChessRogueInfo()) {
         getMutableChessRogueInfo().mergeFrom(other.chessRogueInfo);
       }
+      if (other.hasScene()) {
+        getMutableScene().mergeFrom(other.scene);
+      }
       return this;
     }
 
@@ -457,11 +457,11 @@ public final class ChessRogueStartScRspOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       retcode = 0;
-      lineup.clear();
-      scene.clear();
-      cellInfo.clear();
       currentInfo.clear();
+      lineup.clear();
+      cellInfo.clear();
       chessRogueInfo.clear();
+      scene.clear();
       return this;
     }
 
@@ -472,11 +472,11 @@ public final class ChessRogueStartScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      lineup.clearQuick();
-      scene.clearQuick();
-      cellInfo.clearQuick();
       currentInfo.clearQuick();
+      lineup.clearQuick();
+      cellInfo.clearQuick();
       chessRogueInfo.clearQuick();
+      scene.clearQuick();
       return this;
     }
 
@@ -491,11 +491,11 @@ public final class ChessRogueStartScRspOuterClass {
       ChessRogueStartScRsp other = (ChessRogueStartScRsp) o;
       return bitField0_ == other.bitField0_
         && (!hasRetcode() || retcode == other.retcode)
-        && (!hasLineup() || lineup.equals(other.lineup))
-        && (!hasScene() || scene.equals(other.scene))
-        && (!hasCellInfo() || cellInfo.equals(other.cellInfo))
         && (!hasCurrentInfo() || currentInfo.equals(other.currentInfo))
-        && (!hasChessRogueInfo() || chessRogueInfo.equals(other.chessRogueInfo));
+        && (!hasLineup() || lineup.equals(other.lineup))
+        && (!hasCellInfo() || cellInfo.equals(other.cellInfo))
+        && (!hasChessRogueInfo() || chessRogueInfo.equals(other.chessRogueInfo))
+        && (!hasScene() || scene.equals(other.scene));
     }
 
     @Override
@@ -506,23 +506,23 @@ public final class ChessRogueStartScRspOuterClass {
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeRawByte((byte) 10);
-        output.writeMessageNoTag(lineup);
+        output.writeMessageNoTag(currentInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 34);
-        output.writeMessageNoTag(scene);
+        output.writeRawByte((byte) 66);
+        output.writeMessageNoTag(lineup);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 58);
+        output.writeRawByte((byte) 106);
         output.writeMessageNoTag(cellInfo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 82);
-        output.writeMessageNoTag(currentInfo);
+        output.writeRawByte((byte) 114);
+        output.writeMessageNoTag(chessRogueInfo);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeRawByte((byte) 90);
-        output.writeMessageNoTag(chessRogueInfo);
+        output.writeRawByte((byte) 122);
+        output.writeMessageNoTag(scene);
       }
     }
 
@@ -533,19 +533,19 @@ public final class ChessRogueStartScRspOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(currentInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(cellInfo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(currentInfo);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(chessRogueInfo);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(chessRogueInfo);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
       }
       return size;
     }
@@ -567,44 +567,44 @@ public final class ChessRogueStartScRspOuterClass {
             }
           }
           case 10: {
-            // lineup
-            input.readMessage(lineup);
+            // currentInfo
+            input.readMessage(currentInfo);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 34) {
+            if (tag != 66) {
               break;
             }
           }
-          case 34: {
-            // scene
-            input.readMessage(scene);
+          case 66: {
+            // lineup
+            input.readMessage(lineup);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 58) {
+            if (tag != 106) {
               break;
             }
           }
-          case 58: {
+          case 106: {
             // cellInfo
             input.readMessage(cellInfo);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 82) {
+            if (tag != 114) {
               break;
             }
           }
-          case 82: {
-            // currentInfo
-            input.readMessage(currentInfo);
-            bitField0_ |= 0x00000010;
-            tag = input.readTag();
-            if (tag != 90) {
-              break;
-            }
-          }
-          case 90: {
+          case 114: {
             // chessRogueInfo
             input.readMessage(chessRogueInfo);
+            bitField0_ |= 0x00000010;
+            tag = input.readTag();
+            if (tag != 122) {
+              break;
+            }
+          }
+          case 122: {
+            // scene
+            input.readMessage(scene);
             bitField0_ |= 0x00000020;
             tag = input.readTag();
             if (tag != 0) {
@@ -632,19 +632,19 @@ public final class ChessRogueStartScRspOuterClass {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.lineup, lineup);
+        output.writeMessage(FieldNames.currentInfo, currentInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeMessage(FieldNames.scene, scene);
+        output.writeMessage(FieldNames.lineup, lineup);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeMessage(FieldNames.cellInfo, cellInfo);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeMessage(FieldNames.currentInfo, currentInfo);
+        output.writeMessage(FieldNames.chessRogueInfo, chessRogueInfo);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeMessage(FieldNames.chessRogueInfo, chessRogueInfo);
+        output.writeMessage(FieldNames.scene, scene);
       }
       output.endObject();
     }
@@ -667,10 +667,11 @@ public final class ChessRogueStartScRspOuterClass {
             }
             break;
           }
-          case -1102671473: {
-            if (input.isAtField(FieldNames.lineup)) {
+          case 600912327:
+          case 1468588980: {
+            if (input.isAtField(FieldNames.currentInfo)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(lineup);
+                input.readMessage(currentInfo);
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -678,10 +679,10 @@ public final class ChessRogueStartScRspOuterClass {
             }
             break;
           }
-          case 109254796: {
-            if (input.isAtField(FieldNames.scene)) {
+          case -1102671473: {
+            if (input.isAtField(FieldNames.lineup)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(scene);
+                input.readMessage(lineup);
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -701,11 +702,11 @@ public final class ChessRogueStartScRspOuterClass {
             }
             break;
           }
-          case 600912327:
-          case 1468588980: {
-            if (input.isAtField(FieldNames.currentInfo)) {
+          case -2057768312:
+          case 1888241298: {
+            if (input.isAtField(FieldNames.chessRogueInfo)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(currentInfo);
+                input.readMessage(chessRogueInfo);
                 bitField0_ |= 0x00000010;
               }
             } else {
@@ -713,11 +714,10 @@ public final class ChessRogueStartScRspOuterClass {
             }
             break;
           }
-          case -2057768312:
-          case 1888241298: {
-            if (input.isAtField(FieldNames.chessRogueInfo)) {
+          case 109254796: {
+            if (input.isAtField(FieldNames.scene)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(chessRogueInfo);
+                input.readMessage(scene);
                 bitField0_ |= 0x00000020;
               }
             } else {
@@ -780,15 +780,15 @@ public final class ChessRogueStartScRspOuterClass {
     static class FieldNames {
       static final FieldName retcode = FieldName.forField("retcode");
 
-      static final FieldName lineup = FieldName.forField("lineup");
+      static final FieldName currentInfo = FieldName.forField("currentInfo", "current_info");
 
-      static final FieldName scene = FieldName.forField("scene");
+      static final FieldName lineup = FieldName.forField("lineup");
 
       static final FieldName cellInfo = FieldName.forField("cellInfo", "cell_info");
 
-      static final FieldName currentInfo = FieldName.forField("currentInfo", "current_info");
-
       static final FieldName chessRogueInfo = FieldName.forField("chessRogueInfo", "chess_rogue_info");
+
+      static final FieldName scene = FieldName.forField("scene");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ChessRogueVirtualItemInfoOuterClass.java

@@ -19,25 +19,25 @@ public final class ChessRogueVirtualItemInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <pre>
-     * LNGAAJMILOC CKJPPDKJIOH = 8;
-     * NNGLIKCIBCA JNAGMIALOII = 14;
-     * </pre>
-     *
-     * <code>optional .ChessRogueItemInfo item_info = 6;</code>
-     */
-    private final ChessRogueItemInfoOuterClass.ChessRogueItemInfo itemInfo = ChessRogueItemInfoOuterClass.ChessRogueItemInfo.newInstance();
-
-    /**
-     * <code>optional .ChessRogueBuffInfo buff_info = 9;</code>
+     * <code>optional .ChessRogueBuffInfo buff_info = 6;</code>
      */
     private final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo buffInfo = ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo.newInstance();
 
     /**
-     * <code>optional .ChessRogueMiracleInfo miracle_info = 13;</code>
+     * <code>optional .ChessRogueMiracleInfo miracle_info = 10;</code>
      */
     private final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo miracleInfo = ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo.newInstance();
 
+    /**
+     * <pre>
+     *  HMLCJCGOEHI rogue_aeon_info = 3;
+     *  MBGNHFBIIHJ GEOIJKDCIOI = 12;
+     * </pre>
+     *
+     * <code>optional .ChessRogueItemInfo item_info = 11;</code>
+     */
+    private final ChessRogueItemInfoOuterClass.ChessRogueItemInfo itemInfo = ChessRogueItemInfoOuterClass.ChessRogueItemInfo.newInstance();
+
     private ChessRogueVirtualItemInfo() {
     }
 
@@ -49,40 +49,156 @@ public final class ChessRogueVirtualItemInfoOuterClass {
     }
 
     /**
-     * <pre>
-     * LNGAAJMILOC CKJPPDKJIOH = 8;
-     * NNGLIKCIBCA JNAGMIALOII = 14;
-     * </pre>
-     *
-     * <code>optional .ChessRogueItemInfo item_info = 6;</code>
-     * @return whether the itemInfo field is set
+     * <code>optional .ChessRogueBuffInfo buff_info = 6;</code>
+     * @return whether the buffInfo field is set
      */
-    public boolean hasItemInfo() {
+    public boolean hasBuffInfo() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
+    /**
+     * <code>optional .ChessRogueBuffInfo buff_info = 6;</code>
+     * @return this
+     */
+    public ChessRogueVirtualItemInfo clearBuffInfo() {
+      bitField0_ &= ~0x00000001;
+      buffInfo.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .ChessRogueBuffInfo buff_info = 6;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableBuffInfo()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getBuffInfo() {
+      return buffInfo;
+    }
+
+    /**
+     * <code>optional .ChessRogueBuffInfo buff_info = 6;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getMutableBuffInfo() {
+      bitField0_ |= 0x00000001;
+      return buffInfo;
+    }
+
+    /**
+     * <code>optional .ChessRogueBuffInfo buff_info = 6;</code>
+     * @param value the buffInfo to set
+     * @return this
+     */
+    public ChessRogueVirtualItemInfo setBuffInfo(
+        final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo value) {
+      bitField0_ |= 0x00000001;
+      buffInfo.copyFrom(value);
+      return this;
+    }
+
+    /**
+     * <code>optional .ChessRogueMiracleInfo miracle_info = 10;</code>
+     * @return whether the miracleInfo field is set
+     */
+    public boolean hasMiracleInfo() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional .ChessRogueMiracleInfo miracle_info = 10;</code>
+     * @return this
+     */
+    public ChessRogueVirtualItemInfo clearMiracleInfo() {
+      bitField0_ &= ~0x00000002;
+      miracleInfo.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .ChessRogueMiracleInfo miracle_info = 10;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableMiracleInfo()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMiracleInfo() {
+      return miracleInfo;
+    }
+
+    /**
+     * <code>optional .ChessRogueMiracleInfo miracle_info = 10;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMutableMiracleInfo() {
+      bitField0_ |= 0x00000002;
+      return miracleInfo;
+    }
+
+    /**
+     * <code>optional .ChessRogueMiracleInfo miracle_info = 10;</code>
+     * @param value the miracleInfo to set
+     * @return this
+     */
+    public ChessRogueVirtualItemInfo setMiracleInfo(
+        final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo value) {
+      bitField0_ |= 0x00000002;
+      miracleInfo.copyFrom(value);
+      return this;
+    }
+
     /**
      * <pre>
-     * LNGAAJMILOC CKJPPDKJIOH = 8;
-     * NNGLIKCIBCA JNAGMIALOII = 14;
+     *  HMLCJCGOEHI rogue_aeon_info = 3;
+     *  MBGNHFBIIHJ GEOIJKDCIOI = 12;
      * </pre>
      *
-     * <code>optional .ChessRogueItemInfo item_info = 6;</code>
+     * <code>optional .ChessRogueItemInfo item_info = 11;</code>
+     * @return whether the itemInfo field is set
+     */
+    public boolean hasItemInfo() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <pre>
+     *  HMLCJCGOEHI rogue_aeon_info = 3;
+     *  MBGNHFBIIHJ GEOIJKDCIOI = 12;
+     * </pre>
+     *
+     * <code>optional .ChessRogueItemInfo item_info = 11;</code>
      * @return this
      */
     public ChessRogueVirtualItemInfo clearItemInfo() {
-      bitField0_ &= ~0x00000001;
+      bitField0_ &= ~0x00000004;
       itemInfo.clear();
       return this;
     }
 
     /**
      * <pre>
-     * LNGAAJMILOC CKJPPDKJIOH = 8;
-     * NNGLIKCIBCA JNAGMIALOII = 14;
+     *  HMLCJCGOEHI rogue_aeon_info = 3;
+     *  MBGNHFBIIHJ GEOIJKDCIOI = 12;
      * </pre>
      *
-     * <code>optional .ChessRogueItemInfo item_info = 6;</code>
+     * <code>optional .ChessRogueItemInfo item_info = 11;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -97,11 +213,11 @@ public final class ChessRogueVirtualItemInfoOuterClass {
 
     /**
      * <pre>
-     * LNGAAJMILOC CKJPPDKJIOH = 8;
-     * NNGLIKCIBCA JNAGMIALOII = 14;
+     *  HMLCJCGOEHI rogue_aeon_info = 3;
+     *  MBGNHFBIIHJ GEOIJKDCIOI = 12;
      * </pre>
      *
-     * <code>optional .ChessRogueItemInfo item_info = 6;</code>
+     * <code>optional .ChessRogueItemInfo item_info = 11;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -110,151 +226,35 @@ public final class ChessRogueVirtualItemInfoOuterClass {
      * @return internal storage object for modifications
      */
     public ChessRogueItemInfoOuterClass.ChessRogueItemInfo getMutableItemInfo() {
-      bitField0_ |= 0x00000001;
+      bitField0_ |= 0x00000004;
       return itemInfo;
     }
 
     /**
      * <pre>
-     * LNGAAJMILOC CKJPPDKJIOH = 8;
-     * NNGLIKCIBCA JNAGMIALOII = 14;
+     *  HMLCJCGOEHI rogue_aeon_info = 3;
+     *  MBGNHFBIIHJ GEOIJKDCIOI = 12;
      * </pre>
      *
-     * <code>optional .ChessRogueItemInfo item_info = 6;</code>
+     * <code>optional .ChessRogueItemInfo item_info = 11;</code>
      * @param value the itemInfo to set
      * @return this
      */
     public ChessRogueVirtualItemInfo setItemInfo(
         final ChessRogueItemInfoOuterClass.ChessRogueItemInfo value) {
-      bitField0_ |= 0x00000001;
+      bitField0_ |= 0x00000004;
       itemInfo.copyFrom(value);
       return this;
     }
 
-    /**
-     * <code>optional .ChessRogueBuffInfo buff_info = 9;</code>
-     * @return whether the buffInfo field is set
-     */
-    public boolean hasBuffInfo() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional .ChessRogueBuffInfo buff_info = 9;</code>
-     * @return this
-     */
-    public ChessRogueVirtualItemInfo clearBuffInfo() {
-      bitField0_ &= ~0x00000002;
-      buffInfo.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .ChessRogueBuffInfo buff_info = 9;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableBuffInfo()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getBuffInfo() {
-      return buffInfo;
-    }
-
-    /**
-     * <code>optional .ChessRogueBuffInfo buff_info = 9;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo getMutableBuffInfo() {
-      bitField0_ |= 0x00000002;
-      return buffInfo;
-    }
-
-    /**
-     * <code>optional .ChessRogueBuffInfo buff_info = 9;</code>
-     * @param value the buffInfo to set
-     * @return this
-     */
-    public ChessRogueVirtualItemInfo setBuffInfo(
-        final ChessRogueBuffInfoOuterClass.ChessRogueBuffInfo value) {
-      bitField0_ |= 0x00000002;
-      buffInfo.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * <code>optional .ChessRogueMiracleInfo miracle_info = 13;</code>
-     * @return whether the miracleInfo field is set
-     */
-    public boolean hasMiracleInfo() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional .ChessRogueMiracleInfo miracle_info = 13;</code>
-     * @return this
-     */
-    public ChessRogueVirtualItemInfo clearMiracleInfo() {
-      bitField0_ &= ~0x00000004;
-      miracleInfo.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .ChessRogueMiracleInfo miracle_info = 13;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableMiracleInfo()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMiracleInfo() {
-      return miracleInfo;
-    }
-
-    /**
-     * <code>optional .ChessRogueMiracleInfo miracle_info = 13;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo getMutableMiracleInfo() {
-      bitField0_ |= 0x00000004;
-      return miracleInfo;
-    }
-
-    /**
-     * <code>optional .ChessRogueMiracleInfo miracle_info = 13;</code>
-     * @param value the miracleInfo to set
-     * @return this
-     */
-    public ChessRogueVirtualItemInfo setMiracleInfo(
-        final ChessRogueMiracleInfoOuterClass.ChessRogueMiracleInfo value) {
-      bitField0_ |= 0x00000004;
-      miracleInfo.copyFrom(value);
-      return this;
-    }
-
     @Override
     public ChessRogueVirtualItemInfo copyFrom(final ChessRogueVirtualItemInfo other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        itemInfo.copyFrom(other.itemInfo);
         buffInfo.copyFrom(other.buffInfo);
         miracleInfo.copyFrom(other.miracleInfo);
+        itemInfo.copyFrom(other.itemInfo);
       }
       return this;
     }
@@ -265,15 +265,15 @@ public final class ChessRogueVirtualItemInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasItemInfo()) {
-        getMutableItemInfo().mergeFrom(other.itemInfo);
-      }
       if (other.hasBuffInfo()) {
         getMutableBuffInfo().mergeFrom(other.buffInfo);
       }
       if (other.hasMiracleInfo()) {
         getMutableMiracleInfo().mergeFrom(other.miracleInfo);
       }
+      if (other.hasItemInfo()) {
+        getMutableItemInfo().mergeFrom(other.itemInfo);
+      }
       return this;
     }
 
@@ -284,9 +284,9 @@ public final class ChessRogueVirtualItemInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      itemInfo.clear();
       buffInfo.clear();
       miracleInfo.clear();
+      itemInfo.clear();
       return this;
     }
 
@@ -297,9 +297,9 @@ public final class ChessRogueVirtualItemInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      itemInfo.clearQuick();
       buffInfo.clearQuick();
       miracleInfo.clearQuick();
+      itemInfo.clearQuick();
       return this;
     }
 
@@ -313,39 +313,39 @@ public final class ChessRogueVirtualItemInfoOuterClass {
       }
       ChessRogueVirtualItemInfo other = (ChessRogueVirtualItemInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasItemInfo() || itemInfo.equals(other.itemInfo))
         && (!hasBuffInfo() || buffInfo.equals(other.buffInfo))
-        && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo));
+        && (!hasMiracleInfo() || miracleInfo.equals(other.miracleInfo))
+        && (!hasItemInfo() || itemInfo.equals(other.itemInfo));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 50);
-        output.writeMessageNoTag(itemInfo);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 74);
         output.writeMessageNoTag(buffInfo);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 106);
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 82);
         output.writeMessageNoTag(miracleInfo);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 90);
+        output.writeMessageNoTag(itemInfo);
+      }
     }
 
     @Override
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(itemInfo);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(buffInfo);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(miracleInfo);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeMessageSizeNoTag(itemInfo);
+      }
       return size;
     }
 
@@ -357,26 +357,26 @@ public final class ChessRogueVirtualItemInfoOuterClass {
       while (true) {
         switch (tag) {
           case 50: {
-            // itemInfo
-            input.readMessage(itemInfo);
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 74) {
-              break;
-            }
-          }
-          case 74: {
             // buffInfo
             input.readMessage(buffInfo);
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 106) {
+            if (tag != 82) {
               break;
             }
           }
-          case 106: {
+          case 82: {
             // miracleInfo
             input.readMessage(miracleInfo);
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 90) {
+              break;
+            }
+          }
+          case 90: {
+            // itemInfo
+            input.readMessage(itemInfo);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 0) {
@@ -401,14 +401,14 @@ public final class ChessRogueVirtualItemInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeMessage(FieldNames.itemInfo, itemInfo);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeMessage(FieldNames.buffInfo, buffInfo);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         output.writeMessage(FieldNames.miracleInfo, miracleInfo);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeMessage(FieldNames.itemInfo, itemInfo);
+      }
       output.endObject();
     }
 
@@ -419,24 +419,12 @@ public final class ChessRogueVirtualItemInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1177195105:
-          case -2141481382: {
-            if (input.isAtField(FieldNames.itemInfo)) {
-              if (!input.trySkipNullValue()) {
-                input.readMessage(itemInfo);
-                bitField0_ |= 0x00000001;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case -1522874463:
           case 55707930: {
             if (input.isAtField(FieldNames.buffInfo)) {
               if (!input.trySkipNullValue()) {
                 input.readMessage(buffInfo);
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000001;
               }
             } else {
               input.skipUnknownField();
@@ -448,6 +436,18 @@ public final class ChessRogueVirtualItemInfoOuterClass {
             if (input.isAtField(FieldNames.miracleInfo)) {
               if (!input.trySkipNullValue()) {
                 input.readMessage(miracleInfo);
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 1177195105:
+          case -2141481382: {
+            if (input.isAtField(FieldNames.itemInfo)) {
+              if (!input.trySkipNullValue()) {
+                input.readMessage(itemInfo);
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -508,11 +508,11 @@ public final class ChessRogueVirtualItemInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName itemInfo = FieldName.forField("itemInfo", "item_info");
-
       static final FieldName buffInfo = FieldName.forField("buffInfo", "buff_info");
 
       static final FieldName miracleInfo = FieldName.forField("miracleInfo", "miracle_info");
+
+      static final FieldName itemInfo = FieldName.forField("itemInfo", "item_info");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java

@@ -19,17 +19,17 @@ public final class ComposeItemCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 count = 1;</code>
-     */
-    private int count;
-
-    /**
-     * <code>optional uint32 compose_id = 6;</code>
+     * <code>optional uint32 compose_id = 1;</code>
      */
     private int composeId;
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 14;</code>
+     * <code>optional uint32 count = 8;</code>
+     */
+    private int count;
+
+    /**
+     * <code>optional .ItemCostList compose_item_list = 3;</code>
      */
     private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -44,62 +44,25 @@ public final class ComposeItemCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 1;</code>
-     * @return whether the count field is set
+     * <code>optional uint32 compose_id = 1;</code>
+     * @return whether the composeId field is set
      */
-    public boolean hasCount() {
+    public boolean hasComposeId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 count = 1;</code>
-     * @return this
-     */
-    public ComposeItemCsReq clearCount() {
-      bitField0_ &= ~0x00000001;
-      count = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 count = 1;</code>
-     * @return the count
-     */
-    public int getCount() {
-      return count;
-    }
-
-    /**
-     * <code>optional uint32 count = 1;</code>
-     * @param value the count to set
-     * @return this
-     */
-    public ComposeItemCsReq setCount(final int value) {
-      bitField0_ |= 0x00000001;
-      count = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 compose_id = 6;</code>
-     * @return whether the composeId field is set
-     */
-    public boolean hasComposeId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 compose_id = 6;</code>
+     * <code>optional uint32 compose_id = 1;</code>
      * @return this
      */
     public ComposeItemCsReq clearComposeId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       composeId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 compose_id = 6;</code>
+     * <code>optional uint32 compose_id = 1;</code>
      * @return the composeId
      */
     public int getComposeId() {
@@ -107,18 +70,55 @@ public final class ComposeItemCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 6;</code>
+     * <code>optional uint32 compose_id = 1;</code>
      * @param value the composeId to set
      * @return this
      */
     public ComposeItemCsReq setComposeId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       composeId = value;
       return this;
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 14;</code>
+     * <code>optional uint32 count = 8;</code>
+     * @return whether the count field is set
+     */
+    public boolean hasCount() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 count = 8;</code>
+     * @return this
+     */
+    public ComposeItemCsReq clearCount() {
+      bitField0_ &= ~0x00000002;
+      count = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 count = 8;</code>
+     * @return the count
+     */
+    public int getCount() {
+      return count;
+    }
+
+    /**
+     * <code>optional uint32 count = 8;</code>
+     * @param value the count to set
+     * @return this
+     */
+    public ComposeItemCsReq setCount(final int value) {
+      bitField0_ |= 0x00000002;
+      count = value;
+      return this;
+    }
+
+    /**
+     * <code>optional .ItemCostList compose_item_list = 3;</code>
      * @return whether the composeItemList field is set
      */
     public boolean hasComposeItemList() {
@@ -126,7 +126,7 @@ public final class ComposeItemCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 14;</code>
+     * <code>optional .ItemCostList compose_item_list = 3;</code>
      * @return this
      */
     public ComposeItemCsReq clearComposeItemList() {
@@ -136,7 +136,7 @@ public final class ComposeItemCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 14;</code>
+     * <code>optional .ItemCostList compose_item_list = 3;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ComposeItemCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 14;</code>
+     * <code>optional .ItemCostList compose_item_list = 3;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ComposeItemCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 14;</code>
+     * <code>optional .ItemCostList compose_item_list = 3;</code>
      * @param value the composeItemList to set
      * @return this
      */
@@ -179,8 +179,8 @@ public final class ComposeItemCsReqOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        count = other.count;
         composeId = other.composeId;
+        count = other.count;
         composeItemList.copyFrom(other.composeItemList);
       }
       return this;
@@ -192,12 +192,12 @@ public final class ComposeItemCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasCount()) {
-        setCount(other.count);
-      }
       if (other.hasComposeId()) {
         setComposeId(other.composeId);
       }
+      if (other.hasCount()) {
+        setCount(other.count);
+      }
       if (other.hasComposeItemList()) {
         getMutableComposeItemList().mergeFrom(other.composeItemList);
       }
@@ -211,8 +211,8 @@ public final class ComposeItemCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      count = 0;
       composeId = 0;
+      count = 0;
       composeItemList.clear();
       return this;
     }
@@ -238,8 +238,8 @@ public final class ComposeItemCsReqOuterClass {
       }
       ComposeItemCsReq other = (ComposeItemCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasCount() || count == other.count)
         && (!hasComposeId() || composeId == other.composeId)
+        && (!hasCount() || count == other.count)
         && (!hasComposeItemList() || composeItemList.equals(other.composeItemList));
     }
 
@@ -247,14 +247,14 @@ public final class ComposeItemCsReqOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(count);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(composeId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(count);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 114);
+        output.writeRawByte((byte) 26);
         output.writeMessageNoTag(composeItemList);
       }
     }
@@ -263,10 +263,10 @@ public final class ComposeItemCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList);
@@ -282,24 +282,24 @@ public final class ComposeItemCsReqOuterClass {
       while (true) {
         switch (tag) {
           case 8: {
-            // count
-            count = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 48) {
-              break;
-            }
-          }
-          case 48: {
             // composeId
             composeId = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 114) {
+            if (tag != 64) {
               break;
             }
           }
-          case 114: {
+          case 64: {
+            // count
+            count = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 26) {
+              break;
+            }
+          }
+          case 26: {
             // composeItemList
             input.readMessage(composeItemList);
             bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public final class ComposeItemCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.count, count);
+        output.writeUInt32(FieldNames.composeId, composeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.composeId, composeId);
+        output.writeUInt32(FieldNames.count, count);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.composeItemList, composeItemList);
@@ -344,10 +344,11 @@ public final class ComposeItemCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 94851343: {
-            if (input.isAtField(FieldNames.count)) {
+          case -1399759283:
+          case -442843416: {
+            if (input.isAtField(FieldNames.composeId)) {
               if (!input.trySkipNullValue()) {
-                count = input.readUInt32();
+                composeId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -355,11 +356,10 @@ public final class ComposeItemCsReqOuterClass {
             }
             break;
           }
-          case -1399759283:
-          case -442843416: {
-            if (input.isAtField(FieldNames.composeId)) {
+          case 94851343: {
+            if (input.isAtField(FieldNames.count)) {
               if (!input.trySkipNullValue()) {
-                composeId = input.readUInt32();
+                count = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -432,10 +432,10 @@ public final class ComposeItemCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName count = FieldName.forField("count");
-
       static final FieldName composeId = FieldName.forField("composeId", "compose_id");
 
+      static final FieldName count = FieldName.forField("count");
+
       static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list");
     }
   }

src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java

@@ -19,22 +19,22 @@ public final class ComposeItemScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 count = 4;</code>
+     * <code>optional uint32 count = 3;</code>
      */
     private int count;
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 4;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 compose_id = 11;</code>
+     * <code>optional uint32 compose_id = 8;</code>
      */
     private int composeId;
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 15;</code>
      */
     private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
 
@@ -49,7 +49,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 4;</code>
+     * <code>optional uint32 count = 3;</code>
      * @return whether the count field is set
      */
     public boolean hasCount() {
@@ -57,7 +57,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 4;</code>
+     * <code>optional uint32 count = 3;</code>
      * @return this
      */
     public ComposeItemScRsp clearCount() {
@@ -67,7 +67,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 4;</code>
+     * <code>optional uint32 count = 3;</code>
      * @return the count
      */
     public int getCount() {
@@ -75,7 +75,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 4;</code>
+     * <code>optional uint32 count = 3;</code>
      * @param value the count to set
      * @return this
      */
@@ -86,7 +86,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -94,7 +94,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @return this
      */
     public ComposeItemScRsp clearRetcode() {
@@ -104,7 +104,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -112,7 +112,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -123,7 +123,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 11;</code>
+     * <code>optional uint32 compose_id = 8;</code>
      * @return whether the composeId field is set
      */
     public boolean hasComposeId() {
@@ -131,7 +131,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 11;</code>
+     * <code>optional uint32 compose_id = 8;</code>
      * @return this
      */
     public ComposeItemScRsp clearComposeId() {
@@ -141,7 +141,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 11;</code>
+     * <code>optional uint32 compose_id = 8;</code>
      * @return the composeId
      */
     public int getComposeId() {
@@ -149,7 +149,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 11;</code>
+     * <code>optional uint32 compose_id = 8;</code>
      * @param value the composeId to set
      * @return this
      */
@@ -160,7 +160,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 15;</code>
      * @return whether the returnItemList field is set
      */
     public boolean hasReturnItemList() {
@@ -168,7 +168,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 15;</code>
      * @return this
      */
     public ComposeItemScRsp clearReturnItemList() {
@@ -178,7 +178,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 15;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -192,7 +192,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 15;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -206,7 +206,7 @@ public final class ComposeItemScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 15;</code>
      * @param value the returnItemList to set
      * @return this
      */
@@ -294,19 +294,19 @@ public final class ComposeItemScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(count);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 64);
         output.writeUInt32NoTag(composeId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 106);
+        output.writeRawByte((byte) 122);
         output.writeMessageNoTag(returnItemList);
       }
     }
@@ -336,34 +336,34 @@ public final class ComposeItemScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
+          case 24: {
             // count
             count = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 32) {
               break;
             }
           }
-          case 56: {
+          case 32: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 88) {
+            if (tag != 64) {
               break;
             }
           }
-          case 88: {
+          case 64: {
             // composeId
             composeId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 106) {
+            if (tag != 122) {
               break;
             }
           }
-          case 106: {
+          case 122: {
             // returnItemList
             input.readMessage(returnItemList);
             bitField0_ |= 0x00000008;

src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java

@@ -19,27 +19,27 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 compose_relic_id = 6;</code>
-     */
-    private int composeRelicId;
-
-    /**
-     * <code>optional uint32 compose_id = 8;</code>
+     * <code>optional uint32 compose_id = 3;</code>
      */
     private int composeId;
 
     /**
-     * <code>optional uint32 count = 12;</code>
+     * <code>optional uint32 compose_relic_id = 4;</code>
+     */
+    private int composeRelicId;
+
+    /**
+     * <code>optional uint32 count = 10;</code>
      */
     private int count;
 
     /**
-     * <code>optional uint32 main_affix_id = 13;</code>
+     * <code>optional uint32 main_affix_id = 11;</code>
      */
     private int mainAffixId;
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 11;</code>
+     * <code>optional .ItemCostList compose_item_list = 13;</code>
      */
     private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -54,62 +54,25 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_relic_id = 6;</code>
-     * @return whether the composeRelicId field is set
+     * <code>optional uint32 compose_id = 3;</code>
+     * @return whether the composeId field is set
      */
-    public boolean hasComposeRelicId() {
+    public boolean hasComposeId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 compose_relic_id = 6;</code>
-     * @return this
-     */
-    public ComposeSelectedRelicCsReq clearComposeRelicId() {
-      bitField0_ &= ~0x00000001;
-      composeRelicId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 compose_relic_id = 6;</code>
-     * @return the composeRelicId
-     */
-    public int getComposeRelicId() {
-      return composeRelicId;
-    }
-
-    /**
-     * <code>optional uint32 compose_relic_id = 6;</code>
-     * @param value the composeRelicId to set
-     * @return this
-     */
-    public ComposeSelectedRelicCsReq setComposeRelicId(final int value) {
-      bitField0_ |= 0x00000001;
-      composeRelicId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 compose_id = 8;</code>
-     * @return whether the composeId field is set
-     */
-    public boolean hasComposeId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 compose_id = 8;</code>
+     * <code>optional uint32 compose_id = 3;</code>
      * @return this
      */
     public ComposeSelectedRelicCsReq clearComposeId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       composeId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 compose_id = 8;</code>
+     * <code>optional uint32 compose_id = 3;</code>
      * @return the composeId
      */
     public int getComposeId() {
@@ -117,18 +80,55 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 8;</code>
+     * <code>optional uint32 compose_id = 3;</code>
      * @param value the composeId to set
      * @return this
      */
     public ComposeSelectedRelicCsReq setComposeId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       composeId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 count = 12;</code>
+     * <code>optional uint32 compose_relic_id = 4;</code>
+     * @return whether the composeRelicId field is set
+     */
+    public boolean hasComposeRelicId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 compose_relic_id = 4;</code>
+     * @return this
+     */
+    public ComposeSelectedRelicCsReq clearComposeRelicId() {
+      bitField0_ &= ~0x00000002;
+      composeRelicId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 compose_relic_id = 4;</code>
+     * @return the composeRelicId
+     */
+    public int getComposeRelicId() {
+      return composeRelicId;
+    }
+
+    /**
+     * <code>optional uint32 compose_relic_id = 4;</code>
+     * @param value the composeRelicId to set
+     * @return this
+     */
+    public ComposeSelectedRelicCsReq setComposeRelicId(final int value) {
+      bitField0_ |= 0x00000002;
+      composeRelicId = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 count = 10;</code>
      * @return whether the count field is set
      */
     public boolean hasCount() {
@@ -136,7 +136,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 12;</code>
+     * <code>optional uint32 count = 10;</code>
      * @return this
      */
     public ComposeSelectedRelicCsReq clearCount() {
@@ -146,7 +146,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 12;</code>
+     * <code>optional uint32 count = 10;</code>
      * @return the count
      */
     public int getCount() {
@@ -154,7 +154,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 count = 12;</code>
+     * <code>optional uint32 count = 10;</code>
      * @param value the count to set
      * @return this
      */
@@ -165,7 +165,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 main_affix_id = 13;</code>
+     * <code>optional uint32 main_affix_id = 11;</code>
      * @return whether the mainAffixId field is set
      */
     public boolean hasMainAffixId() {
@@ -173,7 +173,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 main_affix_id = 13;</code>
+     * <code>optional uint32 main_affix_id = 11;</code>
      * @return this
      */
     public ComposeSelectedRelicCsReq clearMainAffixId() {
@@ -183,7 +183,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 main_affix_id = 13;</code>
+     * <code>optional uint32 main_affix_id = 11;</code>
      * @return the mainAffixId
      */
     public int getMainAffixId() {
@@ -191,7 +191,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 main_affix_id = 13;</code>
+     * <code>optional uint32 main_affix_id = 11;</code>
      * @param value the mainAffixId to set
      * @return this
      */
@@ -202,7 +202,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 11;</code>
+     * <code>optional .ItemCostList compose_item_list = 13;</code>
      * @return whether the composeItemList field is set
      */
     public boolean hasComposeItemList() {
@@ -210,7 +210,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 11;</code>
+     * <code>optional .ItemCostList compose_item_list = 13;</code>
      * @return this
      */
     public ComposeSelectedRelicCsReq clearComposeItemList() {
@@ -220,7 +220,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 11;</code>
+     * <code>optional .ItemCostList compose_item_list = 13;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 11;</code>
+     * <code>optional .ItemCostList compose_item_list = 13;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList compose_item_list = 11;</code>
+     * <code>optional .ItemCostList compose_item_list = 13;</code>
      * @param value the composeItemList to set
      * @return this
      */
@@ -264,8 +264,8 @@ public final class ComposeSelectedRelicCsReqOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        composeRelicId = other.composeRelicId;
         composeId = other.composeId;
+        composeRelicId = other.composeRelicId;
         count = other.count;
         mainAffixId = other.mainAffixId;
         composeItemList.copyFrom(other.composeItemList);
@@ -279,12 +279,12 @@ public final class ComposeSelectedRelicCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasComposeRelicId()) {
-        setComposeRelicId(other.composeRelicId);
-      }
       if (other.hasComposeId()) {
         setComposeId(other.composeId);
       }
+      if (other.hasComposeRelicId()) {
+        setComposeRelicId(other.composeRelicId);
+      }
       if (other.hasCount()) {
         setCount(other.count);
       }
@@ -304,8 +304,8 @@ public final class ComposeSelectedRelicCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      composeRelicId = 0;
       composeId = 0;
+      composeRelicId = 0;
       count = 0;
       mainAffixId = 0;
       composeItemList.clear();
@@ -333,8 +333,8 @@ public final class ComposeSelectedRelicCsReqOuterClass {
       }
       ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasComposeRelicId() || composeRelicId == other.composeRelicId)
         && (!hasComposeId() || composeId == other.composeId)
+        && (!hasComposeRelicId() || composeRelicId == other.composeRelicId)
         && (!hasCount() || count == other.count)
         && (!hasMainAffixId() || mainAffixId == other.mainAffixId)
         && (!hasComposeItemList() || composeItemList.equals(other.composeItemList));
@@ -343,23 +343,23 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
-        output.writeUInt32NoTag(composeRelicId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(composeId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 32);
+        output.writeUInt32NoTag(composeRelicId);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(count);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(mainAffixId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 106);
         output.writeMessageNoTag(composeItemList);
       }
     }
@@ -368,10 +368,10 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(count);
@@ -392,43 +392,43 @@ public final class ComposeSelectedRelicCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
-            // composeRelicId
-            composeRelicId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 64) {
-              break;
-            }
-          }
-          case 64: {
+          case 24: {
             // composeId
             composeId = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 32) {
               break;
             }
           }
-          case 96: {
+          case 32: {
+            // composeRelicId
+            composeRelicId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
             // count
             count = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 88) {
               break;
             }
           }
-          case 104: {
+          case 88: {
             // mainAffixId
             mainAffixId = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 106) {
               break;
             }
           }
-          case 90: {
+          case 106: {
             // composeItemList
             input.readMessage(composeItemList);
             bitField0_ |= 0x00000010;
@@ -455,10 +455,10 @@ public final class ComposeSelectedRelicCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.composeRelicId, composeRelicId);
+        output.writeUInt32(FieldNames.composeId, composeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.composeId, composeId);
+        output.writeUInt32(FieldNames.composeRelicId, composeRelicId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.count, count);
@@ -479,11 +479,11 @@ public final class ComposeSelectedRelicCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1424923132:
-          case 885799284: {
-            if (input.isAtField(FieldNames.composeRelicId)) {
+          case -1399759283:
+          case -442843416: {
+            if (input.isAtField(FieldNames.composeId)) {
               if (!input.trySkipNullValue()) {
-                composeRelicId = input.readUInt32();
+                composeId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -491,11 +491,11 @@ public final class ComposeSelectedRelicCsReqOuterClass {
             }
             break;
           }
-          case -1399759283:
-          case -442843416: {
-            if (input.isAtField(FieldNames.composeId)) {
+          case 1424923132:
+          case 885799284: {
+            if (input.isAtField(FieldNames.composeRelicId)) {
               if (!input.trySkipNullValue()) {
-                composeId = input.readUInt32();
+                composeRelicId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -591,10 +591,10 @@ public final class ComposeSelectedRelicCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id");
-
       static final FieldName composeId = FieldName.forField("composeId", "compose_id");
 
+      static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id");
+
       static final FieldName count = FieldName.forField("count");
 
       static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id");

src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java

@@ -19,17 +19,17 @@ public final class ComposeSelectedRelicScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 3;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 compose_id = 4;</code>
+     * <code>optional uint32 compose_id = 13;</code>
      */
     private int composeId;
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 1;</code>
      */
     private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance();
 
@@ -44,7 +44,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @return this
      */
     public ComposeSelectedRelicScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -70,7 +70,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 4;</code>
+     * <code>optional uint32 compose_id = 13;</code>
      * @return whether the composeId field is set
      */
     public boolean hasComposeId() {
@@ -89,7 +89,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 4;</code>
+     * <code>optional uint32 compose_id = 13;</code>
      * @return this
      */
     public ComposeSelectedRelicScRsp clearComposeId() {
@@ -99,7 +99,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 4;</code>
+     * <code>optional uint32 compose_id = 13;</code>
      * @return the composeId
      */
     public int getComposeId() {
@@ -107,7 +107,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 compose_id = 4;</code>
+     * <code>optional uint32 compose_id = 13;</code>
      * @param value the composeId to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 1;</code>
      * @return whether the returnItemList field is set
      */
     public boolean hasReturnItemList() {
@@ -126,7 +126,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 1;</code>
      * @return this
      */
     public ComposeSelectedRelicScRsp clearReturnItemList() {
@@ -136,7 +136,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class ComposeSelectedRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList return_item_list = 13;</code>
+     * <code>optional .ItemList return_item_list = 1;</code>
      * @param value the returnItemList to set
      * @return this
      */
@@ -246,15 +246,15 @@ public final class ComposeSelectedRelicScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(composeId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 106);
+        output.writeRawByte((byte) 10);
         output.writeMessageNoTag(returnItemList);
       }
     }
@@ -281,25 +281,25 @@ public final class ComposeSelectedRelicScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 24: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 104) {
               break;
             }
           }
-          case 32: {
+          case 104: {
             // composeId
             composeId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 106) {
+            if (tag != 10) {
               break;
             }
           }
-          case 106: {
+          case 10: {
             // returnItemList
             input.readMessage(returnItemList);
             bitField0_ |= 0x00000004;

src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java

@@ -26,12 +26,12 @@ public final class DailyActiveInfoNotifyOuterClass {
     private int dailyActivePoint;
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      */
     private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance();
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      */
     private final RepeatedMessage<DailyActivityInfoOuterClass.DailyActivityInfo> dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory());
 
@@ -83,7 +83,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      * @return whether the dailyActiveQuestIdList field is set
      */
     public boolean hasDailyActiveQuestIdList() {
@@ -91,7 +91,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      * @return this
      */
     public DailyActiveInfoNotify clearDailyActiveQuestIdList() {
@@ -101,7 +101,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -115,7 +115,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -129,7 +129,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      * @param value the dailyActiveQuestIdList to add
      * @return this
      */
@@ -140,7 +140,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated uint32 daily_active_quest_id_list = 15;</code>
+     * <code>repeated uint32 daily_active_quest_id_list = 1;</code>
      * @param values the dailyActiveQuestIdList to add
      * @return this
      */
@@ -151,7 +151,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      * @return whether the dailyActiveLevelList field is set
      */
     public boolean hasDailyActiveLevelList() {
@@ -159,7 +159,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      * @return this
      */
     public DailyActiveInfoNotify clearDailyActiveLevelList() {
@@ -169,7 +169,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -184,7 +184,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -199,7 +199,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      * @param value the dailyActiveLevelList to add
      * @return this
      */
@@ -211,7 +211,7 @@ public final class DailyActiveInfoNotifyOuterClass {
     }
 
     /**
-     * <code>repeated .DailyActivityInfo daily_active_level_list = 4;</code>
+     * <code>repeated .DailyActivityInfo daily_active_level_list = 3;</code>
      * @param values the dailyActiveLevelList to add
      * @return this
      */
@@ -300,13 +300,13 @@ public final class DailyActiveInfoNotifyOuterClass {
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < dailyActiveQuestIdList.length(); i++) {
-          output.writeRawByte((byte) 120);
+          output.writeRawByte((byte) 8);
           output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]);
         }
       }
       if ((bitField0_ & 0x00000004) != 0) {
         for (int i = 0; i < dailyActiveLevelList.length(); i++) {
-          output.writeRawByte((byte) 34);
+          output.writeRawByte((byte) 26);
           output.writeMessageNoTag(dailyActiveLevelList.get(i));
         }
       }
@@ -339,20 +339,20 @@ public final class DailyActiveInfoNotifyOuterClass {
             dailyActivePoint = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 122) {
+            if (tag != 10) {
               break;
             }
           }
-          case 122: {
+          case 10: {
             // dailyActiveQuestIdList [packed=true]
             input.readPackedUInt32(dailyActiveQuestIdList, tag);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 34) {
+            if (tag != 26) {
               break;
             }
           }
-          case 34: {
+          case 26: {
             // dailyActiveLevelList
             tag = input.readRepeatedMessage(dailyActiveLevelList, tag);
             bitField0_ |= 0x00000004;
@@ -370,7 +370,7 @@ public final class DailyActiveInfoNotifyOuterClass {
             tag = input.readTag();
             break;
           }
-          case 120: {
+          case 8: {
             // dailyActiveQuestIdList [packed=false]
             tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java

@@ -19,22 +19,22 @@ public final class DailyActivityInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
-     */
-    private int worldLevel;
-
-    /**
-     * <code>optional uint32 daily_active_point = 5;</code>
+     * <code>optional uint32 daily_active_point = 1;</code>
      */
     private int dailyActivePoint;
 
     /**
-     * <code>optional uint32 level = 10;</code>
+     * <code>optional uint32 level = 2;</code>
      */
     private int level;
 
     /**
-     * <code>optional bool is_has_taken = 2;</code>
+     * <code>optional uint32 world_level = 5;</code>
+     */
+    private int worldLevel;
+
+    /**
+     * <code>optional bool is_has_taken = 4;</code>
      */
     private boolean isHasTaken;
 
@@ -49,62 +49,25 @@ public final class DailyActivityInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @return whether the worldLevel field is set
+     * <code>optional uint32 daily_active_point = 1;</code>
+     * @return whether the dailyActivePoint field is set
      */
-    public boolean hasWorldLevel() {
+    public boolean hasDailyActivePoint() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @return this
-     */
-    public DailyActivityInfo clearWorldLevel() {
-      bitField0_ &= ~0x00000001;
-      worldLevel = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @return the worldLevel
-     */
-    public int getWorldLevel() {
-      return worldLevel;
-    }
-
-    /**
-     * <code>optional uint32 world_level = 4;</code>
-     * @param value the worldLevel to set
-     * @return this
-     */
-    public DailyActivityInfo setWorldLevel(final int value) {
-      bitField0_ |= 0x00000001;
-      worldLevel = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 daily_active_point = 5;</code>
-     * @return whether the dailyActivePoint field is set
-     */
-    public boolean hasDailyActivePoint() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 daily_active_point = 5;</code>
+     * <code>optional uint32 daily_active_point = 1;</code>
      * @return this
      */
     public DailyActivityInfo clearDailyActivePoint() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       dailyActivePoint = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 daily_active_point = 5;</code>
+     * <code>optional uint32 daily_active_point = 1;</code>
      * @return the dailyActivePoint
      */
     public int getDailyActivePoint() {
@@ -112,36 +75,36 @@ public final class DailyActivityInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 daily_active_point = 5;</code>
+     * <code>optional uint32 daily_active_point = 1;</code>
      * @param value the dailyActivePoint to set
      * @return this
      */
     public DailyActivityInfo setDailyActivePoint(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       dailyActivePoint = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 level = 10;</code>
+     * <code>optional uint32 level = 2;</code>
      * @return whether the level field is set
      */
     public boolean hasLevel() {
-      return (bitField0_ & 0x00000004) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional uint32 level = 10;</code>
+     * <code>optional uint32 level = 2;</code>
      * @return this
      */
     public DailyActivityInfo clearLevel() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       level = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 level = 10;</code>
+     * <code>optional uint32 level = 2;</code>
      * @return the level
      */
     public int getLevel() {
@@ -149,18 +112,55 @@ public final class DailyActivityInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 level = 10;</code>
+     * <code>optional uint32 level = 2;</code>
      * @param value the level to set
      * @return this
      */
     public DailyActivityInfo setLevel(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       level = value;
       return this;
     }
 
     /**
-     * <code>optional bool is_has_taken = 2;</code>
+     * <code>optional uint32 world_level = 5;</code>
+     * @return whether the worldLevel field is set
+     */
+    public boolean hasWorldLevel() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 world_level = 5;</code>
+     * @return this
+     */
+    public DailyActivityInfo clearWorldLevel() {
+      bitField0_ &= ~0x00000004;
+      worldLevel = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 world_level = 5;</code>
+     * @return the worldLevel
+     */
+    public int getWorldLevel() {
+      return worldLevel;
+    }
+
+    /**
+     * <code>optional uint32 world_level = 5;</code>
+     * @param value the worldLevel to set
+     * @return this
+     */
+    public DailyActivityInfo setWorldLevel(final int value) {
+      bitField0_ |= 0x00000004;
+      worldLevel = value;
+      return this;
+    }
+
+    /**
+     * <code>optional bool is_has_taken = 4;</code>
      * @return whether the isHasTaken field is set
      */
     public boolean hasIsHasTaken() {
@@ -168,7 +168,7 @@ public final class DailyActivityInfoOuterClass {
     }
 
     /**
-     * <code>optional bool is_has_taken = 2;</code>
+     * <code>optional bool is_has_taken = 4;</code>
      * @return this
      */
     public DailyActivityInfo clearIsHasTaken() {
@@ -178,7 +178,7 @@ public final class DailyActivityInfoOuterClass {
     }
 
     /**
-     * <code>optional bool is_has_taken = 2;</code>
+     * <code>optional bool is_has_taken = 4;</code>
      * @return the isHasTaken
      */
     public boolean getIsHasTaken() {
@@ -186,7 +186,7 @@ public final class DailyActivityInfoOuterClass {
     }
 
     /**
-     * <code>optional bool is_has_taken = 2;</code>
+     * <code>optional bool is_has_taken = 4;</code>
      * @param value the isHasTaken to set
      * @return this
      */
@@ -201,9 +201,9 @@ public final class DailyActivityInfoOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        worldLevel = other.worldLevel;
         dailyActivePoint = other.dailyActivePoint;
         level = other.level;
+        worldLevel = other.worldLevel;
         isHasTaken = other.isHasTaken;
       }
       return this;
@@ -215,15 +215,15 @@ public final class DailyActivityInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasWorldLevel()) {
-        setWorldLevel(other.worldLevel);
-      }
       if (other.hasDailyActivePoint()) {
         setDailyActivePoint(other.dailyActivePoint);
       }
       if (other.hasLevel()) {
         setLevel(other.level);
       }
+      if (other.hasWorldLevel()) {
+        setWorldLevel(other.worldLevel);
+      }
       if (other.hasIsHasTaken()) {
         setIsHasTaken(other.isHasTaken);
       }
@@ -237,9 +237,9 @@ public final class DailyActivityInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      worldLevel = 0;
       dailyActivePoint = 0;
       level = 0;
+      worldLevel = 0;
       isHasTaken = false;
       return this;
     }
@@ -264,28 +264,28 @@ public final class DailyActivityInfoOuterClass {
       }
       DailyActivityInfo other = (DailyActivityInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasWorldLevel() || worldLevel == other.worldLevel)
         && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint)
         && (!hasLevel() || level == other.level)
+        && (!hasWorldLevel() || worldLevel == other.worldLevel)
         && (!hasIsHasTaken() || isHasTaken == other.isHasTaken);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(worldLevel);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(dailyActivePoint);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 80);
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 16);
         output.writeUInt32NoTag(level);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(worldLevel);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 32);
         output.writeBoolNoTag(isHasTaken);
       }
     }
@@ -294,14 +294,14 @@ public final class DailyActivityInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(level);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 2;
       }
@@ -315,34 +315,34 @@ public final class DailyActivityInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
-            // worldLevel
-            worldLevel = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 40) {
-              break;
-            }
-          }
-          case 40: {
+          case 8: {
             // dailyActivePoint
             dailyActivePoint = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 80) {
-              break;
-            }
-          }
-          case 80: {
-            // level
-            level = input.readUInt32();
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
             if (tag != 16) {
               break;
             }
           }
           case 16: {
+            // level
+            level = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 40) {
+              break;
+            }
+          }
+          case 40: {
+            // worldLevel
+            worldLevel = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 32) {
+              break;
+            }
+          }
+          case 32: {
             // isHasTaken
             isHasTaken = input.readBool();
             bitField0_ |= 0x00000008;
@@ -369,14 +369,14 @@ public final class DailyActivityInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.worldLevel, worldLevel);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint);
       }
-      if ((bitField0_ & 0x00000004) != 0) {
+      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.level, level);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.worldLevel, worldLevel);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeBool(FieldNames.isHasTaken, isHasTaken);
       }
@@ -390,24 +390,12 @@ public final class DailyActivityInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 440007442:
-          case 1305257111: {
-            if (input.isAtField(FieldNames.worldLevel)) {
-              if (!input.trySkipNullValue()) {
-                worldLevel = input.readUInt32();
-                bitField0_ |= 0x00000001;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 859671121:
           case 1952864125: {
             if (input.isAtField(FieldNames.dailyActivePoint)) {
               if (!input.trySkipNullValue()) {
                 dailyActivePoint = input.readUInt32();
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000001;
               }
             } else {
               input.skipUnknownField();
@@ -418,6 +406,18 @@ public final class DailyActivityInfoOuterClass {
             if (input.isAtField(FieldNames.level)) {
               if (!input.trySkipNullValue()) {
                 level = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case 440007442:
+          case 1305257111: {
+            if (input.isAtField(FieldNames.worldLevel)) {
+              if (!input.trySkipNullValue()) {
+                worldLevel = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -490,12 +490,12 @@ public final class DailyActivityInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
-
       static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point");
 
       static final FieldName level = FieldName.forField("level");
 
+      static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level");
+
       static final FieldName isHasTaken = FieldName.forField("isHasTaken", "is_has_taken");
     }
   }

src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 entity_id = 9;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      */
     private int entityId;
 
@@ -34,7 +34,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 9;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @return whether the entityId field is set
      */
     public boolean hasEntityId() {
@@ -42,7 +42,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 9;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @return this
      */
     public DeactivateFarmElementCsReq clearEntityId() {
@@ -52,7 +52,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 9;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @return the entityId
      */
     public int getEntityId() {
@@ -60,7 +60,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 9;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @param value the entityId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(entityId);
       }
     }
@@ -150,7 +150,7 @@ public final class DeactivateFarmElementCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
+          case 80: {
             // entityId
             entityId = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java

@@ -19,15 +19,15 @@ public final class DeactivateFarmElementScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 entity_id = 5;</code>
-     */
-    private int entityId;
-
-    /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 3;</code>
      */
     private int retcode;
 
+    /**
+     * <code>optional uint32 entity_id = 8;</code>
+     */
+    private int entityId;
+
     private DeactivateFarmElementScRsp() {
     }
 
@@ -39,62 +39,25 @@ public final class DeactivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 5;</code>
-     * @return whether the entityId field is set
+     * <code>optional uint32 retcode = 3;</code>
+     * @return whether the retcode field is set
      */
-    public boolean hasEntityId() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 entity_id = 5;</code>
-     * @return this
-     */
-    public DeactivateFarmElementScRsp clearEntityId() {
-      bitField0_ &= ~0x00000001;
-      entityId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 entity_id = 5;</code>
-     * @return the entityId
-     */
-    public int getEntityId() {
-      return entityId;
-    }
-
-    /**
-     * <code>optional uint32 entity_id = 5;</code>
-     * @param value the entityId to set
-     * @return this
-     */
-    public DeactivateFarmElementScRsp setEntityId(final int value) {
-      bitField0_ |= 0x00000001;
-      entityId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 15;</code>
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @return this
      */
     public DeactivateFarmElementScRsp clearRetcode() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       retcode = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -102,23 +65,60 @@ public final class DeactivateFarmElementScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 3;</code>
      * @param value the retcode to set
      * @return this
      */
     public DeactivateFarmElementScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       retcode = value;
       return this;
     }
 
+    /**
+     * <code>optional uint32 entity_id = 8;</code>
+     * @return whether the entityId field is set
+     */
+    public boolean hasEntityId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 entity_id = 8;</code>
+     * @return this
+     */
+    public DeactivateFarmElementScRsp clearEntityId() {
+      bitField0_ &= ~0x00000002;
+      entityId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 entity_id = 8;</code>
+     * @return the entityId
+     */
+    public int getEntityId() {
+      return entityId;
+    }
+
+    /**
+     * <code>optional uint32 entity_id = 8;</code>
+     * @param value the entityId to set
+     * @return this
+     */
+    public DeactivateFarmElementScRsp setEntityId(final int value) {
+      bitField0_ |= 0x00000002;
+      entityId = value;
+      return this;
+    }
+
     @Override
     public DeactivateFarmElementScRsp copyFrom(final DeactivateFarmElementScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        entityId = other.entityId;
         retcode = other.retcode;
+        entityId = other.entityId;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class DeactivateFarmElementScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasEntityId()) {
-        setEntityId(other.entityId);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
+      if (other.hasEntityId()) {
+        setEntityId(other.entityId);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class DeactivateFarmElementScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      entityId = 0;
       retcode = 0;
+      entityId = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class DeactivateFarmElementScRspOuterClass {
       }
       DeactivateFarmElementScRsp other = (DeactivateFarmElementScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasEntityId() || entityId == other.entityId)
-        && (!hasRetcode() || retcode == other.retcode);
+        && (!hasRetcode() || retcode == other.retcode)
+        && (!hasEntityId() || entityId == other.entityId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
-        output.writeUInt32NoTag(entityId);
+        output.writeRawByte((byte) 24);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 64);
+        output.writeUInt32NoTag(entityId);
       }
     }
 
@@ -190,10 +190,10 @@ public final class DeactivateFarmElementScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class DeactivateFarmElementScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
-            // entityId
-            entityId = input.readUInt32();
+          case 24: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 64) {
               break;
             }
           }
-          case 120: {
-            // retcode
-            retcode = input.readUInt32();
+          case 64: {
+            // entityId
+            entityId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class DeactivateFarmElementScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.entityId, entityId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.entityId, entityId);
       }
       output.endObject();
     }
@@ -256,11 +256,10 @@ public final class DeactivateFarmElementScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -2102099874:
-          case -740565257: {
-            if (input.isAtField(FieldNames.entityId)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                entityId = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -268,10 +267,11 @@ public final class DeactivateFarmElementScRspOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case -2102099874:
+          case -740565257: {
+            if (input.isAtField(FieldNames.entityId)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                entityId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -332,9 +332,9 @@ public final class DeactivateFarmElementScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName entityId = FieldName.forField("entityId", "entity_id");
-
       static final FieldName retcode = FieldName.forField("retcode");
+
+      static final FieldName entityId = FieldName.forField("entityId", "entity_id");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java

@@ -20,7 +20,7 @@ public final class DelMailCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      */
     private final RepeatedInt idList = RepeatedInt.newEmptyInstance();
 
@@ -35,7 +35,7 @@ public final class DelMailCsReqOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      * @return whether the idList field is set
      */
     public boolean hasIdList() {
@@ -43,7 +43,7 @@ public final class DelMailCsReqOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      * @return this
      */
     public DelMailCsReq clearIdList() {
@@ -53,7 +53,7 @@ public final class DelMailCsReqOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -67,7 +67,7 @@ public final class DelMailCsReqOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -81,7 +81,7 @@ public final class DelMailCsReqOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      * @param value the idList to add
      * @return this
      */
@@ -92,7 +92,7 @@ public final class DelMailCsReqOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 13;</code>
+     * <code>repeated uint32 id_list = 9;</code>
      * @param values the idList to add
      * @return this
      */
@@ -163,7 +163,7 @@ public final class DelMailCsReqOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         for (int i = 0; i < idList.length(); i++) {
-          output.writeRawByte((byte) 104);
+          output.writeRawByte((byte) 72);
           output.writeUInt32NoTag(idList.array()[i]);
         }
       }
@@ -185,7 +185,7 @@ public final class DelMailCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 106: {
+          case 74: {
             // idList [packed=true]
             input.readPackedUInt32(idList, tag);
             bitField0_ |= 0x00000001;
@@ -204,7 +204,7 @@ public final class DelMailCsReqOuterClass {
             tag = input.readTag();
             break;
           }
-          case 104: {
+          case 72: {
             // idList [packed=false]
             tag = input.readRepeatedUInt32(idList, tag);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java

@@ -20,12 +20,12 @@ public final class DelMailScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
+     * <code>optional uint32 retcode = 12;</code>
      */
     private int retcode;
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      */
     private final RepeatedInt idList = RepeatedInt.newEmptyInstance();
 
@@ -40,7 +40,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
+     * <code>optional uint32 retcode = 12;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
+     * <code>optional uint32 retcode = 12;</code>
      * @return this
      */
     public DelMailScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
+     * <code>optional uint32 retcode = 12;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -66,7 +66,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
+     * <code>optional uint32 retcode = 12;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      * @return whether the idList field is set
      */
     public boolean hasIdList() {
@@ -85,7 +85,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      * @return this
      */
     public DelMailScRsp clearIdList() {
@@ -95,7 +95,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      * @param value the idList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class DelMailScRspOuterClass {
     }
 
     /**
-     * <code>repeated uint32 id_list = 6;</code>
+     * <code>repeated uint32 id_list = 3;</code>
      * @param values the idList to add
      * @return this
      */
@@ -210,12 +210,12 @@ public final class DelMailScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < idList.length(); i++) {
-          output.writeRawByte((byte) 48);
+          output.writeRawByte((byte) 24);
           output.writeUInt32NoTag(idList.array()[i]);
         }
       }
@@ -240,16 +240,16 @@ public final class DelMailScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
+          case 96: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 50) {
+            if (tag != 26) {
               break;
             }
           }
-          case 50: {
+          case 26: {
             // idList [packed=true]
             input.readPackedUInt32(idList, tag);
             bitField0_ |= 0x00000002;
@@ -268,7 +268,7 @@ public final class DelMailScRspOuterClass {
             tag = input.readTag();
             break;
           }
-          case 48: {
+          case 24: {
             // idList [packed=false]
             tag = input.readRepeatedUInt32(idList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class DeleteFriendCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 uid = 5;</code>
+     * <code>optional uint32 uid = 3;</code>
      */
     private int uid;
 
@@ -34,7 +34,7 @@ public final class DeleteFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 5;</code>
+     * <code>optional uint32 uid = 3;</code>
      * @return whether the uid field is set
      */
     public boolean hasUid() {
@@ -42,7 +42,7 @@ public final class DeleteFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 5;</code>
+     * <code>optional uint32 uid = 3;</code>
      * @return this
      */
     public DeleteFriendCsReq clearUid() {
@@ -52,7 +52,7 @@ public final class DeleteFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 5;</code>
+     * <code>optional uint32 uid = 3;</code>
      * @return the uid
      */
     public int getUid() {
@@ -60,7 +60,7 @@ public final class DeleteFriendCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 uid = 5;</code>
+     * <code>optional uint32 uid = 3;</code>
      * @param value the uid to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class DeleteFriendCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(uid);
       }
     }
@@ -150,7 +150,7 @@ public final class DeleteFriendCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
+          case 24: {
             // uid
             uid = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class DeployRotaterCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .RotaterData rotater_data = 2;</code>
+     * <code>optional .RotaterData rotater_data = 11;</code>
      */
     private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
 
@@ -34,7 +34,7 @@ public final class DeployRotaterCsReqOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 2;</code>
+     * <code>optional .RotaterData rotater_data = 11;</code>
      * @return whether the rotaterData field is set
      */
     public boolean hasRotaterData() {
@@ -42,7 +42,7 @@ public final class DeployRotaterCsReqOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 2;</code>
+     * <code>optional .RotaterData rotater_data = 11;</code>
      * @return this
      */
     public DeployRotaterCsReq clearRotaterData() {
@@ -52,7 +52,7 @@ public final class DeployRotaterCsReqOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 2;</code>
+     * <code>optional .RotaterData rotater_data = 11;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class DeployRotaterCsReqOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 2;</code>
+     * <code>optional .RotaterData rotater_data = 11;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class DeployRotaterCsReqOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 2;</code>
+     * <code>optional .RotaterData rotater_data = 11;</code>
      * @param value the rotaterData to set
      * @return this
      */
@@ -150,7 +150,7 @@ public final class DeployRotaterCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 18);
+        output.writeRawByte((byte) 90);
         output.writeMessageNoTag(rotaterData);
       }
     }
@@ -171,7 +171,7 @@ public final class DeployRotaterCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 18: {
+          case 90: {
             // rotaterData
             input.readMessage(rotaterData);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java

@@ -19,17 +19,17 @@ public final class DeployRotaterScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 11;</code>
+     * <code>optional uint32 retcode = 5;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional .RotatorEnergyInfo energy_info = 5;</code>
+     * <code>optional .RotatorEnergyInfo energy_info = 6;</code>
      */
     private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance();
 
     /**
-     * <code>optional .RotaterData rotater_data = 9;</code>
+     * <code>optional .RotaterData rotater_data = 7;</code>
      */
     private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance();
 
@@ -44,7 +44,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 11;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 11;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return this
      */
     public DeployRotaterScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 11;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -70,7 +70,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 11;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotatorEnergyInfo energy_info = 5;</code>
+     * <code>optional .RotatorEnergyInfo energy_info = 6;</code>
      * @return whether the energyInfo field is set
      */
     public boolean hasEnergyInfo() {
@@ -89,7 +89,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotatorEnergyInfo energy_info = 5;</code>
+     * <code>optional .RotatorEnergyInfo energy_info = 6;</code>
      * @return this
      */
     public DeployRotaterScRsp clearEnergyInfo() {
@@ -99,7 +99,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotatorEnergyInfo energy_info = 5;</code>
+     * <code>optional .RotatorEnergyInfo energy_info = 6;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -113,7 +113,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotatorEnergyInfo energy_info = 5;</code>
+     * <code>optional .RotatorEnergyInfo energy_info = 6;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -127,7 +127,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotatorEnergyInfo energy_info = 5;</code>
+     * <code>optional .RotatorEnergyInfo energy_info = 6;</code>
      * @param value the energyInfo to set
      * @return this
      */
@@ -139,7 +139,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 9;</code>
+     * <code>optional .RotaterData rotater_data = 7;</code>
      * @return whether the rotaterData field is set
      */
     public boolean hasRotaterData() {
@@ -147,7 +147,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 9;</code>
+     * <code>optional .RotaterData rotater_data = 7;</code>
      * @return this
      */
     public DeployRotaterScRsp clearRotaterData() {
@@ -157,7 +157,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 9;</code>
+     * <code>optional .RotaterData rotater_data = 7;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -171,7 +171,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 9;</code>
+     * <code>optional .RotaterData rotater_data = 7;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -185,7 +185,7 @@ public final class DeployRotaterScRspOuterClass {
     }
 
     /**
-     * <code>optional .RotaterData rotater_data = 9;</code>
+     * <code>optional .RotaterData rotater_data = 7;</code>
      * @param value the rotaterData to set
      * @return this
      */
@@ -268,15 +268,15 @@ public final class DeployRotaterScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 50);
         output.writeMessageNoTag(energyInfo);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 74);
+        output.writeRawByte((byte) 58);
         output.writeMessageNoTag(rotaterData);
       }
     }
@@ -303,25 +303,25 @@ public final class DeployRotaterScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 88: {
+          case 40: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 50) {
               break;
             }
           }
-          case 42: {
+          case 50: {
             // energyInfo
             input.readMessage(energyInfo);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 74) {
+            if (tag != 58) {
               break;
             }
           }
-          case 74: {
+          case 58: {
             // rotaterData
             input.readMessage(rotaterData);
             bitField0_ |= 0x00000004;

src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java

@@ -0,0 +1,247 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import us.hebi.quickbuf.ProtoEnum;
+import us.hebi.quickbuf.ProtoUtil;
+
+public final class DevelopmentTypeOuterClass {
+  /**
+   * Protobuf enum {@code DevelopmentType}
+   */
+  public enum DevelopmentType implements ProtoEnum<DevelopmentType> {
+    /**
+     * <code>DEVELOPMENT_NONE = 0;</code>
+     */
+    DEVELOPMENT_NONE("DEVELOPMENT_NONE", 0),
+
+    /**
+     * <code>DEVELOPMENT_ROGUE_COSMOS = 1;</code>
+     */
+    DEVELOPMENT_ROGUE_COSMOS("DEVELOPMENT_ROGUE_COSMOS", 1),
+
+    /**
+     * <code>DEVELOPMENT_ROGUE_CHESS = 2;</code>
+     */
+    DEVELOPMENT_ROGUE_CHESS("DEVELOPMENT_ROGUE_CHESS", 2),
+
+    /**
+     * <code>DEVELOPMENT_ROGUE_CHESS_NOUS = 3;</code>
+     */
+    DEVELOPMENT_ROGUE_CHESS_NOUS("DEVELOPMENT_ROGUE_CHESS_NOUS", 3),
+
+    /**
+     * <code>DEVELOPMENT_MEMORY_CHALLENGE = 4;</code>
+     */
+    DEVELOPMENT_MEMORY_CHALLENGE("DEVELOPMENT_MEMORY_CHALLENGE", 4),
+
+    /**
+     * <code>DEVELOPMENT_STORY_CHALLENGE = 5;</code>
+     */
+    DEVELOPMENT_STORY_CHALLENGE("DEVELOPMENT_STORY_CHALLENGE", 5),
+
+    /**
+     * <code>DEVELOPMENT_UNLOCK_AVATAR = 6;</code>
+     */
+    DEVELOPMENT_UNLOCK_AVATAR("DEVELOPMENT_UNLOCK_AVATAR", 6),
+
+    /**
+     * <code>DEVELOPMENT_UNLOCK_EQUIPMENT = 7;</code>
+     */
+    DEVELOPMENT_UNLOCK_EQUIPMENT("DEVELOPMENT_UNLOCK_EQUIPMENT", 7),
+
+    /**
+     * <code>DEVELOPMENT_ACTIVITY_START = 8;</code>
+     */
+    DEVELOPMENT_ACTIVITY_START("DEVELOPMENT_ACTIVITY_START", 8),
+
+    /**
+     * <code>DEVELOPMENT_ACTIVITY_END = 9;</code>
+     */
+    DEVELOPMENT_ACTIVITY_END("DEVELOPMENT_ACTIVITY_END", 9);
+
+    /**
+     * <code>DEVELOPMENT_NONE = 0;</code>
+     */
+    public static final int DEVELOPMENT_NONE_VALUE = 0;
+
+    /**
+     * <code>DEVELOPMENT_ROGUE_COSMOS = 1;</code>
+     */
+    public static final int DEVELOPMENT_ROGUE_COSMOS_VALUE = 1;
+
+    /**
+     * <code>DEVELOPMENT_ROGUE_CHESS = 2;</code>
+     */
+    public static final int DEVELOPMENT_ROGUE_CHESS_VALUE = 2;
+
+    /**
+     * <code>DEVELOPMENT_ROGUE_CHESS_NOUS = 3;</code>
+     */
+    public static final int DEVELOPMENT_ROGUE_CHESS_NOUS_VALUE = 3;
+
+    /**
+     * <code>DEVELOPMENT_MEMORY_CHALLENGE = 4;</code>
+     */
+    public static final int DEVELOPMENT_MEMORY_CHALLENGE_VALUE = 4;
+
+    /**
+     * <code>DEVELOPMENT_STORY_CHALLENGE = 5;</code>
+     */
+    public static final int DEVELOPMENT_STORY_CHALLENGE_VALUE = 5;
+
+    /**
+     * <code>DEVELOPMENT_UNLOCK_AVATAR = 6;</code>
+     */
+    public static final int DEVELOPMENT_UNLOCK_AVATAR_VALUE = 6;
+
+    /**
+     * <code>DEVELOPMENT_UNLOCK_EQUIPMENT = 7;</code>
+     */
+    public static final int DEVELOPMENT_UNLOCK_EQUIPMENT_VALUE = 7;
+
+    /**
+     * <code>DEVELOPMENT_ACTIVITY_START = 8;</code>
+     */
+    public static final int DEVELOPMENT_ACTIVITY_START_VALUE = 8;
+
+    /**
+     * <code>DEVELOPMENT_ACTIVITY_END = 9;</code>
+     */
+    public static final int DEVELOPMENT_ACTIVITY_END_VALUE = 9;
+
+    private final String name;
+
+    private final int number;
+
+    private DevelopmentType(String name, int number) {
+      this.name = name;
+      this.number = number;
+    }
+
+    /**
+     * @return the string representation of enum entry
+     */
+    @Override
+    public String getName() {
+      return name;
+    }
+
+    /**
+     * @return the numeric wire value of this enum entry
+     */
+    @Override
+    public int getNumber() {
+      return number;
+    }
+
+    /**
+     * @return a converter that maps between this enum's numeric and text representations
+     */
+    public static ProtoEnum.EnumConverter<DevelopmentType> converter() {
+      return DevelopmentTypeConverter.INSTANCE;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value, or null if unknown.
+     */
+    public static DevelopmentType forNumber(int value) {
+      return DevelopmentTypeConverter.INSTANCE.forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @param other Fallback value in case the value is not known.
+     * @return The enum associated with the given numeric wire value, or the fallback value if unknown.
+     */
+    public static DevelopmentType forNumberOr(int number, DevelopmentType other) {
+      DevelopmentType value = forNumber(number);
+      return value == null ? other : value;
+    }
+
+    enum DevelopmentTypeConverter implements ProtoEnum.EnumConverter<DevelopmentType> {
+      INSTANCE;
+
+      private static final DevelopmentType[] lookup = new DevelopmentType[10];
+
+      static {
+        lookup[0] = DEVELOPMENT_NONE;
+        lookup[1] = DEVELOPMENT_ROGUE_COSMOS;
+        lookup[2] = DEVELOPMENT_ROGUE_CHESS;
+        lookup[3] = DEVELOPMENT_ROGUE_CHESS_NOUS;
+        lookup[4] = DEVELOPMENT_MEMORY_CHALLENGE;
+        lookup[5] = DEVELOPMENT_STORY_CHALLENGE;
+        lookup[6] = DEVELOPMENT_UNLOCK_AVATAR;
+        lookup[7] = DEVELOPMENT_UNLOCK_EQUIPMENT;
+        lookup[8] = DEVELOPMENT_ACTIVITY_START;
+        lookup[9] = DEVELOPMENT_ACTIVITY_END;
+      }
+
+      @Override
+      public final DevelopmentType forNumber(final int value) {
+        if (value >= 0 && value < lookup.length) {
+          return lookup[value];
+        }
+        return null;
+      }
+
+      @Override
+      public final DevelopmentType forName(final CharSequence value) {
+        switch (value.length()) {
+          case 16: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_NONE", value)) {
+              return DEVELOPMENT_NONE;
+            }
+            break;
+          }
+          case 23: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_ROGUE_CHESS", value)) {
+              return DEVELOPMENT_ROGUE_CHESS;
+            }
+            break;
+          }
+          case 24: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_ROGUE_COSMOS", value)) {
+              return DEVELOPMENT_ROGUE_COSMOS;
+            }
+            if (ProtoUtil.isEqual("DEVELOPMENT_ACTIVITY_END", value)) {
+              return DEVELOPMENT_ACTIVITY_END;
+            }
+            break;
+          }
+          case 25: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_UNLOCK_AVATAR", value)) {
+              return DEVELOPMENT_UNLOCK_AVATAR;
+            }
+            break;
+          }
+          case 26: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_ACTIVITY_START", value)) {
+              return DEVELOPMENT_ACTIVITY_START;
+            }
+            break;
+          }
+          case 27: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_STORY_CHALLENGE", value)) {
+              return DEVELOPMENT_STORY_CHALLENGE;
+            }
+            break;
+          }
+          case 28: {
+            if (ProtoUtil.isEqual("DEVELOPMENT_ROGUE_CHESS_NOUS", value)) {
+              return DEVELOPMENT_ROGUE_CHESS_NOUS;
+            }
+            if (ProtoUtil.isEqual("DEVELOPMENT_MEMORY_CHALLENGE", value)) {
+              return DEVELOPMENT_MEMORY_CHALLENGE;
+            }
+            if (ProtoUtil.isEqual("DEVELOPMENT_UNLOCK_EQUIPMENT", value)) {
+              return DEVELOPMENT_UNLOCK_EQUIPMENT;
+            }
+            break;
+          }
+        }
+        return null;
+      }
+    }
+  }
+}

src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java

@@ -25,12 +25,12 @@ public final class DialogueResultOuterClass {
     private int hFHKBMGBJAN;
 
     /**
-     * <code>optional .ItemList item_result = 5;</code>
+     * <code>optional .ItemList item_result = 13;</code>
      */
     private final ItemListOuterClass.ItemList itemResult = ItemListOuterClass.ItemList.newInstance();
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      */
     private final RepeatedInt eventIds = RepeatedInt.newEmptyInstance();
 
@@ -82,7 +82,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>optional .ItemList item_result = 5;</code>
+     * <code>optional .ItemList item_result = 13;</code>
      * @return whether the itemResult field is set
      */
     public boolean hasItemResult() {
@@ -90,7 +90,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>optional .ItemList item_result = 5;</code>
+     * <code>optional .ItemList item_result = 13;</code>
      * @return this
      */
     public DialogueResult clearItemResult() {
@@ -100,7 +100,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>optional .ItemList item_result = 5;</code>
+     * <code>optional .ItemList item_result = 13;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -114,7 +114,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>optional .ItemList item_result = 5;</code>
+     * <code>optional .ItemList item_result = 13;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -128,7 +128,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>optional .ItemList item_result = 5;</code>
+     * <code>optional .ItemList item_result = 13;</code>
      * @param value the itemResult to set
      * @return this
      */
@@ -139,7 +139,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      * @return whether the eventIds field is set
      */
     public boolean hasEventIds() {
@@ -147,7 +147,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      * @return this
      */
     public DialogueResult clearEventIds() {
@@ -157,7 +157,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -171,7 +171,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -185,7 +185,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      * @param value the eventIds to add
      * @return this
      */
@@ -196,7 +196,7 @@ public final class DialogueResultOuterClass {
     }
 
     /**
-     * <code>repeated uint32 event_ids = 15;</code>
+     * <code>repeated uint32 event_ids = 10;</code>
      * @param values the eventIds to add
      * @return this
      */
@@ -283,12 +283,12 @@ public final class DialogueResultOuterClass {
         output.writeUInt32NoTag(hFHKBMGBJAN);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 106);
         output.writeMessageNoTag(itemResult);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         for (int i = 0; i < eventIds.length(); i++) {
-          output.writeRawByte((byte) 120);
+          output.writeRawByte((byte) 80);
           output.writeUInt32NoTag(eventIds.array()[i]);
         }
       }
@@ -321,20 +321,20 @@ public final class DialogueResultOuterClass {
             hFHKBMGBJAN = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 106) {
               break;
             }
           }
-          case 42: {
+          case 106: {
             // itemResult
             input.readMessage(itemResult);
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 122) {
+            if (tag != 82) {
               break;
             }
           }
-          case 122: {
+          case 82: {
             // eventIds [packed=true]
             input.readPackedUInt32(eventIds, tag);
             bitField0_ |= 0x00000004;
@@ -353,7 +353,7 @@ public final class DialogueResultOuterClass {
             tag = input.readTag();
             break;
           }
-          case 120: {
+          case 80: {
             // eventIds [packed=false]
             tag = input.readRepeatedUInt32(eventIds, tag);
             bitField0_ |= 0x00000004;

src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java

@@ -24,7 +24,7 @@ public final class DiscardRelicCsReqOuterClass {
     private int relicUniqueId;
 
     /**
-     * <code>optional bool is_discard = 3;</code>
+     * <code>optional bool is_discard = 4;</code>
      */
     private boolean isDiscard;
 
@@ -76,7 +76,7 @@ public final class DiscardRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional bool is_discard = 3;</code>
+     * <code>optional bool is_discard = 4;</code>
      * @return whether the isDiscard field is set
      */
     public boolean hasIsDiscard() {
@@ -84,7 +84,7 @@ public final class DiscardRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional bool is_discard = 3;</code>
+     * <code>optional bool is_discard = 4;</code>
      * @return this
      */
     public DiscardRelicCsReq clearIsDiscard() {
@@ -94,7 +94,7 @@ public final class DiscardRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional bool is_discard = 3;</code>
+     * <code>optional bool is_discard = 4;</code>
      * @return the isDiscard
      */
     public boolean getIsDiscard() {
@@ -102,7 +102,7 @@ public final class DiscardRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional bool is_discard = 3;</code>
+     * <code>optional bool is_discard = 4;</code>
      * @param value the isDiscard to set
      * @return this
      */
@@ -181,7 +181,7 @@ public final class DiscardRelicCsReqOuterClass {
         output.writeUInt32NoTag(relicUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 32);
         output.writeBoolNoTag(isDiscard);
       }
     }
@@ -210,11 +210,11 @@ public final class DiscardRelicCsReqOuterClass {
             relicUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 24) {
+            if (tag != 32) {
               break;
             }
           }
-          case 24: {
+          case 32: {
             // isDiscard
             isDiscard = input.readBool();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java

@@ -19,12 +19,12 @@ public final class DisplayAvatarOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 pos = 2;</code>
+     * <code>optional uint32 pos = 7;</code>
      */
     private int pos;
 
     /**
-     * <code>optional uint32 avatar_id = 13;</code>
+     * <code>optional uint32 avatar_id = 15;</code>
      */
     private int avatarId;
 
@@ -39,7 +39,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 pos = 2;</code>
+     * <code>optional uint32 pos = 7;</code>
      * @return whether the pos field is set
      */
     public boolean hasPos() {
@@ -47,7 +47,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 pos = 2;</code>
+     * <code>optional uint32 pos = 7;</code>
      * @return this
      */
     public DisplayAvatar clearPos() {
@@ -57,7 +57,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 pos = 2;</code>
+     * <code>optional uint32 pos = 7;</code>
      * @return the pos
      */
     public int getPos() {
@@ -65,7 +65,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 pos = 2;</code>
+     * <code>optional uint32 pos = 7;</code>
      * @param value the pos to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 13;</code>
+     * <code>optional uint32 avatar_id = 15;</code>
      * @return whether the avatarId field is set
      */
     public boolean hasAvatarId() {
@@ -84,7 +84,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 13;</code>
+     * <code>optional uint32 avatar_id = 15;</code>
      * @return this
      */
     public DisplayAvatar clearAvatarId() {
@@ -94,7 +94,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 13;</code>
+     * <code>optional uint32 avatar_id = 15;</code>
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -102,7 +102,7 @@ public final class DisplayAvatarOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 13;</code>
+     * <code>optional uint32 avatar_id = 15;</code>
      * @param value the avatarId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class DisplayAvatarOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(pos);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(avatarId);
       }
     }
@@ -205,16 +205,16 @@ public final class DisplayAvatarOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 56: {
             // pos
             pos = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 120) {
               break;
             }
           }
-          case 104: {
+          case 120: {
             // avatarId
             avatarId = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java

@@ -20,12 +20,12 @@ public final class DisplayAvatarVecOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional bool is_display = 2;</code>
+     * <code>optional bool is_display = 5;</code>
      */
     private boolean isDisplay;
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      */
     private final RepeatedMessage<DisplayAvatarOuterClass.DisplayAvatar> displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory());
 
@@ -40,7 +40,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>optional bool is_display = 2;</code>
+     * <code>optional bool is_display = 5;</code>
      * @return whether the isDisplay field is set
      */
     public boolean hasIsDisplay() {
@@ -48,7 +48,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>optional bool is_display = 2;</code>
+     * <code>optional bool is_display = 5;</code>
      * @return this
      */
     public DisplayAvatarVec clearIsDisplay() {
@@ -58,7 +58,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>optional bool is_display = 2;</code>
+     * <code>optional bool is_display = 5;</code>
      * @return the isDisplay
      */
     public boolean getIsDisplay() {
@@ -66,7 +66,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>optional bool is_display = 2;</code>
+     * <code>optional bool is_display = 5;</code>
      * @param value the isDisplay to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      * @return whether the displayAvatarList field is set
      */
     public boolean hasDisplayAvatarList() {
@@ -85,7 +85,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      * @return this
      */
     public DisplayAvatarVec clearDisplayAvatarList() {
@@ -95,7 +95,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      * @param value the displayAvatarList to add
      * @return this
      */
@@ -135,7 +135,7 @@ public final class DisplayAvatarVecOuterClass {
     }
 
     /**
-     * <code>repeated .DisplayAvatar display_avatar_list = 15;</code>
+     * <code>repeated .DisplayAvatar display_avatar_list = 14;</code>
      * @param values the displayAvatarList to add
      * @return this
      */
@@ -212,12 +212,12 @@ public final class DisplayAvatarVecOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 40);
         output.writeBoolNoTag(isDisplay);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < displayAvatarList.length(); i++) {
-          output.writeRawByte((byte) 122);
+          output.writeRawByte((byte) 114);
           output.writeMessageNoTag(displayAvatarList.get(i));
         }
       }
@@ -242,16 +242,16 @@ public final class DisplayAvatarVecOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 40: {
             // isDisplay
             isDisplay = input.readBool();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 122) {
+            if (tag != 114) {
               break;
             }
           }
-          case 122: {
+          case 114: {
             // displayAvatarList
             tag = input.readRepeatedMessage(displayAvatarList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/DisplayRecordTypeOuterClass.java

@@ -0,0 +1,132 @@
+// Code generated by protocol buffer compiler. Do not edit!
+package emu.lunarcore.proto;
+
+import us.hebi.quickbuf.ProtoEnum;
+import us.hebi.quickbuf.ProtoUtil;
+
+public final class DisplayRecordTypeOuterClass {
+  /**
+   * Protobuf enum {@code DisplayRecordType}
+   */
+  public enum DisplayRecordType implements ProtoEnum<DisplayRecordType> {
+    /**
+     * <code>BATTLE_RECORD_NONE = 0;</code>
+     */
+    BATTLE_RECORD_NONE("BATTLE_RECORD_NONE", 0),
+
+    /**
+     * <code>BATTLE_RECORD_CHALLENGE = 1;</code>
+     */
+    BATTLE_RECORD_CHALLENGE("BATTLE_RECORD_CHALLENGE", 1),
+
+    /**
+     * <code>BATTLE_RECORD_ROGUE = 2;</code>
+     */
+    BATTLE_RECORD_ROGUE("BATTLE_RECORD_ROGUE", 2);
+
+    /**
+     * <code>BATTLE_RECORD_NONE = 0;</code>
+     */
+    public static final int BATTLE_RECORD_NONE_VALUE = 0;
+
+    /**
+     * <code>BATTLE_RECORD_CHALLENGE = 1;</code>
+     */
+    public static final int BATTLE_RECORD_CHALLENGE_VALUE = 1;
+
+    /**
+     * <code>BATTLE_RECORD_ROGUE = 2;</code>
+     */
+    public static final int BATTLE_RECORD_ROGUE_VALUE = 2;
+
+    private final String name;
+
+    private final int number;
+
+    private DisplayRecordType(String name, int number) {
+      this.name = name;
+      this.number = number;
+    }
+
+    /**
+     * @return the string representation of enum entry
+     */
+    @Override
+    public String getName() {
+      return name;
+    }
+
+    /**
+     * @return the numeric wire value of this enum entry
+     */
+    @Override
+    public int getNumber() {
+      return number;
+    }
+
+    /**
+     * @return a converter that maps between this enum's numeric and text representations
+     */
+    public static ProtoEnum.EnumConverter<DisplayRecordType> converter() {
+      return DisplayRecordTypeConverter.INSTANCE;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value, or null if unknown.
+     */
+    public static DisplayRecordType forNumber(int value) {
+      return DisplayRecordTypeConverter.INSTANCE.forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @param other Fallback value in case the value is not known.
+     * @return The enum associated with the given numeric wire value, or the fallback value if unknown.
+     */
+    public static DisplayRecordType forNumberOr(int number, DisplayRecordType other) {
+      DisplayRecordType value = forNumber(number);
+      return value == null ? other : value;
+    }
+
+    enum DisplayRecordTypeConverter implements ProtoEnum.EnumConverter<DisplayRecordType> {
+      INSTANCE;
+
+      private static final DisplayRecordType[] lookup = new DisplayRecordType[3];
+
+      static {
+        lookup[0] = BATTLE_RECORD_NONE;
+        lookup[1] = BATTLE_RECORD_CHALLENGE;
+        lookup[2] = BATTLE_RECORD_ROGUE;
+      }
+
+      @Override
+      public final DisplayRecordType forNumber(final int value) {
+        if (value >= 0 && value < lookup.length) {
+          return lookup[value];
+        }
+        return null;
+      }
+
+      @Override
+      public final DisplayRecordType forName(final CharSequence value) {
+        if (value.length() == 18) {
+          if (ProtoUtil.isEqual("BATTLE_RECORD_NONE", value)) {
+            return BATTLE_RECORD_NONE;
+          }
+        }
+        if (value.length() == 19) {
+          if (ProtoUtil.isEqual("BATTLE_RECORD_ROGUE", value)) {
+            return BATTLE_RECORD_ROGUE;
+          }
+        }
+        if (value.length() == 23) {
+          if (ProtoUtil.isEqual("BATTLE_RECORD_CHALLENGE", value)) {
+            return BATTLE_RECORD_CHALLENGE;
+          }
+        }
+        return null;
+      }
+    }
+  }
+}

src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java

@@ -19,22 +19,22 @@ public final class DoGachaCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 gacha_id = 4;</code>
-     */
-    private int gachaId;
-
-    /**
-     * <code>optional uint32 simulate_magic = 7;</code>
-     */
-    private int simulateMagic;
-
-    /**
-     * <code>optional uint32 gacha_random = 11;</code>
+     * <code>optional uint32 gacha_random = 4;</code>
      */
     private int gachaRandom;
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_id = 5;</code>
+     */
+    private int gachaId;
+
+    /**
+     * <code>optional uint32 simulate_magic = 9;</code>
+     */
+    private int simulateMagic;
+
+    /**
+     * <code>optional uint32 gacha_num = 10;</code>
      */
     private int gachaNum;
 
@@ -49,99 +49,25 @@ public final class DoGachaCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_id = 4;</code>
-     * @return whether the gachaId field is set
+     * <code>optional uint32 gacha_random = 4;</code>
+     * @return whether the gachaRandom field is set
      */
-    public boolean hasGachaId() {
+    public boolean hasGachaRandom() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 gacha_id = 4;</code>
-     * @return this
-     */
-    public DoGachaCsReq clearGachaId() {
-      bitField0_ &= ~0x00000001;
-      gachaId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 gacha_id = 4;</code>
-     * @return the gachaId
-     */
-    public int getGachaId() {
-      return gachaId;
-    }
-
-    /**
-     * <code>optional uint32 gacha_id = 4;</code>
-     * @param value the gachaId to set
-     * @return this
-     */
-    public DoGachaCsReq setGachaId(final int value) {
-      bitField0_ |= 0x00000001;
-      gachaId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 simulate_magic = 7;</code>
-     * @return whether the simulateMagic field is set
-     */
-    public boolean hasSimulateMagic() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 simulate_magic = 7;</code>
-     * @return this
-     */
-    public DoGachaCsReq clearSimulateMagic() {
-      bitField0_ &= ~0x00000002;
-      simulateMagic = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 simulate_magic = 7;</code>
-     * @return the simulateMagic
-     */
-    public int getSimulateMagic() {
-      return simulateMagic;
-    }
-
-    /**
-     * <code>optional uint32 simulate_magic = 7;</code>
-     * @param value the simulateMagic to set
-     * @return this
-     */
-    public DoGachaCsReq setSimulateMagic(final int value) {
-      bitField0_ |= 0x00000002;
-      simulateMagic = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 gacha_random = 11;</code>
-     * @return whether the gachaRandom field is set
-     */
-    public boolean hasGachaRandom() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 gacha_random = 11;</code>
+     * <code>optional uint32 gacha_random = 4;</code>
      * @return this
      */
     public DoGachaCsReq clearGachaRandom() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000001;
       gachaRandom = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 gacha_random = 11;</code>
+     * <code>optional uint32 gacha_random = 4;</code>
      * @return the gachaRandom
      */
     public int getGachaRandom() {
@@ -149,18 +75,92 @@ public final class DoGachaCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_random = 11;</code>
+     * <code>optional uint32 gacha_random = 4;</code>
      * @param value the gachaRandom to set
      * @return this
      */
     public DoGachaCsReq setGachaRandom(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000001;
       gachaRandom = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_id = 5;</code>
+     * @return whether the gachaId field is set
+     */
+    public boolean hasGachaId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 gacha_id = 5;</code>
+     * @return this
+     */
+    public DoGachaCsReq clearGachaId() {
+      bitField0_ &= ~0x00000002;
+      gachaId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 gacha_id = 5;</code>
+     * @return the gachaId
+     */
+    public int getGachaId() {
+      return gachaId;
+    }
+
+    /**
+     * <code>optional uint32 gacha_id = 5;</code>
+     * @param value the gachaId to set
+     * @return this
+     */
+    public DoGachaCsReq setGachaId(final int value) {
+      bitField0_ |= 0x00000002;
+      gachaId = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 simulate_magic = 9;</code>
+     * @return whether the simulateMagic field is set
+     */
+    public boolean hasSimulateMagic() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 simulate_magic = 9;</code>
+     * @return this
+     */
+    public DoGachaCsReq clearSimulateMagic() {
+      bitField0_ &= ~0x00000004;
+      simulateMagic = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 simulate_magic = 9;</code>
+     * @return the simulateMagic
+     */
+    public int getSimulateMagic() {
+      return simulateMagic;
+    }
+
+    /**
+     * <code>optional uint32 simulate_magic = 9;</code>
+     * @param value the simulateMagic to set
+     * @return this
+     */
+    public DoGachaCsReq setSimulateMagic(final int value) {
+      bitField0_ |= 0x00000004;
+      simulateMagic = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 gacha_num = 10;</code>
      * @return whether the gachaNum field is set
      */
     public boolean hasGachaNum() {
@@ -168,7 +168,7 @@ public final class DoGachaCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_num = 10;</code>
      * @return this
      */
     public DoGachaCsReq clearGachaNum() {
@@ -178,7 +178,7 @@ public final class DoGachaCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_num = 10;</code>
      * @return the gachaNum
      */
     public int getGachaNum() {
@@ -186,7 +186,7 @@ public final class DoGachaCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_num = 10;</code>
      * @param value the gachaNum to set
      * @return this
      */
@@ -201,9 +201,9 @@ public final class DoGachaCsReqOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
+        gachaRandom = other.gachaRandom;
         gachaId = other.gachaId;
         simulateMagic = other.simulateMagic;
-        gachaRandom = other.gachaRandom;
         gachaNum = other.gachaNum;
       }
       return this;
@@ -215,15 +215,15 @@ public final class DoGachaCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
+      if (other.hasGachaRandom()) {
+        setGachaRandom(other.gachaRandom);
+      }
       if (other.hasGachaId()) {
         setGachaId(other.gachaId);
       }
       if (other.hasSimulateMagic()) {
         setSimulateMagic(other.simulateMagic);
       }
-      if (other.hasGachaRandom()) {
-        setGachaRandom(other.gachaRandom);
-      }
       if (other.hasGachaNum()) {
         setGachaNum(other.gachaNum);
       }
@@ -237,9 +237,9 @@ public final class DoGachaCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
+      gachaRandom = 0;
       gachaId = 0;
       simulateMagic = 0;
-      gachaRandom = 0;
       gachaNum = 0;
       return this;
     }
@@ -264,9 +264,9 @@ public final class DoGachaCsReqOuterClass {
       }
       DoGachaCsReq other = (DoGachaCsReq) o;
       return bitField0_ == other.bitField0_
+        && (!hasGachaRandom() || gachaRandom == other.gachaRandom)
         && (!hasGachaId() || gachaId == other.gachaId)
         && (!hasSimulateMagic() || simulateMagic == other.simulateMagic)
-        && (!hasGachaRandom() || gachaRandom == other.gachaRandom)
         && (!hasGachaNum() || gachaNum == other.gachaNum);
     }
 
@@ -274,18 +274,18 @@ public final class DoGachaCsReqOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(gachaId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
-        output.writeUInt32NoTag(simulateMagic);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(gachaRandom);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(gachaId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 72);
+        output.writeUInt32NoTag(simulateMagic);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(gachaNum);
       }
     }
@@ -294,13 +294,13 @@ public final class DoGachaCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
@@ -316,33 +316,33 @@ public final class DoGachaCsReqOuterClass {
       while (true) {
         switch (tag) {
           case 32: {
-            // gachaId
-            gachaId = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
-            // simulateMagic
-            simulateMagic = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 88) {
-              break;
-            }
-          }
-          case 88: {
             // gachaRandom
             gachaRandom = input.readUInt32();
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 40) {
               break;
             }
           }
-          case 96: {
+          case 40: {
+            // gachaId
+            gachaId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 72) {
+              break;
+            }
+          }
+          case 72: {
+            // simulateMagic
+            simulateMagic = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
             // gachaNum
             gachaNum = input.readUInt32();
             bitField0_ |= 0x00000008;
@@ -369,13 +369,13 @@ public final class DoGachaCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.gachaId, gachaId);
+        output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.simulateMagic, simulateMagic);
+        output.writeUInt32(FieldNames.gachaId, gachaId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
+        output.writeUInt32(FieldNames.simulateMagic, simulateMagic);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.gachaNum, gachaNum);
@@ -390,12 +390,24 @@ public final class DoGachaCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
+          case -1635961627:
+          case -47579616: {
+            if (input.isAtField(FieldNames.gachaRandom)) {
+              if (!input.trySkipNullValue()) {
+                gachaRandom = input.readUInt32();
+                bitField0_ |= 0x00000001;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           case -204751299:
           case -2052301576: {
             if (input.isAtField(FieldNames.gachaId)) {
               if (!input.trySkipNullValue()) {
                 gachaId = input.readUInt32();
-                bitField0_ |= 0x00000001;
+                bitField0_ |= 0x00000002;
               }
             } else {
               input.skipUnknownField();
@@ -407,18 +419,6 @@ public final class DoGachaCsReqOuterClass {
             if (input.isAtField(FieldNames.simulateMagic)) {
               if (!input.trySkipNullValue()) {
                 simulateMagic = input.readUInt32();
-                bitField0_ |= 0x00000002;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
-          case -1635961627:
-          case -47579616: {
-            if (input.isAtField(FieldNames.gachaRandom)) {
-              if (!input.trySkipNullValue()) {
-                gachaRandom = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -490,12 +490,12 @@ public final class DoGachaCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
+      static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
+
       static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
 
       static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic");
 
-      static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
-
       static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
     }
   }

src/generated/main/emu/lunarcore/proto/DoGachaInRollShopCsReqOuterClass.java

@@ -19,15 +19,20 @@ public final class DoGachaInRollShopCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 BBJIJINJAFK = 5;</code>
+     * <code>optional uint32 BBJIJINJAFK = 6;</code>
      */
     private int bBJIJINJAFK;
 
     /**
-     * <code>optional uint32 roll_shop_id = 10;</code>
+     * <code>optional uint32 roll_shop_id = 13;</code>
      */
     private int rollShopId;
 
+    /**
+     * <code>optional uint32 gacha_random = 14;</code>
+     */
+    private int gachaRandom;
+
     private DoGachaInRollShopCsReq() {
     }
 
@@ -39,7 +44,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 BBJIJINJAFK = 5;</code>
+     * <code>optional uint32 BBJIJINJAFK = 6;</code>
      * @return whether the bBJIJINJAFK field is set
      */
     public boolean hasBBJIJINJAFK() {
@@ -47,7 +52,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 BBJIJINJAFK = 5;</code>
+     * <code>optional uint32 BBJIJINJAFK = 6;</code>
      * @return this
      */
     public DoGachaInRollShopCsReq clearBBJIJINJAFK() {
@@ -57,7 +62,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 BBJIJINJAFK = 5;</code>
+     * <code>optional uint32 BBJIJINJAFK = 6;</code>
      * @return the bBJIJINJAFK
      */
     public int getBBJIJINJAFK() {
@@ -65,7 +70,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 BBJIJINJAFK = 5;</code>
+     * <code>optional uint32 BBJIJINJAFK = 6;</code>
      * @param value the bBJIJINJAFK to set
      * @return this
      */
@@ -76,7 +81,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 10;</code>
+     * <code>optional uint32 roll_shop_id = 13;</code>
      * @return whether the rollShopId field is set
      */
     public boolean hasRollShopId() {
@@ -84,7 +89,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 10;</code>
+     * <code>optional uint32 roll_shop_id = 13;</code>
      * @return this
      */
     public DoGachaInRollShopCsReq clearRollShopId() {
@@ -94,7 +99,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 10;</code>
+     * <code>optional uint32 roll_shop_id = 13;</code>
      * @return the rollShopId
      */
     public int getRollShopId() {
@@ -102,7 +107,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 10;</code>
+     * <code>optional uint32 roll_shop_id = 13;</code>
      * @param value the rollShopId to set
      * @return this
      */
@@ -112,6 +117,43 @@ public final class DoGachaInRollShopCsReqOuterClass {
       return this;
     }
 
+    /**
+     * <code>optional uint32 gacha_random = 14;</code>
+     * @return whether the gachaRandom field is set
+     */
+    public boolean hasGachaRandom() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 gacha_random = 14;</code>
+     * @return this
+     */
+    public DoGachaInRollShopCsReq clearGachaRandom() {
+      bitField0_ &= ~0x00000004;
+      gachaRandom = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 gacha_random = 14;</code>
+     * @return the gachaRandom
+     */
+    public int getGachaRandom() {
+      return gachaRandom;
+    }
+
+    /**
+     * <code>optional uint32 gacha_random = 14;</code>
+     * @param value the gachaRandom to set
+     * @return this
+     */
+    public DoGachaInRollShopCsReq setGachaRandom(final int value) {
+      bitField0_ |= 0x00000004;
+      gachaRandom = value;
+      return this;
+    }
+
     @Override
     public DoGachaInRollShopCsReq copyFrom(final DoGachaInRollShopCsReq other) {
       cachedSize = other.cachedSize;
@@ -119,6 +161,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
         bitField0_ = other.bitField0_;
         bBJIJINJAFK = other.bBJIJINJAFK;
         rollShopId = other.rollShopId;
+        gachaRandom = other.gachaRandom;
       }
       return this;
     }
@@ -135,6 +178,9 @@ public final class DoGachaInRollShopCsReqOuterClass {
       if (other.hasRollShopId()) {
         setRollShopId(other.rollShopId);
       }
+      if (other.hasGachaRandom()) {
+        setGachaRandom(other.gachaRandom);
+      }
       return this;
     }
 
@@ -147,6 +193,7 @@ public final class DoGachaInRollShopCsReqOuterClass {
       bitField0_ = 0;
       bBJIJINJAFK = 0;
       rollShopId = 0;
+      gachaRandom = 0;
       return this;
     }
 
@@ -171,19 +218,24 @@ public final class DoGachaInRollShopCsReqOuterClass {
       DoGachaInRollShopCsReq other = (DoGachaInRollShopCsReq) o;
       return bitField0_ == other.bitField0_
         && (!hasBBJIJINJAFK() || bBJIJINJAFK == other.bBJIJINJAFK)
-        && (!hasRollShopId() || rollShopId == other.rollShopId);
+        && (!hasRollShopId() || rollShopId == other.rollShopId)
+        && (!hasGachaRandom() || gachaRandom == other.gachaRandom);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 40);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(bBJIJINJAFK);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(rollShopId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 112);
+        output.writeUInt32NoTag(gachaRandom);
+      }
     }
 
     @Override
@@ -195,6 +247,9 @@ public final class DoGachaInRollShopCsReqOuterClass {
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom);
+      }
       return size;
     }
 
@@ -205,20 +260,29 @@ public final class DoGachaInRollShopCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 40: {
+          case 48: {
             // bBJIJINJAFK
             bBJIJINJAFK = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 80) {
+            if (tag != 104) {
               break;
             }
           }
-          case 80: {
+          case 104: {
             // rollShopId
             rollShopId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
+            if (tag != 112) {
+              break;
+            }
+          }
+          case 112: {
+            // gachaRandom
+            gachaRandom = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
             if (tag != 0) {
               break;
             }
@@ -246,6 +310,9 @@ public final class DoGachaInRollShopCsReqOuterClass {
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.rollShopId, rollShopId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.gachaRandom, gachaRandom);
+      }
       output.endObject();
     }
 
@@ -279,6 +346,18 @@ public final class DoGachaInRollShopCsReqOuterClass {
             }
             break;
           }
+          case -1635961627:
+          case -47579616: {
+            if (input.isAtField(FieldNames.gachaRandom)) {
+              if (!input.trySkipNullValue()) {
+                gachaRandom = input.readUInt32();
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           default: {
             input.skipUnknownField();
             break;
@@ -335,6 +414,8 @@ public final class DoGachaInRollShopCsReqOuterClass {
       static final FieldName bBJIJINJAFK = FieldName.forField("BBJIJINJAFK");
 
       static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id");
+
+      static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/DoGachaInRollShopScRspOuterClass.java

@@ -24,22 +24,22 @@ public final class DoGachaInRollShopScRspOuterClass {
     private int aFMPDBBHCHM;
 
     /**
-     * <code>optional uint32 LEJJOJGNIHK = 4;</code>
-     */
-    private int lEJJOJGNIHK;
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 9;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 roll_shop_id = 8;</code>
+     * <code>optional uint32 LEJJOJGNIHK = 12;</code>
+     */
+    private int lEJJOJGNIHK;
+
+    /**
+     * <code>optional uint32 roll_shop_id = 15;</code>
      */
     private int rollShopId;
 
     /**
-     * <code>optional .ItemList reward = 9;</code>
+     * <code>optional .ItemList reward = 13;</code>
      */
     private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance();
 
@@ -91,62 +91,25 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 LEJJOJGNIHK = 4;</code>
-     * @return whether the lEJJOJGNIHK field is set
+     * <code>optional uint32 retcode = 9;</code>
+     * @return whether the retcode field is set
      */
-    public boolean hasLEJJOJGNIHK() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional uint32 LEJJOJGNIHK = 4;</code>
-     * @return this
-     */
-    public DoGachaInRollShopScRsp clearLEJJOJGNIHK() {
-      bitField0_ &= ~0x00000002;
-      lEJJOJGNIHK = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 LEJJOJGNIHK = 4;</code>
-     * @return the lEJJOJGNIHK
-     */
-    public int getLEJJOJGNIHK() {
-      return lEJJOJGNIHK;
-    }
-
-    /**
-     * <code>optional uint32 LEJJOJGNIHK = 4;</code>
-     * @param value the lEJJOJGNIHK to set
-     * @return this
-     */
-    public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) {
-      bitField0_ |= 0x00000002;
-      lEJJOJGNIHK = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000004) != 0;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @return this
      */
     public DoGachaInRollShopScRsp clearRetcode() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       retcode = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -154,18 +117,55 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 7;</code>
+     * <code>optional uint32 retcode = 9;</code>
      * @param value the retcode to set
      * @return this
      */
     public DoGachaInRollShopScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       retcode = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 8;</code>
+     * <code>optional uint32 LEJJOJGNIHK = 12;</code>
+     * @return whether the lEJJOJGNIHK field is set
+     */
+    public boolean hasLEJJOJGNIHK() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 LEJJOJGNIHK = 12;</code>
+     * @return this
+     */
+    public DoGachaInRollShopScRsp clearLEJJOJGNIHK() {
+      bitField0_ &= ~0x00000004;
+      lEJJOJGNIHK = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 LEJJOJGNIHK = 12;</code>
+     * @return the lEJJOJGNIHK
+     */
+    public int getLEJJOJGNIHK() {
+      return lEJJOJGNIHK;
+    }
+
+    /**
+     * <code>optional uint32 LEJJOJGNIHK = 12;</code>
+     * @param value the lEJJOJGNIHK to set
+     * @return this
+     */
+    public DoGachaInRollShopScRsp setLEJJOJGNIHK(final int value) {
+      bitField0_ |= 0x00000004;
+      lEJJOJGNIHK = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 roll_shop_id = 15;</code>
      * @return whether the rollShopId field is set
      */
     public boolean hasRollShopId() {
@@ -173,7 +173,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 8;</code>
+     * <code>optional uint32 roll_shop_id = 15;</code>
      * @return this
      */
     public DoGachaInRollShopScRsp clearRollShopId() {
@@ -183,7 +183,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 8;</code>
+     * <code>optional uint32 roll_shop_id = 15;</code>
      * @return the rollShopId
      */
     public int getRollShopId() {
@@ -191,7 +191,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 roll_shop_id = 8;</code>
+     * <code>optional uint32 roll_shop_id = 15;</code>
      * @param value the rollShopId to set
      * @return this
      */
@@ -202,7 +202,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 9;</code>
+     * <code>optional .ItemList reward = 13;</code>
      * @return whether the reward field is set
      */
     public boolean hasReward() {
@@ -210,7 +210,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 9;</code>
+     * <code>optional .ItemList reward = 13;</code>
      * @return this
      */
     public DoGachaInRollShopScRsp clearReward() {
@@ -220,7 +220,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 9;</code>
+     * <code>optional .ItemList reward = 13;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -234,7 +234,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 9;</code>
+     * <code>optional .ItemList reward = 13;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -248,7 +248,7 @@ public final class DoGachaInRollShopScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList reward = 9;</code>
+     * <code>optional .ItemList reward = 13;</code>
      * @param value the reward to set
      * @return this
      */
@@ -264,8 +264,8 @@ public final class DoGachaInRollShopScRspOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         aFMPDBBHCHM = other.aFMPDBBHCHM;
-        lEJJOJGNIHK = other.lEJJOJGNIHK;
         retcode = other.retcode;
+        lEJJOJGNIHK = other.lEJJOJGNIHK;
         rollShopId = other.rollShopId;
         reward.copyFrom(other.reward);
       }
@@ -281,12 +281,12 @@ public final class DoGachaInRollShopScRspOuterClass {
       if (other.hasAFMPDBBHCHM()) {
         setAFMPDBBHCHM(other.aFMPDBBHCHM);
       }
-      if (other.hasLEJJOJGNIHK()) {
-        setLEJJOJGNIHK(other.lEJJOJGNIHK);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
+      if (other.hasLEJJOJGNIHK()) {
+        setLEJJOJGNIHK(other.lEJJOJGNIHK);
+      }
       if (other.hasRollShopId()) {
         setRollShopId(other.rollShopId);
       }
@@ -304,8 +304,8 @@ public final class DoGachaInRollShopScRspOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       aFMPDBBHCHM = 0;
-      lEJJOJGNIHK = 0;
       retcode = 0;
+      lEJJOJGNIHK = 0;
       rollShopId = 0;
       reward.clear();
       return this;
@@ -333,8 +333,8 @@ public final class DoGachaInRollShopScRspOuterClass {
       DoGachaInRollShopScRsp other = (DoGachaInRollShopScRsp) o;
       return bitField0_ == other.bitField0_
         && (!hasAFMPDBBHCHM() || aFMPDBBHCHM == other.aFMPDBBHCHM)
-        && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK)
         && (!hasRetcode() || retcode == other.retcode)
+        && (!hasLEJJOJGNIHK() || lEJJOJGNIHK == other.lEJJOJGNIHK)
         && (!hasRollShopId() || rollShopId == other.rollShopId)
         && (!hasReward() || reward.equals(other.reward));
     }
@@ -346,19 +346,19 @@ public final class DoGachaInRollShopScRspOuterClass {
         output.writeUInt32NoTag(aFMPDBBHCHM);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(lEJJOJGNIHK);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(retcode);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(lEJJOJGNIHK);
+      }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(rollShopId);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 74);
+        output.writeRawByte((byte) 106);
         output.writeMessageNoTag(reward);
       }
     }
@@ -370,10 +370,10 @@ public final class DoGachaInRollShopScRspOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(aFMPDBBHCHM);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(lEJJOJGNIHK);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(rollShopId);
@@ -396,38 +396,38 @@ public final class DoGachaInRollShopScRspOuterClass {
             aFMPDBBHCHM = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 72) {
               break;
             }
           }
-          case 32: {
-            // lEJJOJGNIHK
-            lEJJOJGNIHK = input.readUInt32();
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
+          case 72: {
             // retcode
             retcode = input.readUInt32();
-            bitField0_ |= 0x00000004;
+            bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 96) {
               break;
             }
           }
-          case 64: {
+          case 96: {
+            // lEJJOJGNIHK
+            lEJJOJGNIHK = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
+            if (tag != 120) {
+              break;
+            }
+          }
+          case 120: {
             // rollShopId
             rollShopId = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 74) {
+            if (tag != 106) {
               break;
             }
           }
-          case 74: {
+          case 106: {
             // reward
             input.readMessage(reward);
             bitField0_ |= 0x00000010;
@@ -457,10 +457,10 @@ public final class DoGachaInRollShopScRspOuterClass {
         output.writeUInt32(FieldNames.aFMPDBBHCHM, aFMPDBBHCHM);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.lEJJOJGNIHK, lEJJOJGNIHK);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.rollShopId, rollShopId);
@@ -489,10 +489,10 @@ public final class DoGachaInRollShopScRspOuterClass {
             }
             break;
           }
-          case -1007707855: {
-            if (input.isAtField(FieldNames.lEJJOJGNIHK)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                lEJJOJGNIHK = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -500,10 +500,10 @@ public final class DoGachaInRollShopScRspOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case -1007707855: {
+            if (input.isAtField(FieldNames.lEJJOJGNIHK)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                lEJJOJGNIHK = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -589,10 +589,10 @@ public final class DoGachaInRollShopScRspOuterClass {
     static class FieldNames {
       static final FieldName aFMPDBBHCHM = FieldName.forField("AFMPDBBHCHM");
 
-      static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK");
-
       static final FieldName retcode = FieldName.forField("retcode");
 
+      static final FieldName lEJJOJGNIHK = FieldName.forField("LEJJOJGNIHK");
+
       static final FieldName rollShopId = FieldName.forField("rollShopId", "roll_shop_id");
 
       static final FieldName reward = FieldName.forField("reward");

src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java

@@ -20,19 +20,19 @@ public final class DoGachaScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 gacha_id = 3;</code>
+     * <code>optional uint32 gacha_num = 4;</code>
      */
-    private int gachaId;
+    private int gachaNum;
 
     /**
-     * <code>optional uint32 retcode = 4;</code>
+     * <code>optional uint32 retcode = 11;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_id = 12;</code>
      */
-    private int gachaNum;
+    private int gachaId;
 
     /**
      * <code>optional uint32 ceiling_num = 15;</code>
@@ -40,7 +40,7 @@ public final class DoGachaScRspOuterClass {
     private int ceilingNum;
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      */
     private final RepeatedMessage<GachaItemOuterClass.GachaItem> gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory());
 
@@ -55,44 +55,44 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_id = 3;</code>
-     * @return whether the gachaId field is set
+     * <code>optional uint32 gacha_num = 4;</code>
+     * @return whether the gachaNum field is set
      */
-    public boolean hasGachaId() {
+    public boolean hasGachaNum() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 gacha_id = 3;</code>
+     * <code>optional uint32 gacha_num = 4;</code>
      * @return this
      */
-    public DoGachaScRsp clearGachaId() {
+    public DoGachaScRsp clearGachaNum() {
       bitField0_ &= ~0x00000001;
-      gachaId = 0;
+      gachaNum = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 gacha_id = 3;</code>
-     * @return the gachaId
+     * <code>optional uint32 gacha_num = 4;</code>
+     * @return the gachaNum
      */
-    public int getGachaId() {
-      return gachaId;
+    public int getGachaNum() {
+      return gachaNum;
     }
 
     /**
-     * <code>optional uint32 gacha_id = 3;</code>
-     * @param value the gachaId to set
+     * <code>optional uint32 gacha_num = 4;</code>
+     * @param value the gachaNum to set
      * @return this
      */
-    public DoGachaScRsp setGachaId(final int value) {
+    public DoGachaScRsp setGachaNum(final int value) {
       bitField0_ |= 0x00000001;
-      gachaId = value;
+      gachaNum = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 retcode = 4;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -100,7 +100,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 4;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @return this
      */
     public DoGachaScRsp clearRetcode() {
@@ -110,7 +110,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 4;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -118,7 +118,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 4;</code>
+     * <code>optional uint32 retcode = 11;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -129,39 +129,39 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
-     * @return whether the gachaNum field is set
+     * <code>optional uint32 gacha_id = 12;</code>
+     * @return whether the gachaId field is set
      */
-    public boolean hasGachaNum() {
+    public boolean hasGachaId() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
+     * <code>optional uint32 gacha_id = 12;</code>
      * @return this
      */
-    public DoGachaScRsp clearGachaNum() {
+    public DoGachaScRsp clearGachaId() {
       bitField0_ &= ~0x00000004;
-      gachaNum = 0;
+      gachaId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
-     * @return the gachaNum
+     * <code>optional uint32 gacha_id = 12;</code>
+     * @return the gachaId
      */
-    public int getGachaNum() {
-      return gachaNum;
+    public int getGachaId() {
+      return gachaId;
     }
 
     /**
-     * <code>optional uint32 gacha_num = 12;</code>
-     * @param value the gachaNum to set
+     * <code>optional uint32 gacha_id = 12;</code>
+     * @param value the gachaId to set
      * @return this
      */
-    public DoGachaScRsp setGachaNum(final int value) {
+    public DoGachaScRsp setGachaId(final int value) {
       bitField0_ |= 0x00000004;
-      gachaNum = value;
+      gachaId = value;
       return this;
     }
 
@@ -203,7 +203,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      * @return whether the gachaItemList field is set
      */
     public boolean hasGachaItemList() {
@@ -211,7 +211,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      * @return this
      */
     public DoGachaScRsp clearGachaItemList() {
@@ -221,7 +221,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -235,7 +235,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -249,7 +249,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      * @param value the gachaItemList to add
      * @return this
      */
@@ -260,7 +260,7 @@ public final class DoGachaScRspOuterClass {
     }
 
     /**
-     * <code>repeated .GachaItem gacha_item_list = 5;</code>
+     * <code>repeated .GachaItem gacha_item_list = 9;</code>
      * @param values the gachaItemList to add
      * @return this
      */
@@ -275,9 +275,9 @@ public final class DoGachaScRspOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        gachaId = other.gachaId;
-        retcode = other.retcode;
         gachaNum = other.gachaNum;
+        retcode = other.retcode;
+        gachaId = other.gachaId;
         ceilingNum = other.ceilingNum;
         gachaItemList.copyFrom(other.gachaItemList);
       }
@@ -290,14 +290,14 @@ public final class DoGachaScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasGachaId()) {
-        setGachaId(other.gachaId);
+      if (other.hasGachaNum()) {
+        setGachaNum(other.gachaNum);
       }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
-      if (other.hasGachaNum()) {
-        setGachaNum(other.gachaNum);
+      if (other.hasGachaId()) {
+        setGachaId(other.gachaId);
       }
       if (other.hasCeilingNum()) {
         setCeilingNum(other.ceilingNum);
@@ -315,9 +315,9 @@ public final class DoGachaScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      gachaId = 0;
-      retcode = 0;
       gachaNum = 0;
+      retcode = 0;
+      gachaId = 0;
       ceilingNum = 0;
       gachaItemList.clear();
       return this;
@@ -344,9 +344,9 @@ public final class DoGachaScRspOuterClass {
       }
       DoGachaScRsp other = (DoGachaScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasGachaId() || gachaId == other.gachaId)
-        && (!hasRetcode() || retcode == other.retcode)
         && (!hasGachaNum() || gachaNum == other.gachaNum)
+        && (!hasRetcode() || retcode == other.retcode)
+        && (!hasGachaId() || gachaId == other.gachaId)
         && (!hasCeilingNum() || ceilingNum == other.ceilingNum)
         && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList));
     }
@@ -354,16 +354,16 @@ public final class DoGachaScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(gachaId);
+        output.writeRawByte((byte) 32);
+        output.writeUInt32NoTag(gachaNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(gachaNum);
+        output.writeUInt32NoTag(gachaId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeRawByte((byte) 120);
@@ -371,7 +371,7 @@ public final class DoGachaScRspOuterClass {
       }
       if ((bitField0_ & 0x00000010) != 0) {
         for (int i = 0; i < gachaItemList.length(); i++) {
-          output.writeRawByte((byte) 42);
+          output.writeRawByte((byte) 74);
           output.writeMessageNoTag(gachaItemList.get(i));
         }
       }
@@ -381,13 +381,13 @@ public final class DoGachaScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum);
@@ -405,16 +405,16 @@ public final class DoGachaScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
-            // gachaId
-            gachaId = input.readUInt32();
+          case 32: {
+            // gachaNum
+            gachaNum = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 32) {
+            if (tag != 88) {
               break;
             }
           }
-          case 32: {
+          case 88: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000002;
@@ -424,8 +424,8 @@ public final class DoGachaScRspOuterClass {
             }
           }
           case 96: {
-            // gachaNum
-            gachaNum = input.readUInt32();
+            // gachaId
+            gachaId = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 120) {
@@ -437,11 +437,11 @@ public final class DoGachaScRspOuterClass {
             ceilingNum = input.readUInt32();
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 74) {
               break;
             }
           }
-          case 42: {
+          case 74: {
             // gachaItemList
             tag = input.readRepeatedMessage(gachaItemList, tag);
             bitField0_ |= 0x00000010;
@@ -467,13 +467,13 @@ public final class DoGachaScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.gachaId, gachaId);
+        output.writeUInt32(FieldNames.gachaNum, gachaNum);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeUInt32(FieldNames.gachaNum, gachaNum);
+        output.writeUInt32(FieldNames.gachaId, gachaId);
       }
       if ((bitField0_ & 0x00000008) != 0) {
         output.writeUInt32(FieldNames.ceilingNum, ceilingNum);
@@ -491,11 +491,11 @@ public final class DoGachaScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -204751299:
-          case -2052301576: {
-            if (input.isAtField(FieldNames.gachaId)) {
+          case -2052317532:
+          case 803166025: {
+            if (input.isAtField(FieldNames.gachaNum)) {
               if (!input.trySkipNullValue()) {
-                gachaId = input.readUInt32();
+                gachaNum = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -514,11 +514,11 @@ public final class DoGachaScRspOuterClass {
             }
             break;
           }
-          case -2052317532:
-          case 803166025: {
-            if (input.isAtField(FieldNames.gachaNum)) {
+          case -204751299:
+          case -2052301576: {
+            if (input.isAtField(FieldNames.gachaId)) {
               if (!input.trySkipNullValue()) {
-                gachaNum = input.readUInt32();
+                gachaId = input.readUInt32();
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -602,11 +602,11 @@ public final class DoGachaScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
+      static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
 
       static final FieldName retcode = FieldName.forField("retcode");
 
-      static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num");
+      static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
 
       static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num");
 

src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java

@@ -19,15 +19,20 @@ public final class DressAvatarCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 equipment_unique_id = 6;</code>
+     * <code>optional uint32 equipment_unique_id = 3;</code>
      */
     private int equipmentUniqueId;
 
     /**
-     * <code>optional uint32 base_avatar_id = 9;</code>
+     * <code>optional uint32 base_avatar_id = 4;</code>
      */
     private int baseAvatarId;
 
+    /**
+     * <code>optional uint32 equip_avatar_id = 10;</code>
+     */
+    private int equipAvatarId;
+
     private DressAvatarCsReq() {
     }
 
@@ -39,7 +44,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 6;</code>
+     * <code>optional uint32 equipment_unique_id = 3;</code>
      * @return whether the equipmentUniqueId field is set
      */
     public boolean hasEquipmentUniqueId() {
@@ -47,7 +52,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 6;</code>
+     * <code>optional uint32 equipment_unique_id = 3;</code>
      * @return this
      */
     public DressAvatarCsReq clearEquipmentUniqueId() {
@@ -57,7 +62,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 6;</code>
+     * <code>optional uint32 equipment_unique_id = 3;</code>
      * @return the equipmentUniqueId
      */
     public int getEquipmentUniqueId() {
@@ -65,7 +70,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 6;</code>
+     * <code>optional uint32 equipment_unique_id = 3;</code>
      * @param value the equipmentUniqueId to set
      * @return this
      */
@@ -76,7 +81,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 9;</code>
+     * <code>optional uint32 base_avatar_id = 4;</code>
      * @return whether the baseAvatarId field is set
      */
     public boolean hasBaseAvatarId() {
@@ -84,7 +89,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 9;</code>
+     * <code>optional uint32 base_avatar_id = 4;</code>
      * @return this
      */
     public DressAvatarCsReq clearBaseAvatarId() {
@@ -94,7 +99,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 9;</code>
+     * <code>optional uint32 base_avatar_id = 4;</code>
      * @return the baseAvatarId
      */
     public int getBaseAvatarId() {
@@ -102,7 +107,7 @@ public final class DressAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 9;</code>
+     * <code>optional uint32 base_avatar_id = 4;</code>
      * @param value the baseAvatarId to set
      * @return this
      */
@@ -112,6 +117,43 @@ public final class DressAvatarCsReqOuterClass {
       return this;
     }
 
+    /**
+     * <code>optional uint32 equip_avatar_id = 10;</code>
+     * @return whether the equipAvatarId field is set
+     */
+    public boolean hasEquipAvatarId() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional uint32 equip_avatar_id = 10;</code>
+     * @return this
+     */
+    public DressAvatarCsReq clearEquipAvatarId() {
+      bitField0_ &= ~0x00000004;
+      equipAvatarId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 equip_avatar_id = 10;</code>
+     * @return the equipAvatarId
+     */
+    public int getEquipAvatarId() {
+      return equipAvatarId;
+    }
+
+    /**
+     * <code>optional uint32 equip_avatar_id = 10;</code>
+     * @param value the equipAvatarId to set
+     * @return this
+     */
+    public DressAvatarCsReq setEquipAvatarId(final int value) {
+      bitField0_ |= 0x00000004;
+      equipAvatarId = value;
+      return this;
+    }
+
     @Override
     public DressAvatarCsReq copyFrom(final DressAvatarCsReq other) {
       cachedSize = other.cachedSize;
@@ -119,6 +161,7 @@ public final class DressAvatarCsReqOuterClass {
         bitField0_ = other.bitField0_;
         equipmentUniqueId = other.equipmentUniqueId;
         baseAvatarId = other.baseAvatarId;
+        equipAvatarId = other.equipAvatarId;
       }
       return this;
     }
@@ -135,6 +178,9 @@ public final class DressAvatarCsReqOuterClass {
       if (other.hasBaseAvatarId()) {
         setBaseAvatarId(other.baseAvatarId);
       }
+      if (other.hasEquipAvatarId()) {
+        setEquipAvatarId(other.equipAvatarId);
+      }
       return this;
     }
 
@@ -147,6 +193,7 @@ public final class DressAvatarCsReqOuterClass {
       bitField0_ = 0;
       equipmentUniqueId = 0;
       baseAvatarId = 0;
+      equipAvatarId = 0;
       return this;
     }
 
@@ -171,19 +218,24 @@ public final class DressAvatarCsReqOuterClass {
       DressAvatarCsReq other = (DressAvatarCsReq) o;
       return bitField0_ == other.bitField0_
         && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId)
-        && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId);
+        && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+        && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 24);
         output.writeUInt32NoTag(equipmentUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(baseAvatarId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(equipAvatarId);
+      }
     }
 
     @Override
@@ -195,6 +247,9 @@ public final class DressAvatarCsReqOuterClass {
       if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
+      }
       return size;
     }
 
@@ -205,20 +260,29 @@ public final class DressAvatarCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 24: {
             // equipmentUniqueId
             equipmentUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 72) {
+            if (tag != 32) {
               break;
             }
           }
-          case 72: {
+          case 32: {
             // baseAvatarId
             baseAvatarId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
+            if (tag != 80) {
+              break;
+            }
+          }
+          case 80: {
+            // equipAvatarId
+            equipAvatarId = input.readUInt32();
+            bitField0_ |= 0x00000004;
+            tag = input.readTag();
             if (tag != 0) {
               break;
             }
@@ -246,6 +310,9 @@ public final class DressAvatarCsReqOuterClass {
       if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
+      }
       output.endObject();
     }
 
@@ -280,6 +347,18 @@ public final class DressAvatarCsReqOuterClass {
             }
             break;
           }
+          case 169047204:
+          case 33057906: {
+            if (input.isAtField(FieldNames.equipAvatarId)) {
+              if (!input.trySkipNullValue()) {
+                equipAvatarId = input.readUInt32();
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           default: {
             input.skipUnknownField();
             break;
@@ -336,6 +415,8 @@ public final class DressAvatarCsReqOuterClass {
       static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id");
 
       static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
+
+      static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java

@@ -20,12 +20,17 @@ public final class DressRelicAvatarCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 base_avatar_id = 12;</code>
+     * <code>optional uint32 base_avatar_id = 6;</code>
      */
     private int baseAvatarId;
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
+     * <code>optional uint32 equip_avatar_id = 13;</code>
+     */
+    private int equipAvatarId;
+
+    /**
+     * <code>repeated .RelicParam param_list = 12;</code>
      */
     private final RepeatedMessage<RelicParamOuterClass.RelicParam> paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory());
 
@@ -40,7 +45,7 @@ public final class DressRelicAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 12;</code>
+     * <code>optional uint32 base_avatar_id = 6;</code>
      * @return whether the baseAvatarId field is set
      */
     public boolean hasBaseAvatarId() {
@@ -48,7 +53,7 @@ public final class DressRelicAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 12;</code>
+     * <code>optional uint32 base_avatar_id = 6;</code>
      * @return this
      */
     public DressRelicAvatarCsReq clearBaseAvatarId() {
@@ -58,7 +63,7 @@ public final class DressRelicAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 12;</code>
+     * <code>optional uint32 base_avatar_id = 6;</code>
      * @return the baseAvatarId
      */
     public int getBaseAvatarId() {
@@ -66,7 +71,7 @@ public final class DressRelicAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 base_avatar_id = 12;</code>
+     * <code>optional uint32 base_avatar_id = 6;</code>
      * @param value the baseAvatarId to set
      * @return this
      */
@@ -77,25 +82,62 @@ public final class DressRelicAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
-     * @return whether the paramList field is set
+     * <code>optional uint32 equip_avatar_id = 13;</code>
+     * @return whether the equipAvatarId field is set
      */
-    public boolean hasParamList() {
+    public boolean hasEquipAvatarId() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
+     * <code>optional uint32 equip_avatar_id = 13;</code>
+     * @return this
+     */
+    public DressRelicAvatarCsReq clearEquipAvatarId() {
+      bitField0_ &= ~0x00000002;
+      equipAvatarId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 equip_avatar_id = 13;</code>
+     * @return the equipAvatarId
+     */
+    public int getEquipAvatarId() {
+      return equipAvatarId;
+    }
+
+    /**
+     * <code>optional uint32 equip_avatar_id = 13;</code>
+     * @param value the equipAvatarId to set
+     * @return this
+     */
+    public DressRelicAvatarCsReq setEquipAvatarId(final int value) {
+      bitField0_ |= 0x00000002;
+      equipAvatarId = value;
+      return this;
+    }
+
+    /**
+     * <code>repeated .RelicParam param_list = 12;</code>
+     * @return whether the paramList field is set
+     */
+    public boolean hasParamList() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>repeated .RelicParam param_list = 12;</code>
      * @return this
      */
     public DressRelicAvatarCsReq clearParamList() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000004;
       paramList.clear();
       return this;
     }
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
+     * <code>repeated .RelicParam param_list = 12;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +151,7 @@ public final class DressRelicAvatarCsReqOuterClass {
     }
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
+     * <code>repeated .RelicParam param_list = 12;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -118,28 +160,28 @@ public final class DressRelicAvatarCsReqOuterClass {
      * @return internal storage object for modifications
      */
     public RepeatedMessage<RelicParamOuterClass.RelicParam> getMutableParamList() {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000004;
       return paramList;
     }
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
+     * <code>repeated .RelicParam param_list = 12;</code>
      * @param value the paramList to add
      * @return this
      */
     public DressRelicAvatarCsReq addParamList(final RelicParamOuterClass.RelicParam value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000004;
       paramList.add(value);
       return this;
     }
 
     /**
-     * <code>repeated .RelicParam param_list = 11;</code>
+     * <code>repeated .RelicParam param_list = 12;</code>
      * @param values the paramList to add
      * @return this
      */
     public DressRelicAvatarCsReq addAllParamList(final RelicParamOuterClass.RelicParam... values) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000004;
       paramList.addAll(values);
       return this;
     }
@@ -150,6 +192,7 @@ public final class DressRelicAvatarCsReqOuterClass {
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         baseAvatarId = other.baseAvatarId;
+        equipAvatarId = other.equipAvatarId;
         paramList.copyFrom(other.paramList);
       }
       return this;
@@ -164,6 +207,9 @@ public final class DressRelicAvatarCsReqOuterClass {
       if (other.hasBaseAvatarId()) {
         setBaseAvatarId(other.baseAvatarId);
       }
+      if (other.hasEquipAvatarId()) {
+        setEquipAvatarId(other.equipAvatarId);
+      }
       if (other.hasParamList()) {
         getMutableParamList().addAll(other.paramList);
       }
@@ -178,6 +224,7 @@ public final class DressRelicAvatarCsReqOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       baseAvatarId = 0;
+      equipAvatarId = 0;
       paramList.clear();
       return this;
     }
@@ -204,18 +251,23 @@ public final class DressRelicAvatarCsReqOuterClass {
       DressRelicAvatarCsReq other = (DressRelicAvatarCsReq) o;
       return bitField0_ == other.bitField0_
         && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId)
+        && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId)
         && (!hasParamList() || paramList.equals(other.paramList));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(equipAvatarId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
         for (int i = 0; i < paramList.length(); i++) {
-          output.writeRawByte((byte) 90);
+          output.writeRawByte((byte) 98);
           output.writeMessageNoTag(paramList.get(i));
         }
       }
@@ -228,6 +280,9 @@ public final class DressRelicAvatarCsReqOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
         size += (1 * paramList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(paramList);
       }
       return size;
@@ -240,19 +295,28 @@ public final class DressRelicAvatarCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 96: {
+          case 48: {
             // baseAvatarId
             baseAvatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 104) {
               break;
             }
           }
-          case 90: {
+          case 104: {
+            // equipAvatarId
+            equipAvatarId = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 98) {
+              break;
+            }
+          }
+          case 98: {
             // paramList
             tag = input.readRepeatedMessage(paramList, tag);
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000004;
             if (tag != 0) {
               break;
             }
@@ -278,6 +342,9 @@ public final class DressRelicAvatarCsReqOuterClass {
         output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId);
+      }
+      if ((bitField0_ & 0x00000004) != 0) {
         output.writeRepeatedMessage(FieldNames.paramList, paramList);
       }
       output.endObject();
@@ -302,12 +369,24 @@ public final class DressRelicAvatarCsReqOuterClass {
             }
             break;
           }
+          case 169047204:
+          case 33057906: {
+            if (input.isAtField(FieldNames.equipAvatarId)) {
+              if (!input.trySkipNullValue()) {
+                equipAvatarId = input.readUInt32();
+                bitField0_ |= 0x00000002;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
           case 1953705675:
           case 452960528: {
             if (input.isAtField(FieldNames.paramList)) {
               if (!input.trySkipNullValue()) {
                 input.readRepeatedMessage(paramList);
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
               }
             } else {
               input.skipUnknownField();
@@ -369,6 +448,8 @@ public final class DressRelicAvatarCsReqOuterClass {
     static class FieldNames {
       static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id");
 
+      static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id");
+
       static final FieldName paramList = FieldName.forField("paramList", "param_list");
     }
   }

src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class EnableRogueTalentCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 talent_id = 7;</code>
+     * <code>optional uint32 talent_id = 1;</code>
      */
     private int talentId;
 
@@ -34,7 +34,7 @@ public final class EnableRogueTalentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 talent_id = 7;</code>
+     * <code>optional uint32 talent_id = 1;</code>
      * @return whether the talentId field is set
      */
     public boolean hasTalentId() {
@@ -42,7 +42,7 @@ public final class EnableRogueTalentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 talent_id = 7;</code>
+     * <code>optional uint32 talent_id = 1;</code>
      * @return this
      */
     public EnableRogueTalentCsReq clearTalentId() {
@@ -52,7 +52,7 @@ public final class EnableRogueTalentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 talent_id = 7;</code>
+     * <code>optional uint32 talent_id = 1;</code>
      * @return the talentId
      */
     public int getTalentId() {
@@ -60,7 +60,7 @@ public final class EnableRogueTalentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 talent_id = 7;</code>
+     * <code>optional uint32 talent_id = 1;</code>
      * @param value the talentId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class EnableRogueTalentCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 8);
         output.writeUInt32NoTag(talentId);
       }
     }
@@ -150,7 +150,7 @@ public final class EnableRogueTalentCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 56: {
+          case 8: {
             // talentId
             talentId = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java

@@ -19,12 +19,12 @@ public final class EnableRogueTalentScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 4;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional .RogueTalentInfo talent_info = 11;</code>
+     * <code>optional .RogueTalentInfo talent_info = 1;</code>
      */
     private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance();
 
@@ -39,7 +39,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @return this
      */
     public EnableRogueTalentScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -65,7 +65,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 4;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueTalentInfo talent_info = 11;</code>
+     * <code>optional .RogueTalentInfo talent_info = 1;</code>
      * @return whether the talentInfo field is set
      */
     public boolean hasTalentInfo() {
@@ -84,7 +84,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueTalentInfo talent_info = 11;</code>
+     * <code>optional .RogueTalentInfo talent_info = 1;</code>
      * @return this
      */
     public EnableRogueTalentScRsp clearTalentInfo() {
@@ -94,7 +94,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueTalentInfo talent_info = 11;</code>
+     * <code>optional .RogueTalentInfo talent_info = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueTalentInfo talent_info = 11;</code>
+     * <code>optional .RogueTalentInfo talent_info = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class EnableRogueTalentScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueTalentInfo talent_info = 11;</code>
+     * <code>optional .RogueTalentInfo talent_info = 1;</code>
      * @param value the talentInfo to set
      * @return this
      */
@@ -199,11 +199,11 @@ public final class EnableRogueTalentScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 90);
+        output.writeRawByte((byte) 10);
         output.writeMessageNoTag(talentInfo);
       }
     }
@@ -227,16 +227,16 @@ public final class EnableRogueTalentScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 32: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 10) {
               break;
             }
           }
-          case 90: {
+          case 10: {
             // talentInfo
             input.readMessage(talentInfo);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 buff_id = 11;</code>
+     * <code>optional uint32 buff_id = 12;</code>
      */
     private int buffId;
 
@@ -34,7 +34,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 11;</code>
+     * <code>optional uint32 buff_id = 12;</code>
      * @return whether the buffId field is set
      */
     public boolean hasBuffId() {
@@ -42,7 +42,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 11;</code>
+     * <code>optional uint32 buff_id = 12;</code>
      * @return this
      */
     public EnhanceRogueBuffCsReq clearBuffId() {
@@ -52,7 +52,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 11;</code>
+     * <code>optional uint32 buff_id = 12;</code>
      * @return the buffId
      */
     public int getBuffId() {
@@ -60,7 +60,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 buff_id = 11;</code>
+     * <code>optional uint32 buff_id = 12;</code>
      * @param value the buffId to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(buffId);
       }
     }
@@ -150,7 +150,7 @@ public final class EnhanceRogueBuffCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 88: {
+          case 96: {
             // buffId
             buffId = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java

@@ -19,17 +19,17 @@ public final class EnhanceRogueBuffScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 2;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional bool is_success = 7;</code>
+     * <code>optional bool is_success = 13;</code>
      */
     private boolean isSuccess;
 
     /**
-     * <code>optional .RogueBuff rogue_buff = 3;</code>
+     * <code>optional .RogueBuff rogue_buff = 15;</code>
      */
     private final RogueBuffOuterClass.RogueBuff rogueBuff = RogueBuffOuterClass.RogueBuff.newInstance();
 
@@ -44,7 +44,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @return this
      */
     public EnhanceRogueBuffScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -70,7 +70,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 15;</code>
+     * <code>optional uint32 retcode = 2;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional bool is_success = 7;</code>
+     * <code>optional bool is_success = 13;</code>
      * @return whether the isSuccess field is set
      */
     public boolean hasIsSuccess() {
@@ -89,7 +89,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional bool is_success = 7;</code>
+     * <code>optional bool is_success = 13;</code>
      * @return this
      */
     public EnhanceRogueBuffScRsp clearIsSuccess() {
@@ -99,7 +99,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional bool is_success = 7;</code>
+     * <code>optional bool is_success = 13;</code>
      * @return the isSuccess
      */
     public boolean getIsSuccess() {
@@ -107,7 +107,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional bool is_success = 7;</code>
+     * <code>optional bool is_success = 13;</code>
      * @param value the isSuccess to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueBuff rogue_buff = 3;</code>
+     * <code>optional .RogueBuff rogue_buff = 15;</code>
      * @return whether the rogueBuff field is set
      */
     public boolean hasRogueBuff() {
@@ -126,7 +126,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueBuff rogue_buff = 3;</code>
+     * <code>optional .RogueBuff rogue_buff = 15;</code>
      * @return this
      */
     public EnhanceRogueBuffScRsp clearRogueBuff() {
@@ -136,7 +136,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueBuff rogue_buff = 3;</code>
+     * <code>optional .RogueBuff rogue_buff = 15;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueBuff rogue_buff = 3;</code>
+     * <code>optional .RogueBuff rogue_buff = 15;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class EnhanceRogueBuffScRspOuterClass {
     }
 
     /**
-     * <code>optional .RogueBuff rogue_buff = 3;</code>
+     * <code>optional .RogueBuff rogue_buff = 15;</code>
      * @param value the rogueBuff to set
      * @return this
      */
@@ -246,15 +246,15 @@ public final class EnhanceRogueBuffScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 16);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
+        output.writeRawByte((byte) 104);
         output.writeBoolNoTag(isSuccess);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 26);
+        output.writeRawByte((byte) 122);
         output.writeMessageNoTag(rogueBuff);
       }
     }
@@ -281,25 +281,25 @@ public final class EnhanceRogueBuffScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 16: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 56) {
+            if (tag != 104) {
               break;
             }
           }
-          case 56: {
+          case 104: {
             // isSuccess
             isSuccess = input.readBool();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 26) {
+            if (tag != 122) {
               break;
             }
           }
-          case 26: {
+          case 122: {
             // rogueBuff
             input.readMessage(rogueBuff);
             bitField0_ |= 0x00000004;

src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .MotionInfo motion = 4;</code>
+     * <code>optional .MotionInfo motion = 7;</code>
      */
     private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
 
@@ -34,7 +34,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 4;</code>
+     * <code>optional .MotionInfo motion = 7;</code>
      * @return whether the motion field is set
      */
     public boolean hasMotion() {
@@ -42,7 +42,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 4;</code>
+     * <code>optional .MotionInfo motion = 7;</code>
      * @return this
      */
     public EnterMapRotationRegionCsReq clearMotion() {
@@ -52,7 +52,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 4;</code>
+     * <code>optional .MotionInfo motion = 7;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -66,7 +66,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 4;</code>
+     * <code>optional .MotionInfo motion = 7;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -80,7 +80,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 4;</code>
+     * <code>optional .MotionInfo motion = 7;</code>
      * @param value the motion to set
      * @return this
      */
@@ -150,7 +150,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 34);
+        output.writeRawByte((byte) 58);
         output.writeMessageNoTag(motion);
       }
     }
@@ -171,7 +171,7 @@ public final class EnterMapRotationRegionCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 34: {
+          case 58: {
             // motion
             input.readMessage(motion);
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java

@@ -19,12 +19,12 @@ public final class EnterMapRotationRegionScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 2;</code>
+     * <code>optional uint32 retcode = 5;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 client_pos_version = 15;</code>
+     * <code>optional uint32 client_pos_version = 14;</code>
      */
     private int clientPosVersion;
 
@@ -44,7 +44,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 2;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -52,7 +52,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 2;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return this
      */
     public EnterMapRotationRegionScRsp clearRetcode() {
@@ -62,7 +62,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 2;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -70,7 +70,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 2;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 client_pos_version = 15;</code>
+     * <code>optional uint32 client_pos_version = 14;</code>
      * @return whether the clientPosVersion field is set
      */
     public boolean hasClientPosVersion() {
@@ -89,7 +89,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 client_pos_version = 15;</code>
+     * <code>optional uint32 client_pos_version = 14;</code>
      * @return this
      */
     public EnterMapRotationRegionScRsp clearClientPosVersion() {
@@ -99,7 +99,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 client_pos_version = 15;</code>
+     * <code>optional uint32 client_pos_version = 14;</code>
      * @return the clientPosVersion
      */
     public int getClientPosVersion() {
@@ -107,7 +107,7 @@ public final class EnterMapRotationRegionScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 client_pos_version = 15;</code>
+     * <code>optional uint32 client_pos_version = 14;</code>
      * @param value the clientPosVersion to set
      * @return this
      */
@@ -246,11 +246,11 @@ public final class EnterMapRotationRegionScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(clientPosVersion);
       }
       if ((bitField0_ & 0x00000004) != 0) {
@@ -281,16 +281,16 @@ public final class EnterMapRotationRegionScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 16: {
+          case 40: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 112) {
               break;
             }
           }
-          case 120: {
+          case 112: {
             // clientPosVersion
             clientPosVersion = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java

@@ -19,15 +19,15 @@ public final class EnterRogueMapRoomCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 room_id = 4;</code>
-     */
-    private int roomId;
-
-    /**
-     * <code>optional uint32 site_id = 12;</code>
+     * <code>optional uint32 site_id = 7;</code>
      */
     private int siteId;
 
+    /**
+     * <code>optional uint32 room_id = 10;</code>
+     */
+    private int roomId;
+
     private EnterRogueMapRoomCsReq() {
     }
 
@@ -39,62 +39,25 @@ public final class EnterRogueMapRoomCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 room_id = 4;</code>
-     * @return whether the roomId field is set
+     * <code>optional uint32 site_id = 7;</code>
+     * @return whether the siteId field is set
      */
-    public boolean hasRoomId() {
+    public boolean hasSiteId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 room_id = 4;</code>
-     * @return this
-     */
-    public EnterRogueMapRoomCsReq clearRoomId() {
-      bitField0_ &= ~0x00000001;
-      roomId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 room_id = 4;</code>
-     * @return the roomId
-     */
-    public int getRoomId() {
-      return roomId;
-    }
-
-    /**
-     * <code>optional uint32 room_id = 4;</code>
-     * @param value the roomId to set
-     * @return this
-     */
-    public EnterRogueMapRoomCsReq setRoomId(final int value) {
-      bitField0_ |= 0x00000001;
-      roomId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 site_id = 12;</code>
-     * @return whether the siteId field is set
-     */
-    public boolean hasSiteId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 site_id = 12;</code>
+     * <code>optional uint32 site_id = 7;</code>
      * @return this
      */
     public EnterRogueMapRoomCsReq clearSiteId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       siteId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 site_id = 12;</code>
+     * <code>optional uint32 site_id = 7;</code>
      * @return the siteId
      */
     public int getSiteId() {
@@ -102,23 +65,60 @@ public final class EnterRogueMapRoomCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 site_id = 12;</code>
+     * <code>optional uint32 site_id = 7;</code>
      * @param value the siteId to set
      * @return this
      */
     public EnterRogueMapRoomCsReq setSiteId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       siteId = value;
       return this;
     }
 
+    /**
+     * <code>optional uint32 room_id = 10;</code>
+     * @return whether the roomId field is set
+     */
+    public boolean hasRoomId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 room_id = 10;</code>
+     * @return this
+     */
+    public EnterRogueMapRoomCsReq clearRoomId() {
+      bitField0_ &= ~0x00000002;
+      roomId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 room_id = 10;</code>
+     * @return the roomId
+     */
+    public int getRoomId() {
+      return roomId;
+    }
+
+    /**
+     * <code>optional uint32 room_id = 10;</code>
+     * @param value the roomId to set
+     * @return this
+     */
+    public EnterRogueMapRoomCsReq setRoomId(final int value) {
+      bitField0_ |= 0x00000002;
+      roomId = value;
+      return this;
+    }
+
     @Override
     public EnterRogueMapRoomCsReq copyFrom(final EnterRogueMapRoomCsReq other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        roomId = other.roomId;
         siteId = other.siteId;
+        roomId = other.roomId;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class EnterRogueMapRoomCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRoomId()) {
-        setRoomId(other.roomId);
-      }
       if (other.hasSiteId()) {
         setSiteId(other.siteId);
       }
+      if (other.hasRoomId()) {
+        setRoomId(other.roomId);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class EnterRogueMapRoomCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      roomId = 0;
       siteId = 0;
+      roomId = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class EnterRogueMapRoomCsReqOuterClass {
       }
       EnterRogueMapRoomCsReq other = (EnterRogueMapRoomCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasRoomId() || roomId == other.roomId)
-        && (!hasSiteId() || siteId == other.siteId);
+        && (!hasSiteId() || siteId == other.siteId)
+        && (!hasRoomId() || roomId == other.roomId);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 32);
-        output.writeUInt32NoTag(roomId);
+        output.writeRawByte((byte) 56);
+        output.writeUInt32NoTag(siteId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(siteId);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(roomId);
       }
     }
 
@@ -190,10 +190,10 @@ public final class EnterRogueMapRoomCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class EnterRogueMapRoomCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 32: {
-            // roomId
-            roomId = input.readUInt32();
+          case 56: {
+            // siteId
+            siteId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 80) {
               break;
             }
           }
-          case 96: {
-            // siteId
-            siteId = input.readUInt32();
+          case 80: {
+            // roomId
+            roomId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class EnterRogueMapRoomCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.roomId, roomId);
+        output.writeUInt32(FieldNames.siteId, siteId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.siteId, siteId);
+        output.writeUInt32(FieldNames.roomId, roomId);
       }
       output.endObject();
     }
@@ -256,11 +256,11 @@ public final class EnterRogueMapRoomCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -925319338:
-          case 1379892991: {
-            if (input.isAtField(FieldNames.roomId)) {
+          case -902090046:
+          case 2100001043: {
+            if (input.isAtField(FieldNames.siteId)) {
               if (!input.trySkipNullValue()) {
-                roomId = input.readUInt32();
+                siteId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -268,11 +268,11 @@ public final class EnterRogueMapRoomCsReqOuterClass {
             }
             break;
           }
-          case -902090046:
-          case 2100001043: {
-            if (input.isAtField(FieldNames.siteId)) {
+          case -925319338:
+          case 1379892991: {
+            if (input.isAtField(FieldNames.roomId)) {
               if (!input.trySkipNullValue()) {
-                siteId = input.readUInt32();
+                roomId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -333,9 +333,9 @@ public final class EnterRogueMapRoomCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName roomId = FieldName.forField("roomId", "room_id");
-
       static final FieldName siteId = FieldName.forField("siteId", "site_id");
+
+      static final FieldName roomId = FieldName.forField("roomId", "room_id");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java

@@ -19,25 +19,25 @@ public final class EnterRogueMapRoomScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 cur_site_id = 1;</code>
-     */
-    private int curSiteId;
-
-    /**
-     * <code>optional uint32 retcode = 6;</code>
+     * <code>optional uint32 retcode = 10;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional .LineupInfo lineup = 5;</code>
+     * <code>optional uint32 cur_site_id = 15;</code>
      */
-    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+    private int curSiteId;
 
     /**
-     * <code>optional .SceneInfo scene = 10;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      */
     private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
 
+    /**
+     * <code>optional .LineupInfo lineup = 6;</code>
+     */
+    private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
+
     private EnterRogueMapRoomScRsp() {
     }
 
@@ -49,62 +49,25 @@ public final class EnterRogueMapRoomScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 cur_site_id = 1;</code>
-     * @return whether the curSiteId field is set
+     * <code>optional uint32 retcode = 10;</code>
+     * @return whether the retcode field is set
      */
-    public boolean hasCurSiteId() {
+    public boolean hasRetcode() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 cur_site_id = 1;</code>
-     * @return this
-     */
-    public EnterRogueMapRoomScRsp clearCurSiteId() {
-      bitField0_ &= ~0x00000001;
-      curSiteId = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 cur_site_id = 1;</code>
-     * @return the curSiteId
-     */
-    public int getCurSiteId() {
-      return curSiteId;
-    }
-
-    /**
-     * <code>optional uint32 cur_site_id = 1;</code>
-     * @param value the curSiteId to set
-     * @return this
-     */
-    public EnterRogueMapRoomScRsp setCurSiteId(final int value) {
-      bitField0_ |= 0x00000001;
-      curSiteId = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 6;</code>
-     * @return whether the retcode field is set
-     */
-    public boolean hasRetcode() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 6;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return this
      */
     public EnterRogueMapRoomScRsp clearRetcode() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       retcode = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 retcode = 6;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -112,93 +75,73 @@ public final class EnterRogueMapRoomScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 6;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @param value the retcode to set
      * @return this
      */
     public EnterRogueMapRoomScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       retcode = value;
       return this;
     }
 
     /**
-     * <code>optional .LineupInfo lineup = 5;</code>
-     * @return whether the lineup field is set
+     * <code>optional uint32 cur_site_id = 15;</code>
+     * @return whether the curSiteId field is set
      */
-    public boolean hasLineup() {
+    public boolean hasCurSiteId() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 cur_site_id = 15;</code>
+     * @return this
+     */
+    public EnterRogueMapRoomScRsp clearCurSiteId() {
+      bitField0_ &= ~0x00000002;
+      curSiteId = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 cur_site_id = 15;</code>
+     * @return the curSiteId
+     */
+    public int getCurSiteId() {
+      return curSiteId;
+    }
+
+    /**
+     * <code>optional uint32 cur_site_id = 15;</code>
+     * @param value the curSiteId to set
+     * @return this
+     */
+    public EnterRogueMapRoomScRsp setCurSiteId(final int value) {
+      bitField0_ |= 0x00000002;
+      curSiteId = value;
+      return this;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 5;</code>
+     * @return whether the scene field is set
+     */
+    public boolean hasScene() {
       return (bitField0_ & 0x00000004) != 0;
     }
 
     /**
-     * <code>optional .LineupInfo lineup = 5;</code>
-     * @return this
-     */
-    public EnterRogueMapRoomScRsp clearLineup() {
-      bitField0_ &= ~0x00000004;
-      lineup.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 5;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableLineup()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public LineupInfoOuterClass.LineupInfo getLineup() {
-      return lineup;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 5;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
-      bitField0_ |= 0x00000004;
-      return lineup;
-    }
-
-    /**
-     * <code>optional .LineupInfo lineup = 5;</code>
-     * @param value the lineup to set
-     * @return this
-     */
-    public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
-      bitField0_ |= 0x00000004;
-      lineup.copyFrom(value);
-      return this;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 10;</code>
-     * @return whether the scene field is set
-     */
-    public boolean hasScene() {
-      return (bitField0_ & 0x00000008) != 0;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 10;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      * @return this
      */
     public EnterRogueMapRoomScRsp clearScene() {
-      bitField0_ &= ~0x00000008;
+      bitField0_ &= ~0x00000004;
       scene.clear();
       return this;
     }
 
     /**
-     * <code>optional .SceneInfo scene = 10;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -212,7 +155,7 @@ public final class EnterRogueMapRoomScRspOuterClass {
     }
 
     /**
-     * <code>optional .SceneInfo scene = 10;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -221,30 +164,87 @@ public final class EnterRogueMapRoomScRspOuterClass {
      * @return internal storage object for modifications
      */
     public SceneInfoOuterClass.SceneInfo getMutableScene() {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       return scene;
     }
 
     /**
-     * <code>optional .SceneInfo scene = 10;</code>
+     * <code>optional .SceneInfo scene = 5;</code>
      * @param value the scene to set
      * @return this
      */
     public EnterRogueMapRoomScRsp setScene(final SceneInfoOuterClass.SceneInfo value) {
-      bitField0_ |= 0x00000008;
+      bitField0_ |= 0x00000004;
       scene.copyFrom(value);
       return this;
     }
 
+    /**
+     * <code>optional .LineupInfo lineup = 6;</code>
+     * @return whether the lineup field is set
+     */
+    public boolean hasLineup() {
+      return (bitField0_ & 0x00000008) != 0;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 6;</code>
+     * @return this
+     */
+    public EnterRogueMapRoomScRsp clearLineup() {
+      bitField0_ &= ~0x00000008;
+      lineup.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 6;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableLineup()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public LineupInfoOuterClass.LineupInfo getLineup() {
+      return lineup;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 6;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public LineupInfoOuterClass.LineupInfo getMutableLineup() {
+      bitField0_ |= 0x00000008;
+      return lineup;
+    }
+
+    /**
+     * <code>optional .LineupInfo lineup = 6;</code>
+     * @param value the lineup to set
+     * @return this
+     */
+    public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) {
+      bitField0_ |= 0x00000008;
+      lineup.copyFrom(value);
+      return this;
+    }
+
     @Override
     public EnterRogueMapRoomScRsp copyFrom(final EnterRogueMapRoomScRsp other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        curSiteId = other.curSiteId;
         retcode = other.retcode;
-        lineup.copyFrom(other.lineup);
+        curSiteId = other.curSiteId;
         scene.copyFrom(other.scene);
+        lineup.copyFrom(other.lineup);
       }
       return this;
     }
@@ -255,18 +255,18 @@ public final class EnterRogueMapRoomScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasCurSiteId()) {
-        setCurSiteId(other.curSiteId);
-      }
       if (other.hasRetcode()) {
         setRetcode(other.retcode);
       }
-      if (other.hasLineup()) {
-        getMutableLineup().mergeFrom(other.lineup);
+      if (other.hasCurSiteId()) {
+        setCurSiteId(other.curSiteId);
       }
       if (other.hasScene()) {
         getMutableScene().mergeFrom(other.scene);
       }
+      if (other.hasLineup()) {
+        getMutableLineup().mergeFrom(other.lineup);
+      }
       return this;
     }
 
@@ -277,10 +277,10 @@ public final class EnterRogueMapRoomScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      curSiteId = 0;
       retcode = 0;
-      lineup.clear();
+      curSiteId = 0;
       scene.clear();
+      lineup.clear();
       return this;
     }
 
@@ -291,8 +291,8 @@ public final class EnterRogueMapRoomScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      lineup.clearQuick();
       scene.clearQuick();
+      lineup.clearQuick();
       return this;
     }
 
@@ -306,29 +306,29 @@ public final class EnterRogueMapRoomScRspOuterClass {
       }
       EnterRogueMapRoomScRsp other = (EnterRogueMapRoomScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasCurSiteId() || curSiteId == other.curSiteId)
         && (!hasRetcode() || retcode == other.retcode)
-        && (!hasLineup() || lineup.equals(other.lineup))
-        && (!hasScene() || scene.equals(other.scene));
+        && (!hasCurSiteId() || curSiteId == other.curSiteId)
+        && (!hasScene() || scene.equals(other.scene))
+        && (!hasLineup() || lineup.equals(other.lineup));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(curSiteId);
+        output.writeRawByte((byte) 80);
+        output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 48);
-        output.writeUInt32NoTag(retcode);
+        output.writeRawByte((byte) 120);
+        output.writeUInt32NoTag(curSiteId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 42);
-        output.writeMessageNoTag(lineup);
+        output.writeMessageNoTag(scene);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 82);
-        output.writeMessageNoTag(scene);
+        output.writeRawByte((byte) 50);
+        output.writeMessageNoTag(lineup);
       }
     }
 
@@ -336,16 +336,16 @@ public final class EnterRogueMapRoomScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
       }
       return size;
     }
@@ -357,18 +357,18 @@ public final class EnterRogueMapRoomScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // curSiteId
-            curSiteId = input.readUInt32();
+          case 80: {
+            // retcode
+            retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 48) {
+            if (tag != 120) {
               break;
             }
           }
-          case 48: {
-            // retcode
-            retcode = input.readUInt32();
+          case 120: {
+            // curSiteId
+            curSiteId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 42) {
@@ -376,17 +376,17 @@ public final class EnterRogueMapRoomScRspOuterClass {
             }
           }
           case 42: {
-            // lineup
-            input.readMessage(lineup);
+            // scene
+            input.readMessage(scene);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 82) {
+            if (tag != 50) {
               break;
             }
           }
-          case 82: {
-            // scene
-            input.readMessage(scene);
+          case 50: {
+            // lineup
+            input.readMessage(lineup);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
             if (tag != 0) {
@@ -411,16 +411,16 @@ public final class EnterRogueMapRoomScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.curSiteId, curSiteId);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
         output.writeUInt32(FieldNames.retcode, retcode);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeUInt32(FieldNames.curSiteId, curSiteId);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeMessage(FieldNames.lineup, lineup);
+        output.writeMessage(FieldNames.scene, scene);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeMessage(FieldNames.scene, scene);
+        output.writeMessage(FieldNames.lineup, lineup);
       }
       output.endObject();
     }
@@ -432,11 +432,10 @@ public final class EnterRogueMapRoomScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -226037470:
-          case 1245078036: {
-            if (input.isAtField(FieldNames.curSiteId)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                curSiteId = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -444,10 +443,11 @@ public final class EnterRogueMapRoomScRspOuterClass {
             }
             break;
           }
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case -226037470:
+          case 1245078036: {
+            if (input.isAtField(FieldNames.curSiteId)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                curSiteId = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -455,21 +455,21 @@ public final class EnterRogueMapRoomScRspOuterClass {
             }
             break;
           }
-          case -1102671473: {
-            if (input.isAtField(FieldNames.lineup)) {
-              if (!input.trySkipNullValue()) {
-                input.readMessage(lineup);
-                bitField0_ |= 0x00000004;
-              }
-            } else {
-              input.skipUnknownField();
-            }
-            break;
-          }
           case 109254796: {
             if (input.isAtField(FieldNames.scene)) {
               if (!input.trySkipNullValue()) {
                 input.readMessage(scene);
+                bitField0_ |= 0x00000004;
+              }
+            } else {
+              input.skipUnknownField();
+            }
+            break;
+          }
+          case -1102671473: {
+            if (input.isAtField(FieldNames.lineup)) {
+              if (!input.trySkipNullValue()) {
+                input.readMessage(lineup);
                 bitField0_ |= 0x00000008;
               }
             } else {
@@ -530,13 +530,13 @@ public final class EnterRogueMapRoomScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id");
-
       static final FieldName retcode = FieldName.forField("retcode");
 
-      static final FieldName lineup = FieldName.forField("lineup");
+      static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id");
 
       static final FieldName scene = FieldName.forField("scene");
+
+      static final FieldName lineup = FieldName.forField("lineup");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java

@@ -19,20 +19,20 @@ public final class EnterSceneByServerScNotifyOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional .EnterSceneReason reason = 10;</code>
+     * <code>optional .EnterSceneReason reason = 8;</code>
      */
     private int reason;
 
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     */
-    private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
-
     /**
      * <code>optional .LineupInfo lineup = 11;</code>
      */
     private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance();
 
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     */
+    private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance();
+
     private EnterSceneByServerScNotify() {
     }
 
@@ -44,7 +44,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
     }
 
     /**
-     * <code>optional .EnterSceneReason reason = 10;</code>
+     * <code>optional .EnterSceneReason reason = 8;</code>
      * @return whether the reason field is set
      */
     public boolean hasReason() {
@@ -52,7 +52,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
     }
 
     /**
-     * <code>optional .EnterSceneReason reason = 10;</code>
+     * <code>optional .EnterSceneReason reason = 8;</code>
      * @return this
      */
     public EnterSceneByServerScNotify clearReason() {
@@ -62,7 +62,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
     }
 
     /**
-     * <code>optional .EnterSceneReason reason = 10;</code>
+     * <code>optional .EnterSceneReason reason = 8;</code>
      * @return the reason
      */
     public EnterSceneReasonOuterClass.EnterSceneReason getReason() {
@@ -95,7 +95,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
     }
 
     /**
-     * <code>optional .EnterSceneReason reason = 10;</code>
+     * <code>optional .EnterSceneReason reason = 8;</code>
      * @param value the reason to set
      * @return this
      */
@@ -106,69 +106,12 @@ public final class EnterSceneByServerScNotifyOuterClass {
       return this;
     }
 
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     * @return whether the scene field is set
-     */
-    public boolean hasScene() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     * @return this
-     */
-    public EnterSceneByServerScNotify clearScene() {
-      bitField0_ &= ~0x00000002;
-      scene.clear();
-      return this;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     *
-     * This method returns the internal storage object without modifying any has state.
-     * The returned object should not be modified and be treated as read-only.
-     *
-     * Use {@link #getMutableScene()} if you want to modify it.
-     *
-     * @return internal storage object for reading
-     */
-    public SceneInfoOuterClass.SceneInfo getScene() {
-      return scene;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     *
-     * This method returns the internal storage object and sets the corresponding
-     * has state. The returned object will become part of this message and its
-     * contents may be modified as long as the has state is not cleared.
-     *
-     * @return internal storage object for modifications
-     */
-    public SceneInfoOuterClass.SceneInfo getMutableScene() {
-      bitField0_ |= 0x00000002;
-      return scene;
-    }
-
-    /**
-     * <code>optional .SceneInfo scene = 4;</code>
-     * @param value the scene to set
-     * @return this
-     */
-    public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo value) {
-      bitField0_ |= 0x00000002;
-      scene.copyFrom(value);
-      return this;
-    }
-
     /**
      * <code>optional .LineupInfo lineup = 11;</code>
      * @return whether the lineup field is set
      */
     public boolean hasLineup() {
-      return (bitField0_ & 0x00000004) != 0;
+      return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
@@ -176,7 +119,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
      * @return this
      */
     public EnterSceneByServerScNotify clearLineup() {
-      bitField0_ &= ~0x00000004;
+      bitField0_ &= ~0x00000002;
       lineup.clear();
       return this;
     }
@@ -205,7 +148,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
      * @return internal storage object for modifications
      */
     public LineupInfoOuterClass.LineupInfo getMutableLineup() {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       return lineup;
     }
 
@@ -215,19 +158,76 @@ public final class EnterSceneByServerScNotifyOuterClass {
      * @return this
      */
     public EnterSceneByServerScNotify setLineup(final LineupInfoOuterClass.LineupInfo value) {
-      bitField0_ |= 0x00000004;
+      bitField0_ |= 0x00000002;
       lineup.copyFrom(value);
       return this;
     }
 
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     * @return whether the scene field is set
+     */
+    public boolean hasScene() {
+      return (bitField0_ & 0x00000004) != 0;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     * @return this
+     */
+    public EnterSceneByServerScNotify clearScene() {
+      bitField0_ &= ~0x00000004;
+      scene.clear();
+      return this;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     *
+     * This method returns the internal storage object without modifying any has state.
+     * The returned object should not be modified and be treated as read-only.
+     *
+     * Use {@link #getMutableScene()} if you want to modify it.
+     *
+     * @return internal storage object for reading
+     */
+    public SceneInfoOuterClass.SceneInfo getScene() {
+      return scene;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     *
+     * This method returns the internal storage object and sets the corresponding
+     * has state. The returned object will become part of this message and its
+     * contents may be modified as long as the has state is not cleared.
+     *
+     * @return internal storage object for modifications
+     */
+    public SceneInfoOuterClass.SceneInfo getMutableScene() {
+      bitField0_ |= 0x00000004;
+      return scene;
+    }
+
+    /**
+     * <code>optional .SceneInfo scene = 15;</code>
+     * @param value the scene to set
+     * @return this
+     */
+    public EnterSceneByServerScNotify setScene(final SceneInfoOuterClass.SceneInfo value) {
+      bitField0_ |= 0x00000004;
+      scene.copyFrom(value);
+      return this;
+    }
+
     @Override
     public EnterSceneByServerScNotify copyFrom(final EnterSceneByServerScNotify other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
         reason = other.reason;
-        scene.copyFrom(other.scene);
         lineup.copyFrom(other.lineup);
+        scene.copyFrom(other.scene);
       }
       return this;
     }
@@ -241,12 +241,12 @@ public final class EnterSceneByServerScNotifyOuterClass {
       if (other.hasReason()) {
         setReasonValue(other.reason);
       }
-      if (other.hasScene()) {
-        getMutableScene().mergeFrom(other.scene);
-      }
       if (other.hasLineup()) {
         getMutableLineup().mergeFrom(other.lineup);
       }
+      if (other.hasScene()) {
+        getMutableScene().mergeFrom(other.scene);
+      }
       return this;
     }
 
@@ -258,8 +258,8 @@ public final class EnterSceneByServerScNotifyOuterClass {
       cachedSize = -1;
       bitField0_ = 0;
       reason = 0;
-      scene.clear();
       lineup.clear();
+      scene.clear();
       return this;
     }
 
@@ -270,8 +270,8 @@ public final class EnterSceneByServerScNotifyOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      scene.clearQuick();
       lineup.clearQuick();
+      scene.clearQuick();
       return this;
     }
 
@@ -286,24 +286,24 @@ public final class EnterSceneByServerScNotifyOuterClass {
       EnterSceneByServerScNotify other = (EnterSceneByServerScNotify) o;
       return bitField0_ == other.bitField0_
         && (!hasReason() || reason == other.reason)
-        && (!hasScene() || scene.equals(other.scene))
-        && (!hasLineup() || lineup.equals(other.lineup));
+        && (!hasLineup() || lineup.equals(other.lineup))
+        && (!hasScene() || scene.equals(other.scene));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 64);
         output.writeEnumNoTag(reason);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 34);
-        output.writeMessageNoTag(scene);
-      }
-      if ((bitField0_ & 0x00000004) != 0) {
         output.writeRawByte((byte) 90);
         output.writeMessageNoTag(lineup);
       }
+      if ((bitField0_ & 0x00000004) != 0) {
+        output.writeRawByte((byte) 122);
+        output.writeMessageNoTag(scene);
+      }
     }
 
     @Override
@@ -313,10 +313,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
         size += 1 + ProtoSink.computeEnumSizeNoTag(reason);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        size += 1 + ProtoSink.computeMessageSizeNoTag(lineup);
+        size += 1 + ProtoSink.computeMessageSizeNoTag(scene);
       }
       return size;
     }
@@ -328,7 +328,7 @@ public final class EnterSceneByServerScNotifyOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 80: {
+          case 64: {
             // reason
             final int value = input.readInt32();
             if (EnterSceneReasonOuterClass.EnterSceneReason.forNumber(value) != null) {
@@ -336,15 +336,6 @@ public final class EnterSceneByServerScNotifyOuterClass {
               bitField0_ |= 0x00000001;
             }
             tag = input.readTag();
-            if (tag != 34) {
-              break;
-            }
-          }
-          case 34: {
-            // scene
-            input.readMessage(scene);
-            bitField0_ |= 0x00000002;
-            tag = input.readTag();
             if (tag != 90) {
               break;
             }
@@ -352,6 +343,15 @@ public final class EnterSceneByServerScNotifyOuterClass {
           case 90: {
             // lineup
             input.readMessage(lineup);
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 122) {
+              break;
+            }
+          }
+          case 122: {
+            // scene
+            input.readMessage(scene);
             bitField0_ |= 0x00000004;
             tag = input.readTag();
             if (tag != 0) {
@@ -379,10 +379,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
         output.writeEnum(FieldNames.reason, reason, EnterSceneReasonOuterClass.EnterSceneReason.converter());
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeMessage(FieldNames.scene, scene);
+        output.writeMessage(FieldNames.lineup, lineup);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeMessage(FieldNames.lineup, lineup);
+        output.writeMessage(FieldNames.scene, scene);
       }
       output.endObject();
     }
@@ -410,10 +410,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
             }
             break;
           }
-          case 109254796: {
-            if (input.isAtField(FieldNames.scene)) {
+          case -1102671473: {
+            if (input.isAtField(FieldNames.lineup)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(scene);
+                input.readMessage(lineup);
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -421,10 +421,10 @@ public final class EnterSceneByServerScNotifyOuterClass {
             }
             break;
           }
-          case -1102671473: {
-            if (input.isAtField(FieldNames.lineup)) {
+          case 109254796: {
+            if (input.isAtField(FieldNames.scene)) {
               if (!input.trySkipNullValue()) {
-                input.readMessage(lineup);
+                input.readMessage(scene);
                 bitField0_ |= 0x00000004;
               }
             } else {
@@ -487,9 +487,9 @@ public final class EnterSceneByServerScNotifyOuterClass {
     static class FieldNames {
       static final FieldName reason = FieldName.forField("reason");
 
-      static final FieldName scene = FieldName.forField("scene");
-
       static final FieldName lineup = FieldName.forField("lineup");
+
+      static final FieldName scene = FieldName.forField("scene");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java

@@ -24,7 +24,7 @@ public final class EnterSceneCsReqOuterClass {
     private int entryId;
 
     /**
-     * <code>optional uint32 teleport_id = 8;</code>
+     * <code>optional uint32 teleport_id = 13;</code>
      */
     private int teleportId;
 
@@ -76,7 +76,7 @@ public final class EnterSceneCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 teleport_id = 8;</code>
+     * <code>optional uint32 teleport_id = 13;</code>
      * @return whether the teleportId field is set
      */
     public boolean hasTeleportId() {
@@ -84,7 +84,7 @@ public final class EnterSceneCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 teleport_id = 8;</code>
+     * <code>optional uint32 teleport_id = 13;</code>
      * @return this
      */
     public EnterSceneCsReq clearTeleportId() {
@@ -94,7 +94,7 @@ public final class EnterSceneCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 teleport_id = 8;</code>
+     * <code>optional uint32 teleport_id = 13;</code>
      * @return the teleportId
      */
     public int getTeleportId() {
@@ -102,7 +102,7 @@ public final class EnterSceneCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 teleport_id = 8;</code>
+     * <code>optional uint32 teleport_id = 13;</code>
      * @param value the teleportId to set
      * @return this
      */
@@ -181,7 +181,7 @@ public final class EnterSceneCsReqOuterClass {
         output.writeUInt32NoTag(entryId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(teleportId);
       }
     }
@@ -210,11 +210,11 @@ public final class EnterSceneCsReqOuterClass {
             entryId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 64) {
+            if (tag != 104) {
               break;
             }
           }
-          case 64: {
+          case 104: {
             // teleportId
             teleportId = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java

@@ -19,12 +19,12 @@ public final class EnteredSceneInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 plane_id = 9;</code>
+     * <code>optional uint32 plane_id = 7;</code>
      */
     private int planeId;
 
     /**
-     * <code>optional uint32 floor_id = 12;</code>
+     * <code>optional uint32 floor_id = 13;</code>
      */
     private int floorId;
 
@@ -39,7 +39,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 plane_id = 9;</code>
+     * <code>optional uint32 plane_id = 7;</code>
      * @return whether the planeId field is set
      */
     public boolean hasPlaneId() {
@@ -47,7 +47,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 plane_id = 9;</code>
+     * <code>optional uint32 plane_id = 7;</code>
      * @return this
      */
     public EnteredSceneInfo clearPlaneId() {
@@ -57,7 +57,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 plane_id = 9;</code>
+     * <code>optional uint32 plane_id = 7;</code>
      * @return the planeId
      */
     public int getPlaneId() {
@@ -65,7 +65,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 plane_id = 9;</code>
+     * <code>optional uint32 plane_id = 7;</code>
      * @param value the planeId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 floor_id = 12;</code>
+     * <code>optional uint32 floor_id = 13;</code>
      * @return whether the floorId field is set
      */
     public boolean hasFloorId() {
@@ -84,7 +84,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 floor_id = 12;</code>
+     * <code>optional uint32 floor_id = 13;</code>
      * @return this
      */
     public EnteredSceneInfo clearFloorId() {
@@ -94,7 +94,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 floor_id = 12;</code>
+     * <code>optional uint32 floor_id = 13;</code>
      * @return the floorId
      */
     public int getFloorId() {
@@ -102,7 +102,7 @@ public final class EnteredSceneInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 floor_id = 12;</code>
+     * <code>optional uint32 floor_id = 13;</code>
      * @param value the floorId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class EnteredSceneInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 72);
+        output.writeRawByte((byte) 56);
         output.writeUInt32NoTag(planeId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 104);
         output.writeUInt32NoTag(floorId);
       }
     }
@@ -205,16 +205,16 @@ public final class EnteredSceneInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
+          case 56: {
             // planeId
             planeId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 104) {
               break;
             }
           }
-          case 96: {
+          case 104: {
             // floorId
             floorId = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java

@@ -19,17 +19,17 @@ public final class EntityBuffChangeInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 remove_buff_id = 8;</code>
+     * <code>optional uint32 remove_buff_id = 2;</code>
      */
     private int removeBuffId;
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      */
     private int entityId;
 
     /**
-     * <code>optional .BuffInfo add_buff_info = 2;</code>
+     * <code>optional .BuffInfo add_buff_info = 7;</code>
      */
     private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance();
 
@@ -44,7 +44,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 remove_buff_id = 8;</code>
+     * <code>optional uint32 remove_buff_id = 2;</code>
      * @return whether the removeBuffId field is set
      */
     public boolean hasRemoveBuffId() {
@@ -52,7 +52,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 remove_buff_id = 8;</code>
+     * <code>optional uint32 remove_buff_id = 2;</code>
      * @return this
      */
     public EntityBuffChangeInfo clearRemoveBuffId() {
@@ -62,7 +62,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 remove_buff_id = 8;</code>
+     * <code>optional uint32 remove_buff_id = 2;</code>
      * @return the removeBuffId
      */
     public int getRemoveBuffId() {
@@ -70,7 +70,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 remove_buff_id = 8;</code>
+     * <code>optional uint32 remove_buff_id = 2;</code>
      * @param value the removeBuffId to set
      * @return this
      */
@@ -81,7 +81,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @return whether the entityId field is set
      */
     public boolean hasEntityId() {
@@ -89,7 +89,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @return this
      */
     public EntityBuffChangeInfo clearEntityId() {
@@ -99,7 +99,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @return the entityId
      */
     public int getEntityId() {
@@ -107,7 +107,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 10;</code>
      * @param value the entityId to set
      * @return this
      */
@@ -118,7 +118,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional .BuffInfo add_buff_info = 2;</code>
+     * <code>optional .BuffInfo add_buff_info = 7;</code>
      * @return whether the addBuffInfo field is set
      */
     public boolean hasAddBuffInfo() {
@@ -126,7 +126,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional .BuffInfo add_buff_info = 2;</code>
+     * <code>optional .BuffInfo add_buff_info = 7;</code>
      * @return this
      */
     public EntityBuffChangeInfo clearAddBuffInfo() {
@@ -136,7 +136,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional .BuffInfo add_buff_info = 2;</code>
+     * <code>optional .BuffInfo add_buff_info = 7;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional .BuffInfo add_buff_info = 2;</code>
+     * <code>optional .BuffInfo add_buff_info = 7;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class EntityBuffChangeInfoOuterClass {
     }
 
     /**
-     * <code>optional .BuffInfo add_buff_info = 2;</code>
+     * <code>optional .BuffInfo add_buff_info = 7;</code>
      * @param value the addBuffInfo to set
      * @return this
      */
@@ -246,15 +246,15 @@ public final class EntityBuffChangeInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 16);
         output.writeUInt32NoTag(removeBuffId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(entityId);
       }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 18);
+        output.writeRawByte((byte) 58);
         output.writeMessageNoTag(addBuffInfo);
       }
     }
@@ -281,25 +281,25 @@ public final class EntityBuffChangeInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          case 16: {
             // removeBuffId
             removeBuffId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 80) {
               break;
             }
           }
-          case 120: {
+          case 80: {
             // entityId
             entityId = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
-            if (tag != 18) {
+            if (tag != 58) {
               break;
             }
           }
-          case 18: {
+          case 58: {
             // addBuffInfo
             input.readMessage(addBuffInfo);
             bitField0_ |= 0x00000004;

src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java

@@ -20,12 +20,12 @@ public final class EntityBuffInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 entity_id = 6;</code>
+     * <code>optional uint32 entity_id = 5;</code>
      */
     private int entityId;
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      */
     private final RepeatedMessage<BuffInfoOuterClass.BuffInfo> buffList = RepeatedMessage.newEmptyInstance(BuffInfoOuterClass.BuffInfo.getFactory());
 
@@ -40,7 +40,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 6;</code>
+     * <code>optional uint32 entity_id = 5;</code>
      * @return whether the entityId field is set
      */
     public boolean hasEntityId() {
@@ -48,7 +48,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 6;</code>
+     * <code>optional uint32 entity_id = 5;</code>
      * @return this
      */
     public EntityBuffInfo clearEntityId() {
@@ -58,7 +58,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 6;</code>
+     * <code>optional uint32 entity_id = 5;</code>
      * @return the entityId
      */
     public int getEntityId() {
@@ -66,7 +66,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 6;</code>
+     * <code>optional uint32 entity_id = 5;</code>
      * @param value the entityId to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      * @return whether the buffList field is set
      */
     public boolean hasBuffList() {
@@ -85,7 +85,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      * @return this
      */
     public EntityBuffInfo clearBuffList() {
@@ -95,7 +95,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      * @param value the buffList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class EntityBuffInfoOuterClass {
     }
 
     /**
-     * <code>repeated .BuffInfo buff_list = 11;</code>
+     * <code>repeated .BuffInfo buff_list = 15;</code>
      * @param values the buffList to add
      * @return this
      */
@@ -210,12 +210,12 @@ public final class EntityBuffInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 48);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(entityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < buffList.length(); i++) {
-          output.writeRawByte((byte) 90);
+          output.writeRawByte((byte) 122);
           output.writeMessageNoTag(buffList.get(i));
         }
       }
@@ -240,16 +240,16 @@ public final class EntityBuffInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 48: {
+          case 40: {
             // entityId
             entityId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 122) {
               break;
             }
           }
-          case 90: {
+          case 122: {
             // buffList
             tag = input.readRepeatedMessage(buffList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java

@@ -19,17 +19,17 @@ public final class EntityMotionOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 map_layer = 1;</code>
-     */
-    private int mapLayer;
-
-    /**
-     * <code>optional uint32 entity_id = 2;</code>
+     * <code>optional uint32 entity_id = 4;</code>
      */
     private int entityId;
 
     /**
-     * <code>optional .MotionInfo motion = 6;</code>
+     * <code>optional uint32 map_layer = 12;</code>
+     */
+    private int mapLayer;
+
+    /**
+     * <code>optional .MotionInfo motion = 1;</code>
      */
     private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance();
 
@@ -44,62 +44,25 @@ public final class EntityMotionOuterClass {
     }
 
     /**
-     * <code>optional uint32 map_layer = 1;</code>
-     * @return whether the mapLayer field is set
+     * <code>optional uint32 entity_id = 4;</code>
+     * @return whether the entityId field is set
      */
-    public boolean hasMapLayer() {
+    public boolean hasEntityId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 map_layer = 1;</code>
-     * @return this
-     */
-    public EntityMotion clearMapLayer() {
-      bitField0_ &= ~0x00000001;
-      mapLayer = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 map_layer = 1;</code>
-     * @return the mapLayer
-     */
-    public int getMapLayer() {
-      return mapLayer;
-    }
-
-    /**
-     * <code>optional uint32 map_layer = 1;</code>
-     * @param value the mapLayer to set
-     * @return this
-     */
-    public EntityMotion setMapLayer(final int value) {
-      bitField0_ |= 0x00000001;
-      mapLayer = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 entity_id = 2;</code>
-     * @return whether the entityId field is set
-     */
-    public boolean hasEntityId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 entity_id = 2;</code>
+     * <code>optional uint32 entity_id = 4;</code>
      * @return this
      */
     public EntityMotion clearEntityId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       entityId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 entity_id = 2;</code>
+     * <code>optional uint32 entity_id = 4;</code>
      * @return the entityId
      */
     public int getEntityId() {
@@ -107,18 +70,55 @@ public final class EntityMotionOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 2;</code>
+     * <code>optional uint32 entity_id = 4;</code>
      * @param value the entityId to set
      * @return this
      */
     public EntityMotion setEntityId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       entityId = value;
       return this;
     }
 
     /**
-     * <code>optional .MotionInfo motion = 6;</code>
+     * <code>optional uint32 map_layer = 12;</code>
+     * @return whether the mapLayer field is set
+     */
+    public boolean hasMapLayer() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 map_layer = 12;</code>
+     * @return this
+     */
+    public EntityMotion clearMapLayer() {
+      bitField0_ &= ~0x00000002;
+      mapLayer = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 map_layer = 12;</code>
+     * @return the mapLayer
+     */
+    public int getMapLayer() {
+      return mapLayer;
+    }
+
+    /**
+     * <code>optional uint32 map_layer = 12;</code>
+     * @param value the mapLayer to set
+     * @return this
+     */
+    public EntityMotion setMapLayer(final int value) {
+      bitField0_ |= 0x00000002;
+      mapLayer = value;
+      return this;
+    }
+
+    /**
+     * <code>optional .MotionInfo motion = 1;</code>
      * @return whether the motion field is set
      */
     public boolean hasMotion() {
@@ -126,7 +126,7 @@ public final class EntityMotionOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 6;</code>
+     * <code>optional .MotionInfo motion = 1;</code>
      * @return this
      */
     public EntityMotion clearMotion() {
@@ -136,7 +136,7 @@ public final class EntityMotionOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 6;</code>
+     * <code>optional .MotionInfo motion = 1;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -150,7 +150,7 @@ public final class EntityMotionOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 6;</code>
+     * <code>optional .MotionInfo motion = 1;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -164,7 +164,7 @@ public final class EntityMotionOuterClass {
     }
 
     /**
-     * <code>optional .MotionInfo motion = 6;</code>
+     * <code>optional .MotionInfo motion = 1;</code>
      * @param value the motion to set
      * @return this
      */
@@ -179,8 +179,8 @@ public final class EntityMotionOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        mapLayer = other.mapLayer;
         entityId = other.entityId;
+        mapLayer = other.mapLayer;
         motion.copyFrom(other.motion);
       }
       return this;
@@ -192,12 +192,12 @@ public final class EntityMotionOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasMapLayer()) {
-        setMapLayer(other.mapLayer);
-      }
       if (other.hasEntityId()) {
         setEntityId(other.entityId);
       }
+      if (other.hasMapLayer()) {
+        setMapLayer(other.mapLayer);
+      }
       if (other.hasMotion()) {
         getMutableMotion().mergeFrom(other.motion);
       }
@@ -211,8 +211,8 @@ public final class EntityMotionOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      mapLayer = 0;
       entityId = 0;
+      mapLayer = 0;
       motion.clear();
       return this;
     }
@@ -238,23 +238,23 @@ public final class EntityMotionOuterClass {
       }
       EntityMotion other = (EntityMotion) o;
       return bitField0_ == other.bitField0_
-        && (!hasMapLayer() || mapLayer == other.mapLayer)
         && (!hasEntityId() || entityId == other.entityId)
+        && (!hasMapLayer() || mapLayer == other.mapLayer)
         && (!hasMotion() || motion.equals(other.motion));
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
-        output.writeUInt32NoTag(mapLayer);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 16);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(entityId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 96);
+        output.writeUInt32NoTag(mapLayer);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 50);
+        output.writeRawByte((byte) 10);
         output.writeMessageNoTag(motion);
       }
     }
@@ -263,10 +263,10 @@ public final class EntityMotionOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeMessageSizeNoTag(motion);
@@ -281,25 +281,25 @@ public final class EntityMotionOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
-            // mapLayer
-            mapLayer = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 16) {
-              break;
-            }
-          }
-          case 16: {
+          case 32: {
             // entityId
             entityId = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 50) {
+            if (tag != 96) {
               break;
             }
           }
-          case 50: {
+          case 96: {
+            // mapLayer
+            mapLayer = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 10) {
+              break;
+            }
+          }
+          case 10: {
             // motion
             input.readMessage(motion);
             bitField0_ |= 0x00000004;
@@ -326,10 +326,10 @@ public final class EntityMotionOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.mapLayer, mapLayer);
+        output.writeUInt32(FieldNames.entityId, entityId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.entityId, entityId);
+        output.writeUInt32(FieldNames.mapLayer, mapLayer);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeMessage(FieldNames.motion, motion);
@@ -344,11 +344,11 @@ public final class EntityMotionOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 160971093:
-          case 1248553134: {
-            if (input.isAtField(FieldNames.mapLayer)) {
+          case -2102099874:
+          case -740565257: {
+            if (input.isAtField(FieldNames.entityId)) {
               if (!input.trySkipNullValue()) {
-                mapLayer = input.readUInt32();
+                entityId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -356,11 +356,11 @@ public final class EntityMotionOuterClass {
             }
             break;
           }
-          case -2102099874:
-          case -740565257: {
-            if (input.isAtField(FieldNames.entityId)) {
+          case 160971093:
+          case 1248553134: {
+            if (input.isAtField(FieldNames.mapLayer)) {
               if (!input.trySkipNullValue()) {
-                entityId = input.readUInt32();
+                mapLayer = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -431,10 +431,10 @@ public final class EntityMotionOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
-
       static final FieldName entityId = FieldName.forField("entityId", "entity_id");
 
+      static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer");
+
       static final FieldName motion = FieldName.forField("motion");
     }
   }

src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java

@@ -19,12 +19,12 @@ public final class EquipRelicOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 4;</code>
      */
     private int slot;
 
     /**
-     * <code>optional uint32 relic_unique_id = 15;</code>
+     * <code>optional uint32 relic_unique_id = 11;</code>
      */
     private int relicUniqueId;
 
@@ -39,7 +39,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 4;</code>
      * @return whether the slot field is set
      */
     public boolean hasSlot() {
@@ -47,7 +47,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 4;</code>
      * @return this
      */
     public EquipRelic clearSlot() {
@@ -57,7 +57,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 4;</code>
      * @return the slot
      */
     public int getSlot() {
@@ -65,7 +65,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 slot = 8;</code>
+     * <code>optional uint32 slot = 4;</code>
      * @param value the slot to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 15;</code>
+     * <code>optional uint32 relic_unique_id = 11;</code>
      * @return whether the relicUniqueId field is set
      */
     public boolean hasRelicUniqueId() {
@@ -84,7 +84,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 15;</code>
+     * <code>optional uint32 relic_unique_id = 11;</code>
      * @return this
      */
     public EquipRelic clearRelicUniqueId() {
@@ -94,7 +94,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 15;</code>
+     * <code>optional uint32 relic_unique_id = 11;</code>
      * @return the relicUniqueId
      */
     public int getRelicUniqueId() {
@@ -102,7 +102,7 @@ public final class EquipRelicOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 15;</code>
+     * <code>optional uint32 relic_unique_id = 11;</code>
      * @param value the relicUniqueId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class EquipRelicOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(slot);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(relicUniqueId);
       }
     }
@@ -205,16 +205,16 @@ public final class EquipRelicOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          case 32: {
             // slot
             slot = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 88) {
               break;
             }
           }
-          case 120: {
+          case 88: {
             // relicUniqueId
             relicUniqueId = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java

@@ -19,15 +19,15 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 gacha_type = 9;</code>
-     */
-    private int gachaType;
-
-    /**
-     * <code>optional uint32 avatar_id = 12;</code>
+     * <code>optional uint32 avatar_id = 5;</code>
      */
     private int avatarId;
 
+    /**
+     * <code>optional uint32 gacha_type = 13;</code>
+     */
+    private int gachaType;
+
     private ExchangeGachaCeilingCsReq() {
     }
 
@@ -39,62 +39,25 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_type = 9;</code>
-     * @return whether the gachaType field is set
+     * <code>optional uint32 avatar_id = 5;</code>
+     * @return whether the avatarId field is set
      */
-    public boolean hasGachaType() {
+    public boolean hasAvatarId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 gacha_type = 9;</code>
-     * @return this
-     */
-    public ExchangeGachaCeilingCsReq clearGachaType() {
-      bitField0_ &= ~0x00000001;
-      gachaType = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 gacha_type = 9;</code>
-     * @return the gachaType
-     */
-    public int getGachaType() {
-      return gachaType;
-    }
-
-    /**
-     * <code>optional uint32 gacha_type = 9;</code>
-     * @param value the gachaType to set
-     * @return this
-     */
-    public ExchangeGachaCeilingCsReq setGachaType(final int value) {
-      bitField0_ |= 0x00000001;
-      gachaType = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 avatar_id = 12;</code>
-     * @return whether the avatarId field is set
-     */
-    public boolean hasAvatarId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 avatar_id = 12;</code>
+     * <code>optional uint32 avatar_id = 5;</code>
      * @return this
      */
     public ExchangeGachaCeilingCsReq clearAvatarId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       avatarId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 avatar_id = 12;</code>
+     * <code>optional uint32 avatar_id = 5;</code>
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -102,23 +65,60 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 12;</code>
+     * <code>optional uint32 avatar_id = 5;</code>
      * @param value the avatarId to set
      * @return this
      */
     public ExchangeGachaCeilingCsReq setAvatarId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       avatarId = value;
       return this;
     }
 
+    /**
+     * <code>optional uint32 gacha_type = 13;</code>
+     * @return whether the gachaType field is set
+     */
+    public boolean hasGachaType() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 gacha_type = 13;</code>
+     * @return this
+     */
+    public ExchangeGachaCeilingCsReq clearGachaType() {
+      bitField0_ &= ~0x00000002;
+      gachaType = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 gacha_type = 13;</code>
+     * @return the gachaType
+     */
+    public int getGachaType() {
+      return gachaType;
+    }
+
+    /**
+     * <code>optional uint32 gacha_type = 13;</code>
+     * @param value the gachaType to set
+     * @return this
+     */
+    public ExchangeGachaCeilingCsReq setGachaType(final int value) {
+      bitField0_ |= 0x00000002;
+      gachaType = value;
+      return this;
+    }
+
     @Override
     public ExchangeGachaCeilingCsReq copyFrom(final ExchangeGachaCeilingCsReq other) {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        gachaType = other.gachaType;
         avatarId = other.avatarId;
+        gachaType = other.gachaType;
       }
       return this;
     }
@@ -129,12 +129,12 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasGachaType()) {
-        setGachaType(other.gachaType);
-      }
       if (other.hasAvatarId()) {
         setAvatarId(other.avatarId);
       }
+      if (other.hasGachaType()) {
+        setGachaType(other.gachaType);
+      }
       return this;
     }
 
@@ -145,8 +145,8 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      gachaType = 0;
       avatarId = 0;
+      gachaType = 0;
       return this;
     }
 
@@ -170,19 +170,19 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
       }
       ExchangeGachaCeilingCsReq other = (ExchangeGachaCeilingCsReq) o;
       return bitField0_ == other.bitField0_
-        && (!hasGachaType() || gachaType == other.gachaType)
-        && (!hasAvatarId() || avatarId == other.avatarId);
+        && (!hasAvatarId() || avatarId == other.avatarId)
+        && (!hasGachaType() || gachaType == other.gachaType);
     }
 
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(gachaType);
+        output.writeRawByte((byte) 40);
+        output.writeUInt32NoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
-        output.writeUInt32NoTag(avatarId);
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(gachaType);
       }
     }
 
@@ -190,10 +190,10 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
       }
       return size;
     }
@@ -205,18 +205,18 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 72: {
-            // gachaType
-            gachaType = input.readUInt32();
+          case 40: {
+            // avatarId
+            avatarId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 104) {
               break;
             }
           }
-          case 96: {
-            // avatarId
-            avatarId = input.readUInt32();
+          case 104: {
+            // gachaType
+            gachaType = input.readUInt32();
             bitField0_ |= 0x00000002;
             tag = input.readTag();
             if (tag != 0) {
@@ -241,10 +241,10 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.gachaType, gachaType);
+        output.writeUInt32(FieldNames.avatarId, avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.avatarId, avatarId);
+        output.writeUInt32(FieldNames.gachaType, gachaType);
       }
       output.endObject();
     }
@@ -256,11 +256,11 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 802848732:
-          case -871474217: {
-            if (input.isAtField(FieldNames.gachaType)) {
+          case 1787287636:
+          case -428636735: {
+            if (input.isAtField(FieldNames.avatarId)) {
               if (!input.trySkipNullValue()) {
-                gachaType = input.readUInt32();
+                avatarId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -268,11 +268,11 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
             }
             break;
           }
-          case 1787287636:
-          case -428636735: {
-            if (input.isAtField(FieldNames.avatarId)) {
+          case 802848732:
+          case -871474217: {
+            if (input.isAtField(FieldNames.gachaType)) {
               if (!input.trySkipNullValue()) {
-                avatarId = input.readUInt32();
+                gachaType = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -333,9 +333,9 @@ public final class ExchangeGachaCeilingCsReqOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
-
       static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
+
+      static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
     }
   }
 }

src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java

@@ -19,27 +19,27 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
-     */
-    private int retcode;
-
-    /**
-     * <code>optional uint32 avatar_id = 4;</code>
+     * <code>optional uint32 avatar_id = 11;</code>
      */
     private int avatarId;
 
     /**
-     * <code>optional uint32 gacha_type = 10;</code>
+     * <code>optional uint32 retcode = 13;</code>
+     */
+    private int retcode;
+
+    /**
+     * <code>optional uint32 gacha_type = 15;</code>
      */
     private int gachaType;
 
     /**
-     * <code>optional .ItemList transfer_item_list = 2;</code>
+     * <code>optional .ItemList transfer_item_list = 8;</code>
      */
     private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance();
 
     /**
-     * <code>optional .GachaCeiling gacha_ceiling = 5;</code>
+     * <code>optional .GachaCeiling gacha_ceiling = 12;</code>
      */
     private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance();
 
@@ -54,62 +54,25 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @return whether the retcode field is set
+     * <code>optional uint32 avatar_id = 11;</code>
+     * @return whether the avatarId field is set
      */
-    public boolean hasRetcode() {
+    public boolean hasAvatarId() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @return this
-     */
-    public ExchangeGachaCeilingScRsp clearRetcode() {
-      bitField0_ &= ~0x00000001;
-      retcode = 0;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @return the retcode
-     */
-    public int getRetcode() {
-      return retcode;
-    }
-
-    /**
-     * <code>optional uint32 retcode = 3;</code>
-     * @param value the retcode to set
-     * @return this
-     */
-    public ExchangeGachaCeilingScRsp setRetcode(final int value) {
-      bitField0_ |= 0x00000001;
-      retcode = value;
-      return this;
-    }
-
-    /**
-     * <code>optional uint32 avatar_id = 4;</code>
-     * @return whether the avatarId field is set
-     */
-    public boolean hasAvatarId() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional uint32 avatar_id = 4;</code>
+     * <code>optional uint32 avatar_id = 11;</code>
      * @return this
      */
     public ExchangeGachaCeilingScRsp clearAvatarId() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       avatarId = 0;
       return this;
     }
 
     /**
-     * <code>optional uint32 avatar_id = 4;</code>
+     * <code>optional uint32 avatar_id = 11;</code>
      * @return the avatarId
      */
     public int getAvatarId() {
@@ -117,18 +80,55 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 avatar_id = 4;</code>
+     * <code>optional uint32 avatar_id = 11;</code>
      * @param value the avatarId to set
      * @return this
      */
     public ExchangeGachaCeilingScRsp setAvatarId(final int value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       avatarId = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 gacha_type = 10;</code>
+     * <code>optional uint32 retcode = 13;</code>
+     * @return whether the retcode field is set
+     */
+    public boolean hasRetcode() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 13;</code>
+     * @return this
+     */
+    public ExchangeGachaCeilingScRsp clearRetcode() {
+      bitField0_ &= ~0x00000002;
+      retcode = 0;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 13;</code>
+     * @return the retcode
+     */
+    public int getRetcode() {
+      return retcode;
+    }
+
+    /**
+     * <code>optional uint32 retcode = 13;</code>
+     * @param value the retcode to set
+     * @return this
+     */
+    public ExchangeGachaCeilingScRsp setRetcode(final int value) {
+      bitField0_ |= 0x00000002;
+      retcode = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 gacha_type = 15;</code>
      * @return whether the gachaType field is set
      */
     public boolean hasGachaType() {
@@ -136,7 +136,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_type = 10;</code>
+     * <code>optional uint32 gacha_type = 15;</code>
      * @return this
      */
     public ExchangeGachaCeilingScRsp clearGachaType() {
@@ -146,7 +146,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_type = 10;</code>
+     * <code>optional uint32 gacha_type = 15;</code>
      * @return the gachaType
      */
     public int getGachaType() {
@@ -154,7 +154,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_type = 10;</code>
+     * <code>optional uint32 gacha_type = 15;</code>
      * @param value the gachaType to set
      * @return this
      */
@@ -165,7 +165,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList transfer_item_list = 2;</code>
+     * <code>optional .ItemList transfer_item_list = 8;</code>
      * @return whether the transferItemList field is set
      */
     public boolean hasTransferItemList() {
@@ -173,7 +173,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList transfer_item_list = 2;</code>
+     * <code>optional .ItemList transfer_item_list = 8;</code>
      * @return this
      */
     public ExchangeGachaCeilingScRsp clearTransferItemList() {
@@ -183,7 +183,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList transfer_item_list = 2;</code>
+     * <code>optional .ItemList transfer_item_list = 8;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -197,7 +197,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList transfer_item_list = 2;</code>
+     * <code>optional .ItemList transfer_item_list = 8;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -211,7 +211,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .ItemList transfer_item_list = 2;</code>
+     * <code>optional .ItemList transfer_item_list = 8;</code>
      * @param value the transferItemList to set
      * @return this
      */
@@ -222,7 +222,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .GachaCeiling gacha_ceiling = 5;</code>
+     * <code>optional .GachaCeiling gacha_ceiling = 12;</code>
      * @return whether the gachaCeiling field is set
      */
     public boolean hasGachaCeiling() {
@@ -230,7 +230,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .GachaCeiling gacha_ceiling = 5;</code>
+     * <code>optional .GachaCeiling gacha_ceiling = 12;</code>
      * @return this
      */
     public ExchangeGachaCeilingScRsp clearGachaCeiling() {
@@ -240,7 +240,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .GachaCeiling gacha_ceiling = 5;</code>
+     * <code>optional .GachaCeiling gacha_ceiling = 12;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -254,7 +254,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .GachaCeiling gacha_ceiling = 5;</code>
+     * <code>optional .GachaCeiling gacha_ceiling = 12;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -268,7 +268,7 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     }
 
     /**
-     * <code>optional .GachaCeiling gacha_ceiling = 5;</code>
+     * <code>optional .GachaCeiling gacha_ceiling = 12;</code>
      * @param value the gachaCeiling to set
      * @return this
      */
@@ -284,8 +284,8 @@ public final class ExchangeGachaCeilingScRspOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        retcode = other.retcode;
         avatarId = other.avatarId;
+        retcode = other.retcode;
         gachaType = other.gachaType;
         transferItemList.copyFrom(other.transferItemList);
         gachaCeiling.copyFrom(other.gachaCeiling);
@@ -299,12 +299,12 @@ public final class ExchangeGachaCeilingScRspOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasRetcode()) {
-        setRetcode(other.retcode);
-      }
       if (other.hasAvatarId()) {
         setAvatarId(other.avatarId);
       }
+      if (other.hasRetcode()) {
+        setRetcode(other.retcode);
+      }
       if (other.hasGachaType()) {
         setGachaType(other.gachaType);
       }
@@ -324,8 +324,8 @@ public final class ExchangeGachaCeilingScRspOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      retcode = 0;
       avatarId = 0;
+      retcode = 0;
       gachaType = 0;
       transferItemList.clear();
       gachaCeiling.clear();
@@ -354,8 +354,8 @@ public final class ExchangeGachaCeilingScRspOuterClass {
       }
       ExchangeGachaCeilingScRsp other = (ExchangeGachaCeilingScRsp) o;
       return bitField0_ == other.bitField0_
-        && (!hasRetcode() || retcode == other.retcode)
         && (!hasAvatarId() || avatarId == other.avatarId)
+        && (!hasRetcode() || retcode == other.retcode)
         && (!hasGachaType() || gachaType == other.gachaType)
         && (!hasTransferItemList() || transferItemList.equals(other.transferItemList))
         && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling));
@@ -364,23 +364,23 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
-        output.writeUInt32NoTag(retcode);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 32);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(avatarId);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 104);
+        output.writeUInt32NoTag(retcode);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 120);
         output.writeUInt32NoTag(gachaType);
       }
       if ((bitField0_ & 0x00000008) != 0) {
-        output.writeRawByte((byte) 18);
+        output.writeRawByte((byte) 66);
         output.writeMessageNoTag(transferItemList);
       }
       if ((bitField0_ & 0x00000010) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 98);
         output.writeMessageNoTag(gachaCeiling);
       }
     }
@@ -389,10 +389,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType);
@@ -413,43 +413,43 @@ public final class ExchangeGachaCeilingScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
-            // retcode
-            retcode = input.readUInt32();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 32) {
-              break;
-            }
-          }
-          case 32: {
+          case 88: {
             // avatarId
             avatarId = input.readUInt32();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 80) {
+            if (tag != 104) {
               break;
             }
           }
-          case 80: {
+          case 104: {
+            // retcode
+            retcode = input.readUInt32();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 120) {
+              break;
+            }
+          }
+          case 120: {
             // gachaType
             gachaType = input.readUInt32();
             bitField0_ |= 0x00000004;
             tag = input.readTag();
-            if (tag != 18) {
+            if (tag != 66) {
               break;
             }
           }
-          case 18: {
+          case 66: {
             // transferItemList
             input.readMessage(transferItemList);
             bitField0_ |= 0x00000008;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 98) {
               break;
             }
           }
-          case 42: {
+          case 98: {
             // gachaCeiling
             input.readMessage(gachaCeiling);
             bitField0_ |= 0x00000010;
@@ -476,10 +476,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeUInt32(FieldNames.retcode, retcode);
+        output.writeUInt32(FieldNames.avatarId, avatarId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeUInt32(FieldNames.avatarId, avatarId);
+        output.writeUInt32(FieldNames.retcode, retcode);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.gachaType, gachaType);
@@ -500,10 +500,11 @@ public final class ExchangeGachaCeilingScRspOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case 1097936398: {
-            if (input.isAtField(FieldNames.retcode)) {
+          case 1787287636:
+          case -428636735: {
+            if (input.isAtField(FieldNames.avatarId)) {
               if (!input.trySkipNullValue()) {
-                retcode = input.readUInt32();
+                avatarId = input.readUInt32();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -511,11 +512,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
             }
             break;
           }
-          case 1787287636:
-          case -428636735: {
-            if (input.isAtField(FieldNames.avatarId)) {
+          case 1097936398: {
+            if (input.isAtField(FieldNames.retcode)) {
               if (!input.trySkipNullValue()) {
-                avatarId = input.readUInt32();
+                retcode = input.readUInt32();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -612,10 +612,10 @@ public final class ExchangeGachaCeilingScRspOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName retcode = FieldName.forField("retcode");
-
       static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id");
 
+      static final FieldName retcode = FieldName.forField("retcode");
+
       static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type");
 
       static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list");

src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java

@@ -19,7 +19,7 @@ public final class ExchangeHcoinCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 num = 3;</code>
+     * <code>optional uint32 num = 11;</code>
      */
     private int num;
 
@@ -34,7 +34,7 @@ public final class ExchangeHcoinCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 3;</code>
+     * <code>optional uint32 num = 11;</code>
      * @return whether the num field is set
      */
     public boolean hasNum() {
@@ -42,7 +42,7 @@ public final class ExchangeHcoinCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 3;</code>
+     * <code>optional uint32 num = 11;</code>
      * @return this
      */
     public ExchangeHcoinCsReq clearNum() {
@@ -52,7 +52,7 @@ public final class ExchangeHcoinCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 3;</code>
+     * <code>optional uint32 num = 11;</code>
      * @return the num
      */
     public int getNum() {
@@ -60,7 +60,7 @@ public final class ExchangeHcoinCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 3;</code>
+     * <code>optional uint32 num = 11;</code>
      * @param value the num to set
      * @return this
      */
@@ -129,7 +129,7 @@ public final class ExchangeHcoinCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 88);
         output.writeUInt32NoTag(num);
       }
     }
@@ -150,7 +150,7 @@ public final class ExchangeHcoinCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
+          case 88: {
             // num
             num = input.readUInt32();
             bitField0_ |= 0x00000001;

src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java

@@ -19,12 +19,12 @@ public final class ExchangeHcoinScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 10;</code>
      */
     private int retcode;
 
     /**
-     * <code>optional uint32 num = 13;</code>
+     * <code>optional uint32 num = 12;</code>
      */
     private int num;
 
@@ -39,7 +39,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -47,7 +47,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return this
      */
     public ExchangeHcoinScRsp clearRetcode() {
@@ -57,7 +57,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -65,7 +65,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 10;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 13;</code>
+     * <code>optional uint32 num = 12;</code>
      * @return whether the num field is set
      */
     public boolean hasNum() {
@@ -84,7 +84,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 13;</code>
+     * <code>optional uint32 num = 12;</code>
      * @return this
      */
     public ExchangeHcoinScRsp clearNum() {
@@ -94,7 +94,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 13;</code>
+     * <code>optional uint32 num = 12;</code>
      * @return the num
      */
     public int getNum() {
@@ -102,7 +102,7 @@ public final class ExchangeHcoinScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 num = 13;</code>
+     * <code>optional uint32 num = 12;</code>
      * @param value the num to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class ExchangeHcoinScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(num);
       }
     }
@@ -205,16 +205,16 @@ public final class ExchangeHcoinScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 80: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 96) {
               break;
             }
           }
-          case 104: {
+          case 96: {
             // num
             num = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java

@@ -19,12 +19,12 @@ public final class ExpUpEquipmentCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 equipment_unique_id = 3;</code>
+     * <code>optional uint32 equipment_unique_id = 9;</code>
      */
     private int equipmentUniqueId;
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 5;</code>
+     * <code>optional .ItemCostList item_cost_list = 2;</code>
      */
     private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -39,7 +39,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 3;</code>
+     * <code>optional uint32 equipment_unique_id = 9;</code>
      * @return whether the equipmentUniqueId field is set
      */
     public boolean hasEquipmentUniqueId() {
@@ -47,7 +47,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 3;</code>
+     * <code>optional uint32 equipment_unique_id = 9;</code>
      * @return this
      */
     public ExpUpEquipmentCsReq clearEquipmentUniqueId() {
@@ -57,7 +57,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 3;</code>
+     * <code>optional uint32 equipment_unique_id = 9;</code>
      * @return the equipmentUniqueId
      */
     public int getEquipmentUniqueId() {
@@ -65,7 +65,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 equipment_unique_id = 3;</code>
+     * <code>optional uint32 equipment_unique_id = 9;</code>
      * @param value the equipmentUniqueId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 5;</code>
+     * <code>optional .ItemCostList item_cost_list = 2;</code>
      * @return whether the itemCostList field is set
      */
     public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 5;</code>
+     * <code>optional .ItemCostList item_cost_list = 2;</code>
      * @return this
      */
     public ExpUpEquipmentCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 5;</code>
+     * <code>optional .ItemCostList item_cost_list = 2;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 5;</code>
+     * <code>optional .ItemCostList item_cost_list = 2;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class ExpUpEquipmentCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 5;</code>
+     * <code>optional .ItemCostList item_cost_list = 2;</code>
      * @param value the itemCostList to set
      * @return this
      */
@@ -198,11 +198,11 @@ public final class ExpUpEquipmentCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 24);
+        output.writeRawByte((byte) 72);
         output.writeUInt32NoTag(equipmentUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 42);
+        output.writeRawByte((byte) 18);
         output.writeMessageNoTag(itemCostList);
       }
     }
@@ -226,16 +226,16 @@ public final class ExpUpEquipmentCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 24: {
+          case 72: {
             // equipmentUniqueId
             equipmentUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 42) {
+            if (tag != 18) {
               break;
             }
           }
-          case 42: {
+          case 18: {
             // itemCostList
             input.readMessage(itemCostList);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java

@@ -20,12 +20,12 @@ public final class ExpUpEquipmentScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 8;</code>
+     * <code>optional uint32 retcode = 14;</code>
      */
     private int retcode;
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      */
     private final RepeatedMessage<PileItemOuterClass.PileItem> returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory());
 
@@ -40,7 +40,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 8;</code>
+     * <code>optional uint32 retcode = 14;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 8;</code>
+     * <code>optional uint32 retcode = 14;</code>
      * @return this
      */
     public ExpUpEquipmentScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 8;</code>
+     * <code>optional uint32 retcode = 14;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -66,7 +66,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 8;</code>
+     * <code>optional uint32 retcode = 14;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      * @return whether the returnItemList field is set
      */
     public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      * @return this
      */
     public ExpUpEquipmentScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      * @param value the returnItemList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 4;</code>
+     * <code>repeated .PileItem return_item_list = 15;</code>
      * @param values the returnItemList to add
      * @return this
      */
@@ -210,12 +210,12 @@ public final class ExpUpEquipmentScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 64);
+        output.writeRawByte((byte) 112);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < returnItemList.length(); i++) {
-          output.writeRawByte((byte) 34);
+          output.writeRawByte((byte) 122);
           output.writeMessageNoTag(returnItemList.get(i));
         }
       }
@@ -240,16 +240,16 @@ public final class ExpUpEquipmentScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 64: {
+          case 112: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 34) {
+            if (tag != 122) {
               break;
             }
           }
-          case 34: {
+          case 122: {
             // returnItemList
             tag = input.readRepeatedMessage(returnItemList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java

@@ -19,12 +19,12 @@ public final class ExpUpRelicCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 relic_unique_id = 11;</code>
+     * <code>optional uint32 relic_unique_id = 5;</code>
      */
     private int relicUniqueId;
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 3;</code>
+     * <code>optional .ItemCostList item_cost_list = 10;</code>
      */
     private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance();
 
@@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 11;</code>
+     * <code>optional uint32 relic_unique_id = 5;</code>
      * @return whether the relicUniqueId field is set
      */
     public boolean hasRelicUniqueId() {
@@ -47,7 +47,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 11;</code>
+     * <code>optional uint32 relic_unique_id = 5;</code>
      * @return this
      */
     public ExpUpRelicCsReq clearRelicUniqueId() {
@@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 11;</code>
+     * <code>optional uint32 relic_unique_id = 5;</code>
      * @return the relicUniqueId
      */
     public int getRelicUniqueId() {
@@ -65,7 +65,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 relic_unique_id = 11;</code>
+     * <code>optional uint32 relic_unique_id = 5;</code>
      * @param value the relicUniqueId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 3;</code>
+     * <code>optional .ItemCostList item_cost_list = 10;</code>
      * @return whether the itemCostList field is set
      */
     public boolean hasItemCostList() {
@@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 3;</code>
+     * <code>optional .ItemCostList item_cost_list = 10;</code>
      * @return this
      */
     public ExpUpRelicCsReq clearItemCostList() {
@@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 3;</code>
+     * <code>optional .ItemCostList item_cost_list = 10;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -108,7 +108,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 3;</code>
+     * <code>optional .ItemCostList item_cost_list = 10;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -122,7 +122,7 @@ public final class ExpUpRelicCsReqOuterClass {
     }
 
     /**
-     * <code>optional .ItemCostList item_cost_list = 3;</code>
+     * <code>optional .ItemCostList item_cost_list = 10;</code>
      * @param value the itemCostList to set
      * @return this
      */
@@ -198,11 +198,11 @@ public final class ExpUpRelicCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 88);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(relicUniqueId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 26);
+        output.writeRawByte((byte) 82);
         output.writeMessageNoTag(itemCostList);
       }
     }
@@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 88: {
+          case 40: {
             // relicUniqueId
             relicUniqueId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 26) {
+            if (tag != 82) {
               break;
             }
           }
-          case 26: {
+          case 82: {
             // itemCostList
             input.readMessage(itemCostList);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java

@@ -20,12 +20,12 @@ public final class ExpUpRelicScRspOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 5;</code>
      */
     private int retcode;
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      */
     private final RepeatedMessage<PileItemOuterClass.PileItem> returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory());
 
@@ -40,7 +40,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return whether the retcode field is set
      */
     public boolean hasRetcode() {
@@ -48,7 +48,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return this
      */
     public ExpUpRelicScRsp clearRetcode() {
@@ -58,7 +58,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @return the retcode
      */
     public int getRetcode() {
@@ -66,7 +66,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>optional uint32 retcode = 1;</code>
+     * <code>optional uint32 retcode = 5;</code>
      * @param value the retcode to set
      * @return this
      */
@@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      * @return whether the returnItemList field is set
      */
     public boolean hasReturnItemList() {
@@ -85,7 +85,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      * @return this
      */
     public ExpUpRelicScRsp clearReturnItemList() {
@@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      *
      * This method returns the internal storage object without modifying any has state.
      * The returned object should not be modified and be treated as read-only.
@@ -109,7 +109,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      *
      * This method returns the internal storage object and sets the corresponding
      * has state. The returned object will become part of this message and its
@@ -123,7 +123,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      * @param value the returnItemList to add
      * @return this
      */
@@ -134,7 +134,7 @@ public final class ExpUpRelicScRspOuterClass {
     }
 
     /**
-     * <code>repeated .PileItem return_item_list = 11;</code>
+     * <code>repeated .PileItem return_item_list = 12;</code>
      * @param values the returnItemList to add
      * @return this
      */
@@ -210,12 +210,12 @@ public final class ExpUpRelicScRspOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 40);
         output.writeUInt32NoTag(retcode);
       }
       if ((bitField0_ & 0x00000002) != 0) {
         for (int i = 0; i < returnItemList.length(); i++) {
-          output.writeRawByte((byte) 90);
+          output.writeRawByte((byte) 98);
           output.writeMessageNoTag(returnItemList.get(i));
         }
       }
@@ -240,16 +240,16 @@ public final class ExpUpRelicScRspOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 40: {
             // retcode
             retcode = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 90) {
+            if (tag != 98) {
               break;
             }
           }
-          case 90: {
+          case 98: {
             // returnItemList
             tag = input.readRepeatedMessage(returnItemList, tag);
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java

@@ -19,17 +19,17 @@ public final class FarmStageGachaInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional int64 end_time = 3;</code>
-     */
-    private long endTime;
-
-    /**
-     * <code>optional int64 begin_time = 7;</code>
+     * <code>optional int64 begin_time = 3;</code>
      */
     private long beginTime;
 
     /**
-     * <code>optional uint32 gacha_id = 15;</code>
+     * <code>optional int64 end_time = 11;</code>
+     */
+    private long endTime;
+
+    /**
+     * <code>optional uint32 gacha_id = 4;</code>
      */
     private int gachaId;
 
@@ -44,62 +44,25 @@ public final class FarmStageGachaInfoOuterClass {
     }
 
     /**
-     * <code>optional int64 end_time = 3;</code>
-     * @return whether the endTime field is set
+     * <code>optional int64 begin_time = 3;</code>
+     * @return whether the beginTime field is set
      */
-    public boolean hasEndTime() {
+    public boolean hasBeginTime() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional int64 end_time = 3;</code>
-     * @return this
-     */
-    public FarmStageGachaInfo clearEndTime() {
-      bitField0_ &= ~0x00000001;
-      endTime = 0L;
-      return this;
-    }
-
-    /**
-     * <code>optional int64 end_time = 3;</code>
-     * @return the endTime
-     */
-    public long getEndTime() {
-      return endTime;
-    }
-
-    /**
-     * <code>optional int64 end_time = 3;</code>
-     * @param value the endTime to set
-     * @return this
-     */
-    public FarmStageGachaInfo setEndTime(final long value) {
-      bitField0_ |= 0x00000001;
-      endTime = value;
-      return this;
-    }
-
-    /**
-     * <code>optional int64 begin_time = 7;</code>
-     * @return whether the beginTime field is set
-     */
-    public boolean hasBeginTime() {
-      return (bitField0_ & 0x00000002) != 0;
-    }
-
-    /**
-     * <code>optional int64 begin_time = 7;</code>
+     * <code>optional int64 begin_time = 3;</code>
      * @return this
      */
     public FarmStageGachaInfo clearBeginTime() {
-      bitField0_ &= ~0x00000002;
+      bitField0_ &= ~0x00000001;
       beginTime = 0L;
       return this;
     }
 
     /**
-     * <code>optional int64 begin_time = 7;</code>
+     * <code>optional int64 begin_time = 3;</code>
      * @return the beginTime
      */
     public long getBeginTime() {
@@ -107,18 +70,55 @@ public final class FarmStageGachaInfoOuterClass {
     }
 
     /**
-     * <code>optional int64 begin_time = 7;</code>
+     * <code>optional int64 begin_time = 3;</code>
      * @param value the beginTime to set
      * @return this
      */
     public FarmStageGachaInfo setBeginTime(final long value) {
-      bitField0_ |= 0x00000002;
+      bitField0_ |= 0x00000001;
       beginTime = value;
       return this;
     }
 
     /**
-     * <code>optional uint32 gacha_id = 15;</code>
+     * <code>optional int64 end_time = 11;</code>
+     * @return whether the endTime field is set
+     */
+    public boolean hasEndTime() {
+      return (bitField0_ & 0x00000002) != 0;
+    }
+
+    /**
+     * <code>optional int64 end_time = 11;</code>
+     * @return this
+     */
+    public FarmStageGachaInfo clearEndTime() {
+      bitField0_ &= ~0x00000002;
+      endTime = 0L;
+      return this;
+    }
+
+    /**
+     * <code>optional int64 end_time = 11;</code>
+     * @return the endTime
+     */
+    public long getEndTime() {
+      return endTime;
+    }
+
+    /**
+     * <code>optional int64 end_time = 11;</code>
+     * @param value the endTime to set
+     * @return this
+     */
+    public FarmStageGachaInfo setEndTime(final long value) {
+      bitField0_ |= 0x00000002;
+      endTime = value;
+      return this;
+    }
+
+    /**
+     * <code>optional uint32 gacha_id = 4;</code>
      * @return whether the gachaId field is set
      */
     public boolean hasGachaId() {
@@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_id = 15;</code>
+     * <code>optional uint32 gacha_id = 4;</code>
      * @return this
      */
     public FarmStageGachaInfo clearGachaId() {
@@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_id = 15;</code>
+     * <code>optional uint32 gacha_id = 4;</code>
      * @return the gachaId
      */
     public int getGachaId() {
@@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 gacha_id = 15;</code>
+     * <code>optional uint32 gacha_id = 4;</code>
      * @param value the gachaId to set
      * @return this
      */
@@ -159,8 +159,8 @@ public final class FarmStageGachaInfoOuterClass {
       cachedSize = other.cachedSize;
       if ((bitField0_ | other.bitField0_) != 0) {
         bitField0_ = other.bitField0_;
-        endTime = other.endTime;
         beginTime = other.beginTime;
+        endTime = other.endTime;
         gachaId = other.gachaId;
       }
       return this;
@@ -172,12 +172,12 @@ public final class FarmStageGachaInfoOuterClass {
         return this;
       }
       cachedSize = -1;
-      if (other.hasEndTime()) {
-        setEndTime(other.endTime);
-      }
       if (other.hasBeginTime()) {
         setBeginTime(other.beginTime);
       }
+      if (other.hasEndTime()) {
+        setEndTime(other.endTime);
+      }
       if (other.hasGachaId()) {
         setGachaId(other.gachaId);
       }
@@ -191,8 +191,8 @@ public final class FarmStageGachaInfoOuterClass {
       }
       cachedSize = -1;
       bitField0_ = 0;
-      endTime = 0L;
       beginTime = 0L;
+      endTime = 0L;
       gachaId = 0;
       return this;
     }
@@ -217,8 +217,8 @@ public final class FarmStageGachaInfoOuterClass {
       }
       FarmStageGachaInfo other = (FarmStageGachaInfo) o;
       return bitField0_ == other.bitField0_
-        && (!hasEndTime() || endTime == other.endTime)
         && (!hasBeginTime() || beginTime == other.beginTime)
+        && (!hasEndTime() || endTime == other.endTime)
         && (!hasGachaId() || gachaId == other.gachaId);
     }
 
@@ -226,14 +226,14 @@ public final class FarmStageGachaInfoOuterClass {
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
         output.writeRawByte((byte) 24);
-        output.writeInt64NoTag(endTime);
-      }
-      if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 56);
         output.writeInt64NoTag(beginTime);
       }
+      if ((bitField0_ & 0x00000002) != 0) {
+        output.writeRawByte((byte) 88);
+        output.writeInt64NoTag(endTime);
+      }
       if ((bitField0_ & 0x00000004) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(gachaId);
       }
     }
@@ -242,10 +242,10 @@ public final class FarmStageGachaInfoOuterClass {
     protected int computeSerializedSize() {
       int size = 0;
       if ((bitField0_ & 0x00000001) != 0) {
-        size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
+        size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime);
+        size += 1 + ProtoSink.computeInt64SizeNoTag(endTime);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId);
@@ -261,24 +261,24 @@ public final class FarmStageGachaInfoOuterClass {
       while (true) {
         switch (tag) {
           case 24: {
-            // endTime
-            endTime = input.readInt64();
-            bitField0_ |= 0x00000001;
-            tag = input.readTag();
-            if (tag != 56) {
-              break;
-            }
-          }
-          case 56: {
             // beginTime
             beginTime = input.readInt64();
-            bitField0_ |= 0x00000002;
+            bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 88) {
               break;
             }
           }
-          case 120: {
+          case 88: {
+            // endTime
+            endTime = input.readInt64();
+            bitField0_ |= 0x00000002;
+            tag = input.readTag();
+            if (tag != 32) {
+              break;
+            }
+          }
+          case 32: {
             // gachaId
             gachaId = input.readUInt32();
             bitField0_ |= 0x00000004;
@@ -305,10 +305,10 @@ public final class FarmStageGachaInfoOuterClass {
     public void writeTo(final JsonSink output) throws IOException {
       output.beginObject();
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeInt64(FieldNames.endTime, endTime);
+        output.writeInt64(FieldNames.beginTime, beginTime);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeInt64(FieldNames.beginTime, beginTime);
+        output.writeInt64(FieldNames.endTime, endTime);
       }
       if ((bitField0_ & 0x00000004) != 0) {
         output.writeUInt32(FieldNames.gachaId, gachaId);
@@ -323,11 +323,11 @@ public final class FarmStageGachaInfoOuterClass {
       }
       while (!input.isAtEnd()) {
         switch (input.readFieldHash()) {
-          case -1607243192:
-          case 1725551537: {
-            if (input.isAtField(FieldNames.endTime)) {
+          case -1072839914:
+          case 1112183971: {
+            if (input.isAtField(FieldNames.beginTime)) {
               if (!input.trySkipNullValue()) {
-                endTime = input.readInt64();
+                beginTime = input.readInt64();
                 bitField0_ |= 0x00000001;
               }
             } else {
@@ -335,11 +335,11 @@ public final class FarmStageGachaInfoOuterClass {
             }
             break;
           }
-          case -1072839914:
-          case 1112183971: {
-            if (input.isAtField(FieldNames.beginTime)) {
+          case -1607243192:
+          case 1725551537: {
+            if (input.isAtField(FieldNames.endTime)) {
               if (!input.trySkipNullValue()) {
-                beginTime = input.readInt64();
+                endTime = input.readInt64();
                 bitField0_ |= 0x00000002;
               }
             } else {
@@ -412,10 +412,10 @@ public final class FarmStageGachaInfoOuterClass {
      * Contains name constants used for serializing JSON
      */
     static class FieldNames {
-      static final FieldName endTime = FieldName.forField("endTime", "end_time");
-
       static final FieldName beginTime = FieldName.forField("beginTime", "begin_time");
 
+      static final FieldName endTime = FieldName.forField("endTime", "end_time");
+
       static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id");
     }
   }

src/generated/main/emu/lunarcore/proto/FinishRogueDialogueGroupCsReqOuterClass.java

@@ -19,12 +19,12 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 dialogue_group_id = 1;</code>
+     * <code>optional uint32 dialogue_group_id = 10;</code>
      */
     private int dialogueGroupId;
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 12;</code>
      */
     private int entityId;
 
@@ -39,7 +39,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 dialogue_group_id = 1;</code>
+     * <code>optional uint32 dialogue_group_id = 10;</code>
      * @return whether the dialogueGroupId field is set
      */
     public boolean hasDialogueGroupId() {
@@ -47,7 +47,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 dialogue_group_id = 1;</code>
+     * <code>optional uint32 dialogue_group_id = 10;</code>
      * @return this
      */
     public FinishRogueDialogueGroupCsReq clearDialogueGroupId() {
@@ -57,7 +57,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 dialogue_group_id = 1;</code>
+     * <code>optional uint32 dialogue_group_id = 10;</code>
      * @return the dialogueGroupId
      */
     public int getDialogueGroupId() {
@@ -65,7 +65,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 dialogue_group_id = 1;</code>
+     * <code>optional uint32 dialogue_group_id = 10;</code>
      * @param value the dialogueGroupId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 12;</code>
      * @return whether the entityId field is set
      */
     public boolean hasEntityId() {
@@ -84,7 +84,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 12;</code>
      * @return this
      */
     public FinishRogueDialogueGroupCsReq clearEntityId() {
@@ -94,7 +94,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 12;</code>
      * @return the entityId
      */
     public int getEntityId() {
@@ -102,7 +102,7 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     }
 
     /**
-     * <code>optional uint32 entity_id = 15;</code>
+     * <code>optional uint32 entity_id = 12;</code>
      * @param value the entityId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 8);
+        output.writeRawByte((byte) 80);
         output.writeUInt32NoTag(dialogueGroupId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 96);
         output.writeUInt32NoTag(entityId);
       }
     }
@@ -205,16 +205,16 @@ public final class FinishRogueDialogueGroupCsReqOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 8: {
+          case 80: {
             // dialogueGroupId
             dialogueGroupId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 120) {
+            if (tag != 96) {
               break;
             }
           }
-          case 120: {
+          case 96: {
             // entityId
             entityId = input.readUInt32();
             bitField0_ |= 0x00000002;

src/generated/main/emu/lunarcore/proto/FirstNpcTalkInfoOuterClass.java

@@ -19,12 +19,12 @@ public final class FirstNpcTalkInfoOuterClass {
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 npc_id = 15;</code>
+     * <code>optional uint32 npc_id = 6;</code>
      */
     private int npcId;
 
     /**
-     * <code>optional bool unk_bool = 12;</code>
+     * <code>optional bool unk_bool = 14;</code>
      */
     private boolean unkBool;
 
@@ -39,7 +39,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 npc_id = 15;</code>
+     * <code>optional uint32 npc_id = 6;</code>
      * @return whether the npcId field is set
      */
     public boolean hasNpcId() {
@@ -47,7 +47,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 npc_id = 15;</code>
+     * <code>optional uint32 npc_id = 6;</code>
      * @return this
      */
     public FirstNpcTalkInfo clearNpcId() {
@@ -57,7 +57,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 npc_id = 15;</code>
+     * <code>optional uint32 npc_id = 6;</code>
      * @return the npcId
      */
     public int getNpcId() {
@@ -65,7 +65,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional uint32 npc_id = 15;</code>
+     * <code>optional uint32 npc_id = 6;</code>
      * @param value the npcId to set
      * @return this
      */
@@ -76,7 +76,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional bool unk_bool = 12;</code>
+     * <code>optional bool unk_bool = 14;</code>
      * @return whether the unkBool field is set
      */
     public boolean hasUnkBool() {
@@ -84,7 +84,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional bool unk_bool = 12;</code>
+     * <code>optional bool unk_bool = 14;</code>
      * @return this
      */
     public FirstNpcTalkInfo clearUnkBool() {
@@ -94,7 +94,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional bool unk_bool = 12;</code>
+     * <code>optional bool unk_bool = 14;</code>
      * @return the unkBool
      */
     public boolean getUnkBool() {
@@ -102,7 +102,7 @@ public final class FirstNpcTalkInfoOuterClass {
     }
 
     /**
-     * <code>optional bool unk_bool = 12;</code>
+     * <code>optional bool unk_bool = 14;</code>
      * @param value the unkBool to set
      * @return this
      */
@@ -177,11 +177,11 @@ public final class FirstNpcTalkInfoOuterClass {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 120);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(npcId);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 96);
+        output.writeRawByte((byte) 112);
         output.writeBoolNoTag(unkBool);
       }
     }
@@ -205,16 +205,16 @@ public final class FirstNpcTalkInfoOuterClass {
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 120: {
+          case 48: {
             // npcId
             npcId = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 96) {
+            if (tag != 112) {
               break;
             }
           }
-          case 96: {
+          case 112: {
             // unkBool
             unkBool = input.readBool();
             bitField0_ |= 0x00000002;