diff --git a/data/ActivityScheduling.json b/data/ActivityScheduling.json new file mode 100644 index 0000000..5f70cbe --- /dev/null +++ b/data/ActivityScheduling.json @@ -0,0 +1,506 @@ +[ + { + "activityId": 1001501, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10015 + }, + { + "activityId": 1001601, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10016 + }, + { + "activityId": 1001701, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10017 + }, + { + "activityId": 1001901, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10019 + }, + { + "activityId": 1002101, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10043 + }, + { + "activityId": 1002501, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10025 + }, + { + "activityId": 1002601, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10044 + }, + { + "activityId": 1002602, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10044 + }, + { + "activityId": 1004001, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10040 + }, + { + "activityId": 1004101, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10041 + }, + { + "activityId": 1004201, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 10042 + }, + { + "activityId": 2000801, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20022 + }, + { + "activityId": 2000803, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20023 + }, + { + "activityId": 2000804, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20023 + }, + { + "activityId": 2000901, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20023 + }, + { + "activityId": 2001101, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001102, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001103, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001104, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001105, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001106, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001107, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001108, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20011 + }, + { + "activityId": 2001202, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20022 + }, + { + "activityId": 2001303, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20023 + }, + { + "activityId": 2001602, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20022 + }, + { + "activityId": 2002201, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20022 + }, + { + "activityId": 2002202, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20022 + }, + { + "activityId": 2002301, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20023 + }, + { + "activityId": 2002302, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20023 + }, + { + "activityId": 2002303, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 20022 + }, + { + "activityId": 3000800, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 30008 + }, + { + "activityId": 3000801, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 30008 + }, + { + "activityId": 4000208, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40002 + }, + { + "activityId": 4000301, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000302, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000303, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000304, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000305, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000306, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000307, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40003 + }, + { + "activityId": 4000401, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40004 + }, + { + "activityId": 4000402, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40004 + }, + { + "activityId": 4000403, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40004 + }, + { + "activityId": 4000404, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40004 + }, + { + "activityId": 4000405, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 40004 + }, + { + "activityId": 5000002, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000003, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000004, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000005, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000006, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000007, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000008, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000009, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000010, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000011, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000013, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50000 + }, + { + "activityId": 5000105, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50001 + }, + { + "activityId": 5000106, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50001 + }, + { + "activityId": 5000107, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50001 + }, + { + "activityId": 5000201, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50002 + }, + { + "activityId": 5000202, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50002 + }, + { + "activityId": 5000203, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50002 + }, + { + "activityId": 5000204, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50002 + }, + { + "activityId": 5000301, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50003 + }, + { + "activityId": 5000302, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50003 + }, + { + "activityId": 5000303, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50003 + }, + { + "activityId": 5000304, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50003 + }, + { + "activityId": 5000408, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50004 + }, + { + "activityId": 5000501, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50005 + }, + { + "activityId": 5000502, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50005 + }, + { + "activityId": 5000503, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50005 + }, + { + "activityId": 5000504, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50005 + }, + { + "activityId": 5000505, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50005 + }, + { + "activityId": 5000601, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50006 + }, + { + "activityId": 5000602, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50006 + }, + { + "activityId": 5000603, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50006 + }, + { + "activityId": 5000604, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50006 + }, + { + "activityId": 5000605, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 50006 + }, + { + "activityId": 6000101, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 60001 + }, + { + "activityId": 6000302, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 60003 + }, + { + "activityId": 6000801, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 60008 + }, + { + "activityId": 6000901, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 60009 + }, + { + "activityId": 8000501, + "beginTime": 1664308800, + "endTime": 4294967295, + "moduleId": 80005 + } +] diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueCellOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueCellOuterClass.java index 25dd37e..5182948 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueCellOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueCellOuterClass.java @@ -49,9 +49,9 @@ public final class ChessRogueCellOuterClass { private int pNKFAINKKCE; /** - * optional uint32 rogue_version_id = 9; + * optional uint32 cell_id = 9; */ - private int rogueVersionId; + private int cellId; /** *
@@ -63,9 +63,9 @@ public final class ChessRogueCellOuterClass {
     private int jLOBGDKNJLN;
 
     /**
-     * optional uint32 AAODCDKAINI = 11;
+     * optional uint32 new_room_id = 11;
      */
-    private int aAODCDKAINI;
+    private int newRoomId;
 
     /**
      * 
@@ -302,39 +302,39 @@ public final class ChessRogueCellOuterClass {
     }
 
     /**
-     * optional uint32 rogue_version_id = 9;
-     * @return whether the rogueVersionId field is set
+     * optional uint32 cell_id = 9;
+     * @return whether the cellId field is set
      */
-    public boolean hasRogueVersionId() {
+    public boolean hasCellId() {
       return (bitField0_ & 0x00000020) != 0;
     }
 
     /**
-     * optional uint32 rogue_version_id = 9;
+     * optional uint32 cell_id = 9;
      * @return this
      */
-    public ChessRogueCell clearRogueVersionId() {
+    public ChessRogueCell clearCellId() {
       bitField0_ &= ~0x00000020;
-      rogueVersionId = 0;
+      cellId = 0;
       return this;
     }
 
     /**
-     * optional uint32 rogue_version_id = 9;
-     * @return the rogueVersionId
+     * optional uint32 cell_id = 9;
+     * @return the cellId
      */
-    public int getRogueVersionId() {
-      return rogueVersionId;
+    public int getCellId() {
+      return cellId;
     }
 
     /**
-     * optional uint32 rogue_version_id = 9;
-     * @param value the rogueVersionId to set
+     * optional uint32 cell_id = 9;
+     * @param value the cellId to set
      * @return this
      */
-    public ChessRogueCell setRogueVersionId(final int value) {
+    public ChessRogueCell setCellId(final int value) {
       bitField0_ |= 0x00000020;
-      rogueVersionId = value;
+      cellId = value;
       return this;
     }
 
@@ -392,39 +392,39 @@ public final class ChessRogueCellOuterClass {
     }
 
     /**
-     * optional uint32 AAODCDKAINI = 11;
-     * @return whether the aAODCDKAINI field is set
+     * optional uint32 new_room_id = 11;
+     * @return whether the newRoomId field is set
      */
-    public boolean hasAAODCDKAINI() {
+    public boolean hasNewRoomId() {
       return (bitField0_ & 0x00000080) != 0;
     }
 
     /**
-     * optional uint32 AAODCDKAINI = 11;
+     * optional uint32 new_room_id = 11;
      * @return this
      */
-    public ChessRogueCell clearAAODCDKAINI() {
+    public ChessRogueCell clearNewRoomId() {
       bitField0_ &= ~0x00000080;
-      aAODCDKAINI = 0;
+      newRoomId = 0;
       return this;
     }
 
     /**
-     * optional uint32 AAODCDKAINI = 11;
-     * @return the aAODCDKAINI
+     * optional uint32 new_room_id = 11;
+     * @return the newRoomId
      */
-    public int getAAODCDKAINI() {
-      return aAODCDKAINI;
+    public int getNewRoomId() {
+      return newRoomId;
     }
 
     /**
-     * optional uint32 AAODCDKAINI = 11;
-     * @param value the aAODCDKAINI to set
+     * optional uint32 new_room_id = 11;
+     * @param value the newRoomId to set
      * @return this
      */
-    public ChessRogueCell setAAODCDKAINI(final int value) {
+    public ChessRogueCell setNewRoomId(final int value) {
       bitField0_ |= 0x00000080;
-      aAODCDKAINI = value;
+      newRoomId = value;
       return this;
     }
 
@@ -612,9 +612,9 @@ public final class ChessRogueCellOuterClass {
         nLBGDNLIONI = other.nLBGDNLIONI;
         fOKKJJADPEA = other.fOKKJJADPEA;
         pNKFAINKKCE = other.pNKFAINKKCE;
-        rogueVersionId = other.rogueVersionId;
+        cellId = other.cellId;
         jLOBGDKNJLN = other.jLOBGDKNJLN;
-        aAODCDKAINI = other.aAODCDKAINI;
+        newRoomId = other.newRoomId;
         pMBLMGDFGAN = other.pMBLMGDFGAN;
         isUnlocked = other.isUnlocked;
         iIJOCONHKND.copyFrom(other.iIJOCONHKND);
@@ -643,14 +643,14 @@ public final class ChessRogueCellOuterClass {
       if (other.hasPNKFAINKKCE()) {
         setPNKFAINKKCE(other.pNKFAINKKCE);
       }
-      if (other.hasRogueVersionId()) {
-        setRogueVersionId(other.rogueVersionId);
+      if (other.hasCellId()) {
+        setCellId(other.cellId);
       }
       if (other.hasJLOBGDKNJLN()) {
         setJLOBGDKNJLN(other.jLOBGDKNJLN);
       }
-      if (other.hasAAODCDKAINI()) {
-        setAAODCDKAINI(other.aAODCDKAINI);
+      if (other.hasNewRoomId()) {
+        setNewRoomId(other.newRoomId);
       }
       if (other.hasPMBLMGDFGAN()) {
         setPMBLMGDFGAN(other.pMBLMGDFGAN);
@@ -676,9 +676,9 @@ public final class ChessRogueCellOuterClass {
       nLBGDNLIONI = 0;
       fOKKJJADPEA = 0;
       pNKFAINKKCE = 0;
-      rogueVersionId = 0;
+      cellId = 0;
       jLOBGDKNJLN = 0;
-      aAODCDKAINI = 0;
+      newRoomId = 0;
       pMBLMGDFGAN = false;
       isUnlocked = false;
       iIJOCONHKND.clear();
@@ -711,9 +711,9 @@ public final class ChessRogueCellOuterClass {
         && (!hasNLBGDNLIONI() || nLBGDNLIONI == other.nLBGDNLIONI)
         && (!hasFOKKJJADPEA() || fOKKJJADPEA == other.fOKKJJADPEA)
         && (!hasPNKFAINKKCE() || pNKFAINKKCE == other.pNKFAINKKCE)
-        && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId)
+        && (!hasCellId() || cellId == other.cellId)
         && (!hasJLOBGDKNJLN() || jLOBGDKNJLN == other.jLOBGDKNJLN)
-        && (!hasAAODCDKAINI() || aAODCDKAINI == other.aAODCDKAINI)
+        && (!hasNewRoomId() || newRoomId == other.newRoomId)
         && (!hasPMBLMGDFGAN() || pMBLMGDFGAN == other.pMBLMGDFGAN)
         && (!hasIsUnlocked() || isUnlocked == other.isUnlocked)
         && (!hasIIJOCONHKND() || iIJOCONHKND.equals(other.iIJOCONHKND));
@@ -743,7 +743,7 @@ public final class ChessRogueCellOuterClass {
       }
       if ((bitField0_ & 0x00000020) != 0) {
         output.writeRawByte((byte) 72);
-        output.writeUInt32NoTag(rogueVersionId);
+        output.writeUInt32NoTag(cellId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeRawByte((byte) 80);
@@ -751,7 +751,7 @@ public final class ChessRogueCellOuterClass {
       }
       if ((bitField0_ & 0x00000080) != 0) {
         output.writeRawByte((byte) 88);
-        output.writeUInt32NoTag(aAODCDKAINI);
+        output.writeUInt32NoTag(newRoomId);
       }
       if ((bitField0_ & 0x00000100) != 0) {
         output.writeRawByte((byte) 48);
@@ -788,13 +788,13 @@ public final class ChessRogueCellOuterClass {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(pNKFAINKKCE);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         size += 1 + ProtoSink.computeUInt32SizeNoTag(jLOBGDKNJLN);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        size += 1 + ProtoSink.computeUInt32SizeNoTag(aAODCDKAINI);
+        size += 1 + ProtoSink.computeUInt32SizeNoTag(newRoomId);
       }
       if ((bitField0_ & 0x00000100) != 0) {
         size += 2;
@@ -861,8 +861,8 @@ public final class ChessRogueCellOuterClass {
             }
           }
           case 72: {
-            // rogueVersionId
-            rogueVersionId = input.readUInt32();
+            // cellId
+            cellId = input.readUInt32();
             bitField0_ |= 0x00000020;
             tag = input.readTag();
             if (tag != 80) {
@@ -879,8 +879,8 @@ public final class ChessRogueCellOuterClass {
             }
           }
           case 88: {
-            // aAODCDKAINI
-            aAODCDKAINI = input.readUInt32();
+            // newRoomId
+            newRoomId = input.readUInt32();
             bitField0_ |= 0x00000080;
             tag = input.readTag();
             if (tag != 48) {
@@ -953,13 +953,13 @@ public final class ChessRogueCellOuterClass {
         output.writeUInt32(FieldNames.pNKFAINKKCE, pNKFAINKKCE);
       }
       if ((bitField0_ & 0x00000020) != 0) {
-        output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId);
+        output.writeUInt32(FieldNames.cellId, cellId);
       }
       if ((bitField0_ & 0x00000040) != 0) {
         output.writeUInt32(FieldNames.jLOBGDKNJLN, jLOBGDKNJLN);
       }
       if ((bitField0_ & 0x00000080) != 0) {
-        output.writeUInt32(FieldNames.aAODCDKAINI, aAODCDKAINI);
+        output.writeUInt32(FieldNames.newRoomId, newRoomId);
       }
       if ((bitField0_ & 0x00000100) != 0) {
         output.writeBool(FieldNames.pMBLMGDFGAN, pMBLMGDFGAN);
@@ -1036,11 +1036,11 @@ public final class ChessRogueCellOuterClass {
             }
             break;
           }
-          case -1457526951:
-          case 1832096103: {
-            if (input.isAtField(FieldNames.rogueVersionId)) {
+          case -1364082147:
+          case 663147800: {
+            if (input.isAtField(FieldNames.cellId)) {
               if (!input.trySkipNullValue()) {
-                rogueVersionId = input.readUInt32();
+                cellId = input.readUInt32();
                 bitField0_ |= 0x00000020;
               }
             } else {
@@ -1059,10 +1059,11 @@ public final class ChessRogueCellOuterClass {
             }
             break;
           }
-          case 2117066584: {
-            if (input.isAtField(FieldNames.aAODCDKAINI)) {
+          case -629039850:
+          case 635252576: {
+            if (input.isAtField(FieldNames.newRoomId)) {
               if (!input.trySkipNullValue()) {
-                aAODCDKAINI = input.readUInt32();
+                newRoomId = input.readUInt32();
                 bitField0_ |= 0x00000080;
               }
             } else {
@@ -1167,11 +1168,11 @@ public final class ChessRogueCellOuterClass {
 
       static final FieldName pNKFAINKKCE = FieldName.forField("PNKFAINKKCE");
 
-      static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id");
+      static final FieldName cellId = FieldName.forField("cellId", "cell_id");
 
       static final FieldName jLOBGDKNJLN = FieldName.forField("JLOBGDKNJLN");
 
-      static final FieldName aAODCDKAINI = FieldName.forField("AAODCDKAINI");
+      static final FieldName newRoomId = FieldName.forField("newRoomId", "new_room_id");
 
       static final FieldName pMBLMGDFGAN = FieldName.forField("PMBLMGDFGAN");
 
diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousDiceOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousDiceOuterClass.java
index 5145695..d13db1e 100644
--- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousDiceOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousDiceOuterClass.java
@@ -29,9 +29,9 @@ public final class ChessRogueNousDiceOuterClass {
      * FEDEMDEEJML JLCEDGIHAFF = 12;
      * 
* - * optional uint32 NDJBBOEJOEH = 2; + * optional uint32 reroll_times = 2; */ - private int nDJBBOEJOEH; + private int rerollTimes; /** *
@@ -47,9 +47,9 @@ public final class ChessRogueNousDiceOuterClass {
      *  1
      * 
* - * optional uint32 KCFGDMFGIAN = 4; + * optional uint32 cheat_times = 4; */ - private int kCFGDMFGIAN; + private int cheatTimes; /** *
@@ -163,10 +163,10 @@ public final class ChessRogueNousDiceOuterClass {
      * FEDEMDEEJML JLCEDGIHAFF = 12;
      * 
* - * optional uint32 NDJBBOEJOEH = 2; - * @return whether the nDJBBOEJOEH field is set + * optional uint32 reroll_times = 2; + * @return whether the rerollTimes field is set */ - public boolean hasNDJBBOEJOEH() { + public boolean hasRerollTimes() { return (bitField0_ & 0x00000002) != 0; } @@ -175,12 +175,12 @@ public final class ChessRogueNousDiceOuterClass { * FEDEMDEEJML JLCEDGIHAFF = 12; *
* - * optional uint32 NDJBBOEJOEH = 2; + * optional uint32 reroll_times = 2; * @return this */ - public ChessRogueNousDice clearNDJBBOEJOEH() { + public ChessRogueNousDice clearRerollTimes() { bitField0_ &= ~0x00000002; - nDJBBOEJOEH = 0; + rerollTimes = 0; return this; } @@ -189,11 +189,11 @@ public final class ChessRogueNousDiceOuterClass { * FEDEMDEEJML JLCEDGIHAFF = 12; * * - * optional uint32 NDJBBOEJOEH = 2; - * @return the nDJBBOEJOEH + * optional uint32 reroll_times = 2; + * @return the rerollTimes */ - public int getNDJBBOEJOEH() { - return nDJBBOEJOEH; + public int getRerollTimes() { + return rerollTimes; } /** @@ -201,13 +201,13 @@ public final class ChessRogueNousDiceOuterClass { * FEDEMDEEJML JLCEDGIHAFF = 12; * * - * optional uint32 NDJBBOEJOEH = 2; - * @param value the nDJBBOEJOEH to set + * optional uint32 reroll_times = 2; + * @param value the rerollTimes to set * @return this */ - public ChessRogueNousDice setNDJBBOEJOEH(final int value) { + public ChessRogueNousDice setRerollTimes(final int value) { bitField0_ |= 0x00000002; - nDJBBOEJOEH = value; + rerollTimes = value; return this; } @@ -269,10 +269,10 @@ public final class ChessRogueNousDiceOuterClass { * 1 * * - * optional uint32 KCFGDMFGIAN = 4; - * @return whether the kCFGDMFGIAN field is set + * optional uint32 cheat_times = 4; + * @return whether the cheatTimes field is set */ - public boolean hasKCFGDMFGIAN() { + public boolean hasCheatTimes() { return (bitField0_ & 0x00000008) != 0; } @@ -281,12 +281,12 @@ public final class ChessRogueNousDiceOuterClass { * 1 * * - * optional uint32 KCFGDMFGIAN = 4; + * optional uint32 cheat_times = 4; * @return this */ - public ChessRogueNousDice clearKCFGDMFGIAN() { + public ChessRogueNousDice clearCheatTimes() { bitField0_ &= ~0x00000008; - kCFGDMFGIAN = 0; + cheatTimes = 0; return this; } @@ -295,11 +295,11 @@ public final class ChessRogueNousDiceOuterClass { * 1 * * - * optional uint32 KCFGDMFGIAN = 4; - * @return the kCFGDMFGIAN + * optional uint32 cheat_times = 4; + * @return the cheatTimes */ - public int getKCFGDMFGIAN() { - return kCFGDMFGIAN; + public int getCheatTimes() { + return cheatTimes; } /** @@ -307,13 +307,13 @@ public final class ChessRogueNousDiceOuterClass { * 1 * * - * optional uint32 KCFGDMFGIAN = 4; - * @param value the kCFGDMFGIAN to set + * optional uint32 cheat_times = 4; + * @param value the cheatTimes to set * @return this */ - public ChessRogueNousDice setKCFGDMFGIAN(final int value) { + public ChessRogueNousDice setCheatTimes(final int value) { bitField0_ |= 0x00000008; - kCFGDMFGIAN = value; + cheatTimes = value; return this; } @@ -751,9 +751,9 @@ public final class ChessRogueNousDiceOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; diceBranchId = other.diceBranchId; - nDJBBOEJOEH = other.nDJBBOEJOEH; + rerollTimes = other.rerollTimes; curSurfaceId = other.curSurfaceId; - kCFGDMFGIAN = other.kCFGDMFGIAN; + cheatTimes = other.cheatTimes; hIJBOPMGBAP = other.hIJBOPMGBAP; gFGCPJOHMEL = other.gFGCPJOHMEL; curSurfaceIndex = other.curSurfaceIndex; @@ -775,14 +775,14 @@ public final class ChessRogueNousDiceOuterClass { if (other.hasDiceBranchId()) { setDiceBranchId(other.diceBranchId); } - if (other.hasNDJBBOEJOEH()) { - setNDJBBOEJOEH(other.nDJBBOEJOEH); + if (other.hasRerollTimes()) { + setRerollTimes(other.rerollTimes); } if (other.hasCurSurfaceId()) { setCurSurfaceId(other.curSurfaceId); } - if (other.hasKCFGDMFGIAN()) { - setKCFGDMFGIAN(other.kCFGDMFGIAN); + if (other.hasCheatTimes()) { + setCheatTimes(other.cheatTimes); } if (other.hasHIJBOPMGBAP()) { setHIJBOPMGBAP(other.hIJBOPMGBAP); @@ -819,9 +819,9 @@ public final class ChessRogueNousDiceOuterClass { cachedSize = -1; bitField0_ = 0; diceBranchId = 0; - nDJBBOEJOEH = 0; + rerollTimes = 0; curSurfaceId = 0; - kCFGDMFGIAN = 0; + cheatTimes = 0; hIJBOPMGBAP = 0; gFGCPJOHMEL = 0; curSurfaceIndex = 0; @@ -856,9 +856,9 @@ public final class ChessRogueNousDiceOuterClass { ChessRogueNousDice other = (ChessRogueNousDice) o; return bitField0_ == other.bitField0_ && (!hasDiceBranchId() || diceBranchId == other.diceBranchId) - && (!hasNDJBBOEJOEH() || nDJBBOEJOEH == other.nDJBBOEJOEH) + && (!hasRerollTimes() || rerollTimes == other.rerollTimes) && (!hasCurSurfaceId() || curSurfaceId == other.curSurfaceId) - && (!hasKCFGDMFGIAN() || kCFGDMFGIAN == other.kCFGDMFGIAN) + && (!hasCheatTimes() || cheatTimes == other.cheatTimes) && (!hasHIJBOPMGBAP() || hIJBOPMGBAP == other.hIJBOPMGBAP) && (!hasGFGCPJOHMEL() || gFGCPJOHMEL == other.gFGCPJOHMEL) && (!hasCurSurfaceIndex() || curSurfaceIndex == other.curSurfaceIndex) @@ -877,7 +877,7 @@ public final class ChessRogueNousDiceOuterClass { } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(nDJBBOEJOEH); + output.writeUInt32NoTag(rerollTimes); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 24); @@ -885,7 +885,7 @@ public final class ChessRogueNousDiceOuterClass { } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(kCFGDMFGIAN); + output.writeUInt32NoTag(cheatTimes); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 40); @@ -930,13 +930,13 @@ public final class ChessRogueNousDiceOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(diceBranchId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nDJBBOEJOEH); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rerollTimes); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curSurfaceId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kCFGDMFGIAN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cheatTimes); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(hIJBOPMGBAP); @@ -982,8 +982,8 @@ public final class ChessRogueNousDiceOuterClass { } } case 16: { - // nDJBBOEJOEH - nDJBBOEJOEH = input.readUInt32(); + // rerollTimes + rerollTimes = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 24) { @@ -1000,8 +1000,8 @@ public final class ChessRogueNousDiceOuterClass { } } case 32: { - // kCFGDMFGIAN - kCFGDMFGIAN = input.readUInt32(); + // cheatTimes + cheatTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 40) { @@ -1107,13 +1107,13 @@ public final class ChessRogueNousDiceOuterClass { output.writeUInt32(FieldNames.diceBranchId, diceBranchId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.nDJBBOEJOEH, nDJBBOEJOEH); + output.writeUInt32(FieldNames.rerollTimes, rerollTimes); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curSurfaceId, curSurfaceId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.kCFGDMFGIAN, kCFGDMFGIAN); + output.writeUInt32(FieldNames.cheatTimes, cheatTimes); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.hIJBOPMGBAP, hIJBOPMGBAP); @@ -1161,10 +1161,11 @@ public final class ChessRogueNousDiceOuterClass { } break; } - case 320828690: { - if (input.isAtField(FieldNames.nDJBBOEJOEH)) { + case -836069386: + case 176620407: { + if (input.isAtField(FieldNames.rerollTimes)) { if (!input.trySkipNullValue()) { - nDJBBOEJOEH = input.readUInt32(); + rerollTimes = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1184,10 +1185,11 @@ public final class ChessRogueNousDiceOuterClass { } break; } - case 2095806643: { - if (input.isAtField(FieldNames.kCFGDMFGIAN)) { + case -2046149069: + case 1318855898: { + if (input.isAtField(FieldNames.cheatTimes)) { if (!input.trySkipNullValue()) { - kCFGDMFGIAN = input.readUInt32(); + cheatTimes = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1341,11 +1343,11 @@ public final class ChessRogueNousDiceOuterClass { static class FieldNames { static final FieldName diceBranchId = FieldName.forField("diceBranchId", "dice_branch_id"); - static final FieldName nDJBBOEJOEH = FieldName.forField("NDJBBOEJOEH"); + static final FieldName rerollTimes = FieldName.forField("rerollTimes", "reroll_times"); static final FieldName curSurfaceId = FieldName.forField("curSurfaceId", "cur_surface_id"); - static final FieldName kCFGDMFGIAN = FieldName.forField("KCFGDMFGIAN"); + static final FieldName cheatTimes = FieldName.forField("cheatTimes", "cheat_times"); static final FieldName hIJBOPMGBAP = FieldName.forField("HIJBOPMGBAP"); diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java index ce722fa..35de81f 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousQueryInfoOuterClass.java @@ -22,7 +22,14 @@ public final class ChessRogueNousQueryInfoOuterClass { /** *
      * MAKPHMAOCHI talent_info = 1;
-     * OFHBFINPHAG JNAGMIALOII = 6;
+     * 
+ * + * optional .OFHBFINPHAG JNAGMIALOII = 6; + */ + private final OFHBFINPHAGOuterClass.OFHBFINPHAG jNAGMIALOII = OFHBFINPHAGOuterClass.OFHBFINPHAG.newInstance(); + + /** + *
      * CLIDPGPDFGK IKGPADCBBPN = 4;
      * 
* @@ -53,7 +60,82 @@ public final class ChessRogueNousQueryInfoOuterClass { /** *
      * MAKPHMAOCHI talent_info = 1;
-     * OFHBFINPHAG JNAGMIALOII = 6;
+     * 
+ * + * optional .OFHBFINPHAG JNAGMIALOII = 6; + * @return whether the jNAGMIALOII field is set + */ + public boolean hasJNAGMIALOII() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 1;
+     * 
+ * + * optional .OFHBFINPHAG JNAGMIALOII = 6; + * @return this + */ + public ChessRogueNousQueryInfo clearJNAGMIALOII() { + bitField0_ &= ~0x00000001; + jNAGMIALOII.clear(); + return this; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 1;
+     * 
+ * + * optional .OFHBFINPHAG JNAGMIALOII = 6; + * + * 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 #getMutableJNAGMIALOII()} if you want to modify it. + * + * @return internal storage object for reading + */ + public OFHBFINPHAGOuterClass.OFHBFINPHAG getJNAGMIALOII() { + return jNAGMIALOII; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 1;
+     * 
+ * + * optional .OFHBFINPHAG JNAGMIALOII = 6; + * + * 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 OFHBFINPHAGOuterClass.OFHBFINPHAG getMutableJNAGMIALOII() { + bitField0_ |= 0x00000001; + return jNAGMIALOII; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 1;
+     * 
+ * + * optional .OFHBFINPHAG JNAGMIALOII = 6; + * @param value the jNAGMIALOII to set + * @return this + */ + public ChessRogueNousQueryInfo setJNAGMIALOII(final OFHBFINPHAGOuterClass.OFHBFINPHAG value) { + bitField0_ |= 0x00000001; + jNAGMIALOII.copyFrom(value); + return this; + } + + /** + *
      * CLIDPGPDFGK IKGPADCBBPN = 4;
      * 
* @@ -61,13 +143,11 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return whether the queryInfo field is set */ public boolean hasQueryInfo() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** *
-     * MAKPHMAOCHI talent_info = 1;
-     * OFHBFINPHAG JNAGMIALOII = 6;
      * CLIDPGPDFGK IKGPADCBBPN = 4;
      * 
* @@ -75,15 +155,13 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo clearQueryInfo() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; queryInfo.clear(); return this; } /** *
-     * MAKPHMAOCHI talent_info = 1;
-     * OFHBFINPHAG JNAGMIALOII = 6;
      * CLIDPGPDFGK IKGPADCBBPN = 4;
      * 
* @@ -102,8 +180,6 @@ public final class ChessRogueNousQueryInfoOuterClass { /** *
-     * MAKPHMAOCHI talent_info = 1;
-     * OFHBFINPHAG JNAGMIALOII = 6;
      * CLIDPGPDFGK IKGPADCBBPN = 4;
      * 
* @@ -116,14 +192,12 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return internal storage object for modifications */ public ChessRogueQueryOuterClass.ChessRogueQuery getMutableQueryInfo() { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return queryInfo; } /** *
-     * MAKPHMAOCHI talent_info = 1;
-     * OFHBFINPHAG JNAGMIALOII = 6;
      * CLIDPGPDFGK IKGPADCBBPN = 4;
      * 
* @@ -133,7 +207,7 @@ public final class ChessRogueNousQueryInfoOuterClass { */ public ChessRogueNousQueryInfo setQueryInfo( final ChessRogueQueryOuterClass.ChessRogueQuery value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; queryInfo.copyFrom(value); return this; } @@ -143,7 +217,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return whether the pHJAFGJHOCO field is set */ public boolean hasPHJAFGJHOCO() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -151,7 +225,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo clearPHJAFGJHOCO() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; pHJAFGJHOCO.clear(); return this; } @@ -180,7 +254,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutablePHJAFGJHOCO() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return pHJAFGJHOCO; } @@ -190,7 +264,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo addPHJAFGJHOCO(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; pHJAFGJHOCO.add(value); return this; } @@ -201,7 +275,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo addAllPHJAFGJHOCO(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; pHJAFGJHOCO.addAll(values); return this; } @@ -211,7 +285,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return whether the cMNHLKGFKOP field is set */ public boolean hasCMNHLKGFKOP() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -219,7 +293,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo clearCMNHLKGFKOP() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; cMNHLKGFKOP.clear(); return this; } @@ -248,7 +322,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableCMNHLKGFKOP() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return cMNHLKGFKOP; } @@ -258,7 +332,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo addCMNHLKGFKOP(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; cMNHLKGFKOP.add(value); return this; } @@ -269,7 +343,7 @@ public final class ChessRogueNousQueryInfoOuterClass { * @return this */ public ChessRogueNousQueryInfo addAllCMNHLKGFKOP(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; cMNHLKGFKOP.addAll(values); return this; } @@ -279,6 +353,7 @@ public final class ChessRogueNousQueryInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + jNAGMIALOII.copyFrom(other.jNAGMIALOII); queryInfo.copyFrom(other.queryInfo); pHJAFGJHOCO.copyFrom(other.pHJAFGJHOCO); cMNHLKGFKOP.copyFrom(other.cMNHLKGFKOP); @@ -292,6 +367,9 @@ public final class ChessRogueNousQueryInfoOuterClass { return this; } cachedSize = -1; + if (other.hasJNAGMIALOII()) { + getMutableJNAGMIALOII().mergeFrom(other.jNAGMIALOII); + } if (other.hasQueryInfo()) { getMutableQueryInfo().mergeFrom(other.queryInfo); } @@ -311,6 +389,7 @@ public final class ChessRogueNousQueryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + jNAGMIALOII.clear(); queryInfo.clear(); pHJAFGJHOCO.clear(); cMNHLKGFKOP.clear(); @@ -324,6 +403,7 @@ public final class ChessRogueNousQueryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + jNAGMIALOII.clearQuick(); queryInfo.clearQuick(); pHJAFGJHOCO.clear(); cMNHLKGFKOP.clear(); @@ -340,6 +420,7 @@ public final class ChessRogueNousQueryInfoOuterClass { } ChessRogueNousQueryInfo other = (ChessRogueNousQueryInfo) o; return bitField0_ == other.bitField0_ + && (!hasJNAGMIALOII() || jNAGMIALOII.equals(other.jNAGMIALOII)) && (!hasQueryInfo() || queryInfo.equals(other.queryInfo)) && (!hasPHJAFGJHOCO() || pHJAFGJHOCO.equals(other.pHJAFGJHOCO)) && (!hasCMNHLKGFKOP() || cMNHLKGFKOP.equals(other.cMNHLKGFKOP)); @@ -348,16 +429,20 @@ public final class ChessRogueNousQueryInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(jNAGMIALOII); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 106); output.writeMessageNoTag(queryInfo); } - if ((bitField0_ & 0x00000002) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < pHJAFGJHOCO.length(); i++) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(pHJAFGJHOCO.array()[i]); } } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < cMNHLKGFKOP.length(); i++) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(cMNHLKGFKOP.array()[i]); @@ -369,12 +454,15 @@ public final class ChessRogueNousQueryInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(queryInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(jNAGMIALOII); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * pHJAFGJHOCO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pHJAFGJHOCO); + size += 1 + ProtoSink.computeMessageSizeNoTag(queryInfo); } if ((bitField0_ & 0x00000004) != 0) { + size += (1 * pHJAFGJHOCO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pHJAFGJHOCO); + } + if ((bitField0_ & 0x00000008) != 0) { size += (1 * cMNHLKGFKOP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cMNHLKGFKOP); } return size; @@ -387,10 +475,19 @@ public final class ChessRogueNousQueryInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 50: { + // jNAGMIALOII + input.readMessage(jNAGMIALOII); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 106) { + break; + } + } case 106: { // queryInfo input.readMessage(queryInfo); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 58) { break; @@ -399,7 +496,7 @@ public final class ChessRogueNousQueryInfoOuterClass { case 58: { // pHJAFGJHOCO [packed=true] input.readPackedUInt32(pHJAFGJHOCO, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 66) { break; @@ -408,7 +505,7 @@ public final class ChessRogueNousQueryInfoOuterClass { case 66: { // cMNHLKGFKOP [packed=true] input.readPackedUInt32(cMNHLKGFKOP, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { break; @@ -427,13 +524,13 @@ public final class ChessRogueNousQueryInfoOuterClass { case 56: { // pHJAFGJHOCO [packed=false] tag = input.readRepeatedUInt32(pHJAFGJHOCO, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; break; } case 64: { // cMNHLKGFKOP [packed=false] tag = input.readRepeatedUInt32(cMNHLKGFKOP, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } } @@ -444,12 +541,15 @@ public final class ChessRogueNousQueryInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.queryInfo, queryInfo); + output.writeMessage(FieldNames.jNAGMIALOII, jNAGMIALOII); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.pHJAFGJHOCO, pHJAFGJHOCO); + output.writeMessage(FieldNames.queryInfo, queryInfo); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.pHJAFGJHOCO, pHJAFGJHOCO); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.cMNHLKGFKOP, cMNHLKGFKOP); } output.endObject(); @@ -462,12 +562,23 @@ public final class ChessRogueNousQueryInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1457066462: { + if (input.isAtField(FieldNames.jNAGMIALOII)) { + if (!input.trySkipNullValue()) { + input.readMessage(jNAGMIALOII); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -1807200874: case -168476219: { if (input.isAtField(FieldNames.queryInfo)) { if (!input.trySkipNullValue()) { input.readMessage(queryInfo); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -478,7 +589,7 @@ public final class ChessRogueNousQueryInfoOuterClass { if (input.isAtField(FieldNames.pHJAFGJHOCO)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(pHJAFGJHOCO); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -489,7 +600,7 @@ public final class ChessRogueNousQueryInfoOuterClass { if (input.isAtField(FieldNames.cMNHLKGFKOP)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(cMNHLKGFKOP); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -549,6 +660,8 @@ public final class ChessRogueNousQueryInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName jNAGMIALOII = FieldName.forField("JNAGMIALOII"); + static final FieldName queryInfo = FieldName.forField("queryInfo", "query_info"); static final FieldName pHJAFGJHOCO = FieldName.forField("PHJAFGJHOCO"); diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java index f887c9b..72131e6 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueNousValueOuterClass.java @@ -19,7 +19,7 @@ public final class ChessRogueNousValueOuterClass { private static final long serialVersionUID = 0L; /** - * optional sint32 value = 13; + * optional uint32 value = 13; */ private int value_; @@ -34,7 +34,7 @@ public final class ChessRogueNousValueOuterClass { } /** - * optional sint32 value = 13; + * optional uint32 value = 13; * @return whether the value_ field is set */ public boolean hasValue() { @@ -42,7 +42,7 @@ public final class ChessRogueNousValueOuterClass { } /** - * optional sint32 value = 13; + * optional uint32 value = 13; * @return this */ public ChessRogueNousValue clearValue() { @@ -52,7 +52,7 @@ public final class ChessRogueNousValueOuterClass { } /** - * optional sint32 value = 13; + * optional uint32 value = 13; * @return the value_ */ public int getValue() { @@ -60,7 +60,7 @@ public final class ChessRogueNousValueOuterClass { } /** - * optional sint32 value = 13; + * optional uint32 value = 13; * @param value the value_ to set * @return this */ @@ -130,7 +130,7 @@ public final class ChessRogueNousValueOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 104); - output.writeSInt32NoTag(value_); + output.writeUInt32NoTag(value_); } } @@ -138,7 +138,7 @@ public final class ChessRogueNousValueOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(value_); + size += 1 + ProtoSink.computeUInt32SizeNoTag(value_); } return size; } @@ -152,7 +152,7 @@ public final class ChessRogueNousValueOuterClass { switch (tag) { case 104: { // value_ - value_ = input.readSInt32(); + value_ = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { @@ -177,7 +177,7 @@ public final class ChessRogueNousValueOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeSInt32(FieldNames.value_, value_); + output.writeUInt32(FieldNames.value_, value_); } output.endObject(); } @@ -192,7 +192,7 @@ public final class ChessRogueNousValueOuterClass { case 111972721: { if (input.isAtField(FieldNames.value_)) { if (!input.trySkipNullValue()) { - value_ = input.readSInt32(); + value_ = input.readUInt32(); bitField0_ |= 0x00000001; } } else { diff --git a/src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java new file mode 100644 index 0000000..d49a3e5 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChessRoguePhaseOuterClass.java @@ -0,0 +1,130 @@ +// 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 ChessRoguePhaseOuterClass { + /** + * Protobuf enum {@code ChessRoguePhase} + */ + public enum ChessRoguePhase implements ProtoEnum { + /** + * NONE = 0; + */ + NONE("NONE", 0), + + /** + * PHASE_ONE = 1; + */ + PHASE_ONE("PHASE_ONE", 1), + + /** + * PHASE_TWO = 2; + */ + PHASE_TWO("PHASE_TWO", 2); + + /** + * NONE = 0; + */ + public static final int NONE_VALUE = 0; + + /** + * PHASE_ONE = 1; + */ + public static final int PHASE_ONE_VALUE = 1; + + /** + * PHASE_TWO = 2; + */ + public static final int PHASE_TWO_VALUE = 2; + + private final String name; + + private final int number; + + private ChessRoguePhase(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 converter() { + return ChessRoguePhaseConverter.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 ChessRoguePhase forNumber(int value) { + return ChessRoguePhaseConverter.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 ChessRoguePhase forNumberOr(int number, ChessRoguePhase other) { + ChessRoguePhase value = forNumber(number); + return value == null ? other : value; + } + + enum ChessRoguePhaseConverter implements ProtoEnum.EnumConverter { + INSTANCE; + + private static final ChessRoguePhase[] lookup = new ChessRoguePhase[3]; + + static { + lookup[0] = NONE; + lookup[1] = PHASE_ONE; + lookup[2] = PHASE_TWO; + } + + @Override + public final ChessRoguePhase forNumber(final int value) { + if (value >= 0 && value < lookup.length) { + return lookup[value]; + } + return null; + } + + @Override + public final ChessRoguePhase forName(final CharSequence value) { + if (value.length() == 4) { + if (ProtoUtil.isEqual("NONE", value)) { + return NONE; + } + } + if (value.length() == 9) { + if (ProtoUtil.isEqual("PHASE_ONE", value)) { + return PHASE_ONE; + } + if (ProtoUtil.isEqual("PHASE_TWO", value)) { + return PHASE_TWO; + } + } + return null; + } + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java new file mode 100644 index 0000000..544f715 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryInfoOuterClass.java @@ -0,0 +1,686 @@ +// 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 ChessRogueQueryInfoOuterClass { + /** + * Protobuf type {@code ChessRogueQueryInfo} + */ + public static final class ChessRogueQueryInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .OFHBFINPHAG JNAGMIALOII = 3; + */ + private final OFHBFINPHAGOuterClass.OFHBFINPHAG jNAGMIALOII = OFHBFINPHAGOuterClass.OFHBFINPHAG.newInstance(); + + /** + * optional .ChessRogueQuery query_info = 14; + */ + private final ChessRogueQueryOuterClass.ChessRogueQuery queryInfo = ChessRogueQueryOuterClass.ChessRogueQuery.newInstance(); + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + */ + private final RepeatedInt cMNHLKGFKOP = RepeatedInt.newEmptyInstance(); + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + */ + private final RepeatedInt pHJAFGJHOCO = RepeatedInt.newEmptyInstance(); + + private ChessRogueQueryInfo() { + } + + /** + * @return a new empty instance of {@code ChessRogueQueryInfo} + */ + public static ChessRogueQueryInfo newInstance() { + return new ChessRogueQueryInfo(); + } + + /** + * optional .OFHBFINPHAG JNAGMIALOII = 3; + * @return whether the jNAGMIALOII field is set + */ + public boolean hasJNAGMIALOII() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .OFHBFINPHAG JNAGMIALOII = 3; + * @return this + */ + public ChessRogueQueryInfo clearJNAGMIALOII() { + bitField0_ &= ~0x00000001; + jNAGMIALOII.clear(); + return this; + } + + /** + * optional .OFHBFINPHAG JNAGMIALOII = 3; + * + * 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 #getMutableJNAGMIALOII()} if you want to modify it. + * + * @return internal storage object for reading + */ + public OFHBFINPHAGOuterClass.OFHBFINPHAG getJNAGMIALOII() { + return jNAGMIALOII; + } + + /** + * optional .OFHBFINPHAG JNAGMIALOII = 3; + * + * 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 OFHBFINPHAGOuterClass.OFHBFINPHAG getMutableJNAGMIALOII() { + bitField0_ |= 0x00000001; + return jNAGMIALOII; + } + + /** + * optional .OFHBFINPHAG JNAGMIALOII = 3; + * @param value the jNAGMIALOII to set + * @return this + */ + public ChessRogueQueryInfo setJNAGMIALOII(final OFHBFINPHAGOuterClass.OFHBFINPHAG value) { + bitField0_ |= 0x00000001; + jNAGMIALOII.copyFrom(value); + return this; + } + + /** + * optional .ChessRogueQuery query_info = 14; + * @return whether the queryInfo field is set + */ + public boolean hasQueryInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ChessRogueQuery query_info = 14; + * @return this + */ + public ChessRogueQueryInfo clearQueryInfo() { + bitField0_ &= ~0x00000002; + queryInfo.clear(); + return this; + } + + /** + * optional .ChessRogueQuery query_info = 14; + * + * 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 #getMutableQueryInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChessRogueQueryOuterClass.ChessRogueQuery getQueryInfo() { + return queryInfo; + } + + /** + * optional .ChessRogueQuery query_info = 14; + * + * 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 ChessRogueQueryOuterClass.ChessRogueQuery getMutableQueryInfo() { + bitField0_ |= 0x00000002; + return queryInfo; + } + + /** + * optional .ChessRogueQuery query_info = 14; + * @param value the queryInfo to set + * @return this + */ + public ChessRogueQueryInfo setQueryInfo(final ChessRogueQueryOuterClass.ChessRogueQuery value) { + bitField0_ |= 0x00000002; + queryInfo.copyFrom(value); + return this; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + * @return whether the cMNHLKGFKOP field is set + */ + public boolean hasCMNHLKGFKOP() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + * @return this + */ + public ChessRogueQueryInfo clearCMNHLKGFKOP() { + bitField0_ &= ~0x00000004; + cMNHLKGFKOP.clear(); + return this; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + * + * 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 #getMutableCMNHLKGFKOP()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getCMNHLKGFKOP() { + return cMNHLKGFKOP; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + * + * 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 getMutableCMNHLKGFKOP() { + bitField0_ |= 0x00000004; + return cMNHLKGFKOP; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + * @param value the cMNHLKGFKOP to add + * @return this + */ + public ChessRogueQueryInfo addCMNHLKGFKOP(final int value) { + bitField0_ |= 0x00000004; + cMNHLKGFKOP.add(value); + return this; + } + + /** + *
+     * MAKPHMAOCHI talent_info = 11;
+     * 
+ * + * repeated uint32 CMNHLKGFKOP = 4; + * @param values the cMNHLKGFKOP to add + * @return this + */ + public ChessRogueQueryInfo addAllCMNHLKGFKOP(final int... values) { + bitField0_ |= 0x00000004; + cMNHLKGFKOP.addAll(values); + return this; + } + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + * @return whether the pHJAFGJHOCO field is set + */ + public boolean hasPHJAFGJHOCO() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + * @return this + */ + public ChessRogueQueryInfo clearPHJAFGJHOCO() { + bitField0_ &= ~0x00000008; + pHJAFGJHOCO.clear(); + return this; + } + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + * + * 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 #getMutablePHJAFGJHOCO()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getPHJAFGJHOCO() { + return pHJAFGJHOCO; + } + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + * + * 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 getMutablePHJAFGJHOCO() { + bitField0_ |= 0x00000008; + return pHJAFGJHOCO; + } + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + * @param value the pHJAFGJHOCO to add + * @return this + */ + public ChessRogueQueryInfo addPHJAFGJHOCO(final int value) { + bitField0_ |= 0x00000008; + pHJAFGJHOCO.add(value); + return this; + } + + /** + *
+     * CGAPFPHEJIA EEFGNNFCDNJ = 6;
+     * CLIDPGPDFGK IKGPADCBBPN = 9;
+     * 
+ * + * repeated uint32 PHJAFGJHOCO = 8; + * @param values the pHJAFGJHOCO to add + * @return this + */ + public ChessRogueQueryInfo addAllPHJAFGJHOCO(final int... values) { + bitField0_ |= 0x00000008; + pHJAFGJHOCO.addAll(values); + return this; + } + + @Override + public ChessRogueQueryInfo copyFrom(final ChessRogueQueryInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + jNAGMIALOII.copyFrom(other.jNAGMIALOII); + queryInfo.copyFrom(other.queryInfo); + cMNHLKGFKOP.copyFrom(other.cMNHLKGFKOP); + pHJAFGJHOCO.copyFrom(other.pHJAFGJHOCO); + } + return this; + } + + @Override + public ChessRogueQueryInfo mergeFrom(final ChessRogueQueryInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasJNAGMIALOII()) { + getMutableJNAGMIALOII().mergeFrom(other.jNAGMIALOII); + } + if (other.hasQueryInfo()) { + getMutableQueryInfo().mergeFrom(other.queryInfo); + } + if (other.hasCMNHLKGFKOP()) { + getMutableCMNHLKGFKOP().addAll(other.cMNHLKGFKOP); + } + if (other.hasPHJAFGJHOCO()) { + getMutablePHJAFGJHOCO().addAll(other.pHJAFGJHOCO); + } + return this; + } + + @Override + public ChessRogueQueryInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + jNAGMIALOII.clear(); + queryInfo.clear(); + cMNHLKGFKOP.clear(); + pHJAFGJHOCO.clear(); + return this; + } + + @Override + public ChessRogueQueryInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + jNAGMIALOII.clearQuick(); + queryInfo.clearQuick(); + cMNHLKGFKOP.clear(); + pHJAFGJHOCO.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChessRogueQueryInfo)) { + return false; + } + ChessRogueQueryInfo other = (ChessRogueQueryInfo) o; + return bitField0_ == other.bitField0_ + && (!hasJNAGMIALOII() || jNAGMIALOII.equals(other.jNAGMIALOII)) + && (!hasQueryInfo() || queryInfo.equals(other.queryInfo)) + && (!hasCMNHLKGFKOP() || cMNHLKGFKOP.equals(other.cMNHLKGFKOP)) + && (!hasPHJAFGJHOCO() || pHJAFGJHOCO.equals(other.pHJAFGJHOCO)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 26); + output.writeMessageNoTag(jNAGMIALOII); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(queryInfo); + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < cMNHLKGFKOP.length(); i++) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(cMNHLKGFKOP.array()[i]); + } + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < pHJAFGJHOCO.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(pHJAFGJHOCO.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(jNAGMIALOII); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(queryInfo); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * cMNHLKGFKOP.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cMNHLKGFKOP); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * pHJAFGJHOCO.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(pHJAFGJHOCO); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChessRogueQueryInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 26: { + // jNAGMIALOII + input.readMessage(jNAGMIALOII); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // queryInfo + input.readMessage(queryInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // cMNHLKGFKOP [packed=true] + input.readPackedUInt32(cMNHLKGFKOP, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // pHJAFGJHOCO [packed=true] + input.readPackedUInt32(pHJAFGJHOCO, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 32: { + // cMNHLKGFKOP [packed=false] + tag = input.readRepeatedUInt32(cMNHLKGFKOP, tag); + bitField0_ |= 0x00000004; + break; + } + case 64: { + // pHJAFGJHOCO [packed=false] + tag = input.readRepeatedUInt32(pHJAFGJHOCO, tag); + bitField0_ |= 0x00000008; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeMessage(FieldNames.jNAGMIALOII, jNAGMIALOII); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.queryInfo, queryInfo); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.cMNHLKGFKOP, cMNHLKGFKOP); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.pHJAFGJHOCO, pHJAFGJHOCO); + } + output.endObject(); + } + + @Override + public ChessRogueQueryInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1457066462: { + if (input.isAtField(FieldNames.jNAGMIALOII)) { + if (!input.trySkipNullValue()) { + input.readMessage(jNAGMIALOII); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1807200874: + case -168476219: { + if (input.isAtField(FieldNames.queryInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(queryInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 243189738: { + if (input.isAtField(FieldNames.cMNHLKGFKOP)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(cMNHLKGFKOP); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1818568397: { + if (input.isAtField(FieldNames.pHJAFGJHOCO)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(pHJAFGJHOCO); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChessRogueQueryInfo clone() { + return new ChessRogueQueryInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChessRogueQueryInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChessRogueQueryInfo(), data).checkInitialized(); + } + + public static ChessRogueQueryInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChessRogueQueryInfo(), input).checkInitialized(); + } + + public static ChessRogueQueryInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChessRogueQueryInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChessRogueQueryInfo messages + */ + public static MessageFactory getFactory() { + return ChessRogueQueryInfoFactory.INSTANCE; + } + + private enum ChessRogueQueryInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChessRogueQueryInfo create() { + return ChessRogueQueryInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName jNAGMIALOII = FieldName.forField("JNAGMIALOII"); + + static final FieldName queryInfo = FieldName.forField("queryInfo", "query_info"); + + static final FieldName cMNHLKGFKOP = FieldName.forField("CMNHLKGFKOP"); + + static final FieldName pHJAFGJHOCO = FieldName.forField("PHJAFGJHOCO"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java index f179aa7..725284c 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryOuterClass.java @@ -21,9 +21,9 @@ public final class ChessRogueQueryOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 KDHBPKCKEAL = 10; + * optional .ChessRoguePhase phase = 10; */ - private int kDHBPKCKEAL; + private int phase; /** * repeated uint32 main_story_id = 8; @@ -51,39 +51,64 @@ public final class ChessRogueQueryOuterClass { } /** - * optional uint32 KDHBPKCKEAL = 10; - * @return whether the kDHBPKCKEAL field is set + * optional .ChessRoguePhase phase = 10; + * @return whether the phase field is set */ - public boolean hasKDHBPKCKEAL() { + public boolean hasPhase() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 KDHBPKCKEAL = 10; + * optional .ChessRoguePhase phase = 10; * @return this */ - public ChessRogueQuery clearKDHBPKCKEAL() { + public ChessRogueQuery clearPhase() { bitField0_ &= ~0x00000001; - kDHBPKCKEAL = 0; + phase = 0; return this; } /** - * optional uint32 KDHBPKCKEAL = 10; - * @return the kDHBPKCKEAL + * optional .ChessRoguePhase phase = 10; + * @return the phase */ - public int getKDHBPKCKEAL() { - return kDHBPKCKEAL; + public ChessRoguePhaseOuterClass.ChessRoguePhase getPhase() { + return ChessRoguePhaseOuterClass.ChessRoguePhase.forNumber(phase); } /** - * optional uint32 KDHBPKCKEAL = 10; - * @param value the kDHBPKCKEAL to set + * Gets the value of the internal enum store. The result is + * equivalent to {@link ChessRogueQuery#getPhase()}.getNumber(). + * + * @return numeric wire representation + */ + public int getPhaseValue() { + return phase; + } + + /** + * 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 ChessRoguePhaseOuterClass.ChessRoguePhase}. Setting an invalid value + * can cause {@link ChessRogueQuery#getPhase()} to return null + * + * @param value the numeric wire value to set * @return this */ - public ChessRogueQuery setKDHBPKCKEAL(final int value) { + public ChessRogueQuery setPhaseValue(final int value) { bitField0_ |= 0x00000001; - kDHBPKCKEAL = value; + phase = value; + return this; + } + + /** + * optional .ChessRoguePhase phase = 10; + * @param value the phase to set + * @return this + */ + public ChessRogueQuery setPhase(final ChessRoguePhaseOuterClass.ChessRoguePhase value) { + bitField0_ |= 0x00000001; + phase = value.getNumber(); return this; } @@ -299,7 +324,7 @@ public final class ChessRogueQueryOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - kDHBPKCKEAL = other.kDHBPKCKEAL; + phase = other.phase; mainStoryId.copyFrom(other.mainStoryId); eKLAFMBHNIP.copyFrom(other.eKLAFMBHNIP); diceInfo.copyFrom(other.diceInfo); @@ -313,8 +338,8 @@ public final class ChessRogueQueryOuterClass { return this; } cachedSize = -1; - if (other.hasKDHBPKCKEAL()) { - setKDHBPKCKEAL(other.kDHBPKCKEAL); + if (other.hasPhase()) { + setPhaseValue(other.phase); } if (other.hasMainStoryId()) { getMutableMainStoryId().addAll(other.mainStoryId); @@ -335,7 +360,7 @@ public final class ChessRogueQueryOuterClass { } cachedSize = -1; bitField0_ = 0; - kDHBPKCKEAL = 0; + phase = 0; mainStoryId.clear(); eKLAFMBHNIP.clear(); diceInfo.clear(); @@ -365,7 +390,7 @@ public final class ChessRogueQueryOuterClass { } ChessRogueQuery other = (ChessRogueQuery) o; return bitField0_ == other.bitField0_ - && (!hasKDHBPKCKEAL() || kDHBPKCKEAL == other.kDHBPKCKEAL) + && (!hasPhase() || phase == other.phase) && (!hasMainStoryId() || mainStoryId.equals(other.mainStoryId)) && (!hasEKLAFMBHNIP() || eKLAFMBHNIP.equals(other.eKLAFMBHNIP)) && (!hasDiceInfo() || diceInfo.equals(other.diceInfo)); @@ -375,7 +400,7 @@ public final class ChessRogueQueryOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(kDHBPKCKEAL); + output.writeEnumNoTag(phase); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mainStoryId.length(); i++) { @@ -401,7 +426,7 @@ public final class ChessRogueQueryOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kDHBPKCKEAL); + size += 1 + ProtoSink.computeEnumSizeNoTag(phase); } if ((bitField0_ & 0x00000002) != 0) { size += (1 * mainStoryId.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainStoryId); @@ -423,9 +448,12 @@ public final class ChessRogueQueryOuterClass { while (true) { switch (tag) { case 80: { - // kDHBPKCKEAL - kDHBPKCKEAL = input.readUInt32(); - bitField0_ |= 0x00000001; + // phase + final int value = input.readInt32(); + if (ChessRoguePhaseOuterClass.ChessRoguePhase.forNumber(value) != null) { + phase = value; + bitField0_ |= 0x00000001; + } tag = input.readTag(); if (tag != 66) { break; @@ -480,7 +508,7 @@ public final class ChessRogueQueryOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.kDHBPKCKEAL, kDHBPKCKEAL); + output.writeEnum(FieldNames.phase, phase, ChessRoguePhaseOuterClass.ChessRoguePhase.converter()); } if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.mainStoryId, mainStoryId); @@ -501,11 +529,16 @@ public final class ChessRogueQueryOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 160463162: { - if (input.isAtField(FieldNames.kDHBPKCKEAL)) { + case 106629499: { + if (input.isAtField(FieldNames.phase)) { if (!input.trySkipNullValue()) { - kDHBPKCKEAL = input.readUInt32(); - bitField0_ |= 0x00000001; + final ChessRoguePhaseOuterClass.ChessRoguePhase value = input.readEnum(ChessRoguePhaseOuterClass.ChessRoguePhase.converter()); + if (value != null) { + phase = value.getNumber(); + bitField0_ |= 0x00000001; + } else { + input.skipUnknownEnumValue(); + } } } else { input.skipUnknownField(); @@ -925,7 +958,7 @@ public final class ChessRogueQueryOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName kDHBPKCKEAL = FieldName.forField("KDHBPKCKEAL"); + static final FieldName phase = FieldName.forField("phase"); static final FieldName mainStoryId = FieldName.forField("mainStoryId", "main_story_id"); diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java index 4190f0e..b0ae37a 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueQueryScRspOuterClass.java @@ -23,18 +23,22 @@ public final class ChessRogueQueryScRspOuterClass { */ private int retcode; + /** + *
+     * HLODEEONDBF OBGFEMEOJCE = 15;
+     * HFKELKECMJE MKCLHOMEICF = 4;
+     * 
+ * + * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; + */ + private final ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo nOGDNLNLMJH = ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo.newInstance(); + /** * optional .ChessRogueNousQueryInfo rogue_nous = 10; */ private final ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo rogueNous = ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo.newInstance(); /** - *
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     * JDFLHMLFFIL NOGDNLNLMJH = 9;
-     * 
- * * optional .ChessRogueCurrentInfo current_info = 12; */ private final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo currentInfo = ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo.newInstance(); @@ -86,12 +90,95 @@ public final class ChessRogueQueryScRspOuterClass { return this; } + /** + *
+     * HLODEEONDBF OBGFEMEOJCE = 15;
+     * HFKELKECMJE MKCLHOMEICF = 4;
+     * 
+ * + * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; + * @return whether the nOGDNLNLMJH field is set + */ + public boolean hasNOGDNLNLMJH() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + *
+     * HLODEEONDBF OBGFEMEOJCE = 15;
+     * HFKELKECMJE MKCLHOMEICF = 4;
+     * 
+ * + * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; + * @return this + */ + public ChessRogueQueryScRsp clearNOGDNLNLMJH() { + bitField0_ &= ~0x00000002; + nOGDNLNLMJH.clear(); + return this; + } + + /** + *
+     * HLODEEONDBF OBGFEMEOJCE = 15;
+     * HFKELKECMJE MKCLHOMEICF = 4;
+     * 
+ * + * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; + * + * 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 #getMutableNOGDNLNLMJH()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo getNOGDNLNLMJH() { + return nOGDNLNLMJH; + } + + /** + *
+     * HLODEEONDBF OBGFEMEOJCE = 15;
+     * HFKELKECMJE MKCLHOMEICF = 4;
+     * 
+ * + * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; + * + * 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 ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo getMutableNOGDNLNLMJH() { + bitField0_ |= 0x00000002; + return nOGDNLNLMJH; + } + + /** + *
+     * HLODEEONDBF OBGFEMEOJCE = 15;
+     * HFKELKECMJE MKCLHOMEICF = 4;
+     * 
+ * + * optional .ChessRogueQueryInfo NOGDNLNLMJH = 9; + * @param value the nOGDNLNLMJH to set + * @return this + */ + public ChessRogueQueryScRsp setNOGDNLNLMJH( + final ChessRogueQueryInfoOuterClass.ChessRogueQueryInfo value) { + bitField0_ |= 0x00000002; + nOGDNLNLMJH.copyFrom(value); + return this; + } + /** * optional .ChessRogueNousQueryInfo rogue_nous = 10; * @return whether the rogueNous field is set */ public boolean hasRogueNous() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -99,7 +186,7 @@ public final class ChessRogueQueryScRspOuterClass { * @return this */ public ChessRogueQueryScRsp clearRogueNous() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; rogueNous.clear(); return this; } @@ -128,7 +215,7 @@ public final class ChessRogueQueryScRspOuterClass { * @return internal storage object for modifications */ public ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo getMutableRogueNous() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return rogueNous; } @@ -139,48 +226,30 @@ public final class ChessRogueQueryScRspOuterClass { */ public ChessRogueQueryScRsp setRogueNous( final ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; rogueNous.copyFrom(value); return this; } /** - *
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     * JDFLHMLFFIL NOGDNLNLMJH = 9;
-     * 
- * * optional .ChessRogueCurrentInfo current_info = 12; * @return whether the currentInfo field is set */ public boolean hasCurrentInfo() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - *
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     * JDFLHMLFFIL NOGDNLNLMJH = 9;
-     * 
- * * optional .ChessRogueCurrentInfo current_info = 12; * @return this */ public ChessRogueQueryScRsp clearCurrentInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; currentInfo.clear(); return this; } /** - *
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     * JDFLHMLFFIL NOGDNLNLMJH = 9;
-     * 
- * * optional .ChessRogueCurrentInfo current_info = 12; * * This method returns the internal storage object without modifying any has state. @@ -195,12 +264,6 @@ public final class ChessRogueQueryScRspOuterClass { } /** - *
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     * JDFLHMLFFIL NOGDNLNLMJH = 9;
-     * 
- * * optional .ChessRogueCurrentInfo current_info = 12; * * This method returns the internal storage object and sets the corresponding @@ -210,24 +273,18 @@ public final class ChessRogueQueryScRspOuterClass { * @return internal storage object for modifications */ public ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo getMutableCurrentInfo() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return currentInfo; } /** - *
-     * HLODEEONDBF OBGFEMEOJCE = 15;
-     * HFKELKECMJE MKCLHOMEICF = 4;
-     * JDFLHMLFFIL NOGDNLNLMJH = 9;
-     * 
- * * optional .ChessRogueCurrentInfo current_info = 12; * @param value the currentInfo to set * @return this */ public ChessRogueQueryScRsp setCurrentInfo( final ChessRogueCurrentInfoOuterClass.ChessRogueCurrentInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; currentInfo.copyFrom(value); return this; } @@ -238,6 +295,7 @@ public final class ChessRogueQueryScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; + nOGDNLNLMJH.copyFrom(other.nOGDNLNLMJH); rogueNous.copyFrom(other.rogueNous); currentInfo.copyFrom(other.currentInfo); } @@ -253,6 +311,9 @@ public final class ChessRogueQueryScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasNOGDNLNLMJH()) { + getMutableNOGDNLNLMJH().mergeFrom(other.nOGDNLNLMJH); + } if (other.hasRogueNous()) { getMutableRogueNous().mergeFrom(other.rogueNous); } @@ -270,6 +331,7 @@ public final class ChessRogueQueryScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; + nOGDNLNLMJH.clear(); rogueNous.clear(); currentInfo.clear(); return this; @@ -282,6 +344,7 @@ public final class ChessRogueQueryScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + nOGDNLNLMJH.clearQuick(); rogueNous.clearQuick(); currentInfo.clearQuick(); return this; @@ -298,6 +361,7 @@ public final class ChessRogueQueryScRspOuterClass { ChessRogueQueryScRsp other = (ChessRogueQueryScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) + && (!hasNOGDNLNLMJH() || nOGDNLNLMJH.equals(other.nOGDNLNLMJH)) && (!hasRogueNous() || rogueNous.equals(other.rogueNous)) && (!hasCurrentInfo() || currentInfo.equals(other.currentInfo)); } @@ -309,10 +373,14 @@ public final class ChessRogueQueryScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(nOGDNLNLMJH); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 82); output.writeMessageNoTag(rogueNous); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 98); output.writeMessageNoTag(currentInfo); } @@ -325,9 +393,12 @@ public final class ChessRogueQueryScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueNous); + size += 1 + ProtoSink.computeMessageSizeNoTag(nOGDNLNLMJH); } if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueNous); + } + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(currentInfo); } return size; @@ -345,6 +416,15 @@ public final class ChessRogueQueryScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // nOGDNLNLMJH + input.readMessage(nOGDNLNLMJH); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 82) { break; } @@ -352,7 +432,7 @@ public final class ChessRogueQueryScRspOuterClass { case 82: { // rogueNous input.readMessage(rogueNous); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 98) { break; @@ -361,7 +441,7 @@ public final class ChessRogueQueryScRspOuterClass { case 98: { // currentInfo input.readMessage(currentInfo); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { break; @@ -388,9 +468,12 @@ public final class ChessRogueQueryScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueNous, rogueNous); + output.writeMessage(FieldNames.nOGDNLNLMJH, nOGDNLNLMJH); } if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.rogueNous, rogueNous); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.currentInfo, currentInfo); } output.endObject(); @@ -414,12 +497,23 @@ public final class ChessRogueQueryScRspOuterClass { } break; } + case 459821233: { + if (input.isAtField(FieldNames.nOGDNLNLMJH)) { + if (!input.trySkipNullValue()) { + input.readMessage(nOGDNLNLMJH); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 655959321: case -1124433052: { if (input.isAtField(FieldNames.rogueNous)) { if (!input.trySkipNullValue()) { input.readMessage(rogueNous); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -431,7 +525,7 @@ public final class ChessRogueQueryScRspOuterClass { if (input.isAtField(FieldNames.currentInfo)) { if (!input.trySkipNullValue()) { input.readMessage(currentInfo); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -493,6 +587,8 @@ public final class ChessRogueQueryScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName nOGDNLNLMJH = FieldName.forField("NOGDNLNLMJH"); + static final FieldName rogueNous = FieldName.forField("rogueNous", "rogue_nous"); static final FieldName currentInfo = FieldName.forField("currentInfo", "current_info"); diff --git a/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java new file mode 100644 index 0000000..8fbfabf --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DialogueResultOuterClass.java @@ -0,0 +1,482 @@ +// 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 DialogueResultOuterClass { + /** + * Protobuf type {@code DialogueResult} + */ + public static final class DialogueResult extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 HFHKBMGBJAN = 15; + */ + private int hFHKBMGBJAN; + + /** + * optional .ItemList item_result = 6; + */ + private final ItemListOuterClass.ItemList itemResult = ItemListOuterClass.ItemList.newInstance(); + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + */ + private final RepeatedInt bLGIMDCNDHJ = RepeatedInt.newEmptyInstance(); + + private DialogueResult() { + } + + /** + * @return a new empty instance of {@code DialogueResult} + */ + public static DialogueResult newInstance() { + return new DialogueResult(); + } + + /** + * optional uint32 HFHKBMGBJAN = 15; + * @return whether the hFHKBMGBJAN field is set + */ + public boolean hasHFHKBMGBJAN() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 HFHKBMGBJAN = 15; + * @return this + */ + public DialogueResult clearHFHKBMGBJAN() { + bitField0_ &= ~0x00000001; + hFHKBMGBJAN = 0; + return this; + } + + /** + * optional uint32 HFHKBMGBJAN = 15; + * @return the hFHKBMGBJAN + */ + public int getHFHKBMGBJAN() { + return hFHKBMGBJAN; + } + + /** + * optional uint32 HFHKBMGBJAN = 15; + * @param value the hFHKBMGBJAN to set + * @return this + */ + public DialogueResult setHFHKBMGBJAN(final int value) { + bitField0_ |= 0x00000001; + hFHKBMGBJAN = value; + return this; + } + + /** + * optional .ItemList item_result = 6; + * @return whether the itemResult field is set + */ + public boolean hasItemResult() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ItemList item_result = 6; + * @return this + */ + public DialogueResult clearItemResult() { + bitField0_ &= ~0x00000002; + itemResult.clear(); + return this; + } + + /** + * optional .ItemList item_result = 6; + * + * 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 #getMutableItemResult()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getItemResult() { + return itemResult; + } + + /** + * optional .ItemList item_result = 6; + * + * 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 ItemListOuterClass.ItemList getMutableItemResult() { + bitField0_ |= 0x00000002; + return itemResult; + } + + /** + * optional .ItemList item_result = 6; + * @param value the itemResult to set + * @return this + */ + public DialogueResult setItemResult(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000002; + itemResult.copyFrom(value); + return this; + } + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + * @return whether the bLGIMDCNDHJ field is set + */ + public boolean hasBLGIMDCNDHJ() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + * @return this + */ + public DialogueResult clearBLGIMDCNDHJ() { + bitField0_ &= ~0x00000004; + bLGIMDCNDHJ.clear(); + return this; + } + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + * + * 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 #getMutableBLGIMDCNDHJ()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getBLGIMDCNDHJ() { + return bLGIMDCNDHJ; + } + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + * + * 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 getMutableBLGIMDCNDHJ() { + bitField0_ |= 0x00000004; + return bLGIMDCNDHJ; + } + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + * @param value the bLGIMDCNDHJ to add + * @return this + */ + public DialogueResult addBLGIMDCNDHJ(final int value) { + bitField0_ |= 0x00000004; + bLGIMDCNDHJ.add(value); + return this; + } + + /** + * repeated uint32 BLGIMDCNDHJ = 5; + * @param values the bLGIMDCNDHJ to add + * @return this + */ + public DialogueResult addAllBLGIMDCNDHJ(final int... values) { + bitField0_ |= 0x00000004; + bLGIMDCNDHJ.addAll(values); + return this; + } + + @Override + public DialogueResult copyFrom(final DialogueResult other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + hFHKBMGBJAN = other.hFHKBMGBJAN; + itemResult.copyFrom(other.itemResult); + bLGIMDCNDHJ.copyFrom(other.bLGIMDCNDHJ); + } + return this; + } + + @Override + public DialogueResult mergeFrom(final DialogueResult other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasHFHKBMGBJAN()) { + setHFHKBMGBJAN(other.hFHKBMGBJAN); + } + if (other.hasItemResult()) { + getMutableItemResult().mergeFrom(other.itemResult); + } + if (other.hasBLGIMDCNDHJ()) { + getMutableBLGIMDCNDHJ().addAll(other.bLGIMDCNDHJ); + } + return this; + } + + @Override + public DialogueResult clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + hFHKBMGBJAN = 0; + itemResult.clear(); + bLGIMDCNDHJ.clear(); + return this; + } + + @Override + public DialogueResult clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + itemResult.clearQuick(); + bLGIMDCNDHJ.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DialogueResult)) { + return false; + } + DialogueResult other = (DialogueResult) o; + return bitField0_ == other.bitField0_ + && (!hasHFHKBMGBJAN() || hFHKBMGBJAN == other.hFHKBMGBJAN) + && (!hasItemResult() || itemResult.equals(other.itemResult)) + && (!hasBLGIMDCNDHJ() || bLGIMDCNDHJ.equals(other.bLGIMDCNDHJ)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(hFHKBMGBJAN); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(itemResult); + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < bLGIMDCNDHJ.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(bLGIMDCNDHJ.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(hFHKBMGBJAN); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(itemResult); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * bLGIMDCNDHJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(bLGIMDCNDHJ); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DialogueResult mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 120: { + // hFHKBMGBJAN + hFHKBMGBJAN = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // itemResult + input.readMessage(itemResult); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // bLGIMDCNDHJ [packed=true] + input.readPackedUInt32(bLGIMDCNDHJ, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 40: { + // bLGIMDCNDHJ [packed=false] + tag = input.readRepeatedUInt32(bLGIMDCNDHJ, tag); + bitField0_ |= 0x00000004; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.hFHKBMGBJAN, hFHKBMGBJAN); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.itemResult, itemResult); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.bLGIMDCNDHJ, bLGIMDCNDHJ); + } + output.endObject(); + } + + @Override + public DialogueResult mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -110713808: { + if (input.isAtField(FieldNames.hFHKBMGBJAN)) { + if (!input.trySkipNullValue()) { + hFHKBMGBJAN = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1957844240: + case -424526135: { + if (input.isAtField(FieldNames.itemResult)) { + if (!input.trySkipNullValue()) { + input.readMessage(itemResult); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 135413912: { + if (input.isAtField(FieldNames.bLGIMDCNDHJ)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(bLGIMDCNDHJ); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DialogueResult clone() { + return new DialogueResult().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DialogueResult parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DialogueResult(), data).checkInitialized(); + } + + public static DialogueResult parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DialogueResult(), input).checkInitialized(); + } + + public static DialogueResult parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DialogueResult(), input).checkInitialized(); + } + + /** + * @return factory for creating DialogueResult messages + */ + public static MessageFactory getFactory() { + return DialogueResultFactory.INSTANCE; + } + + private enum DialogueResultFactory implements MessageFactory { + INSTANCE; + + @Override + public DialogueResult create() { + return DialogueResult.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName hFHKBMGBJAN = FieldName.forField("HFHKBMGBJAN"); + + static final FieldName itemResult = FieldName.forField("itemResult", "item_result"); + + static final FieldName bLGIMDCNDHJ = FieldName.forField("BLGIMDCNDHJ"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/OFHBFINPHAGOuterClass.java b/src/generated/main/emu/lunarcore/proto/OFHBFINPHAGOuterClass.java new file mode 100644 index 0000000..c1150c9 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/OFHBFINPHAGOuterClass.java @@ -0,0 +1,299 @@ +// 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 OFHBFINPHAGOuterClass { + /** + * Protobuf type {@code OFHBFINPHAG} + */ + public static final class OFHBFINPHAG extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * repeated uint32 AALLCOBKIDB = 14; + */ + private final RepeatedInt aALLCOBKIDB = RepeatedInt.newEmptyInstance(); + + private OFHBFINPHAG() { + } + + /** + * @return a new empty instance of {@code OFHBFINPHAG} + */ + public static OFHBFINPHAG newInstance() { + return new OFHBFINPHAG(); + } + + /** + * repeated uint32 AALLCOBKIDB = 14; + * @return whether the aALLCOBKIDB field is set + */ + public boolean hasAALLCOBKIDB() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * repeated uint32 AALLCOBKIDB = 14; + * @return this + */ + public OFHBFINPHAG clearAALLCOBKIDB() { + bitField0_ &= ~0x00000001; + aALLCOBKIDB.clear(); + return this; + } + + /** + * repeated uint32 AALLCOBKIDB = 14; + * + * 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 #getMutableAALLCOBKIDB()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getAALLCOBKIDB() { + return aALLCOBKIDB; + } + + /** + * repeated uint32 AALLCOBKIDB = 14; + * + * 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 getMutableAALLCOBKIDB() { + bitField0_ |= 0x00000001; + return aALLCOBKIDB; + } + + /** + * repeated uint32 AALLCOBKIDB = 14; + * @param value the aALLCOBKIDB to add + * @return this + */ + public OFHBFINPHAG addAALLCOBKIDB(final int value) { + bitField0_ |= 0x00000001; + aALLCOBKIDB.add(value); + return this; + } + + /** + * repeated uint32 AALLCOBKIDB = 14; + * @param values the aALLCOBKIDB to add + * @return this + */ + public OFHBFINPHAG addAllAALLCOBKIDB(final int... values) { + bitField0_ |= 0x00000001; + aALLCOBKIDB.addAll(values); + return this; + } + + @Override + public OFHBFINPHAG copyFrom(final OFHBFINPHAG other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + aALLCOBKIDB.copyFrom(other.aALLCOBKIDB); + } + return this; + } + + @Override + public OFHBFINPHAG mergeFrom(final OFHBFINPHAG other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasAALLCOBKIDB()) { + getMutableAALLCOBKIDB().addAll(other.aALLCOBKIDB); + } + return this; + } + + @Override + public OFHBFINPHAG clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + aALLCOBKIDB.clear(); + return this; + } + + @Override + public OFHBFINPHAG clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + aALLCOBKIDB.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof OFHBFINPHAG)) { + return false; + } + OFHBFINPHAG other = (OFHBFINPHAG) o; + return bitField0_ == other.bitField0_ + && (!hasAALLCOBKIDB() || aALLCOBKIDB.equals(other.aALLCOBKIDB)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + for (int i = 0; i < aALLCOBKIDB.length(); i++) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(aALLCOBKIDB.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += (1 * aALLCOBKIDB.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(aALLCOBKIDB); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public OFHBFINPHAG mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 114: { + // aALLCOBKIDB [packed=true] + input.readPackedUInt32(aALLCOBKIDB, 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 112: { + // aALLCOBKIDB [packed=false] + tag = input.readRepeatedUInt32(aALLCOBKIDB, tag); + bitField0_ |= 0x00000001; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeRepeatedUInt32(FieldNames.aALLCOBKIDB, aALLCOBKIDB); + } + output.endObject(); + } + + @Override + public OFHBFINPHAG mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 313982738: { + if (input.isAtField(FieldNames.aALLCOBKIDB)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(aALLCOBKIDB); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public OFHBFINPHAG clone() { + return new OFHBFINPHAG().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static OFHBFINPHAG parseFrom(final byte[] data) throws InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new OFHBFINPHAG(), data).checkInitialized(); + } + + public static OFHBFINPHAG parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new OFHBFINPHAG(), input).checkInitialized(); + } + + public static OFHBFINPHAG parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new OFHBFINPHAG(), input).checkInitialized(); + } + + /** + * @return factory for creating OFHBFINPHAG messages + */ + public static MessageFactory getFactory() { + return OFHBFINPHAGFactory.INSTANCE; + } + + private enum OFHBFINPHAGFactory implements MessageFactory { + INSTANCE; + + @Override + public OFHBFINPHAG create() { + return OFHBFINPHAG.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName aALLCOBKIDB = FieldName.forField("AALLCOBKIDB"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java index 07b1434..0a34703 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueUpdateOuterClass.java @@ -19,19 +19,19 @@ public final class RogueUpdateOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 area_id = 7; + * optional uint32 last_common_area_id = 7; */ - private int areaId; + private int lastCommonAreaId; /** - * optional uint32 LOKIGPFHHIN = 8; + * optional uint32 last_rogue_type_id = 8; */ - private int lOKIGPFHHIN; + private int lastRogueTypeId; /** - * optional uint32 KPJNNFIINNB = 12; + * optional uint32 rogue_type_id = 12; */ - private int kPJNNFIINNB; + private int rogueTypeId; private RogueUpdate() { } @@ -44,113 +44,113 @@ public final class RogueUpdateOuterClass { } /** - * optional uint32 area_id = 7; - * @return whether the areaId field is set + * optional uint32 last_common_area_id = 7; + * @return whether the lastCommonAreaId field is set */ - public boolean hasAreaId() { + public boolean hasLastCommonAreaId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 area_id = 7; + * optional uint32 last_common_area_id = 7; * @return this */ - public RogueUpdate clearAreaId() { + public RogueUpdate clearLastCommonAreaId() { bitField0_ &= ~0x00000001; - areaId = 0; + lastCommonAreaId = 0; return this; } /** - * optional uint32 area_id = 7; - * @return the areaId + * optional uint32 last_common_area_id = 7; + * @return the lastCommonAreaId */ - public int getAreaId() { - return areaId; + public int getLastCommonAreaId() { + return lastCommonAreaId; } /** - * optional uint32 area_id = 7; - * @param value the areaId to set + * optional uint32 last_common_area_id = 7; + * @param value the lastCommonAreaId to set * @return this */ - public RogueUpdate setAreaId(final int value) { + public RogueUpdate setLastCommonAreaId(final int value) { bitField0_ |= 0x00000001; - areaId = value; + lastCommonAreaId = value; return this; } /** - * optional uint32 LOKIGPFHHIN = 8; - * @return whether the lOKIGPFHHIN field is set + * optional uint32 last_rogue_type_id = 8; + * @return whether the lastRogueTypeId field is set */ - public boolean hasLOKIGPFHHIN() { + public boolean hasLastRogueTypeId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 LOKIGPFHHIN = 8; + * optional uint32 last_rogue_type_id = 8; * @return this */ - public RogueUpdate clearLOKIGPFHHIN() { + public RogueUpdate clearLastRogueTypeId() { bitField0_ &= ~0x00000002; - lOKIGPFHHIN = 0; + lastRogueTypeId = 0; return this; } /** - * optional uint32 LOKIGPFHHIN = 8; - * @return the lOKIGPFHHIN + * optional uint32 last_rogue_type_id = 8; + * @return the lastRogueTypeId */ - public int getLOKIGPFHHIN() { - return lOKIGPFHHIN; + public int getLastRogueTypeId() { + return lastRogueTypeId; } /** - * optional uint32 LOKIGPFHHIN = 8; - * @param value the lOKIGPFHHIN to set + * optional uint32 last_rogue_type_id = 8; + * @param value the lastRogueTypeId to set * @return this */ - public RogueUpdate setLOKIGPFHHIN(final int value) { + public RogueUpdate setLastRogueTypeId(final int value) { bitField0_ |= 0x00000002; - lOKIGPFHHIN = value; + lastRogueTypeId = value; return this; } /** - * optional uint32 KPJNNFIINNB = 12; - * @return whether the kPJNNFIINNB field is set + * optional uint32 rogue_type_id = 12; + * @return whether the rogueTypeId field is set */ - public boolean hasKPJNNFIINNB() { + public boolean hasRogueTypeId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 KPJNNFIINNB = 12; + * optional uint32 rogue_type_id = 12; * @return this */ - public RogueUpdate clearKPJNNFIINNB() { + public RogueUpdate clearRogueTypeId() { bitField0_ &= ~0x00000004; - kPJNNFIINNB = 0; + rogueTypeId = 0; return this; } /** - * optional uint32 KPJNNFIINNB = 12; - * @return the kPJNNFIINNB + * optional uint32 rogue_type_id = 12; + * @return the rogueTypeId */ - public int getKPJNNFIINNB() { - return kPJNNFIINNB; + public int getRogueTypeId() { + return rogueTypeId; } /** - * optional uint32 KPJNNFIINNB = 12; - * @param value the kPJNNFIINNB to set + * optional uint32 rogue_type_id = 12; + * @param value the rogueTypeId to set * @return this */ - public RogueUpdate setKPJNNFIINNB(final int value) { + public RogueUpdate setRogueTypeId(final int value) { bitField0_ |= 0x00000004; - kPJNNFIINNB = value; + rogueTypeId = value; return this; } @@ -159,9 +159,9 @@ public final class RogueUpdateOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - areaId = other.areaId; - lOKIGPFHHIN = other.lOKIGPFHHIN; - kPJNNFIINNB = other.kPJNNFIINNB; + lastCommonAreaId = other.lastCommonAreaId; + lastRogueTypeId = other.lastRogueTypeId; + rogueTypeId = other.rogueTypeId; } return this; } @@ -172,14 +172,14 @@ public final class RogueUpdateOuterClass { return this; } cachedSize = -1; - if (other.hasAreaId()) { - setAreaId(other.areaId); + if (other.hasLastCommonAreaId()) { + setLastCommonAreaId(other.lastCommonAreaId); } - if (other.hasLOKIGPFHHIN()) { - setLOKIGPFHHIN(other.lOKIGPFHHIN); + if (other.hasLastRogueTypeId()) { + setLastRogueTypeId(other.lastRogueTypeId); } - if (other.hasKPJNNFIINNB()) { - setKPJNNFIINNB(other.kPJNNFIINNB); + if (other.hasRogueTypeId()) { + setRogueTypeId(other.rogueTypeId); } return this; } @@ -191,9 +191,9 @@ public final class RogueUpdateOuterClass { } cachedSize = -1; bitField0_ = 0; - areaId = 0; - lOKIGPFHHIN = 0; - kPJNNFIINNB = 0; + lastCommonAreaId = 0; + lastRogueTypeId = 0; + rogueTypeId = 0; return this; } @@ -217,24 +217,24 @@ public final class RogueUpdateOuterClass { } RogueUpdate other = (RogueUpdate) o; return bitField0_ == other.bitField0_ - && (!hasAreaId() || areaId == other.areaId) - && (!hasLOKIGPFHHIN() || lOKIGPFHHIN == other.lOKIGPFHHIN) - && (!hasKPJNNFIINNB() || kPJNNFIINNB == other.kPJNNFIINNB); + && (!hasLastCommonAreaId() || lastCommonAreaId == other.lastCommonAreaId) + && (!hasLastRogueTypeId() || lastRogueTypeId == other.lastRogueTypeId) + && (!hasRogueTypeId() || rogueTypeId == other.rogueTypeId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(areaId); + output.writeUInt32NoTag(lastCommonAreaId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(lOKIGPFHHIN); + output.writeUInt32NoTag(lastRogueTypeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(kPJNNFIINNB); + output.writeUInt32NoTag(rogueTypeId); } } @@ -242,13 +242,13 @@ public final class RogueUpdateOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lastCommonAreaId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lOKIGPFHHIN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lastRogueTypeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kPJNNFIINNB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueTypeId); } return size; } @@ -261,8 +261,8 @@ public final class RogueUpdateOuterClass { while (true) { switch (tag) { case 56: { - // areaId - areaId = input.readUInt32(); + // lastCommonAreaId + lastCommonAreaId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 64) { @@ -270,8 +270,8 @@ public final class RogueUpdateOuterClass { } } case 64: { - // lOKIGPFHHIN - lOKIGPFHHIN = input.readUInt32(); + // lastRogueTypeId + lastRogueTypeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 96) { @@ -279,8 +279,8 @@ public final class RogueUpdateOuterClass { } } case 96: { - // kPJNNFIINNB - kPJNNFIINNB = input.readUInt32(); + // rogueTypeId + rogueTypeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class RogueUpdateOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); + output.writeUInt32(FieldNames.lastCommonAreaId, lastCommonAreaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.lOKIGPFHHIN, lOKIGPFHHIN); + output.writeUInt32(FieldNames.lastRogueTypeId, lastRogueTypeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.kPJNNFIINNB, kPJNNFIINNB); + output.writeUInt32(FieldNames.rogueTypeId, rogueTypeId); } output.endObject(); } @@ -323,11 +323,11 @@ public final class RogueUpdateOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1409553784: - case -746472947: { - if (input.isAtField(FieldNames.areaId)) { + case -1313973751: + case 2061831298: { + if (input.isAtField(FieldNames.lastCommonAreaId)) { if (!input.trySkipNullValue()) { - areaId = input.readUInt32(); + lastCommonAreaId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,10 +335,11 @@ public final class RogueUpdateOuterClass { } break; } - case -567563551: { - if (input.isAtField(FieldNames.lOKIGPFHHIN)) { + case 1384811513: + case 1305719026: { + if (input.isAtField(FieldNames.lastRogueTypeId)) { if (!input.trySkipNullValue()) { - lOKIGPFHHIN = input.readUInt32(); + lastRogueTypeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -346,10 +347,11 @@ public final class RogueUpdateOuterClass { } break; } - case 303551777: { - if (input.isAtField(FieldNames.kPJNNFIINNB)) { + case -802434961: + case -223704357: { + if (input.isAtField(FieldNames.rogueTypeId)) { if (!input.trySkipNullValue()) { - kPJNNFIINNB = input.readUInt32(); + rogueTypeId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -409,11 +411,11 @@ public final class RogueUpdateOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName areaId = FieldName.forField("areaId", "area_id"); + static final FieldName lastCommonAreaId = FieldName.forField("lastCommonAreaId", "last_common_area_id"); - static final FieldName lOKIGPFHHIN = FieldName.forField("LOKIGPFHHIN"); + static final FieldName lastRogueTypeId = FieldName.forField("lastRogueTypeId", "last_rogue_type_id"); - static final FieldName kPJNNFIINNB = FieldName.forField("KPJNNFIINNB"); + static final FieldName rogueTypeId = FieldName.forField("rogueTypeId", "rogue_type_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java index 831d45e..9f435b9 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectRogueDialogueEventScRspOuterClass.java @@ -35,9 +35,9 @@ public final class SelectRogueDialogueEventScRspOuterClass { private final RogueDialogueEventOuterClass.RogueDialogueEvent eventData = RogueDialogueEventOuterClass.RogueDialogueEvent.newInstance(); /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; + * repeated .DialogueResult dialogue_result = 6; */ - private final RepeatedMessage lELKNNDCGJM = RepeatedMessage.newEmptyInstance(MEMPJPLINCNOuterClass.MEMPJPLINCN.getFactory()); + private final RepeatedMessage dialogueResult = RepeatedMessage.newEmptyInstance(DialogueResultOuterClass.DialogueResult.getFactory()); private SelectRogueDialogueEventScRsp() { } @@ -182,39 +182,39 @@ public final class SelectRogueDialogueEventScRspOuterClass { } /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; - * @return whether the lELKNNDCGJM field is set + * repeated .DialogueResult dialogue_result = 6; + * @return whether the dialogueResult field is set */ - public boolean hasLELKNNDCGJM() { + public boolean hasDialogueResult() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; + * repeated .DialogueResult dialogue_result = 6; * @return this */ - public SelectRogueDialogueEventScRsp clearLELKNNDCGJM() { + public SelectRogueDialogueEventScRsp clearDialogueResult() { bitField0_ &= ~0x00000008; - lELKNNDCGJM.clear(); + dialogueResult.clear(); return this; } /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; + * repeated .DialogueResult dialogue_result = 6; * * 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 #getMutableLELKNNDCGJM()} if you want to modify it. + * Use {@link #getMutableDialogueResult()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getLELKNNDCGJM() { - return lELKNNDCGJM; + public RepeatedMessage getDialogueResult() { + return dialogueResult; } /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; + * repeated .DialogueResult dialogue_result = 6; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -222,32 +222,32 @@ public final class SelectRogueDialogueEventScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableLELKNNDCGJM() { + public RepeatedMessage getMutableDialogueResult() { bitField0_ |= 0x00000008; - return lELKNNDCGJM; + return dialogueResult; } /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; - * @param value the lELKNNDCGJM to add + * repeated .DialogueResult dialogue_result = 6; + * @param value the dialogueResult to add * @return this */ - public SelectRogueDialogueEventScRsp addLELKNNDCGJM( - final MEMPJPLINCNOuterClass.MEMPJPLINCN value) { + public SelectRogueDialogueEventScRsp addDialogueResult( + final DialogueResultOuterClass.DialogueResult value) { bitField0_ |= 0x00000008; - lELKNNDCGJM.add(value); + dialogueResult.add(value); return this; } /** - * repeated .MEMPJPLINCN LELKNNDCGJM = 6; - * @param values the lELKNNDCGJM to add + * repeated .DialogueResult dialogue_result = 6; + * @param values the dialogueResult to add * @return this */ - public SelectRogueDialogueEventScRsp addAllLELKNNDCGJM( - final MEMPJPLINCNOuterClass.MEMPJPLINCN... values) { + public SelectRogueDialogueEventScRsp addAllDialogueResult( + final DialogueResultOuterClass.DialogueResult... values) { bitField0_ |= 0x00000008; - lELKNNDCGJM.addAll(values); + dialogueResult.addAll(values); return this; } @@ -259,7 +259,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { dialogueEventId = other.dialogueEventId; retcode = other.retcode; eventData.copyFrom(other.eventData); - lELKNNDCGJM.copyFrom(other.lELKNNDCGJM); + dialogueResult.copyFrom(other.dialogueResult); } return this; } @@ -279,8 +279,8 @@ public final class SelectRogueDialogueEventScRspOuterClass { if (other.hasEventData()) { getMutableEventData().mergeFrom(other.eventData); } - if (other.hasLELKNNDCGJM()) { - getMutableLELKNNDCGJM().addAll(other.lELKNNDCGJM); + if (other.hasDialogueResult()) { + getMutableDialogueResult().addAll(other.dialogueResult); } return this; } @@ -295,7 +295,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { dialogueEventId = 0; retcode = 0; eventData.clear(); - lELKNNDCGJM.clear(); + dialogueResult.clear(); return this; } @@ -307,7 +307,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { cachedSize = -1; bitField0_ = 0; eventData.clearQuick(); - lELKNNDCGJM.clearQuick(); + dialogueResult.clearQuick(); return this; } @@ -324,7 +324,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId) && (!hasRetcode() || retcode == other.retcode) && (!hasEventData() || eventData.equals(other.eventData)) - && (!hasLELKNNDCGJM() || lELKNNDCGJM.equals(other.lELKNNDCGJM)); + && (!hasDialogueResult() || dialogueResult.equals(other.dialogueResult)); } @Override @@ -342,9 +342,9 @@ public final class SelectRogueDialogueEventScRspOuterClass { output.writeMessageNoTag(eventData); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < lELKNNDCGJM.length(); i++) { + for (int i = 0; i < dialogueResult.length(); i++) { output.writeRawByte((byte) 50); - output.writeMessageNoTag(lELKNNDCGJM.get(i)); + output.writeMessageNoTag(dialogueResult.get(i)); } } } @@ -362,7 +362,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(eventData); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * lELKNNDCGJM.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lELKNNDCGJM); + size += (1 * dialogueResult.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dialogueResult); } return size; } @@ -402,8 +402,8 @@ public final class SelectRogueDialogueEventScRspOuterClass { } } case 50: { - // lELKNNDCGJM - tag = input.readRepeatedMessage(lELKNNDCGJM, tag); + // dialogueResult + tag = input.readRepeatedMessage(dialogueResult, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -436,7 +436,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { output.writeMessage(FieldNames.eventData, eventData); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.lELKNNDCGJM, lELKNNDCGJM); + output.writeRepeatedMessage(FieldNames.dialogueResult, dialogueResult); } output.endObject(); } @@ -483,10 +483,11 @@ public final class SelectRogueDialogueEventScRspOuterClass { } break; } - case 639073651: { - if (input.isAtField(FieldNames.lELKNNDCGJM)) { + case 1191037973: + case 1574283364: { + if (input.isAtField(FieldNames.dialogueResult)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(lELKNNDCGJM); + input.readRepeatedMessage(dialogueResult); bitField0_ |= 0x00000008; } } else { @@ -555,7 +556,7 @@ public final class SelectRogueDialogueEventScRspOuterClass { static final FieldName eventData = FieldName.forField("eventData", "event_data"); - static final FieldName lELKNNDCGJM = FieldName.forField("LELKNNDCGJM"); + static final FieldName dialogueResult = FieldName.forField("dialogueResult", "dialogue_result"); } } } diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index f526b02..22c29a4 100644 --- a/src/main/java/emu/lunarcore/GameConstants.java +++ b/src/main/java/emu/lunarcore/GameConstants.java @@ -58,6 +58,9 @@ public class GameConstants { public static final int ROGUE_ENTRANCE = 801120102; public static final int ROGUE_TALENT_POINT_ITEM_ID = 32; + // Activity + public static final int[] ENABLE_ACTIVITY_TYPES = { 18, 34 }; + // Custom public static final int SERVER_CONSOLE_UID = 99; public static final int EQUIPMENT_SLOT_ID = 100; diff --git a/src/main/java/emu/lunarcore/data/GameData.java b/src/main/java/emu/lunarcore/data/GameData.java index cd289d5..09a61f1 100644 --- a/src/main/java/emu/lunarcore/data/GameData.java +++ b/src/main/java/emu/lunarcore/data/GameData.java @@ -59,6 +59,7 @@ public class GameData { @Getter private static Int2ObjectMap rogueBuffTagExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap rogueBuffGroupExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap rogueDLCAreaExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap rogueNousMainStoryExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap rogueNousSubStoryExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap rogueNousDiceBranchExcelMap = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/emu/lunarcore/data/GameDepot.java b/src/main/java/emu/lunarcore/data/GameDepot.java index b5b16ba..0176e2c 100644 --- a/src/main/java/emu/lunarcore/data/GameDepot.java +++ b/src/main/java/emu/lunarcore/data/GameDepot.java @@ -12,6 +12,9 @@ import lombok.Getter; // Game data that is parsed by the server goes here public class GameDepot { + // Activity + @Getter private static List activityScheduleExcels = new ArrayList<>(); + // Exp @Getter private static List avatarExpExcels = new ArrayList<>(); @Getter private static List equipmentExpExcels = new ArrayList<>(); diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index 6f1f99a..959bd15 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; import emu.lunarcore.data.config.*; +import emu.lunarcore.data.excel.ActivitySchedulingExcel; import org.reflections.Reflections; import com.google.gson.Gson; @@ -43,6 +44,8 @@ public class ResourceLoader { loadMazeAbilities(); // Load rogue maps loadRogueMapGen(); + // Load activity schedule config + loadActivityScheduleConfig(); // Load rogue dialogue events loadRogueDialogueEvent(); @@ -339,4 +342,16 @@ public class ResourceLoader { e.printStackTrace(); } } + + private static void loadActivityScheduleConfig() { + File file = new File(LunarCore.getConfig().getDataDir() + "/ActivityScheduling.json"); + if (!file.exists()) return; + + try (FileReader reader = new FileReader(file)) { + List activityScheduleConfig = gson.fromJson(reader, TypeToken.getParameterized(List.class, ActivitySchedulingExcel.class).getType()); + GameDepot.getActivityScheduleExcels().addAll(activityScheduleConfig); + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/emu/lunarcore/data/excel/ActivitySchedulingExcel.java b/src/main/java/emu/lunarcore/data/excel/ActivitySchedulingExcel.java new file mode 100644 index 0000000..6743ce3 --- /dev/null +++ b/src/main/java/emu/lunarcore/data/excel/ActivitySchedulingExcel.java @@ -0,0 +1,13 @@ +package emu.lunarcore.data.excel; + +import lombok.Getter; + +import java.util.List; + +@Getter +public class ActivitySchedulingExcel { + private int activityId; + private long beginTime; + private long endTime; + private int moduleId; +} diff --git a/src/main/java/emu/lunarcore/data/excel/RogueDLCAreaExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueDLCAreaExcel.java new file mode 100644 index 0000000..9639628 --- /dev/null +++ b/src/main/java/emu/lunarcore/data/excel/RogueDLCAreaExcel.java @@ -0,0 +1,38 @@ +package emu.lunarcore.data.excel; + +import com.google.gson.annotations.SerializedName; +import emu.lunarcore.data.GameData; +import emu.lunarcore.data.GameResource; +import emu.lunarcore.data.ResourceType; +import lombok.Getter; + +import java.util.List; + +@Getter +@ResourceType(name = { "RogueDLCArea.json" }) +public class RogueDLCAreaExcel extends GameResource { + private int AreaID; + private String SubType; + + private List DifficultyID; + private List LayerIDList; + + private List AreaScoreMap; + + @Getter + public static class RogueDLCAreaScoreMap { + @SerializedName("FJBAFMJHNCA") private int LayerID; + @SerializedName("LHKHLPFAKGD") private int Score; + @SerializedName("NDPIHCHCLGA") private int FinishedScore; + } + + @Override + public int getId() { + return AreaID; + } + + @Override + public void onLoad() { + GameData.getRogueDLCAreaExcelMap().put(AreaID, this); + } +} diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java index ca304c5..1e7ac10 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java @@ -177,7 +177,7 @@ public class RogueManager extends BasePlayerManager { var score = RogueScoreRewardInfo.newInstance() .setPoolId(20 + getPlayer().getWorldLevel()) // TODO pool ids should not change when world level changes - //.setPoolRefreshed(true) + .setPoolRefreshed(true) .setHasTakenInitialScore(true) .setBeginTime(beginTime) .setEndTime(endTime); @@ -210,17 +210,6 @@ public class RogueManager extends BasePlayerManager { // Rogue data RogueInstance instance = this.getPlayer().getRogueInstance(); -// if (instance != null) { -// proto.setStatus(instance.getStatus()); -// proto.setRogueProgress(this.getPlayer().getRogueInstance().toProto()); -// proto.setRoomMap(proto.getRogueProgress().getRoomMap()); -// -// for (int id : instance.getBaseAvatarIds()) { -// proto.addBaseAvatarIdList(id); -// } -// -// aeonInfo.setSelectedAeonId(instance.getAeonId()); -// } // Add areas var areaInfo = RogueAreaInfo.newInstance(); diff --git a/src/main/java/emu/lunarcore/game/rogue/chess/ChessRogueManager.java b/src/main/java/emu/lunarcore/game/rogue/chess/ChessRogueManager.java deleted file mode 100644 index 7778b76..0000000 --- a/src/main/java/emu/lunarcore/game/rogue/chess/ChessRogueManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package emu.lunarcore.game.rogue.chess; - -import emu.lunarcore.data.GameData; -import emu.lunarcore.game.player.BasePlayerManager; -import emu.lunarcore.game.player.Player; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; - -import java.util.HashSet; -import java.util.Set; - -public class ChessRogueManager extends BasePlayerManager { - public ChessRogueManager(Player player) { - super(player); - } - - public Int2ObjectMap> getRogueDefaultDice() { - var map = new Int2ObjectOpenHashMap>(); - for (var entry: GameData.getRogueNousDiceBranchExcelMap().values()) { - var set = new HashSet(); - set.add(entry.getDefaultUltraSurface()); - set.addAll(entry.getDefaultCommonSurfaceList()); - map.put(entry.getBranchId(), set); - } - return map; - } -} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerChessRogueQueryCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerChessRogueQueryCsReq.java deleted file mode 100644 index 8b64e01..0000000 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerChessRogueQueryCsReq.java +++ /dev/null @@ -1,16 +0,0 @@ -package emu.lunarcore.server.packet.recv; - -import emu.lunarcore.server.game.GameSession; -import emu.lunarcore.server.packet.CmdId; -import emu.lunarcore.server.packet.Opcodes; -import emu.lunarcore.server.packet.PacketHandler; -import emu.lunarcore.server.packet.send.PacketChessRogueQueryScRsp; - -@Opcodes(CmdId.ChessRogueQueryCsReq) -public class HandlerChessRogueQueryCsReq extends PacketHandler { - - @Override - public void handle(GameSession session, byte[] data) throws Exception { - session.send(new PacketChessRogueQueryScRsp(session.getPlayer())); - } -} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketChessRogueQueryScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketChessRogueQueryScRsp.java deleted file mode 100644 index 7a1fa5d..0000000 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketChessRogueQueryScRsp.java +++ /dev/null @@ -1,39 +0,0 @@ -package emu.lunarcore.server.packet.send; - -import emu.lunarcore.data.GameData; -import emu.lunarcore.game.player.Player; -import emu.lunarcore.proto.ChessRogueNousDiceInfoOuterClass.ChessRogueNousDiceInfo; -import emu.lunarcore.proto.ChessRogueNousDiceSurfaceInfoOuterClass.ChessRogueNousDiceSurfaceInfo; -import emu.lunarcore.proto.ChessRogueNousQueryInfoOuterClass.ChessRogueNousQueryInfo; -import emu.lunarcore.proto.ChessRogueQueryOuterClass.ChessRogueQuery; -import emu.lunarcore.proto.ChessRogueQueryScRspOuterClass.ChessRogueQueryScRsp; -import emu.lunarcore.server.packet.BasePacket; -import emu.lunarcore.server.packet.CmdId; - -public class PacketChessRogueQueryScRsp extends BasePacket { - public PacketChessRogueQueryScRsp(Player player) { - super(CmdId.ChessRogueQueryScRsp); - - var data = ChessRogueQuery.newInstance(); - - for (var entry: GameData.getRogueNousMainStoryExcelMap().keySet()) { - data.addMainStoryId(entry); - } - player.getChessRogueManager().getRogueDefaultDice().forEach((k, v) -> { - var dice = ChessRogueNousDiceInfo.newInstance() - .setDiceBranchId(k); - var index = 0; - for (Integer d : v) { - dice.addDiceSurface(ChessRogueNousDiceSurfaceInfo.newInstance() - .setIndex(++index) - .setDiceId(d)); - } - data.addDiceInfo(dice); - }); - var proto = ChessRogueQueryScRsp.newInstance() - .setRogueNous(ChessRogueNousQueryInfo.newInstance() - .setQueryInfo(data)); - - this.setData(proto); - } -} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetActivityScheduleConfigScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetActivityScheduleConfigScRsp.java index 7d64f18..654b44a 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetActivityScheduleConfigScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetActivityScheduleConfigScRsp.java @@ -1,6 +1,6 @@ package emu.lunarcore.server.packet.send; -import emu.lunarcore.data.GameData; +import emu.lunarcore.data.GameDepot; import emu.lunarcore.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo; import emu.lunarcore.proto.GetActivityScheduleConfigScRspOuterClass.GetActivityScheduleConfigScRsp; import emu.lunarcore.server.packet.BasePacket; @@ -15,14 +15,12 @@ public class PacketGetActivityScheduleConfigScRsp extends BasePacket { var data = GetActivityScheduleConfigScRsp.newInstance(); - for (var activity : GameData.getActivityPanelExcelMap().values()) { - if (activity.getType() != 18) continue; - + for (var activity : GameDepot.getActivityScheduleExcels()) { var info = ActivityScheduleInfo.newInstance() - .setActivityId(activity.getPanelID()) - .setModuleId(activity.getActivityModuleID()) - .setBeginTime(0) - .setEndTime(Integer.MAX_VALUE); + .setActivityId(activity.getActivityId()) + .setModuleId(activity.getModuleId()) + .setBeginTime(activity.getBeginTime()) + .setEndTime(activity.getEndTime()); data.addActivityScheduleList(info); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java index 3b10c50..bcd7e79 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetRogueScoreRewardInfoScRsp.java @@ -19,7 +19,7 @@ public class PacketGetRogueScoreRewardInfoScRsp extends BasePacket { data.getMutableScoreRewardInfo() .setPoolId(20 + player.getWorldLevel()) // TODO pool ids should not change when world level changes - //.setPoolRefreshed(true) + .setPoolRefreshed(true) .setHasTakenInitialScore(true) .setBeginTime(beginTime) .setEndTime(endTime); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java index 69d3392..a72c00b 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java @@ -1,7 +1,7 @@ package emu.lunarcore.server.packet.send; import emu.lunarcore.game.scene.entity.EntityNpc; -import emu.lunarcore.proto.MEMPJPLINCNOuterClass.MEMPJPLINCN; +import emu.lunarcore.proto.DialogueResultOuterClass.DialogueResult; import emu.lunarcore.proto.RogueDialogueEventOuterClass.RogueDialogueEvent; import emu.lunarcore.proto.RogueDialogueEventParamOuterClass.RogueDialogueEventParam; import emu.lunarcore.proto.SelectRogueDialogueEventScRspOuterClass.SelectRogueDialogueEventScRsp; @@ -30,14 +30,14 @@ public class PacketSelectRogueDialogueEventScRsp extends BasePacket { .setGBMDBBBMBEJ(instance.getEventId()) .addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new)); - var l = MEMPJPLINCN.newInstance(); + var l = DialogueResult.newInstance(); for (var param : params) { l.addBLGIMDCNDHJ(param.getDialogueEventId()); } if (nextEventId != 0) { l.addBLGIMDCNDHJ(nextEventId); } - data.addLELKNNDCGJM(l); + data.addDialogueResult(l); data.setEventData(event); this.setData(data);