Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 02:03:35 +08:00
Code Issues Projects Releases Wiki Activity

Update gc to 3.3 (#1981)

Browse Source 
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java
+200 -194
View File
@@ -19,11 +19,17 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
int getFightPropMapCount();
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
boolean containsFightPropMap(
int key);
@@ -34,36 +40,33 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
java.util.Map<java.lang.Integer, java.lang.Float>
getFightPropMap();
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Float>
getFightPropMapMap();
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
float getFightPropMapOrDefault(
int key,
float defaultValue);
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
float getFightPropMapOrThrow(
int key);
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* CmdId: 1221
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1243;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarFightPropUpdateNotify}
@@ -111,12 +114,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
case 0:
done = true;
break;
case 104: {
avatarGuid_ = input.readUInt64();
break;
}
case 122: {
case 82: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
fightPropMap_ = com.google.protobuf.MapField.newMapField(
FightPropMapDefaultEntryHolder.defaultEntry);
@@ -129,6 +127,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
fightPropMap__.getKey(), fightPropMap__.getValue());
break;
}
case 104: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -158,7 +161,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 15:
case 10:
return internalGetFightPropMap();
default:
throw new RuntimeException(
@@ -173,7 +176,18 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.class, emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.Builder.class);
}
public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 15;
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 10;
private static final class FightPropMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Float> defaultEntry =
@@ -200,7 +214,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetFightPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
@@ -218,7 +232,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return getFightPropMapMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
@@ -226,7 +240,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return internalGetFightPropMap().getMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
@@ -239,7 +253,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
@@ -254,17 +268,6 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
return map.get(key);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -279,15 +282,15 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
}
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetFightPropMap(),
FightPropMapDefaultEntryHolder.defaultEntry,
15);
10);
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -297,10 +300,6 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
: internalGetFightPropMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
@@ -309,7 +308,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, fightPropMap__);
.computeMessageSize(10, fightPropMap__);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -326,10 +329,10 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify other = (emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify) obj;
if (!internalGetFightPropMap().equals(
other.internalGetFightPropMap())) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!internalGetFightPropMap().equals(
other.internalGetFightPropMap())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -341,13 +344,13 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
if (!internalGetFightPropMap().getMap().isEmpty()) {
hash = (37 * hash) + FIGHT_PROP_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetFightPropMap().hashCode();
}
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -445,10 +448,13 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1221
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1243;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarFightPropUpdateNotify}
@@ -466,7 +472,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 15:
case 10:
return internalGetFightPropMap();
default:
throw new RuntimeException(
@@ -477,7 +483,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 15:
case 10:
return internalGetMutableFightPropMap();
default:
throw new RuntimeException(
@@ -510,9 +516,9 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableFightPropMap().clear();
avatarGuid_ = 0L;
internalGetMutableFightPropMap().clear();
return this;
}
@@ -540,9 +546,9 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
public emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify buildPartial() {
emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify result = new emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify(this);
int from_bitField0_ = bitField0_;
result.avatarGuid_ = avatarGuid_;
result.fightPropMap_ = internalGetFightPropMap();
result.fightPropMap_.makeImmutable();
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
}
@@ -591,11 +597,11 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify other) {
if (other == emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.getDefaultInstance()) return this;
internalGetMutableFightPropMap().mergeFrom(
other.internalGetFightPropMap());
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
internalGetMutableFightPropMap().mergeFrom(
other.internalGetFightPropMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -626,134 +632,6 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
}
private int bitField0_;
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Float> fightPropMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
internalGetFightPropMap() {
if (fightPropMap_ == null) {
return com.google.protobuf.MapField.emptyMapField(
FightPropMapDefaultEntryHolder.defaultEntry);
}
return fightPropMap_;
}
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
internalGetMutableFightPropMap() {
onChanged();;
if (fightPropMap_ == null) {
fightPropMap_ = com.google.protobuf.MapField.newMapField(
FightPropMapDefaultEntryHolder.defaultEntry);
}
if (!fightPropMap_.isMutable()) {
fightPropMap_ = fightPropMap_.copy();
}
return fightPropMap_;
}
public int getFightPropMapCount() {
return internalGetFightPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
@java.lang.Override
public boolean containsFightPropMap(
int key) {
return internalGetFightPropMap().getMap().containsKey(key);
}
/**
* Use {@link #getFightPropMapMap()} instead.
*/
@java.lang.Override
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMap() {
return getFightPropMapMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
@java.lang.Override
public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMapMap() {
return internalGetFightPropMap().getMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
@java.lang.Override
public float getFightPropMapOrDefault(
int key,
float defaultValue) {
java.util.Map<java.lang.Integer, java.lang.Float> map =
internalGetFightPropMap().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
@java.lang.Override
public float getFightPropMapOrThrow(
int key) {
java.util.Map<java.lang.Integer, java.lang.Float> map =
internalGetFightPropMap().getMap();
if (!map.containsKey(key)) {
throw new java.lang.IllegalArgumentException();
}
return map.get(key);
}
public Builder clearFightPropMap() {
internalGetMutableFightPropMap().getMutableMap()
.clear();
return this;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
public Builder removeFightPropMap(
int key) {
internalGetMutableFightPropMap().getMutableMap()
.remove(key);
return this;
}
/**
* Use alternate mutation accessors instead.
*/
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Float>
getMutableFightPropMap() {
return internalGetMutableFightPropMap().getMutableMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
public Builder putFightPropMap(
int key,
float value) {
internalGetMutableFightPropMap().getMutableMap()
.put(key, value);
return this;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 15;</code>
*/
public Builder putAllFightPropMap(
java.util.Map<java.lang.Integer, java.lang.Float> values) {
internalGetMutableFightPropMap().getMutableMap()
.putAll(values);
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 13;</code>
@@ -784,6 +662,134 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
onChanged();
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Float> fightPropMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
internalGetFightPropMap() {
if (fightPropMap_ == null) {
return com.google.protobuf.MapField.emptyMapField(
FightPropMapDefaultEntryHolder.defaultEntry);
}
return fightPropMap_;
}
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
internalGetMutableFightPropMap() {
onChanged();;
if (fightPropMap_ == null) {
fightPropMap_ = com.google.protobuf.MapField.newMapField(
FightPropMapDefaultEntryHolder.defaultEntry);
}
if (!fightPropMap_.isMutable()) {
fightPropMap_ = fightPropMap_.copy();
}
return fightPropMap_;
}
public int getFightPropMapCount() {
return internalGetFightPropMap().getMap().size();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
public boolean containsFightPropMap(
int key) {
return internalGetFightPropMap().getMap().containsKey(key);
}
/**
* Use {@link #getFightPropMapMap()} instead.
*/
@java.lang.Override
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMap() {
return getFightPropMapMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMapMap() {
return internalGetFightPropMap().getMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
public float getFightPropMapOrDefault(
int key,
float defaultValue) {
java.util.Map<java.lang.Integer, java.lang.Float> map =
internalGetFightPropMap().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
@java.lang.Override
public float getFightPropMapOrThrow(
int key) {
java.util.Map<java.lang.Integer, java.lang.Float> map =
internalGetFightPropMap().getMap();
if (!map.containsKey(key)) {
throw new java.lang.IllegalArgumentException();
}
return map.get(key);
}
public Builder clearFightPropMap() {
internalGetMutableFightPropMap().getMutableMap()
.clear();
return this;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
public Builder removeFightPropMap(
int key) {
internalGetMutableFightPropMap().getMutableMap()
.remove(key);
return this;
}
/**
* Use alternate mutation accessors instead.
*/
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Float>
getMutableFightPropMap() {
return internalGetMutableFightPropMap().getMutableMap();
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
public Builder putFightPropMap(
int key,
float value) {
internalGetMutableFightPropMap().getMutableMap()
.put(key, value);
return this;
}
/**
* <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
*/
public Builder putAllFightPropMap(
java.util.Map<java.lang.Integer, java.lang.Float> values) {
internalGetMutableFightPropMap().getMutableMap()
.putAll(values);
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -857,9 +863,9 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n!AvatarFightPropUpdateNotify.proto\"\257\001\n\033" +
"AvatarFightPropUpdateNotify\022F\n\016fight_pro" +
"p_map\030\017 \003(\0132..AvatarFightPropUpdateNotif" +
"y.FightPropMapEntry\022\023\n\013avatar_guid\030\r \001(\004" +
"AvatarFightPropUpdateNotify\022\023\n\013avatar_gu" +
"id\030\r \001(\004\022F\n\016fight_prop_map\030\n \003(\0132..Avata" +
"rFightPropUpdateNotify.FightPropMapEntry" +
"\0323\n\021FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005va" +
"lue\030\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.pro" +
"tob\006proto3"
@@ -873,7 +879,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
internal_static_AvatarFightPropUpdateNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarFightPropUpdateNotify_descriptor,
new java.lang.String[] { "FightPropMap", "AvatarGuid", });
new java.lang.String[] { "AvatarGuid", "FightPropMap", });
internal_static_AvatarFightPropUpdateNotify_FightPropMapEntry_descriptor =
internal_static_AvatarFightPropUpdateNotify_descriptor.getNestedTypes().get(0);
internal_static_AvatarFightPropUpdateNotify_FightPropMapEntry_fieldAccessorTable = new