mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 13:49:59 +08:00
Add support for v3.5.0 (#2090)
* 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
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
+228
-219
@@ -25,13 +25,13 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
int getGuid();
|
||||
|
||||
/**
|
||||
* <code>uint32 furnitureId = 2;</code>
|
||||
* <code>uint32 furniture_id = 2;</code>
|
||||
* @return The furnitureId.
|
||||
*/
|
||||
int getFurnitureId();
|
||||
|
||||
/**
|
||||
* <code>uint32 furnitureType = 3;</code>
|
||||
* <code>uint32 furniture_type = 3;</code>
|
||||
* @return The furnitureType.
|
||||
*/
|
||||
int getFurnitureType();
|
||||
@@ -52,38 +52,42 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
|
||||
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
* @return Whether the npcData field is set.
|
||||
*/
|
||||
boolean hasNpcData();
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
* @return The npcData.
|
||||
*/
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcData getNpcData();
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData getNpcData();
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcDataOrBuilder getNpcDataOrBuilder();
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCDataOrBuilder getNpcDataOrBuilder();
|
||||
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
* @return Whether the suiteData field is set.
|
||||
*/
|
||||
boolean hasSuiteData();
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
* @return The suiteData.
|
||||
*/
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData getSuiteData();
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData getSuiteData();
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteDataOrBuilder getSuiteDataOrBuilder();
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteDataOrBuilder getSuiteDataOrBuilder();
|
||||
|
||||
public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.GPHOOOLEKGJCase getGPHOOOLEKGJCase();
|
||||
public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.ExtraCase getExtraCase();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: BEAHFDOKHFA
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code HomeMarkPointFurnitureData}
|
||||
*/
|
||||
public static final class HomeMarkPointFurnitureData extends
|
||||
@@ -157,31 +161,31 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
break;
|
||||
}
|
||||
case 50: {
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.Builder subBuilder = null;
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
subBuilder = ((emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_).toBuilder();
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.Builder subBuilder = null;
|
||||
if (extraCase_ == 6) {
|
||||
subBuilder = ((emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_).toBuilder();
|
||||
}
|
||||
gPHOOOLEKGJ_ =
|
||||
input.readMessage(emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.parser(), extensionRegistry);
|
||||
extra_ =
|
||||
input.readMessage(emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.parser(), extensionRegistry);
|
||||
if (subBuilder != null) {
|
||||
subBuilder.mergeFrom((emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_);
|
||||
gPHOOOLEKGJ_ = subBuilder.buildPartial();
|
||||
subBuilder.mergeFrom((emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_);
|
||||
extra_ = subBuilder.buildPartial();
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 6;
|
||||
extraCase_ = 6;
|
||||
break;
|
||||
}
|
||||
case 58: {
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.Builder subBuilder = null;
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
subBuilder = ((emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_).toBuilder();
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.Builder subBuilder = null;
|
||||
if (extraCase_ == 7) {
|
||||
subBuilder = ((emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_).toBuilder();
|
||||
}
|
||||
gPHOOOLEKGJ_ =
|
||||
input.readMessage(emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.parser(), extensionRegistry);
|
||||
extra_ =
|
||||
input.readMessage(emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.parser(), extensionRegistry);
|
||||
if (subBuilder != null) {
|
||||
subBuilder.mergeFrom((emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_);
|
||||
gPHOOOLEKGJ_ = subBuilder.buildPartial();
|
||||
subBuilder.mergeFrom((emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_);
|
||||
extra_ = subBuilder.buildPartial();
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 7;
|
||||
extraCase_ = 7;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
@@ -216,16 +220,16 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.class, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder.class);
|
||||
}
|
||||
|
||||
private int gPHOOOLEKGJCase_ = 0;
|
||||
private java.lang.Object gPHOOOLEKGJ_;
|
||||
public enum GPHOOOLEKGJCase
|
||||
private int extraCase_ = 0;
|
||||
private java.lang.Object extra_;
|
||||
public enum ExtraCase
|
||||
implements com.google.protobuf.Internal.EnumLite,
|
||||
com.google.protobuf.AbstractMessage.InternalOneOfEnum {
|
||||
NPC_DATA(6),
|
||||
SUITE_DATA(7),
|
||||
GPHOOOLEKGJ_NOT_SET(0);
|
||||
EXTRA_NOT_SET(0);
|
||||
private final int value;
|
||||
private GPHOOOLEKGJCase(int value) {
|
||||
private ExtraCase(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
/**
|
||||
@@ -234,15 +238,15 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
* @deprecated Use {@link #forNumber(int)} instead.
|
||||
*/
|
||||
@java.lang.Deprecated
|
||||
public static GPHOOOLEKGJCase valueOf(int value) {
|
||||
public static ExtraCase valueOf(int value) {
|
||||
return forNumber(value);
|
||||
}
|
||||
|
||||
public static GPHOOOLEKGJCase forNumber(int value) {
|
||||
public static ExtraCase forNumber(int value) {
|
||||
switch (value) {
|
||||
case 6: return NPC_DATA;
|
||||
case 7: return SUITE_DATA;
|
||||
case 0: return GPHOOOLEKGJ_NOT_SET;
|
||||
case 0: return EXTRA_NOT_SET;
|
||||
default: return null;
|
||||
}
|
||||
}
|
||||
@@ -251,10 +255,10 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
}
|
||||
};
|
||||
|
||||
public GPHOOOLEKGJCase
|
||||
getGPHOOOLEKGJCase() {
|
||||
return GPHOOOLEKGJCase.forNumber(
|
||||
gPHOOOLEKGJCase_);
|
||||
public ExtraCase
|
||||
getExtraCase() {
|
||||
return ExtraCase.forNumber(
|
||||
extraCase_);
|
||||
}
|
||||
|
||||
public static final int GUID_FIELD_NUMBER = 1;
|
||||
@@ -268,10 +272,10 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return guid_;
|
||||
}
|
||||
|
||||
public static final int FURNITUREID_FIELD_NUMBER = 2;
|
||||
public static final int FURNITURE_ID_FIELD_NUMBER = 2;
|
||||
private int furnitureId_;
|
||||
/**
|
||||
* <code>uint32 furnitureId = 2;</code>
|
||||
* <code>uint32 furniture_id = 2;</code>
|
||||
* @return The furnitureId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -279,10 +283,10 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return furnitureId_;
|
||||
}
|
||||
|
||||
public static final int FURNITURETYPE_FIELD_NUMBER = 3;
|
||||
public static final int FURNITURE_TYPE_FIELD_NUMBER = 3;
|
||||
private int furnitureType_;
|
||||
/**
|
||||
* <code>uint32 furnitureType = 3;</code>
|
||||
* <code>uint32 furniture_type = 3;</code>
|
||||
* @return The furnitureType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -318,64 +322,64 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
|
||||
public static final int NPC_DATA_FIELD_NUMBER = 6;
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
* @return Whether the npcData field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasNpcData() {
|
||||
return gPHOOOLEKGJCase_ == 6;
|
||||
return extraCase_ == 6;
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
* @return The npcData.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.NpcDataOuterClass.NpcData getNpcData() {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_;
|
||||
public emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData getNpcData() {
|
||||
if (extraCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance();
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.NpcDataOuterClass.NpcDataOrBuilder getNpcDataOrBuilder() {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_;
|
||||
public emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCDataOrBuilder getNpcDataOrBuilder() {
|
||||
if (extraCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance();
|
||||
}
|
||||
|
||||
public static final int SUITE_DATA_FIELD_NUMBER = 7;
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
* @return Whether the suiteData field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasSuiteData() {
|
||||
return gPHOOOLEKGJCase_ == 7;
|
||||
return extraCase_ == 7;
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
* @return The suiteData.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData getSuiteData() {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_;
|
||||
public emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData getSuiteData() {
|
||||
if (extraCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance();
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteDataOrBuilder getSuiteDataOrBuilder() {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_;
|
||||
public emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteDataOrBuilder getSuiteDataOrBuilder() {
|
||||
if (extraCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance();
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@@ -404,11 +408,11 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
if (pos_ != null) {
|
||||
output.writeMessage(4, getPos());
|
||||
}
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
output.writeMessage(6, (emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_);
|
||||
if (extraCase_ == 6) {
|
||||
output.writeMessage(6, (emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_);
|
||||
}
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
output.writeMessage(7, (emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_);
|
||||
if (extraCase_ == 7) {
|
||||
output.writeMessage(7, (emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -435,13 +439,13 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(4, getPos());
|
||||
}
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
if (extraCase_ == 6) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(6, (emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_);
|
||||
.computeMessageSize(6, (emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_);
|
||||
}
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
if (extraCase_ == 7) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(7, (emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_);
|
||||
.computeMessageSize(7, (emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -469,8 +473,8 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
if (!getPos()
|
||||
.equals(other.getPos())) return false;
|
||||
}
|
||||
if (!getGPHOOOLEKGJCase().equals(other.getGPHOOOLEKGJCase())) return false;
|
||||
switch (gPHOOOLEKGJCase_) {
|
||||
if (!getExtraCase().equals(other.getExtraCase())) return false;
|
||||
switch (extraCase_) {
|
||||
case 6:
|
||||
if (!getNpcData()
|
||||
.equals(other.getNpcData())) return false;
|
||||
@@ -495,15 +499,15 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + GUID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGuid();
|
||||
hash = (37 * hash) + FURNITUREID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + FURNITURE_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getFurnitureId();
|
||||
hash = (37 * hash) + FURNITURETYPE_FIELD_NUMBER;
|
||||
hash = (37 * hash) + FURNITURE_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getFurnitureType();
|
||||
if (hasPos()) {
|
||||
hash = (37 * hash) + POS_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPos().hashCode();
|
||||
}
|
||||
switch (gPHOOOLEKGJCase_) {
|
||||
switch (extraCase_) {
|
||||
case 6:
|
||||
hash = (37 * hash) + NPC_DATA_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getNpcData().hashCode();
|
||||
@@ -611,6 +615,10 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: BEAHFDOKHFA
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code HomeMarkPointFurnitureData}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -660,8 +668,8 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
pos_ = null;
|
||||
posBuilder_ = null;
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 0;
|
||||
gPHOOOLEKGJ_ = null;
|
||||
extraCase_ = 0;
|
||||
extra_ = null;
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -696,21 +704,21 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
} else {
|
||||
result.pos_ = posBuilder_.build();
|
||||
}
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
if (extraCase_ == 6) {
|
||||
if (npcDataBuilder_ == null) {
|
||||
result.gPHOOOLEKGJ_ = gPHOOOLEKGJ_;
|
||||
result.extra_ = extra_;
|
||||
} else {
|
||||
result.gPHOOOLEKGJ_ = npcDataBuilder_.build();
|
||||
result.extra_ = npcDataBuilder_.build();
|
||||
}
|
||||
}
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
if (extraCase_ == 7) {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
result.gPHOOOLEKGJ_ = gPHOOOLEKGJ_;
|
||||
result.extra_ = extra_;
|
||||
} else {
|
||||
result.gPHOOOLEKGJ_ = suiteDataBuilder_.build();
|
||||
result.extra_ = suiteDataBuilder_.build();
|
||||
}
|
||||
}
|
||||
result.gPHOOOLEKGJCase_ = gPHOOOLEKGJCase_;
|
||||
result.extraCase_ = extraCase_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -771,7 +779,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
if (other.hasPos()) {
|
||||
mergePos(other.getPos());
|
||||
}
|
||||
switch (other.getGPHOOOLEKGJCase()) {
|
||||
switch (other.getExtraCase()) {
|
||||
case NPC_DATA: {
|
||||
mergeNpcData(other.getNpcData());
|
||||
break;
|
||||
@@ -780,7 +788,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
mergeSuiteData(other.getSuiteData());
|
||||
break;
|
||||
}
|
||||
case GPHOOOLEKGJ_NOT_SET: {
|
||||
case EXTRA_NOT_SET: {
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -812,17 +820,17 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
}
|
||||
return this;
|
||||
}
|
||||
private int gPHOOOLEKGJCase_ = 0;
|
||||
private java.lang.Object gPHOOOLEKGJ_;
|
||||
public GPHOOOLEKGJCase
|
||||
getGPHOOOLEKGJCase() {
|
||||
return GPHOOOLEKGJCase.forNumber(
|
||||
gPHOOOLEKGJCase_);
|
||||
private int extraCase_ = 0;
|
||||
private java.lang.Object extra_;
|
||||
public ExtraCase
|
||||
getExtraCase() {
|
||||
return ExtraCase.forNumber(
|
||||
extraCase_);
|
||||
}
|
||||
|
||||
public Builder clearGPHOOOLEKGJ() {
|
||||
gPHOOOLEKGJCase_ = 0;
|
||||
gPHOOOLEKGJ_ = null;
|
||||
public Builder clearExtra() {
|
||||
extraCase_ = 0;
|
||||
extra_ = null;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@@ -861,7 +869,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
|
||||
private int furnitureId_ ;
|
||||
/**
|
||||
* <code>uint32 furnitureId = 2;</code>
|
||||
* <code>uint32 furniture_id = 2;</code>
|
||||
* @return The furnitureId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -869,7 +877,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return furnitureId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 furnitureId = 2;</code>
|
||||
* <code>uint32 furniture_id = 2;</code>
|
||||
* @param value The furnitureId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -880,7 +888,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 furnitureId = 2;</code>
|
||||
* <code>uint32 furniture_id = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearFurnitureId() {
|
||||
@@ -892,7 +900,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
|
||||
private int furnitureType_ ;
|
||||
/**
|
||||
* <code>uint32 furnitureType = 3;</code>
|
||||
* <code>uint32 furniture_type = 3;</code>
|
||||
* @return The furnitureType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -900,7 +908,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return furnitureType_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 furnitureType = 3;</code>
|
||||
* <code>uint32 furniture_type = 3;</code>
|
||||
* @param value The furnitureType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -911,7 +919,7 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 furnitureType = 3;</code>
|
||||
* <code>uint32 furniture_type = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearFurnitureType() {
|
||||
@@ -1041,283 +1049,283 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
}
|
||||
|
||||
private com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcData, emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.Builder, emu.grasscutter.net.proto.NpcDataOuterClass.NpcDataOrBuilder> npcDataBuilder_;
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData, emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.Builder, emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCDataOrBuilder> npcDataBuilder_;
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
* @return Whether the npcData field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasNpcData() {
|
||||
return gPHOOOLEKGJCase_ == 6;
|
||||
return extraCase_ == 6;
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
* @return The npcData.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.NpcDataOuterClass.NpcData getNpcData() {
|
||||
public emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData getNpcData() {
|
||||
if (npcDataBuilder_ == null) {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_;
|
||||
if (extraCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance();
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
if (extraCase_ == 6) {
|
||||
return npcDataBuilder_.getMessage();
|
||||
}
|
||||
return emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
public Builder setNpcData(emu.grasscutter.net.proto.NpcDataOuterClass.NpcData value) {
|
||||
public Builder setNpcData(emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData value) {
|
||||
if (npcDataBuilder_ == null) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
gPHOOOLEKGJ_ = value;
|
||||
extra_ = value;
|
||||
onChanged();
|
||||
} else {
|
||||
npcDataBuilder_.setMessage(value);
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 6;
|
||||
extraCase_ = 6;
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
public Builder setNpcData(
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.Builder builderForValue) {
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.Builder builderForValue) {
|
||||
if (npcDataBuilder_ == null) {
|
||||
gPHOOOLEKGJ_ = builderForValue.build();
|
||||
extra_ = builderForValue.build();
|
||||
onChanged();
|
||||
} else {
|
||||
npcDataBuilder_.setMessage(builderForValue.build());
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 6;
|
||||
extraCase_ = 6;
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
public Builder mergeNpcData(emu.grasscutter.net.proto.NpcDataOuterClass.NpcData value) {
|
||||
public Builder mergeNpcData(emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData value) {
|
||||
if (npcDataBuilder_ == null) {
|
||||
if (gPHOOOLEKGJCase_ == 6 &&
|
||||
gPHOOOLEKGJ_ != emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance()) {
|
||||
gPHOOOLEKGJ_ = emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.newBuilder((emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_)
|
||||
if (extraCase_ == 6 &&
|
||||
extra_ != emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance()) {
|
||||
extra_ = emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.newBuilder((emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_)
|
||||
.mergeFrom(value).buildPartial();
|
||||
} else {
|
||||
gPHOOOLEKGJ_ = value;
|
||||
extra_ = value;
|
||||
}
|
||||
onChanged();
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
if (extraCase_ == 6) {
|
||||
npcDataBuilder_.mergeFrom(value);
|
||||
}
|
||||
npcDataBuilder_.setMessage(value);
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 6;
|
||||
extraCase_ = 6;
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
public Builder clearNpcData() {
|
||||
if (npcDataBuilder_ == null) {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
gPHOOOLEKGJCase_ = 0;
|
||||
gPHOOOLEKGJ_ = null;
|
||||
if (extraCase_ == 6) {
|
||||
extraCase_ = 0;
|
||||
extra_ = null;
|
||||
onChanged();
|
||||
}
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
gPHOOOLEKGJCase_ = 0;
|
||||
gPHOOOLEKGJ_ = null;
|
||||
if (extraCase_ == 6) {
|
||||
extraCase_ = 0;
|
||||
extra_ = null;
|
||||
}
|
||||
npcDataBuilder_.clear();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.Builder getNpcDataBuilder() {
|
||||
public emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.Builder getNpcDataBuilder() {
|
||||
return getNpcDataFieldBuilder().getBuilder();
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.NpcDataOuterClass.NpcDataOrBuilder getNpcDataOrBuilder() {
|
||||
if ((gPHOOOLEKGJCase_ == 6) && (npcDataBuilder_ != null)) {
|
||||
public emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCDataOrBuilder getNpcDataOrBuilder() {
|
||||
if ((extraCase_ == 6) && (npcDataBuilder_ != null)) {
|
||||
return npcDataBuilder_.getMessageOrBuilder();
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_;
|
||||
if (extraCase_ == 6) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.NpcData npc_data = 6;</code>
|
||||
* <code>.HomeMarkPointNPCData npc_data = 6;</code>
|
||||
*/
|
||||
private com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcData, emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.Builder, emu.grasscutter.net.proto.NpcDataOuterClass.NpcDataOrBuilder>
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData, emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.Builder, emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCDataOrBuilder>
|
||||
getNpcDataFieldBuilder() {
|
||||
if (npcDataBuilder_ == null) {
|
||||
if (!(gPHOOOLEKGJCase_ == 6)) {
|
||||
gPHOOOLEKGJ_ = emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.getDefaultInstance();
|
||||
if (!(extraCase_ == 6)) {
|
||||
extra_ = emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.getDefaultInstance();
|
||||
}
|
||||
npcDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.NpcData, emu.grasscutter.net.proto.NpcDataOuterClass.NpcData.Builder, emu.grasscutter.net.proto.NpcDataOuterClass.NpcDataOrBuilder>(
|
||||
(emu.grasscutter.net.proto.NpcDataOuterClass.NpcData) gPHOOOLEKGJ_,
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData, emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData.Builder, emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCDataOrBuilder>(
|
||||
(emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.HomeMarkPointNPCData) extra_,
|
||||
getParentForChildren(),
|
||||
isClean());
|
||||
gPHOOOLEKGJ_ = null;
|
||||
extra_ = null;
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 6;
|
||||
extraCase_ = 6;
|
||||
onChanged();;
|
||||
return npcDataBuilder_;
|
||||
}
|
||||
|
||||
private com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData, emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.Builder, emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteDataOrBuilder> suiteDataBuilder_;
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData, emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.Builder, emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteDataOrBuilder> suiteDataBuilder_;
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
* @return Whether the suiteData field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasSuiteData() {
|
||||
return gPHOOOLEKGJCase_ == 7;
|
||||
return extraCase_ == 7;
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
* @return The suiteData.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData getSuiteData() {
|
||||
public emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData getSuiteData() {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_;
|
||||
if (extraCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance();
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
if (extraCase_ == 7) {
|
||||
return suiteDataBuilder_.getMessage();
|
||||
}
|
||||
return emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
public Builder setSuiteData(emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData value) {
|
||||
public Builder setSuiteData(emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData value) {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
gPHOOOLEKGJ_ = value;
|
||||
extra_ = value;
|
||||
onChanged();
|
||||
} else {
|
||||
suiteDataBuilder_.setMessage(value);
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 7;
|
||||
extraCase_ = 7;
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
public Builder setSuiteData(
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.Builder builderForValue) {
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.Builder builderForValue) {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
gPHOOOLEKGJ_ = builderForValue.build();
|
||||
extra_ = builderForValue.build();
|
||||
onChanged();
|
||||
} else {
|
||||
suiteDataBuilder_.setMessage(builderForValue.build());
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 7;
|
||||
extraCase_ = 7;
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
public Builder mergeSuiteData(emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData value) {
|
||||
public Builder mergeSuiteData(emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData value) {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
if (gPHOOOLEKGJCase_ == 7 &&
|
||||
gPHOOOLEKGJ_ != emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance()) {
|
||||
gPHOOOLEKGJ_ = emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.newBuilder((emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_)
|
||||
if (extraCase_ == 7 &&
|
||||
extra_ != emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance()) {
|
||||
extra_ = emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.newBuilder((emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_)
|
||||
.mergeFrom(value).buildPartial();
|
||||
} else {
|
||||
gPHOOOLEKGJ_ = value;
|
||||
extra_ = value;
|
||||
}
|
||||
onChanged();
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
if (extraCase_ == 7) {
|
||||
suiteDataBuilder_.mergeFrom(value);
|
||||
}
|
||||
suiteDataBuilder_.setMessage(value);
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 7;
|
||||
extraCase_ = 7;
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
public Builder clearSuiteData() {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
gPHOOOLEKGJCase_ = 0;
|
||||
gPHOOOLEKGJ_ = null;
|
||||
if (extraCase_ == 7) {
|
||||
extraCase_ = 0;
|
||||
extra_ = null;
|
||||
onChanged();
|
||||
}
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
gPHOOOLEKGJCase_ = 0;
|
||||
gPHOOOLEKGJ_ = null;
|
||||
if (extraCase_ == 7) {
|
||||
extraCase_ = 0;
|
||||
extra_ = null;
|
||||
}
|
||||
suiteDataBuilder_.clear();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.Builder getSuiteDataBuilder() {
|
||||
public emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.Builder getSuiteDataBuilder() {
|
||||
return getSuiteDataFieldBuilder().getBuilder();
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteDataOrBuilder getSuiteDataOrBuilder() {
|
||||
if ((gPHOOOLEKGJCase_ == 7) && (suiteDataBuilder_ != null)) {
|
||||
public emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteDataOrBuilder getSuiteDataOrBuilder() {
|
||||
if ((extraCase_ == 7) && (suiteDataBuilder_ != null)) {
|
||||
return suiteDataBuilder_.getMessageOrBuilder();
|
||||
} else {
|
||||
if (gPHOOOLEKGJCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_;
|
||||
if (extraCase_ == 7) {
|
||||
return (emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_;
|
||||
}
|
||||
return emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance();
|
||||
return emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.SuiteData suite_data = 7;</code>
|
||||
* <code>.HomeMarkPointSuiteData suite_data = 7;</code>
|
||||
*/
|
||||
private com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData, emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.Builder, emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteDataOrBuilder>
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData, emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.Builder, emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteDataOrBuilder>
|
||||
getSuiteDataFieldBuilder() {
|
||||
if (suiteDataBuilder_ == null) {
|
||||
if (!(gPHOOOLEKGJCase_ == 7)) {
|
||||
gPHOOOLEKGJ_ = emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.getDefaultInstance();
|
||||
if (!(extraCase_ == 7)) {
|
||||
extra_ = emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.getDefaultInstance();
|
||||
}
|
||||
suiteDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData, emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData.Builder, emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteDataOrBuilder>(
|
||||
(emu.grasscutter.net.proto.SuiteDataOuterClass.SuiteData) gPHOOOLEKGJ_,
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData, emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData.Builder, emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteDataOrBuilder>(
|
||||
(emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.HomeMarkPointSuiteData) extra_,
|
||||
getParentForChildren(),
|
||||
isClean());
|
||||
gPHOOOLEKGJ_ = null;
|
||||
extra_ = null;
|
||||
}
|
||||
gPHOOOLEKGJCase_ = 7;
|
||||
extraCase_ = 7;
|
||||
onChanged();;
|
||||
return suiteDataBuilder_;
|
||||
}
|
||||
@@ -1388,31 +1396,32 @@ public final class HomeMarkPointFurnitureDataOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n HomeMarkPointFurnitureData.proto\032\014Vect" +
|
||||
"or.proto\032\rNpcData.proto\032\017SuiteData.proto" +
|
||||
"\"\273\001\n\032HomeMarkPointFurnitureData\022\014\n\004guid\030" +
|
||||
"\001 \001(\r\022\023\n\013furnitureId\030\002 \001(\r\022\025\n\rfurnitureT" +
|
||||
"ype\030\003 \001(\r\022\024\n\003pos\030\004 \001(\0132\007.Vector\022\034\n\010npc_d" +
|
||||
"ata\030\006 \001(\0132\010.NpcDataH\000\022 \n\nsuite_data\030\007 \001(" +
|
||||
"\0132\n.SuiteDataH\000B\r\n\013GPHOOOLEKGJB\033\n\031emu.gr" +
|
||||
"asscutter.net.protob\006proto3"
|
||||
"\n HomeMarkPointFurnitureData.proto\032\032Home" +
|
||||
"MarkPointNPCData.proto\032\034HomeMarkPointSui" +
|
||||
"teData.proto\032\014Vector.proto\"\321\001\n\032HomeMarkP" +
|
||||
"ointFurnitureData\022\014\n\004guid\030\001 \001(\r\022\024\n\014furni" +
|
||||
"ture_id\030\002 \001(\r\022\026\n\016furniture_type\030\003 \001(\r\022\024\n" +
|
||||
"\003pos\030\004 \001(\0132\007.Vector\022)\n\010npc_data\030\006 \001(\0132\025." +
|
||||
"HomeMarkPointNPCDataH\000\022-\n\nsuite_data\030\007 \001" +
|
||||
"(\0132\027.HomeMarkPointSuiteDataH\000B\007\n\005extraB\033" +
|
||||
"\n\031emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
new com.google.protobuf.Descriptors.FileDescriptor[] {
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.getDescriptor(),
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.getDescriptor(),
|
||||
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.getDescriptor(),
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.getDescriptor(),
|
||||
});
|
||||
internal_static_HomeMarkPointFurnitureData_descriptor =
|
||||
getDescriptor().getMessageTypes().get(0);
|
||||
internal_static_HomeMarkPointFurnitureData_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_HomeMarkPointFurnitureData_descriptor,
|
||||
new java.lang.String[] { "Guid", "FurnitureId", "FurnitureType", "Pos", "NpcData", "SuiteData", "GPHOOOLEKGJ", });
|
||||
new java.lang.String[] { "Guid", "FurnitureId", "FurnitureType", "Pos", "NpcData", "SuiteData", "Extra", });
|
||||
emu.grasscutter.net.proto.HomeMarkPointNPCDataOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.HomeMarkPointSuiteDataOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.NpcDataOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.SuiteDataOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user