Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:01:21 +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/HomeBlockDotPatternOuterClass.java
+135 -129
View File
@@ -19,24 +19,28 @@ public final class HomeBlockDotPatternOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 width = 3;</code>
* @return The width.
* <code>uint32 height = 8;</code>
* @return The height.
*/
int getWidth();
int getHeight();
/**
* <code>bytes data = 14;</code>
* <code>bytes data = 6;</code>
* @return The data.
*/
com.google.protobuf.ByteString getData();
/**
* <code>uint32 height = 8;</code>
* @return The height.
* <code>uint32 width = 14;</code>
* @return The width.
*/
int getHeight();
int getWidth();
}
/**
* <pre>
* Name: NALOPCHENIP
* </pre>
*
* Protobuf type {@code HomeBlockDotPattern}
*/
public static final class HomeBlockDotPattern extends
@@ -82,9 +86,9 @@ public final class HomeBlockDotPatternOuterClass {
case 0:
done = true;
break;
case 24: {
case 50: {
width_ = input.readUInt32();
data_ = input.readBytes();
break;
}
case 64: {
@@ -92,9 +96,9 @@ public final class HomeBlockDotPatternOuterClass {
height_ = input.readUInt32();
break;
}
case 114: {
case 112: {
data_ = input.readBytes();
width_ = input.readUInt32();
break;
}
default: {
@@ -129,28 +133,6 @@ public final class HomeBlockDotPatternOuterClass {
emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.class, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder.class);
}
public static final int WIDTH_FIELD_NUMBER = 3;
private int width_;
/**
* <code>uint32 width = 3;</code>
* @return The width.
*/
@java.lang.Override
public int getWidth() {
return width_;
}
public static final int DATA_FIELD_NUMBER = 14;
private com.google.protobuf.ByteString data_;
/**
* <code>bytes data = 14;</code>
* @return The data.
*/
@java.lang.Override
public com.google.protobuf.ByteString getData() {
return data_;
}
public static final int HEIGHT_FIELD_NUMBER = 8;
private int height_;
/**
@@ -162,6 +144,28 @@ public final class HomeBlockDotPatternOuterClass {
return height_;
}
public static final int DATA_FIELD_NUMBER = 6;
private com.google.protobuf.ByteString data_;
/**
* <code>bytes data = 6;</code>
* @return The data.
*/
@java.lang.Override
public com.google.protobuf.ByteString getData() {
return data_;
}
public static final int WIDTH_FIELD_NUMBER = 14;
private int width_;
/**
* <code>uint32 width = 14;</code>
* @return The width.
*/
@java.lang.Override
public int getWidth() {
return width_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -176,14 +180,14 @@ public final class HomeBlockDotPatternOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (width_ != 0) {
output.writeUInt32(3, width_);
if (!data_.isEmpty()) {
output.writeBytes(6, data_);
}
if (height_ != 0) {
output.writeUInt32(8, height_);
}
if (!data_.isEmpty()) {
output.writeBytes(14, data_);
if (width_ != 0) {
output.writeUInt32(14, width_);
}
unknownFields.writeTo(output);
}
@@ -194,17 +198,17 @@ public final class HomeBlockDotPatternOuterClass {
if (size != -1) return size;
size = 0;
if (width_ != 0) {
if (!data_.isEmpty()) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, width_);
.computeBytesSize(6, data_);
}
if (height_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, height_);
}
if (!data_.isEmpty()) {
if (width_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(14, data_);
.computeUInt32Size(14, width_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -221,12 +225,12 @@ public final class HomeBlockDotPatternOuterClass {
}
emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern other = (emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern) obj;
if (getWidth()
!= other.getWidth()) return false;
if (!getData()
.equals(other.getData())) return false;
if (getHeight()
!= other.getHeight()) return false;
if (!getData()
.equals(other.getData())) return false;
if (getWidth()
!= other.getWidth()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -238,12 +242,12 @@ public final class HomeBlockDotPatternOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + WIDTH_FIELD_NUMBER;
hash = (53 * hash) + getWidth();
hash = (37 * hash) + DATA_FIELD_NUMBER;
hash = (53 * hash) + getData().hashCode();
hash = (37 * hash) + HEIGHT_FIELD_NUMBER;
hash = (53 * hash) + getHeight();
hash = (37 * hash) + DATA_FIELD_NUMBER;
hash = (53 * hash) + getData().hashCode();
hash = (37 * hash) + WIDTH_FIELD_NUMBER;
hash = (53 * hash) + getWidth();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -340,6 +344,10 @@ public final class HomeBlockDotPatternOuterClass {
return builder;
}
/**
* <pre>
* Name: NALOPCHENIP
* </pre>
*
* Protobuf type {@code HomeBlockDotPattern}
*/
public static final class Builder extends
@@ -377,11 +385,11 @@ public final class HomeBlockDotPatternOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
width_ = 0;
height_ = 0;
data_ = com.google.protobuf.ByteString.EMPTY;
height_ = 0;
width_ = 0;
return this;
}
@@ -409,9 +417,9 @@ public final class HomeBlockDotPatternOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern buildPartial() {
emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern result = new emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern(this);
result.width_ = width_;
result.data_ = data_;
result.height_ = height_;
result.data_ = data_;
result.width_ = width_;
onBuilt();
return result;
}
@@ -460,14 +468,14 @@ public final class HomeBlockDotPatternOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern other) {
if (other == emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.getDefaultInstance()) return this;
if (other.getWidth() != 0) {
setWidth(other.getWidth());
if (other.getHeight() != 0) {
setHeight(other.getHeight());
}
if (other.getData() != com.google.protobuf.ByteString.EMPTY) {
setData(other.getData());
}
if (other.getHeight() != 0) {
setHeight(other.getHeight());
if (other.getWidth() != 0) {
setWidth(other.getWidth());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -498,71 +506,6 @@ public final class HomeBlockDotPatternOuterClass {
return this;
}
private int width_ ;
/**
* <code>uint32 width = 3;</code>
* @return The width.
*/
@java.lang.Override
public int getWidth() {
return width_;
}
/**
* <code>uint32 width = 3;</code>
* @param value The width to set.
* @return This builder for chaining.
*/
public Builder setWidth(int value) {
width_ = value;
onChanged();
return this;
}
/**
* <code>uint32 width = 3;</code>
* @return This builder for chaining.
*/
public Builder clearWidth() {
width_ = 0;
onChanged();
return this;
}
private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
/**
* <code>bytes data = 14;</code>
* @return The data.
*/
@java.lang.Override
public com.google.protobuf.ByteString getData() {
return data_;
}
/**
* <code>bytes data = 14;</code>
* @param value The data to set.
* @return This builder for chaining.
*/
public Builder setData(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
data_ = value;
onChanged();
return this;
}
/**
* <code>bytes data = 14;</code>
* @return This builder for chaining.
*/
public Builder clearData() {
data_ = getDefaultInstance().getData();
onChanged();
return this;
}
private int height_ ;
/**
* <code>uint32 height = 8;</code>
@@ -593,6 +536,71 @@ public final class HomeBlockDotPatternOuterClass {
onChanged();
return this;
}
private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
/**
* <code>bytes data = 6;</code>
* @return The data.
*/
@java.lang.Override
public com.google.protobuf.ByteString getData() {
return data_;
}
/**
* <code>bytes data = 6;</code>
* @param value The data to set.
* @return This builder for chaining.
*/
public Builder setData(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
data_ = value;
onChanged();
return this;
}
/**
* <code>bytes data = 6;</code>
* @return This builder for chaining.
*/
public Builder clearData() {
data_ = getDefaultInstance().getData();
onChanged();
return this;
}
private int width_ ;
/**
* <code>uint32 width = 14;</code>
* @return The width.
*/
@java.lang.Override
public int getWidth() {
return width_;
}
/**
* <code>uint32 width = 14;</code>
* @param value The width to set.
* @return This builder for chaining.
*/
public Builder setWidth(int value) {
width_ = value;
onChanged();
return this;
}
/**
* <code>uint32 width = 14;</code>
* @return This builder for chaining.
*/
public Builder clearWidth() {
width_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -660,23 +668,21 @@ public final class HomeBlockDotPatternOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\031HomeBlockDotPattern.proto\032\013bytes.proto" +
"\"B\n\023HomeBlockDotPattern\022\r\n\005width\030\003 \001(\r\022\014" +
"\n\004data\030\016 \001(\014\022\016\n\006height\030\010 \001(\rB\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
"\n\031HomeBlockDotPattern.proto\"B\n\023HomeBlock" +
"DotPattern\022\016\n\006height\030\010 \001(\r\022\014\n\004data\030\006 \001(\014" +
"\022\r\n\005width\030\016 \001(\rB\033\n\031emu.grasscutter.net.p" +
"rotob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
emu.grasscutter.net.proto.Bytes.getDescriptor(),
});
internal_static_HomeBlockDotPattern_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_HomeBlockDotPattern_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeBlockDotPattern_descriptor,
new java.lang.String[] { "Width", "Data", "Height", });
emu.grasscutter.net.proto.Bytes.getDescriptor();
new java.lang.String[] { "Height", "Data", "Width", });
}
// @@protoc_insertion_point(outer_class_scope)