Merge remote-tracking branch 'origin/development' into development

build.gradle

@@ -116,7 +116,7 @@ jar {
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
-    
+
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
     from('src/main/java') {
@@ -171,13 +171,23 @@ publishing {
     }
     repositories {
         maven {
-            // change URLs to point to your repos, e.g. http://my.org/repo
-            def releasesRepoUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
-            def snapshotsRepoUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-
-            name = 'sonatype'
-            credentials(PasswordCredentials)
+            if(version.endsWith('-dev')) {
+                println ("Publishing to 4benj-maven")
+                url 'https://repo.4benj.com/releases'
+                name '4benj-maven'
+                credentials {
+                    username System.getenv('benj_maven_username')
+                    password System.getenv('benj_maven_token')
+                }
+            } else {
+                println ("Publishing to sonatype")
+                def releasesRepoUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+                def snapshotsRepoUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+                name = 'sonatype'
+                credentials(PasswordCredentials)
+            }
         }
     }
 }
@@ -225,7 +235,9 @@ eclipse {
 }
 
 signing {
-    sign publishing.publications.mavenJava
+    if(!version.endsWith('-dev')) {
+        sign publishing.publications.mavenJava
+    }
 }
 
 javadoc {

src/main/java/emu/grasscutter/auth/ExternalAuthenticator.java

@@ -16,18 +16,18 @@ public interface ExternalAuthenticator {
     /**
      * Called when an external account creation request is made.
      * @param request The authentication request.
-     *                
-     * For developers: Use {@link AuthenticationRequest#getRequest()} to get the request body.
-     *                 Use {@link AuthenticationRequest#getResponse()} to get the response body.
+     *
+     * For developers: Use AuthenticationRequest#getRequest() to get the request body.
+     *                 Use AuthenticationRequest#getResponse() to get the response body.
      */
     void handleAccountCreation(AuthenticationRequest request);
 
     /**
      * Called when an external password reset request is made.
      * @param request The authentication request.
-     *                
-     * For developers: Use {@link AuthenticationRequest#getRequest()} to get the request body.
-     *                 Use {@link AuthenticationRequest#getResponse()} to get the response body.
+     *
+     * For developers: Use AuthenticationRequest#getRequest() to get the request body.
+     *                 Use AuthenticationRequest#getResponse() to get the response body.
      */
     void handlePasswordReset(AuthenticationRequest request);
 }

src/main/java/emu/grasscutter/plugin/PluginManager.java

@@ -171,6 +171,11 @@ public final class PluginManager {
                 .toList().forEach(handler -> this.invokeHandler(event, handler));
     }
 
+    /**
+     * Gets a plugin's instance by its name.
+     * @param name The name of the plugin.
+     * @return Either null, or the plugin's instance.
+     */
     public Plugin getPlugin(String name) {
         return this.plugins.get(name);
     }

src/main/java/emu/grasscutter/scripts/constants/EventType.java

@@ -82,4 +82,46 @@ public class EventType {
 	public static final int EVENT_SET_GAME_TIME = 75;
 	public static final int EVENT_HIDE_AND_SEEK_PLAYER_QUIT = 76;
 	public static final int EVENT_AVATAR_DIE = 77;
+	public static final int EVENT_SCENE_MULTISTAGE_PLAY_STAGE_START = 78;
+	public static final int EVENT_GALLERY_PROGRESS_PASS = 79;
+	public static final int EVENT_GALLERY_PROGRESS_EMPTY = 80;
+	public static final int EVENT_GALLERY_PROGRESS_FULL = 81;
+	public static final int EVENT_HUNTING_FINISH_FINAL = 82;
+	public static final int EVENT_USE_WIDGET_TOY_FOX_CAMERA = 83;
+	public static final int EVENT_LUNA_RITE_SACRIFICE = 84;
+	public static final int EVENT_SUMO_SWITCH_TEAM_EVENT = 85;
+	public static final int EVENT_FISHING_START = 86;
+	public static final int EVENT_FISHING_STOP = 87;
+	public static final int EVENT_FISHING_QTE_FINISH = 88;
+	public static final int EVENT_FISHING_TIMEOUT_FLEE = 89;
+	public static final int EVENT_ROGUE_CELL_STATE_CHANGE = 90;
+	public static final int EVENT_ROGUE_CELL_CONSTRUCT = 91;
+	public static final int EVENT_ROGUE_CELL_FINISH_SELECT_CARD = 92;
+	public static final int EVENT_ANY_MONSTER_CAPTURE = 93;
+	public static final int EVENT_ACTIVITY_INTERACT_GADGET = 94;
+	public static final int EVENT_CHALLENGE_PAUSE = 95;
+	public static final int EVENT_LEVEL_TAG_CHANGE = 96;
+	public static final int EVENT_CUSTOM_DUNGEON_START = 97;
+	public static final int EVENT_CUSTOM_DUNGEON_RESTART = 98;
+	public static final int EVENT_CUSTOM_DUNGEON_REACTIVE = 99;
+	public static final int EVENT_CUSTOM_DUNGEON_OUT_STUCK = 100;
+	public static final int EVENT_CUSTOM_DUNGEON_EXIT_TRY = 101;
+	public static final int EVENT_CUSTOM_DUNGEON_OFFICIAL_RESTART = 102;
+	public static final int EVENT_ANY_MONSTER_CAPTURE_AND_DISAPPEAR = 103;
+	public static final int EVENT_MICHIAE_INTERACT = 104;
+	public static final int EVENT_SELECT_UIINTERACT = 105;
+	public static final int EVENT_LUA_NOTIFY = 106;
+	public static final int EVENT_PHOTO_FINISH = 107;
+	public static final int EVENT_IRODORI_MASTER_READY = 108;
+	public static final int EVENT_ROGUE_START_FIGHT = 109;
+	public static final int EVENT_ROGUE_CREAGE_FIGHT_GADGET = 110;
+	public static final int EVENT_ROGUE_CREAGE_REPAIR_GADGET = 111;
+	public static final int EVENT_ROGUE_OPEN_ACCESS = 112;
+	public static final int EVENT_GADGET_GIVING_FINISHED = 113;
+	public static final int EVENT_OBSERVATION_POINT_NOTIFY = 114;
+	public static final int EVENT_GADGET_GIVING_TAKEBACK = 115;
+	public static final int EVENT_ECHO_SHELL_INTERACT = 116;
+	public static final int EVENT_PLATFORM_ARRIVAL = 2701;
+	public static final int EVENT_PLAYER_BACK_GALLERY_REVIVE_POINT = 2800;
+	public static final int EVENT_GALLERY_CANNOT_START_AFTER_COUNTDOWN = 2801;
 }

src/main/java/emu/grasscutter/scripts/constants/ScriptRegionShape.java

@@ -4,4 +4,6 @@ public class ScriptRegionShape {
 	public static final int NONE = 0;
 	public static final int SPHERE = 1;
 	public static final int CUBIC = 2;
+	public static final int CYLINDER = 3;
+	public static final int POLYGON = 4;
 }