3131import org .checkerframework .checker .nullness .qual .NonNull ;
3232import org .geysermc .api .util .ApiVersion ;
3333import org .geysermc .geyser .GeyserImpl ;
34+ import org .geysermc .geyser .GeyserLogger ;
3435import org .geysermc .geyser .api .GeyserApi ;
3536import org .geysermc .geyser .api .event .ExtensionEventBus ;
3637import org .geysermc .geyser .api .extension .Extension ;
4243import org .geysermc .geyser .api .extension .exception .InvalidExtensionException ;
4344import org .geysermc .geyser .extension .event .GeyserExtensionEventBus ;
4445import org .geysermc .geyser .text .GeyserLocale ;
46+ import org .geysermc .geyser .util .ThrowingBiConsumer ;
4547
4648import java .io .IOException ;
4749import java .io .Reader ;
5153import java .nio .file .NoSuchFileException ;
5254import java .nio .file .Path ;
5355import java .nio .file .StandardCopyOption ;
56+ import java .util .ArrayList ;
5457import java .util .HashMap ;
5558import java .util .LinkedHashMap ;
5659import java .util .List ;
5760import java .util .Map ;
61+ import java .util .function .BiConsumer ;
5862import java .util .regex .Pattern ;
5963
6064@ RequiredArgsConstructor
@@ -155,6 +159,7 @@ void setClass(String name, final Class<?> clazz) {
155159
156160 @ Override
157161 protected void loadAllExtensions (@ NonNull ExtensionManager extensionManager ) {
162+ GeyserLogger logger = GeyserImpl .getInstance ().getLogger ();
158163 try {
159164 if (Files .notExists (extensionsDirectory )) {
160165 Files .createDirectory (extensionsDirectory );
@@ -163,55 +168,68 @@ protected void loadAllExtensions(@NonNull ExtensionManager extensionManager) {
163168 Map <String , Path > extensions = new LinkedHashMap <>();
164169 Map <String , GeyserExtensionContainer > loadedExtensions = new LinkedHashMap <>();
165170
166- Pattern [] extensionFilters = this .extensionFilters ();
167- List <Path > extensionPaths = Files .walk (extensionsDirectory ).toList ();
168- extensionPaths .forEach (path -> {
169- if (Files .isDirectory (path )) {
171+ Path updateDirectory = extensionsDirectory .resolve ("update" );
172+ if (Files .isDirectory (updateDirectory )) {
173+ // Step 1: Collect the extension files that currently exist so they can be replaced
174+ Map <String , List <Path >> extensionFiles = new HashMap <>();
175+ this .processExtensionsFolder (extensionsDirectory , (path , description ) -> {
176+ extensionFiles .computeIfAbsent (description .id (), k -> new ArrayList <>()).add (path );
177+ }, (path , e ) -> {
178+ // this file will throw again when we actually try to load extensions, and it will be handled there
179+ });
180+
181+ // Step 2: Move the updated/new extensions
182+ this .processExtensionsFolder (updateDirectory , (path , description ) -> {
183+ // Remove the old extension files with the same ID if it exists
184+ List <Path > oldExtensionFiles = extensionFiles .get (description .id ());
185+ if (oldExtensionFiles != null ) {
186+ for (Path oldExtensionFile : oldExtensionFiles ) {
187+ Files .delete (oldExtensionFile );
188+ }
189+ }
190+
191+ // Overwrite the extension with the new jar
192+ Files .move (path , extensionsDirectory .resolve (path .getFileName ()), StandardCopyOption .REPLACE_EXISTING );
193+ }, (path , e ) -> {
194+ logger .error (GeyserLocale .getLocaleStringLog ("geyser.extensions.update.failed" , path .getFileName ()), e );
195+ });
196+ }
197+
198+ // Step 3: Load the extensions
199+ this .processExtensionsFolder (extensionsDirectory , (path , description ) -> {
200+ String name = description .name ();
201+ String id = description .id ();
202+ if (extensions .containsKey (id ) || extensionManager .extension (id ) != null ) {
203+ logger .warning (GeyserLocale .getLocaleStringLog ("geyser.extensions.load.duplicate" , name , path .toString ()));
170204 return ;
171205 }
172206
173- for (Pattern filter : extensionFilters ) {
174- if (!filter .matcher (path .getFileName ().toString ()).matches ()) {
207+ // Check whether an extensions' requested api version is compatible
208+ ApiVersion .Compatibility compatibility = GeyserApi .api ().geyserApiVersion ().supportsRequestedVersion (
209+ description .humanApiVersion (),
210+ description .majorApiVersion (),
211+ description .minorApiVersion ()
212+ );
213+
214+ if (compatibility != ApiVersion .Compatibility .COMPATIBLE ) {
215+ // Workaround for the switch to the Geyser API version instead of the Base API version in extensions
216+ if (compatibility == ApiVersion .Compatibility .HUMAN_DIFFER && description .humanApiVersion () == 1 ) {
217+ logger .warning ("The extension %s requested the Base API version %s, which is deprecated in favor of specifying the Geyser API version. Please update the extension, or contact its developer."
218+ .formatted (name , description .apiVersion ()));
219+ } else {
220+ logger .error (GeyserLocale .getLocaleStringLog ("geyser.extensions.load.failed_api_version" , name , description .apiVersion ()));
175221 return ;
176222 }
177223 }
178224
179- try {
180- GeyserExtensionDescription description = this .extensionDescription (path );
181-
182- String name = description .name ();
183- String id = description .id ();
184- if (extensions .containsKey (id ) || extensionManager .extension (id ) != null ) {
185- GeyserImpl .getInstance ().getLogger ().warning (GeyserLocale .getLocaleStringLog ("geyser.extensions.load.duplicate" , name , path .toString ()));
186- return ;
187- }
188-
189- // Check whether an extensions' requested api version is compatible
190- ApiVersion .Compatibility compatibility = GeyserApi .api ().geyserApiVersion ().supportsRequestedVersion (
191- description .humanApiVersion (),
192- description .majorApiVersion (),
193- description .minorApiVersion ()
194- );
195-
196- if (compatibility != ApiVersion .Compatibility .COMPATIBLE ) {
197- // Workaround for the switch to the Geyser API version instead of the Base API version in extensions
198- if (compatibility == ApiVersion .Compatibility .HUMAN_DIFFER && description .humanApiVersion () == 1 ) {
199- GeyserImpl .getInstance ().getLogger ().warning ("The extension %s requested the Base API version %s, which is deprecated in favor of specifying the Geyser API version. Please update the extension, or contact its developer."
200- .formatted (name , description .apiVersion ()));
201- } else {
202- GeyserImpl .getInstance ().getLogger ().error (GeyserLocale .getLocaleStringLog ("geyser.extensions.load.failed_api_version" , name , description .apiVersion ()));
203- return ;
204- }
205- }
206-
207- GeyserExtensionContainer container = this .loadExtension (path , description );
208- extensions .put (id , path );
209- loadedExtensions .put (id , container );
210- } catch (Throwable e ) {
211- GeyserImpl .getInstance ().getLogger ().error (GeyserLocale .getLocaleStringLog ("geyser.extensions.load.failed_with_name" , path .getFileName (), path .toAbsolutePath ()), e );
212- }
225+ GeyserExtensionContainer container = this .loadExtension (path , description );
226+ extensions .put (id , path );
227+ loadedExtensions .put (id , container );
228+ }, (path , e ) -> {
229+ logger .error (GeyserLocale .getLocaleStringLog ("geyser.extensions.load.failed_with_name" , path .getFileName (), path .toAbsolutePath ()), e );
213230 });
214231
232+ // Step 4: Register the extensions
215233 for (GeyserExtensionContainer container : loadedExtensions .values ()) {
216234 this .extensionContainers .put (container .extension (), container );
217235 this .register (container .extension (), extensionManager );
@@ -221,6 +239,40 @@ protected void loadAllExtensions(@NonNull ExtensionManager extensionManager) {
221239 }
222240 }
223241
242+ /**
243+ * Process extension jars in a folder and call the accept or reject consumer based on the result
244+ *
245+ * @param directory the directory to process
246+ * @param accept the consumer to call when an extension is accepted
247+ * @param reject the consumer to call when an extension is rejected
248+ * @throws IOException if an I/O error occurs
249+ */
250+ private void processExtensionsFolder (Path directory , ThrowingBiConsumer <Path , GeyserExtensionDescription > accept , BiConsumer <Path , Throwable > reject ) throws IOException {
251+ List <Path > extensionPaths = Files .list (directory ).toList ();
252+ Pattern [] extensionFilters = this .extensionFilters ();
253+ extensionPaths .forEach (path -> {
254+ if (Files .isDirectory (path )) {
255+ return ;
256+ }
257+
258+ // Only look at files that meet the extension filter
259+ for (Pattern filter : extensionFilters ) {
260+ if (!filter .matcher (path .getFileName ().toString ()).matches ()) {
261+ return ;
262+ }
263+ }
264+
265+ try {
266+ // Try load the description, so we know it's a valid extension
267+ GeyserExtensionDescription description = this .extensionDescription (path );
268+
269+ accept .acceptThrows (path , description );
270+ } catch (Throwable e ) {
271+ reject .accept (path , e );
272+ }
273+ });
274+ }
275+
224276 @ Override
225277 protected boolean isEnabled (@ NonNull Extension extension ) {
226278 return this .extensionContainers .get (extension ).enabled ;
0 commit comments