Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 12:53:34 +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/HomeResourceOuterClass.java
+85 -85
View File
@@ -19,7 +19,13 @@ public final class HomeResourceOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>fixed32 next_refresh_time = 9;</code>
* <code>uint32 store_value = 4;</code>
* @return The storeValue.
*/
int getStoreValue();
/**
* <code>fixed32 next_refresh_time = 5;</code>
* @return The nextRefreshTime.
*/
int getNextRefreshTime();
@@ -29,16 +35,10 @@ public final class HomeResourceOuterClass {
* @return The storeLimit.
*/
int getStoreLimit();
/**
* <code>uint32 store_value = 10;</code>
* @return The storeValue.
*/
int getStoreValue();
}
/**
* <pre>
* Name: LDMGBIGBOLN
* Obf: KEJFFCAKLNH
* </pre>
*
* Protobuf type {@code HomeResource}
@@ -85,16 +85,16 @@ public final class HomeResourceOuterClass {
case 0:
done = true;
break;
case 77: {
nextRefreshTime_ = input.readFixed32();
break;
}
case 80: {
case 32: {
storeValue_ = input.readUInt32();
break;
}
case 45: {
nextRefreshTime_ = input.readFixed32();
break;
}
case 104: {
storeLimit_ = input.readUInt32();
@@ -132,10 +132,21 @@ public final class HomeResourceOuterClass {
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.class, emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.Builder.class);
}
public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 9;
public static final int STORE_VALUE_FIELD_NUMBER = 4;
private int storeValue_;
/**
* <code>uint32 store_value = 4;</code>
* @return The storeValue.
*/
@java.lang.Override
public int getStoreValue() {
return storeValue_;
}
public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 5;
private int nextRefreshTime_;
/**
* <code>fixed32 next_refresh_time = 9;</code>
* <code>fixed32 next_refresh_time = 5;</code>
* @return The nextRefreshTime.
*/
@java.lang.Override
@@ -154,17 +165,6 @@ public final class HomeResourceOuterClass {
return storeLimit_;
}
public static final int STORE_VALUE_FIELD_NUMBER = 10;
private int storeValue_;
/**
* <code>uint32 store_value = 10;</code>
* @return The storeValue.
*/
@java.lang.Override
public int getStoreValue() {
return storeValue_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -179,11 +179,11 @@ public final class HomeResourceOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (nextRefreshTime_ != 0) {
output.writeFixed32(9, nextRefreshTime_);
}
if (storeValue_ != 0) {
output.writeUInt32(10, storeValue_);
output.writeUInt32(4, storeValue_);
}
if (nextRefreshTime_ != 0) {
output.writeFixed32(5, nextRefreshTime_);
}
if (storeLimit_ != 0) {
output.writeUInt32(13, storeLimit_);
@@ -197,13 +197,13 @@ public final class HomeResourceOuterClass {
if (size != -1) return size;
size = 0;
if (nextRefreshTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeFixed32Size(9, nextRefreshTime_);
}
if (storeValue_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, storeValue_);
.computeUInt32Size(4, storeValue_);
}
if (nextRefreshTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeFixed32Size(5, nextRefreshTime_);
}
if (storeLimit_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -224,12 +224,12 @@ public final class HomeResourceOuterClass {
}
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource other = (emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource) obj;
if (getStoreValue()
!= other.getStoreValue()) return false;
if (getNextRefreshTime()
!= other.getNextRefreshTime()) return false;
if (getStoreLimit()
!= other.getStoreLimit()) return false;
if (getStoreValue()
!= other.getStoreValue()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,12 +241,12 @@ public final class HomeResourceOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + STORE_VALUE_FIELD_NUMBER;
hash = (53 * hash) + getStoreValue();
hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
hash = (53 * hash) + getNextRefreshTime();
hash = (37 * hash) + STORE_LIMIT_FIELD_NUMBER;
hash = (53 * hash) + getStoreLimit();
hash = (37 * hash) + STORE_VALUE_FIELD_NUMBER;
hash = (53 * hash) + getStoreValue();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -344,7 +344,7 @@ public final class HomeResourceOuterClass {
}
/**
* <pre>
* Name: LDMGBIGBOLN
* Obf: KEJFFCAKLNH
* </pre>
*
* Protobuf type {@code HomeResource}
@@ -384,12 +384,12 @@ public final class HomeResourceOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
storeValue_ = 0;
nextRefreshTime_ = 0;
storeLimit_ = 0;
storeValue_ = 0;
return this;
}
@@ -416,9 +416,9 @@ public final class HomeResourceOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource buildPartial() {
emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource result = new emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource(this);
result.storeValue_ = storeValue_;
result.nextRefreshTime_ = nextRefreshTime_;
result.storeLimit_ = storeLimit_;
result.storeValue_ = storeValue_;
onBuilt();
return result;
}
@@ -467,15 +467,15 @@ public final class HomeResourceOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource other) {
if (other == emu.grasscutter.net.proto.HomeResourceOuterClass.HomeResource.getDefaultInstance()) return this;
if (other.getStoreValue() != 0) {
setStoreValue(other.getStoreValue());
}
if (other.getNextRefreshTime() != 0) {
setNextRefreshTime(other.getNextRefreshTime());
}
if (other.getStoreLimit() != 0) {
setStoreLimit(other.getStoreLimit());
}
if (other.getStoreValue() != 0) {
setStoreValue(other.getStoreValue());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -505,9 +505,40 @@ public final class HomeResourceOuterClass {
return this;
}
private int storeValue_ ;
/**
* <code>uint32 store_value = 4;</code>
* @return The storeValue.
*/
@java.lang.Override
public int getStoreValue() {
return storeValue_;
}
/**
* <code>uint32 store_value = 4;</code>
* @param value The storeValue to set.
* @return This builder for chaining.
*/
public Builder setStoreValue(int value) {
storeValue_ = value;
onChanged();
return this;
}
/**
* <code>uint32 store_value = 4;</code>
* @return This builder for chaining.
*/
public Builder clearStoreValue() {
storeValue_ = 0;
onChanged();
return this;
}
private int nextRefreshTime_ ;
/**
* <code>fixed32 next_refresh_time = 9;</code>
* <code>fixed32 next_refresh_time = 5;</code>
* @return The nextRefreshTime.
*/
@java.lang.Override
@@ -515,7 +546,7 @@ public final class HomeResourceOuterClass {
return nextRefreshTime_;
}
/**
* <code>fixed32 next_refresh_time = 9;</code>
* <code>fixed32 next_refresh_time = 5;</code>
* @param value The nextRefreshTime to set.
* @return This builder for chaining.
*/
@@ -526,7 +557,7 @@ public final class HomeResourceOuterClass {
return this;
}
/**
* <code>fixed32 next_refresh_time = 9;</code>
* <code>fixed32 next_refresh_time = 5;</code>
* @return This builder for chaining.
*/
public Builder clearNextRefreshTime() {
@@ -566,37 +597,6 @@ public final class HomeResourceOuterClass {
onChanged();
return this;
}
private int storeValue_ ;
/**
* <code>uint32 store_value = 10;</code>
* @return The storeValue.
*/
@java.lang.Override
public int getStoreValue() {
return storeValue_;
}
/**
* <code>uint32 store_value = 10;</code>
* @param value The storeValue to set.
* @return This builder for chaining.
*/
public Builder setStoreValue(int value) {
storeValue_ = value;
onChanged();
return this;
}
/**
* <code>uint32 store_value = 10;</code>
* @return This builder for chaining.
*/
public Builder clearStoreValue() {
storeValue_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -664,9 +664,9 @@ public final class HomeResourceOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\022HomeResource.proto\"S\n\014HomeResource\022\031\n\021" +
"next_refresh_time\030\t \001(\007\022\023\n\013store_limit\030\r" +
" \001(\r\022\023\n\013store_value\030\n \001(\rB\033\n\031emu.grasscu" +
"\n\022HomeResource.proto\"S\n\014HomeResource\022\023\n\013" +
"store_value\030\004 \001(\r\022\031\n\021next_refresh_time\030\005" +
" \001(\007\022\023\n\013store_limit\030\r \001(\rB\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +678,7 @@ public final class HomeResourceOuterClass {
internal_static_HomeResource_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeResource_descriptor,
new java.lang.String[] { "NextRefreshTime", "StoreLimit", "StoreValue", });
new java.lang.String[] { "StoreValue", "NextRefreshTime", "StoreLimit", });
}
// @@protoc_insertion_point(outer_class_scope)