Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-06 09:14:31 +08:00
Code Issues Projects Releases Wiki Activity

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java
+165 -165
View File
@@ -19,41 +19,41 @@ public final class DropHintNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.Vector position = 6;</code>
* @return Whether the position field is set.
*/
boolean hasPosition();
/**
* <code>.Vector position = 6;</code>
* @return The position.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
/**
* <code>.Vector position = 6;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
/**
* <code>repeated uint32 item_id_list = 12;</code>
* <code>repeated uint32 item_id_list = 10;</code>
* @return A list containing the itemIdList.
*/
java.util.List<java.lang.Integer> getItemIdListList();
/**
* <code>repeated uint32 item_id_list = 12;</code>
* <code>repeated uint32 item_id_list = 10;</code>
* @return The count of itemIdList.
*/
int getItemIdListCount();
/**
* <code>repeated uint32 item_id_list = 12;</code>
* <code>repeated uint32 item_id_list = 10;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
int getItemIdList(int index);
/**
* <code>.Vector position = 7;</code>
* @return Whether the position field is set.
*/
boolean hasPosition();
/**
* <code>.Vector position = 7;</code>
* @return The position.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
/**
* <code>.Vector position = 7;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
}
/**
* <pre>
* CmdId: 633
* Name: EFOOFNIDNMC
* CmdId: 642
* Obf: KGCIHOMNDOG
* </pre>
*
* Protobuf type {@code DropHintNotify}
@@ -102,7 +102,7 @@ public final class DropHintNotifyOuterClass {
case 0:
done = true;
break;
case 50: {
case 58: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (position_ != null) {
subBuilder = position_.toBuilder();
@@ -115,7 +115,7 @@ public final class DropHintNotifyOuterClass {
break;
}
case 96: {
case 80: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -123,7 +123,7 @@ public final class DropHintNotifyOuterClass {
itemIdList_.addInt(input.readUInt32());
break;
}
case 98: {
case 82: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -171,36 +171,10 @@ public final class DropHintNotifyOuterClass {
emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.class, emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.Builder.class);
}
public static final int POSITION_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
/**
* <code>.Vector position = 6;</code>
* @return Whether the position field is set.
*/
@java.lang.Override
public boolean hasPosition() {
return position_ != null;
}
/**
* <code>.Vector position = 6;</code>
* @return The position.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
/**
* <code>.Vector position = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
return getPosition();
}
public static final int ITEM_ID_LIST_FIELD_NUMBER = 12;
public static final int ITEM_ID_LIST_FIELD_NUMBER = 10;
private com.google.protobuf.Internal.IntList itemIdList_;
/**
* <code>repeated uint32 item_id_list = 12;</code>
* <code>repeated uint32 item_id_list = 10;</code>
* @return A list containing the itemIdList.
*/
@java.lang.Override
@@ -209,14 +183,14 @@ public final class DropHintNotifyOuterClass {
return itemIdList_;
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* <code>repeated uint32 item_id_list = 10;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* <code>repeated uint32 item_id_list = 10;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -225,6 +199,32 @@ public final class DropHintNotifyOuterClass {
}
private int itemIdListMemoizedSerializedSize = -1;
public static final int POSITION_FIELD_NUMBER = 7;
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
/**
* <code>.Vector position = 7;</code>
* @return Whether the position field is set.
*/
@java.lang.Override
public boolean hasPosition() {
return position_ != null;
}
/**
* <code>.Vector position = 7;</code>
* @return The position.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
/**
* <code>.Vector position = 7;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
return getPosition();
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -241,10 +241,10 @@ public final class DropHintNotifyOuterClass {
throws java.io.IOException {
getSerializedSize();
if (position_ != null) {
output.writeMessage(6, getPosition());
output.writeMessage(7, getPosition());
}
if (getItemIdListList().size() > 0) {
output.writeUInt32NoTag(98);
output.writeUInt32NoTag(82);
output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
}
for (int i = 0; i < itemIdList_.size(); i++) {
@@ -261,7 +261,7 @@ public final class DropHintNotifyOuterClass {
size = 0;
if (position_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getPosition());
.computeMessageSize(7, getPosition());
}
{
int dataSize = 0;
@@ -292,13 +292,13 @@ public final class DropHintNotifyOuterClass {
}
emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify other = (emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify) obj;
if (!getItemIdListList()
.equals(other.getItemIdListList())) return false;
if (hasPosition() != other.hasPosition()) return false;
if (hasPosition()) {
if (!getPosition()
.equals(other.getPosition())) return false;
}
if (!getItemIdListList()
.equals(other.getItemIdListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -310,14 +310,14 @@ public final class DropHintNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasPosition()) {
hash = (37 * hash) + POSITION_FIELD_NUMBER;
hash = (53 * hash) + getPosition().hashCode();
}
if (getItemIdListCount() > 0) {
hash = (37 * hash) + ITEM_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemIdListList().hashCode();
}
if (hasPosition()) {
hash = (37 * hash) + POSITION_FIELD_NUMBER;
hash = (53 * hash) + getPosition().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -415,8 +415,8 @@ public final class DropHintNotifyOuterClass {
}
/**
* <pre>
* CmdId: 633
* Name: EFOOFNIDNMC
* CmdId: 642
* Obf: KGCIHOMNDOG
* </pre>
*
* Protobuf type {@code DropHintNotify}
@@ -456,14 +456,14 @@ public final class DropHintNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
itemIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
if (positionBuilder_ == null) {
position_ = null;
} else {
position_ = null;
positionBuilder_ = null;
}
itemIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -491,16 +491,16 @@ public final class DropHintNotifyOuterClass {
public emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify buildPartial() {
emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify result = new emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify(this);
int from_bitField0_ = bitField0_;
if (positionBuilder_ == null) {
result.position_ = position_;
} else {
result.position_ = positionBuilder_.build();
}
if (((bitField0_ & 0x00000001) != 0)) {
itemIdList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.itemIdList_ = itemIdList_;
if (positionBuilder_ == null) {
result.position_ = position_;
} else {
result.position_ = positionBuilder_.build();
}
onBuilt();
return result;
}
@@ -549,9 +549,6 @@ public final class DropHintNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify other) {
if (other == emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.getDefaultInstance()) return this;
if (other.hasPosition()) {
mergePosition(other.getPosition());
}
if (!other.itemIdList_.isEmpty()) {
if (itemIdList_.isEmpty()) {
itemIdList_ = other.itemIdList_;
@@ -562,6 +559,9 @@ public final class DropHintNotifyOuterClass {
}
onChanged();
}
if (other.hasPosition()) {
mergePosition(other.getPosition());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -592,18 +592,97 @@ public final class DropHintNotifyOuterClass {
}
private int bitField0_;
private com.google.protobuf.Internal.IntList itemIdList_ = emptyIntList();
private void ensureItemIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
itemIdList_ = mutableCopy(itemIdList_);
bitField0_ |= 0x00000001;
}
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @return A list containing the itemIdList.
*/
public java.util.List<java.lang.Integer>
getItemIdListList() {
return ((bitField0_ & 0x00000001) != 0) ?
java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
public int getItemIdList(int index) {
return itemIdList_.getInt(index);
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @param index The index to set the value at.
* @param value The itemIdList to set.
* @return This builder for chaining.
*/
public Builder setItemIdList(
int index, int value) {
ensureItemIdListIsMutable();
itemIdList_.setInt(index, value);
onChanged();
return this;
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @param value The itemIdList to add.
* @return This builder for chaining.
*/
public Builder addItemIdList(int value) {
ensureItemIdListIsMutable();
itemIdList_.addInt(value);
onChanged();
return this;
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @param values The itemIdList to add.
* @return This builder for chaining.
*/
public Builder addAllItemIdList(
java.lang.Iterable<? extends java.lang.Integer> values) {
ensureItemIdListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, itemIdList_);
onChanged();
return this;
}
/**
* <code>repeated uint32 item_id_list = 10;</code>
* @return This builder for chaining.
*/
public Builder clearItemIdList() {
itemIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_;
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
* @return Whether the position field is set.
*/
public boolean hasPosition() {
return positionBuilder_ != null || position_ != null;
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
* @return The position.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -614,7 +693,7 @@ public final class DropHintNotifyOuterClass {
}
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
*/
public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
@@ -630,7 +709,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
*/
public Builder setPosition(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -644,7 +723,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
*/
public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
@@ -662,7 +741,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
*/
public Builder clearPosition() {
if (positionBuilder_ == null) {
@@ -676,7 +755,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
@@ -684,7 +763,7 @@ public final class DropHintNotifyOuterClass {
return getPositionFieldBuilder().getBuilder();
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
if (positionBuilder_ != null) {
@@ -695,7 +774,7 @@ public final class DropHintNotifyOuterClass {
}
}
/**
* <code>.Vector position = 6;</code>
* <code>.Vector position = 7;</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>
@@ -710,85 +789,6 @@ public final class DropHintNotifyOuterClass {
}
return positionBuilder_;
}
private com.google.protobuf.Internal.IntList itemIdList_ = emptyIntList();
private void ensureItemIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
itemIdList_ = mutableCopy(itemIdList_);
bitField0_ |= 0x00000001;
}
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @return A list containing the itemIdList.
*/
public java.util.List<java.lang.Integer>
getItemIdListList() {
return ((bitField0_ & 0x00000001) != 0) ?
java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
public int getItemIdList(int index) {
return itemIdList_.getInt(index);
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @param index The index to set the value at.
* @param value The itemIdList to set.
* @return This builder for chaining.
*/
public Builder setItemIdList(
int index, int value) {
ensureItemIdListIsMutable();
itemIdList_.setInt(index, value);
onChanged();
return this;
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @param value The itemIdList to add.
* @return This builder for chaining.
*/
public Builder addItemIdList(int value) {
ensureItemIdListIsMutable();
itemIdList_.addInt(value);
onChanged();
return this;
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @param values The itemIdList to add.
* @return This builder for chaining.
*/
public Builder addAllItemIdList(
java.lang.Iterable<? extends java.lang.Integer> values) {
ensureItemIdListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, itemIdList_);
onChanged();
return this;
}
/**
* <code>repeated uint32 item_id_list = 12;</code>
* @return This builder for chaining.
*/
public Builder clearItemIdList() {
itemIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -857,8 +857,8 @@ public final class DropHintNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\024DropHintNotify.proto\032\014Vector.proto\"A\n\016" +
"DropHintNotify\022\031\n\010position\030\006 \001(\0132\007.Vecto" +
"r\022\024\n\014item_id_list\030\014 \003(\rB\033\n\031emu.grasscutt" +
"DropHintNotify\022\024\n\014item_id_list\030\n \003(\r\022\031\n\010" +
"position\030\007 \001(\0132\007.VectorB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -871,7 +871,7 @@ public final class DropHintNotifyOuterClass {
internal_static_DropHintNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DropHintNotify_descriptor,
new java.lang.String[] { "Position", "ItemIdList", });
new java.lang.String[] { "ItemIdList", "Position", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}