Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 17:51:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix switched fields (#2098)

Browse Source
This commit is contained in:
Thoronium 2023-04-05 19:19:04 -06:00 committed by GitHub
parent 9181d1cbfd
commit 7254f55762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java
View File

@ -47,7 +47,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
int getCurFightPropMapCount(); int getCurFightPropMapCount();
/** /**
@ -55,7 +55,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
boolean containsCurFightPropMap( boolean containsCurFightPropMap(
int key); int key);
@ -70,7 +70,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
java.util.Map<java.lang.Integer, java.lang.Float> java.util.Map<java.lang.Integer, java.lang.Float>
getCurFightPropMapMap(); getCurFightPropMapMap();
@ -79,7 +79,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
float getCurFightPropMapOrDefault( float getCurFightPropMapOrDefault(
@ -90,7 +90,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
float getCurFightPropMapOrThrow( float getCurFightPropMapOrThrow(
@ -101,7 +101,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
int getOldFightPropMapCount(); int getOldFightPropMapCount();
/** /**
@ -109,7 +109,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
boolean containsOldFightPropMap( boolean containsOldFightPropMap(
int key); int key);
@ -124,7 +124,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
java.util.Map<java.lang.Integer, java.lang.Float> java.util.Map<java.lang.Integer, java.lang.Float>
getOldFightPropMapMap(); getOldFightPropMapMap();
@ -133,7 +133,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
float getOldFightPropMapOrDefault( float getOldFightPropMapOrDefault(
@ -144,7 +144,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
float getOldFightPropMapOrThrow( float getOldFightPropMapOrThrow(
@ -212,19 +212,6 @@ public final class AvatarUpgradeRspOuterClass {
break; break;
} }
case 58: { case 58: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
curFightPropMap_ = com.google.protobuf.MapField.newMapField(
CurFightPropMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000001;
}
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
curFightPropMap__ = input.readMessage(
CurFightPropMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
curFightPropMap_.getMutableMap().put(
curFightPropMap__.getKey(), curFightPropMap__.getValue());
break;
}
case 98: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) { if (!((mutable_bitField0_ & 0x00000002) != 0)) {
oldFightPropMap_ = com.google.protobuf.MapField.newMapField( oldFightPropMap_ = com.google.protobuf.MapField.newMapField(
OldFightPropMapDefaultEntryHolder.defaultEntry); OldFightPropMapDefaultEntryHolder.defaultEntry);
@ -237,6 +224,19 @@ public final class AvatarUpgradeRspOuterClass {
oldFightPropMap__.getKey(), oldFightPropMap__.getValue()); oldFightPropMap__.getKey(), oldFightPropMap__.getValue());
break; break;
} }
case 98: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
curFightPropMap_ = com.google.protobuf.MapField.newMapField(
CurFightPropMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000001;
}
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
curFightPropMap__ = input.readMessage(
CurFightPropMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
curFightPropMap_.getMutableMap().put(
curFightPropMap__.getKey(), curFightPropMap__.getValue());
break;
}
case 104: { case 104: {
avatarGuid_ = input.readUInt64(); avatarGuid_ = input.readUInt64();
@ -276,9 +276,9 @@ public final class AvatarUpgradeRspOuterClass {
protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMapField(
int number) { int number) {
switch (number) { switch (number) {
case 7:
return internalGetCurFightPropMap();
case 12: case 12:
return internalGetCurFightPropMap();
case 7:
return internalGetOldFightPropMap(); return internalGetOldFightPropMap();
default: default:
throw new RuntimeException( throw new RuntimeException(
@ -337,7 +337,7 @@ public final class AvatarUpgradeRspOuterClass {
return avatarGuid_; return avatarGuid_;
} }
public static final int CUR_FIGHT_PROP_MAP_FIELD_NUMBER = 7; public static final int CUR_FIGHT_PROP_MAP_FIELD_NUMBER = 12;
private static final class CurFightPropMapDefaultEntryHolder { private static final class CurFightPropMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry< static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Float> defaultEntry = java.lang.Integer, java.lang.Float> defaultEntry =
@ -368,7 +368,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -390,7 +390,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -402,7 +402,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -419,7 +419,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -434,7 +434,7 @@ public final class AvatarUpgradeRspOuterClass {
return map.get(key); return map.get(key);
} }
public static final int OLD_FIGHT_PROP_MAP_FIELD_NUMBER = 12; public static final int OLD_FIGHT_PROP_MAP_FIELD_NUMBER = 7;
private static final class OldFightPropMapDefaultEntryHolder { private static final class OldFightPropMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry< static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Float> defaultEntry = java.lang.Integer, java.lang.Float> defaultEntry =
@ -465,7 +465,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -487,7 +487,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -499,7 +499,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -516,7 +516,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -554,14 +554,14 @@ public final class AvatarUpgradeRspOuterClass {
com.google.protobuf.GeneratedMessageV3 com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo( .serializeIntegerMapTo(
output, output,
internalGetCurFightPropMap(), internalGetOldFightPropMap(),
CurFightPropMapDefaultEntryHolder.defaultEntry, OldFightPropMapDefaultEntryHolder.defaultEntry,
7); 7);
com.google.protobuf.GeneratedMessageV3 com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo( .serializeIntegerMapTo(
output, output,
internalGetOldFightPropMap(), internalGetCurFightPropMap(),
OldFightPropMapDefaultEntryHolder.defaultEntry, CurFightPropMapDefaultEntryHolder.defaultEntry,
12); 12);
if (avatarGuid_ != 0L) { if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_); output.writeUInt64(13, avatarGuid_);
@ -586,16 +586,6 @@ public final class AvatarUpgradeRspOuterClass {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, oldLevel_); .computeUInt32Size(3, oldLevel_);
} }
for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
: internalGetCurFightPropMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
curFightPropMap__ = CurFightPropMapDefaultEntryHolder.defaultEntry.newBuilderForType()
.setKey(entry.getKey())
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, curFightPropMap__);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
: internalGetOldFightPropMap().getMap().entrySet()) { : internalGetOldFightPropMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float> com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
@ -604,7 +594,17 @@ public final class AvatarUpgradeRspOuterClass {
.setValue(entry.getValue()) .setValue(entry.getValue())
.build(); .build();
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, oldFightPropMap__); .computeMessageSize(7, oldFightPropMap__);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
: internalGetCurFightPropMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
curFightPropMap__ = CurFightPropMapDefaultEntryHolder.defaultEntry.newBuilderForType()
.setKey(entry.getKey())
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(12, curFightPropMap__);
} }
if (avatarGuid_ != 0L) { if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@ -785,9 +785,9 @@ public final class AvatarUpgradeRspOuterClass {
protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMapField(
int number) { int number) {
switch (number) { switch (number) {
case 7:
return internalGetCurFightPropMap();
case 12: case 12:
return internalGetCurFightPropMap();
case 7:
return internalGetOldFightPropMap(); return internalGetOldFightPropMap();
default: default:
throw new RuntimeException( throw new RuntimeException(
@ -798,9 +798,9 @@ public final class AvatarUpgradeRspOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField( protected com.google.protobuf.MapField internalGetMutableMapField(
int number) { int number) {
switch (number) { switch (number) {
case 7:
return internalGetMutableCurFightPropMap();
case 12: case 12:
return internalGetMutableCurFightPropMap();
case 7:
return internalGetMutableOldFightPropMap(); return internalGetMutableOldFightPropMap();
default: default:
throw new RuntimeException( throw new RuntimeException(
@ -1127,7 +1127,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1149,7 +1149,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1161,7 +1161,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1178,7 +1178,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1203,7 +1203,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
public Builder removeCurFightPropMap( public Builder removeCurFightPropMap(
@ -1226,7 +1226,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
public Builder putCurFightPropMap( public Builder putCurFightPropMap(
int key, int key,
@ -1242,7 +1242,7 @@ public final class AvatarUpgradeRspOuterClass {
*GEKBLKPMJCG *GEKBLKPMJCG
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; cur_fight_prop_map = 7;</code> * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 12;</code>
*/ */
public Builder putAllCurFightPropMap( public Builder putAllCurFightPropMap(
@ -1283,7 +1283,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1305,7 +1305,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1317,7 +1317,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1334,7 +1334,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
@java.lang.Override @java.lang.Override
@ -1359,7 +1359,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
public Builder removeOldFightPropMap( public Builder removeOldFightPropMap(
@ -1382,7 +1382,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
public Builder putOldFightPropMap( public Builder putOldFightPropMap(
int key, int key,
@ -1398,7 +1398,7 @@ public final class AvatarUpgradeRspOuterClass {
*AFEDLAOGFOC *AFEDLAOGFOC
* </pre> * </pre>
* *
* <code>map&lt;uint32, float&gt; old_fight_prop_map = 12;</code> * <code>map&lt;uint32, float&gt; old_fight_prop_map = 7;</code>
*/ */
public Builder putAllOldFightPropMap( public Builder putAllOldFightPropMap(
@ -1487,9 +1487,9 @@ public final class AvatarUpgradeRspOuterClass {
"\n\026AvatarUpgradeRsp.proto\"\326\002\n\020AvatarUpgra" + "\n\026AvatarUpgradeRsp.proto\"\326\002\n\020AvatarUpgra" +
"deRsp\022\021\n\told_level\030\003 \001(\r\022\021\n\tcur_level\030\017 " + "deRsp\022\021\n\told_level\030\003 \001(\r\022\021\n\tcur_level\030\017 " +
"\001(\r\022\017\n\007retcode\030\001 \001(\005\022\023\n\013avatar_guid\030\r \001(" + "\001(\r\022\017\n\007retcode\030\001 \001(\005\022\023\n\013avatar_guid\030\r \001(" +
"\004\022B\n\022cur_fight_prop_map\030\007 \003(\0132&.AvatarUp" + "\004\022B\n\022cur_fight_prop_map\030\014 \003(\0132&.AvatarUp" +
"gradeRsp.CurFightPropMapEntry\022B\n\022old_fig" + "gradeRsp.CurFightPropMapEntry\022B\n\022old_fig" +
"ht_prop_map\030\014 \003(\0132&.AvatarUpgradeRsp.Old" + "ht_prop_map\030\007 \003(\0132&.AvatarUpgradeRsp.Old" +
"FightPropMapEntry\0326\n\024CurFightPropMapEntr" + "FightPropMapEntry\0326\n\024CurFightPropMapEntr" +
"y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\0326\n\024Old" + "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\0326\n\024Old" +
"FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" + "FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +