Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35

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

Added support for getOfflinePlayer(String) with optional cache #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed4550d
Added OfflinePlayer getter with optional web request
TheBusyBiscuit Jan 4, 2021
f2fd3f3
Made requested changes
TheBusyBiscuit Jan 4, 2021
b96d718
Renamed to match Paper-API method
TheBusyBiscuit Jan 6, 2021
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
34 changes: 25 additions & 9 deletions src/main/java/io/papermc/lib/PaperLib.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
* Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
}

/**
* Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
* can be made to look up the UUID of that player. Web requests will block the current Thread though.
* @param name The name of this OfflinePlayer.
* @param makeWebRequest Whether or not a web request for UUID lookups should be made.
* @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
*/
@Nullable
public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
}

/**
* Detects if the current MC version is at least the following version.
Expand Down
14 changes: 13 additions & 1 deletion src/main/java/io/papermc/lib/environments/Environment.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
protected BlockStateSnapshot blockStateSnapshotHandler;
protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

public Environment() {
Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
}

@Nullable
public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
}

public boolean isVersion(int minor) {
return isVersion(minor, 0);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/io/papermc/lib/environments/PaperEnvironment.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
bedSpawnLocationHandler = new BedSpawnLocationPaper();
} catch (NoSuchMethodException ignored) {}
}
if (isVersion(16, 4)) {
try {
// Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
getOfflinePlayerHandler = new GetOfflinePlayerPaper();
} catch(NoSuchMethodException ignored) {}
}
}

@Override
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
@Nullable
OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}
19 changes: 19 additions & 0 deletions src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
@Override
@Nullable
public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
if (makeWebRequest) {
return Bukkit.getOfflinePlayer(name);
} else {
return Bukkit.getOfflinePlayerIfCached(name);
}
}
}
15 changes: 15 additions & 0 deletions src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
@Override
@Nullable
public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
return Bukkit.getOfflinePlayer(name);
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Added support for getOfflinePlayer(String) with optional cache by TheBusyBiscuit · Pull Request #35 · PaperMC/PaperLib · GitHub
Skip to content

This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35
 Open

TheBusyBiscuit
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Added support for getOfflinePlayer(String) with optional cache
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ed4550d

Added OfflinePlayer getter with optional web request


TheBusyBiscuit Jan 4, 2021
f2fd3f3

Made requested changes


TheBusyBiscuit Jan 4, 2021
b96d718

Renamed to match Paper-API method


TheBusyBiscuit Jan 6, 2021

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


34 changes: 25 additions & 9 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
 * Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
 return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
 }

 /**
 * Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
 * can be made to look up the UUID of that player. Web requests will block the current Thread though.
 * @param name The name of this OfflinePlayer.
 * @param makeWebRequest Whether or not a web request for UUID lookups should be made.
 * @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
 */
 @Nullable
 public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 /**
 * Detects if the current MC version is at least the following version.
Expand Down

14 changes: 13 additions & 1 deletion
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;
 protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
 protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

 public Environment() {
 Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
 return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
 }

 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 public boolean isVersion(int minor) {
 return isVersion(minor, 0);
Expand Down

10 changes: 10 additions & 0 deletions
src/main/java/io/papermc/lib/environments/PaperEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
 bedSpawnLocationHandler = new BedSpawnLocationPaper();
 } catch (NoSuchMethodException ignored) {}
 }
 if (isVersion(16, 4)) {
 try {
 // Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
 Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
 getOfflinePlayerHandler = new GetOfflinePlayerPaper();
 } catch(NoSuchMethodException ignored) {}
 }
 }

 @Override
Expand Down

11 changes: 11 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
 @Nullable
 OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}

19 changes: 19 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 if (makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 } else {
 return Bukkit.getOfflinePlayerIfCached(name);
 }
 }
}

15 changes: 15 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Added support for getOfflinePlayer(String) with optional cache by TheBusyBiscuit · Pull Request #35 · PaperMC/PaperLib · GitHub
Skip to content

This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35
 Open

TheBusyBiscuit
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Added support for getOfflinePlayer(String) with optional cache
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ed4550d

Added OfflinePlayer getter with optional web request


TheBusyBiscuit Jan 4, 2021
f2fd3f3

Made requested changes


TheBusyBiscuit Jan 4, 2021
b96d718

Renamed to match Paper-API method


TheBusyBiscuit Jan 6, 2021

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


34 changes: 25 additions & 9 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
 * Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
 return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
 }

 /**
 * Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
 * can be made to look up the UUID of that player. Web requests will block the current Thread though.
 * @param name The name of this OfflinePlayer.
 * @param makeWebRequest Whether or not a web request for UUID lookups should be made.
 * @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
 */
 @Nullable
 public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 /**
 * Detects if the current MC version is at least the following version.
Expand Down

14 changes: 13 additions & 1 deletion
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;
 protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
 protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

 public Environment() {
 Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
 return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
 }

 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 public boolean isVersion(int minor) {
 return isVersion(minor, 0);
Expand Down

10 changes: 10 additions & 0 deletions
src/main/java/io/papermc/lib/environments/PaperEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
 bedSpawnLocationHandler = new BedSpawnLocationPaper();
 } catch (NoSuchMethodException ignored) {}
 }
 if (isVersion(16, 4)) {
 try {
 // Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
 Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
 getOfflinePlayerHandler = new GetOfflinePlayerPaper();
 } catch(NoSuchMethodException ignored) {}
 }
 }

 @Override
Expand Down

11 changes: 11 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
 @Nullable
 OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}

19 changes: 19 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 if (makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 } else {
 return Bukkit.getOfflinePlayerIfCached(name);
 }
 }
}

15 changes: 15 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Added support for getOfflinePlayer(String) with optional cache by TheBusyBiscuit · Pull Request #35 · PaperMC/PaperLib · GitHub
Skip to content

This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35
 Open

TheBusyBiscuit
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Added support for getOfflinePlayer(String) with optional cache
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ed4550d

Added OfflinePlayer getter with optional web request


TheBusyBiscuit Jan 4, 2021
f2fd3f3

Made requested changes


TheBusyBiscuit Jan 4, 2021
b96d718

Renamed to match Paper-API method


TheBusyBiscuit Jan 6, 2021

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


34 changes: 25 additions & 9 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
 * Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
 return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
 }

 /**
 * Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
 * can be made to look up the UUID of that player. Web requests will block the current Thread though.
 * @param name The name of this OfflinePlayer.
 * @param makeWebRequest Whether or not a web request for UUID lookups should be made.
 * @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
 */
 @Nullable
 public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 /**
 * Detects if the current MC version is at least the following version.
Expand Down

14 changes: 13 additions & 1 deletion
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;
 protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
 protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

 public Environment() {
 Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
 return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
 }

 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 public boolean isVersion(int minor) {
 return isVersion(minor, 0);
Expand Down

10 changes: 10 additions & 0 deletions
src/main/java/io/papermc/lib/environments/PaperEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
 bedSpawnLocationHandler = new BedSpawnLocationPaper();
 } catch (NoSuchMethodException ignored) {}
 }
 if (isVersion(16, 4)) {
 try {
 // Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
 Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
 getOfflinePlayerHandler = new GetOfflinePlayerPaper();
 } catch(NoSuchMethodException ignored) {}
 }
 }

 @Override
Expand Down

11 changes: 11 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
 @Nullable
 OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}

19 changes: 19 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 if (makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 } else {
 return Bukkit.getOfflinePlayerIfCached(name);
 }
 }
}

15 changes: 15 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Added support for getOfflinePlayer(String) with optional cache by TheBusyBiscuit · Pull Request #35 · PaperMC/PaperLib · GitHub
Skip to content

This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35
 Open

TheBusyBiscuit
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Added support for getOfflinePlayer(String) with optional cache
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ed4550d

Added OfflinePlayer getter with optional web request


TheBusyBiscuit Jan 4, 2021
f2fd3f3

Made requested changes


TheBusyBiscuit Jan 4, 2021
b96d718

Renamed to match Paper-API method


TheBusyBiscuit Jan 6, 2021

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


34 changes: 25 additions & 9 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
 * Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
 return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
 }

 /**
 * Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
 * can be made to look up the UUID of that player. Web requests will block the current Thread though.
 * @param name The name of this OfflinePlayer.
 * @param makeWebRequest Whether or not a web request for UUID lookups should be made.
 * @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
 */
 @Nullable
 public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 /**
 * Detects if the current MC version is at least the following version.
Expand Down

14 changes: 13 additions & 1 deletion
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;
 protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
 protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

 public Environment() {
 Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
 return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
 }

 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 public boolean isVersion(int minor) {
 return isVersion(minor, 0);
Expand Down

10 changes: 10 additions & 0 deletions
src/main/java/io/papermc/lib/environments/PaperEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
 bedSpawnLocationHandler = new BedSpawnLocationPaper();
 } catch (NoSuchMethodException ignored) {}
 }
 if (isVersion(16, 4)) {
 try {
 // Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
 Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
 getOfflinePlayerHandler = new GetOfflinePlayerPaper();
 } catch(NoSuchMethodException ignored) {}
 }
 }

 @Override
Expand Down

11 changes: 11 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
 @Nullable
 OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}

19 changes: 19 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 if (makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 } else {
 return Bukkit.getOfflinePlayerIfCached(name);
 }
 }
}

15 changes: 15 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Added support for getOfflinePlayer(String) with optional cache by TheBusyBiscuit · Pull Request #35 · PaperMC/PaperLib · GitHub
Skip to content

This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35
 Open

TheBusyBiscuit
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Added support for getOfflinePlayer(String) with optional cache
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ed4550d

Added OfflinePlayer getter with optional web request


TheBusyBiscuit Jan 4, 2021
f2fd3f3

Made requested changes


TheBusyBiscuit Jan 4, 2021
b96d718

Renamed to match Paper-API method


TheBusyBiscuit Jan 6, 2021

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


34 changes: 25 additions & 9 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
 * Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
 return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
 }

 /**
 * Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
 * can be made to look up the UUID of that player. Web requests will block the current Thread though.
 * @param name The name of this OfflinePlayer.
 * @param makeWebRequest Whether or not a web request for UUID lookups should be made.
 * @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
 */
 @Nullable
 public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 /**
 * Detects if the current MC version is at least the following version.
Expand Down

14 changes: 13 additions & 1 deletion
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;
 protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
 protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

 public Environment() {
 Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
 return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
 }

 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 public boolean isVersion(int minor) {
 return isVersion(minor, 0);
Expand Down

10 changes: 10 additions & 0 deletions
src/main/java/io/papermc/lib/environments/PaperEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
 bedSpawnLocationHandler = new BedSpawnLocationPaper();
 } catch (NoSuchMethodException ignored) {}
 }
 if (isVersion(16, 4)) {
 try {
 // Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
 Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
 getOfflinePlayerHandler = new GetOfflinePlayerPaper();
 } catch(NoSuchMethodException ignored) {}
 }
 }

 @Override
Expand Down

11 changes: 11 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
 @Nullable
 OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}

19 changes: 19 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 if (makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 } else {
 return Bukkit.getOfflinePlayerIfCached(name);
 }
 }
}

15 changes: 15 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Added support for getOfflinePlayer(String) with optional cache by TheBusyBiscuit · Pull Request #35 · PaperMC/PaperLib · GitHub
Skip to content

This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Added support for getOfflinePlayer(String) with optional cache#35
 Open

TheBusyBiscuit
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Added support for getOfflinePlayer(String) with optional cache
#35
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ed4550d

Added OfflinePlayer getter with optional web request


TheBusyBiscuit Jan 4, 2021
f2fd3f3

Made requested changes


TheBusyBiscuit Jan 4, 2021
b96d718

Renamed to match Paper-API method


TheBusyBiscuit Jan 6, 2021

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


34 changes: 25 additions & 9 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
package io.papermc.lib;

import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import io.papermc.lib.environments.CraftBukkitEnvironment;
import io.papermc.lib.environments.Environment;
import io.papermc.lib.environments.PaperEnvironment;
import io.papermc.lib.environments.SpigotEnvironment;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;

/**
 * Utility methods that assist plugin developers accessing Paper features.
Expand DownExpand Up@@ -201,6 +205,18 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 public static CompletableFuture<Location> getBedSpawnLocationAsync(@Nonnull Player player, boolean isUrgent) {
 return ENVIRONMENT.getBedSpawnLocationAsync(player, isUrgent);
 }

 /**
 * Gets an OfflinePlayer by the given name. If the Player is not cached, an optional web request
 * can be made to look up the UUID of that player. Web requests will block the current Thread though.
 * @param name The name of this OfflinePlayer.
 * @param makeWebRequest Whether or not a web request for UUID lookups should be made.
 * @return OfflinePlayer by the given name or null if the player is not cached and no web request was made.
 */
 @Nullable
 public static OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return ENVIRONMENT.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 /**
 * Detects if the current MC version is at least the following version.
Expand Down

14 changes: 13 additions & 1 deletion
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,21 +13,27 @@
import io.papermc.lib.features.chunkisgenerated.ChunkIsGenerated;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedUnknown;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayer;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerSpigot;

import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import javax.annotation.Nonnull;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@SuppressWarnings("WeakerAccess")
public abstract class Environment {

Expand All@@ -40,6 +46,7 @@ public abstract class Environment {
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;
 protected BedSpawnLocation bedSpawnLocationHandler = new BedSpawnLocationSync();
 protected GetOfflinePlayer getOfflinePlayerHandler = new GetOfflinePlayerSpigot();

 public Environment() {
 Pattern versionPattern = Pattern.compile("\\(MC: (\\d)\\.(\\d+)\\.?(\\d+?)?(?: Pre-Release )?(\\d)?\\)");
Expand DownExpand Up@@ -112,6 +119,11 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 public CompletableFuture<Location> getBedSpawnLocationAsync(Player player, boolean isUrgent) {
 return bedSpawnLocationHandler.getBedSpawnLocationAsync(player, isUrgent);
 }

 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return getOfflinePlayerHandler.getOfflinePlayerIfCached(name, makeWebRequest);
 }

 public boolean isVersion(int minor) {
 return isVersion(minor, 0);
Expand Down

10 changes: 10 additions & 0 deletions
src/main/java/io/papermc/lib/environments/PaperEnvironment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,10 @@
import io.papermc.lib.features.bedspawnlocation.BedSpawnLocationPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.offlineplayers.GetOfflinePlayerPaper;

import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.HumanEntity;

Expand DownExpand Up@@ -38,6 +41,13 @@ public PaperEnvironment() {
 bedSpawnLocationHandler = new BedSpawnLocationPaper();
 } catch (NoSuchMethodException ignored) {}
 }
 if (isVersion(16, 4)) {
 try {
 // Check for the new "getOfflinePlayerIfCached" method which was added in Paper API 1.16.4+
 Server.class.getDeclaredMethod("getOfflinePlayerIfCached", String.class);
 getOfflinePlayerHandler = new GetOfflinePlayerPaper();
 } catch(NoSuchMethodException ignored) {}
 }
 }

 @Override
Expand Down

11 changes: 11 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.OfflinePlayer;

public interface GetOfflinePlayer {
 @Nullable
 OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest);
}

19 changes: 19 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerPaper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerPaper implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 if (makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 } else {
 return Bukkit.getOfflinePlayerIfCached(name);
 }
 }
}

15 changes: 15 additions & 0 deletions
src/main/java/io/papermc/lib/features/offlineplayers/GetOfflinePlayerSpigot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package io.papermc.lib.features.offlineplayers;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;

public class GetOfflinePlayerSpigot implements GetOfflinePlayer {
 @Override
 @Nullable
 public OfflinePlayer getOfflinePlayerIfCached(@Nonnull String name, boolean makeWebRequest) {
 return Bukkit.getOfflinePlayer(name);
 }
}