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

update gc 3.4 (#2041)

Browse Source 
* update 3.4

* update3.4

* update 3.4

* update 3.4

* Add files via upload

* Delete SetPropCommand.java

* update 3.4 area id

* update version

* exchange cmdid

* exchange cmdid

* exchange cmdid

* my fault

* update AiSyncInfo
This commit is contained in:
yeyeye
2023-02-19 11:18:27 +08:00
committed by GitHub
Unverified
parent 39b4aa1387
commit 71a1e31d37
1191 changed files with 459994 additions and 172995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java
+205 -206
View File
@@ -19,37 +19,37 @@ public final class AbilityIdentifierOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 instanced_ability_id = 4;</code>
* @return The instancedAbilityId.
*/
int getInstancedAbilityId();
/**
* <code>uint32 modifier_owner_id = 10;</code>
* <code>uint32 modifierOwnerId = 3;</code>
* @return The modifierOwnerId.
*/
int getModifierOwnerId();
/**
* <code>bool is_serverbuff_modifier = 14;</code>
* @return The isServerbuffModifier.
*/
boolean getIsServerbuffModifier();
/**
* <code>int32 local_id = 7;</code>
* @return The localId.
*/
int getLocalId();
/**
* <code>uint32 ability_caster_id = 1;</code>
* <code>uint32 abilityCasterId = 10;</code>
* @return The abilityCasterId.
*/
int getAbilityCasterId();
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* <code>uint32 instancedAbilityId = 5;</code>
* @return The instancedAbilityId.
*/
int getInstancedAbilityId();
/**
* <code>bool isServerbuffModifier = 4;</code>
* @return The isServerbuffModifier.
*/
boolean getIsServerbuffModifier();
/**
* <code>int32 localId = 8;</code>
* @return The localId.
*/
int getLocalId();
/**
* <code>uint32 instancedModifierId = 11;</code>
* @return The instancedModifierId.
*/
int getInstancedModifierId();
@@ -99,34 +99,34 @@ public final class AbilityIdentifierOuterClass {
case 0:
done = true;
break;
case 8: {
case 24: {
abilityCasterId_ = input.readUInt32();
modifierOwnerId_ = input.readUInt32();
break;
}
case 32: {
instancedAbilityId_ = input.readUInt32();
isServerbuffModifier_ = input.readBool();
break;
}
case 40: {
instancedModifierId_ = input.readUInt32();
instancedAbilityId_ = input.readUInt32();
break;
}
case 56: {
case 64: {
localId_ = input.readInt32();
break;
}
case 80: {
modifierOwnerId_ = input.readUInt32();
abilityCasterId_ = input.readUInt32();
break;
}
case 112: {
case 88: {
isServerbuffModifier_ = input.readBool();
instancedModifierId_ = input.readUInt32();
break;
}
default: {
@@ -161,21 +161,10 @@ public final class AbilityIdentifierOuterClass {
emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.class, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder.class);
}
public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 4;
private int instancedAbilityId_;
/**
* <code>uint32 instanced_ability_id = 4;</code>
* @return The instancedAbilityId.
*/
@java.lang.Override
public int getInstancedAbilityId() {
return instancedAbilityId_;
}
public static final int MODIFIER_OWNER_ID_FIELD_NUMBER = 10;
public static final int MODIFIEROWNERID_FIELD_NUMBER = 3;
private int modifierOwnerId_;
/**
* <code>uint32 modifier_owner_id = 10;</code>
* <code>uint32 modifierOwnerId = 3;</code>
* @return The modifierOwnerId.
*/
@java.lang.Override
@@ -183,32 +172,10 @@ public final class AbilityIdentifierOuterClass {
return modifierOwnerId_;
}
public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 14;
private boolean isServerbuffModifier_;
/**
* <code>bool is_serverbuff_modifier = 14;</code>
* @return The isServerbuffModifier.
*/
@java.lang.Override
public boolean getIsServerbuffModifier() {
return isServerbuffModifier_;
}
public static final int LOCAL_ID_FIELD_NUMBER = 7;
private int localId_;
/**
* <code>int32 local_id = 7;</code>
* @return The localId.
*/
@java.lang.Override
public int getLocalId() {
return localId_;
}
public static final int ABILITY_CASTER_ID_FIELD_NUMBER = 1;
public static final int ABILITYCASTERID_FIELD_NUMBER = 10;
private int abilityCasterId_;
/**
* <code>uint32 ability_caster_id = 1;</code>
* <code>uint32 abilityCasterId = 10;</code>
* @return The abilityCasterId.
*/
@java.lang.Override
@@ -216,10 +183,43 @@ public final class AbilityIdentifierOuterClass {
return abilityCasterId_;
}
public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 5;
public static final int INSTANCEDABILITYID_FIELD_NUMBER = 5;
private int instancedAbilityId_;
/**
* <code>uint32 instancedAbilityId = 5;</code>
* @return The instancedAbilityId.
*/
@java.lang.Override
public int getInstancedAbilityId() {
return instancedAbilityId_;
}
public static final int ISSERVERBUFFMODIFIER_FIELD_NUMBER = 4;
private boolean isServerbuffModifier_;
/**
* <code>bool isServerbuffModifier = 4;</code>
* @return The isServerbuffModifier.
*/
@java.lang.Override
public boolean getIsServerbuffModifier() {
return isServerbuffModifier_;
}
public static final int LOCALID_FIELD_NUMBER = 8;
private int localId_;
/**
* <code>int32 localId = 8;</code>
* @return The localId.
*/
@java.lang.Override
public int getLocalId() {
return localId_;
}
public static final int INSTANCEDMODIFIERID_FIELD_NUMBER = 11;
private int instancedModifierId_;
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* <code>uint32 instancedModifierId = 11;</code>
* @return The instancedModifierId.
*/
@java.lang.Override
@@ -241,23 +241,23 @@ public final class AbilityIdentifierOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (abilityCasterId_ != 0) {
output.writeUInt32(1, abilityCasterId_);
}
if (instancedAbilityId_ != 0) {
output.writeUInt32(4, instancedAbilityId_);
}
if (instancedModifierId_ != 0) {
output.writeUInt32(5, instancedModifierId_);
}
if (localId_ != 0) {
output.writeInt32(7, localId_);
}
if (modifierOwnerId_ != 0) {
output.writeUInt32(10, modifierOwnerId_);
output.writeUInt32(3, modifierOwnerId_);
}
if (isServerbuffModifier_ != false) {
output.writeBool(14, isServerbuffModifier_);
output.writeBool(4, isServerbuffModifier_);
}
if (instancedAbilityId_ != 0) {
output.writeUInt32(5, instancedAbilityId_);
}
if (localId_ != 0) {
output.writeInt32(8, localId_);
}
if (abilityCasterId_ != 0) {
output.writeUInt32(10, abilityCasterId_);
}
if (instancedModifierId_ != 0) {
output.writeUInt32(11, instancedModifierId_);
}
unknownFields.writeTo(output);
}
@@ -268,29 +268,29 @@ public final class AbilityIdentifierOuterClass {
if (size != -1) return size;
size = 0;
if (abilityCasterId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, abilityCasterId_);
}
if (instancedAbilityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, instancedAbilityId_);
}
if (instancedModifierId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, instancedModifierId_);
}
if (localId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, localId_);
}
if (modifierOwnerId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, modifierOwnerId_);
.computeUInt32Size(3, modifierOwnerId_);
}
if (isServerbuffModifier_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(14, isServerbuffModifier_);
.computeBoolSize(4, isServerbuffModifier_);
}
if (instancedAbilityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, instancedAbilityId_);
}
if (localId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, localId_);
}
if (abilityCasterId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, abilityCasterId_);
}
if (instancedModifierId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, instancedModifierId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -307,16 +307,16 @@ public final class AbilityIdentifierOuterClass {
}
emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other = (emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier) obj;
if (getInstancedAbilityId()
!= other.getInstancedAbilityId()) return false;
if (getModifierOwnerId()
!= other.getModifierOwnerId()) return false;
if (getAbilityCasterId()
!= other.getAbilityCasterId()) return false;
if (getInstancedAbilityId()
!= other.getInstancedAbilityId()) return false;
if (getIsServerbuffModifier()
!= other.getIsServerbuffModifier()) return false;
if (getLocalId()
!= other.getLocalId()) return false;
if (getAbilityCasterId()
!= other.getAbilityCasterId()) return false;
if (getInstancedModifierId()
!= other.getInstancedModifierId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -330,18 +330,18 @@ public final class AbilityIdentifierOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getInstancedAbilityId();
hash = (37 * hash) + MODIFIER_OWNER_ID_FIELD_NUMBER;
hash = (37 * hash) + MODIFIEROWNERID_FIELD_NUMBER;
hash = (53 * hash) + getModifierOwnerId();
hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
hash = (37 * hash) + ABILITYCASTERID_FIELD_NUMBER;
hash = (53 * hash) + getAbilityCasterId();
hash = (37 * hash) + INSTANCEDABILITYID_FIELD_NUMBER;
hash = (53 * hash) + getInstancedAbilityId();
hash = (37 * hash) + ISSERVERBUFFMODIFIER_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsServerbuffModifier());
hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
hash = (37 * hash) + LOCALID_FIELD_NUMBER;
hash = (53 * hash) + getLocalId();
hash = (37 * hash) + ABILITY_CASTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getAbilityCasterId();
hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
hash = (37 * hash) + INSTANCEDMODIFIERID_FIELD_NUMBER;
hash = (53 * hash) + getInstancedModifierId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -476,16 +476,16 @@ public final class AbilityIdentifierOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
instancedAbilityId_ = 0;
modifierOwnerId_ = 0;
abilityCasterId_ = 0;
instancedAbilityId_ = 0;
isServerbuffModifier_ = false;
localId_ = 0;
abilityCasterId_ = 0;
instancedModifierId_ = 0;
return this;
@@ -514,11 +514,11 @@ public final class AbilityIdentifierOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier buildPartial() {
emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier result = new emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier(this);
result.instancedAbilityId_ = instancedAbilityId_;
result.modifierOwnerId_ = modifierOwnerId_;
result.abilityCasterId_ = abilityCasterId_;
result.instancedAbilityId_ = instancedAbilityId_;
result.isServerbuffModifier_ = isServerbuffModifier_;
result.localId_ = localId_;
result.abilityCasterId_ = abilityCasterId_;
result.instancedModifierId_ = instancedModifierId_;
onBuilt();
return result;
@@ -568,21 +568,21 @@ public final class AbilityIdentifierOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other) {
if (other == emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.getDefaultInstance()) return this;
if (other.getInstancedAbilityId() != 0) {
setInstancedAbilityId(other.getInstancedAbilityId());
}
if (other.getModifierOwnerId() != 0) {
setModifierOwnerId(other.getModifierOwnerId());
}
if (other.getAbilityCasterId() != 0) {
setAbilityCasterId(other.getAbilityCasterId());
}
if (other.getInstancedAbilityId() != 0) {
setInstancedAbilityId(other.getInstancedAbilityId());
}
if (other.getIsServerbuffModifier() != false) {
setIsServerbuffModifier(other.getIsServerbuffModifier());
}
if (other.getLocalId() != 0) {
setLocalId(other.getLocalId());
}
if (other.getAbilityCasterId() != 0) {
setAbilityCasterId(other.getAbilityCasterId());
}
if (other.getInstancedModifierId() != 0) {
setInstancedModifierId(other.getInstancedModifierId());
}
@@ -615,40 +615,9 @@ public final class AbilityIdentifierOuterClass {
return this;
}
private int instancedAbilityId_ ;
/**
* <code>uint32 instanced_ability_id = 4;</code>
* @return The instancedAbilityId.
*/
@java.lang.Override
public int getInstancedAbilityId() {
return instancedAbilityId_;
}
/**
* <code>uint32 instanced_ability_id = 4;</code>
* @param value The instancedAbilityId to set.
* @return This builder for chaining.
*/
public Builder setInstancedAbilityId(int value) {
instancedAbilityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 instanced_ability_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearInstancedAbilityId() {
instancedAbilityId_ = 0;
onChanged();
return this;
}
private int modifierOwnerId_ ;
/**
* <code>uint32 modifier_owner_id = 10;</code>
* <code>uint32 modifierOwnerId = 3;</code>
* @return The modifierOwnerId.
*/
@java.lang.Override
@@ -656,7 +625,7 @@ public final class AbilityIdentifierOuterClass {
return modifierOwnerId_;
}
/**
* <code>uint32 modifier_owner_id = 10;</code>
* <code>uint32 modifierOwnerId = 3;</code>
* @param value The modifierOwnerId to set.
* @return This builder for chaining.
*/
@@ -667,7 +636,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>uint32 modifier_owner_id = 10;</code>
* <code>uint32 modifierOwnerId = 3;</code>
* @return This builder for chaining.
*/
public Builder clearModifierOwnerId() {
@@ -677,9 +646,71 @@ public final class AbilityIdentifierOuterClass {
return this;
}
private int abilityCasterId_ ;
/**
* <code>uint32 abilityCasterId = 10;</code>
* @return The abilityCasterId.
*/
@java.lang.Override
public int getAbilityCasterId() {
return abilityCasterId_;
}
/**
* <code>uint32 abilityCasterId = 10;</code>
* @param value The abilityCasterId to set.
* @return This builder for chaining.
*/
public Builder setAbilityCasterId(int value) {
abilityCasterId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 abilityCasterId = 10;</code>
* @return This builder for chaining.
*/
public Builder clearAbilityCasterId() {
abilityCasterId_ = 0;
onChanged();
return this;
}
private int instancedAbilityId_ ;
/**
* <code>uint32 instancedAbilityId = 5;</code>
* @return The instancedAbilityId.
*/
@java.lang.Override
public int getInstancedAbilityId() {
return instancedAbilityId_;
}
/**
* <code>uint32 instancedAbilityId = 5;</code>
* @param value The instancedAbilityId to set.
* @return This builder for chaining.
*/
public Builder setInstancedAbilityId(int value) {
instancedAbilityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 instancedAbilityId = 5;</code>
* @return This builder for chaining.
*/
public Builder clearInstancedAbilityId() {
instancedAbilityId_ = 0;
onChanged();
return this;
}
private boolean isServerbuffModifier_ ;
/**
* <code>bool is_serverbuff_modifier = 14;</code>
* <code>bool isServerbuffModifier = 4;</code>
* @return The isServerbuffModifier.
*/
@java.lang.Override
@@ -687,7 +718,7 @@ public final class AbilityIdentifierOuterClass {
return isServerbuffModifier_;
}
/**
* <code>bool is_serverbuff_modifier = 14;</code>
* <code>bool isServerbuffModifier = 4;</code>
* @param value The isServerbuffModifier to set.
* @return This builder for chaining.
*/
@@ -698,7 +729,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>bool is_serverbuff_modifier = 14;</code>
* <code>bool isServerbuffModifier = 4;</code>
* @return This builder for chaining.
*/
public Builder clearIsServerbuffModifier() {
@@ -710,7 +741,7 @@ public final class AbilityIdentifierOuterClass {
private int localId_ ;
/**
* <code>int32 local_id = 7;</code>
* <code>int32 localId = 8;</code>
* @return The localId.
*/
@java.lang.Override
@@ -718,7 +749,7 @@ public final class AbilityIdentifierOuterClass {
return localId_;
}
/**
* <code>int32 local_id = 7;</code>
* <code>int32 localId = 8;</code>
* @param value The localId to set.
* @return This builder for chaining.
*/
@@ -729,7 +760,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>int32 local_id = 7;</code>
* <code>int32 localId = 8;</code>
* @return This builder for chaining.
*/
public Builder clearLocalId() {
@@ -739,40 +770,9 @@ public final class AbilityIdentifierOuterClass {
return this;
}
private int abilityCasterId_ ;
/**
* <code>uint32 ability_caster_id = 1;</code>
* @return The abilityCasterId.
*/
@java.lang.Override
public int getAbilityCasterId() {
return abilityCasterId_;
}
/**
* <code>uint32 ability_caster_id = 1;</code>
* @param value The abilityCasterId to set.
* @return This builder for chaining.
*/
public Builder setAbilityCasterId(int value) {
abilityCasterId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 ability_caster_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearAbilityCasterId() {
abilityCasterId_ = 0;
onChanged();
return this;
}
private int instancedModifierId_ ;
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* <code>uint32 instancedModifierId = 11;</code>
* @return The instancedModifierId.
*/
@java.lang.Override
@@ -780,7 +780,7 @@ public final class AbilityIdentifierOuterClass {
return instancedModifierId_;
}
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* <code>uint32 instancedModifierId = 11;</code>
* @param value The instancedModifierId to set.
* @return This builder for chaining.
*/
@@ -791,7 +791,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* <code>uint32 instancedModifierId = 11;</code>
* @return This builder for chaining.
*/
public Builder clearInstancedModifierId() {
@@ -867,13 +867,12 @@ public final class AbilityIdentifierOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027AbilityIdentifier.proto\"\270\001\n\021AbilityIde" +
"ntifier\022\034\n\024instanced_ability_id\030\004 \001(\r\022\031\n" +
"\021modifier_owner_id\030\n \001(\r\022\036\n\026is_serverbuf" +
"f_modifier\030\016 \001(\010\022\020\n\010local_id\030\007 \001(\005\022\031\n\021ab" +
"ility_caster_id\030\001 \001(\r\022\035\n\025instanced_modif" +
"ier_id\030\005 \001(\rB\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
"\n\027AbilityIdentifier.proto\"\255\001\n\021AbilityIde" +
"ntifier\022\027\n\017modifierOwnerId\030\003 \001(\r\022\027\n\017abil" +
"ityCasterId\030\n \001(\r\022\032\n\022instancedAbilityId\030" +
"\005 \001(\r\022\034\n\024isServerbuffModifier\030\004 \001(\010\022\017\n\007l" +
"ocalId\030\010 \001(\005\022\033\n\023instancedModifierId\030\013 \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -884,7 +883,7 @@ public final class AbilityIdentifierOuterClass {
internal_static_AbilityIdentifier_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AbilityIdentifier_descriptor,
new java.lang.String[] { "InstancedAbilityId", "ModifierOwnerId", "IsServerbuffModifier", "LocalId", "AbilityCasterId", "InstancedModifierId", });
new java.lang.String[] { "ModifierOwnerId", "AbilityCasterId", "InstancedAbilityId", "IsServerbuffModifier", "LocalId", "InstancedModifierId", });
}
// @@protoc_insertion_point(outer_class_scope)