From a1e9bdd39f62446254580d8074eea959a6a5d17c Mon Sep 17 00:00:00 2001 From: Haru <78084997+imHaruu@users.noreply.github.com> Date: Mon, 23 Sep 2024 22:02:22 +0700 Subject: [PATCH 1/2] Fixed for shop (#107) * Avoid trigger quest * Update BuyGoodsCsReqOuterClass.java --- .../proto/BuyGoodsCsReqOuterClass.java | 210 +++++++++--------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java index b681bbc62..2b506127f 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java @@ -19,24 +19,24 @@ public static final class BuyGoodsCsReq extends ProtoMessage impl private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 4; + * optional uint32 goods_id = 3; */ - private int itemId; + private int goodsId; /** - * optional uint32 goods_id = 5; + * optional uint32 shop_id = 8; */ - private int goodsId; + private int shopId; /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 13; */ private int goodsNum; /** - * optional uint32 shop_id = 13; + * optional uint32 item_id = 15; */ - private int shopId; + private int itemId; private BuyGoodsCsReq() { } @@ -49,81 +49,81 @@ public static BuyGoodsCsReq newInstance() { } /** - * optional uint32 item_id = 4; - * @return whether the itemId field is set + * optional uint32 goods_id = 3; + * @return whether the goodsId field is set */ - public boolean hasItemId() { + public boolean hasGoodsId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 item_id = 4; + * optional uint32 goods_id = 3; * @return this */ - public BuyGoodsCsReq clearItemId() { + public BuyGoodsCsReq clearGoodsId() { bitField0_ &= ~0x00000001; - itemId = 0; + goodsId = 0; return this; } /** - * optional uint32 item_id = 4; - * @return the itemId + * optional uint32 goods_id = 3; + * @return the goodsId */ - public int getItemId() { - return itemId; + public int getGoodsId() { + return goodsId; } /** - * optional uint32 item_id = 4; - * @param value the itemId to set + * optional uint32 goods_id = 3; + * @param value the goodsId to set * @return this */ - public BuyGoodsCsReq setItemId(final int value) { + public BuyGoodsCsReq setGoodsId(final int value) { bitField0_ |= 0x00000001; - itemId = value; + goodsId = value; return this; } /** - * optional uint32 goods_id = 5; - * @return whether the goodsId field is set + * optional uint32 shop_id = 8; + * @return whether the shopId field is set */ - public boolean hasGoodsId() { + public boolean hasShopId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 goods_id = 5; + * optional uint32 shop_id = 8; * @return this */ - public BuyGoodsCsReq clearGoodsId() { + public BuyGoodsCsReq clearShopId() { bitField0_ &= ~0x00000002; - goodsId = 0; + shopId = 0; return this; } /** - * optional uint32 goods_id = 5; - * @return the goodsId + * optional uint32 shop_id = 8; + * @return the shopId */ - public int getGoodsId() { - return goodsId; + public int getShopId() { + return shopId; } /** - * optional uint32 goods_id = 5; - * @param value the goodsId to set + * optional uint32 shop_id = 8; + * @param value the shopId to set * @return this */ - public BuyGoodsCsReq setGoodsId(final int value) { + public BuyGoodsCsReq setShopId(final int value) { bitField0_ |= 0x00000002; - goodsId = value; + shopId = value; return this; } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 13; * @return whether the goodsNum field is set */ public boolean hasGoodsNum() { @@ -131,7 +131,7 @@ public boolean hasGoodsNum() { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 13; * @return this */ public BuyGoodsCsReq clearGoodsNum() { @@ -141,7 +141,7 @@ public BuyGoodsCsReq clearGoodsNum() { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 13; * @return the goodsNum */ public int getGoodsNum() { @@ -149,7 +149,7 @@ public int getGoodsNum() { } /** - * optional uint32 goods_num = 9; + * optional uint32 goods_num = 13; * @param value the goodsNum to set * @return this */ @@ -160,39 +160,39 @@ public BuyGoodsCsReq setGoodsNum(final int value) { } /** - * optional uint32 shop_id = 13; - * @return whether the shopId field is set + * optional uint32 item_id = 15; + * @return whether the itemId field is set */ - public boolean hasShopId() { + public boolean hasItemId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 shop_id = 13; + * optional uint32 item_id = 15; * @return this */ - public BuyGoodsCsReq clearShopId() { + public BuyGoodsCsReq clearItemId() { bitField0_ &= ~0x00000008; - shopId = 0; + itemId = 0; return this; } /** - * optional uint32 shop_id = 13; - * @return the shopId + * optional uint32 item_id = 15; + * @return the itemId */ - public int getShopId() { - return shopId; + public int getItemId() { + return itemId; } /** - * optional uint32 shop_id = 13; - * @param value the shopId to set + * optional uint32 item_id = 15; + * @param value the itemId to set * @return this */ - public BuyGoodsCsReq setShopId(final int value) { + public BuyGoodsCsReq setItemId(final int value) { bitField0_ |= 0x00000008; - shopId = value; + itemId = value; return this; } @@ -201,10 +201,10 @@ public BuyGoodsCsReq copyFrom(final BuyGoodsCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - itemId = other.itemId; goodsId = other.goodsId; - goodsNum = other.goodsNum; shopId = other.shopId; + goodsNum = other.goodsNum; + itemId = other.itemId; } return this; } @@ -215,17 +215,17 @@ public BuyGoodsCsReq mergeFrom(final BuyGoodsCsReq other) { return this; } cachedSize = -1; - if (other.hasItemId()) { - setItemId(other.itemId); - } if (other.hasGoodsId()) { setGoodsId(other.goodsId); } + if (other.hasShopId()) { + setShopId(other.shopId); + } if (other.hasGoodsNum()) { setGoodsNum(other.goodsNum); } - if (other.hasShopId()) { - setShopId(other.shopId); + if (other.hasItemId()) { + setItemId(other.itemId); } return this; } @@ -237,10 +237,10 @@ public BuyGoodsCsReq clear() { } cachedSize = -1; bitField0_ = 0; - itemId = 0; goodsId = 0; - goodsNum = 0; shopId = 0; + goodsNum = 0; + itemId = 0; return this; } @@ -264,29 +264,29 @@ public boolean equals(Object o) { } BuyGoodsCsReq other = (BuyGoodsCsReq) o; return bitField0_ == other.bitField0_ - && (!hasItemId() || itemId == other.itemId) && (!hasGoodsId() || goodsId == other.goodsId) + && (!hasShopId() || shopId == other.shopId) && (!hasGoodsNum() || goodsNum == other.goodsNum) - && (!hasShopId() || shopId == other.shopId); + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(goodsId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(goodsNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(shopId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(itemId); } } @@ -294,16 +294,16 @@ public void writeTo(final ProtoSink output) throws IOException { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -315,36 +315,36 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // itemId - itemId = input.readUInt32(); + case 24: { + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { - // goodsId - goodsId = input.readUInt32(); + case 64: { + // shopId + shopId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { + case 104: { // goodsNum goodsNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { - // shopId - shopId = input.readUInt32(); + case 120: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public BuyGoodsCsReq mergeFrom(final ProtoSource input) throws IOException { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.goodsNum, goodsNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -390,11 +390,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + goodsId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -426,11 +426,11 @@ public BuyGoodsCsReq mergeFrom(final JsonSource input) throws IOException { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public BuyGoodsCsReq create() { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num"); - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); + static final FieldName itemId = FieldName.forField("itemId", "item_id"); } } } From e2925811a2c4cf992a5811781684d9674066f2d6 Mon Sep 17 00:00:00 2001 From: Haru <78084997+imHaruu@users.noreply.github.com> Date: Fri, 4 Oct 2024 04:14:04 +0700 Subject: [PATCH 2/2] Just delete old code (#108) * Avoid trigger quest * Update BuyGoodsCsReqOuterClass.java * Cleanup code --- src/main/java/emu/lunarcore/data/ResourceLoader.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index 6e52bf7c5..11731fd07 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -256,11 +256,6 @@ private static void loadFloorInfos() { GroupInfo group = gson.fromJson(reader, GroupInfo.class); group.setId(simpleGroup.getID()); - // Hacky way to load only groups that arent required for main missions - if (group.getOwnerMainMissionID() > 0 && group.getOwnerMainMissionID() < 2000000) { - continue; - } - // Load groups into the floor info floor.getGroupList().add(group); floor.getGroups().put(simpleGroup.getID(), group);