Update to support 1.6.0

Also fixed some bugs
Melledy · Dec 28, 2023 · caeadbf · caeadbf
1 parent 76dc796
commit caeadbf
Show file tree

Hide file tree

Showing 293 changed files with 16,905 additions and 18,738 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%201.5.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%201.6.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
 <div align="center"><img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Melledy/LunarCore?logo=java&style=for-the-badge"> <img alt="GitHub" src="https://img.shields.io/github/license/Melledy/LunarCore?style=for-the-badge"> <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/Melledy/LunarCore?style=for-the-badge"> <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/Melledy/LunarCore/build.yml?branch=development&logo=github&style=for-the-badge"></div>
 
 <div align="center"><a href="https://discord.gg/cfPKJ6N5hw"><img alt="Discord - Grasscutter" src="https://img.shields.io/discord/1163718404067303444?label=Discord&logo=discord&style=for-the-badge"></a></div>
@@ -18,7 +18,7 @@
 - Mail system
 - Friend system (Assists are not working yet)
 - Forgotten hall
-- Simulated universe (Runs can be finished, but many features are missing)
+-  ~~Simulated universe (Runs can be finished, but many features are missing)~~
 
 # Running the server and client
 

diff --git a/data/Banners.json b/data/Banners.json
@@ -370,5 +370,117 @@
       21000,
       21006
     ]
+  },
+  {
+    "id": 2017,
+    "gachaType": "AvatarUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      1303
+    ],
+    "rateUpItems4": [
+      1001,
+      1202,
+      1214
+    ]
+  },
+  {
+    "id": 3017,
+    "gachaType": "WeaponUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      23019
+    ],
+    "rateUpItems4": [
+      21002,
+      21011,
+      21012
+    ]
+  },
+  {
+    "id": 2018,
+    "gachaType": "AvatarUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      1205
+    ],
+    "rateUpItems4": [
+      1001,
+      1202,
+      1214
+    ]
+  },
+  {
+    "id": 3018,
+    "gachaType": "WeaponUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      23009
+    ],
+    "rateUpItems4": [
+      21002,
+      21011,
+      21012
+    ]
+  },
+  {
+    "id": 2019,
+    "gachaType": "AvatarUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      1305
+    ],
+    "rateUpItems4": [
+      1105,
+      1109,
+      1206
+    ]
+  },
+  {
+    "id": 3019,
+    "gachaType": "WeaponUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      23020
+    ],
+    "rateUpItems4": [
+      21003,
+      21009,
+      21014
+    ]
+  },
+  {
+    "id": 2020,
+    "gachaType": "AvatarUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      1005
+    ],
+    "rateUpItems4": [
+      1105,
+      1109,
+      1206
+    ]
+  },
+  {
+    "id": 3020,
+    "gachaType": "WeaponUp",
+    "beginTime": 0,
+    "endTime": 1924992000,
+    "rateUpItems5": [
+      23006
+    ],
+    "rateUpItems4": [
+      21003,
+      21009,
+      21014
+    ]
   }
 ]
diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java
@@ -19,12 +19,12 @@ public static final class ActivateFarmElementCsReq extends ProtoMessage<Activate
     private static final long serialVersionUID = 0L;
 
     /**
-     * <code>optional uint32 world_level = 10;</code>
+     * <code>optional uint32 world_level = 4;</code>
      */
     private int worldLevel;
 
     /**
-     * <code>optional uint32 entity_id = 13;</code>
+     * <code>optional uint32 entity_id = 6;</code>
      */
     private int entityId;
 
@@ -39,15 +39,15 @@ public static ActivateFarmElementCsReq newInstance() {
     }
 
     /**
-     * <code>optional uint32 world_level = 10;</code>
+     * <code>optional uint32 world_level = 4;</code>
      * @return whether the worldLevel field is set
      */
     public boolean hasWorldLevel() {
       return (bitField0_ & 0x00000001) != 0;
     }
 
     /**
-     * <code>optional uint32 world_level = 10;</code>
+     * <code>optional uint32 world_level = 4;</code>
      * @return this
      */
     public ActivateFarmElementCsReq clearWorldLevel() {
@@ -57,15 +57,15 @@ public ActivateFarmElementCsReq clearWorldLevel() {
     }
 
     /**
-     * <code>optional uint32 world_level = 10;</code>
+     * <code>optional uint32 world_level = 4;</code>
      * @return the worldLevel
      */
     public int getWorldLevel() {
       return worldLevel;
     }
 
     /**
-     * <code>optional uint32 world_level = 10;</code>
+     * <code>optional uint32 world_level = 4;</code>
      * @param value the worldLevel to set
      * @return this
      */
@@ -76,15 +76,15 @@ public ActivateFarmElementCsReq setWorldLevel(final int value) {
     }
 
     /**
-     * <code>optional uint32 entity_id = 13;</code>
+     * <code>optional uint32 entity_id = 6;</code>
      * @return whether the entityId field is set
      */
     public boolean hasEntityId() {
       return (bitField0_ & 0x00000002) != 0;
     }
 
     /**
-     * <code>optional uint32 entity_id = 13;</code>
+     * <code>optional uint32 entity_id = 6;</code>
      * @return this
      */
     public ActivateFarmElementCsReq clearEntityId() {
@@ -94,15 +94,15 @@ public ActivateFarmElementCsReq clearEntityId() {
     }
 
     /**
-     * <code>optional uint32 entity_id = 13;</code>
+     * <code>optional uint32 entity_id = 6;</code>
      * @return the entityId
      */
     public int getEntityId() {
       return entityId;
     }
 
     /**
-     * <code>optional uint32 entity_id = 13;</code>
+     * <code>optional uint32 entity_id = 6;</code>
      * @param value the entityId to set
      * @return this
      */
@@ -177,11 +177,11 @@ public boolean equals(Object o) {
     @Override
     public void writeTo(final ProtoSink output) throws IOException {
       if ((bitField0_ & 0x00000001) != 0) {
-        output.writeRawByte((byte) 80);
+        output.writeRawByte((byte) 32);
         output.writeUInt32NoTag(worldLevel);
       }
       if ((bitField0_ & 0x00000002) != 0) {
-        output.writeRawByte((byte) 104);
+        output.writeRawByte((byte) 48);
         output.writeUInt32NoTag(entityId);
       }
     }
@@ -205,16 +205,16 @@ public ActivateFarmElementCsReq mergeFrom(final ProtoSource input) throws IOExce
       int tag = input.readTag();
       while (true) {
         switch (tag) {
-          case 80: {
+          case 32: {
             // worldLevel
             worldLevel = input.readUInt32();
             bitField0_ |= 0x00000001;
             tag = input.readTag();
-            if (tag != 104) {
+            if (tag != 48) {
               break;
             }
           }
-          case 104: {
+          case 48: {
             // entityId
             entityId = input.readUInt32();
             bitField0_ |= 0x00000002;