diff --git a/src/generated/main/emu/nebula/proto/JointDrillApply.java b/src/generated/main/emu/nebula/proto/JointDrillApply.java index 9af6129..0ce0e6a 100644 --- a/src/generated/main/emu/nebula/proto/JointDrillApply.java +++ b/src/generated/main/emu/nebula/proto/JointDrillApply.java @@ -24,21 +24,21 @@ public final class JointDrillApply { */ private long buildId; + /** + * optional uint64 BossHp = 3; + */ + private long bossHp; + + /** + * optional uint64 BossHpMax = 4; + */ + private long bossHpMax; + /** * optional uint32 LevelId = 1; */ private int levelId; - /** - * optional uint32 BossHp = 3; - */ - private int bossHp; - - /** - * optional uint32 BossHpMax = 4; - */ - private int bossHpMax; - /** * optional bool Simulate = 5; */ @@ -96,12 +96,86 @@ public final class JointDrillApply { return this; } + /** + * optional uint64 BossHp = 3; + * @return whether the bossHp field is set + */ + public boolean hasBossHp() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint64 BossHp = 3; + * @return this + */ + public JointDrillApplyReq clearBossHp() { + bitField0_ &= ~0x00000002; + bossHp = 0L; + return this; + } + + /** + * optional uint64 BossHp = 3; + * @return the bossHp + */ + public long getBossHp() { + return bossHp; + } + + /** + * optional uint64 BossHp = 3; + * @param value the bossHp to set + * @return this + */ + public JointDrillApplyReq setBossHp(final long value) { + bitField0_ |= 0x00000002; + bossHp = value; + return this; + } + + /** + * optional uint64 BossHpMax = 4; + * @return whether the bossHpMax field is set + */ + public boolean hasBossHpMax() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint64 BossHpMax = 4; + * @return this + */ + public JointDrillApplyReq clearBossHpMax() { + bitField0_ &= ~0x00000004; + bossHpMax = 0L; + return this; + } + + /** + * optional uint64 BossHpMax = 4; + * @return the bossHpMax + */ + public long getBossHpMax() { + return bossHpMax; + } + + /** + * optional uint64 BossHpMax = 4; + * @param value the bossHpMax to set + * @return this + */ + public JointDrillApplyReq setBossHpMax(final long value) { + bitField0_ |= 0x00000004; + bossHpMax = value; + return this; + } + /** * optional uint32 LevelId = 1; * @return whether the levelId field is set */ public boolean hasLevelId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -109,7 +183,7 @@ public final class JointDrillApply { * @return this */ public JointDrillApplyReq clearLevelId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000008; levelId = 0; return this; } @@ -128,82 +202,8 @@ public final class JointDrillApply { * @return this */ public JointDrillApplyReq setLevelId(final int value) { - bitField0_ |= 0x00000002; - levelId = value; - return this; - } - - /** - * optional uint32 BossHp = 3; - * @return whether the bossHp field is set - */ - public boolean hasBossHp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 BossHp = 3; - * @return this - */ - public JointDrillApplyReq clearBossHp() { - bitField0_ &= ~0x00000004; - bossHp = 0; - return this; - } - - /** - * optional uint32 BossHp = 3; - * @return the bossHp - */ - public int getBossHp() { - return bossHp; - } - - /** - * optional uint32 BossHp = 3; - * @param value the bossHp to set - * @return this - */ - public JointDrillApplyReq setBossHp(final int value) { - bitField0_ |= 0x00000004; - bossHp = value; - return this; - } - - /** - * optional uint32 BossHpMax = 4; - * @return whether the bossHpMax field is set - */ - public boolean hasBossHpMax() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 BossHpMax = 4; - * @return this - */ - public JointDrillApplyReq clearBossHpMax() { - bitField0_ &= ~0x00000008; - bossHpMax = 0; - return this; - } - - /** - * optional uint32 BossHpMax = 4; - * @return the bossHpMax - */ - public int getBossHpMax() { - return bossHpMax; - } - - /** - * optional uint32 BossHpMax = 4; - * @param value the bossHpMax to set - * @return this - */ - public JointDrillApplyReq setBossHpMax(final int value) { bitField0_ |= 0x00000008; - bossHpMax = value; + levelId = value; return this; } @@ -329,9 +329,9 @@ public final class JointDrillApply { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; buildId = other.buildId; - levelId = other.levelId; bossHp = other.bossHp; bossHpMax = other.bossHpMax; + levelId = other.levelId; simulate = other.simulate; nextPackage.copyFrom(other.nextPackage); } @@ -347,15 +347,15 @@ public final class JointDrillApply { if (other.hasBuildId()) { setBuildId(other.buildId); } - if (other.hasLevelId()) { - setLevelId(other.levelId); - } if (other.hasBossHp()) { setBossHp(other.bossHp); } if (other.hasBossHpMax()) { setBossHpMax(other.bossHpMax); } + if (other.hasLevelId()) { + setLevelId(other.levelId); + } if (other.hasSimulate()) { setSimulate(other.simulate); } @@ -373,9 +373,9 @@ public final class JointDrillApply { cachedSize = -1; bitField0_ = 0; buildId = 0L; + bossHp = 0L; + bossHpMax = 0L; levelId = 0; - bossHp = 0; - bossHpMax = 0; simulate = false; nextPackage.clear(); return this; @@ -403,9 +403,9 @@ public final class JointDrillApply { JointDrillApplyReq other = (JointDrillApplyReq) o; return bitField0_ == other.bitField0_ && (!hasBuildId() || buildId == other.buildId) - && (!hasLevelId() || levelId == other.levelId) && (!hasBossHp() || bossHp == other.bossHp) && (!hasBossHpMax() || bossHpMax == other.bossHpMax) + && (!hasLevelId() || levelId == other.levelId) && (!hasSimulate() || simulate == other.simulate) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -417,16 +417,16 @@ public final class JointDrillApply { output.writeUInt64NoTag(buildId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(levelId); + output.writeRawByte((byte) 24); + output.writeUInt64NoTag(bossHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(bossHp); + output.writeRawByte((byte) 32); + output.writeUInt64NoTag(bossHpMax); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(bossHpMax); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(levelId); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 40); @@ -445,13 +445,13 @@ public final class JointDrillApply { size += 1 + ProtoSink.computeUInt64SizeNoTag(buildId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(levelId); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHp); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHpMax); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHpMax); + size += 1 + ProtoSink.computeUInt32SizeNoTag(levelId); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -474,23 +474,14 @@ public final class JointDrillApply { buildId = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { - break; - } - } - case 8: { - // levelId - levelId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 24) { break; } } case 24: { // bossHp - bossHp = input.readUInt32(); - bitField0_ |= 0x00000004; + bossHp = input.readUInt64(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 32) { break; @@ -498,7 +489,16 @@ public final class JointDrillApply { } case 32: { // bossHpMax - bossHpMax = input.readUInt32(); + bossHpMax = input.readUInt64(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { + // levelId + levelId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 40) { @@ -544,13 +544,13 @@ public final class JointDrillApply { output.writeUInt64(FieldNames.buildId, buildId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.levelId, levelId); + output.writeUInt64(FieldNames.bossHp, bossHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.bossHp, bossHp); + output.writeUInt64(FieldNames.bossHpMax, bossHpMax); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.bossHpMax, bossHpMax); + output.writeUInt32(FieldNames.levelId, levelId); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.simulate, simulate); @@ -579,22 +579,11 @@ public final class JointDrillApply { } break; } - case 1734437791: { - if (input.isAtField(FieldNames.levelId)) { - if (!input.trySkipNullValue()) { - levelId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 1995573621: { if (input.isAtField(FieldNames.bossHp)) { if (!input.trySkipNullValue()) { - bossHp = input.readUInt32(); - bitField0_ |= 0x00000004; + bossHp = input.readUInt64(); + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -604,7 +593,18 @@ public final class JointDrillApply { case -803490897: { if (input.isAtField(FieldNames.bossHpMax)) { if (!input.trySkipNullValue()) { - bossHpMax = input.readUInt32(); + bossHpMax = input.readUInt64(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1734437791: { + if (input.isAtField(FieldNames.levelId)) { + if (!input.trySkipNullValue()) { + levelId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -689,12 +689,12 @@ public final class JointDrillApply { static class FieldNames { static final FieldName buildId = FieldName.forField("BuildId"); - static final FieldName levelId = FieldName.forField("LevelId"); - static final FieldName bossHp = FieldName.forField("BossHp"); static final FieldName bossHpMax = FieldName.forField("BossHpMax"); + static final FieldName levelId = FieldName.forField("LevelId"); + static final FieldName simulate = FieldName.forField("Simulate"); static final FieldName nextPackage = FieldName.forField("NextPackage"); diff --git a/src/generated/main/emu/nebula/proto/JointDrillGiveUp.java b/src/generated/main/emu/nebula/proto/JointDrillGiveUp.java index f0a4805..5fc19eb 100644 --- a/src/generated/main/emu/nebula/proto/JointDrillGiveUp.java +++ b/src/generated/main/emu/nebula/proto/JointDrillGiveUp.java @@ -19,6 +19,11 @@ public final class JointDrillGiveUp { public static final class JointDrillGiveUpReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint64 BossHp = 4; + */ + private long bossHp; + /** * optional uint32 Floor = 1; */ @@ -34,11 +39,6 @@ public final class JointDrillGiveUp { */ private int damage; - /** - * optional uint32 BossHp = 4; - */ - private int bossHp; - /** * optional bytes Record = 5; */ @@ -59,12 +59,49 @@ public final class JointDrillGiveUp { return new JointDrillGiveUpReq(); } + /** + * optional uint64 BossHp = 4; + * @return whether the bossHp field is set + */ + public boolean hasBossHp() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint64 BossHp = 4; + * @return this + */ + public JointDrillGiveUpReq clearBossHp() { + bitField0_ &= ~0x00000001; + bossHp = 0L; + return this; + } + + /** + * optional uint64 BossHp = 4; + * @return the bossHp + */ + public long getBossHp() { + return bossHp; + } + + /** + * optional uint64 BossHp = 4; + * @param value the bossHp to set + * @return this + */ + public JointDrillGiveUpReq setBossHp(final long value) { + bitField0_ |= 0x00000001; + bossHp = value; + return this; + } + /** * optional uint32 Floor = 1; * @return whether the floor field is set */ public boolean hasFloor() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -72,7 +109,7 @@ public final class JointDrillGiveUp { * @return this */ public JointDrillGiveUpReq clearFloor() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; floor = 0; return this; } @@ -91,7 +128,7 @@ public final class JointDrillGiveUp { * @return this */ public JointDrillGiveUpReq setFloor(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; floor = value; return this; } @@ -101,7 +138,7 @@ public final class JointDrillGiveUp { * @return whether the time field is set */ public boolean hasTime() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -109,7 +146,7 @@ public final class JointDrillGiveUp { * @return this */ public JointDrillGiveUpReq clearTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; time = 0; return this; } @@ -128,7 +165,7 @@ public final class JointDrillGiveUp { * @return this */ public JointDrillGiveUpReq setTime(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; time = value; return this; } @@ -138,7 +175,7 @@ public final class JointDrillGiveUp { * @return whether the damage field is set */ public boolean hasDamage() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -146,7 +183,7 @@ public final class JointDrillGiveUp { * @return this */ public JointDrillGiveUpReq clearDamage() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; damage = 0; return this; } @@ -165,45 +202,8 @@ public final class JointDrillGiveUp { * @return this */ public JointDrillGiveUpReq setDamage(final int value) { - bitField0_ |= 0x00000004; - damage = value; - return this; - } - - /** - * optional uint32 BossHp = 4; - * @return whether the bossHp field is set - */ - public boolean hasBossHp() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 BossHp = 4; - * @return this - */ - public JointDrillGiveUpReq clearBossHp() { - bitField0_ &= ~0x00000008; - bossHp = 0; - return this; - } - - /** - * optional uint32 BossHp = 4; - * @return the bossHp - */ - public int getBossHp() { - return bossHp; - } - - /** - * optional uint32 BossHp = 4; - * @param value the bossHp to set - * @return this - */ - public JointDrillGiveUpReq setBossHp(final int value) { bitField0_ |= 0x00000008; - bossHp = value; + damage = value; return this; } @@ -370,10 +370,10 @@ public final class JointDrillGiveUp { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + bossHp = other.bossHp; floor = other.floor; time = other.time; damage = other.damage; - bossHp = other.bossHp; record.copyFrom(other.record); nextPackage.copyFrom(other.nextPackage); } @@ -386,6 +386,9 @@ public final class JointDrillGiveUp { return this; } cachedSize = -1; + if (other.hasBossHp()) { + setBossHp(other.bossHp); + } if (other.hasFloor()) { setFloor(other.floor); } @@ -395,9 +398,6 @@ public final class JointDrillGiveUp { if (other.hasDamage()) { setDamage(other.damage); } - if (other.hasBossHp()) { - setBossHp(other.bossHp); - } if (other.hasRecord()) { getMutableRecord().copyFrom(other.record); } @@ -414,10 +414,10 @@ public final class JointDrillGiveUp { } cachedSize = -1; bitField0_ = 0; + bossHp = 0L; floor = 0; time = 0; damage = 0; - bossHp = 0; record.clear(); nextPackage.clear(); return this; @@ -445,10 +445,10 @@ public final class JointDrillGiveUp { } JointDrillGiveUpReq other = (JointDrillGiveUpReq) o; return bitField0_ == other.bitField0_ + && (!hasBossHp() || bossHp == other.bossHp) && (!hasFloor() || floor == other.floor) && (!hasTime() || time == other.time) && (!hasDamage() || damage == other.damage) - && (!hasBossHp() || bossHp == other.bossHp) && (!hasRecord() || record.equals(other.record)) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -456,21 +456,21 @@ public final class JointDrillGiveUp { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt64NoTag(bossHp); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); output.writeUInt32NoTag(floor); } - if ((bitField0_ & 0x00000002) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 16); output.writeUInt32NoTag(time); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 24); output.writeUInt32NoTag(damage); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(bossHp); - } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 42); output.writeBytesNoTag(record); @@ -485,16 +485,16 @@ public final class JointDrillGiveUp { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floor); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(time); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floor); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(damage); + size += 1 + ProtoSink.computeUInt32SizeNoTag(time); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(damage); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeBytesSizeNoTag(record); @@ -512,10 +512,19 @@ public final class JointDrillGiveUp { int tag = input.readTag(); while (true) { switch (tag) { + case 32: { + // bossHp + bossHp = input.readUInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 8) { + break; + } + } case 8: { // floor floor = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 16) { break; @@ -524,7 +533,7 @@ public final class JointDrillGiveUp { case 16: { // time time = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 24) { break; @@ -533,15 +542,6 @@ public final class JointDrillGiveUp { case 24: { // damage damage = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // bossHp - bossHp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 42) { @@ -584,16 +584,16 @@ public final class JointDrillGiveUp { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.floor, floor); + output.writeUInt64(FieldNames.bossHp, bossHp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.time, time); + output.writeUInt32(FieldNames.floor, floor); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.damage, damage); + output.writeUInt32(FieldNames.time, time); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.bossHp, bossHp); + output.writeUInt32(FieldNames.damage, damage); } if ((bitField0_ & 0x00000010) != 0) { output.writeBytes(FieldNames.record, record); @@ -611,11 +611,22 @@ public final class JointDrillGiveUp { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1995573621: { + if (input.isAtField(FieldNames.bossHp)) { + if (!input.trySkipNullValue()) { + bossHp = input.readUInt64(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 67974124: { if (input.isAtField(FieldNames.floor)) { if (!input.trySkipNullValue()) { floor = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -626,7 +637,7 @@ public final class JointDrillGiveUp { if (input.isAtField(FieldNames.time)) { if (!input.trySkipNullValue()) { time = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -637,17 +648,6 @@ public final class JointDrillGiveUp { if (input.isAtField(FieldNames.damage)) { if (!input.trySkipNullValue()) { damage = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1995573621: { - if (input.isAtField(FieldNames.bossHp)) { - if (!input.trySkipNullValue()) { - bossHp = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -730,14 +730,14 @@ public final class JointDrillGiveUp { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName bossHp = FieldName.forField("BossHp"); + static final FieldName floor = FieldName.forField("Floor"); static final FieldName time = FieldName.forField("Time"); static final FieldName damage = FieldName.forField("Damage"); - static final FieldName bossHp = FieldName.forField("BossHp"); - static final FieldName record = FieldName.forField("Record"); static final FieldName nextPackage = FieldName.forField("NextPackage"); diff --git a/src/generated/main/emu/nebula/proto/JointDrillSync.java b/src/generated/main/emu/nebula/proto/JointDrillSync.java index 4f225de..9bab1c9 100644 --- a/src/generated/main/emu/nebula/proto/JointDrillSync.java +++ b/src/generated/main/emu/nebula/proto/JointDrillSync.java @@ -19,6 +19,16 @@ public final class JointDrillSync { public static final class JointDrillSyncReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint64 BossHp = 4; + */ + private long bossHp; + + /** + * optional uint64 BossHpMax = 5; + */ + private long bossHpMax; + /** * optional uint32 Floor = 1; */ @@ -34,16 +44,6 @@ public final class JointDrillSync { */ private int damage; - /** - * optional uint32 BossHp = 4; - */ - private int bossHp; - - /** - * optional uint32 BossHpMax = 5; - */ - private int bossHpMax; - /** * optional bytes Record = 6; */ @@ -64,12 +64,86 @@ public final class JointDrillSync { return new JointDrillSyncReq(); } + /** + * optional uint64 BossHp = 4; + * @return whether the bossHp field is set + */ + public boolean hasBossHp() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint64 BossHp = 4; + * @return this + */ + public JointDrillSyncReq clearBossHp() { + bitField0_ &= ~0x00000001; + bossHp = 0L; + return this; + } + + /** + * optional uint64 BossHp = 4; + * @return the bossHp + */ + public long getBossHp() { + return bossHp; + } + + /** + * optional uint64 BossHp = 4; + * @param value the bossHp to set + * @return this + */ + public JointDrillSyncReq setBossHp(final long value) { + bitField0_ |= 0x00000001; + bossHp = value; + return this; + } + + /** + * optional uint64 BossHpMax = 5; + * @return whether the bossHpMax field is set + */ + public boolean hasBossHpMax() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint64 BossHpMax = 5; + * @return this + */ + public JointDrillSyncReq clearBossHpMax() { + bitField0_ &= ~0x00000002; + bossHpMax = 0L; + return this; + } + + /** + * optional uint64 BossHpMax = 5; + * @return the bossHpMax + */ + public long getBossHpMax() { + return bossHpMax; + } + + /** + * optional uint64 BossHpMax = 5; + * @param value the bossHpMax to set + * @return this + */ + public JointDrillSyncReq setBossHpMax(final long value) { + bitField0_ |= 0x00000002; + bossHpMax = value; + return this; + } + /** * optional uint32 Floor = 1; * @return whether the floor field is set */ public boolean hasFloor() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -77,7 +151,7 @@ public final class JointDrillSync { * @return this */ public JointDrillSyncReq clearFloor() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000004; floor = 0; return this; } @@ -96,7 +170,7 @@ public final class JointDrillSync { * @return this */ public JointDrillSyncReq setFloor(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; floor = value; return this; } @@ -106,7 +180,7 @@ public final class JointDrillSync { * @return whether the time field is set */ public boolean hasTime() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -114,7 +188,7 @@ public final class JointDrillSync { * @return this */ public JointDrillSyncReq clearTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000008; time = 0; return this; } @@ -133,7 +207,7 @@ public final class JointDrillSync { * @return this */ public JointDrillSyncReq setTime(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; time = value; return this; } @@ -143,7 +217,7 @@ public final class JointDrillSync { * @return whether the damage field is set */ public boolean hasDamage() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -151,7 +225,7 @@ public final class JointDrillSync { * @return this */ public JointDrillSyncReq clearDamage() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000010; damage = 0; return this; } @@ -170,82 +244,8 @@ public final class JointDrillSync { * @return this */ public JointDrillSyncReq setDamage(final int value) { - bitField0_ |= 0x00000004; - damage = value; - return this; - } - - /** - * optional uint32 BossHp = 4; - * @return whether the bossHp field is set - */ - public boolean hasBossHp() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 BossHp = 4; - * @return this - */ - public JointDrillSyncReq clearBossHp() { - bitField0_ &= ~0x00000008; - bossHp = 0; - return this; - } - - /** - * optional uint32 BossHp = 4; - * @return the bossHp - */ - public int getBossHp() { - return bossHp; - } - - /** - * optional uint32 BossHp = 4; - * @param value the bossHp to set - * @return this - */ - public JointDrillSyncReq setBossHp(final int value) { - bitField0_ |= 0x00000008; - bossHp = value; - return this; - } - - /** - * optional uint32 BossHpMax = 5; - * @return whether the bossHpMax field is set - */ - public boolean hasBossHpMax() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 BossHpMax = 5; - * @return this - */ - public JointDrillSyncReq clearBossHpMax() { - bitField0_ &= ~0x00000010; - bossHpMax = 0; - return this; - } - - /** - * optional uint32 BossHpMax = 5; - * @return the bossHpMax - */ - public int getBossHpMax() { - return bossHpMax; - } - - /** - * optional uint32 BossHpMax = 5; - * @param value the bossHpMax to set - * @return this - */ - public JointDrillSyncReq setBossHpMax(final int value) { bitField0_ |= 0x00000010; - bossHpMax = value; + damage = value; return this; } @@ -412,11 +412,11 @@ public final class JointDrillSync { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + bossHp = other.bossHp; + bossHpMax = other.bossHpMax; floor = other.floor; time = other.time; damage = other.damage; - bossHp = other.bossHp; - bossHpMax = other.bossHpMax; record.copyFrom(other.record); nextPackage.copyFrom(other.nextPackage); } @@ -429,6 +429,12 @@ public final class JointDrillSync { return this; } cachedSize = -1; + if (other.hasBossHp()) { + setBossHp(other.bossHp); + } + if (other.hasBossHpMax()) { + setBossHpMax(other.bossHpMax); + } if (other.hasFloor()) { setFloor(other.floor); } @@ -438,12 +444,6 @@ public final class JointDrillSync { if (other.hasDamage()) { setDamage(other.damage); } - if (other.hasBossHp()) { - setBossHp(other.bossHp); - } - if (other.hasBossHpMax()) { - setBossHpMax(other.bossHpMax); - } if (other.hasRecord()) { getMutableRecord().copyFrom(other.record); } @@ -460,11 +460,11 @@ public final class JointDrillSync { } cachedSize = -1; bitField0_ = 0; + bossHp = 0L; + bossHpMax = 0L; floor = 0; time = 0; damage = 0; - bossHp = 0; - bossHpMax = 0; record.clear(); nextPackage.clear(); return this; @@ -492,11 +492,11 @@ public final class JointDrillSync { } JointDrillSyncReq other = (JointDrillSyncReq) o; return bitField0_ == other.bitField0_ + && (!hasBossHp() || bossHp == other.bossHp) + && (!hasBossHpMax() || bossHpMax == other.bossHpMax) && (!hasFloor() || floor == other.floor) && (!hasTime() || time == other.time) && (!hasDamage() || damage == other.damage) - && (!hasBossHp() || bossHp == other.bossHp) - && (!hasBossHpMax() || bossHpMax == other.bossHpMax) && (!hasRecord() || record.equals(other.record)) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -504,25 +504,25 @@ public final class JointDrillSync { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt64NoTag(bossHp); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt64NoTag(bossHpMax); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 8); output.writeUInt32NoTag(floor); } - if ((bitField0_ & 0x00000002) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 16); output.writeUInt32NoTag(time); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 24); output.writeUInt32NoTag(damage); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(bossHp); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(bossHpMax); - } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 50); output.writeBytesNoTag(record); @@ -537,19 +537,19 @@ public final class JointDrillSync { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floor); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(time); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHpMax); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(damage); + size += 1 + ProtoSink.computeUInt32SizeNoTag(floor); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(time); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHpMax); + size += 1 + ProtoSink.computeUInt32SizeNoTag(damage); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeBytesSizeNoTag(record); @@ -567,10 +567,28 @@ public final class JointDrillSync { int tag = input.readTag(); while (true) { switch (tag) { + case 32: { + // bossHp + bossHp = input.readUInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // bossHpMax + bossHpMax = input.readUInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 8) { + break; + } + } case 8: { // floor floor = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 16) { break; @@ -579,7 +597,7 @@ public final class JointDrillSync { case 16: { // time time = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 24) { break; @@ -588,24 +606,6 @@ public final class JointDrillSync { case 24: { // damage damage = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // bossHp - bossHp = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // bossHpMax - bossHpMax = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 50) { @@ -648,19 +648,19 @@ public final class JointDrillSync { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.floor, floor); + output.writeUInt64(FieldNames.bossHp, bossHp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.time, time); + output.writeUInt64(FieldNames.bossHpMax, bossHpMax); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.damage, damage); + output.writeUInt32(FieldNames.floor, floor); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.bossHp, bossHp); + output.writeUInt32(FieldNames.time, time); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.bossHpMax, bossHpMax); + output.writeUInt32(FieldNames.damage, damage); } if ((bitField0_ & 0x00000020) != 0) { output.writeBytes(FieldNames.record, record); @@ -678,11 +678,33 @@ public final class JointDrillSync { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1995573621: { + if (input.isAtField(FieldNames.bossHp)) { + if (!input.trySkipNullValue()) { + bossHp = input.readUInt64(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -803490897: { + if (input.isAtField(FieldNames.bossHpMax)) { + if (!input.trySkipNullValue()) { + bossHpMax = input.readUInt64(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 67974124: { if (input.isAtField(FieldNames.floor)) { if (!input.trySkipNullValue()) { floor = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -693,7 +715,7 @@ public final class JointDrillSync { if (input.isAtField(FieldNames.time)) { if (!input.trySkipNullValue()) { time = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -704,28 +726,6 @@ public final class JointDrillSync { if (input.isAtField(FieldNames.damage)) { if (!input.trySkipNullValue()) { damage = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1995573621: { - if (input.isAtField(FieldNames.bossHp)) { - if (!input.trySkipNullValue()) { - bossHp = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -803490897: { - if (input.isAtField(FieldNames.bossHpMax)) { - if (!input.trySkipNullValue()) { - bossHpMax = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -808,16 +808,16 @@ public final class JointDrillSync { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName bossHp = FieldName.forField("BossHp"); + + static final FieldName bossHpMax = FieldName.forField("BossHpMax"); + static final FieldName floor = FieldName.forField("Floor"); static final FieldName time = FieldName.forField("Time"); static final FieldName damage = FieldName.forField("Damage"); - static final FieldName bossHp = FieldName.forField("BossHp"); - - static final FieldName bossHpMax = FieldName.forField("BossHpMax"); - static final FieldName record = FieldName.forField("Record"); static final FieldName nextPackage = FieldName.forField("NextPackage"); diff --git a/src/generated/main/emu/nebula/proto/PublicJointDrill.java b/src/generated/main/emu/nebula/proto/PublicJointDrill.java index 1cbd00d..a27c8af 100644 --- a/src/generated/main/emu/nebula/proto/PublicJointDrill.java +++ b/src/generated/main/emu/nebula/proto/PublicJointDrill.java @@ -1640,14 +1640,14 @@ public final class PublicJointDrill { private static final long serialVersionUID = 0L; /** - * optional uint32 BossHp = 1; + * optional uint64 BossHp = 1; */ - private int bossHp; + private long bossHp; /** - * optional uint32 BossHpMax = 2; + * optional uint64 BossHpMax = 2; */ - private int bossHpMax; + private long bossHpMax; /** * optional bytes Record = 3; @@ -1670,7 +1670,7 @@ public final class PublicJointDrill { } /** - * optional uint32 BossHp = 1; + * optional uint64 BossHp = 1; * @return whether the bossHp field is set */ public boolean hasBossHp() { @@ -1678,36 +1678,36 @@ public final class PublicJointDrill { } /** - * optional uint32 BossHp = 1; + * optional uint64 BossHp = 1; * @return this */ public Mode1Meta clearBossHp() { bitField0_ &= ~0x00000001; - bossHp = 0; + bossHp = 0L; return this; } /** - * optional uint32 BossHp = 1; + * optional uint64 BossHp = 1; * @return the bossHp */ - public int getBossHp() { + public long getBossHp() { return bossHp; } /** - * optional uint32 BossHp = 1; + * optional uint64 BossHp = 1; * @param value the bossHp to set * @return this */ - public Mode1Meta setBossHp(final int value) { + public Mode1Meta setBossHp(final long value) { bitField0_ |= 0x00000001; bossHp = value; return this; } /** - * optional uint32 BossHpMax = 2; + * optional uint64 BossHpMax = 2; * @return whether the bossHpMax field is set */ public boolean hasBossHpMax() { @@ -1715,29 +1715,29 @@ public final class PublicJointDrill { } /** - * optional uint32 BossHpMax = 2; + * optional uint64 BossHpMax = 2; * @return this */ public Mode1Meta clearBossHpMax() { bitField0_ &= ~0x00000002; - bossHpMax = 0; + bossHpMax = 0L; return this; } /** - * optional uint32 BossHpMax = 2; + * optional uint64 BossHpMax = 2; * @return the bossHpMax */ - public int getBossHpMax() { + public long getBossHpMax() { return bossHpMax; } /** - * optional uint32 BossHpMax = 2; + * optional uint64 BossHpMax = 2; * @param value the bossHpMax to set * @return this */ - public Mode1Meta setBossHpMax(final int value) { + public Mode1Meta setBossHpMax(final long value) { bitField0_ |= 0x00000002; bossHpMax = value; return this; @@ -1942,8 +1942,8 @@ public final class PublicJointDrill { } cachedSize = -1; bitField0_ = 0; - bossHp = 0; - bossHpMax = 0; + bossHp = 0L; + bossHpMax = 0L; record.clear(); nextPackage.clear(); return this; @@ -1981,11 +1981,11 @@ public final class PublicJointDrill { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(bossHp); + output.writeUInt64NoTag(bossHp); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(bossHpMax); + output.writeUInt64NoTag(bossHpMax); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 26); @@ -2001,10 +2001,10 @@ public final class PublicJointDrill { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHp); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bossHpMax); + size += 1 + ProtoSink.computeUInt64SizeNoTag(bossHpMax); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeBytesSizeNoTag(record); @@ -2024,7 +2024,7 @@ public final class PublicJointDrill { switch (tag) { case 8: { // bossHp - bossHp = input.readUInt32(); + bossHp = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 16) { @@ -2033,7 +2033,7 @@ public final class PublicJointDrill { } case 16: { // bossHpMax - bossHpMax = input.readUInt32(); + bossHpMax = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 26) { @@ -2076,10 +2076,10 @@ public final class PublicJointDrill { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.bossHp, bossHp); + output.writeUInt64(FieldNames.bossHp, bossHp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.bossHpMax, bossHpMax); + output.writeUInt64(FieldNames.bossHpMax, bossHpMax); } if ((bitField0_ & 0x00000004) != 0) { output.writeBytes(FieldNames.record, record); @@ -2100,7 +2100,7 @@ public final class PublicJointDrill { case 1995573621: { if (input.isAtField(FieldNames.bossHp)) { if (!input.trySkipNullValue()) { - bossHp = input.readUInt32(); + bossHp = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -2111,7 +2111,7 @@ public final class PublicJointDrill { case -803490897: { if (input.isAtField(FieldNames.bossHpMax)) { if (!input.trySkipNullValue()) { - bossHpMax = input.readUInt32(); + bossHpMax = input.readUInt64(); bitField0_ |= 0x00000002; } } else { @@ -2845,16 +2845,16 @@ public final class PublicJointDrill { public static final class JointDrillBossHp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint64 Hp = 2; + */ + private long hp; + /** * optional uint32 Id = 1; */ private int id; - /** - * optional uint32 Hp = 2; - */ - private int hp; - /** * optional bytes NextPackage = 2047; */ @@ -2870,12 +2870,49 @@ public final class PublicJointDrill { return new JointDrillBossHp(); } + /** + * optional uint64 Hp = 2; + * @return whether the hp field is set + */ + public boolean hasHp() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint64 Hp = 2; + * @return this + */ + public JointDrillBossHp clearHp() { + bitField0_ &= ~0x00000001; + hp = 0L; + return this; + } + + /** + * optional uint64 Hp = 2; + * @return the hp + */ + public long getHp() { + return hp; + } + + /** + * optional uint64 Hp = 2; + * @param value the hp to set + * @return this + */ + public JointDrillBossHp setHp(final long value) { + bitField0_ |= 0x00000001; + hp = value; + return this; + } + /** * optional uint32 Id = 1; * @return whether the id field is set */ public boolean hasId() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -2883,7 +2920,7 @@ public final class PublicJointDrill { * @return this */ public JointDrillBossHp clearId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; id = 0; return this; } @@ -2902,45 +2939,8 @@ public final class PublicJointDrill { * @return this */ public JointDrillBossHp setId(final int value) { - bitField0_ |= 0x00000001; - id = value; - return this; - } - - /** - * optional uint32 Hp = 2; - * @return whether the hp field is set - */ - public boolean hasHp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 Hp = 2; - * @return this - */ - public JointDrillBossHp clearHp() { - bitField0_ &= ~0x00000002; - hp = 0; - return this; - } - - /** - * optional uint32 Hp = 2; - * @return the hp - */ - public int getHp() { - return hp; - } - - /** - * optional uint32 Hp = 2; - * @param value the hp to set - * @return this - */ - public JointDrillBossHp setHp(final int value) { bitField0_ |= 0x00000002; - hp = value; + id = value; return this; } @@ -3028,8 +3028,8 @@ public final class PublicJointDrill { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - id = other.id; hp = other.hp; + id = other.id; nextPackage.copyFrom(other.nextPackage); } return this; @@ -3041,12 +3041,12 @@ public final class PublicJointDrill { return this; } cachedSize = -1; - if (other.hasId()) { - setId(other.id); - } if (other.hasHp()) { setHp(other.hp); } + if (other.hasId()) { + setId(other.id); + } if (other.hasNextPackage()) { getMutableNextPackage().copyFrom(other.nextPackage); } @@ -3060,8 +3060,8 @@ public final class PublicJointDrill { } cachedSize = -1; bitField0_ = 0; + hp = 0L; id = 0; - hp = 0; nextPackage.clear(); return this; } @@ -3087,20 +3087,20 @@ public final class PublicJointDrill { } JointDrillBossHp other = (JointDrillBossHp) o; return bitField0_ == other.bitField0_ - && (!hasId() || id == other.id) && (!hasHp() || hp == other.hp) + && (!hasId() || id == other.id) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 16); + output.writeUInt64NoTag(hp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(hp); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawLittleEndian16((short) 32762); @@ -3112,10 +3112,10 @@ public final class PublicJointDrill { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt64SizeNoTag(hp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); @@ -3130,18 +3130,18 @@ public final class PublicJointDrill { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // id - id = input.readUInt32(); + case 16: { + // hp + hp = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 8) { break; } } - case 16: { - // hp - hp = input.readUInt32(); + case 8: { + // id + id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 16378) { @@ -3175,10 +3175,10 @@ public final class PublicJointDrill { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt64(FieldNames.hp, hp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.hp, hp); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); @@ -3193,10 +3193,10 @@ public final class PublicJointDrill { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2363: { - if (input.isAtField(FieldNames.id)) { + case 2344: { + if (input.isAtField(FieldNames.hp)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + hp = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -3204,10 +3204,10 @@ public final class PublicJointDrill { } break; } - case 2344: { - if (input.isAtField(FieldNames.hp)) { + case 2363: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - hp = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -3279,10 +3279,10 @@ public final class PublicJointDrill { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName id = FieldName.forField("Id"); - static final FieldName hp = FieldName.forField("Hp"); + static final FieldName id = FieldName.forField("Id"); + static final FieldName nextPackage = FieldName.forField("NextPackage"); } } diff --git a/src/main/java/emu/nebula/GameConstants.java b/src/main/java/emu/nebula/GameConstants.java index a7caed0..20edb77 100644 --- a/src/main/java/emu/nebula/GameConstants.java +++ b/src/main/java/emu/nebula/GameConstants.java @@ -7,7 +7,7 @@ import emu.nebula.game.inventory.ItemParamMap; import emu.nebula.util.WeightedList; public class GameConstants { - public static final String VERSION = "1.15.1"; + public static final String VERSION = "1.16.0"; public static int DATA_VERSION = 0; public static final ZoneId UTC_ZONE = ZoneId.of("UTC"); @@ -45,7 +45,8 @@ public class GameConstants { public static final int MAX_BUILDS = 100; public static final int MAX_PRESETS = 50; - public static final int BATTLE_PASS_ID = 9; + public static final int BATTLE_PASS_ID = 1; // Default battle pass + public static final int BATTLE_PASS_UNLOCK_LEVEL = 3; public static final int MAX_FRIENDSHIPS = 50; public static final int MAX_PENDING_FRIENDSHIPS = 30; @@ -69,12 +70,9 @@ public class GameConstants { public static final int REFRESH_TYPE_MONTHLY = 3; public static final int CURRENCY_TYPE_CASH = 1; - // Stellanite Lumina - public static final int CURRENCY_TYPE_ITEM = 2; + public static final int CURRENCY_TYPE_ITEM = 2; // Stellanite Lumina public static final int CURRENCY_TYPE_FREE = 3; public static final int TAG_SKIN = 2; - - public static final int BATTLE_PASS_UNLOCK_LEVEL = 3; public static int[][] VAMPIRE_SURVIVOR_BONUS_POWER = new int[][] { new int[] {100, 120}, diff --git a/src/main/java/emu/nebula/game/activity/ActivityModule.java b/src/main/java/emu/nebula/game/activity/ActivityModule.java index 801a94d..872b109 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityModule.java +++ b/src/main/java/emu/nebula/game/activity/ActivityModule.java @@ -80,10 +80,15 @@ public class ActivityModule extends GameContextModule { //this.activities.add(1011004); // Go, My Lady! Training Handbook Plus! - this.activities.add(1011101); - this.activities.add(1011102); - this.activities.add(1011103); - this.activities.add(1011104); + //this.activities.add(1011101); + //this.activities.add(1011102); + //this.activities.add(1011103); + //this.activities.add(1011104); + + // A Monolith Too Far + this.activities.add(1011201); + this.activities.add(1011203); + this.activities.add(1011204); // ===== Joint Drills (Finale Echoing) ===== //this.activities.add(510003); // Causes soft lock in event screen diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index be85f0d..cb9e834 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -1,7 +1,7 @@ { - "global": 137, - "kr": 142, - "jp": 140, - "tw": 146, - "cn": 136 + "global": 138, + "kr": 143, + "jp": 141, + "tw": 147, + "cn": 137 } \ No newline at end of file