-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement ComponentMessageThrowable conversions and fix registry awar…
…e signed string conversions
- Loading branch information
Showing
10 changed files
with
255 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
cloud-fabric/src/main/java/org/incendo/cloud/fabric/internal/CloudFabricEntrypoint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // | ||
| // MIT License | ||
| // | ||
| // Copyright (c) 2024 Incendo | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE. | ||
| // | ||
| package org.incendo.cloud.fabric.internal; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.ModInitializer; | ||
| import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; | ||
| import net.fabricmc.loader.api.FabricLoader; | ||
| import org.apiguardian.api.API; | ||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||
| import org.checkerframework.framework.qual.DefaultQualifier; | ||
| import org.incendo.cloud.minecraft.modded.internal.AdventureSupport; | ||
|
|
||
| @API(status = API.Status.INTERNAL) | ||
| @DefaultQualifier(NonNull.class) | ||
| public final class CloudFabricEntrypoint implements ModInitializer { | ||
|
|
||
| @Override | ||
| public void onInitialize() { | ||
| if (FabricLoader.getInstance().isModLoaded("adventure-platform-fabric")) { | ||
| ServerLifecycleEvents.SERVER_STARTING.register(AdventureSupport.get()::setupServer); | ||
| ServerLifecycleEvents.SERVER_STOPPED.register(AdventureSupport.get()::removeServer); | ||
| if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { | ||
| AdventureSupport.get().setupClient(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
...ed-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/AdventureSupport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // | ||
| // MIT License | ||
| // | ||
| // Copyright (c) 2024 Incendo | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE. | ||
| // | ||
| package org.incendo.cloud.minecraft.modded.internal; | ||
|
|
||
| import java.util.Objects; | ||
| import net.kyori.adventure.platform.modcommon.MinecraftAudiences; | ||
| import net.kyori.adventure.platform.modcommon.MinecraftClientAudiences; | ||
| import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; | ||
| import net.minecraft.server.MinecraftServer; | ||
| import org.apiguardian.api.API; | ||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
| import org.checkerframework.framework.qual.DefaultQualifier; | ||
|
|
||
| @API(status = API.Status.INTERNAL) | ||
| @DefaultQualifier(NonNull.class) | ||
| public final class AdventureSupport { | ||
| private static final AdventureSupport INSTANCE; | ||
|
|
||
| static { | ||
| INSTANCE = new AdventureSupport(); | ||
| INSTANCE.setupConverter(); | ||
| } | ||
|
|
||
| private @Nullable MinecraftAudiences client; | ||
| private @Nullable MinecraftAudiences server; | ||
|
|
||
| private AdventureSupport() { | ||
| } | ||
|
|
||
| @SuppressWarnings("EmptyCatch") | ||
| private void setupConverter() { | ||
| try { | ||
| ComponentMessageThrowableConverter.setup(this); | ||
| } catch (final LinkageError ignored) { | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Set up the client audience. | ||
| */ | ||
| public void setupClient() { | ||
| this.client = MinecraftClientAudiences.of(); | ||
| } | ||
|
|
||
| /** | ||
| * Set up the server audience. | ||
| * | ||
| * @param server server | ||
| */ | ||
| public void setupServer(final MinecraftServer server) { | ||
| this.server = MinecraftServerAudiences.of(server); | ||
| } | ||
|
|
||
| /** | ||
| * Shutdown the server audience. | ||
| * | ||
| * @param server server | ||
| */ | ||
| @SuppressWarnings("unused") | ||
| public void removeServer(final MinecraftServer server) { | ||
| this.server = null; | ||
| } | ||
|
|
||
| /** | ||
| * Get the MinecraftAudiences instance. | ||
| * | ||
| * @return audiences | ||
| */ | ||
| public MinecraftAudiences audiences() { | ||
| final @Nullable MinecraftAudiences server = this.server; | ||
| if (server == null) { | ||
| return Objects.requireNonNull(this.client, "No audiences present"); | ||
| } else { | ||
| return this.server; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the AdventureSupport instance. | ||
| * | ||
| * @return the instance | ||
| */ | ||
| public static AdventureSupport get() { | ||
| return INSTANCE; | ||
| } | ||
| } |
55 changes: 55 additions & 0 deletions
55
.../java/org/incendo/cloud/minecraft/modded/internal/ComponentMessageThrowableConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // | ||
| // MIT License | ||
| // | ||
| // Copyright (c) 2024 Incendo | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE. | ||
| // | ||
| package org.incendo.cloud.minecraft.modded.internal; | ||
|
|
||
| import com.mojang.brigadier.exceptions.CommandSyntaxException; | ||
| import org.apiguardian.api.API; | ||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||
| import org.checkerframework.framework.qual.DefaultQualifier; | ||
| import org.incendo.cloud.minecraft.extras.MinecraftExceptionHandler; | ||
|
|
||
| @API(status = API.Status.INTERNAL) | ||
| @DefaultQualifier(NonNull.class) | ||
| final class ComponentMessageThrowableConverter implements MinecraftExceptionHandler.ComponentMessageThrowableConverter { | ||
|
|
||
| private final AdventureSupport adventureSupport; | ||
|
|
||
| ComponentMessageThrowableConverter(final AdventureSupport adventureSupport) { | ||
| this.adventureSupport = adventureSupport; | ||
| } | ||
|
|
||
| static void setup(final AdventureSupport adventureSupport) { | ||
| MinecraftExceptionHandler.ComponentMessageThrowableConverterHolder.converter( | ||
| new ComponentMessageThrowableConverter(adventureSupport) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public Throwable maybeConvert(final Throwable thr) { | ||
| if (thr instanceof CommandSyntaxException cse) { | ||
| return (Exception) this.adventureSupport.audiences().asComponentThrowable(cse); | ||
| } | ||
| return thr; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters