From 2aa30ef40d913a9c4a922abed8c0548f408652f6 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:03:25 -0700 Subject: [PATCH] Remove unnecessary protos --- .../proto/GetBagScRspOuterClass.java | 519 +----------------- .../GetPlayerBoardDataScRspOuterClass.java | 368 ++++--------- .../proto/MechanismBarInfoOuterClass.java | 339 ------------ .../lunarcore/proto/SceneInfoOuterClass.java | 175 +----- .../proto/WaitDelResourceOuterClass.java | 339 ------------ .../send/PacketGetPlayerBoardDataScRsp.java | 3 +- 6 files changed, 163 insertions(+), 1580 deletions(-) delete mode 100644 src/generated/main/emu/lunarcore/proto/MechanismBarInfoOuterClass.java delete mode 100644 src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java diff --git a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java index cb54df0..825e60e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java @@ -10,7 +10,6 @@ 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; import us.hebi.quickbuf.RepeatedMessage; public final class GetBagScRspOuterClass { @@ -25,31 +24,11 @@ public final class GetBagScRspOuterClass { */ private int retcode; - /** - * optional uint32 BLDMDEFNEPK = 13; - */ - private int bLDMDEFNEPK; - - /** - * repeated uint32 MIOOCCLLFAA = 1; - */ - private final RepeatedInt mIOOCCLLFAA = RepeatedInt.newEmptyInstance(); - /** * repeated .Relic relic_list = 2; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 3; - */ - private final RepeatedMessage dNOIJIGOANN = RepeatedMessage.newEmptyInstance(WaitDelResourceOuterClass.WaitDelResource.getFactory()); - /** * repeated .Material material_list = 6; */ @@ -60,11 +39,6 @@ public final class GetBagScRspOuterClass { */ private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); - /** - * repeated .Material BBKKDJEGAPF = 15; - */ - private final RepeatedMessage bBKKDJEGAPF = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); - private GetBagScRsp() { } @@ -112,117 +86,12 @@ public final class GetBagScRspOuterClass { return this; } - /** - * optional uint32 BLDMDEFNEPK = 13; - * @return whether the bLDMDEFNEPK field is set - */ - public boolean hasBLDMDEFNEPK() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 BLDMDEFNEPK = 13; - * @return this - */ - public GetBagScRsp clearBLDMDEFNEPK() { - bitField0_ &= ~0x00000002; - bLDMDEFNEPK = 0; - return this; - } - - /** - * optional uint32 BLDMDEFNEPK = 13; - * @return the bLDMDEFNEPK - */ - public int getBLDMDEFNEPK() { - return bLDMDEFNEPK; - } - - /** - * optional uint32 BLDMDEFNEPK = 13; - * @param value the bLDMDEFNEPK to set - * @return this - */ - public GetBagScRsp setBLDMDEFNEPK(final int value) { - bitField0_ |= 0x00000002; - bLDMDEFNEPK = value; - return this; - } - - /** - * repeated uint32 MIOOCCLLFAA = 1; - * @return whether the mIOOCCLLFAA field is set - */ - public boolean hasMIOOCCLLFAA() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 MIOOCCLLFAA = 1; - * @return this - */ - public GetBagScRsp clearMIOOCCLLFAA() { - bitField0_ &= ~0x00000004; - mIOOCCLLFAA.clear(); - return this; - } - - /** - * repeated uint32 MIOOCCLLFAA = 1; - * - * 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 #getMutableMIOOCCLLFAA()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMIOOCCLLFAA() { - return mIOOCCLLFAA; - } - - /** - * repeated uint32 MIOOCCLLFAA = 1; - * - * 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 getMutableMIOOCCLLFAA() { - bitField0_ |= 0x00000004; - return mIOOCCLLFAA; - } - - /** - * repeated uint32 MIOOCCLLFAA = 1; - * @param value the mIOOCCLLFAA to add - * @return this - */ - public GetBagScRsp addMIOOCCLLFAA(final int value) { - bitField0_ |= 0x00000004; - mIOOCCLLFAA.add(value); - return this; - } - - /** - * repeated uint32 MIOOCCLLFAA = 1; - * @param values the mIOOCCLLFAA to add - * @return this - */ - public GetBagScRsp addAllMIOOCCLLFAA(final int... values) { - bitField0_ |= 0x00000004; - mIOOCCLLFAA.addAll(values); - return this; - } - /** * repeated .Relic relic_list = 2; * @return whether the relicList field is set */ public boolean hasRelicList() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -230,7 +99,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp clearRelicList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; relicList.clear(); return this; } @@ -259,7 +128,7 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return relicList; } @@ -269,7 +138,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; relicList.add(value); return this; } @@ -280,116 +149,17 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; relicList.addAll(values); return this; } - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 3; - * @return whether the dNOIJIGOANN field is set - */ - public boolean hasDNOIJIGOANN() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 3; - * @return this - */ - public GetBagScRsp clearDNOIJIGOANN() { - bitField0_ &= ~0x00000010; - dNOIJIGOANN.clear(); - return this; - } - - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 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 #getMutableDNOIJIGOANN()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getDNOIJIGOANN() { - return dNOIJIGOANN; - } - - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 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 RepeatedMessage getMutableDNOIJIGOANN() { - bitField0_ |= 0x00000010; - return dNOIJIGOANN; - } - - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 3; - * @param value the dNOIJIGOANN to add - * @return this - */ - public GetBagScRsp addDNOIJIGOANN(final WaitDelResourceOuterClass.WaitDelResource value) { - bitField0_ |= 0x00000010; - dNOIJIGOANN.add(value); - return this; - } - - /** - *
-     * repeated IIEKAFLADPC GEHHOPNKDFE = 5;
-     * repeated IIEKAFLADPC LOOLEGLHFIP = 10;
-     * 
- * - * repeated .WaitDelResource DNOIJIGOANN = 3; - * @param values the dNOIJIGOANN to add - * @return this - */ - public GetBagScRsp addAllDNOIJIGOANN( - final WaitDelResourceOuterClass.WaitDelResource... values) { - bitField0_ |= 0x00000010; - dNOIJIGOANN.addAll(values); - return this; - } - /** * repeated .Material material_list = 6; * @return whether the materialList field is set */ public boolean hasMaterialList() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -397,7 +167,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp clearMaterialList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000004; materialList.clear(); return this; } @@ -426,7 +196,7 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMaterialList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; return materialList; } @@ -436,7 +206,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; materialList.add(value); return this; } @@ -447,7 +217,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; materialList.addAll(values); return this; } @@ -457,7 +227,7 @@ public final class GetBagScRspOuterClass { * @return whether the equipmentList field is set */ public boolean hasEquipmentList() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -465,7 +235,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp clearEquipmentList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000008; equipmentList.clear(); return this; } @@ -494,7 +264,7 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; return equipmentList; } @@ -504,7 +274,7 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; equipmentList.add(value); return this; } @@ -515,92 +285,20 @@ public final class GetBagScRspOuterClass { * @return this */ public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; equipmentList.addAll(values); return this; } - /** - * repeated .Material BBKKDJEGAPF = 15; - * @return whether the bBKKDJEGAPF field is set - */ - public boolean hasBBKKDJEGAPF() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .Material BBKKDJEGAPF = 15; - * @return this - */ - public GetBagScRsp clearBBKKDJEGAPF() { - bitField0_ &= ~0x00000080; - bBKKDJEGAPF.clear(); - return this; - } - - /** - * repeated .Material BBKKDJEGAPF = 15; - * - * 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 #getMutableBBKKDJEGAPF()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBBKKDJEGAPF() { - return bBKKDJEGAPF; - } - - /** - * repeated .Material BBKKDJEGAPF = 15; - * - * 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 RepeatedMessage getMutableBBKKDJEGAPF() { - bitField0_ |= 0x00000080; - return bBKKDJEGAPF; - } - - /** - * repeated .Material BBKKDJEGAPF = 15; - * @param value the bBKKDJEGAPF to add - * @return this - */ - public GetBagScRsp addBBKKDJEGAPF(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000080; - bBKKDJEGAPF.add(value); - return this; - } - - /** - * repeated .Material BBKKDJEGAPF = 15; - * @param values the bBKKDJEGAPF to add - * @return this - */ - public GetBagScRsp addAllBBKKDJEGAPF(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000080; - bBKKDJEGAPF.addAll(values); - return this; - } - @Override public GetBagScRsp copyFrom(final GetBagScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - bLDMDEFNEPK = other.bLDMDEFNEPK; - mIOOCCLLFAA.copyFrom(other.mIOOCCLLFAA); relicList.copyFrom(other.relicList); - dNOIJIGOANN.copyFrom(other.dNOIJIGOANN); materialList.copyFrom(other.materialList); equipmentList.copyFrom(other.equipmentList); - bBKKDJEGAPF.copyFrom(other.bBKKDJEGAPF); } return this; } @@ -614,27 +312,15 @@ public final class GetBagScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasBLDMDEFNEPK()) { - setBLDMDEFNEPK(other.bLDMDEFNEPK); - } - if (other.hasMIOOCCLLFAA()) { - getMutableMIOOCCLLFAA().addAll(other.mIOOCCLLFAA); - } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } - if (other.hasDNOIJIGOANN()) { - getMutableDNOIJIGOANN().addAll(other.dNOIJIGOANN); - } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } if (other.hasEquipmentList()) { getMutableEquipmentList().addAll(other.equipmentList); } - if (other.hasBBKKDJEGAPF()) { - getMutableBBKKDJEGAPF().addAll(other.bBKKDJEGAPF); - } return this; } @@ -646,13 +332,9 @@ public final class GetBagScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - bLDMDEFNEPK = 0; - mIOOCCLLFAA.clear(); relicList.clear(); - dNOIJIGOANN.clear(); materialList.clear(); equipmentList.clear(); - bBKKDJEGAPF.clear(); return this; } @@ -663,12 +345,9 @@ public final class GetBagScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - mIOOCCLLFAA.clear(); relicList.clearQuick(); - dNOIJIGOANN.clearQuick(); materialList.clearQuick(); equipmentList.clearQuick(); - bBKKDJEGAPF.clearQuick(); return this; } @@ -683,13 +362,9 @@ public final class GetBagScRspOuterClass { GetBagScRsp other = (GetBagScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasBLDMDEFNEPK() || bLDMDEFNEPK == other.bLDMDEFNEPK) - && (!hasMIOOCCLLFAA() || mIOOCCLLFAA.equals(other.mIOOCCLLFAA)) && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasDNOIJIGOANN() || dNOIJIGOANN.equals(other.dNOIJIGOANN)) && (!hasMaterialList() || materialList.equals(other.materialList)) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasBBKKDJEGAPF() || bBKKDJEGAPF.equals(other.bBKKDJEGAPF)); + && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)); } @Override @@ -699,45 +374,23 @@ public final class GetBagScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(bLDMDEFNEPK); - } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < mIOOCCLLFAA.length(); i++) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(mIOOCCLLFAA.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < relicList.length(); i++) { output.writeRawByte((byte) 18); output.writeMessageNoTag(relicList.get(i)); } } - if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < dNOIJIGOANN.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(dNOIJIGOANN.get(i)); - } - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < materialList.length(); i++) { output.writeRawByte((byte) 50); output.writeMessageNoTag(materialList.get(i)); } } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < equipmentList.length(); i++) { output.writeRawByte((byte) 114); output.writeMessageNoTag(equipmentList.get(i)); } } - if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < bBKKDJEGAPF.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(bBKKDJEGAPF.get(i)); - } - } } @Override @@ -747,26 +400,14 @@ public final class GetBagScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bLDMDEFNEPK); - } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * mIOOCCLLFAA.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mIOOCCLLFAA); - } - if ((bitField0_ & 0x00000008) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } - if ((bitField0_ & 0x00000010) != 0) { - size += (1 * dNOIJIGOANN.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dNOIJIGOANN); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * bBKKDJEGAPF.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(bBKKDJEGAPF); - } return size; } @@ -782,24 +423,6 @@ public final class GetBagScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // bLDMDEFNEPK - bLDMDEFNEPK = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 10) { - break; - } - } - case 10: { - // mIOOCCLLFAA [packed=true] - input.readPackedUInt32(mIOOCCLLFAA, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 18) { break; } @@ -807,15 +430,7 @@ public final class GetBagScRspOuterClass { case 18: { // relicList tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000008; - if (tag != 26) { - break; - } - } - case 26: { - // dNOIJIGOANN - tag = input.readRepeatedMessage(dNOIJIGOANN, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; if (tag != 50) { break; } @@ -823,7 +438,7 @@ public final class GetBagScRspOuterClass { case 50: { // materialList tag = input.readRepeatedMessage(materialList, tag); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; if (tag != 114) { break; } @@ -831,15 +446,7 @@ public final class GetBagScRspOuterClass { case 114: { // equipmentList tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000040; - if (tag != 122) { - break; - } - } - case 122: { - // bBKKDJEGAPF - tag = input.readRepeatedMessage(bBKKDJEGAPF, tag); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; if (tag != 0) { break; } @@ -854,12 +461,6 @@ public final class GetBagScRspOuterClass { tag = input.readTag(); break; } - case 8: { - // mIOOCCLLFAA [packed=false] - tag = input.readRepeatedUInt32(mIOOCCLLFAA, tag); - bitField0_ |= 0x00000004; - break; - } } } } @@ -871,26 +472,14 @@ public final class GetBagScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.bLDMDEFNEPK, bLDMDEFNEPK); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.mIOOCCLLFAA, mIOOCCLLFAA); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.dNOIJIGOANN, dNOIJIGOANN); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.materialList, materialList); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.bBKKDJEGAPF, bBKKDJEGAPF); - } output.endObject(); } @@ -912,45 +501,12 @@ public final class GetBagScRspOuterClass { } break; } - case 277919140: { - if (input.isAtField(FieldNames.bLDMDEFNEPK)) { - if (!input.trySkipNullValue()) { - bLDMDEFNEPK = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1874925302: { - if (input.isAtField(FieldNames.mIOOCCLLFAA)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(mIOOCCLLFAA); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 204814001: case 2071893482: { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 648040854: { - if (input.isAtField(FieldNames.dNOIJIGOANN)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(dNOIJIGOANN); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -962,7 +518,7 @@ public final class GetBagScRspOuterClass { if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(materialList); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -974,18 +530,7 @@ public final class GetBagScRspOuterClass { if (input.isAtField(FieldNames.equipmentList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case -867835985: { - if (input.isAtField(FieldNames.bBKKDJEGAPF)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(bBKKDJEGAPF); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1046,19 +591,11 @@ public final class GetBagScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName bLDMDEFNEPK = FieldName.forField("BLDMDEFNEPK"); - - static final FieldName mIOOCCLLFAA = FieldName.forField("MIOOCCLLFAA"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); - static final FieldName dNOIJIGOANN = FieldName.forField("DNOIJIGOANN"); - static final FieldName materialList = FieldName.forField("materialList", "material_list"); static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); - - static final FieldName bBKKDJEGAPF = FieldName.forField("BBKKDJEGAPF"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java index 372b609..890bf79 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java @@ -30,16 +30,16 @@ public final class GetPlayerBoardDataScRspOuterClass { */ private int retcode; - /** - * optional .GetPlayerBoardDataScRspUnk1 unk1 = 5; - */ - private final GetPlayerBoardDataScRspUnk1 unk1 = GetPlayerBoardDataScRspUnk1.newInstance(); - /** * optional string signature = 2; */ private final Utf8String signature = Utf8String.newEmptyInstance(); + /** + * optional string unk1 = 5; + */ + private final Utf8String unk1 = Utf8String.newEmptyInstance(); + /** * repeated .HeadIcon unlocked_head_icon_list = 6; */ @@ -129,69 +129,12 @@ public final class GetPlayerBoardDataScRspOuterClass { return this; } - /** - * optional .GetPlayerBoardDataScRspUnk1 unk1 = 5; - * @return whether the unk1 field is set - */ - public boolean hasUnk1() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .GetPlayerBoardDataScRspUnk1 unk1 = 5; - * @return this - */ - public GetPlayerBoardDataScRsp clearUnk1() { - bitField0_ &= ~0x00000004; - unk1.clear(); - return this; - } - - /** - * optional .GetPlayerBoardDataScRspUnk1 unk1 = 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 #getMutableUnk1()} if you want to modify it. - * - * @return internal storage object for reading - */ - public GetPlayerBoardDataScRspUnk1 getUnk1() { - return unk1; - } - - /** - * optional .GetPlayerBoardDataScRspUnk1 unk1 = 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 GetPlayerBoardDataScRspUnk1 getMutableUnk1() { - bitField0_ |= 0x00000004; - return unk1; - } - - /** - * optional .GetPlayerBoardDataScRspUnk1 unk1 = 5; - * @param value the unk1 to set - * @return this - */ - public GetPlayerBoardDataScRsp setUnk1(final GetPlayerBoardDataScRspUnk1 value) { - bitField0_ |= 0x00000004; - unk1.copyFrom(value); - return this; - } - /** * optional string signature = 2; * @return whether the signature field is set */ public boolean hasSignature() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -199,7 +142,7 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return this */ public GetPlayerBoardDataScRsp clearSignature() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; signature.clear(); return this; } @@ -225,7 +168,7 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return this.signature; } @@ -235,7 +178,7 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return this */ public GetPlayerBoardDataScRsp setSignature(final CharSequence value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; signature.copyFrom(value); return this; } @@ -246,11 +189,76 @@ public final class GetPlayerBoardDataScRspOuterClass { * @return this */ public GetPlayerBoardDataScRsp setSignature(final Utf8String value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; signature.copyFrom(value); return this; } + /** + * optional string unk1 = 5; + * @return whether the unk1 field is set + */ + public boolean hasUnk1() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional string unk1 = 5; + * @return this + */ + public GetPlayerBoardDataScRsp clearUnk1() { + bitField0_ &= ~0x00000008; + unk1.clear(); + return this; + } + + /** + * optional string unk1 = 5; + * @return the unk1 + */ + public String getUnk1() { + return unk1.getString(); + } + + /** + * optional string unk1 = 5; + * @return internal {@code Utf8String} representation of unk1 for reading + */ + public Utf8String getUnk1Bytes() { + return this.unk1; + } + + /** + * optional string unk1 = 5; + * @return internal {@code Utf8String} representation of unk1 for modifications + */ + public Utf8String getMutableUnk1Bytes() { + bitField0_ |= 0x00000008; + return this.unk1; + } + + /** + * optional string unk1 = 5; + * @param value the unk1 to set + * @return this + */ + public GetPlayerBoardDataScRsp setUnk1(final CharSequence value) { + bitField0_ |= 0x00000008; + unk1.copyFrom(value); + return this; + } + + /** + * optional string unk1 = 5; + * @param value the unk1 to set + * @return this + */ + public GetPlayerBoardDataScRsp setUnk1(final Utf8String value) { + bitField0_ |= 0x00000008; + unk1.copyFrom(value); + return this; + } + /** * repeated .HeadIcon unlocked_head_icon_list = 6; * @return whether the unlockedHeadIconList field is set @@ -328,8 +336,8 @@ public final class GetPlayerBoardDataScRspOuterClass { bitField0_ = other.bitField0_; currentHeadIconId = other.currentHeadIconId; retcode = other.retcode; - unk1.copyFrom(other.unk1); signature.copyFrom(other.signature); + unk1.copyFrom(other.unk1); unlockedHeadIconList.copyFrom(other.unlockedHeadIconList); } return this; @@ -347,12 +355,12 @@ public final class GetPlayerBoardDataScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasUnk1()) { - getMutableUnk1().mergeFrom(other.unk1); - } if (other.hasSignature()) { getMutableSignatureBytes().copyFrom(other.signature); } + if (other.hasUnk1()) { + getMutableUnk1Bytes().copyFrom(other.unk1); + } if (other.hasUnlockedHeadIconList()) { getMutableUnlockedHeadIconList().addAll(other.unlockedHeadIconList); } @@ -368,8 +376,8 @@ public final class GetPlayerBoardDataScRspOuterClass { bitField0_ = 0; currentHeadIconId = 0; retcode = 0; - unk1.clear(); signature.clear(); + unk1.clear(); unlockedHeadIconList.clear(); return this; } @@ -381,8 +389,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - unk1.clearQuick(); signature.clear(); + unk1.clear(); unlockedHeadIconList.clearQuick(); return this; } @@ -399,8 +407,8 @@ public final class GetPlayerBoardDataScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId) && (!hasRetcode() || retcode == other.retcode) - && (!hasUnk1() || unk1.equals(other.unk1)) && (!hasSignature() || signature.equals(other.signature)) + && (!hasUnk1() || unk1.equals(other.unk1)) && (!hasUnlockedHeadIconList() || unlockedHeadIconList.equals(other.unlockedHeadIconList)); } @@ -415,13 +423,13 @@ public final class GetPlayerBoardDataScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(unk1); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 18); output.writeStringNoTag(signature); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 42); + output.writeStringNoTag(unk1); + } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { output.writeRawByte((byte) 50); @@ -440,10 +448,10 @@ public final class GetPlayerBoardDataScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(unk1); + size += 1 + ProtoSink.computeStringSizeNoTag(signature); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(signature); + size += 1 + ProtoSink.computeStringSizeNoTag(unk1); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * unlockedHeadIconList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedHeadIconList); @@ -472,15 +480,6 @@ public final class GetPlayerBoardDataScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // unk1 - input.readMessage(unk1); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 18) { break; } @@ -488,6 +487,15 @@ public final class GetPlayerBoardDataScRspOuterClass { case 18: { // signature input.readString(signature); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // unk1 + input.readString(unk1); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 50) { @@ -526,10 +534,10 @@ public final class GetPlayerBoardDataScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.unk1, unk1); + output.writeString(FieldNames.signature, signature); } if ((bitField0_ & 0x00000008) != 0) { - output.writeString(FieldNames.signature, signature); + output.writeString(FieldNames.unk1, unk1); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.unlockedHeadIconList, unlockedHeadIconList); @@ -567,10 +575,10 @@ public final class GetPlayerBoardDataScRspOuterClass { } break; } - case 3594623: { - if (input.isAtField(FieldNames.unk1)) { + case 1073584312: { + if (input.isAtField(FieldNames.signature)) { if (!input.trySkipNullValue()) { - input.readMessage(unk1); + input.readString(signature); bitField0_ |= 0x00000004; } } else { @@ -578,10 +586,10 @@ public final class GetPlayerBoardDataScRspOuterClass { } break; } - case 1073584312: { - if (input.isAtField(FieldNames.signature)) { + case 3594623: { + if (input.isAtField(FieldNames.unk1)) { if (!input.trySkipNullValue()) { - input.readString(signature); + input.readString(unk1); bitField0_ |= 0x00000008; } } else { @@ -658,173 +666,11 @@ public final class GetPlayerBoardDataScRspOuterClass { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName unk1 = FieldName.forField("unk1"); - static final FieldName signature = FieldName.forField("signature"); + static final FieldName unk1 = FieldName.forField("unk1"); + static final FieldName unlockedHeadIconList = FieldName.forField("unlockedHeadIconList", "unlocked_head_icon_list"); } } - - /** - * Protobuf type {@code GetPlayerBoardDataScRspUnk1} - */ - public static final class GetPlayerBoardDataScRspUnk1 extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - private GetPlayerBoardDataScRspUnk1() { - } - - /** - * @return a new empty instance of {@code GetPlayerBoardDataScRspUnk1} - */ - public static GetPlayerBoardDataScRspUnk1 newInstance() { - return new GetPlayerBoardDataScRspUnk1(); - } - - @Override - public GetPlayerBoardDataScRspUnk1 copyFrom(final GetPlayerBoardDataScRspUnk1 other) { - cachedSize = other.cachedSize; - return this; - } - - @Override - public GetPlayerBoardDataScRspUnk1 mergeFrom(final GetPlayerBoardDataScRspUnk1 other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - return this; - } - - @Override - public GetPlayerBoardDataScRspUnk1 clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - return this; - } - - @Override - public GetPlayerBoardDataScRspUnk1 clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof GetPlayerBoardDataScRspUnk1)) { - return false; - } - GetPlayerBoardDataScRspUnk1 other = (GetPlayerBoardDataScRspUnk1) o; - return true; - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - } - - @Override - protected int computeSerializedSize() { - int size = 0; - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public GetPlayerBoardDataScRspUnk1 mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - output.endObject(); - } - - @Override - public GetPlayerBoardDataScRspUnk1 mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public GetPlayerBoardDataScRspUnk1 clone() { - return new GetPlayerBoardDataScRspUnk1().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static GetPlayerBoardDataScRspUnk1 parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new GetPlayerBoardDataScRspUnk1(), data).checkInitialized(); - } - - public static GetPlayerBoardDataScRspUnk1 parseFrom(final ProtoSource input) throws - IOException { - return ProtoMessage.mergeFrom(new GetPlayerBoardDataScRspUnk1(), input).checkInitialized(); - } - - public static GetPlayerBoardDataScRspUnk1 parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new GetPlayerBoardDataScRspUnk1(), input).checkInitialized(); - } - - /** - * @return factory for creating GetPlayerBoardDataScRspUnk1 messages - */ - public static MessageFactory getFactory() { - return GetPlayerBoardDataScRspUnk1Factory.INSTANCE; - } - - private enum GetPlayerBoardDataScRspUnk1Factory implements MessageFactory { - INSTANCE; - - @Override - public GetPlayerBoardDataScRspUnk1 create() { - return GetPlayerBoardDataScRspUnk1.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - } - } } diff --git a/src/generated/main/emu/lunarcore/proto/MechanismBarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MechanismBarInfoOuterClass.java deleted file mode 100644 index c0510b2..0000000 --- a/src/generated/main/emu/lunarcore/proto/MechanismBarInfoOuterClass.java +++ /dev/null @@ -1,339 +0,0 @@ -// 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; - -public final class MechanismBarInfoOuterClass { - /** - * Protobuf type {@code MechanismBarInfo} - */ - public static final class MechanismBarInfo extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 value = 2; - */ - private int value_; - - /** - * optional uint32 NOGHHPKAKAG = 11; - */ - private int nOGHHPKAKAG; - - private MechanismBarInfo() { - } - - /** - * @return a new empty instance of {@code MechanismBarInfo} - */ - public static MechanismBarInfo newInstance() { - return new MechanismBarInfo(); - } - - /** - * optional uint32 value = 2; - * @return whether the value_ field is set - */ - public boolean hasValue() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 value = 2; - * @return this - */ - public MechanismBarInfo clearValue() { - bitField0_ &= ~0x00000001; - value_ = 0; - return this; - } - - /** - * optional uint32 value = 2; - * @return the value_ - */ - public int getValue() { - return value_; - } - - /** - * optional uint32 value = 2; - * @param value the value_ to set - * @return this - */ - public MechanismBarInfo setValue(final int value) { - bitField0_ |= 0x00000001; - value_ = value; - return this; - } - - /** - * optional uint32 NOGHHPKAKAG = 11; - * @return whether the nOGHHPKAKAG field is set - */ - public boolean hasNOGHHPKAKAG() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 NOGHHPKAKAG = 11; - * @return this - */ - public MechanismBarInfo clearNOGHHPKAKAG() { - bitField0_ &= ~0x00000002; - nOGHHPKAKAG = 0; - return this; - } - - /** - * optional uint32 NOGHHPKAKAG = 11; - * @return the nOGHHPKAKAG - */ - public int getNOGHHPKAKAG() { - return nOGHHPKAKAG; - } - - /** - * optional uint32 NOGHHPKAKAG = 11; - * @param value the nOGHHPKAKAG to set - * @return this - */ - public MechanismBarInfo setNOGHHPKAKAG(final int value) { - bitField0_ |= 0x00000002; - nOGHHPKAKAG = value; - return this; - } - - @Override - public MechanismBarInfo copyFrom(final MechanismBarInfo other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - value_ = other.value_; - nOGHHPKAKAG = other.nOGHHPKAKAG; - } - return this; - } - - @Override - public MechanismBarInfo mergeFrom(final MechanismBarInfo other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasValue()) { - setValue(other.value_); - } - if (other.hasNOGHHPKAKAG()) { - setNOGHHPKAKAG(other.nOGHHPKAKAG); - } - return this; - } - - @Override - public MechanismBarInfo clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - value_ = 0; - nOGHHPKAKAG = 0; - return this; - } - - @Override - public MechanismBarInfo clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof MechanismBarInfo)) { - return false; - } - MechanismBarInfo other = (MechanismBarInfo) o; - return bitField0_ == other.bitField0_ - && (!hasValue() || value_ == other.value_) - && (!hasNOGHHPKAKAG() || nOGHHPKAKAG == other.nOGHHPKAKAG); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(value_); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(nOGHHPKAKAG); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(value_); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nOGHHPKAKAG); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public MechanismBarInfo mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 16: { - // value_ - value_ = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // nOGHHPKAKAG - nOGHHPKAKAG = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.value_, value_); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.nOGHHPKAKAG, nOGHHPKAKAG); - } - output.endObject(); - } - - @Override - public MechanismBarInfo mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 111972721: { - if (input.isAtField(FieldNames.value_)) { - if (!input.trySkipNullValue()) { - value_ = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -2077510671: { - if (input.isAtField(FieldNames.nOGHHPKAKAG)) { - if (!input.trySkipNullValue()) { - nOGHHPKAKAG = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public MechanismBarInfo clone() { - return new MechanismBarInfo().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static MechanismBarInfo parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new MechanismBarInfo(), data).checkInitialized(); - } - - public static MechanismBarInfo parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new MechanismBarInfo(), input).checkInitialized(); - } - - public static MechanismBarInfo parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new MechanismBarInfo(), input).checkInitialized(); - } - - /** - * @return factory for creating MechanismBarInfo messages - */ - public static MessageFactory getFactory() { - return MechanismBarInfoFactory.INSTANCE; - } - - private enum MechanismBarInfoFactory implements MessageFactory { - INSTANCE; - - @Override - public MechanismBarInfo create() { - return MechanismBarInfo.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName value_ = FieldName.forField("value"); - - static final FieldName nOGHHPKAKAG = FieldName.forField("NOGHHPKAKAG"); - } - } -} diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java index 533b6f5..ac64d62 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -10,7 +10,6 @@ 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; import us.hebi.quickbuf.RepeatedMessage; public final class SceneInfoOuterClass { @@ -55,11 +54,6 @@ public final class SceneInfoOuterClass { */ private int entryId; - /** - * repeated uint32 JBDDBBAMMNH = 10; - */ - private final RepeatedInt jBDDBBAMMNH = RepeatedInt.newEmptyInstance(); - /** * repeated .SceneEntityInfo entity_list = 9; */ @@ -344,80 +338,12 @@ public final class SceneInfoOuterClass { return this; } - /** - * repeated uint32 JBDDBBAMMNH = 10; - * @return whether the jBDDBBAMMNH field is set - */ - public boolean hasJBDDBBAMMNH() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated uint32 JBDDBBAMMNH = 10; - * @return this - */ - public SceneInfo clearJBDDBBAMMNH() { - bitField0_ &= ~0x00000080; - jBDDBBAMMNH.clear(); - return this; - } - - /** - * repeated uint32 JBDDBBAMMNH = 10; - * - * 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 #getMutableJBDDBBAMMNH()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getJBDDBBAMMNH() { - return jBDDBBAMMNH; - } - - /** - * repeated uint32 JBDDBBAMMNH = 10; - * - * 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 getMutableJBDDBBAMMNH() { - bitField0_ |= 0x00000080; - return jBDDBBAMMNH; - } - - /** - * repeated uint32 JBDDBBAMMNH = 10; - * @param value the jBDDBBAMMNH to add - * @return this - */ - public SceneInfo addJBDDBBAMMNH(final int value) { - bitField0_ |= 0x00000080; - jBDDBBAMMNH.add(value); - return this; - } - - /** - * repeated uint32 JBDDBBAMMNH = 10; - * @param values the jBDDBBAMMNH to add - * @return this - */ - public SceneInfo addAllJBDDBBAMMNH(final int... values) { - bitField0_ |= 0x00000080; - jBDDBBAMMNH.addAll(values); - return this; - } - /** * repeated .SceneEntityInfo entity_list = 9; * @return whether the entityList field is set */ public boolean hasEntityList() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000080) != 0; } /** @@ -425,7 +351,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearEntityList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; entityList.clear(); return this; } @@ -454,7 +380,7 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEntityList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return entityList; } @@ -464,7 +390,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; entityList.add(value); return this; } @@ -475,7 +401,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addAllEntityList(final SceneEntityInfoOuterClass.SceneEntityInfo... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; entityList.addAll(values); return this; } @@ -485,7 +411,7 @@ public final class SceneInfoOuterClass { * @return whether the entityGroupList field is set */ public boolean hasEntityGroupList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000100) != 0; } /** @@ -493,7 +419,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; entityGroupList.clear(); return this; } @@ -524,7 +450,7 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return entityGroupList; } @@ -535,7 +461,7 @@ public final class SceneInfoOuterClass { */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; entityGroupList.add(value); return this; } @@ -547,7 +473,7 @@ public final class SceneInfoOuterClass { */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; entityGroupList.addAll(values); return this; } @@ -557,7 +483,7 @@ public final class SceneInfoOuterClass { * @return whether the groupStateList field is set */ public boolean hasGroupStateList() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000200) != 0; } /** @@ -565,7 +491,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearGroupStateList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000200; groupStateList.clear(); return this; } @@ -594,7 +520,7 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableGroupStateList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return groupStateList; } @@ -604,7 +530,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; groupStateList.add(value); return this; } @@ -616,7 +542,7 @@ public final class SceneInfoOuterClass { */ public SceneInfo addAllGroupStateList( final SceneGroupStateOuterClass.SceneGroupState... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; groupStateList.addAll(values); return this; } @@ -633,7 +559,6 @@ public final class SceneInfoOuterClass { floorId = other.floorId; clientPosVersion = other.clientPosVersion; entryId = other.entryId; - jBDDBBAMMNH.copyFrom(other.jBDDBBAMMNH); entityList.copyFrom(other.entityList); entityGroupList.copyFrom(other.entityGroupList); groupStateList.copyFrom(other.groupStateList); @@ -668,9 +593,6 @@ public final class SceneInfoOuterClass { if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasJBDDBBAMMNH()) { - getMutableJBDDBBAMMNH().addAll(other.jBDDBBAMMNH); - } if (other.hasEntityList()) { getMutableEntityList().addAll(other.entityList); } @@ -697,7 +619,6 @@ public final class SceneInfoOuterClass { floorId = 0; clientPosVersion = 0; entryId = 0; - jBDDBBAMMNH.clear(); entityList.clear(); entityGroupList.clear(); groupStateList.clear(); @@ -711,7 +632,6 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - jBDDBBAMMNH.clear(); entityList.clearQuick(); entityGroupList.clearQuick(); groupStateList.clearQuick(); @@ -735,7 +655,6 @@ public final class SceneInfoOuterClass { && (!hasFloorId() || floorId == other.floorId) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntryId() || entryId == other.entryId) - && (!hasJBDDBBAMMNH() || jBDDBBAMMNH.equals(other.jBDDBBAMMNH)) && (!hasEntityList() || entityList.equals(other.entityList)) && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)) && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)); @@ -772,24 +691,18 @@ public final class SceneInfoOuterClass { output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < jBDDBBAMMNH.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(jBDDBBAMMNH.array()[i]); - } - } - if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < entityList.length(); i++) { output.writeRawByte((byte) 74); output.writeMessageNoTag(entityList.get(i)); } } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < entityGroupList.length(); i++) { output.writeRawLittleEndian16((short) 22762); output.writeMessageNoTag(entityGroupList.get(i)); } } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < groupStateList.length(); i++) { output.writeRawLittleEndian16((short) 29570); output.writeMessageNoTag(groupStateList.get(i)); @@ -822,15 +735,12 @@ public final class SceneInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * jBDDBBAMMNH.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(jBDDBBAMMNH); - } - if ((bitField0_ & 0x00000100) != 0) { size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000200) != 0) { size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); } return size; @@ -902,15 +812,6 @@ public final class SceneInfoOuterClass { entryId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // jBDDBBAMMNH [packed=true] - input.readPackedUInt32(jBDDBBAMMNH, tag); - bitField0_ |= 0x00000080; - tag = input.readTag(); if (tag != 74) { break; } @@ -918,7 +819,7 @@ public final class SceneInfoOuterClass { case 74: { // entityList tag = input.readRepeatedMessage(entityList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; if (tag != 11370) { break; } @@ -926,7 +827,7 @@ public final class SceneInfoOuterClass { case 11370: { // entityGroupList tag = input.readRepeatedMessage(entityGroupList, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; if (tag != 14722) { break; } @@ -934,7 +835,7 @@ public final class SceneInfoOuterClass { case 14722: { // groupStateList tag = input.readRepeatedMessage(groupStateList, tag); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; if (tag != 0) { break; } @@ -949,12 +850,6 @@ public final class SceneInfoOuterClass { tag = input.readTag(); break; } - case 80: { - // jBDDBBAMMNH [packed=false] - tag = input.readRepeatedUInt32(jBDDBBAMMNH, tag); - bitField0_ |= 0x00000080; - break; - } } } } @@ -984,15 +879,12 @@ public final class SceneInfoOuterClass { output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.jBDDBBAMMNH, jBDDBBAMMNH); - } - if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.entityList, entityList); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); } output.endObject(); @@ -1089,23 +981,12 @@ public final class SceneInfoOuterClass { } break; } - case 381386787: { - if (input.isAtField(FieldNames.jBDDBBAMMNH)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(jBDDBBAMMNH); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } case -1483251935: case 1281457018: { if (input.isAtField(FieldNames.entityList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1117,7 +998,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.entityGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(entityGroupList); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1129,7 +1010,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.groupStateList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(groupStateList); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -1202,8 +1083,6 @@ public final class SceneInfoOuterClass { static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName jBDDBBAMMNH = FieldName.forField("JBDDBBAMMNH"); - static final FieldName entityList = FieldName.forField("entityList", "entity_list"); static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); diff --git a/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java b/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java deleted file mode 100644 index e87d7aa..0000000 --- a/src/generated/main/emu/lunarcore/proto/WaitDelResourceOuterClass.java +++ /dev/null @@ -1,339 +0,0 @@ -// 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; - -public final class WaitDelResourceOuterClass { - /** - * Protobuf type {@code WaitDelResource} - */ - public static final class WaitDelResource extends ProtoMessage implements Cloneable { - private static final long serialVersionUID = 0L; - - /** - * optional uint32 num = 6; - */ - private int num; - - /** - * optional uint32 tid = 11; - */ - private int tid; - - private WaitDelResource() { - } - - /** - * @return a new empty instance of {@code WaitDelResource} - */ - public static WaitDelResource newInstance() { - return new WaitDelResource(); - } - - /** - * optional uint32 num = 6; - * @return whether the num field is set - */ - public boolean hasNum() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 num = 6; - * @return this - */ - public WaitDelResource clearNum() { - bitField0_ &= ~0x00000001; - num = 0; - return this; - } - - /** - * optional uint32 num = 6; - * @return the num - */ - public int getNum() { - return num; - } - - /** - * optional uint32 num = 6; - * @param value the num to set - * @return this - */ - public WaitDelResource setNum(final int value) { - bitField0_ |= 0x00000001; - num = value; - return this; - } - - /** - * optional uint32 tid = 11; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 tid = 11; - * @return this - */ - public WaitDelResource clearTid() { - bitField0_ &= ~0x00000002; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 11; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 11; - * @param value the tid to set - * @return this - */ - public WaitDelResource setTid(final int value) { - bitField0_ |= 0x00000002; - tid = value; - return this; - } - - @Override - public WaitDelResource copyFrom(final WaitDelResource other) { - cachedSize = other.cachedSize; - if ((bitField0_ | other.bitField0_) != 0) { - bitField0_ = other.bitField0_; - num = other.num; - tid = other.tid; - } - return this; - } - - @Override - public WaitDelResource mergeFrom(final WaitDelResource other) { - if (other.isEmpty()) { - return this; - } - cachedSize = -1; - if (other.hasNum()) { - setNum(other.num); - } - if (other.hasTid()) { - setTid(other.tid); - } - return this; - } - - @Override - public WaitDelResource clear() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - num = 0; - tid = 0; - return this; - } - - @Override - public WaitDelResource clearQuick() { - if (isEmpty()) { - return this; - } - cachedSize = -1; - bitField0_ = 0; - return this; - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (!(o instanceof WaitDelResource)) { - return false; - } - WaitDelResource other = (WaitDelResource) o; - return bitField0_ == other.bitField0_ - && (!hasNum() || num == other.num) - && (!hasTid() || tid == other.tid); - } - - @Override - public void writeTo(final ProtoSink output) throws IOException { - if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(num); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(tid); - } - } - - @Override - protected int computeSerializedSize() { - int size = 0; - if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); - } - return size; - } - - @Override - @SuppressWarnings("fallthrough") - public WaitDelResource mergeFrom(final ProtoSource input) throws IOException { - // Enabled Fall-Through Optimization (QuickBuffers) - int tag = input.readTag(); - while (true) { - switch (tag) { - case 48: { - // num - num = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 0) { - break; - } - } - case 0: { - return this; - } - default: { - if (!input.skipField(tag)) { - return this; - } - tag = input.readTag(); - break; - } - } - } - } - - @Override - public void writeTo(final JsonSink output) throws IOException { - output.beginObject(); - if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.num, num); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - output.endObject(); - } - - @Override - public WaitDelResource mergeFrom(final JsonSource input) throws IOException { - if (!input.beginObject()) { - return this; - } - while (!input.isAtEnd()) { - switch (input.readFieldHash()) { - case 109446: { - if (input.isAtField(FieldNames.num)) { - if (!input.trySkipNullValue()) { - num = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - default: { - input.skipUnknownField(); - break; - } - } - } - input.endObject(); - return this; - } - - @Override - public WaitDelResource clone() { - return new WaitDelResource().copyFrom(this); - } - - @Override - public boolean isEmpty() { - return ((bitField0_) == 0); - } - - public static WaitDelResource parseFrom(final byte[] data) throws - InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new WaitDelResource(), data).checkInitialized(); - } - - public static WaitDelResource parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new WaitDelResource(), input).checkInitialized(); - } - - public static WaitDelResource parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new WaitDelResource(), input).checkInitialized(); - } - - /** - * @return factory for creating WaitDelResource messages - */ - public static MessageFactory getFactory() { - return WaitDelResourceFactory.INSTANCE; - } - - private enum WaitDelResourceFactory implements MessageFactory { - INSTANCE; - - @Override - public WaitDelResource create() { - return WaitDelResource.newInstance(); - } - } - - /** - * Contains name constants used for serializing JSON - */ - static class FieldNames { - static final FieldName num = FieldName.forField("num"); - - static final FieldName tid = FieldName.forField("tid"); - } - } -} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetPlayerBoardDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetPlayerBoardDataScRsp.java index 94888d3..184dcaa 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetPlayerBoardDataScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetPlayerBoardDataScRsp.java @@ -2,7 +2,6 @@ package emu.lunarcore.server.packet.send; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.GetPlayerBoardDataScRspOuterClass.GetPlayerBoardDataScRsp; -import emu.lunarcore.proto.GetPlayerBoardDataScRspOuterClass.GetPlayerBoardDataScRspUnk1; import emu.lunarcore.proto.HeadIconOuterClass.HeadIcon; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; @@ -13,7 +12,7 @@ public class PacketGetPlayerBoardDataScRsp extends BasePacket { super(CmdId.GetPlayerBoardDataScRsp); var data = GetPlayerBoardDataScRsp.newInstance() - .setUnk1(GetPlayerBoardDataScRspUnk1.newInstance()) + .setUnk1("") .setCurrentHeadIconId(player.getHeadIcon()) .setSignature(player.getSignature());