Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 18:29:54 +08:00
Code Issues Projects Releases Wiki Activity

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java
+320 -312
View File
@@ -19,45 +19,11 @@ public final class AiSkillCdInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
int getSkillCdMapCount();
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
boolean containsSkillCdMap(
int key);
/**
* Use {@link #getSkillCdMapMap()} instead.
*/
@java.lang.Deprecated
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillCdMap();
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillCdMapMap();
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
int getSkillCdMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
int getSkillCdMapOrThrow(
int key);
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
int getSkillGroupCdMapCount();
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
boolean containsSkillGroupCdMap(
int key);
@@ -68,25 +34,63 @@ public final class AiSkillCdInfoOuterClass {
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillGroupCdMap();
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillGroupCdMapMap();
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
int getSkillGroupCdMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
int getSkillGroupCdMapOrThrow(
int key);
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
int getSkillCdMapCount();
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
boolean containsSkillCdMap(
int key);
/**
* Use {@link #getSkillCdMapMap()} instead.
*/
@java.lang.Deprecated
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillCdMap();
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getSkillCdMapMap();
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
int getSkillCdMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
int getSkillCdMapOrThrow(
int key);
}
/**
* <pre>
* Name: DFMOCHLPHCF
* </pre>
*
* Protobuf type {@code AiSkillCdInfo}
*/
public static final class AiSkillCdInfo extends
@@ -132,11 +136,11 @@ public final class AiSkillCdInfoOuterClass {
case 0:
done = true;
break;
case 26: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
case 10: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
SkillGroupCdMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000002;
mutable_bitField0_ |= 0x00000001;
}
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
skillGroupCdMap__ = input.readMessage(
@@ -145,11 +149,11 @@ public final class AiSkillCdInfoOuterClass {
skillGroupCdMap__.getKey(), skillGroupCdMap__.getValue());
break;
}
case 114: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
case 90: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
skillCdMap_ = com.google.protobuf.MapField.newMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000001;
mutable_bitField0_ |= 0x00000002;
}
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
skillCdMap__ = input.readMessage(
@@ -187,10 +191,10 @@ public final class AiSkillCdInfoOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 14:
return internalGetSkillCdMap();
case 3:
case 1:
return internalGetSkillGroupCdMap();
case 11:
return internalGetSkillCdMap();
default:
throw new RuntimeException(
"Invalid map field number: " + number);
@@ -204,88 +208,7 @@ public final class AiSkillCdInfoOuterClass {
emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.class, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.Builder.class);
}
public static final int SKILLCDMAP_FIELD_NUMBER = 14;
private static final class SkillCdMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
com.google.protobuf.MapEntry
.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
com.google.protobuf.WireFormat.FieldType.UINT32,
0,
com.google.protobuf.WireFormat.FieldType.UINT32,
0);
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Integer> skillCdMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
internalGetSkillCdMap() {
if (skillCdMap_ == null) {
return com.google.protobuf.MapField.emptyMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
}
return skillCdMap_;
}
public int getSkillCdMapCount() {
return internalGetSkillCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public boolean containsSkillCdMap(
int key) {
return internalGetSkillCdMap().getMap().containsKey(key);
}
/**
* Use {@link #getSkillCdMapMap()} instead.
*/
@java.lang.Override
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
return getSkillCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
return internalGetSkillCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public int getSkillCdMapOrDefault(
int key,
int defaultValue) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public int getSkillCdMapOrThrow(
int key) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
if (!map.containsKey(key)) {
throw new java.lang.IllegalArgumentException();
}
return map.get(key);
}
public static final int SKILLGROUPCDMAP_FIELD_NUMBER = 3;
public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 1;
private static final class SkillGroupCdMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -312,7 +235,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -330,7 +253,7 @@ public final class AiSkillCdInfoOuterClass {
return getSkillGroupCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -338,7 +261,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -351,7 +274,7 @@ public final class AiSkillCdInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -366,6 +289,87 @@ public final class AiSkillCdInfoOuterClass {
return map.get(key);
}
public static final int SKILL_CD_MAP_FIELD_NUMBER = 11;
private static final class SkillCdMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
com.google.protobuf.MapEntry
.<java.lang.Integer, java.lang.Integer>newDefaultInstance(
emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
com.google.protobuf.WireFormat.FieldType.UINT32,
0,
com.google.protobuf.WireFormat.FieldType.UINT32,
0);
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Integer> skillCdMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
internalGetSkillCdMap() {
if (skillCdMap_ == null) {
return com.google.protobuf.MapField.emptyMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
}
return skillCdMap_;
}
public int getSkillCdMapCount() {
return internalGetSkillCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public boolean containsSkillCdMap(
int key) {
return internalGetSkillCdMap().getMap().containsKey(key);
}
/**
* Use {@link #getSkillCdMapMap()} instead.
*/
@java.lang.Override
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
return getSkillCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
return internalGetSkillCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public int getSkillCdMapOrDefault(
int key,
int defaultValue) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public int getSkillCdMapOrThrow(
int key) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
if (!map.containsKey(key)) {
throw new java.lang.IllegalArgumentException();
}
return map.get(key);
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -385,13 +389,13 @@ public final class AiSkillCdInfoOuterClass {
output,
internalGetSkillGroupCdMap(),
SkillGroupCdMapDefaultEntryHolder.defaultEntry,
3);
1);
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetSkillCdMap(),
SkillCdMapDefaultEntryHolder.defaultEntry,
14);
11);
unknownFields.writeTo(output);
}
@@ -409,7 +413,7 @@ public final class AiSkillCdInfoOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(3, skillGroupCdMap__);
.computeMessageSize(1, skillGroupCdMap__);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
: internalGetSkillCdMap().getMap().entrySet()) {
@@ -419,7 +423,7 @@ public final class AiSkillCdInfoOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, skillCdMap__);
.computeMessageSize(11, skillCdMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -436,10 +440,10 @@ public final class AiSkillCdInfoOuterClass {
}
emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other = (emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo) obj;
if (!internalGetSkillCdMap().equals(
other.internalGetSkillCdMap())) return false;
if (!internalGetSkillGroupCdMap().equals(
other.internalGetSkillGroupCdMap())) return false;
if (!internalGetSkillCdMap().equals(
other.internalGetSkillCdMap())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -451,14 +455,14 @@ public final class AiSkillCdInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (!internalGetSkillCdMap().getMap().isEmpty()) {
hash = (37 * hash) + SKILLCDMAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetSkillCdMap().hashCode();
}
if (!internalGetSkillGroupCdMap().getMap().isEmpty()) {
hash = (37 * hash) + SKILLGROUPCDMAP_FIELD_NUMBER;
hash = (37 * hash) + SKILL_GROUP_CD_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetSkillGroupCdMap().hashCode();
}
if (!internalGetSkillCdMap().getMap().isEmpty()) {
hash = (37 * hash) + SKILL_CD_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetSkillCdMap().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -555,6 +559,10 @@ public final class AiSkillCdInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: DFMOCHLPHCF
* </pre>
*
* Protobuf type {@code AiSkillCdInfo}
*/
public static final class Builder extends
@@ -570,10 +578,10 @@ public final class AiSkillCdInfoOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 14:
return internalGetSkillCdMap();
case 3:
case 1:
return internalGetSkillGroupCdMap();
case 11:
return internalGetSkillCdMap();
default:
throw new RuntimeException(
"Invalid map field number: " + number);
@@ -583,10 +591,10 @@ public final class AiSkillCdInfoOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 14:
return internalGetMutableSkillCdMap();
case 3:
case 1:
return internalGetMutableSkillGroupCdMap();
case 11:
return internalGetMutableSkillCdMap();
default:
throw new RuntimeException(
"Invalid map field number: " + number);
@@ -618,8 +626,8 @@ public final class AiSkillCdInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableSkillCdMap().clear();
internalGetMutableSkillGroupCdMap().clear();
internalGetMutableSkillCdMap().clear();
return this;
}
@@ -647,10 +655,10 @@ public final class AiSkillCdInfoOuterClass {
public emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo buildPartial() {
emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo result = new emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo(this);
int from_bitField0_ = bitField0_;
result.skillCdMap_ = internalGetSkillCdMap();
result.skillCdMap_.makeImmutable();
result.skillGroupCdMap_ = internalGetSkillGroupCdMap();
result.skillGroupCdMap_.makeImmutable();
result.skillCdMap_ = internalGetSkillCdMap();
result.skillCdMap_.makeImmutable();
onBuilt();
return result;
}
@@ -699,10 +707,10 @@ public final class AiSkillCdInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other) {
if (other == emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.getDefaultInstance()) return this;
internalGetMutableSkillCdMap().mergeFrom(
other.internalGetSkillCdMap());
internalGetMutableSkillGroupCdMap().mergeFrom(
other.internalGetSkillGroupCdMap());
internalGetMutableSkillCdMap().mergeFrom(
other.internalGetSkillCdMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -733,134 +741,6 @@ public final class AiSkillCdInfoOuterClass {
}
private int bitField0_;
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Integer> skillCdMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
internalGetSkillCdMap() {
if (skillCdMap_ == null) {
return com.google.protobuf.MapField.emptyMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
}
return skillCdMap_;
}
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
internalGetMutableSkillCdMap() {
onChanged();;
if (skillCdMap_ == null) {
skillCdMap_ = com.google.protobuf.MapField.newMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
}
if (!skillCdMap_.isMutable()) {
skillCdMap_ = skillCdMap_.copy();
}
return skillCdMap_;
}
public int getSkillCdMapCount() {
return internalGetSkillCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public boolean containsSkillCdMap(
int key) {
return internalGetSkillCdMap().getMap().containsKey(key);
}
/**
* Use {@link #getSkillCdMapMap()} instead.
*/
@java.lang.Override
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
return getSkillCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
return internalGetSkillCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public int getSkillCdMapOrDefault(
int key,
int defaultValue) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
@java.lang.Override
public int getSkillCdMapOrThrow(
int key) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
if (!map.containsKey(key)) {
throw new java.lang.IllegalArgumentException();
}
return map.get(key);
}
public Builder clearSkillCdMap() {
internalGetMutableSkillCdMap().getMutableMap()
.clear();
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
public Builder removeSkillCdMap(
int key) {
internalGetMutableSkillCdMap().getMutableMap()
.remove(key);
return this;
}
/**
* Use alternate mutation accessors instead.
*/
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Integer>
getMutableSkillCdMap() {
return internalGetMutableSkillCdMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
public Builder putSkillCdMap(
int key,
int value) {
internalGetMutableSkillCdMap().getMutableMap()
.put(key, value);
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skillCdMap = 14;</code>
*/
public Builder putAllSkillCdMap(
java.util.Map<java.lang.Integer, java.lang.Integer> values) {
internalGetMutableSkillCdMap().getMutableMap()
.putAll(values);
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -888,7 +768,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -906,7 +786,7 @@ public final class AiSkillCdInfoOuterClass {
return getSkillGroupCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -914,7 +794,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetSkillGroupCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -927,7 +807,7 @@ public final class AiSkillCdInfoOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
@java.lang.Override
@@ -948,7 +828,7 @@ public final class AiSkillCdInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
public Builder removeSkillGroupCdMap(
@@ -967,7 +847,7 @@ public final class AiSkillCdInfoOuterClass {
return internalGetMutableSkillGroupCdMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
public Builder putSkillGroupCdMap(
int key,
@@ -979,7 +859,7 @@ public final class AiSkillCdInfoOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skillGroupCdMap = 3;</code>
* <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 1;</code>
*/
public Builder putAllSkillGroupCdMap(
@@ -988,6 +868,134 @@ public final class AiSkillCdInfoOuterClass {
.putAll(values);
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Integer> skillCdMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
internalGetSkillCdMap() {
if (skillCdMap_ == null) {
return com.google.protobuf.MapField.emptyMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
}
return skillCdMap_;
}
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
internalGetMutableSkillCdMap() {
onChanged();;
if (skillCdMap_ == null) {
skillCdMap_ = com.google.protobuf.MapField.newMapField(
SkillCdMapDefaultEntryHolder.defaultEntry);
}
if (!skillCdMap_.isMutable()) {
skillCdMap_ = skillCdMap_.copy();
}
return skillCdMap_;
}
public int getSkillCdMapCount() {
return internalGetSkillCdMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public boolean containsSkillCdMap(
int key) {
return internalGetSkillCdMap().getMap().containsKey(key);
}
/**
* Use {@link #getSkillCdMapMap()} instead.
*/
@java.lang.Override
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
return getSkillCdMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
return internalGetSkillCdMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public int getSkillCdMapOrDefault(
int key,
int defaultValue) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
@java.lang.Override
public int getSkillCdMapOrThrow(
int key) {
java.util.Map<java.lang.Integer, java.lang.Integer> map =
internalGetSkillCdMap().getMap();
if (!map.containsKey(key)) {
throw new java.lang.IllegalArgumentException();
}
return map.get(key);
}
public Builder clearSkillCdMap() {
internalGetMutableSkillCdMap().getMutableMap()
.clear();
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
public Builder removeSkillCdMap(
int key) {
internalGetMutableSkillCdMap().getMutableMap()
.remove(key);
return this;
}
/**
* Use alternate mutation accessors instead.
*/
@java.lang.Deprecated
public java.util.Map<java.lang.Integer, java.lang.Integer>
getMutableSkillCdMap() {
return internalGetMutableSkillCdMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
public Builder putSkillCdMap(
int key,
int value) {
internalGetMutableSkillCdMap().getMutableMap()
.put(key, value);
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; skill_cd_map = 11;</code>
*/
public Builder putAllSkillCdMap(
java.util.Map<java.lang.Integer, java.lang.Integer> values) {
internalGetMutableSkillCdMap().getMutableMap()
.putAll(values);
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1046,16 +1054,16 @@ public final class AiSkillCdInfoOuterClass {
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_AiSkillCdInfo_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor;
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable;
private static final com.google.protobuf.Descriptors.Descriptor
internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
private static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -1065,14 +1073,14 @@ public final class AiSkillCdInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023AiSkillCdInfo.proto\"\354\001\n\rAiSkillCdInfo\022" +
"2\n\nskillCdMap\030\016 \003(\0132\036.AiSkillCdInfo.Skil" +
"lCdMapEntry\022<\n\017skillGroupCdMap\030\003 \003(\0132#.A" +
"iSkillCdInfo.SkillGroupCdMapEntry\0321\n\017Ski" +
"llCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r" +
":\0028\001\0326\n\024SkillGroupCdMapEntry\022\013\n\003key\030\001 \001(" +
"\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter." +
"net.protob\006proto3"
"\n\023AiSkillCdInfo.proto\"\361\001\n\rAiSkillCdInfo\022" +
"?\n\022skill_group_cd_map\030\001 \003(\0132#.AiSkillCdI" +
"nfo.SkillGroupCdMapEntry\0224\n\014skill_cd_map" +
"\030\013 \003(\0132\036.AiSkillCdInfo.SkillCdMapEntry\0326" +
"\n\024SkillGroupCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
"alue\030\002 \001(\r:\0028\001\0321\n\017SkillCdMapEntry\022\013\n\003key" +
"\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -1083,19 +1091,19 @@ public final class AiSkillCdInfoOuterClass {
internal_static_AiSkillCdInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AiSkillCdInfo_descriptor,
new java.lang.String[] { "SkillCdMap", "SkillGroupCdMap", });
internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
new java.lang.String[] { "Key", "Value", });
new java.lang.String[] { "SkillGroupCdMap", "SkillCdMap", });
internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor =
internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor,
new java.lang.String[] { "Key", "Value", });
internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
new java.lang.String[] { "Key", "Value", });
}
// @@protoc_insertion_point(outer_class_scope)