Merge unstable into development (#2173)

* Remove more scene synchronized * Fix worktop options not appearing * Format code [skip actions] * Fix delay with server tasks * Format code [skip actions] * Fully fix fairy clock (#2146) * Fix scene transition * fully fix fairy clock * Re-add call to `Player#updatePlayerGameTime` * Format code [skip actions] * Initialize the script loader in `ResourceLoader#loadAll` * Fix region removal checking * Format code [skip actions] * Use Lombok's `EqualsAndHashCode` for comparing scene regions * Format code [skip actions] * Move 'invalid gather object' to `trace` * Add more information to the 'unknown condition handler' message * Move invalid ability action to trace * Make `KcpTunnel` public * Validate the NPC being talked to * Format code [skip actions] * NPCs are not spawned server side; change logic to handle it * Format code [skip actions] * unload scene when there are no players (#2147) * unload scene when there are no players * Update src/main/java/emu/grasscutter/game/world/Scene.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Check if a command should be copied or HTTP should be used * Lint Code [skip actions] * Fix character names rendering incorrectly * Add basic troubleshooting command * Implement handbook teleporting also a few formatting changes and sort data by logical sense * Fix listener `ConcurrentModificationException` issue * Add color change to `Join the Community!` * Lint Code [skip actions] * Make clickable buttons appear clickable * Remove 'Mechanicus' entities from the list of entities * Format code [skip actions] * Fix going back returning a blank screen * Implement entity spawning * Add setting level to entity card * Add support for 'plain text' mode * Make descriptions of objects scrollable * Lint Code [skip actions] * Format code [skip actions] * Change the way existing hooks work * Format code [skip actions] * Upgrade Javalin to 5.5.0 & Fix project warnings * Upgrade logging libraries * Fix gacha mappings static file issue * Add temporary backwards compatability for `ServerHelper` * Format code [skip actions] * Remove artifact signatures from VCS * Fix forge queue data protocol definition * Run `spotlessApply` * Format code [skip actions] * Download data required for building artifacts * Add call for Facebook logins * Add the wiki page as a submodule * Format code [skip actions] * Update translation (#2150) * Update translation * Update translation * Separate the dispatch and game servers (pt. 1) gacha is still broken, handbook still needs to be done * Format code [skip actions] * Separate the dispatch and game servers (pt. 2) this commit fixes the gacha page * Add description for '/troubleshoot' * Set default avatar talent level to 10 * Separate the dispatch and game servers (pt. 3) implement handbook across servers! * Format code [skip actions] * Update GitHub Actions to use 'download-file' over 'wget' * Gm handbook lmao (#2149) * Fix font issue * Fix avatars * Fix text overflow in commands * Fix virtualized lists and items page 😭😭 * magix why 💀 * use hover style in all minicards * button * remove console.log * lint * Add icons * magix asked * Fix overflow padding issue * Fix achievement text overflow * remove icons from repo * Change command icon * Add the wiki page as a submodule * total magix moment * fix text overflow in commands * Fix discord button * Make text scale on Minicard * import icons and font from another source * Add hover effects to siebar buttons * move font and readme to submodule repo * Make data folder a submodule * import icons and font from data submodule * Update README.md * total magix moment * magix moment v2 * submodule change * Import `.webp` files * Resize `HomeButton` * Fix 'Copy Command' reappearing after changing pages --------- Co-authored-by: KingRainbow44 <kobedo11@gmail.com> * Lint Code [skip actions] * Download data for the build, not for the lint * format imports this is really just to see if build handbook works kek * Implement proper handbook authentication (pt. 1) * Implement proper handbook authentication (pt. 2) * Format code [skip actions] * Add quest data dumping for the handbook * Change colors to fit _something suitable_ * Format code [skip actions] * Fix force pushing to branches after linting * Fix logic of `SetPlayerPropReq` * Move more group loading to `trace` * Add handbook IP authentication in hybrid mode * Fix player level up not displaying on the client properly * Format code [skip actions] * Fix game time locking * Format code [skip actions] * Update player properties * Format code [skip actions] * Move `warn`s for groups to `debug` * Fix player pausing * Move more logs to `trace` * Use `removeItemById` for deleting items via quests * Clean up logger more * Pause in-game time when the world is paused * Format code [skip actions] * More player property documentation * Multi-threaded resource loading * Format code [skip actions] * Add quest widgets * Add quests page (basic impl.) * Add/fix colors also fix tailwind * Remove banned packets client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted * Re-add `BeginCameraSceneLookNotify` * Fix being unable to attack (#2157) * Add `PlayerOpenChestEvent` * Add methods to get players from the server * Add static methods to register an event handler * Add `PlayerEnterDungeonEvent` * Remove legacy documentation from `PlayerMoveEvent` * Add `PlayerChatEvent` * Add defaults to `Position` * Clean up `.utils` * Revert `Multi-threaded resource loading` * Fix changing target UID when talking to the server * Lint Code [skip actions] * Format code [skip actions] * fix NPC talk triggering main quest in 46101 (#2158) Make it so that only talks where the param matches the talkId are checked. * Format code [skip actions] * Partially fix Chasing Shadows (#2159) * Partially fix Chasing Shadows * Go ahead and move it before the return before Magix tells me to. * Format code [skip actions] * Bring back period lol (#2160) * Disable SNI for the HTTPS server * Add `EntityCreationEvent` * Add initial startup message this is so the server appears like its preparing to start * Format code [skip actions] * Enable debug mode for plugin loggers if enabled for the primary logger * Add documentation about `WorldAreaConfigData` * Make more fields in excels accessible * Remove deprecated fields from `GetShopRsp` * Run `spotlessApply` on definitions * Add `PlayerEnterAreaEvent` * Optimize event calls * Fix event invokes * Format code [skip actions] * Remove manual autofinish for main quests. (#2162) * Add world areas to the textmap cache * Format code [skip actions] * Don't overdefine variables in extended classes (#2163) * Add dumper for world areas * Format code [skip actions] * instantiate personalLineList (#2165) * Fix protocol definitions thank you Nazrin! (+ hiro for raw definitions) * Fix the background color leaking from the character widget * Change HTML spacing to 2 spaces * Implement hiding widgets * Change scrollbar to a vibrant color * Add _some_ scaling to the home buttons and its text * Build the handbook with Gradle * Fix the 'finer details' with the handbook UI * Lint Code [skip actions] * Fix target destination for the Gradle-built handbook * Implement fetching a player across servers & Add a chainable JsonObject useful for plugins! might be used in grasscutter eventually * Fix GitHub actions * Fix event calling & canceling * Run `spotlessApply` * Rename fields (might be wrong) * Add/update all/more protocol definitions * Add/update all/more protocol definitions * Remove outdated packet * Fix protocol definitions * Format code [skip actions] * Implement some lua variables for less console spam (#2172) * Implement some lua variables for less console spam * Add GetHostQuestState This fixes some chapter 3 stuff. * Format code [skip actions] * Fix merge import * Format code [skip actions] * Fully fix fairy clock for real this time (#2167) * Fully fix fairy clock For real this time * Make it so relogging keeps the time lock state. * Refactor out questLockTime * Per Hartie, the client packet needs to be changed too * Update src/main/java/emu/grasscutter/game/world/World.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java * Remove all code not needed to get clock working --------- Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> * Implement a proper ability system (#2166) * Apply fix `21dec2fe` * Apply fix `89d01d5f` * Apply fix `d900f154` this one was already implemented; updated to use call from previous commit * Ability changing commit TODO: change info to debug * Remove use of deprecated methods/fields * Temp commit v2 (Adding LoseHP and some fixes) * Oopsie * Probably fix monster battle * Fix issue with reflecting into fields * Fix some things * Fix ability names for 3.6 resources * Improve logging --------- Co-authored-by: StartForKiller <jesussanz2003@gmail.com> * Format code [skip actions] * Add system for sending messages between servers * Format some code * Remove protocol definitions from Spotless * Default debug to false; enable with `-debug` * Implement completely useless global value copying * HACK: Return the avatar which holds the weapon when the weapon is referred to by ID * Add properties to `AbilityModifier` * Change the way HTML is served after authentication * Use thread executors to speed up the database loading process * Format code [skip actions] * Add system for setting handbook address and port * Lint Code [skip actions] * Format code [skip actions] * Fix game-related data not saving * Format code [skip actions] * Fix handbook server details * Lint Code [skip actions] * Format code [skip actions] * Use the headers provided by a context to get the IP address should acknowledge #1975 * Format code [skip actions] * Move more logs to `trace` * Format code [skip actions] * more trace * Fix something and implement weapon entities * Format code [skip actions] * Fix `EntityWeapon` * Remove deprecated API & Fix resource checking * Fix unnecessary warning for first-time setup * Implement handbook request limiting * Format code [skip actions] * Fix new avatar weapons being null * Format code [skip actions] * Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met * Load activity config on server startup * Require plugins to specify an API version and match with the server * Add default open state ignore list * Format code [skip actions] * Quick fix for questing, needs more investigation This would make the questing work again * Remove existing hack for 35303 * Fix ignored open states from being set * Format code [skip actions] * fix the stupidest bug ive ever seen * Optimize player kicking on server close * Format code [skip actions] * Re-add hack to fix 35303 * Update GitHub actions * Format code [skip actions] * Potentially fix issues with regions * Download additional handbook data * Revert "Potentially fix issues with regions" This reverts commit 84e3823695. --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: scooterboo <lewasite@yahoo.com> Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com> Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com> Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2026-05-27 04:09:51 +08:00 · 2023-05-31 20:48:16 -07:00
parent f46fd372d2
commit 9e5b57a043
3839 changed files with 1841548 additions and 37533 deletions
@@ -19,31 +19,31 @@ public final class CoopPointOuterClass {
      com.google.protobuf.MessageOrBuilder {

    /**
-     * <code>uint32 id = 15;</code>
+     * <code>uint32 self_confidence = 9;</code>
+     * @return The selfConfidence.
+     */
+    int getSelfConfidence();
+
+    /**
+     * <code>uint32 id = 11;</code>
     * @return The id.
     */
    int getId();

    /**
-     * <code>.CoopPoint.State state = 4;</code>
+     * <code>.CoopPoint.State state = 14;</code>
     * @return The enum numeric value on the wire for state.
     */
    int getStateValue();
    /**
-     * <code>.CoopPoint.State state = 4;</code>
+     * <code>.CoopPoint.State state = 14;</code>
     * @return The state.
     */
    emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State getState();
-
-    /**
-     * <code>uint32 self_confidence = 8;</code>
-     * @return The selfConfidence.
-     */
-    int getSelfConfidence();
  }
  /**
   * <pre>
-   * Name: GINFLDADAOO
+   * Obf: COOPFICDPBH
   * </pre>
   *
   * Protobuf type {@code CoopPoint}
@@ -91,22 +91,22 @@ public final class CoopPointOuterClass {
            case 0:
              done = true;
              break;
-            case 32: {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
-            case 64: {
+            case 72: {

              selfConfidence_ = input.readUInt32();
              break;
            }
-            case 120: {
+            case 88: {

              id_ = input.readUInt32();
              break;
            }
+            case 112: {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
+              break;
+            }
            default: {
              if (!parseUnknownField(
                  input, unknownFields, extensionRegistry, tag)) {
@@ -141,7 +141,7 @@ public final class CoopPointOuterClass {

    /**
     * <pre>
-     * Name: CLMHLFCKFLK
+     * Obf: EPLCHMLHLBA
     * </pre>
     *
     * Protobuf enum {@code CoopPoint.State}
@@ -260,10 +260,21 @@ public final class CoopPointOuterClass {
      // @@protoc_insertion_point(enum_scope:CoopPoint.State)
    }

-    public static final int ID_FIELD_NUMBER = 15;
+    public static final int SELF_CONFIDENCE_FIELD_NUMBER = 9;
+    private int selfConfidence_;
+    /**
+     * <code>uint32 self_confidence = 9;</code>
+     * @return The selfConfidence.
+     */
+    @java.lang.Override
+    public int getSelfConfidence() {
+      return selfConfidence_;
+    }
+
+    public static final int ID_FIELD_NUMBER = 11;
    private int id_;
    /**
-     * <code>uint32 id = 15;</code>
+     * <code>uint32 id = 11;</code>
     * @return The id.
     */
    @java.lang.Override
@@ -271,17 +282,17 @@ public final class CoopPointOuterClass {
      return id_;
    }

-    public static final int STATE_FIELD_NUMBER = 4;
+    public static final int STATE_FIELD_NUMBER = 14;
    private int state_;
    /**
-     * <code>.CoopPoint.State state = 4;</code>
+     * <code>.CoopPoint.State state = 14;</code>
     * @return The enum numeric value on the wire for state.
     */
    @java.lang.Override public int getStateValue() {
      return state_;
    }
    /**
-     * <code>.CoopPoint.State state = 4;</code>
+     * <code>.CoopPoint.State state = 14;</code>
     * @return The state.
     */
    @java.lang.Override public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State getState() {
@@ -290,17 +301,6 @@ public final class CoopPointOuterClass {
      return result == null ? emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.UNRECOGNIZED : result;
    }

-    public static final int SELF_CONFIDENCE_FIELD_NUMBER = 8;
-    private int selfConfidence_;
-    /**
-     * <code>uint32 self_confidence = 8;</code>
-     * @return The selfConfidence.
-     */
-    @java.lang.Override
-    public int getSelfConfidence() {
-      return selfConfidence_;
-    }
-
    private byte memoizedIsInitialized = -1;
    @java.lang.Override
    public final boolean isInitialized() {
@@ -315,14 +315,14 @@ public final class CoopPointOuterClass {
    @java.lang.Override
    public void writeTo(com.google.protobuf.CodedOutputStream output)
                        throws java.io.IOException {
-      if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.STATE_UNSTARTED.getNumber()) {
-        output.writeEnum(4, state_);
-      }
      if (selfConfidence_ != 0) {
-        output.writeUInt32(8, selfConfidence_);
+        output.writeUInt32(9, selfConfidence_);
      }
      if (id_ != 0) {
-        output.writeUInt32(15, id_);
+        output.writeUInt32(11, id_);
+      }
+      if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.STATE_UNSTARTED.getNumber()) {
+        output.writeEnum(14, state_);
      }
      unknownFields.writeTo(output);
    }
@@ -333,17 +333,17 @@ public final class CoopPointOuterClass {
      if (size != -1) return size;

      size = 0;
-      if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.STATE_UNSTARTED.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, state_);
-      }
      if (selfConfidence_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, selfConfidence_);
+          .computeUInt32Size(9, selfConfidence_);
      }
      if (id_ != 0) {
        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, id_);
+          .computeUInt32Size(11, id_);
+      }
+      if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.STATE_UNSTARTED.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(14, state_);
      }
      size += unknownFields.getSerializedSize();
      memoizedSize = size;
