Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:23:53 +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/HomeBlockSubFieldDataOuterClass.java
+216 -208
View File
@@ -19,36 +19,40 @@ public final class HomeBlockSubFieldDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.Vector rot = 6;</code>
* @return Whether the rot field is set.
*/
boolean hasRot();
/**
* <code>.Vector rot = 6;</code>
* @return The rot.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
/**
* <code>.Vector rot = 6;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
* @return Whether the pos field is set.
*/
boolean hasPos();
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
* @return The pos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
/**
* <code>.Vector rot = 3;</code>
* @return Whether the rot field is set.
*/
boolean hasRot();
/**
* <code>.Vector rot = 3;</code>
* @return The rot.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
/**
* <code>.Vector rot = 3;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
}
/**
* <pre>
* Name: LGCNHKIIMLL
* </pre>
*
* Protobuf type {@code HomeBlockSubFieldData}
*/
public static final class HomeBlockSubFieldData extends
@@ -93,7 +97,7 @@ public final class HomeBlockSubFieldDataOuterClass {
case 0:
done = true;
break;
case 50: {
case 26: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (rot_ != null) {
subBuilder = rot_.toBuilder();
@@ -106,7 +110,7 @@ public final class HomeBlockSubFieldDataOuterClass {
break;
}
case 90: {
case 114: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (pos_ != null) {
subBuilder = pos_.toBuilder();
@@ -151,36 +155,10 @@ public final class HomeBlockSubFieldDataOuterClass {
emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.class, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder.class);
}
public static final int ROT_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
/**
* <code>.Vector rot = 6;</code>
* @return Whether the rot field is set.
*/
@java.lang.Override
public boolean hasRot() {
return rot_ != null;
}
/**
* <code>.Vector rot = 6;</code>
* @return The rot.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
}
/**
* <code>.Vector rot = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
return getRot();
}
public static final int POS_FIELD_NUMBER = 11;
public static final int POS_FIELD_NUMBER = 14;
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
* @return Whether the pos field is set.
*/
@java.lang.Override
@@ -188,7 +166,7 @@ public final class HomeBlockSubFieldDataOuterClass {
return pos_ != null;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
* @return The pos.
*/
@java.lang.Override
@@ -196,13 +174,39 @@ public final class HomeBlockSubFieldDataOuterClass {
return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
return getPos();
}
public static final int ROT_FIELD_NUMBER = 3;
private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
/**
* <code>.Vector rot = 3;</code>
* @return Whether the rot field is set.
*/
@java.lang.Override
public boolean hasRot() {
return rot_ != null;
}
/**
* <code>.Vector rot = 3;</code>
* @return The rot.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
}
/**
* <code>.Vector rot = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
return getRot();
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -218,10 +222,10 @@ public final class HomeBlockSubFieldDataOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (rot_ != null) {
output.writeMessage(6, getRot());
output.writeMessage(3, getRot());
}
if (pos_ != null) {
output.writeMessage(11, getPos());
output.writeMessage(14, getPos());
}
unknownFields.writeTo(output);
}
@@ -234,11 +238,11 @@ public final class HomeBlockSubFieldDataOuterClass {
size = 0;
if (rot_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getRot());
.computeMessageSize(3, getRot());
}
if (pos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, getPos());
.computeMessageSize(14, getPos());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -255,16 +259,16 @@ public final class HomeBlockSubFieldDataOuterClass {
}
emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData other = (emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData) obj;
if (hasRot() != other.hasRot()) return false;
if (hasRot()) {
if (!getRot()
.equals(other.getRot())) return false;
}
if (hasPos() != other.hasPos()) return false;
if (hasPos()) {
if (!getPos()
.equals(other.getPos())) return false;
}
if (hasRot() != other.hasRot()) return false;
if (hasRot()) {
if (!getRot()
.equals(other.getRot())) return false;
}
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -276,14 +280,14 @@ public final class HomeBlockSubFieldDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasRot()) {
hash = (37 * hash) + ROT_FIELD_NUMBER;
hash = (53 * hash) + getRot().hashCode();
}
if (hasPos()) {
hash = (37 * hash) + POS_FIELD_NUMBER;
hash = (53 * hash) + getPos().hashCode();
}
if (hasRot()) {
hash = (37 * hash) + ROT_FIELD_NUMBER;
hash = (53 * hash) + getRot().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -380,6 +384,10 @@ public final class HomeBlockSubFieldDataOuterClass {
return builder;
}
/**
* <pre>
* Name: LGCNHKIIMLL
* </pre>
*
* Protobuf type {@code HomeBlockSubFieldData}
*/
public static final class Builder extends
@@ -417,18 +425,18 @@ public final class HomeBlockSubFieldDataOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
if (rotBuilder_ == null) {
rot_ = null;
} else {
rot_ = null;
rotBuilder_ = null;
}
if (posBuilder_ == null) {
pos_ = null;
} else {
pos_ = null;
posBuilder_ = null;
}
if (rotBuilder_ == null) {
rot_ = null;
} else {
rot_ = null;
rotBuilder_ = null;
}
return this;
}
@@ -455,16 +463,16 @@ public final class HomeBlockSubFieldDataOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData buildPartial() {
emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData result = new emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData(this);
if (rotBuilder_ == null) {
result.rot_ = rot_;
} else {
result.rot_ = rotBuilder_.build();
}
if (posBuilder_ == null) {
result.pos_ = pos_;
} else {
result.pos_ = posBuilder_.build();
}
if (rotBuilder_ == null) {
result.rot_ = rot_;
} else {
result.rot_ = rotBuilder_.build();
}
onBuilt();
return result;
}
@@ -513,12 +521,12 @@ public final class HomeBlockSubFieldDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData other) {
if (other == emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.getDefaultInstance()) return this;
if (other.hasRot()) {
mergeRot(other.getRot());
}
if (other.hasPos()) {
mergePos(other.getPos());
}
if (other.hasRot()) {
mergeRot(other.getRot());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -548,137 +556,18 @@ public final class HomeBlockSubFieldDataOuterClass {
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
/**
* <code>.Vector rot = 6;</code>
* @return Whether the rot field is set.
*/
public boolean hasRot() {
return rotBuilder_ != null || rot_ != null;
}
/**
* <code>.Vector rot = 6;</code>
* @return The rot.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
if (rotBuilder_ == null) {
return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
} else {
return rotBuilder_.getMessage();
}
}
/**
* <code>.Vector rot = 6;</code>
*/
public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (rotBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
rot_ = value;
onChanged();
} else {
rotBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.Vector rot = 6;</code>
*/
public Builder setRot(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
if (rotBuilder_ == null) {
rot_ = builderForValue.build();
onChanged();
} else {
rotBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.Vector rot = 6;</code>
*/
public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (rotBuilder_ == null) {
if (rot_ != null) {
rot_ =
emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial();
} else {
rot_ = value;
}
onChanged();
} else {
rotBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.Vector rot = 6;</code>
*/
public Builder clearRot() {
if (rotBuilder_ == null) {
rot_ = null;
onChanged();
} else {
rot_ = null;
rotBuilder_ = null;
}
return this;
}
/**
* <code>.Vector rot = 6;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
onChanged();
return getRotFieldBuilder().getBuilder();
}
/**
* <code>.Vector rot = 6;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
if (rotBuilder_ != null) {
return rotBuilder_.getMessageOrBuilder();
} else {
return rot_ == null ?
emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
}
}
/**
* <code>.Vector rot = 6;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
getRotFieldBuilder() {
if (rotBuilder_ == null) {
rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
getRot(),
getParentForChildren(),
isClean());
rot_ = null;
}
return rotBuilder_;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
* @return Whether the pos field is set.
*/
public boolean hasPos() {
return posBuilder_ != null || pos_ != null;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
* @return The pos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -689,7 +578,7 @@ public final class HomeBlockSubFieldDataOuterClass {
}
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
@@ -705,7 +594,7 @@ public final class HomeBlockSubFieldDataOuterClass {
return this;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
public Builder setPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -719,7 +608,7 @@ public final class HomeBlockSubFieldDataOuterClass {
return this;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
@@ -737,7 +626,7 @@ public final class HomeBlockSubFieldDataOuterClass {
return this;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
public Builder clearPos() {
if (posBuilder_ == null) {
@@ -751,7 +640,7 @@ public final class HomeBlockSubFieldDataOuterClass {
return this;
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
@@ -759,7 +648,7 @@ public final class HomeBlockSubFieldDataOuterClass {
return getPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
if (posBuilder_ != null) {
@@ -770,7 +659,7 @@ public final class HomeBlockSubFieldDataOuterClass {
}
}
/**
* <code>.Vector pos = 11;</code>
* <code>.Vector pos = 14;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -785,6 +674,125 @@ public final class HomeBlockSubFieldDataOuterClass {
}
return posBuilder_;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
/**
* <code>.Vector rot = 3;</code>
* @return Whether the rot field is set.
*/
public boolean hasRot() {
return rotBuilder_ != null || rot_ != null;
}
/**
* <code>.Vector rot = 3;</code>
* @return The rot.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
if (rotBuilder_ == null) {
return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
} else {
return rotBuilder_.getMessage();
}
}
/**
* <code>.Vector rot = 3;</code>
*/
public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (rotBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
rot_ = value;
onChanged();
} else {
rotBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.Vector rot = 3;</code>
*/
public Builder setRot(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
if (rotBuilder_ == null) {
rot_ = builderForValue.build();
onChanged();
} else {
rotBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.Vector rot = 3;</code>
*/
public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (rotBuilder_ == null) {
if (rot_ != null) {
rot_ =
emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial();
} else {
rot_ = value;
}
onChanged();
} else {
rotBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.Vector rot = 3;</code>
*/
public Builder clearRot() {
if (rotBuilder_ == null) {
rot_ = null;
onChanged();
} else {
rot_ = null;
rotBuilder_ = null;
}
return this;
}
/**
* <code>.Vector rot = 3;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
onChanged();
return getRotFieldBuilder().getBuilder();
}
/**
* <code>.Vector rot = 3;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
if (rotBuilder_ != null) {
return rotBuilder_.getMessageOrBuilder();
} else {
return rot_ == null ?
emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
}
}
/**
* <code>.Vector rot = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
getRotFieldBuilder() {
if (rotBuilder_ == null) {
rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
getRot(),
getParentForChildren(),
isClean());
rot_ = null;
}
return rotBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -853,8 +861,8 @@ public final class HomeBlockSubFieldDataOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033HomeBlockSubFieldData.proto\032\014Vector.pr" +
"oto\"C\n\025HomeBlockSubFieldData\022\024\n\003rot\030\006 \001(" +
"\0132\007.Vector\022\024\n\003pos\030\013 \001(\0132\007.VectorB\033\n\031emu." +
"oto\"C\n\025HomeBlockSubFieldData\022\024\n\003pos\030\016 \001(" +
"\0132\007.Vector\022\024\n\003rot\030\003 \001(\0132\007.VectorB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -867,7 +875,7 @@ public final class HomeBlockSubFieldDataOuterClass {
internal_static_HomeBlockSubFieldData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeBlockSubFieldData_descriptor,
new java.lang.String[] { "Rot", "Pos", });
new java.lang.String[] { "Pos", "Rot", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}