Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 22:49:56 +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/InferencePageInfoOuterClass.java
+67 -67
View File
@@ -18,12 +18,6 @@ public final class InferencePageInfoOuterClass {
// @@protoc_insertion_point(interface_extends:InferencePageInfo)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 page_id = 2;</code>
* @return The pageId.
*/
int getPageId();
/**
* <code>repeated .InfernceWordInfo unlock_word_list = 15;</code>
*/
@@ -47,10 +41,16 @@ public final class InferencePageInfoOuterClass {
*/
emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder getUnlockWordListOrBuilder(
int index);
/**
* <code>uint32 page_id = 7;</code>
* @return The pageId.
*/
int getPageId();
}
/**
* <pre>
* Name: FNFOEMFBKFF
* Obf: IONBOCLLKIJ
* </pre>
*
* Protobuf type {@code InferencePageInfo}
@@ -99,7 +99,7 @@ public final class InferencePageInfoOuterClass {
case 0:
done = true;
break;
case 16: {
case 56: {
pageId_ = input.readUInt32();
break;
@@ -148,17 +148,6 @@ public final class InferencePageInfoOuterClass {
emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.class, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder.class);
}
public static final int PAGE_ID_FIELD_NUMBER = 2;
private int pageId_;
/**
* <code>uint32 page_id = 2;</code>
* @return The pageId.
*/
@java.lang.Override
public int getPageId() {
return pageId_;
}
public static final int UNLOCK_WORD_LIST_FIELD_NUMBER = 15;
private java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> unlockWordList_;
/**
@@ -199,6 +188,17 @@ public final class InferencePageInfoOuterClass {
return unlockWordList_.get(index);
}
public static final int PAGE_ID_FIELD_NUMBER = 7;
private int pageId_;
/**
* <code>uint32 page_id = 7;</code>
* @return The pageId.
*/
@java.lang.Override
public int getPageId() {
return pageId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -214,7 +214,7 @@ public final class InferencePageInfoOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (pageId_ != 0) {
output.writeUInt32(2, pageId_);
output.writeUInt32(7, pageId_);
}
for (int i = 0; i < unlockWordList_.size(); i++) {
output.writeMessage(15, unlockWordList_.get(i));
@@ -230,7 +230,7 @@ public final class InferencePageInfoOuterClass {
size = 0;
if (pageId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, pageId_);
.computeUInt32Size(7, pageId_);
}
for (int i = 0; i < unlockWordList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
@@ -251,10 +251,10 @@ public final class InferencePageInfoOuterClass {
}
emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo other = (emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo) obj;
if (getPageId()
!= other.getPageId()) return false;
if (!getUnlockWordListList()
.equals(other.getUnlockWordListList())) return false;
if (getPageId()
!= other.getPageId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -266,12 +266,12 @@ public final class InferencePageInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PAGE_ID_FIELD_NUMBER;
hash = (53 * hash) + getPageId();
if (getUnlockWordListCount() > 0) {
hash = (37 * hash) + UNLOCK_WORD_LIST_FIELD_NUMBER;
hash = (53 * hash) + getUnlockWordListList().hashCode();
}
hash = (37 * hash) + PAGE_ID_FIELD_NUMBER;
hash = (53 * hash) + getPageId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -369,7 +369,7 @@ public final class InferencePageInfoOuterClass {
}
/**
* <pre>
* Name: FNFOEMFBKFF
* Obf: IONBOCLLKIJ
* </pre>
*
* Protobuf type {@code InferencePageInfo}
@@ -410,14 +410,14 @@ public final class InferencePageInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
pageId_ = 0;
if (unlockWordListBuilder_ == null) {
unlockWordList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
unlockWordListBuilder_.clear();
}
pageId_ = 0;
return this;
}
@@ -445,7 +445,6 @@ public final class InferencePageInfoOuterClass {
public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo buildPartial() {
emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo result = new emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo(this);
int from_bitField0_ = bitField0_;
result.pageId_ = pageId_;
if (unlockWordListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
unlockWordList_ = java.util.Collections.unmodifiableList(unlockWordList_);
@@ -455,6 +454,7 @@ public final class InferencePageInfoOuterClass {
} else {
result.unlockWordList_ = unlockWordListBuilder_.build();
}
result.pageId_ = pageId_;
onBuilt();
return result;
}
@@ -503,9 +503,6 @@ public final class InferencePageInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo other) {
if (other == emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance()) return this;
if (other.getPageId() != 0) {
setPageId(other.getPageId());
}
if (unlockWordListBuilder_ == null) {
if (!other.unlockWordList_.isEmpty()) {
if (unlockWordList_.isEmpty()) {
@@ -532,6 +529,9 @@ public final class InferencePageInfoOuterClass {
}
}
}
if (other.getPageId() != 0) {
setPageId(other.getPageId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -562,37 +562,6 @@ public final class InferencePageInfoOuterClass {
}
private int bitField0_;
private int pageId_ ;
/**
* <code>uint32 page_id = 2;</code>
* @return The pageId.
*/
@java.lang.Override
public int getPageId() {
return pageId_;
}
/**
* <code>uint32 page_id = 2;</code>
* @param value The pageId to set.
* @return This builder for chaining.
*/
public Builder setPageId(int value) {
pageId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 page_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearPageId() {
pageId_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> unlockWordList_ =
java.util.Collections.emptyList();
private void ensureUnlockWordListIsMutable() {
@@ -832,6 +801,37 @@ public final class InferencePageInfoOuterClass {
}
return unlockWordListBuilder_;
}
private int pageId_ ;
/**
* <code>uint32 page_id = 7;</code>
* @return The pageId.
*/
@java.lang.Override
public int getPageId() {
return pageId_;
}
/**
* <code>uint32 page_id = 7;</code>
* @param value The pageId to set.
* @return This builder for chaining.
*/
public Builder setPageId(int value) {
pageId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 page_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearPageId() {
pageId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -900,9 +900,9 @@ public final class InferencePageInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027InferencePageInfo.proto\032\026InfernceWordI" +
"nfo.proto\"Q\n\021InferencePageInfo\022\017\n\007page_i" +
"d\030\002 \001(\r\022+\n\020unlock_word_list\030\017 \003(\0132\021.Infe" +
"rnceWordInfoB\033\n\031emu.grasscutter.net.prot" +
"nfo.proto\"Q\n\021InferencePageInfo\022+\n\020unlock" +
"_word_list\030\017 \003(\0132\021.InfernceWordInfo\022\017\n\007p" +
"age_id\030\007 \001(\rB\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -915,7 +915,7 @@ public final class InferencePageInfoOuterClass {
internal_static_InferencePageInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_InferencePageInfo_descriptor,
new java.lang.String[] { "PageId", "UnlockWordList", });
new java.lang.String[] { "UnlockWordList", "PageId", });
emu.grasscutter.net.proto.InfernceWordInfoOuterClass.getDescriptor();
}