@@ -360,11 +360,11 @@ public final class CoopPointOuterClass {
      }
      emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint other = (emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint) obj;

+      if (getSelfConfidence()
+          != other.getSelfConfidence()) return false;
      if (getId()
          != other.getId()) return false;
      if (state_ != other.state_) return false;
-      if (getSelfConfidence()
-          != other.getSelfConfidence()) return false;
      if (!unknownFields.equals(other.unknownFields)) return false;
      return true;
    }
@@ -376,12 +376,12 @@ public final class CoopPointOuterClass {
      }
      int hash = 41;
      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SELF_CONFIDENCE_FIELD_NUMBER;
+      hash = (53 * hash) + getSelfConfidence();
      hash = (37 * hash) + ID_FIELD_NUMBER;
      hash = (53 * hash) + getId();
      hash = (37 * hash) + STATE_FIELD_NUMBER;
      hash = (53 * hash) + state_;
-      hash = (37 * hash) + SELF_CONFIDENCE_FIELD_NUMBER;
-      hash = (53 * hash) + getSelfConfidence();
      hash = (29 * hash) + unknownFields.hashCode();
      memoizedHashCode = hash;
      return hash;
@@ -479,7 +479,7 @@ public final class CoopPointOuterClass {
    }
    /**
     * <pre>
-     * Name: GINFLDADAOO
+     * Obf: COOPFICDPBH
     * </pre>
     *
     * Protobuf type {@code CoopPoint}
@@ -519,12 +519,12 @@ public final class CoopPointOuterClass {
      @java.lang.Override
      public Builder clear() {
        super.clear();
+        selfConfidence_ = 0;
+
        id_ = 0;

        state_ = 0;

-        selfConfidence_ = 0;
-
        return this;
      }

@@ -551,9 +551,9 @@ public final class CoopPointOuterClass {
      @java.lang.Override
      public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint buildPartial() {
        emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint result = new emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint(this);
+        result.selfConfidence_ = selfConfidence_;
        result.id_ = id_;
        result.state_ = state_;
-        result.selfConfidence_ = selfConfidence_;
        onBuilt();
        return result;
      }
@@ -602,15 +602,15 @@ public final class CoopPointOuterClass {

      public Builder mergeFrom(emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint other) {
        if (other == emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.getDefaultInstance()) return this;
+        if (other.getSelfConfidence() != 0) {
+          setSelfConfidence(other.getSelfConfidence());
+        }
        if (other.getId() != 0) {
          setId(other.getId());
        }
        if (other.state_ != 0) {
          setStateValue(other.getStateValue());
        }
-        if (other.getSelfConfidence() != 0) {
-          setSelfConfidence(other.getSelfConfidence());
-        }
        this.mergeUnknownFields(other.unknownFields);
        onChanged();
        return this;
@@ -640,9 +640,40 @@ public final class CoopPointOuterClass {
        return this;
      }

+      private int selfConfidence_ ;
+      /**
+       * <code>uint32 self_confidence = 9;</code>
+       * @return The selfConfidence.
+       */
+      @java.lang.Override
+      public int getSelfConfidence() {
+        return selfConfidence_;
+      }
+      /**
+       * <code>uint32 self_confidence = 9;</code>
+       * @param value The selfConfidence to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSelfConfidence(int value) {
+        
+        selfConfidence_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 self_confidence = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSelfConfidence() {
+        
+        selfConfidence_ = 0;
+        onChanged();
+        return this;
+      }
+
      private int id_ ;
      /**
-       * <code>uint32 id = 15;</code>
+       * <code>uint32 id = 11;</code>
       * @return The id.
       */
      @java.lang.Override
