Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

let extensions specify geyser api version instead of base api version #3880

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

let extensions specify geyser api version instead of base api version #3880

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
69bae4f
let extensions specify geyser api version instead of base api version
onebeastchris Jun 15, 2023
123ae7d
fix spacing, @link formatting, properly check for compat
onebeastchris Jun 16, 2023
1994c6c
Merge branch 'master' into extension-api-check
onebeastchris Jun 16, 2023
c233e7a
Merge remote-tracking branch 'upstream/master' into extension-api-check
onebeastchris Jun 17, 2023
18e3c3b
Proper warning, update to API changes to also check patch version
onebeastchris Jun 17, 2023
c4bd589
Merge branch 'master' into extension-api-check
onebeastchris Jun 17, 2023
8ec4e8f
Merge remote-tracking branch 'origin/extension-api-check' into extens…
onebeastchris Jun 17, 2023
04ecadc
Merge branch 'master' into extension-api-check
Konicai Jun 18, 2023
7cf06ad
Bump base-api version
Konicai Jun 19, 2023
11b6ce6
Merge branch 'master' into extension-api-check
onebeastchris Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions api/src/main/java/org/geysermc/geyser/api/GeyserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.checkerframework.checker.nullness.qual.Nullable;
import org.geysermc.api.Geyser;
import org.geysermc.api.GeyserApiBase;
import org.geysermc.api.util.ApiVersion;
import org.geysermc.geyser.api.connection.GeyserConnection;
import org.geysermc.geyser.api.event.EventBus;
import org.geysermc.geyser.api.event.EventRegistrar;
Expand Down Expand Up @@ -116,4 +117,12 @@ public interface GeyserApi extends GeyserApiBase {
static GeyserApi api() {
return Geyser.api(GeyserApi.class);
}

/**
* Gets the {@link org.geysermc.api.util.ApiVersion} Geyser API version
* @return the current geyser api version
*/
default org.geysermc.api.util.ApiVersion geyserApiVersion() {
return new ApiVersion(2, 1, 1);
}
onebeastchris marked this conversation as resolved.
Show resolved Hide resolved
}
32 changes: 19 additions & 13 deletions core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,27 @@
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import lombok.RequiredArgsConstructor;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.api.Geyser;
import org.geysermc.api.util.ApiVersion;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.GeyserApi;
import org.geysermc.geyser.api.event.ExtensionEventBus;
import org.geysermc.geyser.api.extension.*;
import org.geysermc.geyser.api.extension.Extension;
import org.geysermc.geyser.api.extension.ExtensionDescription;
import org.geysermc.geyser.api.extension.ExtensionLoader;
import org.geysermc.geyser.api.extension.ExtensionLogger;
import org.geysermc.geyser.api.extension.ExtensionManager;
import org.geysermc.geyser.api.extension.exception.InvalidDescriptionException;
import org.geysermc.geyser.api.extension.exception.InvalidExtensionException;
import org.geysermc.geyser.extension.event.GeyserExtensionEventBus;
import org.geysermc.geyser.text.GeyserLocale;

import java.io.IOException;
import java.io.Reader;
import java.nio.file.*;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
Expand Down Expand Up @@ -157,16 +166,13 @@ protected void loadAllExtensions(@NonNull ExtensionManager extensionManager) {
return;
}

// Completely different API version
if (description.majorApiVersion() != Geyser.api().majorApiVersion()) {
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
return;
}

// If the extension requires new API features, being backwards compatible
if (description.minorApiVersion() > Geyser.api().minorApiVersion()) {
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
return;
// Completely different API version - or if the extension requires new API features, being backwards compatible
if (GeyserApi.api().geyserApiVersion().isCompatible(new ApiVersion(description.majorApiVersion(), description.minorApiVersion(), description.patchApiVersion()))) {
// workaround for the switch to Geyser API version
if (description.majorApiVersion() != 1) {
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.extensions.load.failed_api_version", name, description.apiVersion()));
return;
}
onebeastchris marked this conversation as resolved.
Show resolved Hide resolved
}

extensions.put(name, path);
Expand Down
Loading