Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 13:13:35 +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/BreakoutBrickInfoOuterClass.java
+53 -46
View File
@@ -19,18 +19,22 @@ public final class BreakoutBrickInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 cpoenmafigh = 1;</code>
* @return The cpoenmafigh.
* <code>uint32 hp = 1;</code>
* @return The hp.
*/
int getCpoenmafigh();
int getHp();
/**
* <code>uint32 elementType = 2;</code>
* <code>uint32 element_type = 2;</code>
* @return The elementType.
*/
int getElementType();
}
/**
* <pre>
* Name: GHMIOBEFBDI
* </pre>
*
* Protobuf type {@code BreakoutBrickInfo}
*/
public static final class BreakoutBrickInfo extends
@@ -77,7 +81,7 @@ public final class BreakoutBrickInfoOuterClass {
break;
case 8: {
cpoenmafigh_ = input.readUInt32();
hp_ = input.readUInt32();
break;
}
case 16: {
@@ -117,21 +121,21 @@ public final class BreakoutBrickInfoOuterClass {
emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo.class, emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo.Builder.class);
}
public static final int CPOENMAFIGH_FIELD_NUMBER = 1;
private int cpoenmafigh_;
public static final int HP_FIELD_NUMBER = 1;
private int hp_;
/**
* <code>uint32 cpoenmafigh = 1;</code>
* @return The cpoenmafigh.
* <code>uint32 hp = 1;</code>
* @return The hp.
*/
@java.lang.Override
public int getCpoenmafigh() {
return cpoenmafigh_;
public int getHp() {
return hp_;
}
public static final int ELEMENTTYPE_FIELD_NUMBER = 2;
public static final int ELEMENT_TYPE_FIELD_NUMBER = 2;
private int elementType_;
/**
* <code>uint32 elementType = 2;</code>
* <code>uint32 element_type = 2;</code>
* @return The elementType.
*/
@java.lang.Override
@@ -153,8 +157,8 @@ public final class BreakoutBrickInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (cpoenmafigh_ != 0) {
output.writeUInt32(1, cpoenmafigh_);
if (hp_ != 0) {
output.writeUInt32(1, hp_);
}
if (elementType_ != 0) {
output.writeUInt32(2, elementType_);
@@ -168,9 +172,9 @@ public final class BreakoutBrickInfoOuterClass {
if (size != -1) return size;
size = 0;
if (cpoenmafigh_ != 0) {
if (hp_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, cpoenmafigh_);
.computeUInt32Size(1, hp_);
}
if (elementType_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -191,8 +195,8 @@ public final class BreakoutBrickInfoOuterClass {
}
emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo other = (emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo) obj;
if (getCpoenmafigh()
!= other.getCpoenmafigh()) return false;
if (getHp()
!= other.getHp()) return false;
if (getElementType()
!= other.getElementType()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -206,9 +210,9 @@ public final class BreakoutBrickInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CPOENMAFIGH_FIELD_NUMBER;
hash = (53 * hash) + getCpoenmafigh();
hash = (37 * hash) + ELEMENTTYPE_FIELD_NUMBER;
hash = (37 * hash) + HP_FIELD_NUMBER;
hash = (53 * hash) + getHp();
hash = (37 * hash) + ELEMENT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getElementType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -306,6 +310,10 @@ public final class BreakoutBrickInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: GHMIOBEFBDI
* </pre>
*
* Protobuf type {@code BreakoutBrickInfo}
*/
public static final class Builder extends
@@ -343,7 +351,7 @@ public final class BreakoutBrickInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
cpoenmafigh_ = 0;
hp_ = 0;
elementType_ = 0;
@@ -373,7 +381,7 @@ public final class BreakoutBrickInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo buildPartial() {
emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo result = new emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo(this);
result.cpoenmafigh_ = cpoenmafigh_;
result.hp_ = hp_;
result.elementType_ = elementType_;
onBuilt();
return result;
@@ -423,8 +431,8 @@ public final class BreakoutBrickInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo other) {
if (other == emu.grasscutter.net.proto.BreakoutBrickInfoOuterClass.BreakoutBrickInfo.getDefaultInstance()) return this;
if (other.getCpoenmafigh() != 0) {
setCpoenmafigh(other.getCpoenmafigh());
if (other.getHp() != 0) {
setHp(other.getHp());
}
if (other.getElementType() != 0) {
setElementType(other.getElementType());
@@ -458,40 +466,40 @@ public final class BreakoutBrickInfoOuterClass {
return this;
}
private int cpoenmafigh_ ;
private int hp_ ;
/**
* <code>uint32 cpoenmafigh = 1;</code>
* @return The cpoenmafigh.
* <code>uint32 hp = 1;</code>
* @return The hp.
*/
@java.lang.Override
public int getCpoenmafigh() {
return cpoenmafigh_;
public int getHp() {
return hp_;
}
/**
* <code>uint32 cpoenmafigh = 1;</code>
* @param value The cpoenmafigh to set.
* <code>uint32 hp = 1;</code>
* @param value The hp to set.
* @return This builder for chaining.
*/
public Builder setCpoenmafigh(int value) {
public Builder setHp(int value) {
cpoenmafigh_ = value;
hp_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cpoenmafigh = 1;</code>
* <code>uint32 hp = 1;</code>
* @return This builder for chaining.
*/
public Builder clearCpoenmafigh() {
public Builder clearHp() {
cpoenmafigh_ = 0;
hp_ = 0;
onChanged();
return this;
}
private int elementType_ ;
/**
* <code>uint32 elementType = 2;</code>
* <code>uint32 element_type = 2;</code>
* @return The elementType.
*/
@java.lang.Override
@@ -499,7 +507,7 @@ public final class BreakoutBrickInfoOuterClass {
return elementType_;
}
/**
* <code>uint32 elementType = 2;</code>
* <code>uint32 element_type = 2;</code>
* @param value The elementType to set.
* @return This builder for chaining.
*/
@@ -510,7 +518,7 @@ public final class BreakoutBrickInfoOuterClass {
return this;
}
/**
* <code>uint32 elementType = 2;</code>
* <code>uint32 element_type = 2;</code>
* @return This builder for chaining.
*/
public Builder clearElementType() {
@@ -586,10 +594,9 @@ public final class BreakoutBrickInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\027BreakoutBrickInfo.proto\"=\n\021BreakoutBri" +
"ckInfo\022\023\n\013cpoenmafigh\030\001 \001(\r\022\023\n\013elementTy" +
"pe\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
"roto3"
"\n\027BreakoutBrickInfo.proto\"5\n\021BreakoutBri" +
"ckInfo\022\n\n\002hp\030\001 \001(\r\022\024\n\014element_type\030\002 \001(\r" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -600,7 +607,7 @@ public final class BreakoutBrickInfoOuterClass {
internal_static_BreakoutBrickInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BreakoutBrickInfo_descriptor,
new java.lang.String[] { "Cpoenmafigh", "ElementType", });
new java.lang.String[] { "Hp", "ElementType", });
}
// @@protoc_insertion_point(outer_class_scope)