Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-19 06:09:53 +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/AbilityIdentifierOuterClass.java
+239 -239
View File
@@ -19,40 +19,40 @@ public final class AbilityIdentifierOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 modifier_owner_id = 2;</code>
* @return The modifierOwnerId.
*/
int getModifierOwnerId();
/**
* <code>uint32 instanced_modifier_id = 9;</code>
* @return The instancedModifierId.
*/
int getInstancedModifierId();
/**
* <code>uint32 instanced_ability_id = 10;</code>
* <code>uint32 instanced_ability_id = 4;</code>
* @return The instancedAbilityId.
*/
int getInstancedAbilityId();
/**
* <code>bool is_serverbuff_modifier = 6;</code>
* <code>uint32 modifier_owner_id = 10;</code>
* @return The modifierOwnerId.
*/
int getModifierOwnerId();
/**
* <code>bool is_serverbuff_modifier = 14;</code>
* @return The isServerbuffModifier.
*/
boolean getIsServerbuffModifier();
/**
* <code>uint32 ability_caster_id = 15;</code>
* <code>int32 local_id = 7;</code>
* @return The localId.
*/
int getLocalId();
/**
* <code>uint32 ability_caster_id = 1;</code>
* @return The abilityCasterId.
*/
int getAbilityCasterId();
/**
* <code>int32 local_id = 3;</code>
* @return The localId.
* <code>uint32 instanced_modifier_id = 5;</code>
* @return The instancedModifierId.
*/
int getLocalId();
int getInstancedModifierId();
}
/**
* Protobuf type {@code AbilityIdentifier}
@@ -99,34 +99,34 @@ public final class AbilityIdentifierOuterClass {
case 0:
done = true;
break;
case 16: {
case 8: {
modifierOwnerId_ = input.readUInt32();
abilityCasterId_ = input.readUInt32();
break;
}
case 24: {
localId_ = input.readInt32();
break;
}
case 48: {
isServerbuffModifier_ = input.readBool();
break;
}
case 72: {
instancedModifierId_ = input.readUInt32();
break;
}
case 80: {
case 32: {
instancedAbilityId_ = input.readUInt32();
break;
}
case 120: {
case 40: {
abilityCasterId_ = input.readUInt32();
instancedModifierId_ = input.readUInt32();
break;
}
case 56: {
localId_ = input.readInt32();
break;
}
case 80: {
modifierOwnerId_ = input.readUInt32();
break;
}
case 112: {
isServerbuffModifier_ = input.readBool();
break;
}
default: {
@@ -161,32 +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 MODIFIER_OWNER_ID_FIELD_NUMBER = 2;
private int modifierOwnerId_;
/**
* <code>uint32 modifier_owner_id = 2;</code>
* @return The modifierOwnerId.
*/
@java.lang.Override
public int getModifierOwnerId() {
return modifierOwnerId_;
}
public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 9;
private int instancedModifierId_;
/**
* <code>uint32 instanced_modifier_id = 9;</code>
* @return The instancedModifierId.
*/
@java.lang.Override
public int getInstancedModifierId() {
return instancedModifierId_;
}
public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 10;
public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 4;
private int instancedAbilityId_;
/**
* <code>uint32 instanced_ability_id = 10;</code>
* <code>uint32 instanced_ability_id = 4;</code>
* @return The instancedAbilityId.
*/
@java.lang.Override
@@ -194,10 +172,21 @@ public final class AbilityIdentifierOuterClass {
return instancedAbilityId_;
}
public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 6;
public static final int MODIFIER_OWNER_ID_FIELD_NUMBER = 10;
private int modifierOwnerId_;
/**
* <code>uint32 modifier_owner_id = 10;</code>
* @return The modifierOwnerId.
*/
@java.lang.Override
public int getModifierOwnerId() {
return modifierOwnerId_;
}
public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 14;
private boolean isServerbuffModifier_;
/**
* <code>bool is_serverbuff_modifier = 6;</code>
* <code>bool is_serverbuff_modifier = 14;</code>
* @return The isServerbuffModifier.
*/
@java.lang.Override
@@ -205,10 +194,21 @@ public final class AbilityIdentifierOuterClass {
return isServerbuffModifier_;
}
public static final int ABILITY_CASTER_ID_FIELD_NUMBER = 15;
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;
private int abilityCasterId_;
/**
* <code>uint32 ability_caster_id = 15;</code>
* <code>uint32 ability_caster_id = 1;</code>
* @return The abilityCasterId.
*/
@java.lang.Override
@@ -216,15 +216,15 @@ public final class AbilityIdentifierOuterClass {
return abilityCasterId_;
}
public static final int LOCAL_ID_FIELD_NUMBER = 3;
private int localId_;
public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 5;
private int instancedModifierId_;
/**
* <code>int32 local_id = 3;</code>
* @return The localId.
* <code>uint32 instanced_modifier_id = 5;</code>
* @return The instancedModifierId.
*/
@java.lang.Override
public int getLocalId() {
return localId_;
public int getInstancedModifierId() {
return instancedModifierId_;
}
private byte memoizedIsInitialized = -1;
@@ -241,23 +241,23 @@ public final class AbilityIdentifierOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (modifierOwnerId_ != 0) {
output.writeUInt32(2, modifierOwnerId_);
}
if (localId_ != 0) {
output.writeInt32(3, localId_);
}
if (isServerbuffModifier_ != false) {
output.writeBool(6, isServerbuffModifier_);
}
if (instancedModifierId_ != 0) {
output.writeUInt32(9, instancedModifierId_);
if (abilityCasterId_ != 0) {
output.writeUInt32(1, abilityCasterId_);
}
if (instancedAbilityId_ != 0) {
output.writeUInt32(10, instancedAbilityId_);
output.writeUInt32(4, instancedAbilityId_);
}
if (abilityCasterId_ != 0) {
output.writeUInt32(15, abilityCasterId_);
if (instancedModifierId_ != 0) {
output.writeUInt32(5, instancedModifierId_);
}
if (localId_ != 0) {
output.writeInt32(7, localId_);
}
if (modifierOwnerId_ != 0) {
output.writeUInt32(10, modifierOwnerId_);
}
if (isServerbuffModifier_ != false) {
output.writeBool(14, isServerbuffModifier_);
}
unknownFields.writeTo(output);
}
@@ -268,29 +268,29 @@ public final class AbilityIdentifierOuterClass {
if (size != -1) return size;
size = 0;
if (modifierOwnerId_ != 0) {
if (abilityCasterId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, modifierOwnerId_);
}
if (localId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, localId_);
}
if (isServerbuffModifier_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(6, isServerbuffModifier_);
}
if (instancedModifierId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, instancedModifierId_);
.computeUInt32Size(1, abilityCasterId_);
}
if (instancedAbilityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, instancedAbilityId_);
.computeUInt32Size(4, instancedAbilityId_);
}
if (abilityCasterId_ != 0) {
if (instancedModifierId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, abilityCasterId_);
.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_);
}
if (isServerbuffModifier_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(14, isServerbuffModifier_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -307,18 +307,18 @@ public final class AbilityIdentifierOuterClass {
}
emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other = (emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier) obj;
if (getModifierOwnerId()
!= other.getModifierOwnerId()) return false;
if (getInstancedModifierId()
!= other.getInstancedModifierId()) return false;
if (getInstancedAbilityId()
!= other.getInstancedAbilityId()) return false;
if (getModifierOwnerId()
!= other.getModifierOwnerId()) return false;
if (getIsServerbuffModifier()
!= other.getIsServerbuffModifier()) return false;
if (getAbilityCasterId()
!= other.getAbilityCasterId()) 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;
return true;
}
@@ -330,19 +330,19 @@ public final class AbilityIdentifierOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + MODIFIER_OWNER_ID_FIELD_NUMBER;
hash = (53 * hash) + getModifierOwnerId();
hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
hash = (53 * hash) + getInstancedModifierId();
hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getInstancedAbilityId();
hash = (37 * hash) + MODIFIER_OWNER_ID_FIELD_NUMBER;
hash = (53 * hash) + getModifierOwnerId();
hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsServerbuffModifier());
hash = (37 * hash) + ABILITY_CASTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getAbilityCasterId();
hash = (37 * hash) + LOCAL_ID_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 = (53 * hash) + getInstancedModifierId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -476,17 +476,17 @@ public final class AbilityIdentifierOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
modifierOwnerId_ = 0;
instancedModifierId_ = 0;
instancedAbilityId_ = 0;
modifierOwnerId_ = 0;
isServerbuffModifier_ = false;
localId_ = 0;
abilityCasterId_ = 0;
localId_ = 0;
instancedModifierId_ = 0;
return this;
}
@@ -514,12 +514,12 @@ 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.modifierOwnerId_ = modifierOwnerId_;
result.instancedModifierId_ = instancedModifierId_;
result.instancedAbilityId_ = instancedAbilityId_;
result.modifierOwnerId_ = modifierOwnerId_;
result.isServerbuffModifier_ = isServerbuffModifier_;
result.abilityCasterId_ = abilityCasterId_;
result.localId_ = localId_;
result.abilityCasterId_ = abilityCasterId_;
result.instancedModifierId_ = instancedModifierId_;
onBuilt();
return result;
}
@@ -568,23 +568,23 @@ 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.getModifierOwnerId() != 0) {
setModifierOwnerId(other.getModifierOwnerId());
}
if (other.getInstancedModifierId() != 0) {
setInstancedModifierId(other.getInstancedModifierId());
}
if (other.getInstancedAbilityId() != 0) {
setInstancedAbilityId(other.getInstancedAbilityId());
}
if (other.getModifierOwnerId() != 0) {
setModifierOwnerId(other.getModifierOwnerId());
}
if (other.getIsServerbuffModifier() != false) {
setIsServerbuffModifier(other.getIsServerbuffModifier());
}
if (other.getLocalId() != 0) {
setLocalId(other.getLocalId());
}
if (other.getAbilityCasterId() != 0) {
setAbilityCasterId(other.getAbilityCasterId());
}
if (other.getLocalId() != 0) {
setLocalId(other.getLocalId());
if (other.getInstancedModifierId() != 0) {
setInstancedModifierId(other.getInstancedModifierId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -615,71 +615,9 @@ public final class AbilityIdentifierOuterClass {
return this;
}
private int modifierOwnerId_ ;
/**
* <code>uint32 modifier_owner_id = 2;</code>
* @return The modifierOwnerId.
*/
@java.lang.Override
public int getModifierOwnerId() {
return modifierOwnerId_;
}
/**
* <code>uint32 modifier_owner_id = 2;</code>
* @param value The modifierOwnerId to set.
* @return This builder for chaining.
*/
public Builder setModifierOwnerId(int value) {
modifierOwnerId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 modifier_owner_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearModifierOwnerId() {
modifierOwnerId_ = 0;
onChanged();
return this;
}
private int instancedModifierId_ ;
/**
* <code>uint32 instanced_modifier_id = 9;</code>
* @return The instancedModifierId.
*/
@java.lang.Override
public int getInstancedModifierId() {
return instancedModifierId_;
}
/**
* <code>uint32 instanced_modifier_id = 9;</code>
* @param value The instancedModifierId to set.
* @return This builder for chaining.
*/
public Builder setInstancedModifierId(int value) {
instancedModifierId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 instanced_modifier_id = 9;</code>
* @return This builder for chaining.
*/
public Builder clearInstancedModifierId() {
instancedModifierId_ = 0;
onChanged();
return this;
}
private int instancedAbilityId_ ;
/**
* <code>uint32 instanced_ability_id = 10;</code>
* <code>uint32 instanced_ability_id = 4;</code>
* @return The instancedAbilityId.
*/
@java.lang.Override
@@ -687,7 +625,7 @@ public final class AbilityIdentifierOuterClass {
return instancedAbilityId_;
}
/**
* <code>uint32 instanced_ability_id = 10;</code>
* <code>uint32 instanced_ability_id = 4;</code>
* @param value The instancedAbilityId to set.
* @return This builder for chaining.
*/
@@ -698,7 +636,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>uint32 instanced_ability_id = 10;</code>
* <code>uint32 instanced_ability_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearInstancedAbilityId() {
@@ -708,9 +646,40 @@ public final class AbilityIdentifierOuterClass {
return this;
}
private int modifierOwnerId_ ;
/**
* <code>uint32 modifier_owner_id = 10;</code>
* @return The modifierOwnerId.
*/
@java.lang.Override
public int getModifierOwnerId() {
return modifierOwnerId_;
}
/**
* <code>uint32 modifier_owner_id = 10;</code>
* @param value The modifierOwnerId to set.
* @return This builder for chaining.
*/
public Builder setModifierOwnerId(int value) {
modifierOwnerId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 modifier_owner_id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearModifierOwnerId() {
modifierOwnerId_ = 0;
onChanged();
return this;
}
private boolean isServerbuffModifier_ ;
/**
* <code>bool is_serverbuff_modifier = 6;</code>
* <code>bool is_serverbuff_modifier = 14;</code>
* @return The isServerbuffModifier.
*/
@java.lang.Override
@@ -718,7 +687,7 @@ public final class AbilityIdentifierOuterClass {
return isServerbuffModifier_;
}
/**
* <code>bool is_serverbuff_modifier = 6;</code>
* <code>bool is_serverbuff_modifier = 14;</code>
* @param value The isServerbuffModifier to set.
* @return This builder for chaining.
*/
@@ -729,7 +698,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>bool is_serverbuff_modifier = 6;</code>
* <code>bool is_serverbuff_modifier = 14;</code>
* @return This builder for chaining.
*/
public Builder clearIsServerbuffModifier() {
@@ -739,40 +708,9 @@ public final class AbilityIdentifierOuterClass {
return this;
}
private int abilityCasterId_ ;
/**
* <code>uint32 ability_caster_id = 15;</code>
* @return The abilityCasterId.
*/
@java.lang.Override
public int getAbilityCasterId() {
return abilityCasterId_;
}
/**
* <code>uint32 ability_caster_id = 15;</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 = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAbilityCasterId() {
abilityCasterId_ = 0;
onChanged();
return this;
}
private int localId_ ;
/**
* <code>int32 local_id = 3;</code>
* <code>int32 local_id = 7;</code>
* @return The localId.
*/
@java.lang.Override
@@ -780,7 +718,7 @@ public final class AbilityIdentifierOuterClass {
return localId_;
}
/**
* <code>int32 local_id = 3;</code>
* <code>int32 local_id = 7;</code>
* @param value The localId to set.
* @return This builder for chaining.
*/
@@ -791,7 +729,7 @@ public final class AbilityIdentifierOuterClass {
return this;
}
/**
* <code>int32 local_id = 3;</code>
* <code>int32 local_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearLocalId() {
@@ -800,6 +738,68 @@ public final class AbilityIdentifierOuterClass {
onChanged();
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>
* @return The instancedModifierId.
*/
@java.lang.Override
public int getInstancedModifierId() {
return instancedModifierId_;
}
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* @param value The instancedModifierId to set.
* @return This builder for chaining.
*/
public Builder setInstancedModifierId(int value) {
instancedModifierId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 instanced_modifier_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearInstancedModifierId() {
instancedModifierId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -868,11 +868,11 @@ public final class AbilityIdentifierOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027AbilityIdentifier.proto\"\270\001\n\021AbilityIde" +
"ntifier\022\031\n\021modifier_owner_id\030\002 \001(\r\022\035\n\025in" +
"stanced_modifier_id\030\t \001(\r\022\034\n\024instanced_a" +
"bility_id\030\n \001(\r\022\036\n\026is_serverbuff_modifie" +
"r\030\006 \001(\010\022\031\n\021ability_caster_id\030\017 \001(\r\022\020\n\010lo" +
"cal_id\030\003 \001(\005B\033\n\031emu.grasscutter.net.prot" +
"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"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -884,7 +884,7 @@ public final class AbilityIdentifierOuterClass {
internal_static_AbilityIdentifier_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AbilityIdentifier_descriptor,
new java.lang.String[] { "ModifierOwnerId", "InstancedModifierId", "InstancedAbilityId", "IsServerbuffModifier", "AbilityCasterId", "LocalId", });
new java.lang.String[] { "InstancedAbilityId", "ModifierOwnerId", "IsServerbuffModifier", "LocalId", "AbilityCasterId", "InstancedModifierId", });
}
// @@protoc_insertion_point(outer_class_scope)