mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 22:09:52 +08:00
Update gc to 3.3 (#1981)
* 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:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+89
-89
@@ -19,22 +19,22 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 width = 8;</code>
|
||||
* <code>uint32 width = 13;</code>
|
||||
* @return The width.
|
||||
*/
|
||||
int getWidth();
|
||||
|
||||
/**
|
||||
* <code>bytes data = 12;</code>
|
||||
* @return The data.
|
||||
*/
|
||||
com.google.protobuf.ByteString getData();
|
||||
|
||||
/**
|
||||
* <code>uint32 height = 11;</code>
|
||||
* @return The height.
|
||||
*/
|
||||
int getHeight();
|
||||
|
||||
/**
|
||||
* <code>bytes data = 9;</code>
|
||||
* @return The data.
|
||||
*/
|
||||
com.google.protobuf.ByteString getData();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code HomeBlockDotPattern}
|
||||
@@ -82,19 +82,19 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 64: {
|
||||
case 88: {
|
||||
|
||||
width_ = input.readUInt32();
|
||||
height_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 74: {
|
||||
case 98: {
|
||||
|
||||
data_ = input.readBytes();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
case 104: {
|
||||
|
||||
height_ = input.readUInt32();
|
||||
width_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -129,10 +129,10 @@ 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 = 8;
|
||||
public static final int WIDTH_FIELD_NUMBER = 13;
|
||||
private int width_;
|
||||
/**
|
||||
* <code>uint32 width = 8;</code>
|
||||
* <code>uint32 width = 13;</code>
|
||||
* @return The width.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -140,6 +140,17 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
return width_;
|
||||
}
|
||||
|
||||
public static final int DATA_FIELD_NUMBER = 12;
|
||||
private com.google.protobuf.ByteString data_;
|
||||
/**
|
||||
* <code>bytes data = 12;</code>
|
||||
* @return The data.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.ByteString getData() {
|
||||
return data_;
|
||||
}
|
||||
|
||||
public static final int HEIGHT_FIELD_NUMBER = 11;
|
||||
private int height_;
|
||||
/**
|
||||
@@ -151,17 +162,6 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
return height_;
|
||||
}
|
||||
|
||||
public static final int DATA_FIELD_NUMBER = 9;
|
||||
private com.google.protobuf.ByteString data_;
|
||||
/**
|
||||
* <code>bytes data = 9;</code>
|
||||
* @return The data.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.ByteString getData() {
|
||||
return data_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -176,15 +176,15 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (width_ != 0) {
|
||||
output.writeUInt32(8, width_);
|
||||
}
|
||||
if (!data_.isEmpty()) {
|
||||
output.writeBytes(9, data_);
|
||||
}
|
||||
if (height_ != 0) {
|
||||
output.writeUInt32(11, height_);
|
||||
}
|
||||
if (!data_.isEmpty()) {
|
||||
output.writeBytes(12, data_);
|
||||
}
|
||||
if (width_ != 0) {
|
||||
output.writeUInt32(13, width_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -194,18 +194,18 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (width_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, width_);
|
||||
}
|
||||
if (!data_.isEmpty()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBytesSize(9, data_);
|
||||
}
|
||||
if (height_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(11, height_);
|
||||
}
|
||||
if (!data_.isEmpty()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBytesSize(12, data_);
|
||||
}
|
||||
if (width_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(13, width_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -223,10 +223,10 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
|
||||
if (getWidth()
|
||||
!= other.getWidth()) return false;
|
||||
if (getHeight()
|
||||
!= other.getHeight()) return false;
|
||||
if (!getData()
|
||||
.equals(other.getData())) return false;
|
||||
if (getHeight()
|
||||
!= other.getHeight()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -240,10 +240,10 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + WIDTH_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getWidth();
|
||||
hash = (37 * hash) + HEIGHT_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getHeight();
|
||||
hash = (37 * hash) + DATA_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getData().hashCode();
|
||||
hash = (37 * hash) + HEIGHT_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getHeight();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -379,10 +379,10 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
super.clear();
|
||||
width_ = 0;
|
||||
|
||||
height_ = 0;
|
||||
|
||||
data_ = com.google.protobuf.ByteString.EMPTY;
|
||||
|
||||
height_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -410,8 +410,8 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
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.height_ = height_;
|
||||
result.data_ = data_;
|
||||
result.height_ = height_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -463,12 +463,12 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
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());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -500,7 +500,7 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
|
||||
private int width_ ;
|
||||
/**
|
||||
* <code>uint32 width = 8;</code>
|
||||
* <code>uint32 width = 13;</code>
|
||||
* @return The width.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -508,7 +508,7 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
return width_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 width = 8;</code>
|
||||
* <code>uint32 width = 13;</code>
|
||||
* @param value The width to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -519,7 +519,7 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 width = 8;</code>
|
||||
* <code>uint32 width = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearWidth() {
|
||||
@@ -529,6 +529,40 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
|
||||
/**
|
||||
* <code>bytes data = 12;</code>
|
||||
* @return The data.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.ByteString getData() {
|
||||
return data_;
|
||||
}
|
||||
/**
|
||||
* <code>bytes data = 12;</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 = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearData() {
|
||||
|
||||
data_ = getDefaultInstance().getData();
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int height_ ;
|
||||
/**
|
||||
* <code>uint32 height = 11;</code>
|
||||
@@ -559,40 +593,6 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
|
||||
/**
|
||||
* <code>bytes data = 9;</code>
|
||||
* @return The data.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.ByteString getData() {
|
||||
return data_;
|
||||
}
|
||||
/**
|
||||
* <code>bytes data = 9;</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 = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearData() {
|
||||
|
||||
data_ = getDefaultInstance().getData();
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -661,8 +661,8 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\031HomeBlockDotPattern.proto\"B\n\023HomeBlock" +
|
||||
"DotPattern\022\r\n\005width\030\010 \001(\r\022\016\n\006height\030\013 \001(" +
|
||||
"\r\022\014\n\004data\030\t \001(\014B\033\n\031emu.grasscutter.net.p" +
|
||||
"DotPattern\022\r\n\005width\030\r \001(\r\022\014\n\004data\030\014 \001(\014\022" +
|
||||
"\016\n\006height\030\013 \001(\rB\033\n\031emu.grasscutter.net.p" +
|
||||
"rotob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -674,7 +674,7 @@ public final class HomeBlockDotPatternOuterClass {
|
||||
internal_static_HomeBlockDotPattern_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_HomeBlockDotPattern_descriptor,
|
||||
new java.lang.String[] { "Width", "Height", "Data", });
|
||||
new java.lang.String[] { "Width", "Data", "Height", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user