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

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java
+109 -109
View File
@@ -19,36 +19,36 @@ public final class BuyGoodsReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 buy_count = 14;</code>
* <code>uint32 shop_type = 4;</code>
* @return The shopType.
*/
int getShopType();
/**
* <code>uint32 buy_count = 9;</code>
* @return The buyCount.
*/
int getBuyCount();
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
* @return Whether the goods field is set.
*/
boolean hasGoods();
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
* @return The goods.
*/
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
/**
* <code>uint32 shop_type = 11;</code>
* @return The shopType.
*/
int getShopType();
}
/**
* <pre>
* Name: KNMKFMAAMHH
* CmdId: 754
* CmdId: 789
* Name: DPGDGHJEDFH
* </pre>
*
* Protobuf type {@code BuyGoodsReq}
@@ -95,7 +95,17 @@ public final class BuyGoodsReqOuterClass {
case 0:
done = true;
break;
case 42: {
case 32: {
shopType_ = input.readUInt32();
break;
}
case 72: {
buyCount_ = input.readUInt32();
break;
}
case 106: {
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder subBuilder = null;
if (goods_ != null) {
subBuilder = goods_.toBuilder();
@@ -108,16 +118,6 @@ public final class BuyGoodsReqOuterClass {
break;
}
case 88: {
shopType_ = input.readUInt32();
break;
}
case 112: {
buyCount_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -150,10 +150,21 @@ public final class BuyGoodsReqOuterClass {
emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.class, emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.Builder.class);
}
public static final int BUY_COUNT_FIELD_NUMBER = 14;
public static final int SHOP_TYPE_FIELD_NUMBER = 4;
private int shopType_;
/**
* <code>uint32 shop_type = 4;</code>
* @return The shopType.
*/
@java.lang.Override
public int getShopType() {
return shopType_;
}
public static final int BUY_COUNT_FIELD_NUMBER = 9;
private int buyCount_;
/**
* <code>uint32 buy_count = 14;</code>
* <code>uint32 buy_count = 9;</code>
* @return The buyCount.
*/
@java.lang.Override
@@ -161,10 +172,10 @@ public final class BuyGoodsReqOuterClass {
return buyCount_;
}
public static final int GOODS_FIELD_NUMBER = 5;
public static final int GOODS_FIELD_NUMBER = 13;
private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
* @return Whether the goods field is set.
*/
@java.lang.Override
@@ -172,7 +183,7 @@ public final class BuyGoodsReqOuterClass {
return goods_ != null;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
* @return The goods.
*/
@java.lang.Override
@@ -180,24 +191,13 @@ public final class BuyGoodsReqOuterClass {
return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
return getGoods();
}
public static final int SHOP_TYPE_FIELD_NUMBER = 11;
private int shopType_;
/**
* <code>uint32 shop_type = 11;</code>
* @return The shopType.
*/
@java.lang.Override
public int getShopType() {
return shopType_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -212,14 +212,14 @@ public final class BuyGoodsReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (goods_ != null) {
output.writeMessage(5, getGoods());
}
if (shopType_ != 0) {
output.writeUInt32(11, shopType_);
output.writeUInt32(4, shopType_);
}
if (buyCount_ != 0) {
output.writeUInt32(14, buyCount_);
output.writeUInt32(9, buyCount_);
}
if (goods_ != null) {
output.writeMessage(13, getGoods());
}
unknownFields.writeTo(output);
}
@@ -230,17 +230,17 @@ public final class BuyGoodsReqOuterClass {
if (size != -1) return size;
size = 0;
if (goods_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getGoods());
}
if (shopType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, shopType_);
.computeUInt32Size(4, shopType_);
}
if (buyCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, buyCount_);
.computeUInt32Size(9, buyCount_);
}
if (goods_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, getGoods());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -257,6 +257,8 @@ public final class BuyGoodsReqOuterClass {
}
emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq other = (emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq) obj;
if (getShopType()
!= other.getShopType()) return false;
if (getBuyCount()
!= other.getBuyCount()) return false;
if (hasGoods() != other.hasGoods()) return false;
@@ -264,8 +266,6 @@ public final class BuyGoodsReqOuterClass {
if (!getGoods()
.equals(other.getGoods())) return false;
}
if (getShopType()
!= other.getShopType()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -277,14 +277,14 @@ public final class BuyGoodsReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getShopType();
hash = (37 * hash) + BUY_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getBuyCount();
if (hasGoods()) {
hash = (37 * hash) + GOODS_FIELD_NUMBER;
hash = (53 * hash) + getGoods().hashCode();
}
hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getShopType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -382,8 +382,8 @@ public final class BuyGoodsReqOuterClass {
}
/**
* <pre>
* Name: KNMKFMAAMHH
* CmdId: 754
* CmdId: 789
* Name: DPGDGHJEDFH
* </pre>
*
* Protobuf type {@code BuyGoodsReq}
@@ -423,6 +423,8 @@ public final class BuyGoodsReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
shopType_ = 0;
buyCount_ = 0;
if (goodsBuilder_ == null) {
@@ -431,8 +433,6 @@ public final class BuyGoodsReqOuterClass {
goods_ = null;
goodsBuilder_ = null;
}
shopType_ = 0;
return this;
}
@@ -459,13 +459,13 @@ public final class BuyGoodsReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq buildPartial() {
emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq result = new emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq(this);
result.shopType_ = shopType_;
result.buyCount_ = buyCount_;
if (goodsBuilder_ == null) {
result.goods_ = goods_;
} else {
result.goods_ = goodsBuilder_.build();
}
result.shopType_ = shopType_;
onBuilt();
return result;
}
@@ -514,15 +514,15 @@ public final class BuyGoodsReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq other) {
if (other == emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.getDefaultInstance()) return this;
if (other.getShopType() != 0) {
setShopType(other.getShopType());
}
if (other.getBuyCount() != 0) {
setBuyCount(other.getBuyCount());
}
if (other.hasGoods()) {
mergeGoods(other.getGoods());
}
if (other.getShopType() != 0) {
setShopType(other.getShopType());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -552,9 +552,40 @@ public final class BuyGoodsReqOuterClass {
return this;
}
private int shopType_ ;
/**
* <code>uint32 shop_type = 4;</code>
* @return The shopType.
*/
@java.lang.Override
public int getShopType() {
return shopType_;
}
/**
* <code>uint32 shop_type = 4;</code>
* @param value The shopType to set.
* @return This builder for chaining.
*/
public Builder setShopType(int value) {
shopType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 shop_type = 4;</code>
* @return This builder for chaining.
*/
public Builder clearShopType() {
shopType_ = 0;
onChanged();
return this;
}
private int buyCount_ ;
/**
* <code>uint32 buy_count = 14;</code>
* <code>uint32 buy_count = 9;</code>
* @return The buyCount.
*/
@java.lang.Override
@@ -562,7 +593,7 @@ public final class BuyGoodsReqOuterClass {
return buyCount_;
}
/**
* <code>uint32 buy_count = 14;</code>
* <code>uint32 buy_count = 9;</code>
* @param value The buyCount to set.
* @return This builder for chaining.
*/
@@ -573,7 +604,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>uint32 buy_count = 14;</code>
* <code>uint32 buy_count = 9;</code>
* @return This builder for chaining.
*/
public Builder clearBuyCount() {
@@ -587,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 = 5;</code>
* <code>.ShopGoods goods = 13;</code>
* @return Whether the goods field is set.
*/
public boolean hasGoods() {
return goodsBuilder_ != null || goods_ != null;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
* @return The goods.
*/
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
@@ -605,7 +636,7 @@ public final class BuyGoodsReqOuterClass {
}
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
public Builder setGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
if (goodsBuilder_ == null) {
@@ -621,7 +652,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
public Builder setGoods(
emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -635,7 +666,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
public Builder mergeGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
if (goodsBuilder_ == null) {
@@ -653,7 +684,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
public Builder clearGoods() {
if (goodsBuilder_ == null) {
@@ -667,7 +698,7 @@ public final class BuyGoodsReqOuterClass {
return this;
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsBuilder() {
@@ -675,7 +706,7 @@ public final class BuyGoodsReqOuterClass {
return getGoodsFieldBuilder().getBuilder();
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</code>
*/
public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
if (goodsBuilder_ != null) {
@@ -686,7 +717,7 @@ public final class BuyGoodsReqOuterClass {
}
}
/**
* <code>.ShopGoods goods = 5;</code>
* <code>.ShopGoods goods = 13;</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>
@@ -701,37 +732,6 @@ public final class BuyGoodsReqOuterClass {
}
return goodsBuilder_;
}
private int shopType_ ;
/**
* <code>uint32 shop_type = 11;</code>
* @return The shopType.
*/
@java.lang.Override
public int getShopType() {
return shopType_;
}
/**
* <code>uint32 shop_type = 11;</code>
* @param value The shopType to set.
* @return This builder for chaining.
*/
public Builder setShopType(int value) {
shopType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 shop_type = 11;</code>
* @return This builder for chaining.
*/
public Builder clearShopType() {
shopType_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -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\tbuy_count\030\016 \001(\r\022\031\n\005goods\030" +
"\005 \001(\0132\n.ShopGoods\022\021\n\tshop_type\030\013 \001(\rB\033\n\031" +
"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" +
"emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +814,7 @@ public final class BuyGoodsReqOuterClass {
internal_static_BuyGoodsReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BuyGoodsReq_descriptor,
new java.lang.String[] { "BuyCount", "Goods", "ShopType", });
new java.lang.String[] { "ShopType", "BuyCount", "Goods", });
emu.grasscutter.net.proto.ShopGoodsOuterClass.getDescriptor();
}