Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 06:13:37 +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/BuyGoodsReqOuterClass.java
+52 -52
View File
@@ -19,36 +19,36 @@ public final class BuyGoodsReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 shop_type = 4;</code>
* <code>uint32 shop_type = 2;</code>
* @return The shopType.
*/
int getShopType();
/**
* <code>uint32 buy_count = 9;</code>
* <code>uint32 buy_count = 14;</code>
* @return The buyCount.
*/
int getBuyCount();
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
* @return Whether the goods field is set.
*/
boolean hasGoods();
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
* @return The goods.
*/
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
}
/**
* <pre>
* CmdId: 789
* Name: DPGDGHJEDFH
* CmdId: 702
* Obf: NJMDFFKEJKO
* </pre>
*
* Protobuf type {@code BuyGoodsReq}
@@ -95,17 +95,12 @@ public final class BuyGoodsReqOuterClass {
case 0:
done = true;
break;
case 32: {
case 16: {
shopType_ = input.readUInt32();
break;
}
case 72: {
buyCount_ = input.readUInt32();
break;
}
case 106: {
case 66: {
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder subBuilder = null;
if (goods_ != null) {
subBuilder = goods_.toBuilder();
@@ -118,6 +113,11 @@ public final class BuyGoodsReqOuterClass {
break;
}
case 112: {
buyCount_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -150,10 +150,10 @@ public final class BuyGoodsReqOuterClass {
emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.class, emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.Builder.class);
}
public static final int SHOP_TYPE_FIELD_NUMBER = 4;
public static final int SHOP_TYPE_FIELD_NUMBER = 2;
private int shopType_;
/**
* <code>uint32 shop_type = 4;</code>
* <code>uint32 shop_type = 2;</code>
* @return The shopType.
*/
@java.lang.Override
@@ -161,10 +161,10 @@ public final class BuyGoodsReqOuterClass {
return shopType_;
}
public static final int BUY_COUNT_FIELD_NUMBER = 9;
public static final int BUY_COUNT_FIELD_NUMBER = 14;
private int buyCount_;
/**
* <code>uint32 buy_count = 9;</code>
* <code>uint32 buy_count = 14;</code>
* @return The buyCount.
*/
@java.lang.Override
@@ -172,10 +172,10 @@ public final class BuyGoodsReqOuterClass {
return buyCount_;
}
public static final int GOODS_FIELD_NUMBER = 13;
public static final int GOODS_FIELD_NUMBER = 8;
private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
* @return Whether the goods field is set.
*/
@java.lang.Override
@@ -183,7 +183,7 @@ public final class BuyGoodsReqOuterClass {
return goods_ != null;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
* @return The goods.
*/
@java.lang.Override
@@ -191,7 +191,7 @@ public final class BuyGoodsReqOuterClass {
return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
@@ -213,13 +213,13 @@ public final class BuyGoodsReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (shopType_ != 0) {
output.writeUInt32(4, shopType_);
}
if (buyCount_ != 0) {
output.writeUInt32(9, buyCount_);
output.writeUInt32(2, shopType_);
}
if (goods_ != null) {
output.writeMessage(13, getGoods());
output.writeMessage(8, getGoods());
}
if (buyCount_ != 0) {
output.writeUInt32(14, buyCount_);
}
unknownFields.writeTo(output);
}
@@ -232,15 +232,15 @@ public final class BuyGoodsReqOuterClass {
size = 0;
if (shopType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, shopType_);
}
if (buyCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, buyCount_);
.computeUInt32Size(2, shopType_);
}
if (goods_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, getGoods());
.computeMessageSize(8, getGoods());
}
if (buyCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, buyCount_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -382,8 +382,8 @@ public final class BuyGoodsReqOuterClass {
}
/**
* <pre>
* CmdId: 789
* Name: DPGDGHJEDFH
* CmdId: 702
* Obf: NJMDFFKEJKO
* </pre>
*
* Protobuf type {@code BuyGoodsReq}
@@ -554,7 +554,7 @@ public final class BuyGoodsReqOuterClass {
private int shopType_ ;
/**
* <code>uint32 shop_type = 4;</code>
* <code>uint32 shop_type = 2;</code>
* @return The shopType.
*/
@java.lang.Override
@@ -562,7 +562,7 @@ public final class BuyGoodsReqOuterClass {
return shopType_;
}
/**
* <code>uint32 shop_type = 4;</code>
* <code>uint32 shop_type = 2;</code>
* @param value The shopType to set.
* @return This builder for chaining.
*/
@@ -573,7 +573,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>uint32 shop_type = 4;</code>
* <code>uint32 shop_type = 2;</code>
* @return This builder for chaining.
*/
public Builder clearShopType() {
@@ -585,7 +585,7 @@ public final class BuyGoodsReqOuterClass {
private int buyCount_ ;
/**
* <code>uint32 buy_count = 9;</code>
* <code>uint32 buy_count = 14;</code>
* @return The buyCount.
*/
@java.lang.Override
@@ -593,7 +593,7 @@ public final class BuyGoodsReqOuterClass {
return buyCount_;
}
/**
* <code>uint32 buy_count = 9;</code>
* <code>uint32 buy_count = 14;</code>
* @param value The buyCount to set.
* @return This builder for chaining.
*/
@@ -604,7 +604,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>uint32 buy_count = 9;</code>
* <code>uint32 buy_count = 14;</code>
* @return This builder for chaining.
*/
public Builder clearBuyCount() {
@@ -618,14 +618,14 @@ public final class BuyGoodsReqOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsBuilder_;
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
* @return Whether the goods field is set.
*/
public boolean hasGoods() {
return goodsBuilder_ != null || goods_ != null;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
* @return The goods.
*/
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
@@ -636,7 +636,7 @@ public final class BuyGoodsReqOuterClass {
}
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
public Builder setGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
if (goodsBuilder_ == null) {
@@ -652,7 +652,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
public Builder setGoods(
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -666,7 +666,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
public Builder mergeGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
if (goodsBuilder_ == null) {
@@ -684,7 +684,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
public Builder clearGoods() {
if (goodsBuilder_ == null) {
@@ -698,7 +698,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsBuilder() {
@@ -706,7 +706,7 @@ public final class BuyGoodsReqOuterClass {
return getGoodsFieldBuilder().getBuilder();
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
if (goodsBuilder_ != null) {
@@ -717,7 +717,7 @@ public final class BuyGoodsReqOuterClass {
}
}
/**
* <code>.ShopGoods goods = 13;</code>
* <code>.ShopGoods goods = 8;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder>
@@ -800,8 +800,8 @@ public final class BuyGoodsReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\021BuyGoodsReq.proto\032\017ShopGoods.proto\"N\n\013" +
"BuyGoodsReq\022\021\n\tshop_type\030\004 \001(\r\022\021\n\tbuy_co" +
"unt\030\t \001(\r\022\031\n\005goods\030\r \001(\0132\n.ShopGoodsB\033\n\031" +
"BuyGoodsReq\022\021\n\tshop_type\030\002 \001(\r\022\021\n\tbuy_co" +
"unt\030\016 \001(\r\022\031\n\005goods\030\010 \001(\0132\n.ShopGoodsB\033\n\031" +
"emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor