This repository has been archived by the owner on Apr 9, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #115 from Andre601/feature/papiproxybridge-support
PAPIProxyBridge support
- Loading branch information
Showing
15 changed files
with
249 additions
and
30 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
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
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
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
core/src/main/java/ch/andre601/advancedserverlist/core/papi/PAPICache.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) 2022-2023 Andre_601 | ||
| * | ||
| * 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 ch.andre601.advancedserverlist.core.papi; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| public class PAPICache{ | ||
|
|
||
| private CacheValue cache = null; | ||
|
|
||
| public PAPICache(){} | ||
|
|
||
| public String get(Supplier<String> supplier){ | ||
| if(cache == null || cache.isExpired()) | ||
| cache = new CacheValue(supplier.get(), System.currentTimeMillis()); | ||
|
|
||
| return cache.server(); | ||
| } | ||
|
|
||
| private record CacheValue(String server, long timestamp){ | ||
| // Consider the cache expired if it is older than 5 seconds. | ||
| public boolean isExpired(){ | ||
| return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 5000L; | ||
| } | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
core/src/main/java/ch/andre601/advancedserverlist/core/papi/PAPIUtil.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,87 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2022-2023 Andre_601 | ||
| * | ||
| * 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 ch.andre601.advancedserverlist.core.papi; | ||
|
|
||
| import net.william278.papiproxybridge.api.PlaceholderAPI; | ||
|
|
||
| import java.util.*; | ||
| import java.util.concurrent.CancellationException; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.CompletionException; | ||
|
|
||
| public class PAPIUtil{ | ||
|
|
||
| private final PlaceholderAPI papi; | ||
|
|
||
| private final PAPICache cache = new PAPICache(); | ||
|
|
||
| public PAPIUtil(){ | ||
| this.papi = PlaceholderAPI.createInstance(); | ||
| } | ||
|
|
||
| // Make sure the version of PAPIProxyBridge we get has the required methods we need... | ||
| @SuppressWarnings("BooleanMethodIsAlwaysInverted") | ||
| public boolean isCompatible(){ | ||
| try{ | ||
| papi.getClass().getMethod("findServers"); | ||
| return true; | ||
| }catch(NoSuchMethodException ex){ | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| public String getServer(){ | ||
| return cache.get(() -> { | ||
| List<String> servers; | ||
| try{ | ||
| servers = papi.findServers().getNow(Collections.emptyList()); | ||
| }catch(CancellationException | CompletionException ex){ | ||
| return null; | ||
| } | ||
|
|
||
| if(servers == null || servers.isEmpty()) | ||
| return null; | ||
|
|
||
| return servers.get(0); | ||
| }); | ||
| } | ||
|
|
||
| public <P> P getPlayer(Collection<P> players){ | ||
| if(players.isEmpty()) | ||
| return null; | ||
|
|
||
| return List.copyOf(players).get(0); | ||
| } | ||
|
|
||
| public String parse(String text, UUID carrier, UUID player){ | ||
| try{ | ||
| CompletableFuture<String> future = papi.formatPlaceholders(text, carrier, player); | ||
| return future.getNow(text); | ||
| }catch(IllegalArgumentException | CancellationException | CompletionException ex){ | ||
| return text; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.