@@ -650,7 +681,7 @@ public final class CoopPointOuterClass {
        return id_;
      }
      /**
-       * <code>uint32 id = 15;</code>
+       * <code>uint32 id = 11;</code>
       * @param value The id to set.
       * @return This builder for chaining.
       */
@@ -661,7 +692,7 @@ public final class CoopPointOuterClass {
        return this;
      }
      /**
-       * <code>uint32 id = 15;</code>
+       * <code>uint32 id = 11;</code>
       * @return This builder for chaining.
       */
      public Builder clearId() {
@@ -673,14 +704,14 @@ public final class CoopPointOuterClass {

      private int state_ = 0;
      /**
-       * <code>.CoopPoint.State state = 4;</code>
+       * <code>.CoopPoint.State state = 14;</code>
       * @return The enum numeric value on the wire for state.
       */
      @java.lang.Override public int getStateValue() {
        return state_;
      }
      /**
-       * <code>.CoopPoint.State state = 4;</code>
+       * <code>.CoopPoint.State state = 14;</code>
       * @param value The enum numeric value on the wire for state to set.
       * @return This builder for chaining.
       */
@@ -691,7 +722,7 @@ public final class CoopPointOuterClass {
        return this;
      }
      /**
-       * <code>.CoopPoint.State state = 4;</code>
+       * <code>.CoopPoint.State state = 14;</code>
       * @return The state.
       */
      @java.lang.Override
@@ -701,7 +732,7 @@ public final class CoopPointOuterClass {
        return result == null ? emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.UNRECOGNIZED : result;
      }
      /**
-       * <code>.CoopPoint.State state = 4;</code>
+       * <code>.CoopPoint.State state = 14;</code>
       * @param value The state to set.
       * @return This builder for chaining.
       */
@@ -715,7 +746,7 @@ public final class CoopPointOuterClass {
        return this;
      }
      /**
-       * <code>.CoopPoint.State state = 4;</code>
+       * <code>.CoopPoint.State state = 14;</code>
       * @return This builder for chaining.
       */
      public Builder clearState() {
@@ -724,37 +755,6 @@ public final class CoopPointOuterClass {
        onChanged();
        return this;
      }
-
-      private int selfConfidence_ ;
-      /**
-       * <code>uint32 self_confidence = 8;</code>
-       * @return The selfConfidence.
-       */
-      @java.lang.Override
-      public int getSelfConfidence() {
-        return selfConfidence_;
-      }
-      /**
-       * <code>uint32 self_confidence = 8;</code>
-       * @param value The selfConfidence to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSelfConfidence(int value) {
-        
-        selfConfidence_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 self_confidence = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSelfConfidence() {
-        
-        selfConfidence_ = 0;
-        onChanged();
-        return this;
-      }
      @java.lang.Override
      public final Builder setUnknownFields(
          final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -822,12 +822,12 @@ public final class CoopPointOuterClass {
      descriptor;
  static {
    java.lang.String[] descriptorData = {
-      "\n\017CoopPoint.proto\"\226\001\n\tCoopPoint\022\n\n\002id\030\017 " +
-      "\001(\r\022\037\n\005state\030\004 \001(\0162\020.CoopPoint.State\022\027\n\017" +
-      "self_confidence\030\010 \001(\r\"C\n\005State\022\023\n\017STATE_" +
+      "\n\017CoopPoint.proto\"\226\001\n\tCoopPoint\022\027\n\017self_" +
+      "confidence\030\t \001(\r\022\n\n\002id\030\013 \001(\r\022\037\n\005state\030\016 " +
+      "\001(\0162\020.CoopPoint.State\"C\n\005State\022\023\n\017STATE_" +
      "UNSTARTED\020\000\022\021\n\rSTATE_STARTED\020\001\022\022\n\016STATE_" +
-      "FINISHED\020\002B!\n\031emu.grasscutter.net.protoZ" +
-      "\004/genb\006proto3"
+      "FINISHED\020\002B\033\n\031emu.grasscutter.net.protob" +
+      "\006proto3"
    };
    descriptor = com.google.protobuf.Descriptors.FileDescriptor
      .internalBuildGeneratedFileFrom(descriptorData,
@@ -838,7 +838,7 @@ public final class CoopPointOuterClass {
    internal_static_CoopPoint_fieldAccessorTable = new
      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
        internal_static_CoopPoint_descriptor,
-        new java.lang.String[] { "Id", "State", "SelfConfidence", });
+        new java.lang.String[] { "SelfConfidence", "Id", "State", });
  }

  // @@protoc_insertion_point(outer_class_scope)