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

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/H5ActivityIdsNotifyOuterClass.java
+99 -99
View File
@@ -19,17 +19,11 @@ public final class H5ActivityIdsNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 client_red_dot_timestamp = 12;</code>
* @return The clientRedDotTimestamp.
*/
int getClientRedDotTimestamp();
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
int getH5ActivityMapCount();
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
boolean containsH5ActivityMap(
int key);
@@ -40,28 +34,34 @@ public final class H5ActivityIdsNotifyOuterClass {
java.util.Map<java.lang.Integer, java.lang.Integer>
getH5ActivityMap();
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
java.util.Map<java.lang.Integer, java.lang.Integer>
getH5ActivityMapMap();
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
int getH5ActivityMapOrDefault(
int key,
int defaultValue);
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
int getH5ActivityMapOrThrow(
int key);
/**
* <code>uint32 client_red_dot_timestamp = 14;</code>
* @return The clientRedDotTimestamp.
*/
int getClientRedDotTimestamp();
}
/**
* <pre>
* Name: FAONDBOEDMA
* CmdId: 5659
* CmdId: 5667
* Name: NKAFABCJHNC
* </pre>
*
* Protobuf type {@code H5ActivityIdsNotify}
@@ -109,7 +109,12 @@ public final class H5ActivityIdsNotifyOuterClass {
case 0:
done = true;
break;
case 10: {
case 112: {
clientRedDotTimestamp_ = input.readUInt32();
break;
}
case 122: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
h5ActivityMap_ = com.google.protobuf.MapField.newMapField(
H5ActivityMapDefaultEntryHolder.defaultEntry);
@@ -122,11 +127,6 @@ public final class H5ActivityIdsNotifyOuterClass {
h5ActivityMap__.getKey(), h5ActivityMap__.getValue());
break;
}
case 96: {
clientRedDotTimestamp_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -156,7 +156,7 @@ public final class H5ActivityIdsNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 1:
case 15:
return internalGetH5ActivityMap();
default:
throw new RuntimeException(
@@ -171,18 +171,7 @@ public final class H5ActivityIdsNotifyOuterClass {
emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify.class, emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify.Builder.class);
}
public static final int CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER = 12;
private int clientRedDotTimestamp_;
/**
* <code>uint32 client_red_dot_timestamp = 12;</code>
* @return The clientRedDotTimestamp.
*/
@java.lang.Override
public int getClientRedDotTimestamp() {
return clientRedDotTimestamp_;
}
public static final int H5_ACTIVITY_MAP_FIELD_NUMBER = 1;
public static final int H5_ACTIVITY_MAP_FIELD_NUMBER = 15;
private static final class H5ActivityMapDefaultEntryHolder {
static final com.google.protobuf.MapEntry<
java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -209,7 +198,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return internalGetH5ActivityMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -227,7 +216,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return getH5ActivityMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -235,7 +224,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return internalGetH5ActivityMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -248,7 +237,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -263,6 +252,17 @@ public final class H5ActivityIdsNotifyOuterClass {
return map.get(key);
}
public static final int CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER = 14;
private int clientRedDotTimestamp_;
/**
* <code>uint32 client_red_dot_timestamp = 14;</code>
* @return The clientRedDotTimestamp.
*/
@java.lang.Override
public int getClientRedDotTimestamp() {
return clientRedDotTimestamp_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -277,15 +277,15 @@ public final class H5ActivityIdsNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (clientRedDotTimestamp_ != 0) {
output.writeUInt32(14, clientRedDotTimestamp_);
}
com.google.protobuf.GeneratedMessageV3
.serializeIntegerMapTo(
output,
internalGetH5ActivityMap(),
H5ActivityMapDefaultEntryHolder.defaultEntry,
1);
if (clientRedDotTimestamp_ != 0) {
output.writeUInt32(12, clientRedDotTimestamp_);
}
15);
unknownFields.writeTo(output);
}
@@ -295,6 +295,10 @@ public final class H5ActivityIdsNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (clientRedDotTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, clientRedDotTimestamp_);
}
for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
: internalGetH5ActivityMap().getMap().entrySet()) {
com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
@@ -303,11 +307,7 @@ public final class H5ActivityIdsNotifyOuterClass {
.setValue(entry.getValue())
.build();
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, h5ActivityMap__);
}
if (clientRedDotTimestamp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, clientRedDotTimestamp_);
.computeMessageSize(15, h5ActivityMap__);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -324,10 +324,10 @@ public final class H5ActivityIdsNotifyOuterClass {
}
emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify other = (emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify) obj;
if (getClientRedDotTimestamp()
!= other.getClientRedDotTimestamp()) return false;
if (!internalGetH5ActivityMap().equals(
other.internalGetH5ActivityMap())) return false;
if (getClientRedDotTimestamp()
!= other.getClientRedDotTimestamp()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -339,12 +339,12 @@ public final class H5ActivityIdsNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getClientRedDotTimestamp();
if (!internalGetH5ActivityMap().getMap().isEmpty()) {
hash = (37 * hash) + H5_ACTIVITY_MAP_FIELD_NUMBER;
hash = (53 * hash) + internalGetH5ActivityMap().hashCode();
}
hash = (37 * hash) + CLIENT_RED_DOT_TIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + getClientRedDotTimestamp();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -442,8 +442,8 @@ public final class H5ActivityIdsNotifyOuterClass {
}
/**
* <pre>
* Name: FAONDBOEDMA
* CmdId: 5659
* CmdId: 5667
* Name: NKAFABCJHNC
* </pre>
*
* Protobuf type {@code H5ActivityIdsNotify}
@@ -461,7 +461,7 @@ public final class H5ActivityIdsNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMapField(
int number) {
switch (number) {
case 1:
case 15:
return internalGetH5ActivityMap();
default:
throw new RuntimeException(
@@ -472,7 +472,7 @@ public final class H5ActivityIdsNotifyOuterClass {
protected com.google.protobuf.MapField internalGetMutableMapField(
int number) {
switch (number) {
case 1:
case 15:
return internalGetMutableH5ActivityMap();
default:
throw new RuntimeException(
@@ -505,9 +505,9 @@ public final class H5ActivityIdsNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
internalGetMutableH5ActivityMap().clear();
clientRedDotTimestamp_ = 0;
internalGetMutableH5ActivityMap().clear();
return this;
}
@@ -535,9 +535,9 @@ public final class H5ActivityIdsNotifyOuterClass {
public emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify buildPartial() {
emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify result = new emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify(this);
int from_bitField0_ = bitField0_;
result.clientRedDotTimestamp_ = clientRedDotTimestamp_;
result.h5ActivityMap_ = internalGetH5ActivityMap();
result.h5ActivityMap_.makeImmutable();
result.clientRedDotTimestamp_ = clientRedDotTimestamp_;
onBuilt();
return result;
}
@@ -586,11 +586,11 @@ public final class H5ActivityIdsNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify other) {
if (other == emu.grasscutter.net.proto.H5ActivityIdsNotifyOuterClass.H5ActivityIdsNotify.getDefaultInstance()) return this;
internalGetMutableH5ActivityMap().mergeFrom(
other.internalGetH5ActivityMap());
if (other.getClientRedDotTimestamp() != 0) {
setClientRedDotTimestamp(other.getClientRedDotTimestamp());
}
internalGetMutableH5ActivityMap().mergeFrom(
other.internalGetH5ActivityMap());
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -621,37 +621,6 @@ public final class H5ActivityIdsNotifyOuterClass {
}
private int bitField0_;
private int clientRedDotTimestamp_ ;
/**
* <code>uint32 client_red_dot_timestamp = 12;</code>
* @return The clientRedDotTimestamp.
*/
@java.lang.Override
public int getClientRedDotTimestamp() {
return clientRedDotTimestamp_;
}
/**
* <code>uint32 client_red_dot_timestamp = 12;</code>
* @param value The clientRedDotTimestamp to set.
* @return This builder for chaining.
*/
public Builder setClientRedDotTimestamp(int value) {
clientRedDotTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 client_red_dot_timestamp = 12;</code>
* @return This builder for chaining.
*/
public Builder clearClientRedDotTimestamp() {
clientRedDotTimestamp_ = 0;
onChanged();
return this;
}
private com.google.protobuf.MapField<
java.lang.Integer, java.lang.Integer> h5ActivityMap_;
private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -679,7 +648,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return internalGetH5ActivityMap().getMap().size();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -697,7 +666,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return getH5ActivityMapMap();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -705,7 +674,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return internalGetH5ActivityMap().getMap();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -718,7 +687,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return map.containsKey(key) ? map.get(key) : defaultValue;
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
@java.lang.Override
@@ -739,7 +708,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
public Builder removeH5ActivityMap(
@@ -758,7 +727,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return internalGetMutableH5ActivityMap().getMutableMap();
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
public Builder putH5ActivityMap(
int key,
@@ -770,7 +739,7 @@ public final class H5ActivityIdsNotifyOuterClass {
return this;
}
/**
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 1;</code>
* <code>map&lt;uint32, uint32&gt; h5_activity_map = 15;</code>
*/
public Builder putAllH5ActivityMap(
@@ -779,6 +748,37 @@ public final class H5ActivityIdsNotifyOuterClass {
.putAll(values);
return this;
}
private int clientRedDotTimestamp_ ;
/**
* <code>uint32 client_red_dot_timestamp = 14;</code>
* @return The clientRedDotTimestamp.
*/
@java.lang.Override
public int getClientRedDotTimestamp() {
return clientRedDotTimestamp_;
}
/**
* <code>uint32 client_red_dot_timestamp = 14;</code>
* @param value The clientRedDotTimestamp to set.
* @return This builder for chaining.
*/
public Builder setClientRedDotTimestamp(int value) {
clientRedDotTimestamp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 client_red_dot_timestamp = 14;</code>
* @return This builder for chaining.
*/
public Builder clearClientRedDotTimestamp() {
clientRedDotTimestamp_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -852,9 +852,9 @@ public final class H5ActivityIdsNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031H5ActivityIdsNotify.proto\"\257\001\n\023H5Activi" +
"tyIdsNotify\022 \n\030client_red_dot_timestamp\030" +
"\014 \001(\r\022@\n\017h5_activity_map\030\001 \003(\0132\'.H5Activ" +
"ityIdsNotify.H5ActivityMapEntry\0324\n\022H5Act" +
"tyIdsNotify\022@\n\017h5_activity_map\030\017 \003(\0132\'.H" +
"5ActivityIdsNotify.H5ActivityMapEntry\022 \n" +
"\030client_red_dot_timestamp\030\016 \001(\r\0324\n\022H5Act" +
"ivityMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(" +
"\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
@@ -868,7 +868,7 @@ public final class H5ActivityIdsNotifyOuterClass {
internal_static_H5ActivityIdsNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_H5ActivityIdsNotify_descriptor,
new java.lang.String[] { "ClientRedDotTimestamp", "H5ActivityMap", });
new java.lang.String[] { "H5ActivityMap", "ClientRedDotTimestamp", });
internal_static_H5ActivityIdsNotify_H5ActivityMapEntry_descriptor =
internal_static_H5ActivityIdsNotify_descriptor.getNestedTypes().get(0);
internal_static_H5ActivityIdsNotify_H5ActivityMapEntry_fieldAccessorTable = new